quantplay 2.0.164__tar.gz → 2.0.166__tar.gz

{quantplay-2.0.164 → quantplay-2.0.166}/PKG-INFO

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

{quantplay-2.0.164 → quantplay-2.0.166}/quantplay/broker/broker_factory.py

@@ -188,7 +188,7 @@ class BrokerFactory:
                 consumer_secret=broker_data["consumer_secret"],
                 mobilenumber=broker_data["mobilenumber"],
                 password=broker_data["password"],
-                mpin=broker_data["mpin"],
+                otp=broker_data.get("otp"),
                 load_instrument=False,
             )
 
@@ -387,6 +387,7 @@ class BrokerFactory:
         elif broker == Broker.KOTAK:
             broker_client = Kotak(
                 configuration=broker_data["configuration"],
+                otp=broker_data.get("otp"),
                 load_instrument=load_instrument,
             )
         elif broker == Broker.ZERODHA:

{quantplay-2.0.164 → quantplay-2.0.166}/quantplay/broker/kotak.py

@@ -7,6 +7,7 @@ from urllib.parse import urlencode
 import polars as pl
 import requests
 import urllib
+import jwt
 
 from quantplay.broker.generics.broker import Broker
 from quantplay.model.broker import (
@@ -44,13 +45,13 @@ class Kotak(Broker):
         consumer_secret: str | None = None,
         mobilenumber: str | None = None,
         password: str | None = None,
-        mpin: str | None = None,
+        otp: str | None = None,
         configuration: dict[str, str] | None = None,
         load_instrument: bool = True,
-    ):
+    ) -> None:
         super().__init__()
 
-        self.configuration: dict[str, str] = {
+        self.configuration: dict[str, str | None] = {
             "fin_key": "X6Nk8cQhUgGmJ2vBdWw4sfzrz4L5En",
         }
 
@@ -60,14 +61,17 @@ class Kotak(Broker):
                 "bearer_token": configuration["bearer_token"],
                 "view_token": configuration["view_token"],
                 "sid": configuration["sid"],
-                "edit_token": configuration["edit_token"],
-                "edit_sid": configuration["edit_sid"],
-                "edit_rid": configuration["edit_rid"],
-                "serverId": configuration["serverId"],
+                "edit_token": configuration.get("edit_token"),
+                "edit_sid": configuration.get("edit_sid"),
+                "edit_rid": configuration.get("edit_rid"),
+                "serverId": configuration.get("serverId"),
             }
 
-        elif consumer_key and consumer_secret and mobilenumber and password and mpin:
-            self.login(consumer_key, consumer_secret, mobilenumber, password, mpin)
+        elif consumer_key and consumer_secret and mobilenumber and password:
+            self.login(consumer_key, consumer_secret, mobilenumber, password)
+
+        if otp:
+            self.verify_2fa(otp)
 
         if load_instrument:
             self.load_instrument()
@@ -96,8 +100,7 @@ class Kotak(Broker):
         consumer_secret: str,
         mobilenumber: str,
         password: str,
-        mpin: str,
-    ):
+    ) -> None:
         base64_string = str(consumer_key) + ":" + str(consumer_secret)
         base64_token = base64_string.encode("ascii")
 
@@ -132,7 +135,29 @@ class Kotak(Broker):
         self.configuration["view_token"] = view_token.get("data").get("token")
         self.configuration["sid"] = view_token.get("data").get("sid")
 
-        view_token_resp = requests.post(
+        decode_jwt = jwt.decode(  # type: ignore
+            self.configuration["view_token"], options={"verify_signature": False}
+        )
+        userid = decode_jwt.get("sub")
+        self.kotakUserId = userid
+
+        generate_otp_resp = requests.post(
+            url=f"{PROD_BASE_URL}login/1.0/login/otp/generate",
+            headers={"Authorization": "Bearer " + self.configuration["bearer_token"]},
+            data=json.dumps({"userId": userid, "sendEmail": True, "isWhitelisted": True}),
+        )
+
+        _generate_otp = json.loads(generate_otp_resp.text)
+
+    def verify_2fa(self, otp: str) -> None:
+        if (
+            self.configuration["bearer_token"] is None
+            or self.configuration["sid"] is None
+            or self.configuration["view_token"] is None
+        ):
+            raise InvalidArgumentException("Missing Params")
+
+        login_resp = requests.post(
             url=f"{PROD_BASE_URL}login/1.0/login/v2/validate",
             headers={
                 "Authorization": "Bearer " + self.configuration["bearer_token"],
@@ -140,14 +165,9 @@ class Kotak(Broker):
                 "Auth": self.configuration["view_token"],
                 "Content-Type": "application/json",
             },
-            data=json.dumps({"mobileNumber": mobilenumber, "password": password}),
+            data=json.dumps({"userId": self.kotakUserId, "otp": otp}),
         )
 
-        login_resp = requests.post(
-            url=f"{PROD_BASE_URL}login/1.0/login/v2/validate",
-            headers={"Authorization": "Bearer " + self.configuration["bearer_token"]},
-            data=json.dumps({"mobileNumber": mobilenumber, "mpin": mpin}),
-        )
         edit_token_resp = json.loads(login_resp.text)
 
         if "error" not in edit_token_resp:
@@ -157,27 +177,7 @@ class Kotak(Broker):
             self.configuration["serverId"] = edit_token_resp.get("data").get("hsServerId")
             self.user_id = edit_token_resp.get("data").get("ucc")
 
-        # decode_jwt = jwt.decode(  # type: ignore
-        #     self.configuration["view_token"], options={"verify_signature": False}
-        # )
-        # userid = decode_jwt.get("sub")
-        # self.kotakUserId = userid
-
-        # generate_otp_resp = requests.post(
-        #     url=f"{PROD_BASE_URL}login/1.0/login/otp/generate",
-        #     headers={"Authorization": "Bearer " + self.configuration["bearer_token"]},
-        #     data=json.dumps({"userId": userid, "sendEmail": True, "isWhitelisted": True}),
-        # )
-
-        # generate_otp = json.loads(generate_otp_resp.text)
-
-    def get_base64_token(self, consumer_key: str, consumer_secret: str):
-        """The Base64 Token Generation.
-        This function will generate the Base64 Token this will be used to generate the Bearer Token.
-        Return the Token in a String Format
-        """
-
-    def order_history(self, order_id: str):
+    def order_history(self, order_id: str) -> pl.DataFrame:
         body = {"nOrdNo": order_id}
         order_history = self.request("order_history", body=body)["data"]  # type:ignore
         return pl.DataFrame(order_history)
@@ -591,7 +591,7 @@ class Kotak(Broker):
         url = f"{PROD_BASE_URL}{url}"
 
         request_headers = {
-            "Authorization": "Bearer " + self.configuration["bearer_token"],
+            "Authorization": f'Bearer {self.configuration["bearer_token"]}',
             "Sid": self.configuration["edit_sid"],
             "Auth": self.configuration["edit_token"],
             "neo-fin-key": self.configuration["fin_key"],

{quantplay-2.0.164 → quantplay-2.0.166}/quantplay/broker/noren.py

@@ -45,7 +45,7 @@ class Noren(Broker):
         self,
         load_instrument: bool = True,
         order_updates: Queue[OrderUpdateEvent] | None = None,
-    ):
+    ) -> None:
         super().__init__()
 
         self.order_updates = order_updates
@@ -253,7 +253,7 @@ class Noren(Broker):
                 f"[PLACE_ORDER_FAILED] {exception_message}"
             )
 
-    def ltp(self, exchange: ExchangeType, tradingsymbol: str):
+    def ltp(self, exchange: ExchangeType, tradingsymbol: str) -> float:
         tradingsymbol = self.get_symbol(tradingsymbol, exchange)
 
         try:
@@ -288,7 +288,7 @@ class Noren(Broker):
             "lower_circuit": float(data["lc"]),
         }
 
-    def order_history(self, order_id: str):
+    def order_history(self, order_id: str) -> dict[str, str | Any]:
         order_history = self.api.single_order_history(order_id)
 
         if order_history is None:
@@ -406,10 +406,12 @@ class Noren(Broker):
             )
             .alias("price")
         )
+        print(holdings_df)
 
         holdings_df = holdings_df.with_columns(
             pl.col("tradingsymbol").str.replace("-EQ", "").alias("tradingsymbol")
         )
+        print(holdings_df)
 
         holdings_df = holdings_df.with_columns(
             (pl.col("quantity") * pl.col("price")).alias("value"),
@@ -418,6 +420,7 @@ class Noren(Broker):
             (pl.col("quantity") * pl.col("price")).alias("current_value"),
             ((pl.col("price") / pl.col("average_price") - 1) * 100).alias("pct_change"),
         )
+        print(holdings_df)
 
         return holdings_df[list(self.holidings_schema.keys())].cast(self.holidings_schema)
 

{quantplay-2.0.164 → quantplay-2.0.166}/quantplay/broker/shoonya.py

@@ -25,7 +25,7 @@ class FinvAsia(Noren):
         vendor_code: str | None = None,
         user_token: str | None = None,
         load_instrument: bool = True,
-    ):
+    ) -> None:
         super().__init__(order_updates=order_updates, load_instrument=load_instrument)
         self.api = FA_NorenApi(
             "https://api.shoonya.com/NorenWClientTP/",

{quantplay-2.0.164 → quantplay-2.0.166}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.164 → quantplay-2.0.166}/setup.py

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