trd-utils 0.0.34__tar.gz → 0.0.36__tar.gz

{trd_utils-0.0.34 → trd_utils-0.0.36}/PKG-INFO

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

{trd_utils-0.0.34 → trd_utils-0.0.36}/pyproject.toml

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

trd_utils-0.0.36/trd_utils/__init__.py

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

{trd_utils-0.0.34 → trd_utils-0.0.36}/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-0.0.34 → trd_utils-0.0.36}/trd_utils/exchanges/base_types.py

@@ -37,6 +37,11 @@ class UnifiedPositionInfo(BaseModel):
     # The base unit that the open-price is based on (e.g. USD, USDT, USDC)
     open_price_unit: str | None = None
 
+    # The initial amount of open_price_unit that the trader has put to open
+    # this position.
+    # Note that not all public APIs might provide this field.
+    initial_margin: Decimal | None = None
+
     # The last price of this pair on the target exchange.
     # not all exchanges support this yet, so use it with caution.
     last_price: Decimal | None = None

{trd_utils-0.0.34 → trd_utils-0.0.36}/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:
@@ -339,6 +342,7 @@ class BlofinClient(ExchangeBase):
             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_pos.initial_margin = position.get_initial_margin()
             unified_result.positions.append(unified_pos)
 
         return unified_result

{trd_utils-0.0.34 → trd_utils-0.0.36}/trd_utils/exchanges/blofin/blofin_types.py

@@ -97,8 +97,8 @@ class CopyTraderSingleOrderInfo(BaseModel):
     symbol: str = None
     leverage: int = None
     order_side: str = None
-    avg_open_price: str = None
-    quantity: str = None
+    avg_open_price: Decimal = None
+    quantity: Decimal = None
     quantity_cont: Any = None
     open_time: int = None
     close_time: Any = None
@@ -146,6 +146,11 @@ class CopyTraderSingleOrderInfo(BaseModel):
     position_change_history: Any = None
     user_id: Any = None
 
+    def get_initial_margin(self) -> Decimal:
+        if not self.avg_open_price or not self.quantity or not self.leverage:
+            return None
+        return (self.avg_open_price * self.quantity) / self.leverage
+
 
 class CopyTraderOrderListResponse(BlofinApiResponse):
     data: list[CopyTraderSingleOrderInfo] = None

{trd_utils-0.0.34 → trd_utils-0.0.36}/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:
@@ -914,6 +922,7 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
             unified_pos.position_pair = position.symbol.replace("-", "/")
             unified_pos.open_time = None  # TODO: do something for this?
             unified_pos.open_price = position.avg_price
+            unified_pos.initial_margin = position.margin
             unified_pos.open_price_unit = (
                 position.valuation_coin_name or position.symbol.split("-")[-1]
             )  # TODO

{trd_utils-0.0.34 → trd_utils-0.0.36}/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-0.0.34 → trd_utils-0.0.36}/trd_utils/exchanges/hyperliquid/hyperliquid_client.py

@@ -1,4 +1,5 @@
 
+from datetime import datetime
 from decimal import Decimal
 import json
 import logging
@@ -6,6 +7,8 @@ import httpx
 
 from pathlib import Path
 
+import pytz
+
 from trd_utils.cipher import AESCipher
 from trd_utils.common_utils.wallet_utils import shorten_wallet_address
 from trd_utils.exchanges.base_types import UnifiedPositionInfo, UnifiedTraderInfo, UnifiedTraderPositions
@@ -46,6 +49,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__()
 
@@ -162,9 +166,10 @@ class HyperLiquidClient(ExchangeBase):
             unified_pos.margin_mode = position.leverage.type
             unified_pos.position_leverage = Decimal(position.leverage.value)
             unified_pos.position_pair = f"{position.coin}/USDT"
-            unified_pos.open_time = None # hyperliquid doesn't provide this...
+            unified_pos.open_time = datetime.now(pytz.UTC) # hyperliquid doesn't provide this...
             unified_pos.open_price = position.entry_px
             unified_pos.open_price_unit = "USDT"
+            unified_pos.initial_margin = position.margin_used
             unified_result.positions.append(unified_pos)
 
         return unified_result

{trd_utils-0.0.34 → trd_utils-0.0.36}/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__()
 
@@ -185,6 +186,7 @@ class OkxClient(ExchangeBase):
             unified_pos.open_time = position.c_time
             unified_pos.open_price = position.avg_px
             unified_pos.open_price_unit = position.quote_ccy
+            unified_pos.initial_margin = position.margin
             unified_result.positions.append(unified_pos)
 
         return unified_result

{trd_utils-0.0.34 → trd_utils-0.0.36}/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-0.0.34 → trd_utils-0.0.36}/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/trd_utils/__init__.py

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