kitecli 0.2.6__tar.gz → 0.2.9__tar.gz

{kitecli-0.2.6 → kitecli-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kitecli
-Version: 0.2.6
+Version: 0.2.9
 Summary: KiteCLI — Multi-account, multi-broker trading positions viewer (Zerodha + Kotak Neo)
 Author: KiteCLI Team
 License: MIT

{kitecli-0.2.6 → kitecli-0.2.9}/cli/kite_manager.py

@@ -1039,22 +1039,36 @@ class KiteAccountManager(BaseBrokerManager):
         return {}
 
     def get_market_indices(self) -> dict[str, Any]:
-        # 1. Try Kite first
+        # 1. Try Kite ohlc first for last_price and yesterday's close
         for api_key in self.get_all_api_keys():
             if self.is_authenticated(api_key):
                 kite = self._clients.get(api_key)
                 if kite:
                     try:
-                        data = kite.ltp(["NSE:NIFTY 50", "BSE:SENSEX", "NSE:INDIA VIX"])
-                        nifty = data.get("NSE:NIFTY 50", {}).get("last_price")
-                        sensex = data.get("BSE:SENSEX", {}).get("last_price")
-                        vix = data.get("NSE:INDIA VIX", {}).get("last_price")
-                        if nifty or sensex or vix:
+                        data = kite.ohlc(["NSE:NIFTY 50", "BSE:SENSEX", "NSE:INDIA VIX"])
+                        
+                        def parse_item(item_data):
+                            if not isinstance(item_data, dict):
+                                return None, None
+                            last = item_data.get("last_price")
+                            ohlc = item_data.get("ohlc", {})
+                            close = ohlc.get("close") if isinstance(ohlc, dict) else None
+                            change = (last - close) if (last is not None and close is not None) else None
+                            return last, change
+
+                        nifty_last, nifty_change = parse_item(data.get("NSE:NIFTY 50"))
+                        sensex_last, sensex_change = parse_item(data.get("BSE:SENSEX"))
+                        vix_last, vix_change = parse_item(data.get("NSE:INDIA VIX"))
+
+                        if nifty_last or sensex_last or vix_last:
                             return {
                                 "status": "success",
-                                "nifty": nifty,
-                                "sensex": sensex,
-                                "vix": vix,
+                                "nifty": nifty_last,
+                                "nifty_change": nifty_change,
+                                "sensex": sensex_last,
+                                "sensex_change": sensex_change,
+                                "vix": vix_last,
+                                "vix_change": vix_change,
                             }
                     except Exception as exc:
                         logger.warning("Kite indices fetch failed for api_key=%s…: %s", api_key[:8], exc)

{kitecli-0.2.6 → kitecli-0.2.9}/cli/kotak_manager.py

@@ -228,40 +228,46 @@ class KotakAccountManager(BaseBrokerManager):
             if 'Content-Type' not in headers:
                 headers['Content-Type'] = 'application/json'
 
-            u = url
-            if query_params:
-                u_with_params = u
-                if '?' not in u:
-                    u_with_params += '?' + _urlencode(query_params)
+            def _do_req(h, max_proxy_retries: int = 2):
+                if query_params and isinstance(query_params, dict):
+                    base_u = url.split('?')[0]
+                    u_curr = base_u + '?' + _urlencode(query_params)
                 else:
-                    pass
-            else:
-                u_with_params = u
+                    u_curr = url
 
-            def _do_req(h):
                 req_kwargs = {}
                 if _proxies:
-                    # Kotak Neo static IP whitelisting is only enforced on order APIs
-                    url_lower = u_with_params.lower()
-                    if "/order/" in url_lower and any(x in url_lower for x in ["/place", "/modify", "/cancel"]):
+                    url_lower = u_curr.lower()
+                    is_order_api = "/order/" in url_lower and any(x in url_lower for x in ["/place", "/modify", "/cancel"])
+                    is_login_api = "/login/" in url_lower or "tradeapilogin" in url_lower or "tradeapivalidate" in url_lower
+                    if is_order_api or is_login_api:
                         req_kwargs["proxies"] = _proxies
 
-                logger.debug("Kotak REST [%s] requesting: %s", method, u_with_params)
+                logger.debug("Kotak REST [%s] requesting: %s", method, u_curr)
                 logger.debug("Kotak REST headers: %s", {k: v[:15] + '...' if len(str(v)) > 15 else v for k, v in h.items()})
 
-                if method in ['POST', 'PUT', 'PATCH', 'DELETE']:
-                    if _re.search('json', h['Content-Type'], _re.IGNORECASE):
-                        request_body = _json.dumps(body) if body is not None else None
-                        return _req.post(url=u_with_params, headers=h, data=request_body, **req_kwargs)
-                    elif _re.search('x-www-form-urlencoded', h['Content-Type'], _re.IGNORECASE):
-                        request_body = {"jData": _json.dumps(body)} if body is not None else {}
-                        return _req.post(url=u_with_params, headers=h, data=request_body, **req_kwargs)
-                elif method == 'GET':
-                    return _req.get(url=u_with_params, headers=h, **req_kwargs)
-                return _orig_request(method, url, query_params=query_params, headers=h, body=body)
+                try:
+                    if method in ['POST', 'PUT', 'PATCH', 'DELETE']:
+                        if _re.search('json', h.get('Content-Type', ''), _re.IGNORECASE):
+                            request_body = _json.dumps(body) if body is not None else None
+                            return _req.post(url=u_curr, headers=h, data=request_body, **req_kwargs)
+                        elif _re.search('x-www-form-urlencoded', h.get('Content-Type', ''), _re.IGNORECASE):
+                            request_body = {"jData": _json.dumps(body)} if body is not None else {}
+                            return _req.post(url=u_curr, headers=h, data=request_body, **req_kwargs)
+                    elif method == 'GET':
+                        return _req.get(url=u_curr, headers=h, **req_kwargs)
+                    return _orig_request(method, url, query_params=query_params, headers=h, body=body)
+                except Exception as req_exc:
+                    exc_str = str(req_exc).lower()
+                    if max_proxy_retries > 0 and _proxies and ("proxy" in exc_str or "502" in exc_str or "tunnel" in exc_str or "connect" in exc_str):
+                        import time
+                        logger.warning("Kotak static proxy transient error (%s). Retrying via proxy in 1s...", req_exc)
+                        time.sleep(1.0)
+                        return _do_req(h, max_proxy_retries=max_proxy_retries - 1)
+                    raise
 
             resp = _do_req(headers)
-            logger.info("Kotak REST %s %s → status %s", method, u_with_params, resp.status_code)
+            logger.info("Kotak REST %s %s → status %s", method, url, resp.status_code)
             try:
                 logger.debug("Kotak REST response body: %s", resp.json())
             except Exception:
@@ -284,16 +290,20 @@ class KotakAccountManager(BaseBrokerManager):
                         logger.info("Kotak session invalid (stCode=%s, msg='%s') for account '%s'. Triggering auto-login...", st_code, resp_json.get("errMsg"), name)
                         if self.auto_login(consumer_key):
                             # Update headers with new credentials
+                            new_sid = client.configuration.serverId or client.configuration.edit_sid
                             headers["Sid"] = client.configuration.edit_sid
                             headers["Auth"] = client.configuration.edit_token
+                            if new_sid:
+                                url = _re.sub(r'([?&]sId=)[^&]*', r'\g<1>' + str(new_sid), url)
+                                url = _re.sub(r'([?&]sid=)[^&]*', r'\g<1>' + str(new_sid), url)
                             if isinstance(query_params, dict):
                                 if "sId" in query_params:
-                                    query_params["sId"] = client.configuration.serverId
+                                    query_params["sId"] = new_sid
                                 if "sid" in query_params:
-                                    query_params["sid"] = client.configuration.edit_sid
+                                    query_params["sid"] = new_sid
                             logger.info("Retrying request after successful auto-login...")
                             resp = _do_req(headers)
-                            logger.info("Kotak REST retry %s %s → status %s", method, u_with_params, resp.status_code)
+                            logger.info("Kotak REST retry %s %s → status %s", method, url, resp.status_code)
                             try:
                                 logger.debug("Kotak REST retry response body: %s", resp.json())
                             except Exception:
@@ -628,6 +638,18 @@ class KotakAccountManager(BaseBrokerManager):
             except ValueError:
                 pending_quantity = 0
 
+            fld_qty_str = str(ord.get("fldQty", ord.get("filled_quantity", "0")))
+            try:
+                filled_quantity = int(fld_qty_str)
+            except ValueError:
+                filled_quantity = 0
+
+            avg_prc_str = str(ord.get("avgPrc", ord.get("average_price", "0")))
+            try:
+                average_price = float(avg_prc_str)
+            except ValueError:
+                average_price = 0.0
+
             price_str = str(ord.get("prc", ord.get("price", "0")))
             try:
                 price = float(price_str)
@@ -639,8 +661,10 @@ class KotakAccountManager(BaseBrokerManager):
                 "tradingsymbol": ord.get("trdSym", ord.get("tradingsymbol", "")),
                 "transaction_type": str(ord.get("trnsTp", ord.get("transaction_type", ""))).upper(),
                 "quantity": quantity,
+                "filled_quantity": filled_quantity,
                 "pending_quantity": pending_quantity,
                 "price": price,
+                "average_price": average_price,
                 "order_type": str(ord.get("prcTp", ord.get("order_type", "MARKET"))).upper(),
                 "status": status,
                 "product": str(ord.get("prod", ord.get("product", "NRML"))).upper(),

{kitecli-0.2.6 → kitecli-0.2.9}/cli/live_session.py

@@ -312,6 +312,7 @@ class KCLILiveSession:
         #   NSE:NIFTY 50 -> 256265, BSE:SENSEX -> 265, NSE:INDIA VIX -> 264969
         self.index_tokens = {256265: "nifty", 265: "sensex", 264969: "vix"}
         self.index_values = {"nifty": None, "sensex": None, "vix": None}
+        self.index_close_prices = {}
 
         # Designated primary streaming account. Index and option-chain ticks are
         # subscribed only on this account's ticker (chosen in
@@ -1329,7 +1330,9 @@ class KCLILiveSession:
                 code == 403
                 or "403" in reason_str
                 or "auth_failed" in reason_str
-                or "token" in reason_str
+                or "invalid token" in reason_str
+                or "token expired" in reason_str
+                or "unauthorized" in reason_str
             )
             if is_auth_failure:
                 self.log_message(
@@ -1378,9 +1381,22 @@ class KCLILiveSession:
             if not token or ltp is None:
                 continue
 
-            # Market index tick → update the header values.
+            # Market index tick → update the header values & streaming change.
             if token in self.index_tokens:
-                self.index_values[self.index_tokens[token]] = ltp
+                key = self.index_tokens[token]
+                self.index_values[key] = ltp
+
+                # Extract close from tick OHLC if available, or use cached REST close price
+                tick_close = None
+                if isinstance(tick.get("ohlc"), dict):
+                    tick_close = tick["ohlc"].get("close")
+                if tick_close:
+                    self.index_close_prices[key] = tick_close
+
+                close_val = self.index_close_prices.get(key)
+                if close_val is not None:
+                    self.index_values[f"{key}_change"] = ltp - close_val
+
                 indices_updated = True
                 continue
 
@@ -1458,18 +1474,82 @@ class KCLILiveSession:
             self.app.invalidate()
 
     def _render_indices_html(self) -> HTML:
-        """Build the formatted market-index header from the current values."""
-        def fmt(v):
-            return f"{v:,.2f}" if v else "N/A"
-
-        nifty_str = fmt(self.index_values.get("nifty"))
-        sensex_str = fmt(self.index_values.get("sensex"))
-        vix_str = fmt(self.index_values.get("vix"))
-        return HTML(
-            f"  <ansicyan><b>NIFTY 50:</b></ansicyan> <style fg='#ffffff'>{nifty_str}</style>   "
-            f"│   <ansiyellow><b>SENSEX:</b></ansiyellow> <style fg='#ffffff'>{sensex_str}</style>   "
-            f"│   <ansired><b>INDIA VIX:</b></ansired> <style fg='#ffffff'>{vix_str}</style>"
-        )
+        """Build formatted market-index header tailored to the Right Pane width."""
+        total_cols = 100
+        if hasattr(self, "app") and self.app and hasattr(self.app, "output") and self.app.output:
+            try:
+                cols = self.app.output.get_size().columns
+                if isinstance(cols, int):
+                    total_cols = cols
+            except Exception:
+                pass
+
+        # The indices bar is rendered inside the Right Pane, so compute right pane width
+        lw = getattr(self, "left_pane_weight", 50)
+        rw = getattr(self, "right_pane_weight", 50)
+        pane_cols = int(total_cols * (rw / max(1, lw + rw)))
+
+        def fmt_item(val, chg, is_vix: bool = False, compact: bool = False):
+            if val is None:
+                return "<style fg='#ffffff'>N/A</style>"
+            val_str = f"{val:,.2f}"
+            if chg is None:
+                return f"<style fg='#ffffff'>{val_str}</style>"
+
+            # For VIX: negative change (volatility drop) is green, positive (volatility spike) is red
+            # For NIFTY/SENSEX: positive is green, negative is red
+            if is_vix:
+                color = "#00ff00" if chg <= 0 else "#ff5f5f"
+            else:
+                color = "#00ff00" if chg >= 0 else "#ff5f5f"
+
+            sign = "+" if chg >= 0 else ""
+            if compact:
+                # In tight right-pane spaces, round large changes to integers e.g. (+80) instead of (+80.50)
+                chg_str = f"{sign}{int(round(chg)):,d}" if not is_vix else f"{sign}{chg:.2f}"
+            else:
+                chg_str = f"{sign}{chg:,.2f}"
+            return f"<style fg='{color}'>{val_str} ({chg_str})</style>"
+
+        if pane_cols >= 75:
+            # Full width: NIFTY 50: 24,234.85 (-99.80) │ SENSEX: 77,708.24 (-441.41) │ IV: 13.45 (+0.25)
+            nifty_html = fmt_item(self.index_values.get("nifty"), self.index_values.get("nifty_change"))
+            sensex_html = fmt_item(self.index_values.get("sensex"), self.index_values.get("sensex_change"))
+            vix_html = fmt_item(self.index_values.get("vix"), self.index_values.get("vix_change"), is_vix=True)
+            return HTML(
+                f" <ansicyan><b>NIFTY 50:</b></ansicyan> {nifty_html} "
+                f"│ <ansiyellow><b>SENSEX:</b></ansiyellow> {sensex_html} "
+                f"│ <ansired><b>IV:</b></ansired> {vix_html}"
+            )
+        elif pane_cols >= 55:
+            # Medium width: NIFTY: 24,234.85 (-100) │ SENSEX: 77,708.24 (-441) │ IV: 13.45 (+0.25)
+            nifty_html = fmt_item(self.index_values.get("nifty"), self.index_values.get("nifty_change"), compact=True)
+            sensex_html = fmt_item(self.index_values.get("sensex"), self.index_values.get("sensex_change"), compact=True)
+            vix_html = fmt_item(self.index_values.get("vix"), self.index_values.get("vix_change"), is_vix=True, compact=True)
+            return HTML(
+                f"<ansicyan><b>NIFTY:</b></ansicyan> {nifty_html} "
+                f"│ <ansiyellow><b>SENSEX:</b></ansiyellow> {sensex_html} "
+                f"│ <ansired><b>IV:</b></ansired> {vix_html}"
+            )
+        else:
+            # Ultra compact for narrow right pane (< 55 cols): N: 24,234.85 │ S: 77,708.24 │ IV: 13.45
+            def fmt_val_only(val, chg, is_vix=False):
+                if val is None:
+                    return "<style fg='#ffffff'>N/A</style>"
+                val_str = f"{val:,.2f}"
+                if chg is None:
+                    return f"<style fg='#ffffff'>{val_str}</style>"
+                color = ("#00ff00" if chg <= 0 else "#ff5f5f") if is_vix else ("#00ff00" if chg >= 0 else "#ff5f5f")
+                return f"<style fg='{color}'>{val_str}</style>"
+
+            nifty_html = fmt_val_only(self.index_values.get("nifty"), self.index_values.get("nifty_change"))
+            sensex_html = fmt_val_only(self.index_values.get("sensex"), self.index_values.get("sensex_change"))
+            vix_html = fmt_val_only(self.index_values.get("vix"), self.index_values.get("vix_change"), is_vix=True)
+            return HTML(
+                f"<ansicyan><b>N:</b></ansicyan> {nifty_html} "
+                f"│ <ansiyellow><b>S:</b></ansiyellow> {sensex_html} "
+                f"│ <ansired><b>IV:</b></ansired> {vix_html}"
+            )
 
     def _get_active_ticker(self):
         """Get the primary ticker if it is connected, else fallback to any connected ticker."""
@@ -1730,9 +1810,20 @@ class KCLILiveSession:
                         if self._ws_should_log("rest_err:indices", min_interval=30.0):
                             self.log_message(f"[#ff8700]Indices fetch failed:[/#] {self._clean_error(str(indices_resp))}")
                     elif isinstance(indices_resp, dict) and indices_resp.get("status") == "success":
-                        self.index_values["nifty"]  = indices_resp.get("nifty")
-                        self.index_values["sensex"] = indices_resp.get("sensex")
-                        self.index_values["vix"]    = indices_resp.get("vix")
+                        self.index_values["nifty"]         = indices_resp.get("nifty")
+                        self.index_values["nifty_change"]  = indices_resp.get("nifty_change")
+                        self.index_values["sensex"]        = indices_resp.get("sensex")
+                        self.index_values["sensex_change"] = indices_resp.get("sensex_change")
+                        self.index_values["vix"]           = indices_resp.get("vix")
+                        self.index_values["vix_change"]    = indices_resp.get("vix_change")
+
+                        # Cache close prices (last - change) so live WebSocket ticks can dynamically recalculate change
+                        for key in ["nifty", "sensex", "vix"]:
+                            last_val = self.index_values.get(key)
+                            chg_val = self.index_values.get(f"{key}_change")
+                            if last_val is not None and chg_val is not None:
+                                self.index_close_prices[key] = last_val - chg_val
+
                         self.market_indices_control.text = self._render_indices_html()
                     elif isinstance(indices_resp, dict):
                         errors_this_cycle += 1
@@ -3892,7 +3983,7 @@ class KCLILiveSession:
      Ctrl + E           -> Executed Orders
      Ctrl + O           -> Option Chain
      Ctrl + G           -> AI Advisor
-     Ctrl + H           -> Help
+     F5 / Esc+5         -> Help
 
    Function Keys / Alt:
      F1 / F2 / F3 / F4 / F5
@@ -4359,7 +4450,6 @@ class KCLILiveSession:
             event.app.invalidate()
 
         @kb.add("c-5")
-        @kb.add("c-h")
         @kb.add("escape", "5")
         @kb.add("f5")
         def _c5(event):

{kitecli-0.2.6 → kitecli-0.2.9}/kitecli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kitecli
-Version: 0.2.6
+Version: 0.2.9
 Summary: KiteCLI — Multi-account, multi-broker trading positions viewer (Zerodha + Kotak Neo)
 Author: KiteCLI Team
 License: MIT

{kitecli-0.2.6 → kitecli-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "kitecli"
-version = "0.2.6"
+version = "0.2.9"
 description = "KiteCLI — Multi-account, multi-broker trading positions viewer (Zerodha + Kotak Neo)"
 readme = "README.md"
 requires-python = ">=3.10"