quantplay 2.0.56__tar.gz → 2.0.58__tar.gz

{quantplay-2.0.56 → quantplay-2.0.58}/PKG-INFO

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

{quantplay-2.0.56 → quantplay-2.0.58}/quantplay/broker/broker_factory.py

@@ -90,31 +90,32 @@ broker_required_args = {
 }
 
 broker_generate_args = {
-    Broker.ZERODHA: set(["user_id", "api_key", "api_secret", "password", "totp"]),
+    Broker.ZERODHA: set(["user_id", "api_key", "api_secret"]),
     Broker.FLATTRADE: set(["user_id" "api_secret", "password", "totp_key", "api_key"]),
-    Broker.IIFL_XTS: set(["user_id", "wrapper", "md_wrapper"]),
+    Broker.IIFL_XTS: set(["api_key", "api_secret", "md_api_key", "md_api_secret"]),
     Broker.MOTILAL: set(["user_id", "password", "api_key", "two_fa", "totp"]),
     Broker.ALICEBLUE: set(["user_id", "api_key"]),
     Broker.DHAN: set(["user_id", "access_token"]),
-    Broker.FIVEPAISA_OPENAPI: set(["user_id", "client"]),
+    Broker.FIVEPAISA_OPENAPI: set(
+        [
+            "app_source",
+            "app_user_id",
+            "app_password",
+            "user_key",
+            "encryption_key",
+            "client_id",
+            "totp_key",
+            "pin",
+        ]
+    ),
     Broker.ANGELONE: set(["user_id", "api_key", "mpin", "totp"]),
     Broker.FINVASIA: set(
         ["api_secret", "imei", "password", "totp_key", "user_id", "vendor_code"]
     ),
+    Broker.UPSTOX: set(["user_id", "access_token"]),
     Broker.KOTAK: set(
         ["consumer_key", "consumer_secret", "mobilenumber", "password", "mpin"]
     ),
-    Broker.UPSTOX: set(
-        [
-            "user_id",
-            "api_key",
-            "api_secret",
-            "totp",
-            "mobile_number",
-            "account_pin",
-            "redirect_url",
-        ]
-    ),
 }
 
 
@@ -126,10 +127,10 @@ class BrokerFactory:
         return f"{username}:{broker_name}"
 
     def validate_broker_args(
-        self, broker_info: Dict[str, Any], is_generator_args: bool = False
+        self, user_broker_account: Dict[str, Any], is_generator_args: bool = False
     ):
-        broker = broker_info["broker"]
-        broker_data = broker_info["broker_data"]
+        broker = user_broker_account["broker"]
+        broker_data = user_broker_account["broker_data"]
 
         compare_map = broker_generate_args if is_generator_args else broker_required_args
 
@@ -138,17 +139,19 @@ class BrokerFactory:
 
         if not compare_map[broker].issubset(broker_data.keys()):
             raise InvalidArgumentException(
-                f"Missing Arguments for {broker_info['username']}:{broker_info['nickname']} in broker '{broker}' -> {compare_map[broker].difference(broker_info.keys())}"
+                f"Missing Arguments for {user_broker_account['username']}:{user_broker_account['nickname']} in broker '{broker}' -> {compare_map[broker].difference(user_broker_account.keys())}"
             )
 
-    def generate_token(self, broker_info: Dict[str, Any]):
+    def generate_token(
+        self, user_broker_account: Dict[str, Any]
+    ) -> Dict[str, BrokerType | Any]:
         broker_client: BrokerType | None = None
 
-        broker_data = broker_info["broker_data"]
-        broker = broker_info["broker"]
+        broker_data = user_broker_account["broker_data"]
+        broker = user_broker_account["broker"]
 
         broker_client: BrokerType | None = None
-        self.validate_broker_args(broker_info, is_generator_args=True)
+        self.validate_broker_args(user_broker_account, is_generator_args=True)
 
         if broker == Broker.MOTILAL:
             broker_client = Motilal(
@@ -181,18 +184,25 @@ class BrokerFactory:
             broker_data["configuration"] = broker_client.configuration
 
         elif broker == Broker.ZERODHA:
-            broker_client = Zerodha(
-                user_id=broker_data["user_id"],
-                api_key=broker_data["api_key"],
-                api_secret=broker_data["api_secret"],
-                password=broker_data["password"],
-                totp=broker_data["totp"],
-                load_instrument=False,
-            )
+            if "password" in broker_data:
+                broker_client = Zerodha(
+                    user_id=broker_data["user_id"],
+                    api_key=broker_data["api_key"],
+                    api_secret=broker_data["api_secret"],
+                    password=broker_data["password"],
+                    totp=broker_data["totp"],
+                    load_instrument=False,
+                )
+
+                broker_data["zerodha_wrapper"] = codecs.encode(
+                    pickle.dumps(broker_client.wrapper), "base64"
+                ).decode()
 
-            broker_data["zerodha_wrapper"] = codecs.encode(
-                pickle.dumps(broker_client.wrapper), "base64"
-            ).decode()
+            else:
+                broker_client = Zerodha(
+                    wrapper=broker_data["zerodha_wrapper"],
+                    load_instrument=False,
+                )
 
         elif broker == Broker.ANGELONE:
             broker_client = AngelOne(
@@ -221,13 +231,7 @@ class BrokerFactory:
         elif broker == Broker.UPSTOX:
             broker_client = Upstox(
                 user_id=broker_data["user_id"],
-                api_key=broker_data["api_key"],
-                api_secret=broker_data["api_secret"],
-                totp=broker_data["totp"],
-                mobile_number=broker_data["mobile_number"],
-                account_pin=broker_data["account_pin"],
-                redirect_url=broker_data["redirect_url"],
-                load_instrument=False,
+                access_token=broker_data["access_token"],
             )
 
             broker_data["access_token"] = broker_client.configuration.access_token
@@ -303,17 +307,17 @@ class BrokerFactory:
         }
 
     def store_broker_client(
-        self, broker_info: Dict[str, Any], load_instrument: bool = True
+        self, user_broker_account: Dict[str, Any], load_instrument: bool = True
     ) -> BrokerType | None:
-        username = broker_info["username"]
-        nickname = broker_info["nickname"]
+        username = user_broker_account["username"]
+        nickname = user_broker_account["nickname"]
 
-        self.validate_broker_args(broker_info)
+        self.validate_broker_args(user_broker_account)
 
         broker_key = self.get_broker_key(username, nickname)
 
-        broker_data = broker_info["broker_data"]
-        broker = broker_info["broker"]
+        broker_data = user_broker_account["broker_data"]
+        broker = user_broker_account["broker"]
 
         broker_client: BrokerType | None = None
 
@@ -400,25 +404,27 @@ class BrokerFactory:
                 broker_name=broker, broker=broker_client
             )
 
-        broker_client.username = broker_info["username"]
-        broker_client.nickname = broker_info["nickname"]
-        broker_client.broker_name = broker_info["broker"]
+        broker_client.username = user_broker_account["username"]
+        broker_client.nickname = user_broker_account["nickname"]
+        broker_client.broker_name = user_broker_account["broker"]
         broker_client.user_id = broker_data["user_id"]
 
         self.client_broker_data[broker_key] = broker_client
 
         return broker_client
 
-    def get_broker_client(self, broker_info: Dict[str, Any]) -> BrokerType:
-        username = broker_info["username"]
-        nickname = broker_info["nickname"]
+    def get_broker_client(self, user_broker_account: Dict[str, Any]) -> BrokerType:
+        username = user_broker_account["username"]
+        nickname = user_broker_account["nickname"]
 
         broker_key = self.get_broker_key(username, nickname)
 
         if broker_key in self.client_broker_data:
             return self.client_broker_data[broker_key]
 
-        broker_client = self.store_broker_client(broker_info, load_instrument=False)
+        broker_client = self.store_broker_client(
+            user_broker_account, load_instrument=False
+        )
 
         if broker_client is not None:
             return broker_client

{quantplay-2.0.56 → quantplay-2.0.58}/quantplay/broker/dhan.py

@@ -10,6 +10,7 @@ from quantplay.exception.exceptions import (
     InvalidArgumentException,
     QuantplayOrderPlacementException,
     RetryableException,
+    TokenException,
     retry_exception,
 )
 from quantplay.model.broker import (
@@ -32,10 +33,14 @@ class Dhan(Broker):
         access_token: str,
         load_instrument: bool = True,
     ):
-        self.dhan = dhanhq(
-            client_id=user_id,
-            access_token=access_token,
-        )
+        try:
+            self.dhan = dhanhq(
+                client_id=user_id,
+                access_token=access_token,
+            )
+
+        except Exception:
+            raise TokenException("Dhan Session Expired")
 
     def load_instrument(self, file_name: str | None = None) -> None:
         super().load_instrument("upstox_instruments")

{quantplay-2.0.56 → quantplay-2.0.58}/quantplay/broker/upstox.py

@@ -51,36 +51,20 @@ class Upstox(Broker):
     ):
         super().__init__()
 
-        try:
-            if access_token:
-                self.set_access_token(access_token)
-                self.user_id = user_id
-            elif (
-                api_key
-                and api_secret
-                and totp
-                and mobile_number
-                and account_pin
-                and redirect_url
-            ):
-                new_access_token = self.generate_token(
-                    api_key, api_secret, totp, mobile_number, account_pin, redirect_url
-                )
-                self.set_access_token(new_access_token)
-
-                self.configuration = upstox_client.Configuration()
-                self.configuration.access_token = self.access_token
-            else:
-                raise InvalidArgumentException("Missing Args")
-
-        except Exception as e:
-            raise e
+        if access_token:
+            self.set_access_token(access_token)
+            self.user_id = user_id
+        else:
+            raise TokenException("Upstox Session Expired")
 
-        self.configuration = upstox_client.Configuration()
-        self.configuration.access_token = self.access_token
-        self.api_version = "2.0"
+        try:
+            self.configuration = upstox_client.Configuration()
+            self.configuration.access_token = self.access_token
+            self.api_version = "2.0"
 
-        self.api_client = upstox_client.ApiClient(self.configuration)
+            self.api_client = upstox_client.ApiClient(self.configuration)
+        except Exception:
+            raise TokenException("Upstox Session Expired")
 
         if load_instrument:
             self.load_instrument()

{quantplay-2.0.56 → quantplay-2.0.58}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.56 → quantplay-2.0.58}/setup.py

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