kitecli 0.3.1__tar.gz → 0.3.3__tar.gz

{kitecli-0.3.1 → kitecli-0.3.3}/PKG-INFO

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

{kitecli-0.3.1 → kitecli-0.3.3}/cli/api_client.py

@@ -636,3 +636,18 @@ class KCLIClient:
             return mgr.get_ltp_and_tokens(api_key, symbols)
         return {}
 
+    def get_market_depth(self, symbol: str) -> dict:
+        """Fetch 5-depth order book, OHLC, and market stats for a symbol."""
+        if hasattr(_kite_manager, "get_market_depth"):
+            res = _kite_manager.get_market_depth(symbol)
+            if res.get("status") == "success":
+                return res
+
+        for mgr in [_kotak_manager]:
+            if hasattr(mgr, "get_market_depth"):
+                res = mgr.get_market_depth(symbol)
+                if res.get("status") == "success":
+                    return res
+
+        return {"status": "error", "message": f"Market depth not available for symbol '{symbol}'"}
+

{kitecli-0.3.1 → kitecli-0.3.3}/cli/base_manager.py

@@ -157,3 +157,7 @@ class BaseBrokerManager(ABC):
     ) -> dict[str, Any]:
         """Calculate margin required for a proposed order. Default: fallback estimation."""
         return {"status": "error", "message": "not supported by this broker"}
+
+    def get_market_depth(self, symbol: str) -> dict[str, Any]:
+        """Fetch 5-depth order book, OHLC, and market stats for a symbol. Default: not supported."""
+        return {"status": "error", "message": "not supported by this broker"}

{kitecli-0.3.1 → kitecli-0.3.3}/cli/charges.py

@@ -7,7 +7,7 @@ Official Rates from https://zerodha.com/charges/#charges-explained:
 - GST: 18% on (brokerage + SEBI charges + transaction charges).
 - SEBI charges: ₹10 / crore (0.0001%).
 - Stamp charges: 0.003% or ₹300 / crore on buy side.
-- IPFT fee: ₹50 / crore (0.0005%).
+- IPFT fee: ₹0.01 / crore (0.0000001%).
 """
 
 from typing import Any
@@ -55,8 +55,8 @@ def calculate_option_charges(
     # 4. SEBI turnover fee: ₹10 / crore (0.0001%)
     sebi_fee = round(total_val * 0.000001, 2)
 
-    # 5. IPFT fee: ₹50 / crore (0.000005%) for NSE/NFO
-    ipft_fee = round(total_val * 0.000005, 2) if is_nse else 0.0
+    # 5. IPFT fee: ₹0.01 / crore (0.0000001%) for NSE/NFO
+    ipft_fee = round(total_val * 1e-9, 2) if is_nse else 0.0
 
     # 6. GST: 18% on (Brokerage + Exchange Fee + SEBI Fee)
     gst = round((brokerage + exch_fee + sebi_fee) * 0.18, 2)

{kitecli-0.3.1 → kitecli-0.3.3}/cli/display.py

@@ -6,10 +6,13 @@ through the functions in this module so the CLI has a consistent,
 polished look.
 """
 
+from datetime import date, datetime
+from typing import Optional, Any
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
+from cli.greeks import get_position_expiry_info, format_expiry_header, format_strike_display
 
 console = Console()
 
@@ -70,12 +73,121 @@ def _format_pnl_pct(value: float) -> str:
     return f"{prefix}{value:.2f}%"
 
 
+def _build_account_positions_table(
+    positions: list[dict],
+    show_indices: bool = False,
+    start_idx: int = 1,
+    today: Optional[date] = None,
+) -> tuple[Table, int]:
+    """Build a grouped-by-expiry Table for an account's positions.
+
+    Returns:
+        (table, next_pos_idx)
+    """
+    table = Table(
+        show_header=True,
+        header_style="bold #58a6ff",
+        border_style="#30363d",
+        row_styles=["", "dim"],
+        pad_edge=True,
+        expand=True,
+    )
+    table.add_column("Symbol", style="bold #e6edf3", ratio=1)
+    table.add_column("Strike", style="bold #79c0ff", justify="center", no_wrap=True)
+    table.add_column("Lots/Qty", justify="right", no_wrap=True)
+    table.add_column("Avg Price", justify="right", no_wrap=True)
+    table.add_column("LTP", justify="right", no_wrap=True)
+    table.add_column("P&L", justify="right", no_wrap=True)
+
+    if not positions:
+        return table, start_idx
+
+    if today is None:
+        today = date.today()
+
+    # 1. Group positions by expiry
+    groups: dict[Optional[date], list[tuple[dict, dict]]] = {}
+    for pos in positions:
+        info = get_position_expiry_info(pos)
+        exp = info.get("expiry_date")
+        groups.setdefault(exp, []).append((info, pos))
+
+    # 2. Sort expiry keys: real dates ascending, None (Equity) at end
+    sorted_exp_keys = sorted([k for k in groups.keys() if k is not None])
+    if None in groups:
+        sorted_exp_keys.append(None)
+
+    pos_idx = start_idx
+    first_group = True
+
+    for exp_k in sorted_exp_keys:
+        items = groups[exp_k]
+        # Sort within group: strike ascending, CE before PE, tradingsymbol
+        items.sort(
+            key=lambda x: (
+                x[0].get("strike", 0.0),
+                0 if x[0].get("option_type") == "CE" else (1 if x[0].get("option_type") == "PE" else 2),
+                str(x[1].get("tradingsymbol", "")),
+            )
+        )
+
+        group_pnl = sum(float(p.get("pnl", 0)) for _, p in items)
+        date_str, dte_str = format_expiry_header(exp_k, today=today)
+
+        # Section header
+        if not first_group:
+            table.add_section()
+
+        pnl_col = _pnl_style(group_pnl)
+        pnl_sign = "+" if group_pnl > 0 else ""
+        header_title = Text.assemble(
+            ("📅 " + date_str, "bold #58a6ff"),
+            (f" ({dte_str})" if dte_str else "", "#8b949e"),
+        )
+        subtotal_title = Text(f"{pnl_sign}{_format_currency(group_pnl)}", style=f"bold {pnl_col}")
+        table.add_row(header_title, "", "", "", "", subtotal_title, style="bold")
+        table.add_section()
+
+        for info, pos in items:
+            pnl = float(pos.get("pnl", 0))
+            style = _pnl_style(pnl)
+            pos_sign = "+" if pnl > 0 else ""
+
+            symbol = str(pos.get("tradingsymbol", ""))
+            if show_indices:
+                symbol = f"[{pos_idx}] {symbol}"
+                pos_idx += 1
+
+            strike_display = format_strike_display(info)
+
+            lot_size = pos.get("lot_size", 1) or 1
+            qty = pos.get("quantity", 0)
+            if lot_size > 1:
+                lots = qty / lot_size
+                qty_display = f"{int(lots)}L" if lots == int(lots) else f"{lots:.1f}L"
+            else:
+                qty_display = str(qty)
+
+            table.add_row(
+                symbol,
+                strike_display,
+                qty_display,
+                _format_currency(float(pos.get("average_price", 0))),
+                _format_currency(float(pos.get("last_price", 0))),
+                Text(f"{pos_sign}{_format_currency(pnl)}", style=style),
+            )
+
+        first_group = False
+
+    return table, pos_idx
+
+
 def display_positions(accounts_data: list[dict]) -> None:
-    """Render positions tables for every account.
+    """Print a Rich table of open positions across all accounts.
 
     Args:
-        accounts_data: List of dicts, each with keys ``name``,
-            ``total_pnl``, and ``positions`` (list of position dicts).
+        accounts_data: List of account dicts, each with keys ``name``,
+                       ``total_pnl``, and ``positions``.
     """
     grand_total_pnl = 0.0
 
@@ -86,6 +198,7 @@ def display_positions(accounts_data: list[dict]) -> None:
         grand_total_pnl += total_pnl
 
         pnl_color = _pnl_style(total_pnl)
+
         header_text = Text.assemble(
             (f" {name} ", "bold #e6edf3"),
             (" │ ", "#8b949e"),
@@ -104,31 +217,7 @@ def display_positions(accounts_data: list[dict]) -> None:
             console.print()
             continue
 
-        table = Table(
-            show_header=True,
-            header_style="bold #58a6ff",
-            border_style="#30363d",
-            row_styles=["", "dim"],
-            pad_edge=True,
-            expand=True,
-        )
-        table.add_column("Symbol", style="bold #e6edf3", no_wrap=True)
-        table.add_column("Qty", justify="right")
-        table.add_column("Avg Price", justify="right")
-        table.add_column("LTP", justify="right")
-        table.add_column("P&L", justify="right")
-
-        for pos in positions:
-            pnl = float(pos.get("pnl", 0))
-            style = _pnl_style(pnl)
-
-            table.add_row(
-                str(pos.get("tradingsymbol", "")),
-                str(pos.get("quantity", 0)),
-                _format_currency(float(pos.get("average_price", 0))),
-                _format_currency(float(pos.get("last_price", 0))),
-                Text(_format_currency(pnl), style=style),
-            )
+        table, _ = _build_account_positions_table(positions, show_indices=False)
 
         panel = Panel(
             table,
@@ -181,7 +270,7 @@ def render_positions_to_string(accounts_data: list[dict], width: int = 80, show_
 
         pnl_color = _pnl_style(total_pnl)
 
-        margin_net  = account.get("margin_net")
+        margin_net = account.get("margin_net")
         margin_cash = account.get("margin_cash")
 
         header_parts: list[tuple[str, str]] = [
@@ -205,7 +294,6 @@ def render_positions_to_string(accounts_data: list[dict], width: int = 80, show_
 
         header_text = Text.assemble(*header_parts)
 
-
         if not positions:
             panel = Panel(
                 Text("  No open positions", style="#8b949e italic"),
@@ -217,46 +305,11 @@ def render_positions_to_string(accounts_data: list[dict], width: int = 80, show_
             capture_console.print()
             continue
 
-        table = Table(
-            show_header=True,
-            header_style="bold #58a6ff",
-            border_style="#30363d",
-            row_styles=["", "dim"],
-            pad_edge=True,
-            expand=True,
+        table, pos_idx = _build_account_positions_table(
+            positions,
+            show_indices=show_indices,
+            start_idx=pos_idx,
         )
-        table.add_column("Symbol", style="bold #e6edf3", no_wrap=True)
-        table.add_column("Lots/Qty", justify="right")
-        table.add_column("Avg Price", justify="right")
-        table.add_column("LTP", justify="right")
-        table.add_column("P&L", justify="right")
-
-        for pos in positions:
-            pnl = float(pos.get("pnl", 0))
-            style = _pnl_style(pnl)
-
-            symbol = str(pos.get("tradingsymbol", ""))
-            if show_indices:
-                symbol = f"[{pos_idx}] {symbol}"
-                pos_idx += 1
-
-            lot_size = pos.get("lot_size", 1) or 1
-            qty = pos.get("quantity", 0)
-            if lot_size > 1:
-                lots = qty / lot_size
-                # Show as integer lots if whole number, else 1 decimal
-                qty_display = f"{int(lots)}L" if lots == int(lots) else f"{lots:.1f}L"
-            else:
-                qty_display = str(qty)
-
-            table.add_row(
-                symbol,
-                qty_display,
-                _format_currency(float(pos.get("average_price", 0))),
-                _format_currency(float(pos.get("last_price", 0))),
-                Text(_format_currency(pnl), style=style),
-            )
-
 
         panel = Panel(
             table,

{kitecli-0.3.1 → kitecli-0.3.3}/cli/executor.py

@@ -3,7 +3,8 @@ from cli.api_client import KCLIClient
 from cli.parser import (
     AccountSelectCommand, PlaceOrderCommand, ExitCommand,
     StatusCommand, PositionsCommand, OrdersCommand,
-    CancelOrderCommand, ModifyOrderCommand
+    CancelOrderCommand, ModifyOrderCommand, MarketDepthCommand,
+    ConditionalOrderCommand, CancelConditionalOrderCommand, ConditionalOrdersViewCommand
 )
 
 class ExecutionContext:
@@ -370,4 +371,83 @@ async def execute_command(cmd: Any, context: ExecutionContext) -> dict:
             "message": "\n".join(output_lines)
         }
 
+    # 9. Market Depth Command
+    elif isinstance(cmd, MarketDepthCommand):
+        target_sym = cmd.symbol or context.selected_symbol
+        if not target_sym:
+            raise ValueError("Usage: md <symbol> (e.g. 'md NIFTY2682025000CE' or 'md INFY')")
+
+        res = context.client.get_market_depth(target_sym)
+        if res.get("status") != "success":
+            return {
+                "status": "executed",
+                "message": f"❌ Failed to fetch market depth for {target_sym}: {res.get('message', 'Unknown error')}"
+            }
+
+        sym = res.get("symbol", target_sym)
+        ltp = res.get("last_price", 0.0)
+        chg = res.get("change", 0.0)
+        chg_pct = res.get("change_pct", 0.0)
+        vol = res.get("volume", 0)
+        oi = res.get("oi", 0)
+        tot_b = res.get("total_buy_quantity", 0)
+        tot_s = res.get("total_sell_quantity", 0)
+
+        output_lines = [
+            f"📊 Market Depth: {sym} | LTP: ₹{ltp:.2f} ({chg:+.2f} / {chg_pct:+.2f}%) | Vol: {vol:,} | OI: {oi:,}",
+            "┌─────────┬─────────┬──────────────┬──────────────┬─────────┬─────────┐",
+            "│ Orders  │ Qty     │ Bid Price    │ Ask Price    │ Qty     │ Orders  │",
+            "├─────────┼─────────┼──────────────┼──────────────┼─────────┼─────────┤"
+        ]
+
+        bids = res.get("buy_depth", [])
+        asks = res.get("sell_depth", [])
+        for i in range(5):
+            b = bids[i] if i < len(bids) else {}
+            a = asks[i] if i < len(asks) else {}
+            b_ord = f"{b.get('orders', 0):>7}" if b.get('orders') else "       -"
+            b_qty = f"{b.get('quantity', 0):>7}" if b.get('quantity') else "       -"
+            b_pr = f"₹{b.get('price', 0.0):>9.2f}" if b.get('price') else "        -"
+            a_pr = f"₹{a.get('price', 0.0):>9.2f}" if a.get('price') else "        -"
+            a_qty = f"{a.get('quantity', 0):>7}" if a.get('quantity') else "       -"
+            a_ord = f"{a.get('orders', 0):>7}" if a.get('orders') else "       -"
+            output_lines.append(f"│ {b_ord} │ {b_qty} │ {b_pr} │ {a_pr} │ {a_qty} │ {a_ord} │")
+
+        output_lines.append("├─────────┼─────────┼──────────────┼──────────────┼─────────┼─────────┤")
+        output_lines.append(f"│ Total Buy Qty: {tot_b:<17,} │ Total Sell Qty: {tot_s:<16,} │")
+        output_lines.append("└────────────────────────────────┬──────────────────────────────┘")
+
+        return {
+            "status": "executed",
+            "message": "\n".join(output_lines)
+        }
+
+    # 10. Conditional Order Command (Headless / CLI)
+    elif isinstance(cmd, ConditionalOrderCommand):
+        parent_cmd = cmd.parent_cmd
+        if not cmd.confirmed:
+            parent_res = await execute_command(parent_cmd, context)
+            if parent_res.get("status") == "pending_confirmation":
+                return {
+                    "status": "pending_confirmation",
+                    "message": f"Confirm CONDITIONAL CHAIN:\n  1) {parent_res.get('message')}\n  2) THEN ON FILL: {cmd.child_raw_text}",
+                    "command": cmd
+                }
+        parent_cmd.confirmed = True
+        return await execute_command(parent_cmd, context)
+
+    # 11. Cancel Conditional Order Command
+    elif isinstance(cmd, CancelConditionalOrderCommand):
+        return {
+            "status": "executed",
+            "message": f"Cancelled conditional orders targeting '{cmd.target}'."
+        }
+
+    # 12. Conditional Orders View Command
+    elif isinstance(cmd, ConditionalOrdersViewCommand):
+        return {
+            "status": "executed",
+            "message": "Conditional orders viewer is active in live TUI dashboard ('kcli live')."
+        }
+
     raise TypeError(f"Execution not implemented for command type '{type(cmd)}'.")