quantplay 2.0.42__tar.gz → 2.0.45__tar.gz

{quantplay-2.0.42 → quantplay-2.0.45}/PKG-INFO

@@ -1,11 +1,36 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.42
+Version: 2.0.45
 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.42 → quantplay-2.0.45}/pyproject.toml

@@ -6,7 +6,7 @@ line-length = 90
 
 [tool.pyright]
 typeCheckingMode = "strict"
-pythonVersion = "3.12"
+pythonVersion = "3.10"
 venvPath = "."
 venv = ".venv"
 reportUntypedFunctionDecorator="none"

quantplay-2.0.45/quantplay/broker/__init__.py

@@ -0,0 +1,25 @@
+from .aliceblue import Aliceblue
+from .angelone import AngelOne
+from .broker_factory import BrokerFactory
+from .dhan import Dhan
+from .five_paisa import FivePaisa
+from .flattrade import FlatTrade
+from .iifl_xts import IIFL
+from .motilal import Motilal
+from .shoonya import FinvAsia
+from .upstox import Upstox
+from .zerodha import Zerodha
+
+__all__ = [
+    "Aliceblue",
+    "AngelOne",
+    "BrokerFactory",
+    "Dhan",
+    "FivePaisa",
+    "FlatTrade",
+    "FinvAsia",
+    "Motilal",
+    "Zerodha",
+    "Upstox",
+    "IIFL",
+]

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/aliceblue.py

@@ -1,17 +1,23 @@
 import codecs
 import copy
 import pickle
-from queue import Queue
 import traceback
+from queue import Queue
 from typing import Any, Dict, Literal
 
 import polars as pl
 from pya3 import (
     Aliceblue as Alice,
+)
+from pya3 import (
     OrderType as AliceOrderType,
-    TransactionType as AliceTransactionType,
+)
+from pya3 import (
     ProductType as AliceProductType,
 )
+from pya3 import (
+    TransactionType as AliceTransactionType,
+)
 from retrying import retry  # type: ignore
 
 from quantplay.broker.generics.broker import Broker
@@ -50,8 +56,9 @@ class Aliceblue(Broker):
         api_key: str | None = None,
         order_updates: Queue[OrderUpdateEvent] | None = None,
         client: str | None = None,
+        load_instrument: bool = True,
     ):
-        super(Aliceblue, self).__init__()
+        super().__init__()
         self.order_updates = order_updates
 
         try:
@@ -82,7 +89,9 @@ class Aliceblue(Broker):
             raise RetryableException(str(e))
 
         self.user_id = self.alice.user_id
-        self.load_instrument()
+
+        if load_instrument:
+            self.load_instrument()
 
     def set_client(self, serialized_client: str):
         try:

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/angelone.py

@@ -1,16 +1,16 @@
 import binascii
 import copy
 import json
-from queue import Queue
 import traceback
+from queue import Queue
 from typing import Any, Dict
 
-from SmartApi.smartExceptions import DataException  # type: ignore
 import polars as pl
 import pyotp
 from requests.exceptions import ConnectionError, ConnectTimeout
 from retrying import retry  # type: ignore
 from SmartApi import SmartConnect  # type: ignore
+from SmartApi.smartExceptions import DataException  # type: ignore
 
 from quantplay.broker.generics.broker import Broker
 from quantplay.exception.exceptions import (
@@ -58,7 +58,7 @@ class AngelOne(Broker):
         access_token: str | None = None,
         load_instrument: bool = True,
     ):
-        super(AngelOne, self).__init__()
+        super().__init__()
         self.order_updates = order_updates
 
         try:
@@ -73,6 +73,7 @@ class AngelOne(Broker):
             else:
                 if totp is None:
                     raise InvalidArgumentException("TOTP Key is Missing")
+
                 self.wrapper = SmartConnect(api_key=api_key)
                 response = self.invoke_angelone_api(
                     self.wrapper.generateSession,  # type: ignore
@@ -80,10 +81,12 @@ class AngelOne(Broker):
                     password=mpin,
                     totp=pyotp.TOTP(totp).now(),
                 )
+
                 if response["status"] is False:
                     if "message" in response:
                         raise InvalidArgumentException(response["message"])
                     raise InvalidArgumentException("Invalid API credentials")
+
                 token_data = self.invoke_angelone_api(
                     self.wrapper.generateToken,  # type: ignore
                     refresh_token=self.wrapper.refresh_token,  # type: ignore

{quantplay-2.0.42/quantplay/broker/generics → quantplay-2.0.45/quantplay/broker}/broker_factory.py

@@ -5,7 +5,6 @@ from typing import Any, Dict
 
 from quantplay.broker.aliceblue import Aliceblue
 from quantplay.broker.angelone import AngelOne
-
 from quantplay.broker.five_paisa import FivePaisa
 from quantplay.broker.flattrade import FlatTrade
 from quantplay.broker.iifl_xts import IIFL as IIFL_XTS
@@ -14,9 +13,8 @@ from quantplay.broker.shoonya import FinvAsia
 from quantplay.broker.upstox import Upstox
 from quantplay.broker.zerodha import Zerodha
 from quantplay.exception.exceptions import InvalidArgumentException
-
-from quantplay.utils.pickle_utils import PickleUtils
 from quantplay.utils.caching import InstrumentCache
+from quantplay.utils.pickle_utils import PickleUtils
 
 BrokerType = (
     Aliceblue
@@ -58,62 +56,47 @@ class BrokerFactory:
         Broker.UPSTOX: "upstox_instruments",
         Broker.FIVEPAISA_OPENAPI: "5paisa_instruments",
     }
+    broker_required_args = {
+        Broker.ZERODHA: set(["user_id", "zerodha_wrapper"]),
+        Broker.FINVASIA: set(["user_id", "user_token"]),
+        Broker.FLATTRADE: set(["user_id", "user_token"]),
+        Broker.IIFL_XTS: set(["user_id", "wrapper", "md_wrapper"]),
+        Broker.MOTILAL: set(["user_id", "headers"]),
+        Broker.ALICEBLUE: set(["user_id", "client"]),
+        Broker.UPSTOX: set(["user_id", "access_token"]),
+        Broker.FIVEPAISA_OPENAPI: set(["user_id", "client"]),
+        Broker.ANGELONE: set(
+            [
+                "user_id",
+                "api_key",
+                "access_token",
+                "refresh_token",
+                "feed_token",
+            ]
+        ),
+    }
 
     def __init__(self):
         self.client_broker_data: Dict[str, BrokerType] = {}
 
     def get_broker_key(self, username: str, broker_name: str) -> str:
-        return "{}:{}".format(username, broker_name)
-
-    def set_broker_instruments(self, broker_name: str, broker: BrokerType) -> None:
-        symbol_data_key = f"{broker_name}_instruments"
-        quantplay_symbol_key = f"{broker_name}_qplay_symbols"
-        broker_symbol_key = f"{broker_name}_broker_symbols"
+        return f"{username}:{broker_name}"
 
-        symbol_data = instrument_cache.get(symbol_data_key)
-        quantplay_symbol_map = instrument_cache.get(quantplay_symbol_key)
-        broker_symbol_map = instrument_cache.get(broker_symbol_key)
-
-        if symbol_data is not None:
-            broker.symbol_data = symbol_data
-
-            if broker_name != "Zerodha":
-                if quantplay_symbol_map is not None and broker_symbol_map is not None:
-                    broker.quantplay_symbol_map = quantplay_symbol_map
-                    broker.broker_symbol_map = broker_symbol_map
-
-                else:
-                    broker.initialize_broker_symbol_map()
-                    instrument_cache.set(
-                        quantplay_symbol_key, broker.quantplay_symbol_map
-                    )
-                    instrument_cache.set(broker_symbol_key, broker.broker_symbol_map)
+    def validate_broker_args(self, broker_info: Dict[str, Any]):
+        broker = broker_info["broker"]
+        broker_data = broker_info["broker_data"]
 
-            return
+        if broker not in self.broker_required_args.keys():
+            raise InvalidArgumentException(f"Unsupported Broker: '{broker}'")
 
-        try:
-            symbol_data = PickleUtils.load_data(
-                BrokerFactory.broker_instruments_map[broker_name]
+        if not self.broker_required_args[broker].issubset(broker_data.keys()):
+            raise InvalidArgumentException(
+                f"Missing Arguments for {broker_info['username']}:{broker_info['nickname']} in broker '{broker}' -> {self.broker_required_args[broker].difference(broker_info.keys())}"
             )
-            broker.symbol_data = symbol_data
-
-            if broker_name != "Zerodha":
-                broker.initialize_broker_symbol_map()
-                instrument_cache.set(quantplay_symbol_key, broker.quantplay_symbol_map)
-
-            instrument_cache.set(symbol_data_key, symbol_data)
-
-        except Exception:
-            traceback.print_exc()
-
-            if broker_name != "Zerodha":
-                broker.load_instrument(BrokerFactory.broker_instruments_map[broker_name])
-            else:
-                broker.initialize_symbol_data()
 
     def store_broker_client(
         self, broker_info: Dict[str, Any], load_instrument: bool = True
-    ) -> None:
+    ) -> BrokerType | None:
         username = broker_info["username"]
         nickname = broker_info["nickname"]
 
@@ -125,9 +108,9 @@ class BrokerFactory:
         broker_client: BrokerType | None = None
 
         if broker == "Motilal":
-            motial_headers = broker_data["headers"]
             broker_client = Motilal(
-                headers=motial_headers, load_instrument=load_instrument
+                headers=broker_data["headers"],
+                load_instrument=load_instrument,
             )
 
         elif broker == "Zerodha":
@@ -147,31 +130,29 @@ class BrokerFactory:
             )
 
         elif broker == Broker.ALICEBLUE:
-            broker_client = Aliceblue(client=broker_data["client"])
+            broker_client = Aliceblue(
+                client=broker_data["client"],
+                load_instrument=load_instrument,
+            )
 
         elif broker == Broker.UPSTOX:
             broker_client = Upstox(
                 access_token=broker_data["access_token"],
                 user_id=broker_data["user_id"],
+                load_instrument=load_instrument,
             )
 
         elif broker == Broker.FINVASIA:
-            finvasia_data = broker_data
             broker_client = FinvAsia(
-                order_updates=None,
-                user_id=finvasia_data["user_id"],
-                password=finvasia_data["password"],
-                user_token=finvasia_data["user_token"],
+                user_id=broker_data["user_id"],
+                user_token=broker_data["user_token"],
                 load_instrument=load_instrument,
             )
 
         elif broker == Broker.FLATTRADE:
-            flattrade_data = broker_data
             broker_client = FlatTrade(
-                order_updates=None,
-                user_id=flattrade_data["user_id"],
-                password=flattrade_data["password"],
-                user_token=flattrade_data["user_token"],
+                user_id=broker_data["user_id"],
+                user_token=broker_data["user_token"],
                 load_instrument=load_instrument,
             )
 
@@ -181,22 +162,30 @@ class BrokerFactory:
                 load_instrument=load_instrument,
             )
 
-            self.client_broker_data[broker_key] = broker_client
-
         elif broker == Broker.IIFL_XTS:
-            iifl_xts_data = broker_data
             broker_client = IIFL_XTS(
                 wrapper=broker_data["wrapper"],
                 md_wrapper=broker_data["md_wrapper"],
-                client_id=iifl_xts_data["user_id"],
+                client_id=broker_data["user_id"],
                 load_instrument=load_instrument,
             )
 
         else:
-            raise InvalidArgumentException(f"Broker {broker} not supported")
+            raise InvalidArgumentException(f"Broker '{broker}' not supported")
+
+        if not load_instrument:
+            broker_client = self.set_broker_instruments(
+                broker_name=broker, broker=broker_client
+            )
+
+        broker_client.username = broker_info["username"]
+        broker_client.nickname = broker_info["nickname"]
+        broker_client.broker_name = broker_info["broker"]
+        broker_client.user_id = broker_data["user_id"]
 
         self.client_broker_data[broker_key] = broker_client
-        self.set_broker_instruments(broker_name=broker, broker=broker_client)
+
+        return broker_client
 
     def get_broker_client(self, broker_info: Dict[str, Any]) -> BrokerType:
         username = broker_info["username"]
@@ -207,13 +196,62 @@ class BrokerFactory:
         if broker_key in self.client_broker_data:
             return self.client_broker_data[broker_key]
 
-        self.store_broker_client(broker_info, load_instrument=False)
+        self.validate_broker_args(broker_info)
+        broker_client = self.store_broker_client(broker_info, load_instrument=False)
 
-        if broker_key in self.client_broker_data:
-            return self.client_broker_data[broker_key]
+        if broker_client is not None:
+            return broker_client
         else:
             raise InvalidArgumentException("Invalid broker API configuration")
 
+    def set_broker_instruments(self, broker_name: str, broker: BrokerType) -> BrokerType:
+        symbol_data_key = f"{broker_name}_instruments"
+        quantplay_symbol_key = f"{broker_name}_qplay_symbols"
+        broker_symbol_key = f"{broker_name}_broker_symbols"
+
+        symbol_data = instrument_cache.get(symbol_data_key)
+        quantplay_symbol_map = instrument_cache.get(quantplay_symbol_key)
+        broker_symbol_map = instrument_cache.get(broker_symbol_key)
+
+        if symbol_data is not None:
+            broker.symbol_data = symbol_data
+
+            if broker_name != "Zerodha":
+                if quantplay_symbol_map is not None and broker_symbol_map is not None:
+                    broker.quantplay_symbol_map = quantplay_symbol_map
+                    broker.broker_symbol_map = broker_symbol_map
+
+                else:
+                    broker.initialize_broker_symbol_map()
+                    instrument_cache.set(
+                        quantplay_symbol_key, broker.quantplay_symbol_map
+                    )
+                    instrument_cache.set(broker_symbol_key, broker.broker_symbol_map)
+
+            return broker
+
+        try:
+            symbol_data = PickleUtils.load_data(
+                BrokerFactory.broker_instruments_map[broker_name]
+            )
+            broker.symbol_data = symbol_data
+
+            if broker_name != "Zerodha":
+                broker.initialize_broker_symbol_map()
+                instrument_cache.set(quantplay_symbol_key, broker.quantplay_symbol_map)
+
+            instrument_cache.set(symbol_data_key, symbol_data)
+
+        except Exception:
+            traceback.print_exc()
+
+            if broker_name != "Zerodha":
+                broker.load_instrument(BrokerFactory.broker_instruments_map[broker_name])
+            else:
+                broker.initialize_symbol_data()
+
+        return broker
+
     def clear_instrument_cache(self, broker: str) -> None:
         symbol_data_key = f"{broker}_instruments"
         instrument_cache.delete(symbol_data_key)

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/dhan.py

@@ -4,8 +4,7 @@ import traceback
 from typing import Any, Dict, Hashable, List
 
 import polars as pl
-from kiteconnect import KiteConnect, KiteTicker  # type: ignore
-from kiteconnect.exceptions import TokenException  # type: ignore
+from dhanhq import dhanhq  # type:ignore
 from retrying import retry  # type: ignore
 
 from quantplay.broker.generics.broker import Broker
@@ -15,7 +14,6 @@ from quantplay.exception.exceptions import (
     RetryableException,
     retry_exception,
 )
-from quantplay.exception.exceptions import TokenException as QuantplayTokenException
 from quantplay.model.broker import (
     ExchangeType,
 )
@@ -27,11 +25,11 @@ from quantplay.model.generics import (
 )
 from quantplay.utils.constant import Constants, OrderType
 from quantplay.utils.pickle_utils import InstrumentData, PickleUtils
-from dhanhq import dhanhq  # type:ignore
 
 
 class Dhan(Broker):
     def __init__(self):
+        super().__init__()
         self.dhan = dhanhq(
             client_id="1102866282",
             access_token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJkaGFuIiwicGFydG5lcklkIjoiIiwiZXhwIjoxNzIzODgxNjgxLCJ0b2tlbkNvbnN1bWVyVHlwZSI6IlNFTEYiLCJ3ZWJob29rVXJsIjoiIiwiZGhhbkNsaWVudElkIjoiMTEwMjg2NjI4MiJ9.0dNR4gOdIQ3KeaAokEwbRt6v_6ESn73r6yOL9-7lzphVCAmP-pahgK6OIOxVUExBJa0SaxX0TNX7Vk0RBQ-lxQ",
@@ -41,8 +39,6 @@ class Dhan(Broker):
             access_token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJkaGFuIiwicGFydG5lcklkIjoiIiwiZXhwIjoxNzIxMzc3ODM5LCJ0b2tlbkNvbnN1bWVyVHlwZSI6IlNFTEYiLCJ3ZWJob29rVXJsIjoiIiwiZGhhbkNsaWVudElkIjoiMTEwMDc5OTExNiJ9.ykd4NYsnl7s1UegkUUY9tbP4OxxjqtskGi8JK0lyC9bRRPQRyxDv022JyDIl6crdFsQXfG7-6BsipPYxOtLR8g",
         )
 
-        super(Dhan, self).__init__()
-
     def set_wrapper(self, serialized_wrapper: str):
         self.wrapper = pickle.loads(codecs.decode(serialized_wrapper.encode(), "base64"))
 
@@ -69,33 +65,6 @@ class Dhan(Broker):
     def get_username(self):
         return self.username
 
-    def on_ticks(self, kws: KiteTicker, ticks: Any):
-        """Callback on live ticks"""
-        # logger.info("[TEST_TICK] {}".format(ticks))
-        pass
-
-    def on_order_update(self, kws: KiteTicker, data: Any):
-        """Callback on order update"""
-        Constants.logger.info(f"[UPDATE_RECEIVED] {data}")
-
-        if self.order_updates is None:
-            raise Exception("Event Queue Not Initalised")
-
-        self.order_updates.put(data)
-
-    def on_connect(self, kws: KiteTicker, response: Any):
-        """Callback on successfull connect"""
-        kws.subscribe([256265])  # type: ignore
-        kws.set_mode(kws.MODE_FULL, [256265])  # type: ignore
-
-    def stream_order_data(self):
-        kite_ticker = KiteTicker(self.wrapper.api_key, self.wrapper.access_token)
-        kite_ticker.on_order_update = self.on_order_update  # type:ignore
-        kite_ticker.on_ticks = self.on_ticks  # type:ignore
-        kite_ticker.on_connect = self.on_connect  # type:ignore
-
-        kite_ticker.connect(threaded=True)  # type: ignore
-
     @retry(
         wait_exponential_multiplier=3000,
         wait_exponential_max=10000,
@@ -135,8 +104,6 @@ class Dhan(Broker):
                 )
 
             return api_response[key]["last_price"]
-        except TokenException:
-            raise QuantplayTokenException("Zerodha token expired")
         except Exception as e:
             exception_message = "GetLtp call failed for [{}] with error [{}]".format(
                 tradingsymbol, str(e)

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/finvasia_utils/fa_noren.py

@@ -8,11 +8,12 @@ import urllib.parse
 from datetime import datetime as dt
 from time import sleep
 from typing import Any, Callable, Dict, List, Literal, TypedDict
-from quantplay.model.generics import NorenTypes
-from quantplay.model.generics import ExchangeType
+
 import requests
 import websocket
 
+from quantplay.model.generics import ExchangeType, NorenTypes
+
 logger = logging.getLogger(__name__)
 
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/five_paisa.py

@@ -10,7 +10,6 @@ from retrying import retry  # type: ignore
 
 from quantplay.broker.generics.broker import Broker
 from quantplay.exception.exceptions import (
-    BrokerException,
     InvalidArgumentException,
     QuantplayOrderPlacementException,
     RetryableException,
@@ -49,6 +48,7 @@ class FivePaisa(Broker):
         client: str | None = None,
         load_instrument: bool = True,
     ):
+        super().__init__()
         self.broker_name = "FivePaisa_OpenAPI"
         try:
             if client:
@@ -96,7 +96,6 @@ class FivePaisa(Broker):
 
         if load_instrument:
             self.load_instrument()
-        super(FivePaisa, self).__init__()
 
     def get_exchange(self, exchange: ExchangeType) -> Any:
         return exchange
@@ -310,10 +309,9 @@ class FivePaisa(Broker):
     )
     def orders(self, tag: str | None = None, add_ltp: bool = True):
         orders = self.client.order_book()
+
         if orders is None:
-            raise BrokerException(
-                "Invalid data response. AngelOne sent incorrect data, Please check."
-            )
+            raise TokenException("5Paisa Token expired")
 
         if len(orders) == 0:
             return pl.DataFrame(schema=self.orders_schema)

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/flattrade.py

@@ -81,9 +81,9 @@ class FlatTrade(Noren):
             "request_code": reqCode,
             "api_secret": hashlib.sha256(secret_code.encode()).hexdigest(),
         }
-        url3 = "https://authapi.flattrade.in/trade/apitoken"
+        url = "https://authapi.flattrade.in/trade/apitoken"
 
-        res3 = requests.post(url3, json=payload)
-        token = res3.json()["token"]
+        res = requests.post(url, json=payload)
+        token = res.json()["token"]
 
         return token

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/ft_utils/ft_noren.py

@@ -8,11 +8,12 @@ import urllib.parse
 from datetime import datetime as dt
 from time import sleep
 from typing import Any, Callable, Dict, List, Literal, TypedDict
-from quantplay.model.generics import NorenTypes
-from quantplay.model.generics import ExchangeType
+
 import requests
 import websocket
 
+from quantplay.model.generics import ExchangeType, NorenTypes
+
 logger = logging.getLogger(__name__)
 
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/generics/broker.py

@@ -1,4 +1,3 @@
-from abc import ABC, abstractmethod
 import copy
 import io
 import json
@@ -11,6 +10,7 @@ import threading
 import time
 import traceback
 import zipfile
+from abc import ABC, abstractmethod
 from datetime import datetime, timedelta
 from queue import Queue
 from threading import Lock
@@ -32,10 +32,10 @@ from quantplay.model.broker import (
     UserBrokerProfileResponse,
 )
 from quantplay.model.generics import (
+    OrderTypeType,
     ProductType,
     QuantplayOrder,
     TransactionType,
-    OrderTypeType,
 )
 from quantplay.model.instrument_data import InstrumentDataType
 from quantplay.model.order_event import OrderUpdateEvent
@@ -812,8 +812,8 @@ class Broker(ABC):
         product: ProductType,
         transaction_type: TransactionType,
         quantity: int,
-        strike_factor: int,
-        new_strike: int,
+        strike_factor: int | None,
+        new_strike: int | None,
     ):
         split_regex = r"([A-Z]+)(.{5})([0-9]+)(CE|PE)"
 
@@ -825,7 +825,7 @@ class Broker(ABC):
         config = self.underlying_config(underlying, expiry)
         strike_gap = config["strike_gap"]
 
-        if strike_factor:
+        if strike_factor is not None:
             new_strike = strike + (strike_gap * strike_factor)
 
         new_trading_symbol = f"{underlying}{expiry}{new_strike}{instrument_type}"

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/motilal.py

@@ -1,11 +1,23 @@
+import binascii
 import copy
 import hashlib
+import json
 from queue import Queue
 from typing import Any, Dict
-import requests
-import json
+
 import polars as pl
+import pyotp
+import requests
+from retrying import retry  # type: ignore
 
+from quantplay.broker.generics.broker import Broker
+from quantplay.exception.exceptions import (
+    InvalidArgumentException,
+    QuantplayOrderPlacementException,
+    RetryableException,
+    TokenException,
+    retry_exception,
+)
 from quantplay.model.broker import UserBrokerProfileResponse
 from quantplay.model.generics import (
     ExchangeType,
@@ -15,18 +27,7 @@ from quantplay.model.generics import (
 )
 from quantplay.model.order_event import OrderUpdateEvent
 from quantplay.utils.constant import Constants, OrderType
-from quantplay.broker.generics.broker import Broker
-from quantplay.exception.exceptions import InvalidArgumentException
-import pyotp
-import binascii
 from quantplay.utils.pickle_utils import InstrumentData
-from quantplay.exception.exceptions import (
-    QuantplayOrderPlacementException,
-    TokenException,
-    retry_exception,
-    RetryableException,
-)
-from retrying import retry  # type: ignore
 from quantplay.wrapper.aws.s3 import S3Utils
 
 
@@ -74,7 +75,7 @@ class Motilal(Broker):
         totp: str | None = None,
         order_updates: Queue[OrderUpdateEvent] | None = None,
     ):
-        super(Motilal, self).__init__()
+        super().__init__()
         self.order_updates = order_updates
 
         self.instrument_data_by_exchange = {}
@@ -339,7 +340,7 @@ class Motilal(Broker):
             ).json()
             Constants.logger.info("[MODIFY_ORDER_RESPONSE] {}".format(response))
         except Exception as e:
-            exception_message = f"[ORDER_MODIFICATION_FAILED] for {data["uniqueorderid"]} failed with exception {e}"
+            exception_message = f"[ORDER_MODIFICATION_FAILED] for {data['uniqueorderid']} failed with exception {e}"
             Constants.logger.error("{}".format(exception_message))
         return order["order_id"]
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/noren.py

@@ -23,8 +23,12 @@ from quantplay.model.broker import (
     ModifyOrderRequest,
     UserBrokerProfileResponse,
 )
-from quantplay.model.generics import OrderTypeType, ProductType, TransactionType
-from quantplay.model.generics import NorenTypes
+from quantplay.model.generics import (
+    NorenTypes,
+    OrderTypeType,
+    ProductType,
+    TransactionType,
+)
 from quantplay.model.order_event import OrderUpdateEvent
 from quantplay.utils.constant import Constants, OrderType
 from quantplay.utils.pickle_utils import InstrumentData
@@ -39,7 +43,7 @@ class Noren(Broker):
         load_instrument: bool = True,
         order_updates: Queue[OrderUpdateEvent] | None = None,
     ):
-        super(Noren, self).__init__()
+        super().__init__()
 
         self.order_updates = order_updates
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/upstox.py

@@ -49,6 +49,8 @@ class Upstox(Broker):
         redirect_url: str | None = None,
         load_instrument: bool = True,
     ):
+        super().__init__()
+
         try:
             if access_token:
                 self.set_access_token(access_token)
@@ -83,8 +85,6 @@ class Upstox(Broker):
         if load_instrument:
             self.load_instrument()
 
-        super(Upstox, self).__init__()
-
     def load_instrument(self, file_name: str | None = None) -> None:
         super().load_instrument("upstox_instruments")
 
@@ -192,7 +192,7 @@ class Upstox(Broker):
             )
 
             Constants.logger.info(
-                f"Modifying order [{ order["order_id"]}] new price [{order.get("price")}]"
+                f"Modifying order [{ order['order_id']}] new price [{order.get('price')}]"
             )
         return order["order_id"]
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/xts.py

@@ -47,7 +47,7 @@ class XTS(Broker):
         ClientID: str | None = None,
         load_instrument: bool = True,
     ):
-        super(XTS, self).__init__()
+        super().__init__()
         self.order_updates: Queue[OrderUpdateEvent] | None = order_updates
         self.root_url = root_url
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/xts_utils/Connect.py

@@ -12,9 +12,8 @@ import traceback
 from typing import Any, Dict, List, Literal
 
 import requests
-import urllib3
 import requests.adapters
-
+import urllib3
 from six.moves.urllib.parse import urljoin  # type:ignore
 
 from quantplay.broker.xts_utils import Exception as ex

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/xts_utils/InteractiveSocketClient.py

@@ -1,4 +1,5 @@
 from typing import Any, Dict, List, Literal
+
 import socketio  # type: ignore
 
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/zerodha.py

@@ -47,6 +47,7 @@ class Zerodha(Broker):
         totp: str | None = None,
         load_instrument: bool = True,
     ):
+        super().__init__()
         self.wrapper: KiteConnect
         try:
             if wrapper:
@@ -62,7 +63,6 @@ class Zerodha(Broker):
         if load_instrument:
             self.initialize_symbol_data()
         self.broker_symbol_map = {}
-        super(Zerodha, self).__init__()
 
     def set_wrapper(self, serialized_wrapper: str):
         self.wrapper = pickle.loads(codecs.decode(serialized_wrapper.encode(), "base64"))

quantplay-2.0.45/quantplay/exception/exceptions.py

@@ -0,0 +1,100 @@
+class InvalidArgumentException(Exception):
+    code = "400"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class DataNotFoundException(Exception):
+    code = "404"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class FeatureNotSupported(Exception):
+    code = "407"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class AccessDeniedException(Exception):
+    code = "403"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class RetryableException(Exception):
+    code = "409"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+def retry_on_access_denied(exc: Exception):
+    return isinstance(exc, AccessDeniedException)
+
+
+def retry_exception(exc: Exception):
+    return isinstance(exc, RetryableException)
+
+
+class StaleDataFound(Exception):
+    code = "101"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class ServiceException(Exception):
+    code = "500"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class StockNotListedOnExchange(Exception):
+    stocks = []
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class QuantplayOrderPlacementException(Exception):
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class StrategyInvocationException(Exception):
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class BrokerNotFoundException(Exception):
+    code = "404"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class TokenException(Exception):
+    code = "404"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class WrongLibrarySetup(Exception):
+    code = "501"
+
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class BrokerException(Exception):
+    code = "510"
+
+    def __init__(self, message: str):
+        super().__init__(message)

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/model/instrument_data.py

@@ -1,5 +1,7 @@
 from typing import TypedDict
+
 from typing_extensions import NotRequired
+
 from quantplay.model.generics import ExchangeType
 
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/wrapper/aws/s3.py

@@ -1,11 +1,12 @@
+import os
+from threading import Lock
+
 import boto3
 import pandas as pd
-import os
 from boto3.s3.transfer import TransferConfig
-from threading import Lock
-from quantplay.utils.constant import Constants
 from retrying import retry  # type: ignore
 
+from quantplay.utils.constant import Constants
 
 lock = Lock()
 

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay.egg-info/PKG-INFO

@@ -1,11 +1,36 @@
 Metadata-Version: 2.1
 Name: quantplay
-Version: 2.0.42
+Version: 2.0.45
 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.42 → quantplay-2.0.45}/quantplay.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ quantplay.egg-info/top_level.txt
 quantplay/broker/__init__.py
 quantplay/broker/aliceblue.py
 quantplay/broker/angelone.py
+quantplay/broker/broker_factory.py
 quantplay/broker/dhan.py
 quantplay/broker/five_paisa.py
 quantplay/broker/flattrade.py
@@ -31,7 +32,6 @@ quantplay/broker/ft_utils/flattrade_utils.py
 quantplay/broker/ft_utils/ft_noren.py
 quantplay/broker/generics/__init__.py
 quantplay/broker/generics/broker.py
-quantplay/broker/generics/broker_factory.py
 quantplay/broker/uplink/__init__.py
 quantplay/broker/uplink/uplink_utils.py
 quantplay/broker/xts_utils/Connect.py

{quantplay-2.0.42 → quantplay-2.0.45}/setup.py

@@ -9,7 +9,7 @@ def is_requirement(s: str) -> bool:
     and must not start from - or #.
     """
     s = s.strip()
-    return not any([not s, re.match("^[-#]", s)])  # empty  # option or comment
+    return not any([not s, re.match("^[-#]", s)])
 
 
 requirements = [
@@ -21,7 +21,7 @@ requirements = [
 setup(
     name="quantplay",
     long_description=Path("README.md").read_text(),
-    version="2.0.42",
+    version="2.0.45",
     setup_requires=["pytest-runner"],
     install_requires=requirements,
     tests_require=[],

quantplay-2.0.42/quantplay/exception/exceptions.py

@@ -1,114 +0,0 @@
-class InvalidArgumentException(Exception):
-    code = "400"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(InvalidArgumentException, self).__init__(message)
-
-
-class DataNotFoundException(Exception):
-    code = "404"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(DataNotFoundException, self).__init__(message)
-
-
-class FeatureNotSupported(Exception):
-    code = "407"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(FeatureNotSupported, self).__init__(message)
-
-
-class AccessDeniedException(Exception):
-    code = "403"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(AccessDeniedException, self).__init__(message)
-
-
-class RetryableException(Exception):
-    code = "409"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(RetryableException, self).__init__(message)
-
-
-def retry_on_access_denied(exc: Exception):
-    return isinstance(exc, AccessDeniedException)
-
-
-def retry_exception(exc: Exception):
-    return isinstance(exc, RetryableException)
-
-
-class StaleDataFound(Exception):
-    code = "101"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(StaleDataFound, self).__init__(message)
-
-
-class ServiceException(Exception):
-    code = "500"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(ServiceException, self).__init__(message)
-
-
-class StockNotListedOnExchange(Exception):
-    stocks = []
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(StockNotListedOnExchange, self).__init__(message)
-
-
-class QuantplayOrderPlacementException(Exception):
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(QuantplayOrderPlacementException, self).__init__(message)
-
-
-class StrategyInvocationException(Exception):
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(StrategyInvocationException, self).__init__(message)
-
-
-class BrokerNotFoundException(Exception):
-    code = "404"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(BrokerNotFoundException, self).__init__(message)
-
-
-class TokenException(Exception):
-    code = "404"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(TokenException, self).__init__(message)
-
-
-class WrongLibrarySetup(Exception):
-    code = "501"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(WrongLibrarySetup, self).__init__(message)
-
-
-class BrokerException(Exception):
-    code = "510"
-
-    def __init__(self, message: str):
-        # Call the base class constructor with the parameters it needs
-        super(BrokerException, self).__init__(message)

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/broker/auto_login/aliceblue.py

@@ -5,6 +5,7 @@ import traceback
 import pyotp
 from retrying import retry  # type: ignore
 from selenium.common.exceptions import NoSuchElementException, WebDriverException
+from selenium.webdriver import Chrome
 
 from quantplay.exception.exceptions import (
     BrokerException,
@@ -12,7 +13,6 @@ from quantplay.exception.exceptions import (
     RetryableException,
 )
 from quantplay.utils.selenium_utils import Selenium
-from selenium.webdriver import Chrome
 
 
 class AliceblueLogin:

{quantplay-2.0.42 → quantplay-2.0.45}/quantplay/utils/pickle_utils.py

@@ -1,6 +1,6 @@
 import pickle
-from typing import Any, Dict
 from threading import Lock
+from typing import Any, Dict
 
 from quantplay.model.instrument_data import InstrumentDataType