quantplay 2.0.76__tar.gz → 2.0.81__tar.gz

{quantplay-2.0.76 → quantplay-2.0.81}/PKG-INFO

@@ -1,36 +1,11 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.76
+Version: 2.0.81
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
 Author-email: 
 License: MIT
-Requires-Dist: setuptools
-Requires-Dist: path
-Requires-Dist: pyotp
-Requires-Dist: retrying
-Requires-Dist: boto3
-Requires-Dist: numpy
-Requires-Dist: websocket-client
-Requires-Dist: smartapi-python
-Requires-Dist: logzero
-Requires-Dist: selenium
-Requires-Dist: requests
-Requires-Dist: pandas
-Requires-Dist: pyarrow
-Requires-Dist: polars
-Requires-Dist: kiteconnect
-Requires-Dist: pya3
-Requires-Dist: py5paisa
-Requires-Dist: upstox-python-sdk
-Requires-Dist: undetected-chromedriver
-Requires-Dist: cachetools
-Requires-Dist: py_vollib
-Requires-Dist: python-engineio
-Requires-Dist: python-socketio
-Requires-Dist: six
-Requires-Dist: dhanhq
 
 # Quantplay Alpha playground
 

{quantplay-2.0.76 → quantplay-2.0.81}/quantplay/broker/dhan.py

@@ -24,6 +24,8 @@ from quantplay.model.generics import (
     TransactionType,
 )
 from quantplay.utils.constant import Constants, OrderType
+from quantplay.utils.pickle_utils import InstrumentData
+from quantplay.wrapper.aws.s3 import S3Utils
 
 
 class Dhan(Broker):
@@ -38,14 +40,26 @@ class Dhan(Broker):
                 client_id=user_id,
                 access_token=access_token,
             )
-
+            self.user_id = user_id
         except Exception:
             raise TokenException("Dhan Session Expired")
         if load_instrument:
             self.load_instrument()
 
     def load_instrument(self, file_name: str | None = None) -> None:
-        super().load_instrument("dhan_instruments")
+        try:
+            self.symbol_data = InstrumentData.get_instance().load_data(  # type: ignore
+                "dhan_instruments"
+            )
+            Constants.logger.info("[LOADING_INSTRUMENTS] loading data from cache")
+        except Exception:
+            self.instrument_data = S3Utils.read_csv(
+                "quantplay-market-data",
+                "symbol_data/dhan_instruments.csv",
+            )
+            self.initialize_symbol_data(save_as="dhan_instruments")
+
+        self.initialize_broker_symbol_map()
 
     def set_username(self, username: str):
         self.username = username
@@ -53,9 +67,6 @@ class Dhan(Broker):
     def get_username(self):
         return self.username
 
-    def get_quantplay_symbol(self, symbol: str):
-        return symbol
-
     @retry(
         wait_exponential_multiplier=3000,
         wait_exponential_max=10000,
@@ -321,7 +332,12 @@ class Dhan(Broker):
             }
         )
         orders_df = orders_df.with_columns(
-            pl.when(pl.col("product") == "INTRADAY").then(pl.lit("MIS")).alias("product"),
+            pl.when(pl.col("product") == "INTRADAY")
+            .then(pl.lit("MIS"))
+            .when(pl.col("product") == "MARGIN")
+            .then(pl.lit("NRML"))
+            .otherwise(pl.col("product"))
+            .alias("product"),
             pl.when(pl.col("exchange") == "NSE_FNO")
             .then(pl.lit("NFO"))
             .when(pl.col("exchange") == "BSE_FO")
@@ -346,6 +362,13 @@ class Dhan(Broker):
             .alias("status"),
         )
 
+        orders_df = orders_df.with_columns(
+            pl.when((pl.col("status") == "OPEN") & (pl.col("trigger_price") > 0))
+            .then(pl.lit("TRIGGER PENDING"))
+            .otherwise(pl.col("status"))
+            .alias("status")
+        )
+
         orders_df = orders_df.with_columns(
             pl.lit(None).cast(pl.Float64).alias("ltp"),
             pl.lit(0.0).alias("average_price"),

{quantplay-2.0.76 → quantplay-2.0.81}/quantplay/broker/generics/broker.py

@@ -74,6 +74,7 @@ class Broker(ABC):
         "trigger_price": pl.Float64,
         "ltp": pl.Float64,
         "order_timestamp": pl.Datetime(time_unit="ms"),
+        "update_timestamp": pl.Datetime(time_unit="ms"),
         "token": pl.Int64,
         "quantity": pl.Int64,
         "pending_quantity": pl.Int64,
@@ -595,7 +596,10 @@ class Broker(ABC):
                     delta_time = str(
                         datetime.now().replace(microsecond=0) - timedelta(seconds=120)
                     )
-                    orders = orders[orders["update_timestamp"] >= delta_time]
+                    orders = orders.filter(
+                        pl.col("update_timestamp").dt.strftime("%Y-%m-%d %H:%M:%S")
+                        >= delta_time
+                    )
 
                     orders = orders.to_dicts()
                     for order in orders:

{quantplay-2.0.76 → quantplay-2.0.81}/quantplay/broker/noren.py

@@ -711,6 +711,10 @@ class Noren(Broker):
             if "collateral" in api_margins:
                 collateral = api_margins["collateral"]
 
+            holdings_val = 0
+            if "grcoll" in api_margins:
+                holdings_val = api_margins["grcoll"]
+
             if "marginused" not in api_margins:
                 api_margins["margin_used"] = 0
             else:
@@ -735,7 +739,7 @@ class Noren(Broker):
             except Exception:
                 margins["cash"] = 0
 
-            margins["total_balance"] = float(api_margins["cash"]) + float(collateral)
+            margins["total_balance"] = float(api_margins["cash"]) + float(holdings_val)
 
             return margins
 

{quantplay-2.0.76 → quantplay-2.0.81}/quantplay.egg-info/PKG-INFO

@@ -1,36 +1,11 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.76
+Version: 2.0.81
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
 Author-email: 
 License: MIT
-Requires-Dist: setuptools
-Requires-Dist: path
-Requires-Dist: pyotp
-Requires-Dist: retrying
-Requires-Dist: boto3
-Requires-Dist: numpy
-Requires-Dist: websocket-client
-Requires-Dist: smartapi-python
-Requires-Dist: logzero
-Requires-Dist: selenium
-Requires-Dist: requests
-Requires-Dist: pandas
-Requires-Dist: pyarrow
-Requires-Dist: polars
-Requires-Dist: kiteconnect
-Requires-Dist: pya3
-Requires-Dist: py5paisa
-Requires-Dist: upstox-python-sdk
-Requires-Dist: undetected-chromedriver
-Requires-Dist: cachetools
-Requires-Dist: py_vollib
-Requires-Dist: python-engineio
-Requires-Dist: python-socketio
-Requires-Dist: six
-Requires-Dist: dhanhq
 
 # Quantplay Alpha playground
 

{quantplay-2.0.76 → quantplay-2.0.81}/setup.py

@@ -21,7 +21,7 @@ requirements = [
 setup(
     name="quantplay",
     long_description=Path("README.md").read_text(),
-    version="2.0.76",
+    version="2.0.81",
     setup_requires=["pytest-runner"],
     install_requires=requirements,
     tests_require=[],