ddapi 0.9.3__tar.gz → 0.12.0__tar.gz

{ddapi-0.9.3 → ddapi-0.12.0}/PKG-INFO

@@ -1,21 +1,19 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.9.3
+Version: 0.12.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
+License: MIT
 Project-URL: Github, https://github.com/ByFox213/ddapi
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author
-Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
@@ -41,28 +39,28 @@ DDnet
 
 ```python
 import asyncio
+
 from ddapi import DDnetApi, DDPlayer
 
 
 async def main():
-    obj = DDnetApi()
-    nickname = "Cor"
-    user: DDPlayer = await obj.player(nickname)
-    if user is None:
-        return "Player not found"
-
-    print(f"{user.player}: {user.points.points}")
-    # Cor: 31473 
-    await obj.close()  # Closing client Not necessary
-    assert isinstance(user, DDPlayer)
+    async with DDnetApi() as obj:
+        user: DDPlayer = await obj.player("Cor")
+    if user is not None:
+        text = f"{user.player}: {user.points.points}/{user.points.total}"
+        percent = round(user.points.total / user.points.points * 100)
+        print(f"{text}({percent}%)")
+        # Cor: 32950/32950(100%)
+    else:
+        print("Player not found")
 
 
 asyncio.run(main())
 ```
 
 Tested on Python
-| 3.9 | 3.10 | 3.11 | 3.12 |
-|-----|------|------|------|
-| ? | ? | ✅ | ✅ |
+| 3.10 | 3.11 | 3.12 |
+|------|------|------|
+| ✅ | ✅ | ✅ |
 
 [other examples](https://github.com/ByFox213/ddapi/tree/main/example)

ddapi-0.12.0/README.md

@@ -0,0 +1,45 @@
+ddapi is an api from the ddnet and qwik website
+
+## Installation
+
+```bash
+  pip install ddapi
+```
+
+or
+
+```bash
+  pip install git+https://github.com/ByFox213/ddapi
+```
+
+## Usage/Examples
+
+DDnet
+
+```python
+import asyncio
+
+from ddapi import DDnetApi, DDPlayer
+
+
+async def main():
+    async with DDnetApi() as obj:
+        user: DDPlayer = await obj.player("Cor")
+    if user is not None:
+        text = f"{user.player}: {user.points.points}/{user.points.total}"
+        percent = round(user.points.total / user.points.points * 100)
+        print(f"{text}({percent}%)")
+        # Cor: 32950/32950(100%)
+    else:
+        print("Player not found")
+
+
+asyncio.run(main())
+```
+
+Tested on Python
+| 3.10 | 3.11 | 3.12 |
+|------|------|------|
+| ✅ | ✅ | ✅ |
+
+[other examples](https://github.com/ByFox213/ddapi/tree/main/example)

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi/__init__.py

@@ -1,7 +1,7 @@
 """the module is made for the convenience of users to download and use"""
 from .main import DDnetApi, DDstats, Status
-from .scheme import *
+from .scheme import *  # noqa: F403
 
-__version__ = "0.9.3"
-__author__ = 'ByFox'
+__version__ = "0.12.0"
+__author__ = "ByFox"
 __LICENSE__ = "MIT"

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi/api.py

@@ -1,43 +1,66 @@
+import asyncio
 from abc import ABC
-from typing import Optional, TypeVar, Type, Any
+from typing import Optional, Type, Any
 
 import aiohttp
-from aiohttp import ClientSession, ClientConnectorError
-from aiohttp.typedefs import DEFAULT_JSON_DECODER
+from aiohttp import ClientSession
 
-ModelType = TypeVar('ModelType', bound='Model')
+from ddapi.types import T
+
+try:
+    import orjson
+
+    DEFAULT_JSON_DECODER = orjson.loads
+except ImportError:
+    from aiohttp.typedefs import DEFAULT_JSON_DECODER
 
 
 class API(ABC):
     def __init__(
             self,
             session: ClientSession = None,
+            autoclose: bool = True,
             json_loads: Any = DEFAULT_JSON_DECODER
     ):
         self.__session = session
         self.json_loads = json_loads
+        self.autoclose = autoclose
 
-    @staticmethod
-    def powered() -> None:
-        return None
+        if self.__session is None:
+            self.__session = aiohttp.ClientSession()
 
-    async def _get(self, url: str) -> Optional[dict]:
-        """Send a GET request to the given URL and return the response as JSON."""
+    async def __aenter__(self):
         if self.__session is None:
             self.__session = aiohttp.ClientSession()
+        return self
 
-        try:
-            async with self.__session.get(url) as req:
-                return await req.json(loads=self.json_loads) if req.status == 200 else None
-        except ClientConnectorError:
-            return
+    async def __aexit__(self, _exc_type, _exc_val, _exc_tb):
+        if self.autoclose:
+            await self.close()
+
+    def __del__(self):
+        if self.__session is not None and not self.__session.closed:
+            loop = asyncio.get_event_loop()
+            if loop.is_running():
+                loop.create_task(self.close())
+            else:
+                loop.run_until_complete(self.close())
+
+    async def _get(self, url: str) -> Optional[dict]:
+        """Send a GET request to the given URL and return the response as JSON."""
+        async with self.__session.get(url) as req:
+            return (
+                await req.json(loads=self.json_loads)
+                if req.status == 200
+                else None
+            )
 
     async def _generate_model_instance(
             self,
             url: str,
-            model: Type[ModelType],
+            model: Type[T],
             k: Optional[str] = None
-    ) -> Optional[ModelType]:
+    ) -> Optional[T]:
         """Generate a model instance from the given URL and optional keyword arguments.
 
         Args:
@@ -64,3 +87,11 @@ class API(ABC):
         if self.__session is not None:
             await self.__session.close()
         self.__session = None
+
+    @property
+    def domain(self) -> str:
+        return "ddnet.org"
+
+    @staticmethod
+    def powered() -> None:
+        return None

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi/main.py

@@ -1,9 +1,13 @@
+from enum import StrEnum
 from urllib.parse import quote
 
 from .api import API
-from .scheme import *
+from .scheme import DDPlayer, DDStatus, ReleasesMaps, Query, QueryMap, QueryMapper, \
+    Master, DMap, DProfile, SMap, Maps, Player, Info, BannedMaster, List, ListData, \
+    ListPl, ListPlData, MasterTw, ServerTwOne, Charts, ChartEnum, Stats
 
 __all__ = (
+    "MasterEnum",
     "DDnetApi",
     "DDstats",
     "Status"
@@ -11,16 +15,16 @@ __all__ = (
 
 
 class MasterEnum(StrEnum):
-    master1 = "master1"
-    master2 = "master2"
-    master3 = "master3"
-    master4 = "master4"
+    master1 = "1"
+    master2 = "2"
+    master3 = "3"
+    master4 = "4"
 
 
 class DDnetApi(API):
-    def __init__(self):
-        super().__init__()
-        self.domain = "ddnet.org"
+    @property
+    def domain(self) -> str:
+        return "ddnet.org"
 
     @staticmethod
     def powered() -> str:
@@ -57,19 +61,19 @@ class DDnetApi(API):
         return await self._generate_model_instance(
             f"https://{self.domain}/maps/?query={quote(map_name)}",
             QueryMap,
-            'maps',
+            "maps",
         )
 
     async def query_mapper(self, player: str) -> QueryMapper:
         return await self._generate_model_instance(
             f"https://{self.domain}/maps/?qmapper={quote(player)}",
             QueryMapper,
-            'players',
+            "players",
         )
 
-    async def master(self, master: MasterEnum = MasterEnum.master1) -> Master:
+    async def master(self, number: MasterEnum = MasterEnum.master1) -> Master:
         return await self._generate_model_instance(
-            f"https://{master}.{self.domain}/ddnet/15/servers.json",
+            f"https://master{number}.{self.domain}/ddnet/15/servers.json",
             Master
         )
 
@@ -81,14 +85,34 @@ class DDnetApi(API):
 
 
 class DDstats(API):
-    def __init__(self):
-        super().__init__()
-        self.domain = 'ddstats.tw'
+    @property
+    def domain(self) -> str:
+        return "ddstats.tw"
 
     @staticmethod
     def powered() -> str:
         return DDstats().domain
 
+    async def profile(self, player_name: str) -> DProfile:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/profile/json?player={quote(player_name)}",
+            DProfile,
+            "profile"
+        )
+
+    async def map(self, map_name: str) -> SMap:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/map/json?map={quote(map_name)}",
+            SMap
+        )
+
+    async def maps(self) -> Maps:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/maps/json",
+            Maps,
+            "maps"
+        )
+
     async def player(self, player_name: str) -> Player:
         """Fetch player data from the API and return it as a dictionary."""
         return await self._generate_model_instance(
@@ -98,9 +122,9 @@ class DDstats(API):
 
 
 class Status(API):
-    def __init__(self):
-        super().__init__()
-        self.domain = 'status.tw'
+    @property
+    def domain(self) -> str:
+        return "status.tw"
 
     @staticmethod
     def powered() -> str:
@@ -172,7 +196,12 @@ class Status(API):
             ServerTwOne,
         )
 
-    async def server_charts(self, ip: str, port: int | str, chart: ChartEnum = ChartEnum.day) -> Charts:
+    async def server_charts(
+            self,
+            ip: str,
+            port: int | str,
+            chart: ChartEnum = ChartEnum.day
+    ) -> Charts:
         return await self._generate_model_instance(
             f"https://api.{self.domain}/server/{quote(ip)}/{port}/chart/{chart}",
             Charts,
@@ -180,11 +209,11 @@ class Status(API):
         )
 
     async def server_history(self, ip: str, port: int | str) -> None:
-        # https://api.status.tw/server/{ip}/{port}/history
+        # TODO: https://api.status.tw/server/{ip}/{port}/history
         raise NotImplementedError()
 
     async def server_stats(self, ip: str, port: int | str) -> None:
-        # https://api.status.tw/server/{ip}/{port}/stats
+        # TODO: https://api.status.tw/server/{ip}/{port}/stats
         raise NotImplementedError()
 
     async def clan_list(self) -> ListPl:
@@ -214,7 +243,7 @@ class Status(API):
         )
 
     async def player_history(self, name: str) -> None:
-        # https://api.status.tw/player/name/{name}/history
+        # TODO:  https://api.status.tw/player/name/{name}/history
         raise NotImplementedError()
 
     async def stats(self) -> Stats:
@@ -224,9 +253,9 @@ class Status(API):
         )
 
     async def stats_players(self, t: str) -> None:
-        # https://api.status.tw/stats/players/day | week | month
+        # TODO: https://api.status.tw/stats/players/day | week | month
         raise NotImplementedError()
 
     async def stats_servers(self, t: str) -> None:
-        # https://api.status.tw/stats/servers/week | month
+        # TODO:  https://api.status.tw/stats/servers/week | month
         raise NotImplementedError()

ddapi-0.12.0/ddapi/ddapi/scheme/__init__.py

@@ -0,0 +1,4 @@
+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.0/ddapi/ddapi/scheme/base.py

@@ -0,0 +1,21 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+from ddapi import DData
+
+
+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.9.3 → ddapi-0.12.0}/ddapi/ddapi/scheme/ddnet.py

@@ -5,7 +5,9 @@ from typing import Optional, Any
 
 from pydantic import BaseModel, Field
 
-rm_list = ["DD-Persian", "/vDQMHSss8W", '']
+from .base import DDType
+
+rm_list = ["DD-Persian", "/vDQMHSss8W", ""]
 
 
 class DPoints(BaseModel):
@@ -94,22 +96,6 @@ class DData(BaseModel):
     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 Activity(BaseModel):
     date: str
     hours_played: int
@@ -220,7 +206,7 @@ class Master(BaseModel):
             client.clan
             for server in self.servers
             for client in server.info.clients
-            if client != ''
+            if client != ""
         )
 
         for i in remove_list:
@@ -297,3 +283,29 @@ class QueryMapData(BaseModel):
 
 class QueryMap(BaseModel):
     maps: list[QueryMapData]
+
+
+class DDStatusData(BaseModel):
+    name: str = None
+    type: str = None
+    host: str = None
+    location: str = None
+    online4: bool = None
+    online6: bool = None
+    uptime: str = None
+    load: float = None
+    network_rx: int = None
+    network_tx: int = None
+    packets_rx: int = None
+    packets_tx: int = None
+    cpu: int = None
+    memory_total: int = None
+    memory_used: int = None
+    swap_total: int = None
+    swap_used: int = None
+    hdd_total: int = None
+    hdd_used: int = None
+
+
+class DDStatus(BaseModel):
+    servers: list[DDStatusData]

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi/scheme/ddstats_tw.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from pydantic import BaseModel, Field
 
-rm_list = ["DD-Persian", "/vDQMHSss8W", '']
+from .base import DDType
 
 
 class PData(BaseModel):
@@ -12,22 +12,6 @@ class PData(BaseModel):
     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
@@ -45,6 +29,10 @@ class Profile(BaseModel):
     skin_color_feet: Optional[int] = None
 
 
+class DProfile(BaseModel):
+    profile: Profile
+
+
 class DDMap(BaseModel):
     map: str
     server: str
@@ -113,9 +101,9 @@ class Points(BaseModel):
     weekly_points: Optional[PData] = None
     monthly_points: Optional[PData] = None
     yearly_points: Optional[PData] = None
-    points: PPoints
-    rank_points: PPoints
-    team_points: PPoints
+    points: DDType
+    rank_points: DDType
+    team_points: DDType
 
 
 class RecentActivity(BaseModel):
@@ -173,7 +161,7 @@ class RecentTop10s(BaseModel):
     map: str
     time: float
     rank: int
-    timestamp: Optional[datetime]
+    timestamp: Optional[datetime] = None
     server: str
 
 
@@ -205,27 +193,74 @@ class Player(BaseModel):
     recent_top_10s: Optional[list[RecentTop10s]] = None
 
 
-class DDStatusData(BaseModel):
-    name: str = None
-    type: str = None
-    host: str = None
-    location: str = None
-    online4: bool = None
-    online6: bool = None
-    uptime: str = None
-    load: float = None
-    network_rx: int = None
-    network_tx: int = None
-    packets_rx: int = None
-    packets_tx: int = None
-    cpu: int = None
-    memory_total: int = None
-    memory_used: int = None
-    swap_total: int = None
-    swap_used: int = None
-    hdd_total: int = None
-    hdd_used: int = None
-
-
-class DDStatus(BaseModel):
-    servers: list[DDStatusData]
+class Maps(BaseModel):
+    maps: list[DDMap]
+
+
+class InfoSMap(BaseModel):
+    map: DDMap
+    finishes: int
+    finishes_rank: int
+    median_time: float
+
+
+class RankingSMap(BaseModel):
+    rank: int
+    timestamp: Optional[datetime] = None
+    name: str
+    time: float
+    map: str
+    server: str
+
+
+class TeamRankingSMap(BaseModel):
+    rank: int
+    timestamp: Optional[datetime] = None
+    id: list[int]
+    players: list[str]
+    time: float
+    map: str
+    server: str
+
+
+class TimeCpsSMap(BaseModel):
+    name: str
+    cp1: float
+    cp2: float
+    cp3: float
+    cp4: float
+    cp5: float
+    cp6: float
+    cp7: float
+    cp8: float
+    cp9: float
+    cp10: float
+    cp11: float
+    cp12: float
+    cp13: float
+    cp14: float
+    cp15: float
+    cp16: float
+    cp17: float
+    cp18: float
+    cp19: float
+    cp20: float
+    cp21: float
+    cp22: float
+    cp23: float
+    cp24: float
+    cp25: float
+    time: float
+
+
+class PlaytimeSMap(BaseModel):
+    name: str
+    seconds_played: int
+
+
+class SMap(BaseModel):
+    info: InfoSMap
+    rankings: list[RankingSMap]
+    team_rankings: list[TeamRankingSMap]
+    time_cps: list[TimeCpsSMap]
+    playtime: list[PlaytimeSMap]

ddapi-0.12.0/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(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")

ddapi-0.12.0/ddapi/ddapi/types.py

@@ -0,0 +1,3 @@
+from typing import TypeVar
+
+T = TypeVar("T")

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,21 +1,19 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.9.3
+Version: 0.12.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
+License: MIT
 Project-URL: Github, https://github.com/ByFox213/ddapi
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author
-Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
@@ -41,28 +39,28 @@ DDnet
 
 ```python
 import asyncio
+
 from ddapi import DDnetApi, DDPlayer
 
 
 async def main():
-    obj = DDnetApi()
-    nickname = "Cor"
-    user: DDPlayer = await obj.player(nickname)
-    if user is None:
-        return "Player not found"
-
-    print(f"{user.player}: {user.points.points}")
-    # Cor: 31473 
-    await obj.close()  # Closing client Not necessary
-    assert isinstance(user, DDPlayer)
+    async with DDnetApi() as obj:
+        user: DDPlayer = await obj.player("Cor")
+    if user is not None:
+        text = f"{user.player}: {user.points.points}/{user.points.total}"
+        percent = round(user.points.total / user.points.points * 100)
+        print(f"{text}({percent}%)")
+        # Cor: 32950/32950(100%)
+    else:
+        print("Player not found")
 
 
 asyncio.run(main())
 ```
 
 Tested on Python
-| 3.9 | 3.10 | 3.11 | 3.12 |
-|-----|------|------|------|
-| ? | ? | ✅ | ✅ |
+| 3.10 | 3.11 | 3.12 |
+|------|------|------|
+| ✅ | ✅ | ✅ |
 
 [other examples](https://github.com/ByFox213/ddapi/tree/main/example)

{ddapi-0.9.3 → ddapi-0.12.0}/ddapi/ddapi.egg-info/SOURCES.txt

@@ -5,11 +5,13 @@ setup.py
 ddapi/ddapi/__init__.py
 ddapi/ddapi/api.py
 ddapi/ddapi/main.py
+ddapi/ddapi/types.py
 ddapi/ddapi.egg-info/PKG-INFO
 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.9.3 → ddapi-0.12.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ddapi
-version = 0.9.3
+version = 0.12.0
 author = ByFox
 description = DDnet api
 long_description = file: README.md
@@ -8,16 +8,13 @@ long_description_content_type = text/markdown
 url = https://github.com/ByFox213/ddapi
 project_urls = 
 	github = https://github.com/ByFox213/ddapi
-classifiers = 
-	Programming Language :: Python :: 3
-	License :: OSI Approved :: MIT License
-	Operating System :: OS Independent
+license_files = LICENSE
 
 [options]
 package_dir = 
 	= ddapi
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.9
 
 [options.packages.find]
 where = ddapi

{ddapi-0.9.3 → ddapi-0.12.0}/setup.py

@@ -5,20 +5,16 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ddapi",
-    version="0.9.3",
+    version="0.12.0",
     author="ByFox",
     description="DDnet api",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/ByFox213/ddapi",
+    license="MIT",
     project_urls={
         "Github": "https://github.com/ByFox213/ddapi"
     },
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
     package_dir={"": "ddapi"},
     packages=setuptools.find_packages(where="ddapi"),
     python_requires=">=3.8"

ddapi-0.9.3/README.md

@@ -1,45 +0,0 @@
-ddapi is an api from the ddnet and qwik website
-
-## Installation
-
-```bash
-  pip install ddapi
-```
-
-or
-
-```bash
-  pip install git+https://github.com/ByFox213/ddapi
-```
-
-## Usage/Examples
-
-DDnet
-
-```python
-import asyncio
-from ddapi import DDnetApi, DDPlayer
-
-
-async def main():
-    obj = DDnetApi()
-    nickname = "Cor"
-    user: DDPlayer = await obj.player(nickname)
-    if user is None:
-        return "Player not found"
-
-    print(f"{user.player}: {user.points.points}")
-    # Cor: 31473 
-    await obj.close()  # Closing client Not necessary
-    assert isinstance(user, DDPlayer)
-
-
-asyncio.run(main())
-```
-
-Tested on Python
-| 3.9 | 3.10 | 3.11 | 3.12 |
-|-----|------|------|------|
-| ? | ? | ✅ | ✅ |
-
-[other examples](https://github.com/ByFox213/ddapi/tree/main/example)

ddapi-0.9.3/ddapi/ddapi/scheme/__init__.py

@@ -1,3 +0,0 @@
-from .ddnet import *
-from .ddstats_tw import *
-from .status_tw import *

ddapi-0.9.3/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
-
-
-class ChartEnum(StrEnum):
-    day = "day"
-    week = "week"
-    month = "month"
-
-
-class DataTw(BaseModel):
-    name: str
-    createdAt: datetime
-
-
-class VersionTw(BaseModel):
-    version: str
-    createdAt: datetime
-
-
-class CountryTw(BaseModel):
-    identifier: str
-    code: int
-    iconUrl: str
-
-
-class ClientTw(BaseModel):
-    name: str
-    country: CountryTw
-    score: int
-    isPlayer: bool
-    isAfk: bool
-    team: int
-    createdAt: datetime
-    clan: DataTw | None
-    server: "ServerTw" = None
-
-
-class ServerTw(BaseModel):
-    ip: str
-    port: int
-    name: str
-    numClients: int
-    numPlayers: int
-    maxClients: int
-    maxPlayers: int
-    hasPassword: bool
-    supports6: bool
-    supports7: bool
-    createdAt: datetime
-    relevanceScore: int
-    clientScoreKind: str | None
-    logoUrl: str
-    map: DataTw
-    website: Optional[str] = None
-    discordInvite: Optional[str] = None
-    description: Optional[str] = None
-    gameType: DataTw
-    version: VersionTw
-    clients: list[ClientTw]
-
-
-class ServerTwOne(BaseModel):
-    ip: str
-    port: int
-    online: ServerTw
-
-
-class Chart(BaseModel):
-    avgPlayers: float
-    maxPlayers: int
-    minPlayers: int
-    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
-    isActive: bool
-    reason: str | None
-    unbanDate: datetime | None
-    createdAt: datetime
-
-
-class BannedMaster(BaseModel):
-    servers: list[BannedMasterData]
-
-
-class ListData(BaseModel):
-    name: str
-    createdAt: datetime
-    servers: list[ServerTw]
-
-
-class List(BaseModel):
-    data: list[ListData]
-
-
-class ListPlData(BaseModel):
-    name: str
-    createdAt: datetime
-    players: list[ClientTw]
-
-
-class ListPl(BaseModel):
-    data: list[ListPlData]
-
-
-class Stats(BaseModel):
-    numPlayers: int
-    numClans: int
-    numServers: int
-    numMaps: int
-    numGameTypes: int
-    numVersions: int