quantplay 2.0.58__tar.gz → 2.0.60__tar.gz

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

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

{quantplay-2.0.58 → quantplay-2.0.60}/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
 
@@ -91,7 +92,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 +111,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(
@@ -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_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,
@@ -255,7 +256,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.58 → quantplay-2.0.60}/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.58 → quantplay-2.0.60}/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.58 → quantplay-2.0.60}/quantplay.egg-info/PKG-INFO

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

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

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