ddapi 0.12.1__tar.gz → 0.12.2__tar.gz

{ddapi-0.12.1 → ddapi-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.12.1
+Version: 0.12.2
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi/__init__.py

@@ -3,6 +3,6 @@
 from .main import DDnetApi, DDstats, Status
 from .scheme import *  # noqa: F403
 
-__version__ = "0.12.1"
+__version__ = "0.12.2"
 __author__ = "ByFox"
 __LICENSE__ = "MIT"

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi/scheme/__init__.py

@@ -1,4 +1,3 @@
-from .base import *  # noqa: F403
 from .ddnet import *  # noqa: F403
 from .ddstats_tw import *  # noqa: F403
 from .status_tw import *  # noqa: F403

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi/scheme/ddnet.py

@@ -5,11 +5,43 @@ from typing import Optional, Any
 
 from pydantic import BaseModel, Field
 
-from .base import DRank, DDType, DPoints
-
 rm_list = ["DD-Persian", "/vDQMHSss8W", ""]
 
 
+class DRank(BaseModel):
+    points: Optional[int] = None
+    rank: Optional[int] = None
+
+
+class DPoints(BaseModel):
+    total: int
+    points: Optional[int] = Field(default=None)
+    rank: Optional[int] = Field(default=None)
+
+
+class DData(BaseModel):
+    points: Optional[DPoints] = Field(default=None)
+    team_rank: Optional[DRank] = Field(default=None)
+    rank: Optional[DRank] = Field(default=None)
+    maps: Optional[dict] = Field(default=None)
+
+
+class DDType(BaseModel):
+    Novice: Optional[DData] = None
+    Moderate: Optional[DData] = None
+    Brutal: Optional[DData] = None
+    Insane: Optional[DData] = None
+    Dummy: Optional[DData] = None
+    DDmaX_Easy: Optional[DData] = Field(default=None, validation_alias="DDmaX.Easy")
+    DDmaX_Next: Optional[DData] = Field(default=None, validation_alias="DDmaX.Next")
+    DDmaX_Nut: Optional[DData] = Field(default=None, validation_alias="DDmaX.Nut")
+    DDmaX_Pro: Optional[DData] = Field(default=None, validation_alias="DDmaX.Pro")
+    Oldschool: Optional[DData] = Field(default=None)
+    Race: Optional[DData] = None
+    Solo: Optional[DData] = None
+    total: Optional[DData] = None
+
+
 class MaxFinishes(BaseModel):
     rank: int
     player: str

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi/scheme/ddstats_tw.py

@@ -4,14 +4,28 @@ from typing import Optional
 
 from pydantic import BaseModel, Field
 
-from .base import DDType
-
 
 class PData(BaseModel):
     rank: int
     points: int
 
 
+class PPoints(BaseModel):
+    Novice: Optional[PData] = None
+    Moderate: Optional[PData] = None
+    Brutal: Optional[PData] = None
+    Insane: Optional[PData] = None
+    Dummy: Optional[PData] = None
+    DDmaX_Easy: Optional[PData] = Field(default=None, validation_alias="DDmaX.Easy")
+    DDmaX_Next: Optional[PData] = Field(default=None, validation_alias="DDmaX.Next")
+    DDmaX_Nut: Optional[PData] = Field(default=None, validation_alias="DDmaX.Nut")
+    DDmaX_Pro: Optional[PData] = Field(default=None, validation_alias="DDmaX.Pro")
+    Oldschool: Optional[PData] = None
+    Race: Optional[PData] = None
+    Solo: Optional[PData] = None
+    total: Optional[PData] = None
+
+
 class PointG(BaseModel):
     date: str
     points: int
@@ -101,9 +115,9 @@ class Points(BaseModel):
     weekly_points: Optional[PData] = None
     monthly_points: Optional[PData] = None
     yearly_points: Optional[PData] = None
-    points: DDType
-    rank_points: DDType
-    team_points: DDType
+    points: PPoints
+    rank_points: PPoints
+    team_points: PPoints
 
 
 class RecentActivity(BaseModel):

ddapi-0.12.2/ddapi/ddapi/scheme/status_tw.py

@@ -0,0 +1,131 @@
+# Status.tw
+from datetime import datetime
+from enum import StrEnum
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class ChartEnum(StrEnum):
+    day = "day"
+    week = "week"
+    month = "month"
+
+
+class DataTw(BaseModel):
+    name: str
+    created_at: datetime = Field(alias="createdAt")
+
+
+class VersionTw(BaseModel):
+    version: str
+    created_at: datetime = Field(alias="createdAt")
+
+
+class CountryTw(BaseModel):
+    identifier: str
+    code: int
+    icon_url: str = Field(alias="iconUrl")
+
+
+class ClientTw(BaseModel):
+    name: str
+    country: CountryTw
+    score: int
+    is_player: bool = Field(alias="isPlayer")
+    is_afk: bool = Field(alias="isAfk")
+    team: int
+    created_at: datetime = Field(alias="createdAt")
+    clan: DataTw | None
+    server: "ServerTw" = None
+
+
+class ServerTw(BaseModel):
+    ip: str
+    port: int
+    name: str
+    num_clients: int = Field(alias="numClients")
+    num_players: int = Field(alias="numPlayers")
+    max_clients: int = Field(alias="maxClients")
+    max_players: int = Field(alias="maxPlayers")
+    has_password: bool = Field(alias="hasPassword")
+    supports6: bool
+    supports7: bool
+    created_at: datetime = Field(alias="createdAt")
+    relevance_score: int = Field(alias="relevanceScore")
+    client_score_kind: str | None = Field(alias="clientScoreKind")
+    logo_url: str = Field(alias="logoUrl")
+    map: DataTw
+    website: Optional[str] = None
+    discord_invite: Optional[str] = Field(None, alias="discordInvite")
+    description: Optional[str] = None
+    game_type: DataTw = Field(alias="gameType")
+    version: VersionTw
+    clients: list[ClientTw]
+
+
+class ServerTwOne(BaseModel):
+    ip: str
+    port: int
+    online: ServerTw
+
+
+class Chart(BaseModel):
+    avg_players: float = Field(alias="avgPlayers")
+    max_players: int = Field(alias="maxPlayers")
+    min_players: int = Field(alias="minPlayers")
+    timestamp: datetime
+
+
+class Charts(BaseModel):
+    charts: list[Chart]
+
+
+class MasterTw(BaseModel):
+    servers: list[ServerTw]
+
+
+class Info(BaseModel):
+    app: str
+    version: str
+
+
+class BannedMasterData(BaseModel):
+    ip: str
+    is_active: bool = Field(alias="isActive")
+    reason: str | None
+    unban_date: datetime | None = Field(alias="unbanDate")
+    created_at: datetime = Field(alias="createdAt")
+
+
+class BannedMaster(BaseModel):
+    servers: list[BannedMasterData]
+
+
+class ListData(BaseModel):
+    name: str
+    created_at: datetime = Field(alias="createdAt")
+    servers: list[ServerTw]
+
+
+class List(BaseModel):
+    data: list[ListData]
+
+
+class ListPlData(BaseModel):
+    name: str
+    created_at: datetime = Field(alias="createdAt")
+    players: list[ClientTw]
+
+
+class ListPl(BaseModel):
+    data: list[ListPlData]
+
+
+class Stats(BaseModel):
+    num_players: int = Field(alias="numPlayers")
+    num_clans: int = Field(alias="numClans")
+    num_servers: int = Field(alias="numServers")
+    num_maps: int = Field(alias="numMaps")
+    num_game_types: int = Field(alias="numGameTypes")
+    num_versions: int = Field(alias="numVersions")

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.12.1
+Version: 0.12.2
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.12.1 → ddapi-0.12.2}/ddapi/ddapi.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ ddapi/ddapi.egg-info/SOURCES.txt
 ddapi/ddapi.egg-info/dependency_links.txt
 ddapi/ddapi.egg-info/top_level.txt
 ddapi/ddapi/scheme/__init__.py
-ddapi/ddapi/scheme/base.py
 ddapi/ddapi/scheme/ddnet.py
 ddapi/ddapi/scheme/ddstats_tw.py
 ddapi/ddapi/scheme/status_tw.py

{ddapi-0.12.1 → ddapi-0.12.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ddapi
-version = 0.12.1
+version = 0.12.2
 author = ByFox
 description = DDnet api
 long_description = file: README.md

{ddapi-0.12.1 → ddapi-0.12.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ddapi",
-    version="0.12.1",
+    version="0.12.2",
     author="ByFox",
     description="DDnet api",
     long_description=long_description,

ddapi-0.12.1/ddapi/ddapi/scheme/base.py

@@ -1,37 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class DRank(BaseModel):
-    points: Optional[int] = None
-    rank: Optional[int] = None
-
-
-class DPoints(BaseModel):
-    total: int
-    points: Optional[int] = Field(default=None)
-    rank: Optional[int] = Field(default=None)
-
-
-class DData(BaseModel):
-    points: Optional[DPoints] = Field(default=None)
-    team_rank: Optional[DRank] = Field(default=None)
-    rank: Optional[DRank] = Field(default=None)
-    maps: Optional[dict] = Field(default=None)
-
-
-class DDType(BaseModel):
-    Novice: Optional[DData] = None
-    Moderate: Optional[DData] = None
-    Brutal: Optional[DData] = None
-    Insane: Optional[DData] = None
-    Dummy: Optional[DData] = None
-    DDmaX_Easy: Optional[DData] = Field(default=None, validation_alias="DDmaX.Easy")
-    DDmaX_Next: Optional[DData] = Field(default=None, validation_alias="DDmaX.Next")
-    DDmaX_Nut: Optional[DData] = Field(default=None, validation_alias="DDmaX.Nut")
-    DDmaX_Pro: Optional[DData] = Field(default=None, validation_alias="DDmaX.Pro")
-    Oldschool: Optional[DData] = Field(default=None)
-    Race: Optional[DData] = None
-    Solo: Optional[DData] = None
-    total: Optional[DData] = None

ddapi-0.12.1/ddapi/ddapi/scheme/status_tw.py

@@ -1,131 +0,0 @@
-# Status.tw
-from datetime import datetime
-from enum import StrEnum
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class ChartEnum(StrEnum):
-    day = "day"
-    week = "week"
-    month = "month"
-
-
-class DataTw(BaseModel):
-    name: str
-    created_at: datetime = Field(serialization_alias="createdAt")
-
-
-class VersionTw(BaseModel):
-    version: str
-    created_at: datetime = Field(serialization_alias="createdAt")
-
-
-class CountryTw(BaseModel):
-    identifier: str
-    code: int
-    icon_url: str = Field(serialization_alias="iconUrl")
-
-
-class ClientTw(BaseModel):
-    name: str
-    country: CountryTw
-    score: int
-    is_player: bool = Field(serialization_alias="isPlayer")
-    is_afk: bool = Field(serialization_alias="isAfk")
-    team: int
-    created_at: datetime = Field(serialization_alias="createdAt")
-    clan: DataTw | None
-    server: "ServerTw" = None
-
-
-class ServerTw(BaseModel):
-    ip: str
-    port: int
-    name: str
-    num_clients: int = Field(serialization_alias="numClients")
-    num_players: int = Field(serialization_alias="numPlayers")
-    max_clients: int = Field(serialization_alias="maxClients")
-    max_players: int = Field(serialization_alias="maxPlayers")
-    has_password: bool = Field(serialization_alias="hasPassword")
-    supports6: bool
-    supports7: bool
-    created_at: datetime = Field(serialization_alias="createdAt")
-    relevance_score: int = Field(serialization_alias="relevanceScore")
-    client_score_kind: str | None = Field(serialization_alias="clientScoreKind")
-    logo_url: str = Field(serialization_alias="logoUrl")
-    map: DataTw
-    website: Optional[str] = None
-    discord_invite: Optional[str] = Field(None, serialization_alias="discordInvite")
-    description: Optional[str] = None
-    game_type: DataTw = Field(serialization_alias="gameType")
-    version: VersionTw
-    clients: list[ClientTw]
-
-
-class ServerTwOne(BaseModel):
-    ip: str
-    port: int
-    online: ServerTw
-
-
-class Chart(BaseModel):
-    avg_players: float = Field(serialization_alias="avgPlayers")
-    max_players: int = Field(serialization_alias="maxPlayers")
-    min_players: int = Field(serialization_alias="minPlayers")
-    timestamp: datetime
-
-
-class Charts(BaseModel):
-    charts: list[Chart]
-
-
-class MasterTw(BaseModel):
-    servers: list[ServerTw]
-
-
-class Info(BaseModel):
-    app: str
-    version: str
-
-
-class BannedMasterData(BaseModel):
-    ip: str
-    is_active: bool = Field(serialization_alias="isActive")
-    reason: str | None
-    unban_date: datetime | None = Field(serialization_alias="unbanDate")
-    created_at: datetime = Field(serialization_alias="createdAt")
-
-
-class BannedMaster(BaseModel):
-    servers: list[BannedMasterData]
-
-
-class ListData(BaseModel):
-    name: str
-    created_at: datetime = Field(serialization_alias="createdAt")
-    servers: list[ServerTw]
-
-
-class List(BaseModel):
-    data: list[ListData]
-
-
-class ListPlData(BaseModel):
-    name: str
-    created_at: datetime = Field(serialization_alias="createdAt")
-    players: list[ClientTw]
-
-
-class ListPl(BaseModel):
-    data: list[ListPlData]
-
-
-class Stats(BaseModel):
-    num_players: int = Field(serialization_alias="numPlayers")
-    num_clans: int = Field(serialization_alias="numClans")
-    num_servers: int = Field(serialization_alias="numServers")
-    num_maps: int = Field(serialization_alias="numMaps")
-    num_game_types: int = Field(serialization_alias="numGameTypes")
-    num_versions: int = Field(serialization_alias="numVersions")