quantplay 2.0.73__tar.gz → 2.0.75__tar.gz

{quantplay-2.0.73 → quantplay-2.0.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.73
+Version: 2.0.75
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.0.73 → quantplay-2.0.75}/quantplay/broker/broker_factory.py

@@ -61,7 +61,7 @@ broker_instruments_map = {
     Broker.ANGELONE: "angelone_instruments",
     Broker.ALICEBLUE: "aliceblue_instruments",
     Broker.UPSTOX: "upstox_instruments",
-    Broker.DHAN: "upstox_instruments",
+    Broker.DHAN: "dhan_instruments",
     Broker.KOTAK: "upstox_instruments",
     Broker.FIVEPAISA_OPENAPI: "5paisa_instruments",
 }

{quantplay-2.0.73 → quantplay-2.0.75}/quantplay/broker/dhan.py

@@ -41,9 +41,11 @@ class Dhan(Broker):
 
         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("upstox_instruments")
+        super().load_instrument("dhan_instruments")
 
     def set_username(self, username: str):
         self.username = username
@@ -62,16 +64,32 @@ class Dhan(Broker):
     def modify_order(self, order: Any) -> str:
         # TODO
         order_id = order["order_id"]
+        existing_order: Dict[str, Any] = self.invoke_dhan_api(
+            self.dhan.get_order_by_id,  # type: ignore
+            order_id,
+        )
 
+        if "quantity" not in order:
+            order["quantity"] = existing_order["data"]["quantity"]
+        if "trigger_price" not in order:
+            order["trigger_price"] = None
         try:
-            order["variety"] = "regular"
-            if "trigger_price" not in order:
-                order["trigger_price"] = None
             Constants.logger.info(
                 "Modifying order [{}] new price [{}]".format(
                     order["order_id"], order["price"]
                 )
             )
+            self.dhan.modify_order(  # type: ignore
+                order_id,
+                order["order_type"],
+                None,
+                order["quantity"],
+                order["price"],
+                order["trigger_price"],
+                None,
+                self.dhan.DAY,
+            )
+
             response = self.wrapper.modify_order(  # type: ignore
                 order_id=order_id,
                 variety=order["variety"],
@@ -94,7 +112,7 @@ class Dhan(Broker):
         return order_id
 
     def cancel_order(self, order_id: str, variety: str | None = "regular"):
-        self.wrapper.cancel_order(order_id=order_id, variety=variety)  # type: ignore
+        self.dhan.cancel_order(order_id=order_id)  # type: ignore
 
     def get_order_type(self, order_type: OrderTypeType) -> DhanTypes.OrderTypeType:
         if order_type == OrderType.market:
@@ -132,6 +150,12 @@ class Dhan(Broker):
 
         raise InvalidArgumentException(f"Product {product} not supported for trading")
 
+    def get_symbol(self, symbol: str, exchange: ExchangeType | None = None):
+        if symbol not in self.quantplay_symbol_map:
+            return symbol
+
+        return self.quantplay_symbol_map[symbol]
+
     # @retry(wait_exponential_multiplier=3000, wait_exponential_max=10000, stop_max_attempt_number=3)
     def place_order(
         self,
@@ -149,8 +173,10 @@ class Dhan(Broker):
             Constants.logger.info(
                 f"[PLACING_ORDER] {tradingsymbol} {exchange} {quantity} {tag}"
             )
+            tradingsymbol = self.get_symbol(tradingsymbol)
+            security_id = self.symbol_data[f"{exchange}:{tradingsymbol}"]["token"]
             order_id: str = self.dhan.place_order(  # type:ignore
-                security_id="1333",  # hdfcbank
+                security_id=security_id,  # hdfcbank
                 exchange_segment=self.get_exchange_segment(exchange),
                 transaction_type=transaction_type,
                 quantity=quantity,

{quantplay-2.0.73 → quantplay-2.0.75}/quantplay/broker/noren.py

@@ -657,7 +657,7 @@ class Noren(Broker):
             .alias("order_type")
         )
 
-        if "rejreason" in orders:
+        if "rejreason" in orders_df:
             orders_df = orders_df.with_columns(
                 pl.col("rejreason").alias("status_message")
             )

{quantplay-2.0.73 → quantplay-2.0.75}/quantplay.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.73
+Version: 2.0.75
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.0.73 → quantplay-2.0.75}/setup.py

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