trd-utils 0.0.34__py3-none-any.whl → 0.0.35__py3-none-any.whl

trd_utils/exchanges/README.md

@@ -48,11 +48,13 @@ class MyExchangeClient(ExchangeBase):
         fav_letter: str = "^",
         read_session_file: bool = True,
         sessions_dir: str = "sessions",
+        use_http1: bool = False,
+        use_http2: bool = True,
     ):
         self.httpx_client = httpx.AsyncClient(
             verify=http_verify,
-            http2=True,
-            http1=False,
+            http1=use_http1,
+            http2=use_http2,
         )
         self.account_name = account_name
         self._fav_letter = fav_letter

trd_utils/exchanges/blofin/blofin_client.py

@@ -51,16 +51,19 @@ class BlofinClient(ExchangeBase):
         fav_letter: str = "^",
         read_session_file: bool = True,
         sessions_dir: str = "sessions",
+        use_http1: bool = False,
+        use_http2: bool = True,
     ):
         self.httpx_client = httpx.AsyncClient(
             verify=http_verify,
-            http2=True,
-            http1=False,
+            http1=use_http1,
+            http2=use_http2,
         )
         self.account_name = account_name
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
-        
+        self.exchange_name = "blofin"
+
         super().__init__()
 
         if read_session_file:

trd_utils/exchanges/bx_ultra/bx_ultra_client.py

@@ -114,9 +114,13 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
         http_verify: bool = True,
         fav_letter: str = "^",
         sessions_dir: str = "sessions",
+        use_http1: bool = False,
+        use_http2: bool = True,
     ):
         self.httpx_client = httpx.AsyncClient(
-            verify=http_verify, http2=True, http1=False
+            verify=http_verify,
+            http1=use_http1,
+            http2=use_http2,
         )
         self.account_name = account_name
         self.platform_id = platform_id
@@ -124,6 +128,7 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
         self.app_version = app_version
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
+        self.exchange_name = "\u0062ing\u0078"
 
         super().__init__()
         self.read_from_session_file(
@@ -301,6 +306,8 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
                 await self._do_price_ws(
                     url=url,
                 )
+            except asyncio.CancelledError:
+                return
             except Exception as ex:
                 err_str = f"{ex}"
                 if err_str.find("Event loop is closed") != -1:
@@ -308,6 +315,7 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
                     return
 
                 logger.warning(f"error at _do_price_ws: {err_str}")
+                await asyncio.sleep(1)
 
     async def _do_price_ws(self, url: str):
         async with websockets.connect(url, ping_interval=None) as ws:

trd_utils/exchanges/exchange_base.py

@@ -52,6 +52,9 @@ class ExchangeBase(ABC):
     install_channel: str = "officialAPK"
     channel_header: str = "officialAPK"
 
+    # The name of the exchange.
+    exchange_name: str = None
+
     jwt_manager: JWTManager = None
 
     _fav_letter: str = "^"

trd_utils/exchanges/hyperliquid/hyperliquid_client.py

@@ -46,6 +46,7 @@ class HyperLiquidClient(ExchangeBase):
         self.account_name = account_name
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
+        self.exchange_name = "hyperliquid"
 
         super().__init__()
 

trd_utils/exchanges/okx/okx_client.py

@@ -54,6 +54,7 @@ class OkxClient(ExchangeBase):
         self.account_name = account_name
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
+        self.exchange_name = "okx"
 
         super().__init__()
 

trd_utils/exchanges/price_fetcher.py

@@ -1,6 +1,9 @@
 
 
+from datetime import datetime
 from decimal import Decimal
+
+import pytz
 from trd_utils.types_helper import BaseModel
 
 
@@ -20,6 +23,13 @@ class MinimalCandleInfo(BaseModel):
     # volume in the second part of the pair (e.g. USDT).
     quote_volume: Decimal = None
 
+    # The time this candle info was retrieved.
+    fetched_at: datetime = None
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.fetched_at = datetime.now(tz=pytz.UTC)
+
 
 class IPriceFetcher:
     """
@@ -35,4 +45,4 @@ class IPriceFetcher:
         pass
 
     async def get_last_candle(self, pair: str) -> MinimalCandleInfo:
-        pass
+        pass

trd_utils/types_helper/base_model.py

@@ -212,7 +212,6 @@ def convert_to_ultra_list(value: Any) -> UltraList:
 class BaseModel:
     def __init__(self, **kwargs):
         annotations = get_my_field_types(self)
-        # annotations = self.__annotations__
         for key, value in kwargs.items():
             corrected_key = key
             if key not in annotations:

{trd_utils-0.0.34.dist-info → trd_utils-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: trd_utils
-Version: 0.0.34
+Version: 0.0.35
 Summary: Common Basic Utils for Python3. By ALiwoto.
 Keywords: utils,trd_utils,basic-utils,common-utils
 Author: ALiwoto

{trd_utils-0.0.34.dist-info → trd_utils-0.0.35.dist-info}/RECORD

@@ -4,34 +4,34 @@ trd_utils/common_utils/float_utils.py,sha256=aYPwJ005LmrRhXAngojwvdDdtRgeb1FfR6h
 trd_utils/common_utils/wallet_utils.py,sha256=OX9q2fymP0VfIWTRIRBP8W33cfyjLXimxMgPOsZe-3g,727
 trd_utils/date_utils/__init__.py,sha256=Erg_E1TfKWNpiuZFm_NXRjCwoRMfxpPS2-mJK6V4lFM,77
 trd_utils/date_utils/datetime_helpers.py,sha256=euIJBr-6PfJzLScOC9xVXd8Re_Gw5CSBPwtHX9_Il4A,596
-trd_utils/exchanges/README.md,sha256=UwkpsfcoLCJaMvJe4yBsFkDpf8P6DOLYhtybb6xWMLc,6738
+trd_utils/exchanges/README.md,sha256=8egE4IPUQ3_UtiGP6GaCg50xq_dp43aGY_X1lKcO6ok,6812
 trd_utils/exchanges/__init__.py,sha256=sZRyp24q0KyMYASshAfsP-AfvsCADTYqqefxiRulPKE,484
 trd_utils/exchanges/base_types.py,sha256=NGykHGyY97mcc4gqxa0RLNElro0y3cQsdSCM1XAtIz8,3625
 trd_utils/exchanges/blofin/__init__.py,sha256=X4r9o4Nyjla4UeOBG8lrgtnGYO2aErFMKaJ7yQrFasE,76
-trd_utils/exchanges/blofin/blofin_client.py,sha256=UMPxgGtAiImEjNbAQ3cDqu0Tw9BtKndcj92_2S55HEY,12904
+trd_utils/exchanges/blofin/blofin_client.py,sha256=j3E9fdz06x3T4fA0SmS0PxopE4qNc1kSuj2UxGazodQ,13008
 trd_utils/exchanges/blofin/blofin_types.py,sha256=ZlHX1ClYTd2pDRTQIlZYyBu5ReGpMgxXxKASsPeBQug,4090
 trd_utils/exchanges/bx_ultra/__init__.py,sha256=8Ssy-eOemQR32Nv1-FoPHm87nRqRO4Fm2PU5GHEFKfQ,80
 trd_utils/exchanges/bx_ultra/bx_types.py,sha256=hRe8DfF3sdXlMdk-knwWx4XpZUp1rITpXPnUDtiy93o,34715
-trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=Wdfg34goiMeJEGd5T-thouXEC_2Gacs8ixiSJ0rcojg,34726
+trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=MKL2nKMjWy_aIFQKtY62gwODISEfAsGnD58SElUx6Q8,34977
 trd_utils/exchanges/bx_ultra/bx_utils.py,sha256=PwapomwDW33arVmKIDj6cL-aP0ptu4BYy_lOCqSAPOo,1392
 trd_utils/exchanges/errors.py,sha256=P_NTuc389XL7rFegomP59BydWmHv8ckiGyNU-_l5qNQ,167
-trd_utils/exchanges/exchange_base.py,sha256=wJV966YYw6BQnB7hr9Cgy3a4FHg8_jyWeaidJgzCA7Q,7772
+trd_utils/exchanges/exchange_base.py,sha256=Zn5y4bymK53ENVLjYnQadS61SZKs8BGoZ4jfsY4GOcE,7835
 trd_utils/exchanges/hyperliquid/README.md,sha256=-qaxmDt_9NTus2xRuzyFGkKgYDWgWk7ufHVTSkyn3t4,105
 trd_utils/exchanges/hyperliquid/__init__.py,sha256=QhwGRcneGFHREM-MMdYpbcx-aWdsWsu2WznHzx7LaUM,92
-trd_utils/exchanges/hyperliquid/hyperliquid_client.py,sha256=FOOEDY1wOvyDlUcnSHf0Vp-8KNK2_AkI6Z7h3lls3Co,6832
+trd_utils/exchanges/hyperliquid/hyperliquid_client.py,sha256=-aBtgTjXJyI9n4kmDQIlm4Ip00SAwgURJ-ztZxuCRTM,6875
 trd_utils/exchanges/hyperliquid/hyperliquid_types.py,sha256=MiGG5fRU7wHqOMtCzQXD1fwwbeUK1HEcQwW5rl-9D4c,2678
 trd_utils/exchanges/okx/__init__.py,sha256=OjVpvcwB9mrCTofLt14JRHV2-fMAzGz9-YkJAMwl6dM,67
-trd_utils/exchanges/okx/okx_client.py,sha256=lUf507ovd4D3fI7Z3Iy1fGvxNJWdm4wTcdzTCkMw13U,7146
+trd_utils/exchanges/okx/okx_client.py,sha256=zrWGs8H8oU_ZrP-nY5g5p3iaIZUJs_oozFa0HExS6EU,7181
 trd_utils/exchanges/okx/okx_types.py,sha256=IkFOfgivcvvIw950jyGHAVfFFGbGqfZcYGfZLWfNLvc,5013
-trd_utils/exchanges/price_fetcher.py,sha256=Jjrlnis-9fFOYR-7T8T0Dkzi63gSN7gSLkehjbbldEg,1074
+trd_utils/exchanges/price_fetcher.py,sha256=YHLkM6sCvHGFS_4t188Sl3DczqrarK-1ivGwZEVsom4,1320
 trd_utils/html_utils/__init__.py,sha256=1WWs8C7JszRjTkmzIRLHpxWECHur_DrulTPGIeX88oM,426
 trd_utils/html_utils/html_formats.py,sha256=unKsvOiiDmYTTaM0DYZEUNLEUzWQKKrqASJXvY54kvU,2299
 trd_utils/tradingview/__init__.py,sha256=H0QYb-O5qvy7qC3yswtlcSWLmeBnaS6oJ3JtjvmaV_Y,154
 trd_utils/tradingview/tradingview_client.py,sha256=g_eWYaCRQAL8Kvd-r6AnAdbH7Jha6C_GAyCuxh-RQUU,3917
 trd_utils/tradingview/tradingview_types.py,sha256=z21MXPVdWHAduEl3gSeMIRhxtBN9yK-jPYHfZSMIbSA,6144
 trd_utils/types_helper/__init__.py,sha256=lLbUiW1jUV1gjzTMFLthwkvF0hwauH-F_J2JZq--1U0,67
-trd_utils/types_helper/base_model.py,sha256=Q2KK0r4UXP9PlWeIl6nxdAeCGB5InU5IkTNGAfJasfM,11808
-trd_utils-0.0.34.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.34.dist-info/METADATA,sha256=H9rMPrA7U_x3IGEHWivudi9ixFtXr9bKvDqarQgM8SM,1179
-trd_utils-0.0.34.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.34.dist-info/RECORD,,
+trd_utils/types_helper/base_model.py,sha256=dknzoq6iAUOb0n_yhI5mU3So-F_8d5ykGk3EbrERLnM,11763
+trd_utils-0.0.35.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.35.dist-info/METADATA,sha256=h6uD6uuSfYbor9unNO36-sxv4uxdpdhCKBIqJfNeygM,1179
+trd_utils-0.0.35.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.35.dist-info/RECORD,,