TornAPIWrapper 2.9.0__tar.gz → 2.9.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {tornapiwrapper-2.9.0/src/TornAPIWrapper.egg-info → tornapiwrapper-2.9.1}/PKG-INFO +1 -1
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/__init__.py +1 -1
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/client.py +7 -3
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/client_async.py +7 -3
- tornapiwrapper-2.9.1/src/TornAPIWrapper/text_response_endpoints.py +1 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1/src/TornAPIWrapper.egg-info}/PKG-INFO +1 -1
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper.egg-info/SOURCES.txt +1 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/LICENSE +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/README.md +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/pyproject.toml +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/setup.cfg +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/__main__.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/__init__.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/company.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/faction.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/forum.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/key.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/market.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/property.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/racing.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/torn.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints/user.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/__init__.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/company.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/faction.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/forum.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/key.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/market.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/property.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/racing.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/torn.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/user.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/errors.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/params/__init__.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/params/builders.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/params/map.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/type_hints.py +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper.egg-info/dependency_links.txt +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper.egg-info/requires.txt +0 -0
- {tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper.egg-info/top_level.txt +0 -0
|
@@ -35,6 +35,8 @@ from .endpoints.racing import Racing
|
|
|
35
35
|
from .endpoints.torn import Torn
|
|
36
36
|
from .endpoints.user import User
|
|
37
37
|
from .errors import TornAPIErrorHandler
|
|
38
|
+
from .text_response_endpoints import text_response_endpoints
|
|
39
|
+
|
|
38
40
|
|
|
39
41
|
class TornAPIWrapper:
|
|
40
42
|
"""
|
|
@@ -59,16 +61,18 @@ class TornAPIWrapper:
|
|
|
59
61
|
self.key: Key = Key(self)
|
|
60
62
|
self.torn: Torn = Torn(self)
|
|
61
63
|
|
|
62
|
-
def request(self, endpoint: str, params: dict | None) -> dict:
|
|
64
|
+
def request(self, endpoint: str, params: dict | None) -> dict | str:
|
|
63
65
|
"""
|
|
64
|
-
Sends a request to the Torn API and returns
|
|
66
|
+
Sends a request to the Torn API and returns either JSON data or raw text.
|
|
65
67
|
:param endpoint: Torn API endpoint path.
|
|
66
68
|
:param params: Query parameters to include in the request.
|
|
67
69
|
:return: API response data.
|
|
68
|
-
:rtype: dict
|
|
70
|
+
:rtype: dict | str
|
|
69
71
|
"""
|
|
70
72
|
api_request = self.session.get(url=f"{self.BASE_URL}{endpoint}", params=params, timeout=self.request_timeout)
|
|
71
73
|
api_request.raise_for_status()
|
|
74
|
+
if endpoint in text_response_endpoints:
|
|
75
|
+
return api_request.text
|
|
72
76
|
api_request_json = api_request.json()
|
|
73
77
|
api_request_error = api_request_json.get("error")
|
|
74
78
|
if api_request_error:
|
|
@@ -35,6 +35,8 @@ from .endpoints_async.racing import Racing
|
|
|
35
35
|
from .endpoints_async.torn import Torn
|
|
36
36
|
from .endpoints_async.user import User
|
|
37
37
|
from .errors import TornAPIErrorHandler
|
|
38
|
+
from .text_response_endpoints import text_response_endpoints
|
|
39
|
+
|
|
38
40
|
|
|
39
41
|
class TornAPIWrapperAsync:
|
|
40
42
|
"""
|
|
@@ -65,16 +67,18 @@ class TornAPIWrapperAsync:
|
|
|
65
67
|
self.key: Key = Key(self)
|
|
66
68
|
self.torn: Torn = Torn(self)
|
|
67
69
|
|
|
68
|
-
async def request(self, endpoint: str, params: dict | None) -> dict:
|
|
70
|
+
async def request(self, endpoint: str, params: dict | None) -> dict | str:
|
|
69
71
|
"""
|
|
70
|
-
Sends a request to the Torn API and returns
|
|
72
|
+
Sends a request to the Torn API and returns either JSON data or raw text.
|
|
71
73
|
:param endpoint: Torn API endpoint path.
|
|
72
74
|
:param params: Query parameters to include in the request.
|
|
73
75
|
:return: API response data.
|
|
74
|
-
:rtype: dict
|
|
76
|
+
:rtype: dict | str
|
|
75
77
|
"""
|
|
76
78
|
async with self.session.get(url=f"{self.BASE_URL}{endpoint}", params=params) as api_request:
|
|
77
79
|
api_request.raise_for_status()
|
|
80
|
+
if endpoint in text_response_endpoints:
|
|
81
|
+
return await api_request.text()
|
|
78
82
|
api_request_json = await api_request.json()
|
|
79
83
|
api_request_error = api_request_json.get("error")
|
|
80
84
|
if api_request_error:
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
text_response_endpoints = {"/company/snapshot"}
|
|
@@ -6,6 +6,7 @@ src/TornAPIWrapper/__main__.py
|
|
|
6
6
|
src/TornAPIWrapper/client.py
|
|
7
7
|
src/TornAPIWrapper/client_async.py
|
|
8
8
|
src/TornAPIWrapper/errors.py
|
|
9
|
+
src/TornAPIWrapper/text_response_endpoints.py
|
|
9
10
|
src/TornAPIWrapper/type_hints.py
|
|
10
11
|
src/TornAPIWrapper.egg-info/PKG-INFO
|
|
11
12
|
src/TornAPIWrapper.egg-info/SOURCES.txt
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper/endpoints_async/property.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{tornapiwrapper-2.9.0 → tornapiwrapper-2.9.1}/src/TornAPIWrapper.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|