trd-utils 0.0.39__py3-none-any.whl → 0.0.41__py3-none-any.whl

trd_utils/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = "0.0.39"
+__version__ = "0.0.41"
 

trd_utils/exchanges/base_types.py

@@ -50,6 +50,34 @@ class UnifiedPositionInfo(BaseModel):
     # not all exchanges support this yet, so use it with caution.
     last_volume: Decimal | None = None
 
+    def recalculate_pnl(self) -> tuple[Decimal, Decimal]:
+        """
+        Recalculates the PnL based on the available data.
+        This requires `last_price`, `open_price`, `initial_margin`,
+        and `position_leverage` to be set.
+
+        Returns:
+            The recalculated (PnL, percentage) as a Decimal, or None if calculation
+            is not possible with the current data.
+        """
+        if not self.position_leverage:
+            self.position_leverage = 1
+
+        if not all([self.last_price, self.open_price, self.initial_margin]):
+            # Not enough data to calculate PnL.
+            return None
+
+        price_change_percentage = (self.last_price - self.open_price) / self.open_price
+        if self.position_side == "SHORT":
+            # For a short position, profit is made when the price goes down.
+            price_change_percentage *= -1
+
+        pnl_percentage = self.position_leverage * price_change_percentage
+        # PnL = Initial Margin * Leverage * Price Change %
+        pnl = self.initial_margin * pnl_percentage
+        self.position_pnl = pnl
+        return (pnl, pnl_percentage)
+
     def __str__(self):
         parts = []
 

trd_utils/exchanges/bx_ultra/bx_ultra_client.py

@@ -83,7 +83,8 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
     # region client parameters
     we_api_base_host: str = "\u0061pi-\u0061pp.w\u0065-\u0061pi.com"
     we_api_base_url: str = "https://\u0061pi-\u0061pp.w\u0065-\u0061pi.com/\u0061pi"
-    ws_we_api_base_url: str = "wss://ws-market-swap.w\u0065-\u0061pi.com/ws"
+    ws_we_api_base_url: str = "wss://ws-market-sw\u0061p.w\u0065-\u0061pi.com/ws"
+    f_ws_we_api_base_url: str = "wss://f-ws-\u0061pp.w\u0065-\u0061pi.com/market"
     original_base_host: str = "https://\u0062ing\u0078.co\u006d"
     qq_os_base_host: str = "https://\u0061pi-\u0061pp.\u0071\u0071-os.com"
     qq_os_base_url: str = "https://\u0061pi-\u0061pp.\u0071\u0071-os.com/\u0061pi"
@@ -283,7 +284,7 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
 
     # endregion
     ###########################################################
-    # region ws-subscribes
+    # region ws last-candle methods
     async def do_price_subscribe(self) -> None:
         """
         Subscribes to the price changes coming from the exchange.
@@ -922,6 +923,9 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
     ) -> UnifiedTraderPositions:
         perp_positions = []
         std_positions = []
+        perp_ex: str = None
+        std_ex: str = None
+
         try:
             result = await self.get_unified_trader_positions_perp(
                 uid=uid,
@@ -930,7 +934,7 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
             perp_positions = result.positions
         except Exception as ex:
             if not no_warn:
-                logger.warning(f"Failed to fetch perp positions of {uid}: {ex}")
+                perp_ex = f"{ex}"
 
         try:
             result = await self.get_unified_trader_positions_std(
@@ -939,7 +943,13 @@ class BXUltraClient(ExchangeBase, IPriceFetcher):
             std_positions = result.positions
         except Exception as ex:
             if not no_warn:
-                logger.warning(f"Failed to fetch std positions of {uid}: {ex}")
+                std_ex = f"{ex}"
+
+        if not perp_positions and not std_positions:
+            if perp_ex:
+                logger.warning(f"Failed to fetch perp positions of {uid}: {perp_ex}")
+            if std_ex:
+                logger.warning(f"Failed to fetch std positions of {uid}: {std_ex}")
 
         unified_result = UnifiedTraderPositions()
         unified_result.positions = perp_positions + std_positions

{trd_utils-0.0.39.dist-info → trd_utils-0.0.41.dist-info}/METADATA

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

{trd_utils-0.0.39.dist-info → trd_utils-0.0.41.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trd_utils/__init__.py,sha256=_y4WjAWHrgEgLvv3r_45aY_RMAA0naOkGcAzESovGeU,25
+trd_utils/__init__.py,sha256=opeJdyFbAssqryQZxqUaYkJDAEZ8cuVWBwxBnzfUbDk,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
@@ -6,13 +6,13 @@ trd_utils/date_utils/__init__.py,sha256=Erg_E1TfKWNpiuZFm_NXRjCwoRMfxpPS2-mJK6V4
 trd_utils/date_utils/datetime_helpers.py,sha256=euIJBr-6PfJzLScOC9xVXd8Re_Gw5CSBPwtHX9_Il4A,596
 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=Dh7obMq9EMhLNuH6c0WbX8sFJpqRfhBXkRCKiiAG49c,3827
+trd_utils/exchanges/base_types.py,sha256=MVZvmxmYWgYh4URGVYaalNgY57l0VJX1GC8U18tB0rE,4964
 trd_utils/exchanges/blofin/__init__.py,sha256=X4r9o4Nyjla4UeOBG8lrgtnGYO2aErFMKaJ7yQrFasE,76
 trd_utils/exchanges/blofin/blofin_client.py,sha256=LAAbwXbA7nDxJZFwbXtaNsIZCayEyX3SwfwYdRr3uQs,13079
 trd_utils/exchanges/blofin/blofin_types.py,sha256=bQx0opCgHwcuC-5TxiVA4VQr17A1x7u7QIMdcIrROAg,4315
 trd_utils/exchanges/bx_ultra/__init__.py,sha256=8Ssy-eOemQR32Nv1-FoPHm87nRqRO4Fm2PU5GHEFKfQ,80
 trd_utils/exchanges/bx_ultra/bx_types.py,sha256=7Ga6IYHQNRDbhWXmS1J0NxpcR9HUJ8ZwQGh-1EvNRqM,36687
-trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=iLR6ZA0ou2FeE4lw3J92keuYXPp5D8RsToW5-XYMWo0,39867
+trd_utils/exchanges/bx_ultra/bx_ultra_client.py,sha256=aWnJjK0KXn_250lOfm3tUk8KZbr3wq9lsRIqcuOLAJk,40196
 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=Zn5y4bymK53ENVLjYnQadS61SZKs8BGoZ4jfsY4GOcE,7835
@@ -31,7 +31,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=dknzoq6iAUOb0n_yhI5mU3So-F_8d5ykGk3EbrERLnM,11763
-trd_utils-0.0.39.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.39.dist-info/METADATA,sha256=cA46gdwdtI8poYrD-rYuK13Pz6pKkt_PvSfC3pYTDoQ,1179
-trd_utils-0.0.39.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.39.dist-info/RECORD,,
+trd_utils-0.0.41.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.41.dist-info/METADATA,sha256=VfqukF_Pe-4dpdr8SDsCaYHHcWVdUVq50LOhH943Dgw,1179
+trd_utils-0.0.41.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.41.dist-info/RECORD,,