quantplay 2.0.74__tar.gz → 2.0.76__tar.gz

{quantplay-2.0.74 → quantplay-2.0.76}/PKG-INFO

@@ -1,11 +1,36 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.74
+Version: 2.0.76
 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.74 → quantplay-2.0.76}/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.74 → quantplay-2.0.76}/quantplay/broker/broker_factory.py

@@ -61,7 +61,7 @@ broker_instruments_map = {
     Broker.ANGELONE: "angelone_instruments",
     Broker.ALICEBLUE: "aliceblue_instruments",
     Broker.UPSTOX: "upstox_instruments",
-    Broker.DHAN: "upstox_instruments",
+    Broker.DHAN: "dhan_instruments",
     Broker.KOTAK: "upstox_instruments",
     Broker.FIVEPAISA_OPENAPI: "5paisa_instruments",
 }

{quantplay-2.0.74 → quantplay-2.0.76}/quantplay/broker/dhan.py

@@ -41,9 +41,11 @@ class Dhan(Broker):
 
         except Exception:
             raise TokenException("Dhan Session Expired")
+        if load_instrument:
+            self.load_instrument()
 
     def load_instrument(self, file_name: str | None = None) -> None:
-        super().load_instrument("upstox_instruments")
+        super().load_instrument("dhan_instruments")
 
     def set_username(self, username: str):
         self.username = username
@@ -148,6 +150,12 @@ class Dhan(Broker):
 
         raise InvalidArgumentException(f"Product {product} not supported for trading")
 
+    def get_symbol(self, symbol: str, exchange: ExchangeType | None = None):
+        if symbol not in self.quantplay_symbol_map:
+            return symbol
+
+        return self.quantplay_symbol_map[symbol]
+
     # @retry(wait_exponential_multiplier=3000, wait_exponential_max=10000, stop_max_attempt_number=3)
     def place_order(
         self,
@@ -165,8 +173,10 @@ class Dhan(Broker):
             Constants.logger.info(
                 f"[PLACING_ORDER] {tradingsymbol} {exchange} {quantity} {tag}"
             )
+            tradingsymbol = self.get_symbol(tradingsymbol)
+            security_id = self.symbol_data[f"{exchange}:{tradingsymbol}"]["token"]
             order_id: str = self.dhan.place_order(  # type:ignore
-                security_id="1333",  # hdfcbank
+                security_id=security_id,  # hdfcbank
                 exchange_segment=self.get_exchange_segment(exchange),
                 transaction_type=transaction_type,
                 quantity=quantity,

{quantplay-2.0.74 → quantplay-2.0.76}/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.74 → quantplay-2.0.76}/quantplay.egg-info/PKG-INFO

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

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