trd-utils 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

trd_utils/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = "0.0.7"
+__version__ = "0.0.9"
 

trd_utils/exchanges/blofin/blofin_client.py

@@ -1,3 +1,4 @@
+import asyncio
 from decimal import Decimal
 import json
 import logging
@@ -10,6 +11,8 @@ from pathlib import Path
 from trd_utils.exchanges.blofin.blofin_types import (
     BlofinApiResponse,
     CmsColorResponse,
+    CopyTraderAllOrderHistory,
+    CopyTraderAllOrderList,
     CopyTraderInfoResponse,
     CopyTraderOrderHistoryResponse,
     CopyTraderOrderListResponse,
@@ -89,9 +92,9 @@ class BlofinClient(ExchangeBase):
 
     async def get_copy_trader_order_list(
         self,
-        from_param: int,
-        limit_param: 0,
         uid: int,
+        from_param: int = 0,
+        limit_param: int = 20,
     ) -> CopyTraderOrderListResponse:
         payload = {
             "from": from_param,
@@ -106,11 +109,60 @@ class BlofinClient(ExchangeBase):
             model=CopyTraderOrderListResponse,
         )
     
+    async def get_copy_trader_all_order_list(
+        self,
+        uid: int,
+        from_param: int = 0,
+        chunk_limit: int = 20,
+        sleep_delay: int = 0.5,
+    ) -> CopyTraderAllOrderList:
+        if chunk_limit < 1:
+            raise ValueError("chunk_limit parameter has to be more than 1")
+
+        result = CopyTraderAllOrderList(
+            code=200,
+            data=[],
+            total_count=0,
+        )
+        current_id_from = from_param
+        while True:
+            total_ignored = 0
+            current_result = await self.get_copy_trader_order_list(
+                uid=uid,
+                from_param=current_id_from,
+                limit_param=chunk_limit,
+            )
+            if not current_result or not isinstance(current_result, CopyTraderOrderListResponse) or \
+                not current_result.data:
+                return result
+            
+            if current_result.data[0].id == current_id_from:
+                if len(current_result.data) < 2:
+                    return result
+                current_result.data = current_result.data[1:]
+                total_ignored += 1
+            elif current_id_from:
+                raise ValueError(
+                    "Expected first array to have the same value as from_param: "
+                    f"current_id_from: {current_id_from}; but was: {current_result.data[0].id}"
+                )
+            
+            current_id_from = current_result.data[-1].id
+            result.data.extend(current_result.data)
+            result.total_count += len(current_result.data)
+            if len(current_result.data) < chunk_limit - total_ignored:
+                # the trader doesn't have any more open orders
+                return result
+            if result.total_count > len(current_result.data) and sleep_delay:
+                # we don't want to sleep after 1 request only
+                await asyncio.sleep(sleep_delay)
+
+
     async def get_copy_trader_order_history(
         self,
-        from_param: int,
-        limit_param: 0,
         uid: int,
+        from_param: int = 0,
+        limit_param: int = 20,
     ) -> CopyTraderOrderHistoryResponse:
         payload = {
             "from": from_param,
@@ -125,6 +177,54 @@ class BlofinClient(ExchangeBase):
             model=CopyTraderOrderHistoryResponse,
         )
 
+    async def get_copy_trader_all_order_history(
+        self,
+        uid: int,
+        from_param: int = 0,
+        chunk_limit: int = 20,
+        sleep_delay: int = 0.5,
+    ) -> CopyTraderAllOrderHistory:
+        if chunk_limit < 1:
+            raise ValueError("chunk_limit parameter has to be more than 1")
+
+        result = CopyTraderAllOrderHistory(
+            code=200,
+            data=[],
+            total_count=0,
+        )
+        current_id_from = from_param
+        while True:
+            total_ignored = 0
+            current_result = await self.get_copy_trader_order_history(
+                uid=uid,
+                from_param=current_id_from,
+                limit_param=chunk_limit,
+            )
+            if not current_result or not isinstance(current_result, CopyTraderOrderHistoryResponse) or \
+                not current_result.data:
+                return result
+            
+            if current_result.data[0].id == current_id_from:
+                if len(current_result.data) < 2:
+                    return result
+                current_result.data = current_result.data[1:]
+                total_ignored += 1
+            elif current_id_from:
+                raise ValueError(
+                    "Expected first array to have the same value as from_param: "
+                    f"current_id_from: {current_id_from}; but was: {current_result.data[0].id}"
+                )
+            
+            current_id_from = current_result.data[-1].id
+            result.data.extend(current_result.data)
+            result.total_count += len(current_result.data)
+            if len(current_result.data) < chunk_limit - total_ignored:
+                # the trader doesn't have any more orders history
+                return result
+            if result.total_count > len(current_result.data) and sleep_delay:
+                # we don't want to sleep after 1 request only
+                await asyncio.sleep(sleep_delay)
+
     # endregion
     ###########################################################
     # region client helper methods

trd_utils/exchanges/blofin/blofin_types.py

@@ -139,6 +139,11 @@ class CopyTraderSingleOrderInfo(BaseModel):
 class CopyTraderOrderListResponse(BlofinApiResponse):
     data: list[CopyTraderSingleOrderInfo] = None
 
+class CopyTraderAllOrderList(CopyTraderOrderListResponse):
+    total_count: int = None
 
 class CopyTraderOrderHistoryResponse(BlofinApiResponse):
     data: list[CopyTraderSingleOrderInfo] = None
+
+class CopyTraderAllOrderHistory(CopyTraderOrderHistoryResponse):
+    total_count: int = None

trd_utils/types_helper/base_model.py

@@ -273,7 +273,7 @@ class BaseModel:
             if not isinstance(key, str):
                 continue
 
-            if key.startswith("__"):
+            if key.startswith("__") or key.startswith(f"_{self.__class__.__name__}__"):
                 # ignore private attributes
                 continue
 

{trd_utils-0.0.7.dist-info → trd_utils-0.0.9.dist-info}/METADATA

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

{trd_utils-0.0.7.dist-info → trd_utils-0.0.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
-trd_utils/__init__.py,sha256=T3fa9wcYqXeAC8vAZ1EjWWLpXmx9tFj9SvTgGPKVr4Y,24
+trd_utils/__init__.py,sha256=EtMikRqbxB479_heVdFOL4-tqL9aX5v56zrDcmFCRiE,24
 trd_utils/cipher/__init__.py,sha256=V05KNuzQwCic-ihMVHlC8sENaJGc3I8MCb4pg4849X8,1765
 trd_utils/common_utils/float_utils.py,sha256=W-jv7nzjl88xwGB6gsEXmDDhF6DseOrrVT2qx7OvyCo,266
 trd_utils/exchanges/__init__.py,sha256=SQJt5cIXh305miWuDumkOLZHzqDUyOqSmlhTT9Xc9RY,180
 trd_utils/exchanges/blofin/__init__.py,sha256=dQkY9aSbI5fZJDOSbkrbrbpHSbWbJjLEmjpkXxDMDD4,74
-trd_utils/exchanges/blofin/blofin_client.py,sha256=IPmTTT437UdLW-FiGwi6ZEEurjD_rc8VxvykNIEdQFs,7628
-trd_utils/exchanges/blofin/blofin_types.py,sha256=QlhgpBvFr-RwZB8agGwQSmhegw3__0TAsBg6oEXScYM,3664
+trd_utils/exchanges/blofin/blofin_client.py,sha256=SoA272BtqvG8FpxZYpwWx-flJxHEm1-qVMzklmDYZkQ,11611
+trd_utils/exchanges/blofin/blofin_types.py,sha256=8uTJEMYL3Tq3Q_-yAZ4naGKQdQCgyjVn7bE1GRIr8kA,3845
 trd_utils/exchanges/bx_ultra/__init__.py,sha256=8Ssy-eOemQR32Nv1-FoPHm87nRqRO4Fm2PU5GHEFKfQ,80
 trd_utils/exchanges/bx_ultra/bx_types.py,sha256=FiJish58XpF6_vDRWxvpBVlPwXjC7uzK5K7CaA6Y8AI,25217
 trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=4Zsybe7lzB7qSvOByp8KdoVvFcOAnFuStJJQuGWT6po,21164
@@ -16,8 +16,8 @@ trd_utils/tradingview/__init__.py,sha256=H0QYb-O5qvy7qC3yswtlcSWLmeBnaS6oJ3Jtjvm
 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=VlEXDzOyn6fYH-dE86EGJ6u_el08QvdyOtJkj-0EAVA,65
-trd_utils/types_helper/base_model.py,sha256=diowqH_nh21HDUki_0nbrEtZd8IxGCpwrN8yCVN8QDE,9311
-trd_utils-0.0.7.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.7.dist-info/METADATA,sha256=Yy5-Rg6vMAN1W-ExlW6CJRa23Jzvebv9dvc0j4KEvNw,1094
-trd_utils-0.0.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.7.dist-info/RECORD,,
+trd_utils/types_helper/base_model.py,sha256=YjUV4eHNdySbskfXONgvhyyp0JtiAhkTeMhF_5b0evg,9362
+trd_utils-0.0.9.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.9.dist-info/METADATA,sha256=POitI8oET_mWfr-xav-QUZsRREEemRdY_I3c7U80kj8,1094
+trd_utils-0.0.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.9.dist-info/RECORD,,