quantplay 2.0.9__tar.gz → 2.0.11__tar.gz

{quantplay-2.0.9 → quantplay-2.0.11}/PKG-INFO

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

{quantplay-2.0.9 → quantplay-2.0.11}/quantplay/broker/noren.py

@@ -123,14 +123,11 @@ class Noren(Broker):
             order["order_id"] = order["norenordno"]
             order["exchange_order_id"] = order["exchordid"]
             order["exchange"] = order["exch"]
-
-            # TODO translate symbol
-            # -EQ should be removed
-            # F&O symbol translation
             order["tradingsymbol"] = order["tsym"]
 
             if order["exchange"] == "NSE":
                 order["tradingsymbol"] = order["tradingsymbol"].replace("-EQ", "")
+
             elif order["exchange"] in ["NFO", "MCX"]:
                 order["tradingsymbol"] = self.broker_symbol_map[order["tradingsymbol"]]
 
@@ -649,16 +646,20 @@ class Noren(Broker):
     def invoke_noren_api(self, fn: Callable, *args, **kwargs) -> Dict:
         try:
             response = fn(*args, **kwargs)
-            if "stat" in response and "not_ok" == response["stat"].lower():
+
+            if response is None or (
+                "stat" in response and "not_ok" == response["stat"].lower()
+            ):
                 raise TokenException(response["emsg"])
+
             return response
 
         except JSONDecodeError:
-            raise BrokerException("Failed to data from broker")
+            raise BrokerException("Failed to Receive Data from broker")
 
         except Exception:
             traceback.print_exc()
-            raise RetryableException("Failed to data from broker")
+            raise RetryableException("Failed to Receive Data from broker. Retrying Again")
 
     @timeit(MetricName="Finvasia:positions")
     @retry(
@@ -679,8 +680,10 @@ class Noren(Broker):
                 api_margins["margin_used"] = 0
             else:
                 api_margins["margin_used"] = api_margins["marginused"]
+
             if "payin" not in api_margins:
                 api_margins["payin"] = 0
+
             margin_available = (
                 float(api_margins["cash"])
                 + float(collateral)
@@ -691,16 +694,20 @@ class Noren(Broker):
             margins = {}
             margins["margin_used"] = api_margins["margin_used"]
             margins["margin_available"] = margin_available
+
             try:
                 margins["cash"] = float(api_margins["cash"])
             except Exception:
                 margins["cash"] = 0
+
             margins["total_balance"] = float(api_margins["cash"]) + float(collateral)
 
             return margins
+
         except Exception as e:
             logger.error(f"[NOREN_MARGIN_ERROR] {e}")
             RetryableException("[NOREN] Failed to fetch account margin")
+
         return {}
 
     @timeit(MetricName="Finvasia:account_summary")

{quantplay-2.0.9 → quantplay-2.0.11}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.9 → quantplay-2.0.11}/setup.py

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