quantplay 2.0.23__tar.gz → 2.0.25__tar.gz

{quantplay-2.0.23 → quantplay-2.0.25}/PKG-INFO

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

{quantplay-2.0.23 → quantplay-2.0.25}/quantplay/broker/noren.py

@@ -505,13 +505,11 @@ class Noren(Broker):
                 "norenordno": "order_id",
                 "uid": "user_id",
                 "exch": "exchange",
-                "avgprc": "average_price",
                 "prd": "product",
                 "trantype": "transaction_type",
                 "qty": "quantity",
                 "prc": "price",
                 "prctyp": "order_type",
-                "fillshares": "filled_quantity",
                 "norentm": "order_timestamp",
             }
         )
@@ -528,8 +526,12 @@ class Noren(Broker):
 
         orders_df = orders_df.with_columns(pl.lit(None).alias("variety"))
 
-        if "filled_quantity" not in orders_df.columns:
+        if "fillshares" not in orders_df.columns:
             orders_df = orders_df.with_columns(pl.lit(0).alias("filled_quantity"))
+        else:
+            orders_df = orders_df.with_columns(
+                pl.col("fillshares").cast(pl.Int64).alias("filled_quantity")
+            )
         if "rorgqty" not in orders_df.columns:
             orders_df = orders_df.with_columns(pl.lit(0).alias("pending_quantity"))
         else:
@@ -542,6 +544,12 @@ class Noren(Broker):
             orders_df = orders_df.with_columns(
                 pl.col("trgprc").cast(pl.Float64).alias("trigger_price")
             )
+        if "avgprc" not in orders_df.columns:
+            orders_df = orders_df.with_columns(pl.lit(None).alias("average_price"))
+        else:
+            orders_df = orders_df.with_columns(
+                pl.col("avgprc").cast(pl.Float64).alias("average_price")
+            )
         if "remarks" not in orders_df.columns:
             orders_df = orders_df.with_columns(pl.lit(None).alias("tag"))
         else:

{quantplay-2.0.23 → quantplay-2.0.25}/quantplay/broker/upstox.py

@@ -484,13 +484,6 @@ class Upstox(Broker):
         if tag:
             orders_df = orders_df.filter(pl.col("tag") == tag)
 
-        orders_df = orders_df.with_columns(
-            pl.col("instrument_token")
-            .str.split_exact("|", 1)
-            .struct.rename_fields(["upstox_exchange", "token"])
-            .alias("fields")
-        ).unnest("fields")
-
         orders_df = orders_df.with_columns(
             pl.when(pl.col("exchange") == "NSE")
             .then(pl.col("tradingsymbol").str.replace("-EQ", ""))
@@ -498,6 +491,17 @@ class Upstox(Broker):
             .alias("tradingsymbol")
         )
 
+        orders_df = orders_df.with_columns(
+            pl.struct(["exchange", "tradingsymbol"])
+            .map_elements(
+                lambda x: int(
+                    self.symbol_attribute(x["exchange"], x["tradingsymbol"], "token")
+                ),
+                return_dtype=pl.Int64,
+            )
+            .alias("token")
+        )
+
         orders_df = orders_df.with_columns(
             pl.col("order_timestamp")
             .str.strptime(pl.Datetime, "%Y-%m-%d %H:%M:%S")

{quantplay-2.0.23 → quantplay-2.0.25}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.23 → quantplay-2.0.25}/setup.py

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