trd-utils 0.0.30__py3-none-any.whl → 0.0.32__py3-none-any.whl

trd_utils/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = "0.0.30"
+__version__ = "0.0.32"
 

trd_utils/exchanges/blofin/blofin_client.py

@@ -59,6 +59,8 @@ class BlofinClient(ExchangeBase):
         self.account_name = account_name
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
+        
+        super().__init__()
 
         if read_session_file:
             self.read_from_session_file(f"{sessions_dir}/{self.account_name}.bf")

trd_utils/exchanges/bx_ultra/bx_types.py

@@ -636,6 +636,17 @@ class CopyTraderResumeResult(BaseModel):
     swap_copy_trade_label_type: int = None
     is_pro: int = None
 
+    def get_account_identity_by_filter(self, filter_text: str):
+        if not self.trader_sharing_accounts:
+            return 0
+        
+        for current in self.trader_sharing_accounts:
+            if current.display_name.lower().find(filter_text) != -1 or \
+                current.copy_trade_account_enum.lower().find(filter_text) != -1:
+                if current.api_identity:
+                    return current.api_identity
+        return 0
+
 
 class CopyTraderResumeResponse(BxApiResponse):
     data: CopyTraderResumeResult = None

trd_utils/exchanges/bx_ultra/bx_ultra_client.py

@@ -124,14 +124,12 @@ class BXUltraClient(ExchangeBase):
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
 
+        super().__init__()
         self.read_from_session_file(
             file_path=f"{self.sessions_dir}/{self.account_name}.bx"
         )
         self.__last_candle_storage = {}
         self.__last_candle_lock = asyncio.Lock()
-        self._internal_lock = asyncio.Lock()
-        self.extra_tasks = []
-        self.ws_connections = []
 
     # endregion
     ###########################################################
@@ -310,11 +308,12 @@ class BXUltraClient(ExchangeBase):
             async for msg in ws:
                 try:
                     decompressed_message = gzip.decompress(msg)
-                    if decompressed_message.lower() == "ping":
+                    str_msg = decompressed_message.decode("utf-8")
+                    if str_msg.lower() == "ping":
                         await ws.send("Pong")
                         continue
 
-                    data: dict = json.loads(decompressed_message, parse_float=Decimal)
+                    data: dict = json.loads(str_msg, parse_float=Decimal)
                     if not isinstance(data, dict):
                         logger.warning(f"invalid data instance: {type(data)}")
                         continue
@@ -702,6 +701,7 @@ class BXUltraClient(ExchangeBase):
     async def get_trader_api_identity(
         self,
         uid: int | str,
+        sub_account_filter: str = "futures",
     ) -> int | str:
         global user_api_identity_cache
         api_identity = user_api_identity_cache.get(uid, None)
@@ -710,6 +710,12 @@ class BXUltraClient(ExchangeBase):
                 uid=uid,
             )
             api_identity = resume.data.api_identity
+            if not api_identity:
+                # second try: try to use one of the sub-accounts' identity
+                api_identity = resume.data.get_account_identity_by_filter(sub_account_filter)
+
+            # maybe also try to fetch it in other ways later?
+            # ...
             user_api_identity_cache[uid] = api_identity
         return api_identity
 
@@ -838,7 +844,8 @@ class BXUltraClient(ExchangeBase):
         aes = AESCipher(key=f"bx_{self.account_name}_bx", fav_letter=self._fav_letter)
         target_path = Path(file_path)
         if not target_path.exists():
-            target_path.mkdir(parents=True)
+            target_path.parent.mkdir(parents=True, exist_ok=True)
+            target_path.touch()
         target_path.write_text(aes.encrypt(json.dumps(json_data)))
 
     # endregion
@@ -848,10 +855,17 @@ class BXUltraClient(ExchangeBase):
     async def get_unified_trader_positions(
         self,
         uid: int | str,
+        api_identity: int | str | None = None,
+        sub_account_filter: str = "futures",
     ) -> UnifiedTraderPositions:
-        api_identity = await self.get_trader_api_identity(
-            uid=uid,
-        )
+        if not api_identity:
+            api_identity = await self.get_trader_api_identity(
+                uid=uid,
+                sub_account_filter=sub_account_filter,
+            )
+        
+        if not api_identity:
+            raise ValueError(f"Failed to fetch api_identity for user {uid}")
 
         result = await self.get_copy_trader_positions(
             uid=uid,

trd_utils/exchanges/exchange_base.py

@@ -66,7 +66,15 @@ class ExchangeBase(ABC):
     ws_connections: list[WSConnection] = None
     # endregion
     ###########################################################
+    # region constructor method
 
+    def __init__(self):
+        self._internal_lock = asyncio.Lock()
+        self.extra_tasks = []
+        self.ws_connections = []
+
+    # endregion
+    ###########################################################
     # region abstract trading methods
 
     async def get_unified_trader_positions(
@@ -96,7 +104,6 @@ class ExchangeBase(ABC):
         )
 
     # endregion
-
     ###########################################################
     # region client helper methods
     def get_headers(self, payload=None, needs_auth: bool = False) -> dict:

trd_utils/exchanges/hyperliquid/hyperliquid_client.py

@@ -47,6 +47,8 @@ class HyperLiquidClient(ExchangeBase):
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
 
+        super().__init__()
+
         if read_session_file:
             self.read_from_session_file(f"{sessions_dir}/{self.account_name}.hl")
 

trd_utils/exchanges/okx/okx_client.py

@@ -55,6 +55,8 @@ class OkxClient(ExchangeBase):
         self._fav_letter = fav_letter
         self.sessions_dir = sessions_dir
 
+        super().__init__()
+
         if read_session_file:
             self.read_from_session_file(f"{sessions_dir}/{self.account_name}.okx")
 

{trd_utils-0.0.30.dist-info → trd_utils-0.0.32.dist-info}/METADATA

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

{trd_utils-0.0.30.dist-info → trd_utils-0.0.32.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trd_utils/__init__.py,sha256=yHJ8D3i2dO26rZPCv6zktwpCzBAZJncL4kRz1UsG-Po,25
+trd_utils/__init__.py,sha256=5mjXdrdRYpXTN4Y1ocvl6aDC56jkrCDAO1vGFM9PsPw,25
 trd_utils/cipher/__init__.py,sha256=V05KNuzQwCic-ihMVHlC8sENaJGc3I8MCb4pg4849X8,1765
 trd_utils/common_utils/float_utils.py,sha256=aYPwJ005LmrRhXAngojwvdDdtRgeb1FfR6hKeQ5ndMU,470
 trd_utils/common_utils/wallet_utils.py,sha256=OX9q2fymP0VfIWTRIRBP8W33cfyjLXimxMgPOsZe-3g,727
@@ -8,20 +8,20 @@ trd_utils/exchanges/README.md,sha256=UwkpsfcoLCJaMvJe4yBsFkDpf8P6DOLYhtybb6xWMLc
 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=x0CU75_wWRA6RmVfm2wh7y-jNjohpcMG6HJ1tqkD1ok,12342
+trd_utils/exchanges/blofin/blofin_client.py,sha256=RJcyET62cjxczEdHqQ-Cy6CT8veJYio_efublNBvEo8,12378
 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=oEXd825UVTINiQTKuUsJqG0qUo4bkl4Bay6cEDOAS_g,34532
-trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=rSGq95C7OmN44W9K7rAMLMMCL8vys-9TnO6Dmc7BOoo,33787
+trd_utils/exchanges/bx_ultra/bx_types.py,sha256=qg_MoaZRpfRf29Eh-W0JXUklQWt5ckoP-Ktk4faX9io,34985
+trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=w4VNjNjp5h-GLRMheWl8uU_KPWL7FrhV5TwbfQiyo3A,34432
 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=6vlwQXogZaxg1wNgZWvGZ0BYv0hfjdQNdXBpV-tvHkE,7665
+trd_utils/exchanges/exchange_base.py,sha256=c9SV-XyZNonbPa8DDujHGSF4CR-iweGUojsPGvphjlU,7909
 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=dE-WIj1_H_5qHnO2Uu4DBVl1qEPdLdQFJW0IIwia1UM,6804
+trd_utils/exchanges/hyperliquid/hyperliquid_client.py,sha256=FOOEDY1wOvyDlUcnSHf0Vp-8KNK2_AkI6Z7h3lls3Co,6832
 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=M6P1lDJ2UDqT7WMvXgiK4BbUwa73OHvh-8Dbo51oOqo,7118
+trd_utils/exchanges/okx/okx_client.py,sha256=lUf507ovd4D3fI7Z3Iy1fGvxNJWdm4wTcdzTCkMw13U,7146
 trd_utils/exchanges/okx/okx_types.py,sha256=IkFOfgivcvvIw950jyGHAVfFFGbGqfZcYGfZLWfNLvc,5013
 trd_utils/html_utils/__init__.py,sha256=1WWs8C7JszRjTkmzIRLHpxWECHur_DrulTPGIeX88oM,426
 trd_utils/html_utils/html_formats.py,sha256=unKsvOiiDmYTTaM0DYZEUNLEUzWQKKrqASJXvY54kvU,2299
@@ -30,7 +30,7 @@ trd_utils/tradingview/tradingview_client.py,sha256=g_eWYaCRQAL8Kvd-r6AnAdbH7Jha6
 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.30.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.30.dist-info/METADATA,sha256=uM6m-5n_NAzTrGqOgkVRlZHmUmqy-cwaZi-zDNJaen4,1179
-trd_utils-0.0.30.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.30.dist-info/RECORD,,
+trd_utils-0.0.32.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.32.dist-info/METADATA,sha256=iqiiINJSXF-3P6x455gGj8HLQYJ-Qx6mKXl-HFBMe_A,1179
+trd_utils-0.0.32.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.32.dist-info/RECORD,,