ruff fix and renamed

valorant/__init__.py

@@ -17,9 +17,70 @@
 from . import models as models, utils as utils
 from .asset import Asset as Asset
 from .client import Client as Client
-from .enums import *
+from .enums import (
+    MELEE_WEAPON_ID as MELEE_WEAPON_ID,
+    AbilitySlot as AbilitySlot,
+    Locale as Locale,
+    MissionType as MissionType,
+    RelationType as RelationType,
+    RewardType as RewardType,
+    try_enum as try_enum,
+)
 from .localization import Localization as Localization
-from .models import *
+from .models import (
+    Ability as Ability,
+    AdsStats as AdsStats,
+    Agent as Agent,
+    AirBurstStats as AirBurstStats,
+    AltShotgunStats as AltShotgunStats,
+    BaseModel as BaseModel,
+    Border as Border,
+    Buddy as Buddy,
+    BuddyLevel as BuddyLevel,
+    Bundle as Bundle,
+    Callout as Callout,
+    Ceremony as Ceremony,
+    Chapter as Chapter,
+    ChapterLevel as ChapterLevel,
+    CompetitiveSeason as CompetitiveSeason,
+    CompetitiveTier as CompetitiveTier,
+    Content as Content,
+    ContentTier as ContentTier,
+    Contract as Contract,
+    Currency as Currency,
+    DamageRange as DamageRange,
+    Event as Event,
+    GameFeatureOverride as GameFeatureOverride,
+    GameMode as GameMode,
+    GameModeEquippable as GameModeEquippable,
+    GameRuleBoolOverride as GameRuleBoolOverride,
+    Gear as Gear,
+    GridPosition as GridPosition,
+    Level as Level,
+    LevelBorder as LevelBorder,
+    Location as Location,
+    Map as Map,
+    Media as Media,
+    Mission as Mission,
+    PlayerCard as PlayerCard,
+    PlayerTitle as PlayerTitle,
+    Reward as Reward,
+    Role as Role,
+    Season as Season,
+    ShopData as ShopData,
+    Skin as Skin,
+    SkinChroma as SkinChroma,
+    SkinLevel as SkinLevel,
+    Spray as Spray,
+    SprayLevel as SprayLevel,
+    Theme as Theme,
+    Tier as Tier,
+    Version as Version,
+    VoiceLine as VoiceLine,
+    VoiceLineLocalization as VoiceLineLocalization,
+    Weapon as Weapon,
+    WeaponStats as WeaponStats,
+)
 
 
 class VersionInfo(NamedTuple):

valorant/models/__init__.py

@@ -9,25 +9,68 @@
 
 """
 
-from . import abc as abc
-from .agents import *
-from .buddies import *
-from .bundles import *
-from .ceremonies import *
-from .competitive_tiers import *
-from .content_tiers import *
-from .contracts import *
-from .currencies import *
-from .events import *
-from .gamemodes import *
-from .gear import *
-from .level_borders import *
-from .maps import *
-from .missions import *
-from .player_cards import *
-from .player_titles import *
-from .seasons import *
-from .sprays import *
-from .themes import *
-from .version import *
-from .weapons import *
+from .agents import (
+    Ability as Ability,
+    Agent as Agent,
+    Media as Media,
+    Role as Role,
+    VoiceLine as VoiceLine,
+    VoiceLineLocalization as VoiceLineLocalization,
+)
+from .base import BaseModel as BaseModel, GridPosition as GridPosition, ShopData as ShopData
+from .buddies import (
+    Buddy as Buddy,
+    BuddyLevel as BuddyLevel,
+)
+from .bundles import Bundle as Bundle
+from .ceremonies import Ceremony as Ceremony
+from .competitive_tiers import CompetitiveTier as CompetitiveTier, Tier as Tier
+from .content_tiers import ContentTier as ContentTier
+from .contracts import (
+    Chapter as Chapter,
+    ChapterLevel as ChapterLevel,
+    Content as Content,
+    Contract as Contract,
+    Level as Level,
+    Reward as Reward,
+)
+from .currencies import Currency as Currency
+from .events import Event as Event
+from .gamemodes import (
+    GameFeatureOverride as GameFeatureOverride,
+    GameMode as GameMode,
+    GameModeEquippable as GameModeEquippable,
+    GameRuleBoolOverride as GameRuleBoolOverride,
+)
+from .gear import Gear as Gear
+from .level_borders import LevelBorder as LevelBorder
+from .maps import (
+    Callout as Callout,
+    Location as Location,
+    Map as Map,
+)
+from .missions import Mission as Mission
+from .player_cards import PlayerCard as PlayerCard
+from .player_titles import PlayerTitle as PlayerTitle
+from .seasons import (
+    Border as Border,
+    CompetitiveSeason as CompetitiveSeason,
+    Season as Season,
+)
+from .sprays import (
+    Spray as Spray,
+    SprayLevel as SprayLevel,
+)
+from .themes import Theme as Theme
+from .version import Version as Version
+from .weapons import (
+    AdsStats as AdsStats,
+    AirBurstStats as AirBurstStats,
+    AltShotgunStats as AltShotgunStats,
+    DamageRange as DamageRange,
+    Skin as Skin,
+    SkinChroma as SkinChroma,
+    SkinLevel as SkinLevel,
+    Weapon as Weapon,
+    WeaponStats as WeaponStats,
+)

valorant/models/agents.py

@@ -29,7 +29,7 @@
 from ..asset import Asset
 from ..enums import AbilitySlot, Locale, try_enum
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/abc.py → valorant/models/base.py

@@ -24,7 +24,6 @@
 
 from __future__ import annotations
 
-import abc
 import uuid
 from typing import TYPE_CHECKING, Dict, Optional, Union
 
@@ -46,8 +45,7 @@
 )
 
 
-class BaseModel(abc.ABC):
-    __slots__ = ('_uuid',)
+class BaseModel:
 
     def __init__(self, uuid: str) -> None:
         self._uuid = uuid

valorant/models/buddies.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/bundles.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/ceremonies.py

@@ -27,7 +27,7 @@
 from typing import TYPE_CHECKING, Dict, Optional, Union
 
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/competitive_tiers.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/content_tiers.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/contracts.py

@@ -30,7 +30,7 @@
 from ..asset import Asset
 from ..enums import Locale, RelationType, RewardType, try_enum
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from uuid import UUID

valorant/models/currencies.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/events.py

@@ -28,7 +28,7 @@
 
 from .. import utils
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     import datetime

valorant/models/gamemodes.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/gear.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel, ShopData
+from .base import BaseModel, ShopData
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/level_borders.py

@@ -1,4 +1,4 @@
-from __future__ import annotations
+
 
 """
 The MIT License (MIT)
@@ -23,10 +23,12 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from ..asset import Asset
-from .abc import BaseModel
+from .base import BaseModel
 
 # fmt: off
 __all__ = (

valorant/models/maps.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/missions.py

@@ -29,7 +29,7 @@
 from .. import utils
 from ..enums import Locale, MissionType, try_enum
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     import datetime

valorant/models/player_cards.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/player_titles.py

@@ -27,7 +27,7 @@
 from typing import TYPE_CHECKING, Dict, Optional, Union
 
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/seasons.py

@@ -29,7 +29,7 @@
 from .. import utils
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     import datetime

valorant/models/sprays.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/themes.py

@@ -28,7 +28,7 @@
 
 from ..asset import Asset
 from ..localization import Localization
-from .abc import BaseModel
+from .base import BaseModel
 
 if TYPE_CHECKING:
     from ..cache import CacheState

valorant/models/weapons.py

@@ -30,7 +30,7 @@
 from ..asset import Asset
 from ..enums import MELEE_WEAPON_ID, Locale
 from ..localization import Localization
-from .abc import BaseModel, ShopData
+from .base import BaseModel, ShopData
 
 if TYPE_CHECKING:
     from ..cache import CacheState