quantplay 2.1.140__tar.gz → 2.1.142__tar.gz

{quantplay-2.1.140 → quantplay-2.1.142}/PKG-INFO

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

{quantplay-2.1.140 → quantplay-2.1.142}/quantplay/broker/motilal.py

@@ -85,49 +85,26 @@ class Motilal(Broker):
 
         self.instrument_data_by_exchange = {}
 
-        uat = ""
-        if is_uat:
-            uat = "uat"
-
-        self.url = (
-            "https://{}openapi.motilaloswal.com/rest/login/v7/authdirectapi".format(uat)
-        )
-        self.otp_url = (
-            "https://{}openapi.motilaloswal.com/rest/login/v5/resendotp".format(uat)
-        )
-        self.verify_otp_url = (
-            "https://{}openapi.motilaloswal.com/rest/login/v5/verifyotp".format(uat)
-        )
-        self.ltp_url = (
-            "https://{}openapi.motilaloswal.com/rest/report/v1/getltpdata".format(uat)
-        )
-        self.place_order_url = (
-            "https://{}openapi.motilaloswal.com/rest/trans/v1/placeorder".format(uat)
-        )
-        self.get_profile_url = (
-            "https://{}openapi.motilaloswal.com/rest/login/v1/getprofile".format(uat)
-        )
-        self.margin_summary_url = "https://{}openapi.motilaloswal.com/rest/report/v1/getreportmarginsummary".format(
-            uat
-        )
-        self.modify_order_url = (
-            "https://{}openapi.motilaloswal.com/rest/trans/v2/modifyorder".format(uat)
-        )
-        self.order_book_url = (
-            "https://{}openapi.motilaloswal.com/rest/book/v1/getorderbook".format(uat)
-        )
-        self.cancel_order_url = (
-            "https://{}openapi.motilaloswal.com/rest/trans/v1/cancelorder".format(uat)
-        )
-        self.positions_url = (
-            "https://{}openapi.motilaloswal.com/rest/book/v1/getposition".format(uat)
-        )
-        self.holdings_url = (
-            "https://{}openapi.motilaloswal.com/rest/report/v1/getdpholding".format(uat)
-        )
-        self.order_details_url = "https://{}openapi.motilaloswal.com/rest/book/v2/getorderdetailbyuniqueorderid".format(
-            uat
-        )
+        # Versions per Motilal's API docs: the v7 login token is rejected (MO8001) by
+        # the older v1 data endpoints.
+        base = (
+            "https://openapi.motilaloswaluat.com/rest"
+            if is_uat
+            else "https://openapi.motilaloswal.com/rest"
+        )
+        self.url = f"{base}/login/v7/authdirectapi"
+        self.otp_url = f"{base}/login/v5/resendotp"
+        self.verify_otp_url = f"{base}/login/v5/verifyotp"
+        self.get_profile_url = f"{base}/login/v5/getprofile"
+        self.ltp_url = f"{base}/report/v3/getltpdata"
+        self.margin_summary_url = f"{base}/report/v3/getreportmarginsummary"
+        self.holdings_url = f"{base}/report/v3/getdpholding"
+        self.positions_url = f"{base}/book/v4/getposition"
+        self.order_book_url = f"{base}/book/v5/getorderbook"
+        self.order_details_url = f"{base}/book/v5/getorderdetailbyuniqueorderid"
+        self.place_order_url = f"{base}/trans/v2/placeorder"
+        self.modify_order_url = f"{base}/trans/v5/modifyorder"
+        self.cancel_order_url = f"{base}/trans/v2/cancelorder"
 
         try:
             if headers:
@@ -521,9 +498,7 @@ class Motilal(Broker):
         retry_on_exception=retry_exception,
     )
     def __post_request(self, url: str, data: Any):
-        if not data:
-            data = {"Clientcode": self.headers["vendorinfo"]}
-        data = json.dumps(data)
+        data = json.dumps(data or {})
 
         api_response = requests.post(
             url,
@@ -588,7 +563,7 @@ class Motilal(Broker):
         holdings_df = holdings_df.with_columns(
             pl.struct(["exchange", "tradingsymbol"])
             .map_elements(
-                lambda x: int(self.ltp(x["exchange"], x["tradingsymbol"])),
+                lambda x: float(self.ltp(x["exchange"], x["tradingsymbol"])),
                 return_dtype=pl.Float64,
             )
             .alias("price")

{quantplay-2.1.140 → quantplay-2.1.142}/quantplay/broker/upstox.py

@@ -360,7 +360,7 @@ class Upstox(Broker):
         holdings_df = holdings_df.with_columns(
             pl.struct(["exchange", "tradingsymbol"])
             .map_elements(
-                lambda x: int(self.ltp(x["exchange"], x["tradingsymbol"])),
+                lambda x: float(self.ltp(x["exchange"], x["tradingsymbol"])),
                 return_dtype=pl.Float64,
             )
             .alias("price")

{quantplay-2.1.140 → quantplay-2.1.142}/quantplay/broker/zerodha.py

@@ -461,26 +461,40 @@ class Zerodha(Broker):
         positions_df = positions_df.with_columns(
             (pl.col("exchange") + ":" + pl.col("tradingsymbol")).alias("exchange_symbol")
         )
-        symbols = (
-            positions_df.select(pl.col("exchange_symbol").unique()).to_series().to_list()
-        )
-        symbol_ltps = self.get_ltps(symbols)
-        ltp_map: dict[str, float] = {}
-        for exchange_symbol in symbol_ltps:
-            ltp_map[exchange_symbol] = float(symbol_ltps[exchange_symbol]["last_price"])
+        if add_ltp:
+            symbols = (
+                positions_df.select(pl.col("exchange_symbol").unique())
+                .to_series()
+                .to_list()
+            )
+            symbol_ltps = self.get_ltps(symbols)
+            ltp_map: dict[str, float] = {}
+            for exchange_symbol in symbol_ltps:
+                ltp_map[exchange_symbol] = float(
+                    symbol_ltps[exchange_symbol]["last_price"]
+                )
 
-        positions_df = positions_df.with_columns(
-            pl.col("exchange_symbol")
-            .replace_strict(ltp_map, default=0.0)
-            .cast(pl.Float64)
-            .alias("ltp")
-        )
+            positions_df = positions_df.with_columns(
+                pl.col("exchange_symbol")
+                .replace_strict(ltp_map, default=0.0)
+                .cast(pl.Float64)
+                .alias("ltp")
+            )
+        else:
+            # kite.ltp() needs a paid market-data subscription; callers that only
+            # display positions skip it and fill live prices themselves.
+            positions_df = positions_df.with_columns(
+                pl.lit(None).cast(pl.Float64).alias("ltp")
+            )
 
         positions_df = positions_df.with_columns(
             (pl.col("sell_value") - pl.col("buy_value")).alias("pnl")
         )
         positions_df = positions_df.with_columns(
-            (pl.col("quantity") * pl.col("ltp") + pl.col("pnl")).alias("pnl")
+            pl.when(pl.col("quantity") == 0)
+            .then(pl.col("pnl"))
+            .otherwise(pl.col("quantity") * pl.col("ltp") + pl.col("pnl"))
+            .alias("pnl")
         )
 
         positions_df = positions_df.with_columns(

{quantplay-2.1.140 → quantplay-2.1.142}/quantplay.egg-info/PKG-INFO

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

{quantplay-2.1.140 → quantplay-2.1.142}/quantplay.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ tests/test_log_redaction.py
 tests/test_motilal_login.py
 tests/test_sub_client_all_types.py
 tests/test_xts_v2_modify_order.py
+tests/test_zerodha_positions_add_ltp.py
 tests/wrapper/__init__.py
 tests/wrapper/aws/__init__.py
 tests/wrapper/aws/s3_test.py

{quantplay-2.1.140 → quantplay-2.1.142}/setup.py

@@ -21,7 +21,7 @@ requirements = [
 setup(
     name="quantplay",
     long_description=Path("README.md").read_text(),
-    version="2.1.140",
+    version="2.1.142",
     install_requires=requirements,
     tests_require=[],
     packages=find_packages(),

{quantplay-2.1.140 → quantplay-2.1.142}/tests/test_motilal_login.py

@@ -56,3 +56,25 @@ def test_accounts_do_not_share_header_state() -> None:
 def test_login_without_secret_is_rejected() -> None:
     with pytest.raises(RetryableException, match="Missing Arguments"):
         _login(api_secret=None)
+
+
+def test_data_endpoints_use_versions_that_accept_v7_tokens() -> None:
+    client, _ = _login()
+    assert client.get_profile_url.endswith("/login/v5/getprofile")
+    assert client.holdings_url.endswith("/report/v3/getdpholding")
+    assert client.positions_url.endswith("/book/v4/getposition")
+    assert client.order_book_url.endswith("/book/v5/getorderbook")
+    assert client.place_order_url.endswith("/trans/v2/placeorder")
+    assert client.modify_order_url.endswith("/trans/v5/modifyorder")
+    assert client.cancel_order_url.endswith("/trans/v2/cancelorder")
+
+
+def test_reads_send_an_empty_body() -> None:
+    # v3+ rejects a client sending its own code: MO2031 "Client and Vendor Cannot
+    # Enter UserId".
+    client, _ = _login()
+    response = MagicMock()
+    response.json.return_value = {"status": "SUCCESS", "data": []}
+    with patch("quantplay.broker.motilal.requests.post", return_value=response) as post:
+        client.margins()
+    assert post.call_args.kwargs["data"] == "{}"

quantplay-2.1.142/tests/test_zerodha_positions_add_ltp.py

@@ -0,0 +1,73 @@
+from typing import Any
+from unittest.mock import MagicMock
+
+import polars as pl
+import pytest
+
+from quantplay.broker.zerodha import Zerodha
+from quantplay.exception.exceptions import TokenException
+
+
+def _position(symbol: str, quantity: int, buy: float, sell: float) -> dict[str, Any]:
+    return {
+        "tradingsymbol": symbol,
+        "exchange": "NFO",
+        "product": "NRML",
+        "quantity": quantity,
+        "average_price": 100.0,
+        "buy_quantity": 50,
+        "sell_quantity": 50 - quantity,
+        "buy_value": buy,
+        "sell_value": sell,
+        "buy_price": 100.0,
+        "sell_price": 100.0,
+    }
+
+
+@pytest.fixture
+def broker() -> Zerodha:
+    zerodha = object.__new__(Zerodha)
+    zerodha.wrapper = MagicMock()
+    zerodha.invoke_kite_api = MagicMock(  # type: ignore[method-assign]
+        return_value={
+            "net": [
+                _position("NIFTY26N0624000CE", 50, 5000.0, 0.0),
+                _position("NIFTY26N0624000PE", 0, 5000.0, 6000.0),
+            ]
+        }
+    )
+    zerodha.symbol_attribute = MagicMock(return_value=123)  # type: ignore[method-assign]
+    return zerodha
+
+
+def test_add_ltp_false_skips_market_data_call(broker: Zerodha) -> None:
+    # kite.ltp() fails without a market-data subscription; add_ltp=False must not call it
+    broker.get_ltps = MagicMock(  # type: ignore[method-assign]
+        side_effect=TokenException("LTP Calls Require Market Data Subscription")
+    )
+
+    positions = broker.positions(add_ltp=False)
+
+    broker.get_ltps.assert_not_called()
+    rows = {r["tradingsymbol"]: r for r in positions.to_dicts()}
+    assert rows["NIFTY26N0624000CE"]["ltp"] is None
+    assert rows["NIFTY26N0624000CE"]["pnl"] is None
+    assert rows["NIFTY26N0624000PE"]["ltp"] is None
+    assert rows["NIFTY26N0624000PE"]["pnl"] == 1000.0
+
+
+def test_add_ltp_true_unchanged(broker: Zerodha) -> None:
+    broker.get_ltps = MagicMock(  # type: ignore[method-assign]
+        return_value={
+            "NFO:NIFTY26N0624000CE": {"last_price": 120.0},
+            "NFO:NIFTY26N0624000PE": {"last_price": 80.0},
+        }
+    )
+
+    positions = broker.positions(add_ltp=True)
+
+    rows = {r["tradingsymbol"]: r for r in positions.to_dicts()}
+    assert rows["NIFTY26N0624000CE"]["ltp"] == 120.0
+    assert rows["NIFTY26N0624000CE"]["pnl"] == 50 * 120.0 - 5000.0
+    assert rows["NIFTY26N0624000PE"]["pnl"] == 1000.0
+    assert positions.schema == pl.Schema(broker.positions_schema)