quantplay 2.0.96__tar.gz → 2.0.98__tar.gz

{quantplay-2.0.96 → quantplay-2.0.98}/PKG-INFO

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

{quantplay-2.0.96 → quantplay-2.0.98}/quantplay/broker/ft_utils/flattrade_utils.py

@@ -80,7 +80,7 @@ class FlatTradeUtils:
                         )
 
                 except Exception as e:
-                    Constants.logger.error(f"Flattrade Selenium Error : {e}")
+                    Constants.logger.info(f"Flattrade Selenium Error : {e}")
                     traceback.print_exc()
                     raise TokenException(str(e))
 
@@ -95,7 +95,7 @@ class FlatTradeUtils:
             try:
                 request_token = url.split("code=")[1].split("&")[0]
             except Exception as e:
-                Constants.logger.error(f"Flattrade Selenium Error for {url}")
+                Constants.logger.info(f"Flattrade Selenium Error for {url}")
                 traceback.print_exc()
                 raise TokenException(str(e))
 

{quantplay-2.0.96 → quantplay-2.0.98}/quantplay/broker/generics/broker.py

@@ -217,12 +217,12 @@ class Broker(ABC):
         return pd.read_csv(f"/tmp/{file_name}.csv")  # type: ignore
 
     @cached(cache=TTLCache(maxsize=1, ttl=2))  # type: ignore
-    def cached_orders(self) -> pl.DataFrame:
-        return self.orders()
+    def cached_orders(self, tag: str | None = None, add_ltp: bool = True) -> pl.DataFrame:
+        return self.orders(tag, add_ltp)
 
     @cached(cache=TTLCache(maxsize=1, ttl=2))  # type: ignore
-    def cached_positions(self) -> pl.DataFrame:
-        return self.positions()
+    def cached_positions(self, drop_cnc: bool = True) -> pl.DataFrame:
+        return self.positions(drop_cnc)
 
     def get_symbol(self, symbol: str, exchange: ExchangeType | None = None):
         return symbol

{quantplay-2.0.96 → quantplay-2.0.98}/quantplay/broker/noren.py

@@ -1,12 +1,15 @@
 import json
+import re
 import traceback
 from json.decoder import JSONDecodeError
 from queue import Queue
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 import polars as pl
 from retrying import retry  # type: ignore
 
+from datetime import datetime
+
 from quantplay.broker.finvasia_utils.fa_noren import FA_NorenApi
 from quantplay.broker.ft_utils.ft_noren import FT_NorenApi
 from quantplay.broker.generics.broker import Broker
@@ -685,6 +688,66 @@ class Noren(Broker):
             traceback.print_exc()
             raise RetryableException("Failed to Receive Data from broker. Retrying Again")
 
+    def basket_margin(self, basket_orders: List[Dict[str, Any]]) -> Dict[str, Any]:
+        basket_orders = [
+            {
+                "exchange": "NFO",
+                "tradingsymbol": "NIFTY2481424500CE",
+                "transaction_type": "SELL",
+                "variety": "regular",
+                "product": "NRML",
+                "order_type": "MARKET",
+                "quantity": 25,
+            },
+            {
+                "exchange": "NFO",
+                "tradingsymbol": "NIFTY2481424500PE",
+                "transaction_type": "SELL",
+                "variety": "regular",
+                "product": "NRML",
+                "order_type": "MARKET",
+                "quantity": 15,
+            },
+        ]
+
+        for order in basket_orders:
+            exchange = order["exchange"]
+            tradingsymbol = order["tradingsymbol"]
+            if order["exchange"] not in ["BFO", "NFO"]:
+                raise InvalidArgumentException(
+                    f"Exchange {exchange} is not supported for basket margin calculation"
+                )
+
+            split_regex = r"([A-Z]+)(.{5})([0-9]+)(CE|PE)"
+
+            underlying, expiry, strike, instrument_type = re.findall(  # type:ignore
+                split_regex, tradingsymbol
+            )[0]
+            order["strprc"] = str(strike) + ".00"
+            order["symname"] = underlying
+            order["instname"] = "OPTIDX"
+            order["netqty"] = order["quantity"]
+            order["sellqty"] = order["quantity"]
+            order["optt"] = instrument_type
+            order["prd"] = self.get_product(order["product"])
+            order["exch"] = order["exchange"]
+
+            expiry = self.symbol_data[  # type:ignore
+                f"{exchange}:{self.get_symbol(tradingsymbol)}"
+            ]["expiry"]
+            order["exd"] = (
+                datetime.strptime(expiry, "%Y-%m-%d")  # type:ignore
+                .strftime("%d-%b-%Y")
+                .upper()
+            )
+
+        if self.user_id is None:
+            raise Exception(
+                "UserId is not set: Please contact support team and report the issue"
+            )
+        response = self.api.span_calculator(self.user_id, basket_orders)
+        return response
+
     def margins(self) -> MarginsResponse:
         api_margins = self.invoke_noren_api(self.api.get_limits)
 

{quantplay-2.0.96 → quantplay-2.0.98}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.0.96 → quantplay-2.0.98}/setup.py

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