quantplay 2.0.47__tar.gz → 2.0.50__tar.gz

{quantplay-2.0.47 → quantplay-2.0.50}/PKG-INFO

@@ -1,36 +1,11 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.47
+Version: 2.0.50
 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.47 → quantplay-2.0.50}/quantplay/broker/aliceblue.py

@@ -598,6 +598,12 @@ class Aliceblue(Broker):
 
     def margins(self) -> Dict[str, float]:
         margins = self.invoke_aliceblue_api(self.alice.get_balance)
+        if margins is None:
+            return {
+                "margin_used": 0.0,
+                "total_balance": 0.0,
+                "margin_available": 0.0,
+            }
 
         margins = [a for a in margins if a["segment"] == "ALL"][0]
 
@@ -625,6 +631,8 @@ class Aliceblue(Broker):
 
             if "emsg" in response and "expired" in response["emsg"].lower():
                 raise TokenException("Session expired")
+            elif "emsg" in response and "unauthorized" in response["emsg"].lower():
+                raise TokenException("Session expired")
             elif (
                 "stat" in response
                 and response["stat"].lower() == "not_ok"

{quantplay-2.0.47 → quantplay-2.0.50}/quantplay/broker/dhan.py

@@ -1,7 +1,5 @@
-import codecs
-import pickle
 import traceback
-from typing import Any, Dict, Hashable, List
+from typing import Any, Dict
 
 import polars as pl
 from dhanhq import dhanhq  # type:ignore
@@ -16,6 +14,7 @@ from quantplay.exception.exceptions import (
 )
 from quantplay.model.broker import (
     ExchangeType,
+    UserBrokerProfileResponse,
 )
 from quantplay.model.generics import (
     DhanTypes,
@@ -24,40 +23,22 @@ from quantplay.model.generics import (
     TransactionType,
 )
 from quantplay.utils.constant import Constants, OrderType
-from quantplay.utils.pickle_utils import InstrumentData, PickleUtils
 
 
 class Dhan(Broker):
-    def __init__(self):
-        super().__init__()
+    def __init__(
+        self,
+        user_id: str,
+        access_token: str,
+        load_instrument: bool = True,
+    ):
         self.dhan = dhanhq(
-            client_id="1102866282",
-            access_token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJkaGFuIiwicGFydG5lcklkIjoiIiwiZXhwIjoxNzIzODgxNjgxLCJ0b2tlbkNvbnN1bWVyVHlwZSI6IlNFTEYiLCJ3ZWJob29rVXJsIjoiIiwiZGhhbkNsaWVudElkIjoiMTEwMjg2NjI4MiJ9.0dNR4gOdIQ3KeaAokEwbRt6v_6ESn73r6yOL9-7lzphVCAmP-pahgK6OIOxVUExBJa0SaxX0TNX7Vk0RBQ-lxQ",
-        )
-        self.dhan_w = dhanhq(
-            client_id="1100799116",
-            access_token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJkaGFuIiwicGFydG5lcklkIjoiIiwiZXhwIjoxNzIxMzc3ODM5LCJ0b2tlbkNvbnN1bWVyVHlwZSI6IlNFTEYiLCJ3ZWJob29rVXJsIjoiIiwiZGhhbkNsaWVudElkIjoiMTEwMDc5OTExNiJ9.ykd4NYsnl7s1UegkUUY9tbP4OxxjqtskGi8JK0lyC9bRRPQRyxDv022JyDIl6crdFsQXfG7-6BsipPYxOtLR8g",
+            client_id=user_id,
+            access_token=access_token,
         )
 
-    def set_wrapper(self, serialized_wrapper: str):
-        self.wrapper = pickle.loads(codecs.decode(serialized_wrapper.encode(), "base64"))
-
-    def initialize_symbol_data(self, save_as: str | None = None) -> None:
-        try:
-            self.symbol_data = InstrumentData.get_instance().load_data(  # type: ignore
-                "zerodha_instruments"
-            )
-            Constants.logger.info("[LOADING_INSTRUMENTS] loading data from cache")
-        except Exception:
-            instruments = self.wrapper.instruments()  # type: ignore
-            self.symbol_data = {}
-            for instrument in instruments:
-                exchange = instrument["exchange"]
-                tradingsymbol = instrument["tradingsymbol"]
-                self.symbol_data["{}:{}".format(exchange, tradingsymbol)] = instrument
-
-            PickleUtils.save_data(self.symbol_data, "zerodha_instruments")
-            Constants.logger.info("[LOADING_INSTRUMENTS] loading data from server")
+    def load_instrument(self, file_name: str | None = None) -> None:
+        super().load_instrument("upstox_instruments")
 
     def set_username(self, username: str):
         self.username = username
@@ -65,51 +46,9 @@ class Dhan(Broker):
     def get_username(self):
         return self.username
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-    )
-    def get_ltps(self, trading_symbols: List[str]):
-        response = self.wrapper.ltp(trading_symbols)  # type: ignore
-        if not isinstance(response, dict):
-            raise InvalidArgumentException(
-                "Invalid data response. Zerodha sent incorrect data, Please check."
-            )
-        api_response: Dict[str, Any] = response
-        return api_response
-
     def get_quantplay_symbol(self, symbol: str):
         return symbol
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-        retry_on_exception=retry_exception,
-    )
-    def ltp(self, exchange: ExchangeType, tradingsymbol: str) -> float:
-        try:
-            key = f"{exchange}:{tradingsymbol}"
-            response = self.wrapper.ltp([key])  # type: ignore
-            if not isinstance(response, dict):
-                raise InvalidArgumentException(
-                    "Invalid data response. Zerodha sent incorrect data, Please check."
-                )
-            api_response: Dict[Hashable, Any] = response
-
-            if key not in api_response:
-                raise InvalidArgumentException(
-                    "Symbol {} not listed on exchange".format(tradingsymbol)
-                )
-
-            return api_response[key]["last_price"]
-        except Exception as e:
-            exception_message = "GetLtp call failed for [{}] with error [{}]".format(
-                tradingsymbol, str(e)
-            )
-            raise RetryableException(exception_message)
-
     @retry(
         wait_exponential_multiplier=3000,
         wait_exponential_max=10000,
@@ -135,7 +74,7 @@ class Dhan(Broker):
                 trigger_price=order["trigger_price"],
                 order_type=order["order_type"],
             )
-            return response
+            return response  # type:ignore
         except Exception as e:
             exception_message = (
                 "OrderModificationFailed for {} failed with exception {}".format(
@@ -225,7 +164,7 @@ class Dhan(Broker):
         stop_max_attempt_number=3,
     )
     def holdings(self):
-        holdings = self.dhan_w.get_holdings()
+        holdings = self.dhan.get_holdings()
 
         if not isinstance(holdings["data"], list):
             return pl.DataFrame(schema=self.holidings_schema)
@@ -259,7 +198,7 @@ class Dhan(Broker):
         retry_on_exception=retry_exception,
     )
     def positions(self, drop_cnc: bool = True) -> pl.DataFrame:
-        positions = self.dhan_w.get_positions()
+        positions = self.dhan.get_positions()
 
         positions_df = pl.DataFrame(positions.get("data", {}))  # type:ignore
 
@@ -436,3 +375,15 @@ class Dhan(Broker):
 
             return margins
         return {}
+
+    def profile(self) -> UserBrokerProfileResponse:
+        return {"user_id": "test"}
+
+    def get_exchange(
+        self,
+        exchange: ExchangeType,
+    ) -> Any:
+        return exchange
+
+    def ltp(self, exchange: ExchangeType, tradingsymbol: str) -> float:
+        return 0.0

{quantplay-2.0.47 → quantplay-2.0.50}/quantplay.egg-info/PKG-INFO

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

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