ddapi 0.1.1__tar.gz → 0.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.1.1
+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.1 → 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.1 → ddapi-0.1.2}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.1.1
+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.1 → ddapi-0.1.2}/ddapi/ddapi.egg-info/requires.txt

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ddapi"
-version = "0.1.1"
+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.1 → ddapi-0.1.2}/setup.cfg

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

{ddapi-0.1.1 → 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.1/ddapi/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")