tradx 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

tradx/baseClass/baseAlgo.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 import shortuuid
 from typing import Any, TYPE_CHECKING, List, Dict
-from datetime import datetime, timedelta
+from decimal import Decimal
 from tradx.baseClass.order import Order
 from tradx.baseClass.position import Position
 
@@ -167,8 +167,9 @@ class BaseAlgo(ABC):
                 order.OrderDisclosedQuantity,
                 order.OrderPrice,
                 order.OrderStopPrice,
-                order.OrderStatus,
                 order.OrderSide,
+                order.TimeInForce,
+                order.OrderStatus,
             )
             self.order_diary.append(new_order)
             if self.interactiveEngine.user_logger:
@@ -198,7 +199,8 @@ class BaseAlgo(ABC):
         3. Logs the update or insertion of the position.
         4. Ensures the on_tradeEvent callback is called asynchronously.
         """
-
+        if trade.OrderStatus != "Filled":
+            return
         # Check if the trade exists in the position diary
         existing_position = next(
             (
@@ -370,23 +372,35 @@ class BaseAlgo(ABC):
         5. If the order is not filled, modifies the order with updated market data.
         """
         OrderUniqueIdentifier = self.order_no()
-        Data: TouchLineData = await self.marketDataEngine.fetch_ltp(
-            [
-                {
-                    "exchangeSegment": ExchangeSegment,
-                    "exchangeInstrumentID": ExchangeInstrumentID,
-                }
-            ]
+        _adjust = Decimal("0.05")
+        Data: TouchLineData = (
+            await self.marketDataEngine.fetch_ltp(
+                [
+                    {
+                        "exchangeSegment": ExchangeSegment,
+                        "exchangeInstrumentID": ExchangeInstrumentID,
+                    }
+                ]
+            )
         )[0]
+
         await self.interactiveEngine.limit_order(
             ExchangeSegment,
             ExchangeInstrumentID,
             ProductType,
             Quantity,
-            (Data.AskInfo.Price + 0.05 if Quantity > 0 else Data.BidInfo.Price - 0.05),
+            (
+                (Data.AskInfo.Price + _adjust).to_eng_string()
+                if Quantity > 0
+                else (Data.BidInfo.Price - _adjust).to_eng_string()
+            ),
             OrderUniqueIdentifier,
         )
-
+        if self.interactiveEngine.user_logger:
+            self.interactiveEngine.user_logger.info(
+                f"Placing Limit Order for {ExchangeInstrumentID} with Quantity {Quantity}",
+                caller=f"{self.__class__.__name__}.safe_market_order",
+            )
         await asyncio.sleep(0.1)
         order = next(
             (
@@ -396,7 +410,7 @@ class BaseAlgo(ABC):
             ),
             None,
         )
-        while order is None or (order is not None and order.OrderStatus != "Filled"):
+        while order is None or (order is not None and "Filled" not in order.OrderStatus):
             await asyncio.sleep(0.1)
             order = next(
                 (
@@ -406,15 +420,25 @@ class BaseAlgo(ABC):
                 ),
                 None,
             )
-            if order is not None and order.OrderStatus != "Filled":
-                Data: TouchLineData = await self.marketDataEngine.fetch_ltp(
-                    [
-                        {
-                            "exchangeSegment": ExchangeSegment,
-                            "exchangeInstrumentID": ExchangeInstrumentID,
-                        }
-                    ]
+            if order is not None and order.OrderStatus == "Rejected":
+                if self.interactiveEngine.user_logger:
+                    self.interactiveEngine.user_logger.info(
+                        f"Order Rejected for {ExchangeInstrumentID} with Quantity {Quantity}",
+                        caller=f"{self.__class__.__name__}.safe_market_order",
+                    )
+                break
+            if order is not None and "Filled" not in order.OrderStatus:
+                Data: TouchLineData = (
+                    await self.marketDataEngine.fetch_ltp(
+                        [
+                            {
+                                "exchangeSegment": ExchangeSegment,
+                                "exchangeInstrumentID": ExchangeInstrumentID,
+                            }
+                        ]
+                    )
                 )[0]
+
                 await self.interactiveEngine.xt.modify_order(
                     order.AppOrderID,
                     order.ProductType,
@@ -422,15 +446,22 @@ class BaseAlgo(ABC):
                     order.OrderQuantity,
                     order.OrderDisclosedQuantity,
                     (
-                        Data.AskInfo.Price + 0.05
+                        (Data.AskInfo.Price + _adjust).to_eng_string()
                         if Quantity > 0
-                        else Data.BidInfo.Price - 0.05
+                        else (Data.BidInfo.Price - _adjust).to_eng_string()
                     ),
-                    order.OrderStopPrice,
+                    order.OrderStopPrice.to_eng_string(),
                     order.TimeInForce,
                     order.OrderUniqueIdentifier,
+                    "*****",
                 )
-                await asyncio.sleep(0.3)
+                if self.interactiveEngine.user_logger:
+                    self.interactiveEngine.user_logger.info(
+                        f"Modifying Order for {ExchangeInstrumentID} with Quantity {Quantity} and Price "
+                        f"{(Data.AskInfo.Price + _adjust).to_eng_string() if Quantity > 0 else (Data.BidInfo.Price - _adjust).to_eng_string()}",
+                        caller=f"{self.__class__.__name__}.safe_market_order",
+                    )
+                await asyncio.sleep(0.7)
 
     async def safeLiquidateIntraday(self) -> None:
         """

tradx/baseClass/order.py

@@ -37,6 +37,7 @@ class Order(BaseModel):
         OrderPrice: Decimal,
         OrderStopPrice: Decimal,
         OrderSide: str,
+        TimeInForce: str,
         OrderStatus: str = "",
     ):
         super().__init__(
@@ -50,4 +51,5 @@ class Order(BaseModel):
             OrderStopPrice=OrderStopPrice,
             OrderStatus=OrderStatus,
             OrderSide=OrderSide,
+            TimeInForce=TimeInForce,
         )

{tradx-0.1.2.dist-info → tradx-0.1.4.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ tradx/dualHashMap.py,sha256=XsidIc3aMvpVGOvdfV7lOeZaLCWAD5i180BGyAfdYXE,1737
 tradx/interactiveEngine.py,sha256=DCuEEYJcTn6DEG9pbaZsmGyHeyWGNG2q46Iljel6Drc,34584
 tradx/marketDataEngine.py,sha256=pIY4dephqzykzPYJk0khYMVmD1QAr-17CtLN1WkcAWM,34597
 tradx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tradx/baseClass/baseAlgo.py,sha256=TP4gh2O0siSwIZazmoMXtJGgg54pjv2Pu87tPCu8luA,19092
+tradx/baseClass/baseAlgo.py,sha256=glbp8aaqEE205EEwM9buE8BLjyHmHqwEef0b0mC7Okg,20708
 tradx/baseClass/candleData.py,sha256=tS-iAoRGwK2xVSvrqmNZPYeB63qD53oPPHaUDfJBWkk,2947
 tradx/baseClass/cmInstrument.py,sha256=WpibHdJyVGVs0B8o1COiXr4rNXB8bapzFLyRaIG0w9Q,2408
 tradx/baseClass/futureInstrument.py,sha256=ygsGfzUg337gSwoSaAb8DB31YhLOI-nOv3ApX3z5CWQ,2186
@@ -17,7 +17,7 @@ tradx/baseClass/marketStatusData.py,sha256=lZKJlYB_Bfc1Rpv4rQ15ZQTXgH5EkBDOvH6RS
 tradx/baseClass/openInterestData.py,sha256=L-WuxyNwdZAFPoSVhfJPKv8jOy5K0rSB2o5EkWVSv9g,3111
 tradx/baseClass/openInterestPartialData.py,sha256=vpo18P9VCBuCXbxjggg4ahd0uS5WkP14rBvcLwdrTFw,1673
 tradx/baseClass/optionsInstrument.py,sha256=O3zhNf1R1wmtdPCUaDr7mOM7co0Aeg8AHmPvVpabP60,9886
-tradx/baseClass/order.py,sha256=Xt64sMkp0FCGdckcpDeaieLwcADK7MGng7J5MHdTEwM,1634
+tradx/baseClass/order.py,sha256=1o3AtlysNBs4dRwSjCh11AOoJ97QCNra4D9HLv9vMm4,1699
 tradx/baseClass/orderEvent.py,sha256=P4sJW3NKi53JDo8RwMVVKpCA_dIpkcE1-sm9ikpFYWk,2901
 tradx/baseClass/position.py,sha256=6fzm_Mr1GKSaRArRgsZItgw74_8omy-MBXRTfO12Pwk,1551
 tradx/baseClass/positionEvent.py,sha256=odOMeBqKUKfJ9Zj7IPcipMyfRTMsQyA-hvTJ_NcqKUk,3484
@@ -28,6 +28,6 @@ tradx/baseClass/tradeEvent.py,sha256=djunJW5AzjeMfJZVMlrFprplB7vrYBi-mmaR1TA0MK4
 tradx/constants/holidays.py,sha256=GCg0xGvXm1EM0n6YF1KYEnldSiC2sbsc09Iekjwn0ww,1547
 tradx/logger/logger.py,sha256=DfrjzwYkujTq7arksNTPcQeioXnwT1xgN659blhreog,3232
 tradx/logger/logger2.py,sha256=ebJ-qqnpnCqvyx1Cz1-kGGULtkH-hfrK6UNfa0bSlH8,2654
-tradx-0.1.2.dist-info/METADATA,sha256=3xvSJM8d9adxAb_FV92DHMTqNgEeddWe5F74Xz_REEM,2627
-tradx-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tradx-0.1.2.dist-info/RECORD,,
+tradx-0.1.4.dist-info/METADATA,sha256=zhl0gR2DsVuQkPdyZC3b2ox0CecLvW0MPA9YdBaXu28,2627
+tradx-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tradx-0.1.4.dist-info/RECORD,,