trd-utils 0.0.15__tar.gz → 0.0.17__tar.gz

{trd_utils-0.0.15 → trd_utils-0.0.17}/PKG-INFO

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

{trd_utils-0.0.15 → trd_utils-0.0.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trd_utils"
-version = "0.0.15"
+version = "0.0.17"
 description = "Common Basic Utils for Python3. By ALiwoto."
 authors = ["ALiwoto <aminnimaj@gmail.com>"]
 packages = [

trd_utils-0.0.17/trd_utils/__init__.py

@@ -0,0 +1,3 @@
+
+__version__ = "0.0.17"
+

trd_utils-0.0.17/trd_utils/date_utils/__init__.py

@@ -0,0 +1,8 @@
+
+from .datetime_helpers import dt_from_ts
+
+
+__all__ = [
+    "dt_from_ts",
+]
+

trd_utils-0.0.17/trd_utils/date_utils/datetime_helpers.py

@@ -0,0 +1,16 @@
+
+
+
+
+from datetime import datetime, timezone
+
+
+def dt_from_ts(timestamp: float) -> datetime:
+    """
+    Return a datetime from a timestamp.
+    :param timestamp: timestamp in seconds or milliseconds
+    """
+    if timestamp > 1e10:
+        # Timezone in ms - convert to seconds
+        timestamp /= 1000
+    return datetime.fromtimestamp(timestamp, tz=timezone.utc)

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/__init__.py

@@ -11,11 +11,11 @@ from .hyperliquid import HyperLiquidClient
 
 
 __all__ = [
-    ExchangeBase,
-    UnifiedTraderInfo,
-    UnifiedTraderPositions,
-    UnifiedPositionInfo,
-    BXUltraClient,
-    BlofinClient,
-    HyperLiquidClient,
+    "ExchangeBase",
+    "UnifiedTraderInfo",
+    "UnifiedTraderPositions",
+    "UnifiedPositionInfo",
+    "BXUltraClient",
+    "BlofinClient",
+    "HyperLiquidClient",
 ]

trd_utils-0.0.17/trd_utils/exchanges/base_types.py

@@ -0,0 +1,106 @@
+
+
+from datetime import datetime
+from decimal import Decimal
+
+from trd_utils.types_helper.base_model import BaseModel
+
+class UnifiedPositionInfo(BaseModel):
+    # The id of the position.
+    position_id: str = None
+
+    # The pnl (profit) of the position.
+    position_pnl: Decimal = None
+
+    # The position side, either "LONG" or "SHORT".
+    position_side: str = None
+
+    # The position's leverage.
+    position_leverage: Decimal = None
+
+    # The margin mode; e.g. cross or isolated. Please note that
+    # different exchanges might provide different kinds of margin modes,
+    # depending on what they support, that's why we can't support a unified
+    # enum type for this as of yet.
+    margin_mode: str = None
+
+    # The formatted pair string of this position.
+    # e.g. BTC/USDT.
+    position_pair: str = None
+
+    # The open time of this position.
+    # Note that not all public APIs might provide this field.
+    open_time: datetime = None
+
+    # Open price of the position.
+    open_price: Decimal = None
+
+    # The base unit that the open-price is based on (e.g. USD, USDT, USDC)
+    open_price_unit: str | None = None
+
+    def __str__(self):
+        parts = []
+        
+        # Add position pair and ID
+        parts.append(f"Position: {self.position_pair or 'Unknown'} (ID: {self.position_id or 'N/A'})")
+        
+        # Add side and leverage
+        side_str = f"Side: {self.position_side or 'Unknown'}"
+        if self.position_leverage is not None:
+            side_str += f", {self.position_leverage}x"
+        parts.append(side_str)
+        
+        # Add margin mode if available
+        if self.margin_mode:
+            parts.append(f"Margin: {self.margin_mode}")
+        
+        # Add open price if available
+        price_str = "Open price: "
+        if self.open_price is not None:
+            price_str += f"{self.open_price}"
+            if self.open_price_unit:
+                price_str += f" {self.open_price_unit}"
+        else:
+            price_str += "N/A"
+        parts.append(price_str)
+        
+        # Add open time if available
+        if self.open_time:
+            parts.append(f"Opened: {self.open_time.strftime('%Y-%m-%d %H:%M:%S')}")
+        
+        # Add PNL if available
+        if self.position_pnl is not None:
+            parts.append(f"PNL: {self.position_pnl}")
+        
+        return " | ".join(parts)
+
+    def __repr__(self):
+        return self.__str__()
+
+class UnifiedTraderPositions(BaseModel):
+    positions: list[UnifiedPositionInfo] = None
+
+class UnifiedTraderInfo(BaseModel):
+    # Trader's id. Either int or str. In DEXes (such as HyperLiquid),
+    # this might be wallet address of the trader.
+    trader_id: int | str = None
+
+    # Name of the trader
+    trader_name: str = None
+
+    # The URL in which we can see the trader's profile
+    trader_url: str = None
+
+    # Trader's win-rate. Not all exchanges might support this field.
+    win_rate: Decimal = None
+
+    def __str__(self):
+        return (
+            f"Trader: {self.trader_name} (ID: {self.trader_id})"
+            f"{' | Win Rate: ' + str(round(self.win_rate, 2))}"
+            f"{' | Profile: ' + self.trader_url}"
+        )
+    
+    def __repr__(self):
+        return self.__str__()
+    

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/blofin/__init__.py

@@ -2,5 +2,5 @@
 from .blofin_client import BlofinClient
 
 __all__ = [
-    BlofinClient,
+    "BlofinClient",
 ]

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/blofin/blofin_client.py

@@ -2,15 +2,18 @@ import asyncio
 from decimal import Decimal
 import json
 import logging
-from typing import Type
 import httpx
 
 import time
 from pathlib import Path
 
-from trd_utils.exchanges.base_types import UnifiedTraderInfo, UnifiedTraderPositions
+from trd_utils.date_utils.datetime_helpers import dt_from_ts
+from trd_utils.exchanges.base_types import (
+    UnifiedPositionInfo,
+    UnifiedTraderInfo,
+    UnifiedTraderPositions,
+)
 from trd_utils.exchanges.blofin.blofin_types import (
-    BlofinApiResponse,
     CmsColorResponse,
     CopyTraderAllOrderHistory,
     CopyTraderAllOrderList,
@@ -22,6 +25,9 @@ from trd_utils.exchanges.blofin.blofin_types import (
 from trd_utils.cipher import AESCipher
 from trd_utils.exchanges.exchange_base import ExchangeBase
 
+
+BASE_PROFILE_URL = "https://blofin.com/copy-trade/details/"
+
 logger = logging.getLogger(__name__)
 
 
@@ -65,7 +71,7 @@ class BlofinClient(ExchangeBase):
         return await self.invoke_get(
             f"{self.blofin_api_base_url}/cms/share_config",
             headers=headers,
-            model=ShareConfigResponse,
+            model_type=ShareConfigResponse,
         )
 
     async def get_cms_color(self) -> CmsColorResponse:
@@ -73,7 +79,7 @@ class BlofinClient(ExchangeBase):
         return await self.invoke_get(
             f"{self.blofin_api_base_url}/cms/color",
             headers=headers,
-            model=CmsColorResponse,
+            model_type=CmsColorResponse,
         )
 
     # endregion
@@ -88,26 +94,26 @@ class BlofinClient(ExchangeBase):
             f"{self.blofin_api_base_url}/copy/trader/info",
             headers=headers,
             content=payload,
-            model=CopyTraderInfoResponse,
+            model_type=CopyTraderInfoResponse,
         )
 
     async def get_copy_trader_order_list(
         self,
-        uid: int,
+        uid: int | str,
         from_param: int = 0,
         limit_param: int = 20,
     ) -> CopyTraderOrderListResponse:
         payload = {
             "from": from_param,
             "limit": limit_param,
-            "uid": uid,
+            "uid": int(uid),
         }
         headers = self.get_headers()
         return await self.invoke_post(
             f"{self.blofin_api_base_url}/copy/trader/order/list",
             headers=headers,
             content=payload,
-            model=CopyTraderOrderListResponse,
+            model_type=CopyTraderOrderListResponse,
         )
 
     async def get_copy_trader_all_order_list(
@@ -133,11 +139,13 @@ class BlofinClient(ExchangeBase):
                 from_param=current_id_from,
                 limit_param=chunk_limit,
             )
-            if (
-                not current_result
-                or not isinstance(current_result, CopyTraderOrderListResponse)
-                or not current_result.data
-            ):
+            if not isinstance(current_result, CopyTraderOrderListResponse):
+                raise ValueError(
+                    "get_copy_trader_order_list returned invalid value of "
+                    f"{type(current_result)}",
+                )
+            if not current_result.data:
+                # we no longer have anything else here
                 return result
 
             if current_result.data[0].id == current_id_from:
@@ -177,7 +185,7 @@ class BlofinClient(ExchangeBase):
             f"{self.blofin_api_base_url}/copy/trader/order/history",
             headers=headers,
             content=payload,
-            model=CopyTraderOrderHistoryResponse,
+            model_type=CopyTraderOrderHistoryResponse,
         )
 
     async def get_copy_trader_all_order_history(
@@ -256,56 +264,6 @@ class BlofinClient(ExchangeBase):
             the_headers["Authorization"] = f"Bearer {self.authorization_token}"
         return the_headers
 
-    async def invoke_get(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        model: Type[BlofinApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "BlofinApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-        response = await self.httpx_client.get(
-            url=url,
-            headers=headers,
-            params=params,
-        )
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def invoke_post(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        content: dict | str | bytes = "",
-        model: Type[BlofinApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "BlofinApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-
-        if isinstance(content, dict):
-            content = json.dumps(content, separators=(",", ":"), sort_keys=True)
-
-        response = await self.httpx_client.post(
-            url=url,
-            headers=headers,
-            params=params,
-            content=content,
-        )
-        if not model:
-            return response.json()
-
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def aclose(self) -> None:
-        await self.httpx_client.aclose()
-        logger.info("BlofinClient closed")
-        return True
-
     def read_from_session_file(self, file_path: str) -> None:
         """
         Reads from session file; if it doesn't exist, creates it.
@@ -338,6 +296,8 @@ class BlofinClient(ExchangeBase):
         }
         aes = AESCipher(key=f"bf_{self.account_name}_bf", fav_letter=self._fav_letter)
         target_path = Path(file_path)
+        if not target_path.exists():
+            target_path.mkdir(parents=True)
         target_path.write_text(aes.encrypt(json.dumps(json_data)))
 
     # endregion
@@ -347,13 +307,43 @@ class BlofinClient(ExchangeBase):
         self,
         uid: int | str,
     ) -> UnifiedTraderPositions:
-        pass
+        result = await self.get_copy_trader_all_order_list(
+            uid=uid,
+        )
+        unified_result = UnifiedTraderPositions()
+        unified_result.positions = []
+        for position in result.data:
+            unified_pos = UnifiedPositionInfo()
+            unified_pos.position_id = position.id or position.order_id
+            unified_pos.position_pnl = position.real_pnl or position.pnl
+            unified_pos.position_side = (
+                "LONG" if position.order_side in ("LONG", "BUY") else "SHORT"
+            )
+            unified_pos.margin_mode = position.margin_mode
+            unified_pos.position_leverage = Decimal(position.leverage)
+            unified_pos.position_pair = position.symbol.replace("-", "/")
+            unified_pos.open_time = dt_from_ts(position.open_time)
+            unified_pos.open_price = position.avg_open_price
+            unified_pos.open_price_unit = position.symbol.split("-")[-1]
+            unified_result.positions.append(unified_pos)
+
+        return unified_result
 
     async def get_unified_trader_info(
         self,
         uid: int | str,
     ) -> UnifiedTraderInfo:
-        pass
+        info_resp = await self.get_copy_trader_info(
+            uid=uid,
+        )
+        info = info_resp.data
+        unified_info = UnifiedTraderInfo()
+        unified_info.trader_id = info.uid
+        unified_info.trader_name = info.nick_name
+        unified_info.trader_url = f"{BASE_PROFILE_URL}{info.uid}"
+        unified_info.win_rate = info.win_rate
+
+        return unified_info
 
     # endregion
     ###########################################################

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/blofin/blofin_types.py

@@ -114,7 +114,7 @@ class CopyTraderSingleOrderInfo(BaseModel):
     price: Any = None
     fill_quantity: Any = None
     fill_quantity_cont: Any = None
-    pnl: Any = None
+    pnl: Decimal = None
     cancel_source: Any = None
     order_type: Any = None
     order_open_state: Any = None

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/bx_ultra/bx_ultra_client.py

@@ -1,10 +1,11 @@
-"""BxUltra exchange subclass"""
+"""
+BxUltra exchange subclass
+"""
 
 import asyncio
 from decimal import Decimal
 import json
 import logging
-from typing import Type
 import uuid
 
 import httpx
@@ -12,6 +13,11 @@ import httpx
 import time
 from pathlib import Path
 
+from trd_utils.exchanges.base_types import (
+    UnifiedPositionInfo,
+    UnifiedTraderInfo,
+    UnifiedTraderPositions,
+)
 from trd_utils.exchanges.bx_ultra.bx_utils import do_ultra_ss
 from trd_utils.exchanges.bx_ultra.bx_types import (
     AssetsInfoResponse,
@@ -30,7 +36,6 @@ from trd_utils.exchanges.bx_ultra.bx_types import (
     ZenDeskABStatusResponse,
     ZenDeskAuthResponse,
     ZoneModuleListResponse,
-    BxApiResponse,
 )
 from trd_utils.cipher import AESCipher
 
@@ -49,9 +54,17 @@ WEB_APP_VERSION = "4.78.12"
 TG_APP_VERSION = "5.0.15"
 
 ACCEPT_ENCODING_HEADER = "gzip, deflate, br, zstd"
+BASE_PROFILE_URL = "https://bingx.com/en/CopyTrading/"
 
 logger = logging.getLogger(__name__)
 
+# The cache in which we will be storing the api identities.
+# The key of this dict is uid (long user identifier), to api-identity.
+# Why is this a global variable, and not a class attribute? because as far as
+# I've observed, api-identities in bx (unlike Telegram's access-hashes) are not
+# specific to the current session that is fetching them,
+user_api_identity_cache: dict[int, int] = {}
+
 
 class BXUltraClient(ExchangeBase):
     ###########################################################
@@ -119,7 +132,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/coin/v1/zone/module-info",
             headers=headers,
             params=params,
-            model=ZoneModuleListResponse,
+            model_type=ZoneModuleListResponse,
         )
 
     async def get_user_favorite_quotation(
@@ -136,7 +149,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/coin/v1/user/favorite/quotation",
             headers=headers,
             params=params,
-            model=UserFavoriteQuotationResponse,
+            model_type=UserFavoriteQuotationResponse,
         )
 
     async def get_quotation_rank(
@@ -153,7 +166,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/coin/v1/rank/quotation-rank",
             headers=headers,
             params=params,
-            model=QuotationRankResponse,
+            model_type=QuotationRankResponse,
         )
 
     async def get_hot_search(
@@ -170,7 +183,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/coin/v1/quotation/hot-search",
             headers=headers,
             params=params,
-            model=HotSearchResponse,
+            model_type=HotSearchResponse,
         )
 
     async def get_homepage(
@@ -187,7 +200,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/coin/v1/discovery/homepage",
             headers=headers,
             params=params,
-            model=HomePageResponse,
+            model_type=HomePageResponse,
         )
 
     # endregion
@@ -198,15 +211,17 @@ class BXUltraClient(ExchangeBase):
         return await self.invoke_get(
             f"{self.we_api_base_url}/customer/v1/zendesk/ab-status",
             headers=headers,
-            model=ZenDeskABStatusResponse,
+            model_type=ZenDeskABStatusResponse,
         )
+
     async def do_zendesk_auth(self) -> ZenDeskAuthResponse:
         headers = self.get_headers(needs_auth=True)
         return await self.invoke_get(
             f"{self.we_api_base_url}/customer/v1/zendesk/auth/jwt",
             headers=headers,
-            model=ZenDeskAuthResponse,
+            model_type=ZenDeskAuthResponse,
         )
+
     # endregion
     ###########################################################
     # region platform-tool
@@ -215,7 +230,7 @@ class BXUltraClient(ExchangeBase):
         return await self.invoke_get(
             f"{self.we_api_base_url}/platform-tool/v1/hint/list",
             headers=headers,
-            model=HintListResponse,
+            model_type=HintListResponse,
         )
 
     # endregion
@@ -226,7 +241,7 @@ class BXUltraClient(ExchangeBase):
         return await self.invoke_get(
             f"{self.we_api_base_url}/asset-manager/v1/assets/account-total-overview",
             headers=headers,
-            model=AssetsInfoResponse,
+            model_type=AssetsInfoResponse,
         )
 
     # endregion
@@ -255,7 +270,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/v4/contract/order/hold",
             headers=headers,
             params=params,
-            model=ContractsListResponse,
+            model_type=ContractsListResponse,
         )
 
     async def get_contract_order_history(
@@ -282,7 +297,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/v2/contract/order/history",
             headers=headers,
             params=params,
-            model=ContractOrdersHistoryResponse,
+            model_type=ContractOrdersHistoryResponse,
         )
 
     async def get_today_contract_earnings(
@@ -389,7 +404,7 @@ class BXUltraClient(ExchangeBase):
     # endregion
     ###########################################################
     # region copy-trade-facade
-    async def get_copy_trade_trader_positions(
+    async def get_copy_trader_positions(
         self,
         uid: int | str,
         api_identity: str,
@@ -409,7 +424,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/copy-trade-facade/v2/real/trader/positions",
             headers=headers,
             params=params,
-            model=CopyTraderTradePositionsResponse,
+            model_type=CopyTraderTradePositionsResponse,
         )
 
     async def search_copy_traders(
@@ -446,7 +461,7 @@ class BXUltraClient(ExchangeBase):
             headers=headers,
             params=params,
             content=payload,
-            model=SearchCopyTradersResponse,
+            model_type=SearchCopyTradersResponse,
         )
 
     async def get_copy_trader_futures_stats(
@@ -454,6 +469,11 @@ class BXUltraClient(ExchangeBase):
         uid: int | str,
         api_identity: str,
     ) -> CopyTraderFuturesStatsResponse:
+        """
+        Returns futures statistics of a certain trader.
+        If you do not have the api_identity parameter, please first invoke
+        get_copy_trader_resume method and get it from there.
+        """
         params = {
             "uid": f"{uid}",
             "apiIdentity": f"{api_identity}",
@@ -463,7 +483,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/copy-trade-facade/v4/trader/account/futures/stat",
             headers=headers,
             params=params,
-            model=CopyTraderFuturesStatsResponse,
+            model_type=CopyTraderFuturesStatsResponse,
         )
 
     async def get_copy_trader_resume(
@@ -478,9 +498,22 @@ class BXUltraClient(ExchangeBase):
             f"{self.we_api_base_url}/copy-trade-facade/v1/trader/resume",
             headers=headers,
             params=params,
-            model=CopyTraderResumeResponse,
+            model_type=CopyTraderResumeResponse,
         )
 
+    async def get_trader_api_identity(
+        self,
+        uid: int | str,
+    ) -> int | str:
+        api_identity = user_api_identity_cache.get(uid, None)
+        if not api_identity:
+            resume = await self.get_copy_trader_resume(
+                uid=uid,
+            )
+            api_identity = resume.data.api_identity
+            user_api_identity_cache[uid] = api_identity
+        return api_identity
+
     # endregion
     ###########################################################
     # region welfare
@@ -490,7 +523,7 @@ class BXUltraClient(ExchangeBase):
             f"{self.original_base_host}/api/act-operation/v1/welfare/sign-in/do",
             headers=headers,
             content="",
-            model=None,
+            model_type=None,
         )
 
     # endregion
@@ -540,56 +573,6 @@ class BXUltraClient(ExchangeBase):
             the_headers["Authorization"] = f"Bearer {self.authorization_token}"
         return the_headers
 
-    async def invoke_get(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        model: Type[BxApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "BxApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-        response = await self.httpx_client.get(
-            url=url,
-            headers=headers,
-            params=params,
-        )
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def invoke_post(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        content: dict | str | bytes = "",
-        model: Type[BxApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "BxApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-
-        if isinstance(content, dict):
-            content = json.dumps(content, separators=(",", ":"), sort_keys=True)
-
-        response = await self.httpx_client.post(
-            url=url,
-            headers=headers,
-            params=params,
-            content=content,
-        )
-        if not model:
-            return response.json()
-
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def aclose(self) -> None:
-        await self.httpx_client.aclose()
-        logger.info("BXUltraClient closed")
-        return True
-
     def read_from_session_file(self, file_path: str) -> None:
         """
         Reads from session file; if it doesn't exist, creates it.
@@ -650,7 +633,80 @@ 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.write_text(aes.encrypt(json.dumps(json_data)))
 
     # endregion
     ###########################################################
+    # region unified methods
+
+    async def get_unified_trader_positions(
+        self,
+        uid: int | str,
+    ) -> UnifiedTraderPositions:
+        global user_api_identity_cache
+
+        api_identity = await self.get_trader_api_identity(
+            uid=uid,
+        )
+
+        result = await self.get_copy_trader_positions(
+            uid=uid,
+            api_identity=api_identity,
+            page_size=50,  # TODO: make this dynamic I guess...
+        )
+        if result.data.hide:
+            # TODO: do proper exceptions here...
+            raise ValueError("The trader has made their positions hidden")
+        unified_result = UnifiedTraderPositions()
+        unified_result.positions = []
+        for position in result.data.positions:
+            unified_pos = UnifiedPositionInfo()
+            unified_pos.position_id = position.position_no
+            unified_pos.position_pnl = position.unrealized_pnl
+            unified_pos.position_side = position.position_side
+            unified_pos.margin_mode = "isolated"  # TODO: fix this
+            unified_pos.position_leverage = position.leverage
+            unified_pos.position_pair = (
+                position.symbol
+            )  # TODO: make sure correct format
+            unified_pos.open_time = None  # TODO: do something for this?
+            unified_pos.open_price = position.avg_price
+            unified_pos.open_price_unit = position.symbol.split("-")[-1]  # TODO
+            unified_result.positions.append(unified_pos)
+
+        return unified_result
+
+    async def get_unified_trader_info(
+        self,
+        uid: int | str,
+    ) -> UnifiedTraderInfo:
+        resume_resp = await self.get_copy_trader_resume(
+            uid=uid,
+        )
+        if resume_resp.code != 0 and not resume_resp.data:
+            if resume_resp.msg:
+                raise ValueError(f"got error from API: {resume_resp.msg}")
+            raise ValueError(
+                f"got unknown error from bx API while fetching resume for {uid}"
+            )
+
+        resume = resume_resp.data
+        api_identity = resume.api_identity
+
+        info_resp = await self.get_copy_trader_futures_stats(
+            uid=uid,
+            api_identity=api_identity,
+        )
+        info = info_resp.data
+        unified_info = UnifiedTraderInfo()
+        unified_info.trader_id = resume.trader_info.uid
+        unified_info.trader_name = resume.trader_info.nick_name
+        unified_info.trader_url = f"{BASE_PROFILE_URL}{uid}"
+        unified_info.win_rate = Decimal(info.win_rate.rstrip("%")) / 100
+
+        return unified_info
+
+    # endregion
+    ###########################################################

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/exchange_base.py

@@ -1,10 +1,12 @@
 from decimal import Decimal
-from typing import Any
+import json
+from typing import Any, Type
 from abc import ABC
 
 import httpx
 
 from trd_utils.exchanges.base_types import UnifiedTraderInfo, UnifiedTraderPositions
+from trd_utils.types_helper.base_model import BaseModel
 
 
 class ExchangeBase(ABC):
@@ -66,32 +68,55 @@ class ExchangeBase(ABC):
     async def invoke_get(
         self,
         url: str,
-        headers: dict | None,
-        params: dict | None,
-        model: Any,
+        headers: dict | None = None,
+        params: dict | None = None,
+        model_type: Type[BaseModel] | None = None,
         parse_float=Decimal,
-    ) -> Any:
+    ) -> "BaseModel":
         """
         Invokes the specific request to the specific url with the specific params and headers.
         """
-        pass
+        response = await self.httpx_client.get(
+            url=url,
+            headers=headers,
+            params=params,
+        )
+        return model_type.deserialize(response.json(parse_float=parse_float))
 
     async def invoke_post(
         self,
         url: str,
         headers: dict | None = None,
         params: dict | None = None,
-        content: str | bytes = "",
-        model: None = None,
+        content: dict | str | bytes = "",
+        model_type: Type[BaseModel] | None = None,
         parse_float=Decimal,
-    ):
+    ) -> "BaseModel":
         """
         Invokes the specific request to the specific url with the specific params and headers.
         """
-        pass
+
+        if isinstance(content, dict):
+            content = json.dumps(content, separators=(",", ":"), sort_keys=True)
+
+        response = await self.httpx_client.post(
+            url=url,
+            headers=headers,
+            params=params,
+            content=content,
+        )
+        if not model_type:
+            return response.json()
+
+        return model_type.deserialize(response.json(parse_float=parse_float))
+
 
     async def aclose(self) -> None:
-        pass
+        await self.httpx_client.aclose()
+
+    # endregion
+    ###########################################################
+    # region data-files related methods
 
     def read_from_session_file(self, file_path: str) -> None:
         """

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/hyperliquid/__init__.py

@@ -3,5 +3,5 @@ from .hyperliquid_client import HyperLiquidClient
 
 
 __all__ = [
-    HyperLiquidClient,
+    "HyperLiquidClient",
 ]

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/exchanges/hyperliquid/hyperliquid_client.py

@@ -102,56 +102,6 @@ class HyperLiquidClient(ExchangeBase):
             the_headers["Authorization"] = f"Bearer {self.authorization_token}"
         return the_headers
 
-    async def invoke_get(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        model: Type[HyperLiquidApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "HyperLiquidApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-        response = await self.httpx_client.get(
-            url=url,
-            headers=headers,
-            params=params,
-        )
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def invoke_post(
-        self,
-        url: str,
-        headers: dict | None = None,
-        params: dict | None = None,
-        content: dict | str | bytes = "",
-        model: Type[HyperLiquidApiResponse] | None = None,
-        parse_float=Decimal,
-    ) -> "HyperLiquidApiResponse":
-        """
-        Invokes the specific request to the specific url with the specific params and headers.
-        """
-
-        if isinstance(content, dict):
-            content = json.dumps(content, separators=(",", ":"), sort_keys=True)
-
-        response = await self.httpx_client.post(
-            url=url,
-            headers=headers,
-            params=params,
-            content=content,
-        )
-        if not model:
-            return response.json()
-
-        return model.deserialize(response.json(parse_float=parse_float))
-
-    async def aclose(self) -> None:
-        await self.httpx_client.aclose()
-        logger.info("HyperLiquidClient closed")
-        return True
-
     def read_from_session_file(self, file_path: str) -> None:
         """
         Reads from session file; if it doesn't exist, creates it.
@@ -182,6 +132,8 @@ class HyperLiquidClient(ExchangeBase):
         }
         aes = AESCipher(key=f"bf_{self.account_name}_bf", fav_letter=self._fav_letter)
         target_path = Path(file_path)
+        if not target_path.exists():
+            target_path.mkdir(parents=True)
         target_path.write_text(aes.encrypt(json.dumps(json_data)))
 
     # endregion

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/types_helper/__init__.py

@@ -2,5 +2,5 @@ from .base_model import BaseModel
 
 
 __all__ = [
-    BaseModel,
+    "BaseModel",
 ]

{trd_utils-0.0.15 → trd_utils-0.0.17}/trd_utils/types_helper/base_model.py

@@ -138,7 +138,7 @@ def generic_obj_to_value(
         return expected_type(**value)
 
     if not expected_type_args:
-        if isinstance(value, expected_type):
+        if value is None or isinstance(value, expected_type):
             return value
         return expected_type(value)
 

trd_utils-0.0.15/trd_utils/__init__.py

@@ -1,3 +0,0 @@
-
-__version__ = "0.0.15"
-

trd_utils-0.0.15/trd_utils/exchanges/base_types.py

@@ -1,53 +0,0 @@
-
-
-from datetime import datetime
-from decimal import Decimal
-
-class UnifiedPositionInfo:
-    # The id of the position.
-    position_id: str = None
-
-    # The pnl (profit) of the position.
-    position_pnl: Decimal = None
-
-    # The position side, either "LONG" or "SHORT".
-    position_side: str = None
-
-    # The formatted pair string of this position.
-    # e.g. BTC/USDT.
-    position_pair: str = None
-
-    # Side but with a proper emoji alongside of it.
-    side_with_emoji: str = None
-
-    # The open time of this position.
-    # Note that not all public APIs might provide this field.
-    open_time: datetime = None
-
-    # The relative open time of this position.
-    relative_open_time: str = None
-
-    # Open price of the position.
-    open_price: Decimal = None
-
-    # The string (and formatted) version of the open_price.
-    # Optionally base unit also included (e.g. USDT or USD).
-    open_price_str: str = None
-
-
-class UnifiedTraderPositions:
-    positions: list[UnifiedPositionInfo] = None
-
-class UnifiedTraderInfo:
-    # Name of the trader
-    trader_name: str = None
-
-    # The URL in which we can see the trader's profile
-    trader_url: str = None
-
-    # Trader's id. Either int or str. In DEXes (such as HyperLiquid),
-    # this might be wallet address of the trader.
-    trader_id: int | str = None
-
-    # Trader's win-rate. Not all exchanges might support this field.
-    win_rate: Decimal = None