trd-utils 0.0.39__tar.gz → 0.0.41__tar.gz

{trd_utils-0.0.39 → trd_utils-0.0.41}/PKG-INFO

@@ -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 → trd_utils-0.0.41}/pyproject.toml

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

trd_utils-0.0.41/trd_utils/__init__.py

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

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

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