Merge pull request #7 from Polyisoprene/master

MERGE

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
       shell: bash
 
     - name : Install dependance
-      run: poetry install --without dev
+      run: poetry install
       shell: bash
 
     - name : Build dist

.gitignore

@@ -3,4 +3,5 @@
 .git
 .github
 dist
+sample.py
 dynamicadaptor/__pycache__

dynamicadaptor/AddonCard.py

@@ -1,5 +1,4 @@
-from enum import Enum
-from typing import List, Optional, Union
+from typing import List, Optional
 from pydantic import BaseModel
 
 
@@ -9,7 +8,6 @@ class GoodsItem(BaseModel):
     price: str
     name: str
 
-
 
 class Goods(BaseModel):
     head_text: str
@@ -25,16 +23,16 @@ class Reserve(BaseModel):
     title: str
     desc1: ReserveDesc
     desc2: ReserveDesc
-    desc3: Optional[ReserveDesc]
+    desc3: Optional[ReserveDesc] = None
 
 
 # Common
 class Common(BaseModel):
     sub_type: str
-    head_text: Optional[str]
+    head_text: Optional[str] = None
     cover: str
     desc1: str
-    desc2: Optional[str]
+    desc2: Optional[str] = None
     title: str
 
 
@@ -44,29 +42,32 @@ class Ugc(BaseModel):
     title: str
     desc_second: str
     duration: str
-    head_text: Optional[str]
+    head_text: Optional[str] = None
 
 
 # Vote
 class Vote(BaseModel):
-    desc: Optional[str]
-    join_num: Optional[int]
-
+    desc: Optional[str] = None
+    join_num: Optional[int] = None
 
 
 class UpowerLotteryBtnJst(BaseModel):
-    text:str
+    text: str
+
+
 class UpowerLotteryDesc(BaseModel):
-    text:str
+    text: str
+
 
 class UpowerLotteryBtn(BaseModel):
-    jump_style:Optional[UpowerLotteryBtnJst]
-    
+    jump_style: Optional[UpowerLotteryBtnJst] = None
+
 
 class UpowerLottery(BaseModel):
-    title:str
-    desc:UpowerLotteryDesc
-    button:UpowerLotteryBtn
+    title: str
+    desc: UpowerLotteryDesc
+    button: UpowerLotteryBtn
+
 
 # class AdditionalDetail(Enum):
 #     """
@@ -86,14 +87,15 @@ class UpowerLottery(BaseModel):
 #     reserve: Reserve
 #     common: Common
 #     ugc: Ugc
-#     vote: Vote    
-#     upower_lottery:UpowerLottery 
+#     vote: Vote
+#     upower_lottery:UpowerLottery
+
 
 class Additional(BaseModel):
     type: str
-    goods: Optional[Goods]
-    reserve: Optional[Reserve]
-    common: Optional[Common]
-    ugc: Optional[Ugc]
-    vote: Optional[Vote]
-    upower_lottery:Optional[UpowerLottery]
+    goods: Optional[Goods] = None
+    reserve: Optional[Reserve] = None
+    common: Optional[Common] = None
+    ugc: Optional[Ugc] = None
+    vote: Optional[Vote] = None
+    upower_lottery: Optional[UpowerLottery] = None

dynamicadaptor/Content.py

@@ -3,19 +3,16 @@
 
 
 class Emoji(BaseModel):
-    icon_url: Optional[str]
-    text: Optional[str]
-    type: Union[int, str, None]
-
-
-
+    icon_url: Optional[str] = None
+    text: Optional[str] = None
+    type: Union[int, str, None] = None
 
 
 class RichTextDetail(BaseModel):
     type: str
     text: str
-    orig_text: Optional[str]
-    emoji: Optional[Emoji]
+    orig_text: Optional[str] = None
+    emoji: Optional[Emoji] = None
     # RICH_TEXT_NODE_TYPE_TEXT      文本
     # RICH_TEXT_NODE_TYPE_AT        At
     # RICH_TEXT_NODE_TYPE_VOTE      投票
@@ -32,6 +29,6 @@ class Topic(BaseModel):
 
 
 class Text(BaseModel):
-    text: Optional[str]
-    topic: Optional[Topic]
-    rich_text_nodes: Optional[List[RichTextDetail]]
+    text: Optional[str] = None
+    topic: Optional[Topic] = None
+    rich_text_nodes: Optional[List[RichTextDetail]] = None