quantplay 2.0.148__tar.gz → 2.0.149__tar.gz

{quantplay-2.0.148 → quantplay-2.0.149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.148
+Version: 2.0.149
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
@@ -21,7 +21,7 @@ Requires-Dist: requests
 Requires-Dist: pandas
 Requires-Dist: pyarrow
 Requires-Dist: polars
-Requires-Dist: breeze-connect
+Requires-Dist: breeze_connect
 Requires-Dist: kiteconnect
 Requires-Dist: pya3
 Requires-Dist: py5paisa

{quantplay-2.0.148 → quantplay-2.0.149}/quantplay/broker/broker_factory.py

@@ -10,7 +10,7 @@ from quantplay.broker.angelone import AngelOne
 from quantplay.broker.dhan import Dhan
 from quantplay.broker.five_paisa import FivePaisa
 from quantplay.broker.flattrade import FlatTrade
-from quantplay.broker.icici_direct import ICICI
+# from quantplay.broker.icici_direct import ICICI
 from quantplay.broker.iifl_xts import IIFL as IIFL_XTS
 from quantplay.broker.jainam_xts import Jainam
 from quantplay.broker.kotak import Kotak
@@ -35,7 +35,7 @@ BrokerType = (
     | Kotak
     | Dhan
     | Jainam
-    | ICICI
+    # | ICICI
 )
 
 instrument_cache = InstrumentCache()
@@ -261,25 +261,25 @@ class BrokerFactory:
             broker_client.api.close_websocket()
             broker_data["user_token"] = broker_client.user_token
 
-        elif broker == Broker.ICICI:
-            if "password" in broker_data:
-                broker_client = ICICI(
-                    api_key=broker_data["api_key"],
-                    api_secret=broker_data["api_secret"],
-                    user_id=broker_data["user_id"],
-                    password=broker_data["password"],
-                    totp=broker_data["totp"],
-                    session_token=broker_data["session_token"],
-                    load_instrument=False,
-                )
-            else:
-                broker_client = ICICI(
-                    api_key=broker_data["api_key"],
-                    api_secret=broker_data["api_secret"],
-                    session_token=broker_data["session_token"],
-                    load_instrument=False,
-                )
-            broker_data["session_token"] = broker_client.session_token
+        # elif broker == Broker.ICICI:
+        #     if "password" in broker_data:
+        #         broker_client = ICICI(
+        #             api_key=broker_data["api_key"],
+        #             api_secret=broker_data["api_secret"],
+        #             user_id=broker_data["user_id"],
+        #             password=broker_data["password"],
+        #             totp=broker_data["totp"],
+        #             session_token=broker_data["session_token"],
+        #             load_instrument=False,
+        #         )
+        #     else:
+        #         broker_client = ICICI(
+        #             api_key=broker_data["api_key"],
+        #             api_secret=broker_data["api_secret"],
+        #             session_token=broker_data["session_token"],
+        #             load_instrument=False,
+        #         )
+        #     broker_data["session_token"] = broker_client.session_token
 
         elif broker == Broker.FLATTRADE:
             broker_client = FlatTrade(
@@ -425,13 +425,13 @@ class BrokerFactory:
                 load_instrument=load_instrument,
             )
 
-        elif broker == Broker.ICICI:
-            broker_client = ICICI(
-                api_key=broker_data["api_key"],
-                api_secret=broker_data["api_secret"],
-                session_token=broker_data["session_token"],
-                load_instrument=load_instrument,
-            )
+        # elif broker == Broker.ICICI:
+        #     broker_client = ICICI(
+        #         api_key=broker_data["api_key"],
+        #         api_secret=broker_data["api_secret"],
+        #         session_token=broker_data["session_token"],
+        #         load_instrument=load_instrument,
+        #     )
 
         elif broker == Broker.FLATTRADE:
             broker_client = FlatTrade(

{quantplay-2.0.148 → quantplay-2.0.149}/quantplay/broker/icici_direct.py

@@ -80,7 +80,7 @@ class ICICI(Broker):
         user_id: str,
         password: str,
         totp: str,
-    ):
+    ) -> None:
         session_token = BreezeUtils.get_session_code(api_key, user_id, password, totp)
         self.session_token = session_token
 
@@ -137,12 +137,12 @@ class ICICI(Broker):
 
         print(data)
 
-        if data["Success"] is None or len(data["Success"]) == 0:
+        if data is None or len(data) == 0:
             raise NoDataException(f"Historical Data For {data}")
 
-        return pl.from_dicts(data["Success"])
+        return pl.from_dicts(data)
 
-    def get_symbol(self, symbol: str, exchange: ExchangeType | None = None):
+    def get_symbol(self, symbol: str, exchange: ExchangeType | None = None) -> str:
         if symbol not in self.quantplay_symbol_map:
             return symbol
 
@@ -233,13 +233,19 @@ class ICICI(Broker):
         return orders_df
 
     def positions(self, drop_cnc: bool = True) -> pl.DataFrame:
-        positions: Dict[str, Any] = self.wrapper.get_portfolio_positions()  # type:ignore
+        to_date = datetime.now().isoformat()[:19] + ".000Z"
+        from_date = (datetime.now() - timedelta(hours=10)).isoformat()[:19] + ".000Z"
+        positions: Dict[str, Any] = self.wrapper.get_portfolio_holdings(  # type:ignore
+            exchange_code="NFO",
+            from_date=from_date,
+            to_date=to_date,
+            stock_code="",
+            portfolio_type="",
+        )
         if "Success" in positions and positions["Success"] is None:
             return pl.DataFrame(schema=self.positions_schema)
         positions_df = pl.DataFrame(positions["Success"])
-        if "realized_profit" not in positions_df:
-            positions_df = positions_df.with_columns(pl.lit(0.0).alias("realized_profit"))
-        positions_df = positions_df.filter(pl.col("exchange_code").is_in(["NFO", "BFO"]))
+
         positions_df = positions_df.rename(
             {
                 "exchange_code": "exchange",
@@ -248,9 +254,6 @@ class ICICI(Broker):
                 "product_type": "product",
             }
         )
-        positions_df = positions_df.with_columns(
-            pl.col("quantity").cast(pl.Int32).alias("quantity")
-        )
         positions_df = positions_df.with_columns(
             pl.col("strike").cast(pl.Float32).alias("strike"),
             pl.col("expiry").str.strptime(pl.Date, format="%d-%b-%Y").alias("expiry"),
@@ -259,11 +262,11 @@ class ICICI(Broker):
             .when(pl.col("right") == "Put")
             .then(pl.lit("PE"))
             .alias("instrument_type"),
-            pl.when(pl.col("action") == "Sell")
-            .then(abs(pl.col("quantity").cast(pl.Float32)) * -1)
-            .otherwise(abs(pl.col("quantity").cast(pl.Float32)))
-            .alias("quantity"),
-            pl.lit(0).alias("pnl"),
+            (
+                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"),
         )
 
@@ -340,14 +343,9 @@ class ICICI(Broker):
         if tag is None:
             tag = ""
         icici_tradingsymbol = self.get_symbol(tradingsymbol)
-        try:
-            symbol_data: Dict[str, Any] = self.symbol_data[  # type:ignore
-                f"{exchange}:{icici_tradingsymbol}"
-            ]
-        except KeyError:
-            raise QuantplayOrderPlacementException(
-                f"Failed to find tradingsymbol {tradingsymbol}"
-            )
+        symbol_data: Dict[str, Any] = self.symbol_data[  # type:ignore
+            f"{exchange}:{icici_tradingsymbol}"
+        ]
         icici_product = "cash"
         if exchange in ["NFO", "BFO"]:
             icici_product = "futures"
@@ -369,7 +367,7 @@ class ICICI(Broker):
         else:
             response: Dict[str, Any] = self.wrapper.place_order(  # type:ignore
                 stock_code=symbol_data["symbol_code"],
-                exchange_code=exchange,
+                exchange_code="NFO",
                 product=icici_product,
                 action=transaction_type.lower(),
                 order_type=order_type.lower(),
@@ -384,8 +382,6 @@ class ICICI(Broker):
             )
         if "Success" in response and "order_id" in response["Success"]:
             return response["Success"]["order_id"]
-        elif "Error" in response:
-            raise QuantplayOrderPlacementException(response["Error"])
         else:
             raise QuantplayOrderPlacementException(
                 f"ICICI: order placement failed {response}"
@@ -452,8 +448,6 @@ class ICICI(Broker):
         try:
             data = fn(*args, **kwargs)
 
-            print(data)
-
             if data["Status"] > 200:
                 if data["Error"] == "Limit exceed: API call per day: ":
                     raise RateLimitExcededException(data["Error"])

{quantplay-2.0.148 → quantplay-2.0.149}/quantplay.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.148
+Version: 2.0.149
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
@@ -21,7 +21,7 @@ Requires-Dist: requests
 Requires-Dist: pandas
 Requires-Dist: pyarrow
 Requires-Dist: polars
-Requires-Dist: breeze-connect
+Requires-Dist: breeze_connect
 Requires-Dist: kiteconnect
 Requires-Dist: pya3
 Requires-Dist: py5paisa

{quantplay-2.0.148 → quantplay-2.0.149}/quantplay.egg-info/requires.txt

@@ -13,7 +13,7 @@ requests
 pandas
 pyarrow
 polars
-breeze-connect
+breeze_connect
 kiteconnect
 pya3
 py5paisa

{quantplay-2.0.148 → quantplay-2.0.149}/setup.py

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