ddapi 0.12.0__tar.gz → 0.12.1__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.12.0
+Version: 0.12.1
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
 License: MIT
 Project-URL: Github, https://github.com/ByFox213/ddapi
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author

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

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

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

@@ -17,10 +17,10 @@ except ImportError:
 
 class API(ABC):
     def __init__(
-            self,
-            session: ClientSession = None,
-            autoclose: bool = True,
-            json_loads: Any = DEFAULT_JSON_DECODER
+        self,
+        session: ClientSession = None,
+        autoclose: bool = True,
+        json_loads: Any = DEFAULT_JSON_DECODER,
     ):
         self.__session = session
         self.json_loads = json_loads
@@ -49,17 +49,10 @@ class API(ABC):
     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
-            )
+            return await req.json(loads=self.json_loads) if req.status == 200 else None
 
     async def _generate_model_instance(
-            self,
-            url: str,
-            model: Type[T],
-            k: Optional[str] = None
+        self, url: str, model: Type[T], k: Optional[str] = None
     ) -> Optional[T]:
         """Generate a model instance from the given URL and optional keyword arguments.
 

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

@@ -2,17 +2,34 @@ from enum import StrEnum
 from urllib.parse import quote
 
 from .api import API
-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"
+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")
+
 
 class MasterEnum(StrEnum):
     master1 = "1"
@@ -33,28 +50,22 @@ class DDnetApi(API):
     async def player(self, player: str) -> DDPlayer:
         """Fetch player data from the API and return it as a dictionary."""
         return await self._generate_model_instance(
-            f"https://{self.domain}/players/?json2={quote(player)}",
-            DDPlayer
+            f"https://{self.domain}/players/?json2={quote(player)}", DDPlayer
         )
 
     async def status(self) -> DDStatus:
         return await self._generate_model_instance(
-            f"https://{self.domain}/status/json/stats.json",
-            DDStatus
+            f"https://{self.domain}/status/json/stats.json", DDStatus
         )
 
     async def releases_map(self) -> ReleasesMaps:
         return await self._generate_model_instance(
-            f"https://{self.domain}/releases/maps.json",
-            ReleasesMaps,
-            "maps"
+            f"https://{self.domain}/releases/maps.json", ReleasesMaps, "maps"
         )
 
     async def query(self, player: str) -> Query:
         return await self._generate_model_instance(
-            f"https://{self.domain}/players/?query={quote(player)}",
-            Query,
-            "players"
+            f"https://{self.domain}/players/?query={quote(player)}", Query, "players"
         )
 
     async def query_map(self, map_name: str) -> QueryMap:
@@ -73,14 +84,12 @@ class DDnetApi(API):
 
     async def master(self, number: MasterEnum = MasterEnum.master1) -> Master:
         return await self._generate_model_instance(
-            f"https://master{number}.{self.domain}/ddnet/15/servers.json",
-            Master
+            f"https://master{number}.{self.domain}/ddnet/15/servers.json", Master
         )
 
     async def map(self, map_name: str) -> DMap:
         return await self._generate_model_instance(
-            f"https://{self.domain}/maps/?json={quote(map_name)}",
-            DMap
+            f"https://{self.domain}/maps/?json={quote(map_name)}", DMap
         )
 
 
@@ -97,27 +106,23 @@ class DDstats(API):
         return await self._generate_model_instance(
             f"https://{self.domain}/profile/json?player={quote(player_name)}",
             DProfile,
-            "profile"
+            "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
+            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"
+            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(
-            f"https://{self.domain}/player/json?player={quote(player_name)}",
-            Player
+            f"https://{self.domain}/player/json?player={quote(player_name)}", Player
         )
 
 
@@ -132,62 +137,48 @@ class Status(API):
 
     async def info(self) -> Info:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/info",
-            Info
+            f"https://api.{self.domain}/info", Info
         )
 
     async def master_bans(self) -> BannedMaster:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/master/bans/list",
-            BannedMaster,
-            "servers"
+            f"https://api.{self.domain}/master/bans/list", BannedMaster, "servers"
         )
 
     async def map_list(self) -> List:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/map/list",
-            List,
-            "data"
+            f"https://api.{self.domain}/map/list", List, "data"
         )
 
     async def map(self, name: str) -> ListData:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/map/name/{quote(name)}",
-            ListData
+            f"https://api.{self.domain}/map/name/{quote(name)}", ListData
         )
 
     async def gametype_list(self) -> List:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/gametype/list",
-            List,
-            "data"
+            f"https://api.{self.domain}/gametype/list", List, "data"
         )
 
     async def gametype(self, name: str) -> ListData:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/gametype/name/{quote(name)}",
-            ListData
+            f"https://api.{self.domain}/gametype/name/{quote(name)}", ListData
         )
 
     async def version_list(self) -> List:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/version/list",
-            List,
-            "data"
+            f"https://api.{self.domain}/version/list", List, "data"
         )
 
     async def version(self, name: str) -> ListData:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/version/name/{quote(name)}",
-            ListData
+            f"https://api.{self.domain}/version/name/{quote(name)}", ListData
         )
 
     async def server_list(self) -> MasterTw:
         """Fetch player data from the API and return it as a dictionary."""
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/server/list",
-            MasterTw,
-            "servers"
+            f"https://api.{self.domain}/server/list", MasterTw, "servers"
         )
 
     async def server(self, ip: str, port: int | str) -> ServerTwOne:
@@ -197,15 +188,12 @@ class Status(API):
         )
 
     async def server_charts(
-            self,
-            ip: str,
-            port: int | str,
-            chart: ChartEnum = ChartEnum.day
+        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,
-            "charts"
+            "charts",
         )
 
     async def server_history(self, ip: str, port: int | str) -> None:
@@ -218,28 +206,22 @@ class Status(API):
 
     async def clan_list(self) -> ListPl:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/clan/list",
-            ListPl,
-            "data"
+            f"https://api.{self.domain}/clan/list", ListPl, "data"
         )
 
     async def clan(self, name: str) -> ListPlData:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/clan/name/{quote(name)}",
-            ListPlData
+            f"https://api.{self.domain}/clan/name/{quote(name)}", ListPlData
         )
 
     async def player_list(self) -> ListPl:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/player/list",
-            ListPl,
-            "data"
+            f"https://api.{self.domain}/player/list", ListPl, "data"
         )
 
     async def player(self, name: str) -> ListPlData:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/player/name/{quote(name)}",
-            ListPlData
+            f"https://api.{self.domain}/player/name/{quote(name)}", ListPlData
         )
 
     async def player_history(self, name: str) -> None:
@@ -248,8 +230,7 @@ class Status(API):
 
     async def stats(self) -> Stats:
         return await self._generate_model_instance(
-            f"https://api.{self.domain}/stats",
-            Stats
+            f"https://api.{self.domain}/stats", Stats
         )
 
     async def stats_players(self, t: str) -> None:

{ddapi-0.12.0 → ddapi-0.12.1}/ddapi/ddapi/scheme/base.py

@@ -2,7 +2,23 @@ from typing import Optional
 
 from pydantic import BaseModel, Field
 
-from ddapi import DData
+
+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):

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

@@ -5,17 +5,11 @@ from typing import Optional, Any
 
 from pydantic import BaseModel, Field
 
-from .base import DDType
+from .base import DRank, DDType, DPoints
 
 rm_list = ["DD-Persian", "/vDQMHSss8W", ""]
 
 
-class DPoints(BaseModel):
-    total: int
-    points: Optional[int] = Field(default=None)
-    rank: Optional[int] = Field(default=None)
-
-
 class MaxFinishes(BaseModel):
     rank: int
     player: str
@@ -65,11 +59,6 @@ class DMap(BaseModel):
     max_finishes: list[MaxFinishes]
 
 
-class DRank(BaseModel):
-    points: Optional[int] = None
-    rank: Optional[int] = None
-
-
 class FirstFinish(BaseModel):
     timestamp: float
     map: str
@@ -89,13 +78,6 @@ class FavoritePartner(BaseModel):
     finishes: int
 
 
-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 Activity(BaseModel):
     date: str
     hours_played: int
@@ -221,17 +203,20 @@ class Master(BaseModel):
                     count_clients=i.count_client,
                     address=i.addresses[0],
                     game_type=i.info.game_type,
-                    name=i.info.name
+                    name=i.info.name,
                 )
                 if isinstance(i.addresses, list)
                 else CountServers(
                     count_clients=i.count_client,
                     address=i.addresses,
                     game_type=i.info.game_type,
-                    name=i.info.name
+                    name=i.info.name,
                 )
                 for i in self.servers
-            ), key=lambda x: x.count_clients, reverse=True)
+            ),
+            key=lambda x: x.count_clients,
+            reverse=True,
+        )
 
     @property
     def count_clients(self) -> int:

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.12.0
+Version: 0.12.1
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
 License: MIT
 Project-URL: Github, https://github.com/ByFox213/ddapi
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author

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

@@ -1,6 +1,6 @@
 [metadata]
 name = ddapi
-version = 0.12.0
+version = 0.12.1
 author = ByFox
 description = DDnet api
 long_description = file: README.md
@@ -14,7 +14,7 @@ license_files = LICENSE
 package_dir = 
 	= ddapi
 packages = find:
-python_requires = >=3.9
+python_requires = >=3.10
 
 [options.packages.find]
 where = ddapi

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

@@ -5,17 +5,15 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ddapi",
-    version="0.12.0",
+    version="0.12.1",
     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"
-    },
+    project_urls={"Github": "https://github.com/ByFox213/ddapi"},
     package_dir={"": "ddapi"},
     packages=setuptools.find_packages(where="ddapi"),
-    python_requires=">=3.8"
+    python_requires=">=3.10",
 )