quantplay 2.0.80__tar.gz → 2.0.81__tar.gz

{quantplay-2.0.80 → quantplay-2.0.81}/PKG-INFO

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

{quantplay-2.0.80 → quantplay-2.0.81}/quantplay/broker/angelone.py

@@ -85,7 +85,7 @@ class AngelOne(Broker):
                     totp=pyotp.TOTP(str(totp)).now(),
                 )
 
-                if response["status"] is False:
+                if not response["status"]:
                     if "message" in response:
                         raise InvalidArgumentException(response["message"])
                     raise InvalidArgumentException("Invalid API credentials")

{quantplay-2.0.80 → quantplay-2.0.81}/quantplay/broker/ft_utils/flattrade_utils.py

@@ -9,6 +9,7 @@ from selenium.common.exceptions import WebDriverException
 from quantplay.exception.exceptions import (
     InvalidArgumentException,
     RetryableException,
+    TokenException,
     WrongLibrarySetup,
     retry_exception,
 )
@@ -68,9 +69,11 @@ class FlatTradeUtils:
                     )
                     error_message = error_attempt.text
 
-                    if error_message in [
-                        "Invalid Input : Wrong Password",
-                        "Invalid API key",
+                    if error_message.lower() in [
+                        "invalid input : wrong password",
+                        "invalid api key",
+                        "resetpassword",
+                        "user blocked due to multiple wrong attempts",
                     ]:
                         raise InvalidArgumentException(
                             f"Flattrade Login Failed: {error_message}"
@@ -79,19 +82,22 @@ class FlatTradeUtils:
                 except Exception as e:
                     Constants.logger.error(f"Flattrade Selenium Error : {e}")
                     traceback.print_exc()
+                    raise TokenException(str(e))
 
                 finally:
                     Constants.logger.error(
                         f"Flattrade Unkown Selenium Error : {error_message}"
                     )
-                    raise Exception(f"Flattrade Unkown Selenium Error : {error_message}")
+                    raise TokenException(
+                        f"Flattrade Unkown Selenium Error : {error_message}"
+                    )
 
             try:
                 request_token = url.split("code=")[1].split("&")[0]
             except Exception as e:
                 Constants.logger.error(f"Flattrade Selenium Error for {url}")
                 traceback.print_exc()
-                raise e
+                raise TokenException(str(e))
 
             driver.close()
 
@@ -99,7 +105,7 @@ class FlatTradeUtils:
 
         except binascii.Error:
             raise InvalidArgumentException("Invalid TOTP key provided")
-        except InvalidArgumentException as e:
+        except (InvalidArgumentException, TokenException) as e:
             raise e
         except WebDriverException:
             raise WrongLibrarySetup("Selenium setup need to be fixed")

{quantplay-2.0.80 → quantplay-2.0.81}/quantplay/broker/noren.py

@@ -711,6 +711,10 @@ class Noren(Broker):
             if "collateral" in api_margins:
                 collateral = api_margins["collateral"]
 
+            holdings_val = 0
+            if "grcoll" in api_margins:
+                holdings_val = api_margins["grcoll"]
+
             if "marginused" not in api_margins:
                 api_margins["margin_used"] = 0
             else:
@@ -735,7 +739,7 @@ class Noren(Broker):
             except Exception:
                 margins["cash"] = 0
 
-            margins["total_balance"] = float(api_margins["cash"]) + float(collateral)
+            margins["total_balance"] = float(api_margins["cash"]) + float(holdings_val)
 
             return margins
 

{quantplay-2.0.80 → quantplay-2.0.81}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.80 → quantplay-2.0.81}/setup.py

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