fix: genshin_db models

genshin_db/api.py

@@ -7,10 +7,10 @@
 class API:
     """genshin-db api，能夠取得遊戲內容 json 格式資料"""
 
-    GENSHIN_DB_URL: ClassVar[str] = "https://genshin-db-api.vercel.app/api/{folder}"
-    IMAGE_URL: ClassVar[
-        str
-    ] = "https://res.cloudinary.com/genshin/image/upload/sprites/{image}.png"
+    GENSHIN_DB_URL: ClassVar[str] = "https://genshin-db-api.vercel.app/api/v5/{folder}"
+    IMAGE_URL: ClassVar[str] = (
+        "https://res.cloudinary.com/genshin/image/upload/sprites/{image}.png"
+    )
 
     class GenshinDBLang(enum.Enum):
         """genshin-db api 支援的語言: https://genshin-db-api.vercel.app/api/languages"""
@@ -83,7 +83,9 @@ async def request_genshin_db(
         async with aiohttp.ClientSession() as session:
             async with session.get(url, params=params) as response:
                 if response.status != 200:
-                    raise Exception(f"無法取得 genshin-db api 內容: url={url} params={str(params)}")
+                    raise Exception(
+                        f"無法取得 genshin-db api 內容: url={url} params={str(params)}"
+                    )
                 data = await response.json(encoding="utf-8")
                 return data
 

genshin_db/models/artifacts.py

@@ -2,6 +2,7 @@
 
 from pydantic import BaseModel, Field
 
+from ..api import API
 from .base import GenshinDbBase, GenshinDbListBase
 
 
@@ -13,11 +14,31 @@ class PartDetail(BaseModel):
 
 
 class Images(BaseModel):
-    flower_url: Optional[str] = Field(None, alias="flower")
-    plume_url: Optional[str] = Field(None, alias="plume")
-    sands_url: Optional[str] = Field(None, alias="sands")
-    goblet_url: Optional[str] = Field(None, alias="goblet")
-    circlet_url: str = Field(alias="circlet")
+    filename_flower: Optional[str]
+    filename_plume: Optional[str]
+    filename_sands: Optional[str]
+    filename_goblet: Optional[str]
+    filename_circlet: str
+
+    @property
+    def flower_url(self) -> Optional[str]:
+        return None if self.filename_flower is None else API.get_image_url(self.filename_flower)
+
+    @property
+    def plume_url(self) -> Optional[str]:
+        return None if self.filename_plume is None else API.get_image_url(self.filename_plume)
+
+    @property
+    def sands_url(self) -> Optional[str]:
+        return None if self.filename_sands is None else API.get_image_url(self.filename_sands)
+
+    @property
+    def goblet_url(self) -> Optional[str]:
+        return None if self.filename_goblet is None else API.get_image_url(self.filename_goblet)
+
+    @property
+    def circlet_url(self) -> str:
+        return API.get_image_url(self.filename_circlet)
 
 
 class Artifact(GenshinDbBase):

genshin_db/models/tcg_cards.py

@@ -41,9 +41,9 @@ class CharacterCard(GenshinDbBase):
     max_energy: int = Field(alias="maxenergy")
     tags: list[str] = Field(alias="tagstext")
     """含有元素屬性、武器、陣營"""
-    story_title: str = Field(alias="storytitle")
-    story_text: str = Field(alias="storytext")
-    source: str
+    story_title: str | None = Field(alias="storytitle")
+    story_text: str | None = Field(alias="storytext")
+    source: str | None
     """獲取此卡牌的來源方式"""
     talents: list[Talent] = Field(alias="skills")
     images: Images

genshin_db/parsers.py

@@ -54,7 +54,7 @@ def _parse_costs(cls, costs: list[DiceCost]) -> str:
     @classmethod
     def parse_character_card(cls, card: CharacterCard) -> discord.Embed:
         """解析角色牌內容，傳回 discord.Embed"""
-        embed = EmbedTemplate.normal(card.story_text, title=card.name)
+        embed = EmbedTemplate.normal(card.story_text or " ", title=card.name)
         embed.set_image(url=card.image_url)
         for talent in card.talents:
             _value = "花費：" + cls._parse_costs(talent.costs) + "\n"
@@ -135,7 +135,9 @@ def parse_artifact_part(cls, part: PartDetail) -> discord.Embed:
     @classmethod
     def parse_weapon(cls, weapon: Weapon) -> discord.Embed:
         """解析武器內容，傳回 discord.Embed"""
-        description = f"基礎攻擊力：{weapon.base_atk}\n主屬性：{weapon.mainstat}+{weapon.mainvalue}\n"
+        description = (
+            f"基礎攻擊力：{weapon.base_atk}\n主屬性：{weapon.mainstat}+{weapon.mainvalue}\n"
+        )
         embed = EmbedTemplate.normal(description, title=f"★{weapon.rarity} {weapon.name}")
         embed.add_field(name=weapon.effect_name, value=weapon.effect_desciption)
         embed.set_thumbnail(
@@ -199,7 +201,9 @@ def parse_talent(cls, talent: Talent) -> discord.Embed:
         embed.add_field(name="固有：" + talent.passive1.name, value=talent.passive1.description)
         embed.add_field(name="固有：" + talent.passive2.name, value=talent.passive2.description)
         if talent.passive3 is not None:
-            embed.add_field(name="固有：" + talent.passive3.name, value=talent.passive3.description)
+            embed.add_field(
+                name="固有：" + talent.passive3.name, value=talent.passive3.description
+            )
         return embed
 
     @classmethod
@@ -229,7 +233,9 @@ def parse_food(cls, food: Food) -> discord.Embed:
             embed.add_field(name="完美料理", value=food.delicious.effect)
         embed.add_field(
             name="屬性",
-            value=f"稀有度：{food.rarity}\n" + f"類型：{food.food_type}\n" + f"效果：{food.effect}\n",
+            value=f"稀有度：{food.rarity}\n"
+            + f"類型：{food.food_type}\n"
+            + f"效果：{food.effect}\n",
         )
         embed.add_field(
             name="材料",