quantplay 2.0.66__tar.gz → 2.0.67__tar.gz

{quantplay-2.0.66 → quantplay-2.0.67}/PKG-INFO

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

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/five_paisa.py

@@ -81,6 +81,7 @@ class FivePaisa(Broker):
 
                 try:
                     self.margins()
+
                 except TokenException:
                     raise RetryableException("Generating token again")
             else:

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/flattrade.py

@@ -2,12 +2,13 @@ import binascii
 import hashlib
 from queue import Queue
 
+from kiteconnect.exceptions import TokenException
 import requests
 
 from quantplay.broker.ft_utils.flattrade_utils import FlatTradeUtils
 from quantplay.broker.ft_utils.ft_noren import FT_NorenApi
 from quantplay.broker.noren import Noren
-from quantplay.exception.exceptions import InvalidArgumentException, RetryableException
+from quantplay.exception.exceptions import RetryableException
 from quantplay.model.order_event import OrderUpdateEvent
 
 
@@ -57,12 +58,12 @@ class FlatTrade(Noren):
                 }
 
             else:
-                raise InvalidArgumentException("Missing Arguments")
+                raise TokenException("Missing Arguments")
 
-        except InvalidArgumentException:
+        except TokenException:
             raise
         except binascii.Error:
-            raise InvalidArgumentException("Invalid TOTP key provided")
+            raise TokenException("Invalid TOTP key provided")
         except Exception as e:
             raise RetryableException(str(e))
 

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/ft_utils/flattrade_utils.py

@@ -22,6 +22,7 @@ class FlatTradeUtils:
     totp_xpath = '//*[@id="pan"]'
 
     login_xpath = '//*[@id="sbmt"]'
+    error_xpath = '//*[@id="app"]/div/div/div[2]/div/div[2]/div[1]/div/form/div[5]/div'
 
     @staticmethod
     @retry(
@@ -58,8 +59,34 @@ class FlatTradeUtils:
 
             url = driver.current_url
 
+            if url.split("/")[2] == flattrade_url.split("/")[2]:
+                error_message = ""
+
+                try:
+                    error_attempt = driver.find_element(
+                        "xpath", FlatTradeUtils.error_xpath
+                    )
+                    error_message = error_attempt.text
+
+                    if error_message in [
+                        "Invalid Input : Wrong Password",
+                        "Invalid API key",
+                    ]:
+                        raise InvalidArgumentException(
+                            f"Flattrade Login Failed: {error_message}"
+                        )
+
+                except Exception as e:
+                    Constants.logger.error(f"Flattrade Selenium Error : {e}")
+                    traceback.print_exc()
+
+                finally:
+                    Constants.logger.error(
+                        f"Flattrade Unkown Selenium Error : {error_message}"
+                    )
+                    raise Exception(f"Flattrade Unkown Selenium Error : {error_message}")
+
             try:
-                # TODO: IndexError: list index out of range
                 request_token = url.split("code=")[1].split("&")[0]
             except Exception as e:
                 Constants.logger.error(f"Flattrade Selenium Error for {url}")
@@ -72,10 +99,10 @@ class FlatTradeUtils:
 
         except binascii.Error:
             raise InvalidArgumentException("Invalid TOTP key provided")
-        except InvalidArgumentException:
-            raise
+        except InvalidArgumentException as e:
+            raise e
         except WebDriverException:
             raise WrongLibrarySetup("Selenium setup need to be fixed")
         except Exception as e:
-            print(traceback.print_exc())
+            traceback.print_exc()
             raise RetryableException(str(e))

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/kotak.py

@@ -21,11 +21,8 @@ PROD_BASE_URL = "https://gw-napi.kotaksecurities.com/"
 SESSION_PROD_BASE_URL = "https://napi.kotaksecurities.com/"
 
 
-# EvOUzPVqkwvlFl_6cZYZSCO5mwQa
-# pVwafvF3ssA_jFVbKPrwhKt7igwa
-# Kotak@123
-# +918149949114
-# 491700
+# from quantplay.broker.kotak import Kotak
+# client = Kotak(None,"EvOUzPVqkwvlFl_6cZYZSCO5mwQa","pVwafvF3ssA_jFVbKPrwhKt7igwa","+918149949114","Kotak@123","491700")
 
 
 class Kotak(Broker):
@@ -84,8 +81,6 @@ class Kotak(Broker):
             data=json.dumps({"grant_type": "client_credentials"}),
         )
 
-        print(session_init)
-
         if not session_init.ok:
             raise Exception("")
 
@@ -185,7 +180,15 @@ class Kotak(Broker):
         return {"user_id": self.user_id or ""}
 
     def margins(self) -> Dict[str, float]:
-        return self.request("limits", body={"seg": "ALL", "exch": "ALL", "prod": "ALL"})
+        limits_resp = self.request(
+            "limits", body={"seg": "ALL", "exch": "ALL", "prod": "ALL"}
+        )
+
+        margins = {
+            "margin_used": limits_resp["MarginUsed"],
+            "margin_available": limits_resp["Net"],
+        }
+        return margins
 
     # **
     # ** POST/PUT Api's

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/motilal.py

@@ -139,8 +139,9 @@ class Motilal(Broker):
                 raise Exception("Missing Arguments")
 
             self.user_id = self.headers["vendorinfo"]
+
         except binascii.Error:
-            raise InvalidArgumentException("Invalid TOTP key provided")
+            raise TokenException("Invalid TOTP key provided")
         except InvalidArgumentException:
             raise
         except Exception as e:

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/shoonya.py

@@ -5,7 +5,11 @@ import pyotp
 
 from quantplay.broker.finvasia_utils.fa_noren import FA_NorenApi
 from quantplay.broker.noren import Noren
-from quantplay.exception.exceptions import InvalidArgumentException, RetryableException
+from quantplay.exception.exceptions import (
+    InvalidArgumentException,
+    RetryableException,
+    TokenException,
+)
 from quantplay.model.order_event import OrderUpdateEvent
 
 
@@ -48,12 +52,12 @@ class FinvAsia(Noren):
                     imei=imei,
                 )
             else:
-                raise InvalidArgumentException("Missing Args")
+                raise TokenException("Missing Args")
 
-        except InvalidArgumentException:
+        except TokenException:
             raise
         except binascii.Error:
-            raise InvalidArgumentException("Invalid TOTP key provided")
+            raise TokenException("Invalid TOTP key provided")
         except Exception as e:
             raise RetryableException(str(e))
 

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/upstox.py

@@ -133,6 +133,7 @@ class Upstox(Broker):
         try:
             symbol_info = self.symbol_data[f"{exchange}:{tradingsymbol}"]
             # Market quotes and instruments - LTP quotes.
+            # TODO:Check Get FN->symbol_info
             api_response = api_instance.ltp(  # type: ignore
                 symbol_info.get("instrument_key"), self.api_version
             )

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay/broker/zerodha.py

@@ -112,7 +112,7 @@ class Zerodha(Broker):
 
     def stream_order_data(self):
         if self.wrapper.api_key is None or self.wrapper.access_token is None:
-            raise InvalidArgumentException("")
+            raise InvalidArgumentException("Zerodha WS: API Key or Access Token Missing")
 
         kite_ticker = KiteTicker(self.wrapper.api_key, self.wrapper.access_token)
         kite_ticker.on_order_update = self.on_order_update

{quantplay-2.0.66 → quantplay-2.0.67}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.66 → quantplay-2.0.67}/setup.py

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