quantplay 2.0.57__tar.gz → 2.0.59__tar.gz

{quantplay-2.0.57 → quantplay-2.0.59}/PKG-INFO

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

{quantplay-2.0.57 → quantplay-2.0.59}/quantplay/broker/broker_factory.py

@@ -91,7 +91,7 @@ broker_required_args = {
 
 broker_generate_args = {
     Broker.ZERODHA: set(["user_id", "api_key", "api_secret"]),
-    Broker.FLATTRADE: set(["user_id" "api_secret", "password", "totp_key", "api_key"]),
+    Broker.FLATTRADE: set(["user_id" "api_secret", "password", "totp", "api_key"]),
     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"]),
@@ -110,7 +110,7 @@ broker_generate_args = {
     ),
     Broker.ANGELONE: set(["user_id", "api_key", "mpin", "totp"]),
     Broker.FINVASIA: set(
-        ["api_secret", "imei", "password", "totp_key", "user_id", "vendor_code"]
+        ["api_secret", "imei", "password", "totp", "user_id", "vendor_code"]
     ),
     Broker.UPSTOX: set(["user_id", "access_token"]),
     Broker.KOTAK: set(
@@ -142,7 +142,9 @@ class BrokerFactory:
                 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, user_broker_account: Dict[str, Any]):
+    def generate_token(
+        self, user_broker_account: Dict[str, Any]
+    ) -> Dict[str, BrokerType | Any]:
         broker_client: BrokerType | None = None
 
         broker_data = user_broker_account["broker_data"]
@@ -239,7 +241,7 @@ class BrokerFactory:
                 api_secret=broker_data["api_secret"],
                 imei=broker_data["imei"],
                 password=broker_data["password"],
-                totp_key=broker_data["totp_key"],
+                totp=broker_data["totp_key"],
                 user_id=broker_data["user_id"],
                 vendor_code=broker_data["vendor_code"],
                 load_instrument=False,
@@ -253,7 +255,7 @@ class BrokerFactory:
                 user_id=broker_data["user_id"],
                 api_secret=broker_data["api_secret"],
                 password=broker_data["password"],
-                totp_key=broker_data["totp_key"],
+                totp=broker_data["totp_key"],
                 api_key=broker_data["api_key"],
                 load_instrument=False,
             )

{quantplay-2.0.57 → quantplay-2.0.59}/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.57 → quantplay-2.0.59}/quantplay/broker/flattrade.py

@@ -17,7 +17,7 @@ class FlatTrade(Noren):
         order_updates: Queue[OrderUpdateEvent] | None = None,
         api_secret: str | None = None,
         password: str | None = None,
-        totp_key: str | None = None,
+        totp: str | None = None,
         user_id: str | None = None,
         user_token: str | None = None,
         api_key: str | None = None,
@@ -33,11 +33,11 @@ class FlatTrade(Noren):
             if user_token and user_id:
                 self.api.set_session(userid=user_id, usertoken=user_token)
 
-            elif user_id and password and totp_key and api_key and api_secret:
+            elif user_id and password and totp and api_key and api_secret:
                 token = self.login(
                     user_id=user_id,
                     password=password,
-                    totp_key=totp_key,
+                    totp_key=totp,
                     api_key=api_key,
                     api_secret=api_secret,
                 )

{quantplay-2.0.57 → quantplay-2.0.59}/quantplay/broker/shoonya.py

@@ -16,7 +16,7 @@ class FinvAsia(Noren):
         api_secret: str | None = None,
         imei: str | None = None,
         password: str | None = None,
-        totp_key: str | None = None,
+        totp: str | None = None,
         user_id: str | None = None,
         vendor_code: str | None = None,
         user_token: str | None = None,
@@ -37,10 +37,8 @@ class FinvAsia(Noren):
                     "email": None,
                     "uname": None,
                 }
-            elif (
-                user_id and password and totp_key and vendor_code and api_secret and imei
-            ):
-                totp = pyotp.TOTP(totp_key).now()
+            elif user_id and password and totp and vendor_code and api_secret and imei:
+                totp = pyotp.TOTP(totp).now()
                 response = self.login(
                     user_id=user_id,
                     password=password,

{quantplay-2.0.57 → quantplay-2.0.59}/quantplay/broker/upstox.py

@@ -51,39 +51,20 @@ class Upstox(Broker):
     ):
         super().__init__()
 
-        try:
-            if access_token:
-                self.set_access_token(access_token)
-                self.user_id = user_id
-
-            # TODO: Implement Auto Login
-            # 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.57 → quantplay-2.0.59}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.57 → quantplay-2.0.59}/setup.py

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