tradx 0.7.13__py3-none-any.whl → 0.8.1__py3-none-any.whl

tradx/interactiveEngine.py

@@ -520,7 +520,26 @@ class interactiveEngine(InteractiveSocketClient):
             self.user_logger.info(
                 f"logged out! {data}", caller="interactiveEngine.on_messagelogout"
             )
+    async def reconnect(self):
+        try:
+            # Initialize and connect OrderSocket_io object
+            self.socket = OrderSocket_io(
+                self.set_interactiveToken,
+                self.set_iuserID,
+                self._root,
+                self,
+            )
+            # Log successful login
+            if self.user_logger:
+                self.user_logger.info(
+                    f"Login successful.", caller="interactiveEngine.reconnect"
+                )
 
+            await self.socket.connect()
+        
+        except Exception as e:
+            if self.user_logger:
+                self.user_logger.error(e, caller="interactiveEngine.reconnect")
     async def on_disconnect(self) -> None:
         """
         Callback for handling disconnection events.
@@ -530,11 +549,37 @@ class interactiveEngine(InteractiveSocketClient):
             None
         """
         self.isConnected = False
+        if self.user_logger:
+            self.user_logger.info(
+                "Interactive Socket disconnected!",
+                caller="interactiveEngine.on_disconnect",
+            )
         current_time = datetime.now().time()
-        if current_time.hour < 15 or (
-            current_time.hour == 15 and current_time.minute < 12
-        ):
-            print("Socket Disconnected, emergency square off triggered.")
+        cnt: int = 0
+        if current_time < datetime.strptime("15:20", "%H:%M").time():
+            while not self.isConnected and cnt < 3:
+                print("Attempting to reconnect as the time is before 3:20 PM and isConnected is False for interactive Socket.")
+                if self.user_logger:
+                    self.user_logger.info(
+                        "Attempting to reconnect as the time is before 3:20 PM and isConnected is False.",
+                        caller="interactiveEngine.on_disconnect",
+                    )
+                await self.reconnect()
+                await asyncio.sleep(3)
+                cnt += 1
+                if not self.isConnected and self.user_logger:
+                    print( f"Reconnection attempt {cnt} failed for interactive socket. Retrying...")
+                    self.user_logger.warning(
+                        f"Reconnection attempt {cnt} failed. Retrying...",
+                        caller="interactiveEngine.on_disconnect",
+                    )
+        if cnt >= 3:
+            if self.user_logger:
+                self.user_logger.error(
+                    f"Reconnection attempts failed. Please check the network connection.",
+                    caller="interactiveEngine.on_disconnect",
+                )
+            print("Interactive Socket reconnection failed, emergency square off triggered.")
             # Log the initiation of the liquidation process
             if self.user_logger:
                 self.user_logger.info(
@@ -598,11 +643,7 @@ class interactiveEngine(InteractiveSocketClient):
                     )
                 )
 
-        if self.user_logger:
-            self.user_logger.info(
-                "Interactive Socket disconnected!",
-                caller="interactiveEngine.on_disconnect",
-            )
+ 
 
     async def on_trade(self, xts_message: str) -> None:
         """

tradx/marketDataEngine.py

@@ -148,6 +148,7 @@ class marketDataEngine(MarketDataSocketClient):
         assert api_password, "API password is required"
         assert source, "Source is required"
         assert root, "Root is required"
+        self.isConnected: bool = False
         self._api_key: str = api_key
         self._api_password: str = api_password
         self._source: str = source
@@ -167,6 +168,10 @@ class marketDataEngine(MarketDataSocketClient):
                 caller="marketDataEngine.__init__",
             )
 
+    async def on_event_instrument_change_partial(self, data):
+        """On receiving message code 1105:Instrument Change partial"""
+        return
+
     async def initialize(self) -> None:
         """
         Asynchronously initializes the market data engine.
@@ -251,13 +256,29 @@ class marketDataEngine(MarketDataSocketClient):
         Returns:
             None
         """
-
+        self.isConnected = True
         if self.user_logger:
             self.user_logger.info(
                 "Market Data Socket connected successfully!",
                 caller="marketDataEngine.on_connect",
             )
+    async def reconnect(self):
+        try:
+            # Initialize and connect OrderSocket_io object
+            self.socket = MDSocket_io(
+                self.set_marketDataToken, self.set_userID, self._root, self
+            )
+            # Log successful login
+            if self.user_logger:
+                self.user_logger.info(
+                    f"Login successful.", caller="marketDataEngine.reconnect"
+                )
 
+            await self.socket.connect()
+        
+        except Exception as e:
+            if self.user_logger:
+                self.user_logger.error(e, caller="marketDataEngine.reconnect")
     async def on_disconnect(self) -> None:
         """
         Handles the event when the market data socket gets disconnected.
@@ -267,12 +288,38 @@ class marketDataEngine(MarketDataSocketClient):
         Returns:
             None
         """
-
+        self.isConnected = False
         if self.user_logger:
             self.user_logger.info(
                 "Market Data Socket disconnected!",
                 caller="marketDataEngine.on_disconnect",
             )
+        current_time = datetime.now().time()
+        cnt: int = 0
+        if current_time < datetime.strptime("15:20", "%H:%M").time():
+            while not self.isConnected and cnt < 3:
+                print("Attempting to reconnect as the time is before 3:20 PM and isConnected is False for market data socket.")
+                if self.user_logger:
+                    self.user_logger.info(
+                        "Attempting to reconnect as the time is before 3:20 PM and isConnected is False.",
+                        caller="marketDataEngine.on_disconnect",
+                    )
+                await self.reconnect()
+                await asyncio.sleep(3)
+                cnt += 1
+                if not self.isConnected and self.user_logger:
+                    print(f"Reconnection attempt {cnt} failed for market data socket. Retrying...")
+                    self.user_logger.warning(
+                        f"Reconnection attempt {cnt} failed. Retrying...",
+                        caller="marketDataEngine.on_disconnect",
+                    )
+        if cnt >= 3:
+            print("Reconnection attempts failed for market data socket. Please check the network connection.",)
+            if self.user_logger:
+                self.user_logger.error(
+                    f"Reconnection attempts failed. Please check the network connection.",
+                    caller="marketDataEngine.on_disconnect",
+                )
 
     async def on_message(self, xts_message: Any) -> None:
         """

{tradx-0.7.13.dist-info → tradx-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradx
-Version: 0.7.13
+Version: 0.8.1
 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.13.dist-info → tradx-0.8.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 tradx/__init__.py,sha256=MlWuula4lJZLPYPi4d5ZE9yoJnYWtgbZ0QsgWdWPwU0,53
 tradx/algoContainer.py,sha256=1IkVCIF_gXIby8z3pDdlVeUablh-PZVZ1EawyCB7oUs,3807
 tradx/dualHashMap.py,sha256=XsidIc3aMvpVGOvdfV7lOeZaLCWAD5i180BGyAfdYXE,1737
-tradx/interactiveEngine.py,sha256=ln7dT_S0HaFHA36AW5P0o6svYGSLlmBThheIhJQ6D34,38912
-tradx/marketDataEngine.py,sha256=W3EF-BSQX20jDm4kdVT9F6Qh1GAI2udO6Z3P280QIYM,37630
+tradx/interactiveEngine.py,sha256=EuUkHInDgb8NCEAlGWsoVXA4KtA7KYDj_42qXu4mAso,40828
+tradx/marketDataEngine.py,sha256=NsMEI4tdyLxpyAP2QiKFkn2mywXxTV9yekEbcTFFk44,39994
 tradx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tradx/baseClass/baseAlgo.py,sha256=eUfFNlTB7rwgIt8pbU3qj7SlD5jOCgpnL4jXXFJQqa8,21012
 tradx/baseClass/candleData.py,sha256=tS-iAoRGwK2xVSvrqmNZPYeB63qD53oPPHaUDfJBWkk,2947
@@ -28,6 +28,6 @@ tradx/baseClass/tradeEvent.py,sha256=djunJW5AzjeMfJZVMlrFprplB7vrYBi-mmaR1TA0MK4
 tradx/constants/holidays.py,sha256=B4ee4bPFy-gBTKN6-G68Idf1n6HxoRcx72O92zSobcE,1200
 tradx/logger/logger.py,sha256=DfrjzwYkujTq7arksNTPcQeioXnwT1xgN659blhreog,3232
 tradx/logger/logger2.py,sha256=ebJ-qqnpnCqvyx1Cz1-kGGULtkH-hfrK6UNfa0bSlH8,2654
-tradx-0.7.13.dist-info/METADATA,sha256=XDDP1wPlfvlHrpu9S4aSz8m6WFVZfBpDryO-biPGFNM,2629
-tradx-0.7.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tradx-0.7.13.dist-info/RECORD,,
+tradx-0.8.1.dist-info/METADATA,sha256=4lOHDdAjn-AupLoQHGSGrkUZ1RXfGz8fGQdUopW1FdE,2628
+tradx-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tradx-0.8.1.dist-info/RECORD,,