quantplay 2.0.67__tar.gz → 2.0.68__tar.gz

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

@@ -1,36 +1,11 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.67
+Version: 2.0.68
 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.67 → quantplay-2.0.68}/quantplay/broker/dhan.py

@@ -272,7 +272,6 @@ class Dhan(Broker):
 
     def orders(self, tag: str | None = None, add_ltp: bool = True) -> pl.DataFrame:
         orders = self.invoke_dhan_api(self.dhan.get_order_list)
-
         if not orders or "data" not in orders or not isinstance(orders["data"], list):
             return pl.DataFrame(schema=self.orders_schema)
 
@@ -295,7 +294,6 @@ class Dhan(Broker):
                 "orderType": "order_type",
             }
         )
-
         orders_df = orders_df.with_columns(
             pl.when(pl.col("product") == "INTRADAY").then(pl.lit("MIS")).alias("product"),
             pl.when(pl.col("exchange") == "NSE_FNO")
@@ -306,14 +304,19 @@ class Dhan(Broker):
             .then(pl.lit("NSE"))
             .when(pl.col("exchange") == "BSE_EQ")
             .then(pl.lit("BSE"))
+            .otherwise(pl.col("exchange"))
             .alias("exchange"),
             pl.when(pl.col("order_type") == "STOP_LOSS_MARKET")
             .then(pl.lit("SL-M"))
             .when(pl.col("order_type") == "STOP_LOSS")
             .then(pl.lit("SL"))
+            .otherwise(pl.col("order_type"))
             .alias("order_type"),
             pl.when(pl.col("status") == "TRADED")
             .then(pl.lit("COMPLETE"))
+            .when(pl.col("status") == "PENDING")
+            .then(pl.lit("OPEN"))
+            .otherwise(pl.col("status"))
             .alias("status"),
         )
 

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

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

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

@@ -2,13 +2,12 @@ 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 RetryableException
+from quantplay.exception.exceptions import InvalidArgumentException, RetryableException
 from quantplay.model.order_event import OrderUpdateEvent
 
 
@@ -33,12 +32,6 @@ 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(
@@ -50,20 +43,21 @@ class FlatTrade(Noren):
                 )
 
                 self.api.set_session(userid=user_id, usertoken=token)
-                response = {
-                    "susertoken": token,
-                    "actid": user_id,
-                    "email": None,
-                    "uname": None,
-                }
 
             else:
-                raise TokenException("Missing Arguments")
+                raise InvalidArgumentException("Missing Arguments")
 
-        except TokenException:
+            response = {
+                "susertoken": user_token,
+                "actid": user_id,
+                "email": None,
+                "uname": None,
+            }
+
+        except InvalidArgumentException:
             raise
         except binascii.Error:
-            raise TokenException("Invalid TOTP key provided")
+            raise InvalidArgumentException("Invalid TOTP key provided")
         except Exception as e:
             raise RetryableException(str(e))
 

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

@@ -22,7 +22,6 @@ 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(
@@ -59,34 +58,8 @@ 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}")
@@ -99,10 +72,10 @@ class FlatTradeUtils:
 
         except binascii.Error:
             raise InvalidArgumentException("Invalid TOTP key provided")
-        except InvalidArgumentException as e:
-            raise e
+        except InvalidArgumentException:
+            raise
         except WebDriverException:
             raise WrongLibrarySetup("Selenium setup need to be fixed")
         except Exception as e:
-            traceback.print_exc()
+            print(traceback.print_exc())
             raise RetryableException(str(e))

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

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

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

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

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

@@ -5,11 +5,7 @@ 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,
-    TokenException,
-)
+from quantplay.exception.exceptions import InvalidArgumentException, RetryableException
 from quantplay.model.order_event import OrderUpdateEvent
 
 
@@ -52,12 +48,12 @@ class FinvAsia(Noren):
                     imei=imei,
                 )
             else:
-                raise TokenException("Missing Args")
+                raise InvalidArgumentException("Missing Args")
 
-        except TokenException:
+        except InvalidArgumentException:
             raise
         except binascii.Error:
-            raise TokenException("Invalid TOTP key provided")
+            raise InvalidArgumentException("Invalid TOTP key provided")
         except Exception as e:
             raise RetryableException(str(e))
 

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

@@ -133,7 +133,6 @@ 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.67 → quantplay-2.0.68}/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("Zerodha WS: API Key or Access Token Missing")
+            raise InvalidArgumentException("")
 
         kite_ticker = KiteTicker(self.wrapper.api_key, self.wrapper.access_token)
         kite_ticker.on_order_update = self.on_order_update

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

@@ -1,36 +1,11 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.67
+Version: 2.0.68
 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.67 → quantplay-2.0.68}/setup.py

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