tradx 0.7.1__tar.gz → 0.7.3__tar.gz

{tradx-0.7.1 → tradx-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradx
-Version: 0.7.1
+Version: 0.7.3
 Summary: A Package Designed to simplify strategy development on package xts-api-client
 Author-email: "jatin.kumawat" <jatin.kumawat@rmoneyindia.com>
 Requires-Python: >=3.12

{tradx-0.7.1 → tradx-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tradx"
-version = "0.7.1"
+version = "0.7.3"
 description = "A Package Designed to simplify strategy development on package xts-api-client"
 readme = "README.md"
 authors = [

{tradx-0.7.1 → tradx-0.7.3}/src/tradx/baseClass/baseAlgo.py

@@ -351,7 +351,13 @@ class BaseAlgo(ABC):
                 )
 
     async def safe_market_order(
-        self, ExchangeSegment, ExchangeInstrumentID, ProductType, Quantity, InitialBid, InitialAsk
+        self,
+        ExchangeSegment,
+        ExchangeInstrumentID,
+        ProductType,
+        Quantity,
+        InitialBid,
+        InitialAsk,
     ):
         """
         Places a safe market order by continuously modifying the order until it is filled.
@@ -383,7 +389,11 @@ class BaseAlgo(ABC):
                 ]
             )
         )[0]
-        price = (Data.AskInfo.Price + _adjust).to_eng_string() if Quantity > 0 else (Data.BidInfo.Price - _adjust).to_eng_string()
+        price = (
+            (Data.AskInfo.Price + _adjust).to_eng_string()
+            if Quantity > 0
+            else (Data.BidInfo.Price - _adjust).to_eng_string()
+        )
         await self.interactiveEngine.limit_order(
             ExchangeSegment,
             ExchangeInstrumentID,
@@ -491,5 +501,7 @@ class BaseAlgo(ABC):
                         position.ExchangeInstrumentID,
                         position.ProductType,
                         -1 * position.Quantity,
+                        0,
+                        0,
                     )
                 )

{tradx-0.7.1 → tradx-0.7.3}/src/tradx/marketDataEngine.py

@@ -123,7 +123,7 @@ class marketDataEngine(MarketDataSocketClient):
     async def on_event_market_status_full(self, data):
         """On receiving message code 1507:Market Status full"""
         # __ = MarketStatusData(data)
-        _ = data
+        __ = data
         if self.user_logger:
             self.user_logger.info(
                 f"1507:Market Status full;{__}",
@@ -372,11 +372,22 @@ class marketDataEngine(MarketDataSocketClient):
             response = await self.xt.send_subscription(
                 Instruments=Instruments, xtsMessageCode=xtsMessageCode
             )
+            if (
+                response["type"] == "error"
+                and response["description"] == "Instrument Already Subscribed !"
+            ):
+                if self.user_logger:
+                    self.user_logger.error(
+                        f"Error in Subscribing Quantities: {Instruments} on request from {algo.name} as {response}",
+                        caller="marketDataEngine.subscribe",
+                    )
+                # Avoid raising this error
             if response["type"] != "success":
-                self.user_logger.error(
-                    f"Error in Subscribing Quantities: {Instruments} on request from {algo.name} as {response}",
-                    caller="marketDataEngine.subscribe",
-                )
+                if self.user_logger:
+                    self.user_logger.error(
+                        f"Error in Subscribing Quantities: {Instruments} on request from {algo.name} as {response}",
+                        caller="marketDataEngine.subscribe",
+                    )
                 raise (response)
             if self.user_logger:
                 self.user_logger.info(