quantplay 2.0.26__tar.gz → 2.0.28__tar.gz

{quantplay-2.0.26 → quantplay-2.0.28}/PKG-INFO

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

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/aliceblue.py

@@ -214,7 +214,10 @@ class Aliceblue(Broker):
             raise QuantplayOrderPlacementException(exception_message)
 
     def ltp(self, exchange, tradingsymbol: str):
-        inst = self.alice.get_instrument_by_symbol(exchange, tradingsymbol)
+        tradingsymbol = self.get_symbol(tradingsymbol, exchange=exchange)
+        inst = self.invoke_aliceblue_api(
+            self.alice.get_instrument_by_symbol, exchange=exchange, symbol=tradingsymbol
+        )
         info = self.invoke_aliceblue_api(self.alice.get_scrip_info, instrument=inst)
 
         return float(info["LTP"])
@@ -453,6 +456,8 @@ class Aliceblue(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         if "rorgqty" in orders_df.columns:
             orders_df = orders_df.with_columns(
@@ -547,10 +552,6 @@ class Aliceblue(Broker):
     def margins(self):
         margins = self.invoke_aliceblue_api(self.alice.get_balance)
 
-        if "emsg" in margins and "expired" in margins["emsg"].lower():
-            raise TokenException("Session expired")
-        if "stat" in margins and "not_ok" in margins["stat"].lower():
-            raise TokenException(f"Aliceblue broker error: {margins['emsg']}")
         margins = [a for a in margins if a["segment"] == "ALL"][0]
 
         response = {
@@ -570,6 +571,11 @@ class Aliceblue(Broker):
     def invoke_aliceblue_api(self, fn: Callable, *args, **kwargs) -> Any:
         try:
             response = fn(*args, **kwargs)
+
+            if "emsg" in response and "expired" in response["emsg"].lower():
+                raise TokenException("Session expired")
+            if "stat" in response and response["stat"].lower() == "not_ok":
+                raise InvalidArgumentException(response["emsg"])
             if response is None:
                 raise InvalidArgumentException(
                     "Invalid data response. Aliceblue sent incorrect data, Please check."
@@ -577,9 +583,9 @@ class Aliceblue(Broker):
 
             return response
 
-        except TokenException:
-            raise QuantplayTokenException("Token Expired")
+        except (TokenException, InvalidArgumentException):
+            raise
 
         except Exception:
             traceback.print_exc()
-            raise RetryableException("Failed to fetch user profile")
+            raise RetryableException("Failed to fetch data from Aliceblue")

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/angelone.py

@@ -23,7 +23,6 @@ from quantplay.exception.exceptions import (
     TokenException,
     retry_exception,
 )
-from quantplay.exception.exceptions import TokenException as QuantplayTokenException
 from quantplay.model.broker import ModifyOrderRequest, UserBrokerProfileResponse
 from quantplay.model.order_event import OrderUpdateEvent
 from quantplay.utils.constant import Constants, OrderType
@@ -162,11 +161,6 @@ class AngelOne(Broker):
             "Product {} not supported for trading".format(product)
         )
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-    )
     def ltp(self, exchange, tradingsymbol: str) -> float:
         if tradingsymbol in MarketConstants.INDEX_SYMBOL_TO_DERIVATIVE_SYMBOL_MAP:
             tradingsymbol = MarketConstants.INDEX_SYMBOL_TO_DERIVATIVE_SYMBOL_MAP[
@@ -185,11 +179,6 @@ class AngelOne(Broker):
             symboltoken=symboltoken,
         )
 
-        if "status" in response and response["status"] is False:
-            raise InvalidArgumentException(
-                "Failed to fetch ltp broker error {}".format(response)
-            )
-
         return response["data"]["ltp"]
 
     def place_order(
@@ -310,18 +299,8 @@ class AngelOne(Broker):
     def cancel_order(self, order_id, variety="NORMAL"):
         self.wrapper.cancelOrder(order_id=order_id, variety=variety)
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=15000,
-        stop_max_attempt_number=5,
-        retry_on_exception=retry_exception,
-    )
     def holdings(self):
-        try:
-            holdings = self.invoke_angelone_api(self.wrapper.holding)
-        except Exception:
-            raise RetryableException("Access Denied retrying")
-        self.handle_exception(holdings)
+        holdings = self.invoke_angelone_api(self.wrapper.holding)
 
         if holdings["data"] is None or len(holdings["data"]) == 0:
             return pl.DataFrame(schema=self.holidings_schema)
@@ -350,15 +329,11 @@ class AngelOne(Broker):
     @retry(
         wait_exponential_multiplier=3000,
         wait_exponential_max=15000,
-        stop_max_attempt_number=5,
+        stop_max_attempt_number=2,
         retry_on_exception=retry_exception,
     )
     def positions(self, drop_cnc: bool = True):
-        try:
-            positions = self.invoke_angelone_api(self.wrapper.position)
-        except Exception:
-            raise RetryableException("Access Denied retrying")
-        self.handle_exception(positions)
+        positions = self.invoke_angelone_api(self.wrapper.position)
 
         if positions["data"] is None:
             return pl.DataFrame(schema=self.positions_schema)
@@ -427,18 +402,8 @@ class AngelOne(Broker):
             self.positions_schema
         )
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-        retry_on_exception=retry_exception,
-    )
     def orders(self, tag: str | None = None, add_ltp: bool = True) -> pl.DataFrame:
-        try:
-            order_book = self.invoke_angelone_api(self.wrapper.orderBook)
-        except Exception:
-            raise RetryableException("Access Denied retrying")
-        self.handle_exception(order_book)
+        order_book = self.invoke_angelone_api(self.wrapper.orderBook)
 
         if order_book["data"]:
             orders_df = pl.DataFrame(order_book["data"])
@@ -534,21 +499,10 @@ class AngelOne(Broker):
                 traceback.print_exc()
                 raise ServiceException("Unknown error while fetching order book [{}]")
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-        retry_on_exception=retry_exception,
-    )
     def profile(self):
-        try:
-            profile_data = self.invoke_angelone_api(
-                self.wrapper.getProfile, refreshToken=self.refresh_token
-            )
-        except Exception:
-            raise RetryableException("Access Denied retrying")
-
-        self.handle_exception(profile_data)
+        profile_data = self.invoke_angelone_api(
+            self.wrapper.getProfile, refreshToken=self.refresh_token
+        )
 
         profile_data = profile_data["data"]
         response: UserBrokerProfileResponse = {
@@ -559,15 +513,8 @@ class AngelOne(Broker):
 
         return response
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-        retry_on_exception=retry_exception,
-    )
     def margins(self):
         api_margins = self.invoke_angelone_api(self.wrapper.rmsLimit)
-        self.handle_exception(api_margins)
 
         if "data" in api_margins and api_margins["data"] is None:
             if "errorcode" in api_margins and api_margins["errorcode"] == "AB1004":
@@ -610,19 +557,25 @@ class AngelOne(Broker):
 
         return response
 
+    @retry(
+        wait_exponential_multiplier=3000,
+        wait_exponential_max=10000,
+        stop_max_attempt_number=3,
+        retry_on_exception=retry_exception,
+    )
     def invoke_angelone_api(self, fn: Callable, *args, **kwargs) -> Dict:
         try:
             response = fn(*args, **kwargs)
+            if "errorCode" in response and response["errorCode"] == "AG8001":
+                raise TokenException(f"{self.user_id}: Invalid Token")
             if isinstance(response, bytes):
                 raise InvalidArgumentException(
                     "Invalid data response. AngelOne sent incorrect data, Please check."
                 )
 
             return response
-
-        except TokenException:
-            raise QuantplayTokenException("Token Expired")
-
+        except (TokenException, InvalidArgumentException):
+            raise
         except Exception:
             traceback.print_exc()
             raise RetryableException("Failed to fetch user profile")

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/five_paisa.py

@@ -413,6 +413,8 @@ class FivePaisa(Broker):
                 .then(-pl.col("pnl"))
                 .otherwise(pl.col("pnl"))
             )
+        else:
+            orders = orders.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         return orders
 

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/motilal.py

@@ -89,7 +89,7 @@ class Motilal(Broker):
         self.verify_otp_url = (
             "https://{}openapi.motilaloswal.com/rest/login/v3/verifyotp".format(uat)
         )
-        self.ltp_utl = (
+        self.ltp_url = (
             "https://{}openapi.motilaloswal.com/rest/report/v1/getltpdata".format(uat)
         )
         self.place_order_url = (
@@ -263,11 +263,6 @@ class Motilal(Broker):
         Constants.logger.info(response)
         return response
 
-    @retry(
-        wait_exponential_multiplier=3000,
-        wait_exponential_max=10000,
-        stop_max_attempt_number=3,
-    )
     def ltp(self, exchange, tradingsymbol: str) -> float:
         tradingsymbol = self.get_symbol(tradingsymbol)
         token = self.symbol_data["{}:{}".format(exchange, tradingsymbol)]["token"]
@@ -279,9 +274,7 @@ class Motilal(Broker):
         }
 
         Constants.logger.info("[GET_LTP_REQUEST] response {}".format(data))
-        response = requests.post(
-            self.ltp_utl, headers=self.headers, data=json.dumps(data)
-        )
+        response = self.__post_request(self.ltp_url, json.dumps(data))
         Constants.logger.info("[GET_LTP_RESPONSE] response {}".format(response.json()))
         return response.json()["data"]["ltp"] / 100.0
 
@@ -737,6 +730,8 @@ class Motilal(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         orders_df = orders_df.with_columns(
             pl.when(pl.col("product") == "VALUEPLUS")

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/noren.py

@@ -525,6 +525,8 @@ class Noren(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         orders_df = orders_df.with_columns(pl.lit(None).alias("variety"))
 

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/upstox.py

@@ -465,6 +465,8 @@ class Upstox(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
         orders_df = orders_df.rename({"placed_by": "user_id"})
 
         orders_df = orders_df.with_columns(

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/xts.py

@@ -275,6 +275,8 @@ class XTS(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         orders_df = orders_df.with_columns(
             pl.col("filled_quantity").cast(pl.Int64).alias("filled_quantity"),

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay/broker/zerodha.py

@@ -495,6 +495,8 @@ class Zerodha(Broker):
             orders_df = orders_df.join(
                 positions.select(["tradingsymbol", "ltp"]), on="tradingsymbol", how="left"
             )
+        else:
+            orders_df = orders_df.with_columns(pl.lit(None).cast(pl.Float64).alias("ltp"))
 
         orders_df = orders_df.with_columns(
             (

{quantplay-2.0.26 → quantplay-2.0.28}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.26 → quantplay-2.0.28}/setup.py

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