Skip to content

Commit

Permalink
fix: update display_name field type to support str and LocalizedField
Browse files Browse the repository at this point in the history
  • Loading branch information
staciax committed Dec 31, 2024
1 parent c5380d4 commit c769c59
Show file tree
Hide file tree
Showing 20 changed files with 54 additions and 54 deletions.
14 changes: 7 additions & 7 deletions valorant/models/agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@

class Role(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
description: LocalizedField
display_name: str | LocalizedField = Field(alias='displayName')
description: str | LocalizedField
display_icon: str = Field(alias='displayIcon')
asset_path: str = Field(alias='assetPath')

Expand All @@ -62,8 +62,8 @@ class Recruitment(BaseModel):

class Ability(BaseModel):
slot: AbilitySlot
display_name: LocalizedField = Field(alias='displayName')
description: LocalizedField
display_name: str | LocalizedField = Field(alias='displayName')
description: str | LocalizedField
display_icon: str | None = Field(alias='displayIcon')

def __repr__(self) -> str:
Expand All @@ -72,10 +72,10 @@ def __repr__(self) -> str:

class Agent(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
description: LocalizedField
display_name: str | LocalizedField = Field(alias='displayName')
description: str | LocalizedField
developer_name: str = Field(alias='developerName')
character_tags: list[LocalizedField] | None = Field(alias='characterTags')
character_tags: list[str | LocalizedField] | None = Field(alias='characterTags')
display_icon: str = Field(alias='displayIcon')
display_icon_small: str = Field(alias='displayIconSmall')
bust_portrait: str | None = Field(alias='bustPortrait')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/buddies.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Level(BaseUUIDModel):
# uuid: str
charm_level: int = Field(alias='charmLevel')
hide_if_not_owned: bool = Field(alias='hideIfNotOwned')
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
display_icon: str = Field(alias='displayIcon')
asset_path: str = Field(alias='assetPath')

Expand All @@ -55,7 +55,7 @@ def __repr__(self) -> str:

class Buddy(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
is_hidden_if_not_owned: bool = Field(alias='isHiddenIfNotOwned')
theme_uuid: UUID | None = Field(alias='themeUuid')
display_icon: str = Field(alias='displayIcon')
Expand Down
10 changes: 5 additions & 5 deletions valorant/models/bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

class Bundle(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name_sub_text: LocalizedField | None = Field(alias='displayNameSubText')
description: LocalizedField
extra_description: LocalizedField | None = Field(alias='extraDescription')
promo_description: LocalizedField | None = Field(alias='promoDescription')
display_name: str | LocalizedField = Field(alias='displayName')
display_name_sub_text: str | LocalizedField | None = Field(alias='displayNameSubText')
description: str | LocalizedField
extra_description: str | LocalizedField | None = Field(alias='extraDescription')
promo_description: str | LocalizedField | None = Field(alias='promoDescription')
use_additional_context: bool = Field(alias='useAdditionalContext')
display_icon: str = Field(alias='displayIcon')
display_icon2: str = Field(alias='displayIcon2')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/ceremonies.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@

class Ceremony(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
asset_path: str = Field(alias='assetPath')
4 changes: 2 additions & 2 deletions valorant/models/competitive_tiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

class Tier(BaseModel):
tier: int
tier_name: LocalizedField = Field(alias='tierName')
tier_name: str | LocalizedField = Field(alias='tierName')
division: DivisionTier
division_name: LocalizedField = Field(alias='divisionName')
division_name: str | LocalizedField = Field(alias='divisionName')
color: Color
background_color: Color = Field(alias='backgroundColor')
small_icon: str | None = Field(alias='smallIcon')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/content_tiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

class ContentTier(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
dev_name: str = Field(alias='devName')
rank: int
juice_value: int = Field(alias='juiceValue')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/contracts.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ async def fetch_relationship(self, *, client: Client) -> Agent | Event | Season

class Contract(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
display_icon: str | None = Field(alias='displayIcon')
ship_it: bool = Field(alias='shipIt')
use_level_vp_cost_override: bool = Field(alias='useLevelVPCostOverride')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/currencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

class Currency(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name_singular: LocalizedField = Field(alias='displayNameSingular')
display_name: str | LocalizedField = Field(alias='displayName')
display_name_singular: str | LocalizedField = Field(alias='displayNameSingular')
display_icon: str = Field(alias='displayIcon')
large_icon: str = Field(alias='largeIcon')
reward_preview_icon: str = Field(alias='rewardPreviewIcon')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

class Event(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
short_display_name: LocalizedField = Field(alias='shortDisplayName')
display_name: str | LocalizedField = Field(alias='displayName')
short_display_name: str | LocalizedField = Field(alias='shortDisplayName')
start_time: datetime = Field(alias='startTime')
end_time: datetime = Field(alias='endTime')
asset_path: str = Field(alias='assetPath')
8 changes: 4 additions & 4 deletions valorant/models/gamemodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ class GameRuleBoolOverride(BaseModel):

class GameMode(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
description: LocalizedField | None
duration: LocalizedField | None
display_name: str | LocalizedField = Field(alias='displayName')
description: str | LocalizedField | None
duration: str | LocalizedField | None
economy_type: str | None = Field(alias='economyType')
allows_match_timeouts: bool = Field(alias='allowsMatchTimeouts')
is_team_voice_allowed: bool = Field(alias='isTeamVoiceAllowed')
Expand All @@ -74,7 +74,7 @@ class GameMode(BaseUUIDModel):

class Equippable(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
category: str
display_icon: str = Field(alias='displayIcon')
kill_stream_icon: str = Field(alias='killStreamIcon')
Expand Down
12 changes: 6 additions & 6 deletions valorant/models/gear.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@


class Detail(BaseModel):
name: LocalizedField
value: LocalizedField
name: str | LocalizedField
value: str | LocalizedField


class ShopData(BaseModel):
cost: int
category: ShopCategory
shop_order_priority: int = Field(alias='shopOrderPriority')
category_text: LocalizedField = Field(alias='categoryText')
category_text: str | LocalizedField = Field(alias='categoryText')
grid_position: Any = Field(alias='gridPosition')
can_be_trashed: bool = Field(alias='canBeTrashed')
image: Any
Expand All @@ -56,9 +56,9 @@ class ShopData(BaseModel):

class Gear(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
description: LocalizedField
descriptions: list[LocalizedField]
display_name: str | LocalizedField = Field(alias='displayName')
description: str | LocalizedField
descriptions: list[str | LocalizedField]
details: list[Detail]
display_icon: str = Field(alias='displayIcon')
asset_path: str = Field(alias='assetPath')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/level_borders.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class LevelBorder(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
starting_level: int = Field(alias='startingLevel')
level_number_appearance: str = Field(alias='levelNumberAppearance')
small_player_card_appearance: str = Field(alias='smallPlayerCardAppearance')
Expand Down
10 changes: 5 additions & 5 deletions valorant/models/maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ class Location(BaseModel):


class Callout(BaseModel):
region_name: LocalizedField = Field(alias='regionName')
super_region_name: LocalizedField = Field(alias='superRegionName')
region_name: str | LocalizedField = Field(alias='regionName')
super_region_name: str | LocalizedField = Field(alias='superRegionName')
location: Location


class Map(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
narrative_description: Any = Field(alias='narrativeDescription')
tactical_description: LocalizedField | None = Field(alias='tacticalDescription')
coordinates: LocalizedField | None
tactical_description: str | LocalizedField | None = Field(alias='tacticalDescription')
coordinates: str | LocalizedField | None
display_icon: str | None = Field(alias='displayIcon')
list_view_icon: str = Field(alias='listViewIcon')
list_view_icon_tall: str | None = Field(alias='listViewIconTall')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/missions.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class Objective(BaseModel):

class Mission(BaseUUIDModel):
# uuid: str
display_name: LocalizedField | None = Field(alias='displayName')
title: LocalizedField | None
display_name: str | LocalizedField | None = Field(alias='displayName')
title: str | LocalizedField | None
type: MissionType | None
xp_grant: int = Field(alias='xpGrant')
progress_to_complete: int = Field(alias='progressToComplete')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/player_cards.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

class PlayerCard(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
is_hidden_if_not_owned: bool = Field(alias='isHiddenIfNotOwned')
theme_uuid: UUID | None = Field(alias='themeUuid')
display_icon: str = Field(alias='displayIcon')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/player_titles.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class PlayerTitle(BaseUUIDModel):
# uuid: str
display_name: LocalizedField | None = Field(alias='displayName')
title_text: LocalizedField | None = Field(alias='titleText')
display_name: str | LocalizedField | None = Field(alias='displayName')
title_text: str | LocalizedField | None = Field(alias='titleText')
is_hidden_if_not_owned: bool = Field(alias='isHiddenIfNotOwned')
asset_path: str = Field(alias='assetPath')
4 changes: 2 additions & 2 deletions valorant/models/seasons.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

class Season(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
title: LocalizedField | None
display_name: str | LocalizedField = Field(alias='displayName')
title: str | LocalizedField | None
type: SeasonType | None
start_time: datetime = Field(alias='startTime')
end_time: datetime = Field(alias='endTime')
Expand Down
4 changes: 2 additions & 2 deletions valorant/models/sprays.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
class Level(BaseUUIDModel):
# uuid: str
spray_level: int = Field(alias='sprayLevel')
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
display_icon: str | None = Field(alias='displayIcon')
asset_path: str = Field(alias='assetPath')


class Spray(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
category: str | None
theme_uuid: UUID | None = Field(alias='themeUuid')
is_null_spray: bool = Field(alias='isNullSpray')
Expand Down
2 changes: 1 addition & 1 deletion valorant/models/themes.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class Theme(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
display_icon: str | None = Field(alias='displayIcon')
store_featured_image: str | None = Field(alias='storeFeaturedImage')
asset_path: str = Field(alias='assetPath')
10 changes: 5 additions & 5 deletions valorant/models/weapons.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class ShopData(BaseModel):
cost: int
category: ShopCategory
shop_order_priority: int = Field(alias='shopOrderPriority')
category_text: LocalizedField = Field(alias='categoryText')
category_text: str | LocalizedField = Field(alias='categoryText')
grid_position: GridPosition | None = Field(alias='gridPosition')
can_be_trashed: bool = Field(alias='canBeTrashed')
image: str | None
Expand All @@ -113,7 +113,7 @@ class ShopData(BaseModel):

class Chroma(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
display_icon: str | None = Field(alias='displayIcon')
full_render: str = Field(alias='fullRender')
swatch: str | None
Expand All @@ -123,7 +123,7 @@ class Chroma(BaseUUIDModel):

class Level(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
level_item: str | None = Field(alias='levelItem')
display_icon: str | None = Field(alias='displayIcon')
streamed_video: str | None = Field(alias='streamedVideo')
Expand All @@ -132,7 +132,7 @@ class Level(BaseUUIDModel):

class Skin(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
theme_uuid: UUID = Field(alias='themeUuid')
content_tier_uuid: UUID | None = Field(alias='contentTierUuid')
display_icon: str | None = Field(alias='displayIcon')
Expand All @@ -156,7 +156,7 @@ async def fetch_content_tier(self, *, client: Client) -> ContentTier | None:

class Weapon(BaseUUIDModel):
# uuid: str
display_name: LocalizedField = Field(alias='displayName')
display_name: str | LocalizedField = Field(alias='displayName')
category: WeaponCategory
default_skin_uuid: str = Field(alias='defaultSkinUuid')
display_icon: str = Field(alias='displayIcon')
Expand Down

0 comments on commit c769c59

Please sign in to comment.