tradx 0.7.10__py3-none-any.whl → 0.7.12__py3-none-any.whl

tradx/baseClass/baseAlgo.py

@@ -165,9 +165,9 @@ class BaseAlgo(ABC):
                 order.OrderType,
                 order.OrderQuantity,
                 order.OrderDisclosedQuantity,
-                order.OrderPrice,
+                order.OrderAverageTradedPriceAPI,
                 order.OrderStopPrice,
-                order.OrderSide,
+                order.OrderSideAPI,
                 order.TimeInForce,
                 order.OrderStatus,
             )

tradx/marketDataEngine.py

@@ -21,6 +21,92 @@ import json
 import pandas
 import asyncio
 
+import pandas as pd
+import math
+from decimal import Decimal
+from io import StringIO
+
+
+def cm_master_string_to_df(cm_master_result: str) -> pd.DataFrame:
+    """
+    Converts the response of cm_master API to a pandas DataFrame.
+
+    This function takes a string response from the cm_master API, which contains data separated by the '|' character,
+    and converts it into a pandas DataFrame. The DataFrame will have predefined column headers.
+
+    Parameters:
+        cm_master_result (str): The string response from the cm_master API.
+
+    Returns:
+        pd.DataFrame: A pandas DataFrame containing the parsed data from the cm_master_result string.
+    """
+    col_header = [
+        "ExchangeSegment",
+        "ExchangeInstrumentID",
+        "InstrumentType",
+        "Name",
+        "Description",
+        "Series",
+        "NameWithSeries",
+        "InstrumentID",
+        "PriceBand_High",
+        "PriceBand_Low",
+        "FreezeQty",
+        "TickSize",
+        "LotSize",
+        "Multiplier",
+        "DisplayName",
+        "ISIN",
+        "PriceNumerator",
+        "PriceDenominator",
+        "DetailedDescription",
+        "ExtendedSurvlndicator",
+        "Cautionlndicator",
+        "GSMIndicator",
+    ]
+    _dtype = {
+        "ExchangeSegment": str,
+        "ExchangeInstrumentID": int,
+        "InstrumentType": int,
+        "Name": str,
+        "Description": str,
+        "Series": str,
+        "NameWithSeries": str,
+        "InstrumentID": int,
+        "LotSize": int,
+        "Multiplier": int,
+        "DisplayName": str,
+        "ISIN": str,
+        "PriceNumerator": int,
+        "PriceDenominator": int,
+        "DetailedDescription": str,
+        "ExtendedSurvlndicator": int,
+        "Cautionlndicator": int,
+        "GSMIndicator": int,
+    }
+    _converters = {
+        "PriceBand_High": Decimal,
+        "PriceBand_Low": Decimal,
+        "TickSize": Decimal,
+        "FreezeQty": float,  # Define FreezeQty as float first
+    }
+
+    cm_master_df = pd.read_csv(
+        StringIO(cm_master_result),
+        sep="|",
+        low_memory=False,
+        header=None,
+        names=col_header,
+        dtype=_dtype,
+        converters=_converters,
+    )
+
+    cm_master_df["FreezeQty"] = cm_master_df["FreezeQty"].apply(
+        lambda x: int(math.floor(x))
+    )  # Floor and convert to int
+
+    return cm_master_df
+
 
 class marketDataEngine(MarketDataSocketClient):
     """Class for market DATA API obj"""
@@ -436,20 +522,9 @@ class marketDataEngine(MarketDataSocketClient):
             """Get Master Instruments Request for NSE cash market segment"""
             exchangesegments = [self.xt.EXCHANGE_NSECM, self.xt.EXCHANGE_BSECM]
             response = await self.xt.get_master(exchangeSegmentList=exchangesegments)
-
-            a = response["result"].split("\n")
-            # List to store successfully parsed DataFrames
-            dfs = []
-            for line in a:
-                try:
-                    df = helper.cm_master_string_to_df(
-                        line
-                    )  # Process each line individually
-                    dfs.append(df)  # Store successfully parsed DataFrame
-                except Exception as e:
-                    print(f"Error processing line: {line}\nError: {e}")
-
-            self.CM_MASTER_DF: pandas.DataFrame = pandas.concat(dfs, ignore_index=True)
+            self.CM_MASTER_DF: pandas.DataFrame = cm_master_string_to_df(
+                response["result"]
+            )
             self.CM_MASTER_DF.to_csv(f"MASTER_CM.csv", index=False)
 
             if self.user_logger:

{tradx-0.7.10.dist-info → tradx-0.7.12.dist-info}/METADATA

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

@@ -2,9 +2,9 @@ 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=pGIdYc1z2XVFYy09Qimb9kfcRLu_Nt4Yjcewf_DC3_U,35683
+tradx/marketDataEngine.py,sha256=W3EF-BSQX20jDm4kdVT9F6Qh1GAI2udO6Z3P280QIYM,37630
 tradx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tradx/baseClass/baseAlgo.py,sha256=LE4ZYb-gLpPMU45ETMg58kRQdGN-Q9wgDhKEasovL-k,20922
+tradx/baseClass/baseAlgo.py,sha256=C4vteQwUvzb0rGsiKvYn-b4sKoCc3GrjNw34ed0FF_8,20941
 tradx/baseClass/candleData.py,sha256=tS-iAoRGwK2xVSvrqmNZPYeB63qD53oPPHaUDfJBWkk,2947
 tradx/baseClass/cmInstrument.py,sha256=WpibHdJyVGVs0B8o1COiXr4rNXB8bapzFLyRaIG0w9Q,2408
 tradx/baseClass/futureInstrument.py,sha256=ygsGfzUg337gSwoSaAb8DB31YhLOI-nOv3ApX3z5CWQ,2186
@@ -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.10.dist-info/METADATA,sha256=rQwSNcfhXwpQ64gUcPp4D3t1MK0agqHc1fj0w9DXMq8,2629
-tradx-0.7.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tradx-0.7.10.dist-info/RECORD,,
+tradx-0.7.12.dist-info/METADATA,sha256=yKQqP_m4zcLlSxFllenzhr5fsYOmshke72uL_7uBYl0,2629
+tradx-0.7.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tradx-0.7.12.dist-info/RECORD,,