lock

PaiGramTeam · Dec 19, 2024 · f6632c8 · f6632c8
1 parent 0107677
commit f6632c8
Show file tree

Hide file tree

Showing 6 changed files with 466 additions and 537 deletions.
diff --git a/models/avatar.py b/models/avatar.py
@@ -23,16 +23,16 @@ class YattaAvatarCV(BaseModel):
 
 
 class YattaAvatarFetter(BaseModel):
-    faction: Optional[str]
-    description: Optional[str]
-    cv: Optional[YattaAvatarCV]
+    faction: Optional[str] = None
+    description: Optional[str] = None
+    cv: Optional[YattaAvatarCV] = None
 
 
 class YattaAvatarEidolon(BaseModel):
     id: int
     rank: int
-    name: Optional[str]
-    description: Optional[str]
+    name: Optional[str] = None
+    description: Optional[str] = None
     icon: str
 
     @property

diff --git a/models/relic_affix.py b/models/relic_affix.py
@@ -1,7 +1,7 @@
 from decimal import Decimal
 from typing import Optional, Dict
 
-from pydantic import BaseModel, root_validator
+from pydantic import model_validator, BaseModel
 
 from .enums import RelicAffix, RelicPosition
 
@@ -38,7 +38,8 @@ class RelicAffixAll(BaseModel):
     sub_affix: Dict[str, SingleRelicAffix]
     """ 副词条 """
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def transform_dicts(cls, values):
         for data in ["main_affix", "sub_affix"]:
             affix = values.get(data)