quantplay 2.0.133__tar.gz → 2.0.136__tar.gz

{quantplay-2.0.133 → quantplay-2.0.136}/PKG-INFO

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

{quantplay-2.0.133 → quantplay-2.0.136}/quantplay/broker/icici_direct.py

@@ -54,7 +54,7 @@ class ICICI(Broker):
         load_instrument: bool = True,
     ) -> None:
         if api_key and api_secret and session_token:
-            self.wrapper = BreezeConnect(api_key) # type:ignore
+            self.wrapper = BreezeConnect(api_key)  # type:ignore
             self.wrapper.generate_session(api_secret, session_token)  # type: ignore
 
         if load_instrument:
@@ -143,7 +143,7 @@ class ICICI(Broker):
                 "exchange_code": "exchange",
                 "expiry_date": "expiry",
                 "strike_price": "strike",
-                "user_remark" : "tag",
+                "user_remark": "tag",
             }
         )
         orders_df = orders_df.with_columns(
@@ -196,8 +196,17 @@ class ICICI(Broker):
             pl.lit(None).alias("status_message_raw"),
             pl.col("order_timestamp").alias("update_timestamp"),
         )
+        orders_df = orders_df[list(self.orders_schema.keys())].cast(self.orders_schema)
+        orders_df = orders_df.with_columns(
+            pl.when(pl.col("status") == "EXECUTED")
+            .then(pl.lit("COMPLETE"))
+            .when(pl.col("status") == "ORDERED")
+            .then(pl.lit("OPEN"))
+            .otherwise(pl.col("status"))
+            .alias("status")
+        )
 
-        return orders_df[list(self.orders_schema.keys())].cast(self.orders_schema)
+        return orders_df
 
     def positions(self, drop_cnc: bool = True) -> pl.DataFrame:
         to_date = datetime.now().isoformat()[:19] + ".000Z"
@@ -229,6 +238,12 @@ class ICICI(Broker):
             .when(pl.col("right") == "Put")
             .then(pl.lit("PE"))
             .alias("instrument_type"),
+            (
+                    pl.col("unrealized_profit").cast(pl.Float32)
+                    + pl.col("realized_profit").cast(pl.Float32)
+            ).alias("pnl"),
+            pl.col("quantity").cast(pl.Int32).alias("quantity"),
+            pl.col("average_price").cast(pl.Float32).alias("average_price")
         )
 
         positions_df = positions_df.with_columns(
@@ -255,17 +270,17 @@ class ICICI(Broker):
         )
 
         positions_df = positions_df.with_columns(
-            pl.lit(0).alias("sell_value"),
-            pl.lit(0).alias("buy_value"),
+            pl.when(pl.col("quantity") < 0)
+            .then(pl.col("quantity").abs()*pl.col("average_price")).otherwise(pl.lit(0)).alias("sell_value"),
+            pl.when(pl.col("quantity") > 0)
+            .then(pl.col("quantity").abs() * pl.col("average_price")).otherwise(pl.lit(0)).alias("buy_value"),
             pl.lit(0).alias("ltp"),
-            pl.lit(0).alias("sell_quantity"),
+            pl.when(pl.col("quantity") < 0)
+            .then(pl.col("quantity").abs()).otherwise(pl.lit(0)).alias("sell_quantity"),
+            pl.when(pl.col("quantity") > 0)
+            .then(pl.col("quantity").abs()).otherwise(pl.lit(0)).alias("buy_quantity"),
             pl.lit("NRML").alias("product"),
-            pl.lit(0).alias("buy_quantity"),
             pl.col("instrument_type").alias("option_type"),
-            (
-                pl.col("unrealized_profit").cast(pl.Float32)
-                + pl.col("realized_profit").cast(pl.Float32)
-            ).alias("pnl"),
         )
         return positions_df[list(self.positions_schema.keys())].cast(
             self.positions_schema
@@ -307,7 +322,7 @@ class ICICI(Broker):
                 quantity=str(quantity),
                 price=str(price),
                 validity="day",
-                user_remark=tag
+                user_remark=tag,
             )
         else:
             response = self.wrapper.place_order(
@@ -323,7 +338,7 @@ class ICICI(Broker):
                 expiry_date=str(symbol_data["expiry"]) + "T06:00:00.000Z",
                 right=self.get_right(symbol_data),
                 strike_price=str(symbol_data["strike"]),
-                user_remark=tag
+                user_remark=tag,
             )
         return response["Success"]["order_id"]
 
@@ -373,7 +388,7 @@ class ICICI(Broker):
         }
 
     def get_exchange(self, exchange: ExchangeType) -> ...:
-        return
+        return exchange
 
     def get_product(self, product: ProductType) -> ...:
         return

{quantplay-2.0.133 → quantplay-2.0.136}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.133 → quantplay-2.0.136}/setup.py

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