Fix pydantic 2.5 error

enkapy/client.py

@@ -228,7 +228,7 @@ async def fetch_user(self, uid: int, player_only=False) -> EnkaData:
 
  obj: EnkaData = EnkaData.model_validate(data)
 
- if not player_only:
+ if not player_only and obj.characters:
  for character in obj.characters:
  if character.skill_depot_id in self._skill_depot_data:
  depot = self._skill_depot_data[character.skill_depot_id]

enkapy/model/__init__.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -10,6 +10,6 @@ class EnkaData(BaseModel):
  """All data about the player"""
  player: PlayerInfo = Field({}, alias="playerInfo")
  """Basic player info"""
- characters: List[CharacterInfo] = Field([], alias="avatarInfoList")
+ characters: Optional[List[CharacterInfo]] = Field([], alias="avatarInfoList")
  """Player characters shown in game"""
  ttl: int = 0

enkapy/model/artifact.py

@@ -23,7 +23,7 @@ def value(self) -> float:
 
 
 class ArtifactFlat(BaseModel):
- itemType: str
+ equipType: str
  """Artifact equip types
  
  EQUIP_BRACER: flower

enkapy/model/players.py

@@ -26,14 +26,14 @@ class PlayerInfo(BaseModel):
  """Player name card background id"""
  nickname: Optional[str]
  """Player nickname"""
- signature: Optional[str]
+ signature: Optional[str] = ''
  """Player signature"""
  worldLevel: Optional[int]
  """Player world level"""
  profilePicture: ProfilePicture
  """Player profile picture"""
 
- showAvatarInfoList: Optional[List[ShowAvatar]]
+ showAvatarInfoList: Optional[List[ShowAvatar]] = []
  """Player characters shown"""
 
  towerFloorIndex: Optional[int]

setup.py

@@ -2,7 +2,7 @@
 
 setuptools.setup(
  name="enka.py",
- version="1.1.6",
+ version="1.1.7",
  author="pwnless",
  author_email="[email protected]",
  description="Library for fetching JSON data from site https://enka.network/",