quantplay 2.0.54__tar.gz → 2.0.56__tar.gz

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

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

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

@@ -62,8 +62,9 @@ broker_instruments_map = {
     Broker.ANGELONE: "angelone_instruments",
     Broker.ALICEBLUE: "aliceblue_instruments",
     Broker.UPSTOX: "upstox_instruments",
-    Broker.FIVEPAISA_OPENAPI: "5paisa_instruments",
+    Broker.DHAN: "upstox_instruments",
     Broker.KOTAK: "upstox_instruments",
+    Broker.FIVEPAISA_OPENAPI: "5paisa_instruments",
 }
 
 broker_required_args = {
@@ -90,14 +91,16 @@ broker_required_args = {
 
 broker_generate_args = {
     Broker.ZERODHA: set(["user_id", "api_key", "api_secret", "password", "totp"]),
-    Broker.FINVASIA: set(["user_id", "user_token"]),
-    Broker.FLATTRADE: set(["user_id", "user_token"]),
+    Broker.FLATTRADE: set(["user_id" "api_secret", "password", "totp_key", "api_key"]),
     Broker.IIFL_XTS: set(["user_id", "wrapper", "md_wrapper"]),
     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.ANGELONE: set(["user_id", "api_key", "mpin", "totp"]),
+    Broker.FINVASIA: set(
+        ["api_secret", "imei", "password", "totp_key", "user_id", "vendor_code"]
+    ),
     Broker.KOTAK: set(
         ["consumer_key", "consumer_secret", "mobilenumber", "password", "mpin"]
     ),
@@ -294,10 +297,10 @@ class BrokerFactory:
         else:
             raise InvalidArgumentException(f"Broker '{broker}' not supported")
 
-        return (
-            broker_client,
-            broker_data,
-        )
+        return {
+            "broker_client": broker_client,
+            "broker_data": broker_data,
+        }
 
     def store_broker_client(
         self, broker_info: Dict[str, Any], load_instrument: bool = True
@@ -305,6 +308,8 @@ class BrokerFactory:
         username = broker_info["username"]
         nickname = broker_info["nickname"]
 
+        self.validate_broker_args(broker_info)
+
         broker_key = self.get_broker_key(username, nickname)
 
         broker_data = broker_info["broker_data"]
@@ -318,14 +323,14 @@ class BrokerFactory:
                 load_instrument=load_instrument,
             )
 
-        if broker == Broker.DHAN:
+        elif broker == Broker.DHAN:
             broker_client = Dhan(
                 user_id=broker_data["user_id"],
                 access_token=broker_data["access_token"],
                 load_instrument=load_instrument,
             )
 
-        if broker == Broker.KOTAK:
+        elif broker == Broker.KOTAK:
             broker_client = Kotak(
                 configuration=broker_data["configuration"],
                 load_instrument=load_instrument,
@@ -413,7 +418,6 @@ class BrokerFactory:
         if broker_key in self.client_broker_data:
             return self.client_broker_data[broker_key]
 
-        self.validate_broker_args(broker_info)
         broker_client = self.store_broker_client(broker_info, load_instrument=False)
 
         if broker_client is not None:

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

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

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

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