unicex 0.1.15__py3-none-any.whl → 0.1.16__py3-none-any.whl

unicex/_base/asyncio/client.py

@@ -1,6 +1,7 @@
 __all__ = ["BaseClient"]
 
 import asyncio
+import json
 from itertools import cycle
 from typing import Any, Self
 
@@ -169,27 +170,45 @@ class BaseClient:
         Возвращает:
             `dict | list`: Ответ API в формате JSON.
         """
+        response_text = await response.text()
+        status_code = response.status
+
+        # Парсинг JSON
         try:
-            response.raise_for_status()
-        except Exception as e:
-            response_text = await response.text()
+            response_json = json.loads(response_text)
+        except json.JSONDecodeError as e:
             raise ResponseError(
-                f"HTTP error: {e}. Response: {response_text}. Status code: {response.status}"
-            ) from e
+                f"JSONDecodeError: {e}. Response: {response_text}. Status code: {response.status}",
+                status_code=status_code,
+                response_text=response_text,
+            ) from None
 
+        # Проверка HTTP-статуса
         try:
-            result = await response.json()
+            response.raise_for_status()
         except Exception as e:
+            error_code = next(
+                (
+                    response_json[k]
+                    for k in ("code", "err_code", "errCode", "status")
+                    if k in response_json
+                ),
+                "",
+            )
             raise ResponseError(
-                f"JSONDecodeError error: {e}. Response: {response.text}. Status code: {response.status}"
-            ) from e
-
+                f"HTTP error: {e}. Response: {response_json}. Status code: {response.status}",
+                status_code=status_code,
+                code=error_code,
+                response_text=response_text,
+                response_json=response_json,
+            ) from None
+
+        # Логирование ответа
         try:
-            result_str: str = str(result)
             self._logger.debug(
-                f"Response: {result_str[:100]}{'...' if len(result_str) > 100 else ''}"
+                f"Response: {response_text[:300]}{'...' if len(response_text) > 300 else ''}"
             )
         except Exception as e:
-            self._logger.error(f"Error while log response: {e}")
+            self._logger.error(f"Error while logging response: {e}")
 
-        return result
+        return response_json

unicex/_base/sync/client.py

@@ -1,5 +1,6 @@
 __all__ = ["BaseClient"]
 
+import json
 import time
 from itertools import cycle
 from typing import Any, Self
@@ -133,37 +134,53 @@ class BaseClient:
         ) from errors[-1]
 
     def _handle_response(self, response: requests.Response) -> Any:
-        """Обрабатывает HTTP‑ответ.
+        """Обрабатывает HTTP-ответ.
 
         Параметры:
-            response (`requests.Response`): Ответ HTTP‑запроса.
+            response (`requests.Response`): Ответ HTTP-запроса.
 
         Возвращает:
             `dict | list`: Ответ API в формате JSON.
         """
+        response_text = response.text
+        status_code = response.status_code
+
+        # Парсинг JSON
         try:
-            response.raise_for_status()
-        except Exception as e:
+            response_json = json.loads(response_text)
+        except json.JSONDecodeError as e:
             raise ResponseError(
-                f"HTTP error: {e}. Response: {response.text}. Status code: {response.status_code}"
-            ) from e
-
-        if not response.content:
-            raise ResponseError(f"Empty response. Status code: {response.status_code}")
+                f"JSONDecodeError: {e}. Response: {response_text}. Status code: {status_code}",
+                status_code=status_code,
+                response_text=response_text,
+            ) from None
 
+        # Проверка HTTP-статуса
         try:
-            result = response.json()
-        except requests.exceptions.JSONDecodeError as e:
+            response.raise_for_status()
+        except Exception as e:
+            error_code = next(
+                (
+                    response_json[k]
+                    for k in ("code", "err_code", "errCode", "status")
+                    if k in response_json
+                ),
+                "",
+            )
             raise ResponseError(
-                f"JSONDecodeError error: {e}. Response: {response.text}. Status code: {response.status_code}"
-            ) from e
-
+                f"HTTP error: {e}. Response: {response_json}. Status code: {status_code}",
+                status_code=status_code,
+                code=error_code,
+                response_text=response_text,
+                response_json=response_json,
+            ) from None
+
+        # Логирование ответа
         try:
-            result_str: str = str(result)
             self._logger.debug(
-                f"Response: {result_str[:100]}{'...' if len(result_str) > 100 else ''}"
+                f"Response: {response_text[:300]}{'...' if len(response_text) > 300 else ''}"
             )
         except Exception as e:
-            self._logger.error(f"Error while log response: {e}")
+            self._logger.error(f"Error while logging response: {e}")
 
-        return result
+        return response_json

unicex/bitget/_mixins/client.py

@@ -74,6 +74,7 @@ class ClientMixin:
                     "ACCESS-PASSPHRASE": self._api_passphrase,  # type: ignore[attr-defined]
                     "ACCESS-TIMESTAMP": timestamp,
                     "ACCESS-SIGN": signature,
+                    "locale": "en-US",
                 }
             )
         return headers

unicex/exceptions.py

@@ -1,6 +1,6 @@
 """Модуль,который описывает исключения и ошибки, которые могут возникнуть при работе с библиотекой."""
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 
 @dataclass
@@ -43,4 +43,22 @@ class QueueOverflowError(UniCexException):
 class ResponseError(UniCexException):
     """Исключение, возникающее при ошибке ответа."""
 
-    pass
+    status_code: int
+    code: str = ""  # "" - means undefined
+    response_json: dict = field(default_factory=dict)
+    response_text: str = ""
+
+    def __str__(self) -> str:
+        """Возвращает строковое представление исключения."""
+        if self.response_json:
+            preview = str(self.response_json)
+            if len(preview) > 500:
+                preview = preview[:500] + "..."
+            return f"ResponseError: status_code={self.status_code}, code={self.code}, response_json: {preview}"
+        elif self.response_text:
+            preview = str(self.response_text)
+            if len(preview) > 500:
+                preview = preview[:500] + "..."
+            return f"ResponseError: status_code={self.status_code}, code={self.code}, response_text: {preview}"
+        else:
+            return f"ResponseError: status_code={self.status_code}, code={self.code}"

{unicex-0.1.15.dist-info → unicex-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unicex
-Version: 0.1.15
+Version: 0.1.16
 Summary: Unified Crypto Exchange API 
 Author-email: LoveBloodAndDiamonds <ayazshakirzyanov27@gmail.com>
 License: BSD 3-Clause License

{unicex-0.1.15.dist-info → unicex-0.1.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
 unicex/__init__.py,sha256=LkRQxl60i91NZqLEOgOquh60tK73M31WaorxMUsS4-k,1372
 unicex/enums.py,sha256=wce1tN1qUIbx2seOzLh64kr0c5qyfji4FW7Qf2Crzp4,4215
-unicex/exceptions.py,sha256=Sl-MkTq1WhmGZbkjm-Hwn3Bn5dDH5V1Sr5QD_iOsEZw,1289
+unicex/exceptions.py,sha256=r-xZzX78VuxVnI5pe99AM8FIiGcdIUDcF5CaTkQ4NE0,2213
 unicex/extra.py,sha256=qgN0RH0g7V5Ve30bsYageiL3gAyxplU1wk7XLmzFXWo,6805
 unicex/mapper.py,sha256=Ymasn7zq5W0A1WEsIHO3st1FgeryvD7-ShWEi5kr9Mk,4658
 unicex/types.py,sha256=j74BbMxpraWg2Nncu6Fqtec0BPs_gRKiuIfR_A7DxEg,2171
@@ -15,10 +15,10 @@ unicex/_abc/sync/uni_client.py,sha256=ZKltLNHtinj1aepknk8Neh7EOPhJj0jHcBMkVHyG_a
 unicex/_abc/sync/uni_websocket_manager.py,sha256=MPGZfcC1FLcsRIvKj2yQHaK1nwSBo-KpSnIeuVcBE2c,9731
 unicex/_base/__init__.py,sha256=SMe2SLh94RNJbdI-w_CmaXA0479nCBJfbxOApKT5Iak,90
 unicex/_base/asyncio/__init__.py,sha256=ckqI6LVP3DHuIiLXKx67rJyG0SEEsPnBr8uk1Dw9cwg,114
-unicex/_base/asyncio/client.py,sha256=ba87j1vpku5O24a9wsYQgf776OGUX85soLgUChBCwss,8223
+unicex/_base/asyncio/client.py,sha256=Na6yIOCvuQgLzLeO5fOtsxZ0M71UMcYXIJA4ADFqYyU,8894
 unicex/_base/asyncio/websocket.py,sha256=VANQYJKVv75t85dL1JePO77IbdsHC6h8d9_8jjwCh-4,10016
 unicex/_base/sync/__init__.py,sha256=ckqI6LVP3DHuIiLXKx67rJyG0SEEsPnBr8uk1Dw9cwg,114
-unicex/_base/sync/client.py,sha256=A-c-M4tXSlUX_4hlqjwL5zm_yjtRkAEqcqc3xw49T6A,6648
+unicex/_base/sync/client.py,sha256=sYEJP-DHH4alWoFHbCvNWUH5WRvt3QYzC0Vyp5uQcgg,7202
 unicex/_base/sync/websocket.py,sha256=tSTmZZFkbtcI1FWME__AkiMjcu3xNaRA0a0HoAnhkE0,10156
 unicex/binance/__init__.py,sha256=prW16sT_wNyu2Cx9w2Dndsu-kW6qsy_Cs5qP2XMBljo,446
 unicex/binance/adapter.py,sha256=f20XKuXdaWTBkFAfLgFXIuQoJwL_56-WMASzunV4TKo,14305
@@ -43,7 +43,7 @@ unicex/bitget/__init__.py,sha256=C0H2WB8HZiRZKqKkF3_d09I5guqQpzj8sLbZDaS_-Gs,192
 unicex/bitget/adapter.py,sha256=eyyt1L_VnlW_l2tQ4Ymut4eyYqfdNzNV2MvX6V7g_mQ,11589
 unicex/bitget/types.py,sha256=m-QJdZYaD08XmGpY25eciOK7PRLI4KjheTn5MBR15Gk,2022
 unicex/bitget/_mixins/__init__.py,sha256=DUS9aZ2LeI4DOHUxFGwoB8s_45smA5KFpt5kQ7HAZ6c,148
-unicex/bitget/_mixins/client.py,sha256=lXmvLrcWT1v3XHNuHgfsxQ_3V-i0MtXLwMyPZ8Ya6Jg,5149
+unicex/bitget/_mixins/client.py,sha256=mGwc4mLzyuub_UA9-7-cFzAltNFwXPSXpvempj9KB5I,5188
 unicex/bitget/_mixins/user_websocket.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unicex/bitget/_mixins/websocket_manager.py,sha256=JHuhJOYO0VtnIVSt34o3hfdjKTsYzJYovl9GRVwXJtM,1924
 unicex/bitget/asyncio/__init__.py,sha256=N798Z5m25xLz5x1yRhB0Y2UOYuJ0CAeNryM_OAHBqAk,242
@@ -59,8 +59,8 @@ unicex/bybit/types.py,sha256=gCuzL_casy9kYQ33Mc5hiFW4MjTiEEU7xva38PkkfRA,8016
 unicex/bybit/uni_client.py,sha256=x8e3m4IH-tDGyjNk4hnM7KBrZFkLglF-RI8AuIhKJjc,6908
 unicex/bybit/websocket.py,sha256=K48uwoF2wjy1McGGfmUGj1Q9s3DvSabNLViqgBAG9YQ,159
 unicex/bybit/websocket_manager.py,sha256=3FdZn7WPAFnKsnknjDvbDnbpgH8xMj_4v-ksW81c9d4,902
-unicex-0.1.15.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.1.15.dist-info/METADATA,sha256=m8NzKbMLshLZBqBq1PSWm4PWBDiQ2g00HI9D5ksE5bI,7158
-unicex-0.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.1.15.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.1.15.dist-info/RECORD,,
+unicex-0.1.16.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.1.16.dist-info/METADATA,sha256=Rj2_mCThWnvqfrtIaVI8jeMAw5UrnnoUv4PDf2Q_5gI,7158
+unicex-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.1.16.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.1.16.dist-info/RECORD,,