quantplay 2.0.68__tar.gz → 2.0.71__tar.gz

{quantplay-2.0.68 → quantplay-2.0.71}/PKG-INFO

@@ -1,11 +1,36 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.68
+Version: 2.0.71
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
 Author-email: 
 License: MIT
+Requires-Dist: setuptools
+Requires-Dist: path
+Requires-Dist: pyotp
+Requires-Dist: retrying
+Requires-Dist: boto3
+Requires-Dist: numpy
+Requires-Dist: websocket-client
+Requires-Dist: smartapi-python
+Requires-Dist: logzero
+Requires-Dist: selenium
+Requires-Dist: requests
+Requires-Dist: pandas
+Requires-Dist: pyarrow
+Requires-Dist: polars
+Requires-Dist: kiteconnect
+Requires-Dist: pya3
+Requires-Dist: py5paisa
+Requires-Dist: upstox-python-sdk
+Requires-Dist: undetected-chromedriver
+Requires-Dist: cachetools
+Requires-Dist: py_vollib
+Requires-Dist: python-engineio
+Requires-Dist: python-socketio
+Requires-Dist: six
+Requires-Dist: dhanhq
 
 # Quantplay Alpha playground
 

{quantplay-2.0.68 → quantplay-2.0.71}/quantplay/broker/angelone.py

@@ -79,7 +79,7 @@ class AngelOne(Broker):
                     self.wrapper.generateSession,  # type: ignore
                     clientCode=user_id,
                     password=mpin,
-                    totp=pyotp.TOTP(totp).now(),
+                    totp=pyotp.TOTP(str(totp)).now(),
                 )
 
                 if response["status"] is False:

{quantplay-2.0.68 → quantplay-2.0.71}/quantplay/broker/auto_login/aliceblue.py

@@ -83,7 +83,7 @@ class AliceblueLogin:
             AliceblueLogin.click_on_login(driver)
             AliceblueLogin.enter_user_id(driver, user_id)
             AliceblueLogin.enter_password(driver, password)
-            AliceblueLogin.enter_totp(driver, pyotp.TOTP(totp).now())
+            AliceblueLogin.enter_totp(driver, pyotp.TOTP(str(totp)).now())
 
         except binascii.Error:
             raise InvalidArgumentException("Invalid TOTP key provided")

{quantplay-2.0.68 → quantplay-2.0.71}/quantplay/broker/five_paisa.py

@@ -77,10 +77,11 @@ class FivePaisa(Broker):
                 if totp is None:
                     raise InvalidArgumentException("TOTP Key is Missing")
 
-                self.client.get_totp_session(client_id, pyotp.TOTP(totp).now(), pin)
+                self.client.get_totp_session(client_id, pyotp.TOTP(str(totp)).now(), pin)
 
                 try:
                     self.margins()
+
                 except TokenException:
                     raise RetryableException("Generating token again")
             else:

{quantplay-2.0.68 → quantplay-2.0.71}/quantplay/broker/flattrade.py

@@ -2,12 +2,13 @@ import binascii
 import hashlib
 from queue import Queue
 
+from quantplay.exception 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
 
 
@@ -32,6 +33,12 @@ class FlatTrade(Noren):
         try:
             if user_token and user_id:
                 self.api.set_session(userid=user_id, usertoken=user_token)
+                response = {
+                    "susertoken": user_token,
+                    "actid": user_id,
+                    "email": None,
+                    "uname": None,
+                }
 
             elif user_id and password and totp and api_key and api_secret:
                 token = self.login(
@@ -43,21 +50,20 @@ class FlatTrade(Noren):
                 )
 
                 self.api.set_session(userid=user_id, usertoken=token)
+                response = {
+                    "susertoken": token,
+                    "actid": user_id,
+                    "email": None,
+                    "uname": None,
+                }
 
             else:
-                raise InvalidArgumentException("Missing Arguments")
+                raise TokenException("Missing Arguments")
 
-            response = {
-                "susertoken": user_token,
-                "actid": user_id,
-                "email": None,
-                "uname": None,
-            }
-
-        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.68 → quantplay-2.0.71}/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(
@@ -32,7 +33,7 @@ class FlatTradeUtils:
     )
     def get_request_code(api_key: str, user_id: str, password: str, totp: str):
         try:
-            pyotp.TOTP(totp).now()
+            pyotp.TOTP(str(totp)).now()
             driver = Selenium().get_browser()
 
             flattrade_url = f"https://auth.flattrade.in/?app_key={api_key}"
@@ -47,7 +48,7 @@ class FlatTradeUtils:
             password_element.send_keys(password)
 
             totp_pin = driver.find_element("xpath", FlatTradeUtils.totp_xpath)
-            totp_pin.send_keys(pyotp.TOTP(totp).now())
+            totp_pin.send_keys(pyotp.TOTP(str(totp)).now())
 
             time.sleep(1)
 
@@ -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.68 → quantplay-2.0.71}/quantplay/broker/kite_utils.py

@@ -70,7 +70,7 @@ class KiteUtils:
             raise InvalidArgumentException("Password Key is Missing")
 
         try:
-            pyotp.TOTP(totp).now()
+            pyotp.TOTP(str(totp)).now()
             driver = Selenium().get_browser()
 
             kite_url = "https://kite.trade/connect/login?api_key={}&v=3".format(api_key)
@@ -95,7 +95,7 @@ class KiteUtils:
             KiteUtils.check_error(page_source)
 
             kite_pin = driver.find_element("xpath", KiteUtils.kite_pin_xpath)
-            kite_pin.send_keys(pyotp.TOTP(totp).now())
+            kite_pin.send_keys(pyotp.TOTP(str(totp)).now())
             time.sleep(1)
 
             page_source = driver.page_source

{quantplay-2.0.68 → quantplay-2.0.71}/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.68 → quantplay-2.0.71}/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:
@@ -230,11 +231,11 @@ class Motilal(Broker):
     def generate_token(
         self, user_id: str, password: str, api_key: str, two_fa: str, totp: str
     ):
-        current_totp = pyotp.TOTP(totp).now()
+        current_totp = pyotp.TOTP(str(totp)).now()
         Constants.logger.info("TOTP is {}".format(current_totp))
         # initializing string
-        str = "{}{}".format(password, api_key)
-        result = hashlib.sha256(str.encode())
+        encoded_str = "{}{}".format(password, api_key)
+        result = hashlib.sha256(encoded_str.encode())
 
         data = {
             "userid": user_id,

{quantplay-2.0.68 → quantplay-2.0.71}/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
 
 
@@ -38,7 +42,7 @@ class FinvAsia(Noren):
                     "uname": None,
                 }
             elif user_id and password and totp and vendor_code and api_secret and imei:
-                totp = pyotp.TOTP(totp).now()
+                totp = pyotp.TOTP(str(totp)).now()
                 response = self.login(
                     user_id=user_id,
                     password=password,
@@ -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.68 → quantplay-2.0.71}/quantplay/broker/uplink/uplink_utils.py

@@ -85,7 +85,7 @@ class UplinkUtils:
             time.sleep(1)
 
             totp_element = driver.find_element("xpath", UplinkUtils.totp_xpath)
-            totp_now = pyotp.TOTP(totp).now()
+            totp_now = pyotp.TOTP(str(totp)).now()
             totp_element.send_keys(totp_now)
             time.sleep(1)
 

{quantplay-2.0.68 → quantplay-2.0.71}/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.68 → quantplay-2.0.71}/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
@@ -270,9 +270,12 @@ class Zerodha(Broker):
 
         except TokenException as e:
             message = str(e)
+
             if "Invalid" in message and "checksum" in message:
                 raise InvalidArgumentException("Invalid API secret")
-            raise
+
+            raise QuantplayTokenException(str(e))
+
         except Exception as e:
             traceback.print_exc()
             print("Need token input " + kite.login_url())

{quantplay-2.0.68 → quantplay-2.0.71}/quantplay.egg-info/PKG-INFO

@@ -1,11 +1,36 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.68
+Version: 2.0.71
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 
 Author-email: 
 License: MIT
+Requires-Dist: setuptools
+Requires-Dist: path
+Requires-Dist: pyotp
+Requires-Dist: retrying
+Requires-Dist: boto3
+Requires-Dist: numpy
+Requires-Dist: websocket-client
+Requires-Dist: smartapi-python
+Requires-Dist: logzero
+Requires-Dist: selenium
+Requires-Dist: requests
+Requires-Dist: pandas
+Requires-Dist: pyarrow
+Requires-Dist: polars
+Requires-Dist: kiteconnect
+Requires-Dist: pya3
+Requires-Dist: py5paisa
+Requires-Dist: upstox-python-sdk
+Requires-Dist: undetected-chromedriver
+Requires-Dist: cachetools
+Requires-Dist: py_vollib
+Requires-Dist: python-engineio
+Requires-Dist: python-socketio
+Requires-Dist: six
+Requires-Dist: dhanhq
 
 # Quantplay Alpha playground
 

{quantplay-2.0.68 → quantplay-2.0.71}/setup.py

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