ddapi 0.1.0__tar.gz → 0.1.2__tar.gz

{ddapi-0.1.0 → ddapi-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.1.0
+Version: 0.1.2
 Summary: ddapi
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
@@ -36,7 +36,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydantic
 Requires-Dist: aiohttp
-Requires-Dist: orjson
 Provides-Extra: dev
 Requires-Dist: pydantic; extra == "dev"
 Requires-Dist: aiohttp; extra == "dev"

ddapi-0.1.2/ddapi/ddapi/DDnetApiPy/main.py

@@ -0,0 +1,61 @@
+import aiohttp
+from aiohttp import ClientSession
+from typing import Union
+from json import JSONDecoder
+from aiohttp.typedefs import DEFAULT_JSON_DECODER
+from ..errors import ExceptConnection
+from ..dataclass import DDPlayer
+from ..misc import username_encode
+
+
+class DDnetApi:
+    def __init__(self,
+                 session: ClientSession = None,
+                 on_raise: bool = True,
+                 json_loads: JSONDecoder = DEFAULT_JSON_DECODER):
+        self.session = session
+        self.on_raise = on_raise
+        self.json_loads = json_loads
+        self.url = "https://ddstats.qwik.space/player/json?player={0}"
+
+    @property
+    def closed(self):
+        return self.session.closed is None or self.session.closed
+
+    async def _ch_start(self) -> None:
+        if self.session is None:
+            self.session = aiohttp.ClientSession()
+
+    async def _send(self, url: str) -> Union[dict, None]:
+        await self._ch_start()
+        try:
+            async with self.session.get(url) as req:
+                if req.status == 200:
+                    usr = await req.text()
+                    if usr == '{}' or usr is None:
+                        return
+                    del usr
+                    return await req.json(loads=self.json_loads)
+                return
+        except Exception as ex:
+            if self.on_raise:
+                raise ExceptConnection(f"This hosting may not be available at the moment: {ex}")
+            return
+
+    async def close(self) -> None:
+        return await self.session.close()
+
+    async def player(self, player: str) -> Union[DDPlayer, None]:
+        dat = await self._send(f"https://ddnet.org/players/?json2={username_encode(player)}")
+        if dat is None:
+            return
+        return DDPlayer(**dat)
+
+    async def dict_player(self, player: str) -> Union[dict, None]:
+        dat = await self._send(f"https://ddnet.org/players/?json2={username_encode(player)}")
+        if dat is None:
+            return
+        return dat
+
+    async def master(self) -> Union[dict, None]:
+        return await self._send("https://master1.ddnet.org/ddnet/15/servers.json")

ddapi-0.1.2/ddapi/ddapi/__init__.py

@@ -0,0 +1,6 @@
+from .DDnetApiPy.main import *
+from .qwikDDnetApiPy.main import *
+from .dataclass import DDPlayer, Player
+
+__version__ = "0.3.5"
+__author__ = 'ByFox'

ddapi-0.1.2/ddapi/ddapi/dataclass.py

@@ -0,0 +1,251 @@
+from pydantic import BaseModel, Field
+from typing import Optional
+
+
+# ddnet
+class DPoints(BaseModel):
+    total: Optional[int] = Field(default=None)
+    points: Optional[int] = Field(default=None)
+    rank: Optional[int] = Field(default=None)
+
+
+class DRank(BaseModel):
+    points: Optional[int] = Field(default=None)
+    rank: Optional[int] = Field(default=None)
+
+
+class FirstFinish(BaseModel):
+    timestamp: Optional[float] = Field(default=None)
+    map: Optional[str] = Field(default=None)
+    time: Optional[float] = Field(default=None)
+
+
+class LastFinish(BaseModel):
+    timestamp: Optional[float] = Field(default=None)
+    map: Optional[str] = Field(default=None)
+    time: Optional[float] = Field(default=None)
+    country: Optional[str] = Field(default=None)
+    type: Optional[str] = Field(default=None)
+
+
+class FavorPart(BaseModel):
+    name: Optional[str] = Field(default=None)
+    finishes: 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] = Field(default=None)
+    Moderate: Optional[DData] = Field(default=None)
+    Brutal: Optional[DData] = Field(default=None)
+    Insane: Optional[DData] = Field(default=None)
+    Dummy: Optional[DData] = Field(default=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] = Field(default=None)
+    Solo: Optional[DData] = Field(default=None)
+    total: Optional[DData] = Field(default=None)
+
+
+class DActiov(BaseModel):
+    date: Optional[str] = Field(default=None)
+    hours_played: Optional[int] = Field(default=None)
+
+
+class DDPlayer(BaseModel):
+    player: Optional[str] = Field(default=None)
+    points: Optional[DPoints] = Field(default=None)
+    team_rank: Optional[DRank] = Field(default=None)
+    rank: Optional[DRank] = Field(default=None)
+    points_last_month: Optional[DRank] = Field(default=None)
+    points_last_week: Optional[DRank] = Field(default=None)
+    first_finish: Optional[FirstFinish] = Field(default=None)
+    last_finishes: Optional[list[LastFinish]] = Field(default=None)
+    favorite_partners: Optional[list[FavorPart]] = Field(default=None)
+    types: Optional[DDType] = Field(default=None)
+    activity: Optional[list[DActiov]] = Field(default=None)
+    hours_played_past_365_days: Optional[int] = Field(default=None)
+
+
+# qwik
+class Skin(BaseModel):
+    name: Optional[str] = Field(default=None)
+    color_body: Optional[int] = Field(default=None)
+    color_feet: Optional[int] = Field(default=None)
+
+
+class PData(BaseModel):
+    rank: Optional[str] = Field(default=None)
+    points: Optional[int] = Field(default=None)
+
+
+class PPoints(BaseModel):
+    Novice: Optional[PData] = Field(default=None)
+    Moderate: Optional[PData] = Field(default=None)
+    Brutal: Optional[PData] = Field(default=None)
+    Insane: Optional[PData] = Field(default=None)
+    Dummy: Optional[PData] = Field(default=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] = Field(default=None)
+    Race: Optional[PData] = Field(default=None)
+    Solo: Optional[PData] = Field(default=None)
+    total: Optional[PData] = Field(default=None)
+
+
+class Points(BaseModel):
+    points: Optional[PPoints] = Field(default=None)
+    rankpoints: Optional[PPoints] = Field(default=None)
+    teampoints: Optional[PPoints] = Field(default=None)
+
+
+class RData(BaseModel):
+    Map: Optional[str] = Field(default=None)
+    Name: Optional[str] = Field(default=None)
+    Time: Optional[float] = Field(default=None)
+    Server: Optional[str] = Field(default=None)
+    Rank: Optional[int] = Field(default=None)
+    Teamrank: Optional[int] = Field(default=None)
+    Category: str
+    Points: int
+
+
+class Rankings(BaseModel):
+    Novice: Optional[list[RData]] = Field(default=None)
+    Moderate: Optional[list[RData]] = Field(default=None)
+    Brutal: Optional[list[RData]] = Field(default=None)
+    Insane: Optional[list[RData]] = Field(default=None)
+    Dummy: Optional[list[RData]] = Field(default=None)
+    DDmaX_Easy: Optional[list[RData]] = Field(default=None, validation_alias='DDmaX.Easy')
+    DDmaX_Next: Optional[list[RData]] = Field(default=None, validation_alias='DDmaX.Next')
+    DDmaX_Nut: Optional[list[RData]] = Field(default=None, validation_alias='DDmaX.Nut')
+    DDmaX_Pro: Optional[list[RData]] = Field(default=None, validation_alias='DDmaX.Pro')
+    Oldschool: Optional[list[RData]] = Field(default=None)
+    Race: Optional[list[RData]] = Field(default=None)
+    Solo: Optional[list[RData]] = Field(default=None)
+    Fun: Optional[list[RData]] = Field(default=None)
+    total: Optional[list[RData]] = Field(default=None)
+
+
+class RPointG(BaseModel):
+    date: Optional[str] = Field(default=None)
+    rankpoints: Optional[int] = Field(default=None)
+    teampoints: Optional[int] = Field(default=None)
+
+
+class PointG(BaseModel):
+    date: Optional[str] = Field(default=None)
+    points: Optional[int] = Field(default=None)
+    maps: Optional[str] = Field(default=None)
+
+
+class RecentPlayerInfo(BaseModel):
+    date: Optional[str] = Field(default=None)
+    name: Optional[str] = Field(default=None)
+    clan: Optional[str] = Field(default=None)
+    country: Optional[int] = Field(default=None)
+    skin_name: Optional[str] = Field(default=None)
+    skin_color_body: Optional[int] = Field(default=None)
+    skin_color_feet: Optional[int] = Field(default=None)
+
+
+class RecentPlayTime(BaseModel):
+    date: Optional[str] = Field(default=None)
+    map: Optional[str] = Field(default=None)
+    player: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+    Server: Optional[str] = Field(default=None)
+
+
+class PlaytimeCategories(BaseModel):
+    Category: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+
+
+class PlaytimeGameTypes(BaseModel):
+    gametype: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+
+
+class PlaytimeLocation(BaseModel):
+    location: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+
+
+class PlaytimePerMonth(BaseModel):
+    Year: Optional[str] = Field(default=None)
+    Month: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+
+
+class MostPlayedMaps(BaseModel):
+    map: Optional[str] = Field(default=None)
+    Server: Optional[str] = Field(default=None)
+    Playtime: Optional[int] = Field(default=None)
+
+
+class AllTop10s(BaseModel):
+    Server: Optional[str] = Field(default=None)
+    Map: Optional[str] = Field(default=None)
+    rank: Optional[int] = Field(default=None)
+    rtime: Optional[float] = Field(default=None)
+    teamrank: Optional[int] = Field(default=None)
+    ttime: Optional[float] = Field(default=None)
+
+
+class AmountOfTop10(BaseModel):
+    Name: Optional[str] = Field(default=None)
+    Rank: Optional[int] = Field(default=None)
+    RankAmount: Optional[int] = Field(default=None)
+    TeamRankAmount: Optional[int] = Field(default=None)
+
+
+class Rank1sPartners(BaseModel):
+    Name: Optional[str] = Field(default=None)
+    Amount: Optional[int] = Field(default=None)
+
+
+class RecentTop10s(BaseModel):
+    Timestamp: Optional[str] = Field(default=None)
+    Server: Optional[str] = Field(default=None)
+    Name: Optional[str] = Field(default=None)
+    Time: Optional[float] = Field(default=None)
+    Map: Optional[str] = Field(default=None)
+    Rank: Optional[int] = Field(default=None)
+
+
+class Player(BaseModel):
+    player: Optional[str] = Field(default=None)
+    clan: Optional[str] = Field(default=None)
+    country: Optional[int] = Field(default=None)
+    skin: Optional[Skin] = Field(default=None)
+    stamp: Optional[str] = Field(default=None)
+    points: Optional[Points] = Field(default=None)
+    rankings: Optional[Rankings] = Field(default=None)
+    isMapper: Optional[int] = Field(default=None)
+    rankedPointsGraph: Optional[list[RPointG]] = Field(default=None)
+    pointsGraph: Optional[list[PointG]] = Field(default=None)
+    playtime: Optional[dict] = Field(default=None)
+    recentPlayerinfo: Optional[list[RecentPlayerInfo]] = Field(default=None)
+    recentPlaytime: Optional[list[RecentPlayTime]] = Field(default=None)
+    playtimeCategories: Optional[list[PlaytimeCategories]] = Field(default=None)
+    playtimeGametypes: Optional[list[PlaytimeGameTypes]] = Field(default=None)
+    playtimeLocation: Optional[list[PlaytimeLocation]] = Field(default=None)
+    playtimePerMonth: Optional[list[PlaytimePerMonth]] = Field(default=None)
+    mostPlayedMaps: Optional[list[MostPlayedMaps]] = Field(default=None)
+    allTop10s: Optional[list[AllTop10s]] = Field(default=None)
+    AmountOfTop10Placements: Optional[list[AmountOfTop10]] = Field(default=None,
+                                                                   validation_alias="AmountOfTop10Placements")
+    rank1sPartners: Optional[list[Rank1sPartners]] = Field(default=None)
+    recentTop10s: Optional[list[RecentTop10s]] = Field(default=None)

ddapi-0.1.2/ddapi/ddapi/errors.py

@@ -0,0 +1,2 @@
+class ExceptConnection(Exception):
+    pass

ddapi-0.1.2/ddapi/ddapi/misc.py

@@ -0,0 +1,26 @@
+sum_to_encoding = {"␣": "%20", "!": "%21", "\"": "%22", "#": "%23",
+                   "$": "%24", "%": "%25", "&": "%26", "\'": "%27",
+                   "(": "%28", ")": "%29", "*": "%2A", "+": "%2B",
+                   ",": "%2C", "/": "%2F", ":": "%3A", ";": "%3B",
+                   "=": "%3D", "?": "%3F", "@": "%40", "[": "%5B",
+                   "]": "%5D", "-": "%2D", ".": "%2E", "<": "%3C",
+                   ">": "%3E", "\\": "%5C", "^": "%5E", "_": "%5F",
+                   "`": "%60", "{": "%7B", "|": "%7C", "}": "%7D",
+                   "~": "%7E"}
+
+
+def username_encode(username: str) -> str:
+    """Decodes the line so that http gives out information about the player.
+    :param username:
+        :type: str
+    :return:
+        :type: str
+    """
+    result: str = ""
+    for i in username:
+        add: str = sum_to_encoding.get(i)
+        if add is not None:
+            result += add
+        else:
+            result += i
+    return result

{ddapi-0.1.0 → ddapi-0.1.2/ddapi}/ddapi/qwikDDnetApiPy/main.py

@@ -1,14 +1,21 @@
 import aiohttp
-import orjson
 from aiohttp import ClientSession
+from typing import Union
+from json import JSONDecoder
+from aiohttp.typedefs import DEFAULT_JSON_DECODER
 from ..dataclass import Player
 from ..misc import username_encode
 from ..errors import ExceptConnection
 
 
 class QwikAPI:
-    def __init__(self, session: ClientSession = None):
+    def __init__(self,
+                 session: ClientSession = None,
+                 on_raise: bool = True,
+                 json_loads: JSONDecoder = DEFAULT_JSON_DECODER):
         self.session = session
+        self.on_raise = on_raise
+        self.json_loads = json_loads
         self.url = "https://ddstats.qwik.space/player/json?player={0}"
 
     @property
@@ -19,7 +26,7 @@ class QwikAPI:
         if self.session is None:
             self.session = aiohttp.ClientSession()
 
-    async def _send(self, player: str) -> dict | None:
+    async def _send(self, player: str) -> Union[dict, None]:
         await self._ch_start()
         try:
             async with self.session.get(self.url.format(username_encode(player))) as req:
@@ -28,12 +35,14 @@ class QwikAPI:
                     if usr == '{}' or usr is None:
                         return
                     del usr
-                    return await req.json(loads=orjson.loads)
+                    return await req.json(loads=self.json_loads)
                 return
         except Exception as ex:
-            raise ExceptConnection(f"This hosting may not be available at the moment: {ex}")
+            if self.on_raise:
+                raise ExceptConnection(f"This hosting may not be available at the moment: {ex}")
+            return
 
-    async def player(self, nickname) -> Player | None:
+    async def player(self, nickname) -> Union[Player, None]:
         dat = await self._send(nickname)
         if not dat:
             return

{ddapi-0.1.0 → ddapi-0.1.2}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.1.0
+Version: 0.1.2
 Summary: ddapi
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
@@ -36,7 +36,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydantic
 Requires-Dist: aiohttp
-Requires-Dist: orjson
 Provides-Extra: dev
 Requires-Dist: pydantic; extra == "dev"
 Requires-Dist: aiohttp; extra == "dev"

ddapi-0.1.2/ddapi/ddapi.egg-info/SOURCES.txt

@@ -0,0 +1,18 @@
+LICENSE
+README.md
+pyproject.toml
+setup.cfg
+setup.py
+ddapi/ddapi/__init__.py
+ddapi/ddapi/dataclass.py
+ddapi/ddapi/errors.py
+ddapi/ddapi/misc.py
+ddapi/ddapi.egg-info/PKG-INFO
+ddapi/ddapi.egg-info/SOURCES.txt
+ddapi/ddapi.egg-info/dependency_links.txt
+ddapi/ddapi.egg-info/requires.txt
+ddapi/ddapi.egg-info/top_level.txt
+ddapi/ddapi/DDnetApiPy/__init__.py
+ddapi/ddapi/DDnetApiPy/main.py
+ddapi/ddapi/qwikDDnetApiPy/__init__.py
+ddapi/ddapi/qwikDDnetApiPy/main.py

{ddapi-0.1.0 → ddapi-0.1.2}/ddapi/ddapi.egg-info/requires.txt

@@ -1,6 +1,5 @@
 pydantic
 aiohttp
-orjson
 
 [dev]
 pydantic

ddapi-0.1.2/ddapi/ddapi.egg-info/top_level.txt

@@ -0,0 +1 @@
+ddapi

{ddapi-0.1.0 → ddapi-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ddapi"
-version = "0.1.0"
+version = "0.1.2"
 description = "ddapi"
 readme = "README.md"
 authors = [{ name = "ByFox" }]
@@ -17,8 +17,7 @@ classifiers = [
 keywords = ["feed", "reader", "tutorial"]
 dependencies = [
     "pydantic",
-    "aiohttp",
-    'orjson'
+    "aiohttp"
 ]
 requires-python = ">=3.8"
 

{ddapi-0.1.0 → ddapi-0.1.2}/setup.cfg

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

{ddapi-0.1.0 → ddapi-0.1.2}/setup.py

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

ddapi-0.1.0/ddapi/DDnetApiPy/main.py

@@ -1,48 +0,0 @@
-import aiohttp
-import orjson
-from aiohttp import ClientSession
-from ..dataclass import DDPlayer
-from ..misc import username_encode
-
-
-class DDnetApi:
-    def __init__(self, session: ClientSession = None):
-        self.session = session
-        self.url = "https://ddstats.qwik.space/player/json?player={0}"
-
-    @property
-    def closed(self):
-        return self.session.closed is None or self.session.closed
-
-    async def _ch_start(self) -> None:
-        if self.session is None:
-            self.session = aiohttp.ClientSession()
-
-    async def _send(self, url: str) -> dict | None:
-        await self._ch_start()
-        async with self.session.get(url) as req:
-            if req.status == 200:
-                usr = await req.text()
-                if usr == '{}' or usr is None:
-                    return
-                del usr
-                return await req.json(loads=orjson.loads)
-            return
-
-    async def close(self) -> None:
-        return await self.session.close()
-
-    async def player(self, player: str) -> DDPlayer | None:
-        dat = await self._send(f"https://ddnet.org/players/?json2={username_encode(player)}")
-        if dat is None:
-            return
-        return DDPlayer(**dat)
-
-    async def dict_player(self, player: str) -> dict | None:
-        dat = await self._send(f"https://ddnet.org/players/?json2={username_encode(player)}")
-        if dat is None:
-            return
-        return dat
-
-    async def master(self) -> dict | None:
-        return await self._send("https://master1.ddnet.org/ddnet/15/servers.json")

ddapi-0.1.0/ddapi/ddapi.egg-info/SOURCES.txt

@@ -1,14 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-setup.cfg
-setup.py
-ddapi/DDnetApiPy/__init__.py
-ddapi/DDnetApiPy/main.py
-ddapi/ddapi.egg-info/PKG-INFO
-ddapi/ddapi.egg-info/SOURCES.txt
-ddapi/ddapi.egg-info/dependency_links.txt
-ddapi/ddapi.egg-info/requires.txt
-ddapi/ddapi.egg-info/top_level.txt
-ddapi/qwikDDnetApiPy/__init__.py
-ddapi/qwikDDnetApiPy/main.py

ddapi-0.1.0/ddapi/ddapi.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-DDnetApiPy
-qwikDDnetApiPy