quantplay 2.0.59__tar.gz → 2.0.61__tar.gz

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

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

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

@@ -5,6 +5,7 @@ import traceback
 from dataclasses import dataclass
 from typing import Any, Dict
 
+
 from quantplay.broker.aliceblue import Aliceblue
 from quantplay.broker.angelone import AngelOne
 from quantplay.broker.dhan import Dhan
@@ -16,7 +17,7 @@ from quantplay.broker.motilal import Motilal
 from quantplay.broker.shoonya import FinvAsia
 from quantplay.broker.upstox import Upstox
 from quantplay.broker.zerodha import Zerodha
-from quantplay.exception.exceptions import InvalidArgumentException
+from quantplay.exception.exceptions import InvalidArgumentException, TokenException
 from quantplay.utils.caching import InstrumentCache
 from quantplay.utils.pickle_utils import PickleUtils
 
@@ -104,7 +105,7 @@ broker_generate_args = {
             "user_key",
             "encryption_key",
             "client_id",
-            "totp_key",
+            "totp",
             "pin",
         ]
     ),
@@ -138,8 +139,8 @@ class BrokerFactory:
             raise InvalidArgumentException(f"Unsupported Broker: '{broker}'")
 
         if not compare_map[broker].issubset(broker_data.keys()):
-            raise InvalidArgumentException(
-                f"Missing Arguments for {user_broker_account['username']}:{user_broker_account['nickname']} in broker '{broker}' -> {compare_map[broker].difference(user_broker_account.keys())}"
+            raise TokenException(
+                f"Missing Arguments for {user_broker_account['username']}:{user_broker_account['nickname']} in broker '{broker}' -> {compare_map[broker].difference(broker_data.keys())}"
             )
 
     def generate_token(
@@ -241,7 +242,7 @@ class BrokerFactory:
                 api_secret=broker_data["api_secret"],
                 imei=broker_data["imei"],
                 password=broker_data["password"],
-                totp=broker_data["totp_key"],
+                totp=broker_data["totp"],
                 user_id=broker_data["user_id"],
                 vendor_code=broker_data["vendor_code"],
                 load_instrument=False,
@@ -255,7 +256,7 @@ class BrokerFactory:
                 user_id=broker_data["user_id"],
                 api_secret=broker_data["api_secret"],
                 password=broker_data["password"],
-                totp=broker_data["totp_key"],
+                totp=broker_data["totp"],
                 api_key=broker_data["api_key"],
                 load_instrument=False,
             )
@@ -271,7 +272,7 @@ class BrokerFactory:
                 user_key=broker_data["user_key"],
                 encryption_key=broker_data["encryption_key"],
                 client_id=broker_data["client_id"],
-                totp_key=broker_data["totp_key"],
+                totp=broker_data["totp"],
                 pin=broker_data["pin"],
                 load_instrument=False,
             )

{quantplay-2.0.59 → quantplay-2.0.61}/quantplay/broker/five_paisa.py

@@ -43,7 +43,7 @@ class FivePaisa(Broker):
         user_key: str | None = None,
         encryption_key: str | None = None,
         client_id: str | None = None,
-        totp_key: str | None = None,
+        totp: str | None = None,
         pin: str | None = None,
         client: str | None = None,
         load_instrument: bool = True,
@@ -74,10 +74,10 @@ class FivePaisa(Broker):
                 )
                 self.user_key = user_key
 
-                if totp_key is None:
+                if totp is None:
                     raise InvalidArgumentException("TOTP Key is Missing")
 
-                self.client.get_totp_session(client_id, pyotp.TOTP(totp_key).now(), pin)
+                self.client.get_totp_session(client_id, pyotp.TOTP(totp).now(), pin)
 
                 try:
                     self.margins()

{quantplay-2.0.59 → quantplay-2.0.61}/quantplay/broker/flattrade.py

@@ -37,7 +37,7 @@ class FlatTrade(Noren):
                 token = self.login(
                     user_id=user_id,
                     password=password,
-                    totp_key=totp,
+                    totp=totp,
                     api_key=api_key,
                     api_secret=api_secret,
                 )
@@ -67,12 +67,12 @@ class FlatTrade(Noren):
         self,
         user_id: str,
         password: str,
-        totp_key: str,
+        totp: str,
         api_key: str,
         api_secret: str,
     ):
         reqCode = FlatTradeUtils.get_request_code(
-            api_key=api_key, user_id=user_id, password=password, totp=totp_key
+            api_key=api_key, user_id=user_id, password=password, totp=totp
         )
 
         secret_code = api_key + reqCode + api_secret

{quantplay-2.0.59 → quantplay-2.0.61}/quantplay/broker/uplink/uplink_utils.py

@@ -62,7 +62,7 @@ class UplinkUtils:
     def get_request_token(
         api_key: str,
         redirect_url: str,
-        totp_key: str,
+        totp: str,
         mobile_number: str,
         account_pin: str,
     ):
@@ -85,7 +85,7 @@ class UplinkUtils:
             time.sleep(1)
 
             totp_element = driver.find_element("xpath", UplinkUtils.totp_xpath)
-            totp_now = pyotp.TOTP(totp_key).now()
+            totp_now = pyotp.TOTP(totp).now()
             totp_element.send_keys(totp_now)
             time.sleep(1)
 

{quantplay-2.0.59 → quantplay-2.0.61}/quantplay.egg-info/PKG-INFO

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

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

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