kader 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

cli/app.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import threading
+from importlib.metadata import version as get_version
 from pathlib import Path
 from typing import Optional
 
@@ -32,9 +33,19 @@ from .utils import (
 )
 from .widgets import ConversationView, InlineSelector, LoadingSpinner, ModelSelector
 
-WELCOME_MESSAGE = """# Welcome to Kader CLI! 🚀
+WELCOME_MESSAGE = """
+<div align="center">
 
-Your **modern AI-powered coding assistant**.
+```
+    ██╗ ██╗  ██╗ █████╗ ██████╗ ███████╗██████╗
+   ██╔╝ ██║ ██╔╝██╔══██╗██╔══██╗██╔════╝██╔══██╗
+  ██╔╝  █████╔╝ ███████║██║  ██║█████╗  ██████╔╝
+ ██╔╝   ██╔═██╗ ██╔══██║██║  ██║██╔══╝  ██╔══██╗
+██╔╝    ██║  ██╗██║  ██║██████╔╝███████╗██║  ██║
+╚═╝     ╚═╝  ╚═╝╚═╝  ╚═╝╚═════╝ ╚══════╝╚═╝  ╚═╝
+```
+
+</div>
 
 Type a message below to start chatting, or use one of the commands:
 
@@ -45,10 +56,16 @@ Type a message below to start chatting, or use one of the commands:
 - `/save` - Save current session
 - `/load` - Load a saved session
 - `/sessions` - List saved sessions
+- `/cost` - Show the cost of the conversation
 - `/exit` - Exit the application
 """
 
 
+# Minimum terminal size to prevent UI breakage
+MIN_WIDTH = 89
+MIN_HEIGHT = 29
+
+
 class KaderApp(App):
     """Main Kader CLI application."""
 
@@ -81,6 +98,7 @@ class KaderApp(App):
         self._confirmation_result: tuple[bool, Optional[str]] = (True, None)
         self._inline_selector: Optional[InlineSelector] = None
         self._model_selector: Optional[ModelSelector] = None
+        self._update_info: Optional[str] = None  # Latest version if update available
 
         self._agent = self._create_agent(self._current_model)
 
@@ -291,6 +309,71 @@ class KaderApp(App):
         # Focus the input
         self.query_one("#prompt-input", Input).focus()
 
+        # Check initial size
+        self._check_terminal_size()
+
+        # Start background update check
+        threading.Thread(target=self._check_for_updates, daemon=True).start()
+
+    def _check_for_updates(self) -> None:
+        """Check for package updates in background thread."""
+        try:
+            from outdated import check_outdated
+
+            current_version = get_version("kader")
+            is_outdated, latest_version = check_outdated("kader", current_version)
+
+            if is_outdated:
+                self._update_info = latest_version
+                # Schedule UI update on main thread
+                self.call_from_thread(self._show_update_notification)
+        except Exception:
+            # Silently ignore update check failures
+            pass
+
+    def _show_update_notification(self) -> None:
+        """Show update notification as a toast."""
+        if not self._update_info:
+            return
+
+        try:
+            current = get_version("kader")
+            message = (
+                f">> Update available! v{current} → v{self._update_info} "
+                f"Run: uv tool upgrade kader"
+            )
+            self.notify(message, severity="information", timeout=10)
+        except Exception:
+            pass
+
+    def on_resize(self) -> None:
+        """Handle terminal resize events."""
+        self._check_terminal_size()
+
+    def _check_terminal_size(self) -> None:
+        """Check if terminal is large enough and show warning if not."""
+        width = self.console.size.width
+        height = self.console.size.height
+
+        # Check if we need to show/hide the size warning
+        too_small = width < MIN_WIDTH or height < MIN_HEIGHT
+
+        try:
+            warning = self.query_one("#size-warning", Static)
+            if not too_small:
+                warning.remove()
+        except Exception:
+            if too_small:
+                # Show warning overlay
+                warning_text = f"""⚠️  Terminal Too Small
+
+Current: {width}x{height}
+Minimum: {MIN_WIDTH}x{MIN_HEIGHT}
+
+Please resize your terminal."""
+                warning = Static(warning_text, id="size-warning")
+                self.mount(warning)
+
     async def on_input_submitted(self, event: Input.Submitted) -> None:
         """Handle user input submission."""
         user_input = event.value.strip()
@@ -324,6 +407,7 @@ class KaderApp(App):
         elif cmd == "/clear":
             conversation.clear_messages()
             self._agent.memory.clear()
+            self._agent.provider.reset_tracking()  # Reset usage/cost tracking
             self._current_session_id = None
             self.notify("Conversation cleared!", severity="information")
         elif cmd == "/save":
@@ -342,6 +426,8 @@ class KaderApp(App):
         elif cmd == "/refresh":
             self._refresh_directory_tree()
             self.notify("Directory tree refreshed!", severity="information")
+        elif cmd == "/cost":
+            self._handle_cost(conversation)
         elif cmd == "/exit":
             self.exit()
         else:
@@ -536,6 +622,42 @@ class KaderApp(App):
             conversation.add_message(f"❌ Error listing sessions: {e}", "assistant")
             self.notify(f"Error: {e}", severity="error")
 
+    def _handle_cost(self, conversation: ConversationView) -> None:
+        """Display LLM usage costs."""
+        try:
+            # Get cost and usage from the provider
+            cost = self._agent.provider.total_cost
+            usage = self._agent.provider.total_usage
+            model = self._agent.provider.model
+
+            lines = [
+                "## Usage Costs 💰\n",
+                f"**Model:** `{model}`\n",
+                "### Cost Breakdown",
+                "| Type | Amount |",
+                "|------|--------|",
+                f"| Input Cost | ${cost.input_cost:.6f} |",
+                f"| Output Cost | ${cost.output_cost:.6f} |",
+                f"| **Total Cost** | **${cost.total_cost:.6f}** |",
+                "",
+                "### Token Usage",
+                "| Type | Tokens |",
+                "|------|--------|",
+                f"| Prompt Tokens | {usage.prompt_tokens:,} |",
+                f"| Completion Tokens | {usage.completion_tokens:,} |",
+                f"| **Total Tokens** | **{usage.total_tokens:,}** |",
+            ]
+
+            if cost.total_cost == 0.0:
+                lines.append(
+                    "\n> 💡 *Note: Ollama runs locally, so there are no API costs.*"
+                )
+
+            conversation.add_message("\n".join(lines), "assistant")
+        except Exception as e:
+            conversation.add_message(f"❌ Error getting costs: {e}", "assistant")
+            self.notify(f"Error: {e}", severity="error")
+
 
 def main() -> None:
     """Run the Kader CLI application."""

cli/app.tcss

@@ -17,6 +17,23 @@ $text-muted: #6c7086;
 
 Screen {
     background: $background;
+    min-width: 89;
+    min-height: 29;
+}
+
+/* ===== Size Warning Overlay ===== */
+
+#size-warning {
+    dock: top;
+    width: 100%;
+    height: 100%;
+    background: $background 95%;
+    color: $warning;
+    text-align: center;
+    content-align: center middle;
+    text-style: bold;
+    padding: 2;
+    layer: overlay;
 }
 
 /* ===== Header ===== */

cli/utils.py

@@ -19,6 +19,7 @@ HELP_TEXT = """## Kader CLI Commands 📖
 | `/save` | Save current session |
 | `/load <id>` | Load a saved session |
 | `/sessions` | List saved sessions |
+| `/cost` | Show usage costs |
 | `/refresh` | Refresh file tree |
 | `/exit` | Exit the CLI |
 

kader/agent/base.py

@@ -559,12 +559,13 @@ class BaseAgent:
                         token_usage["total_tokens"],
                     )
 
+                    # estimate the cost...
+                    estimated_cost = self.provider.estimate_cost(token_usage)
+
                     # Calculate and log cost
                     agent_logger.calculate_cost(
                         self.logger_id,
-                        token_usage["prompt_tokens"],
-                        token_usage["completion_tokens"],
-                        getattr(self.provider, "model", ""),
+                        estimated_cost.total_cost,
                     )
 
             # Save session update
@@ -726,12 +727,13 @@ class BaseAgent:
                         token_usage["total_tokens"],
                     )
 
+                    # estimate the cost...
+                    estimated_cost = self.provider.estimate_cost(token_usage)
+
                     # Calculate and log cost
                     agent_logger.calculate_cost(
                         self.logger_id,
-                        token_usage["prompt_tokens"],
-                        token_usage["completion_tokens"],
-                        getattr(self.provider, "model", ""),
+                        estimated_cost.total_cost,
                     )
 
             # Save session update

kader/agent/logger.py

@@ -99,27 +99,9 @@ class AgentLogger:
     def calculate_cost(
         self,
         logger_id: str,
-        prompt_tokens: int,
-        completion_tokens: int,
-        model_name: str = "",
-        pricing_data: Optional[Dict[str, float]] = None,
+        total_cost: float,
     ):
         """Calculate and log cost based on token usage."""
-        # Use provided pricing data or defaults
-        if pricing_data is None:
-            # Default pricing (these would come from a model registry in practice)
-            pricing_data = {
-                "input_cost_per_million": 0.5,  # $0.50 per million input tokens
-                "output_cost_per_million": 1.5,  # $1.50 per million output tokens
-            }
-
-        input_cost = (prompt_tokens / 1_000_000) * pricing_data.get(
-            "input_cost_per_million", 0.5
-        )
-        output_cost = (completion_tokens / 1_000_000) * pricing_data.get(
-            "output_cost_per_million", 1.5
-        )
-        total_cost = input_cost + output_cost
 
         self.log_cost(logger_id, total_cost)
         return total_cost

{kader-0.1.1.dist-info → kader-0.1.3.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: kader
-Version: 0.1.1
+Version: 0.1.3
 Summary: kader coding agent
 Requires-Python: >=3.11
 Requires-Dist: faiss-cpu>=1.9.0
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: ollama>=0.6.1
+Requires-Dist: outdated>=0.2.2
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: tenacity>=9.1.2
 Requires-Dist: textual[syntax]>=6.8.0

{kader-0.1.1.dist-info → kader-0.1.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 cli/README.md,sha256=DY3X7w6LPka1GzhtTrGwhpkFmx0YyRpcTCHjFmti3Yg,4654
 cli/__init__.py,sha256=OAi_KSwcuYXR0sRxKuw1DYQrz1jbu8p7vn41_99f36I,107
 cli/__main__.py,sha256=xO2JVjCsh691b-cjSBAEKocJeUeI3P0gfUqM-f1Mp1A,95
-cli/app.py,sha256=eEWrfq_XobsjAeSc2lRMNBJ1cs2nlZ_qeoamuqSnubg,19981
-cli/app.tcss,sha256=eJX5akeqHmoZVDjibvBPIBot5UK7eiUxgojNu9IjMBs,10098
-cli/utils.py,sha256=jt5wvSMIjPP-ZbvXEK2fd00-oRj32sj95HinJd4c73Q,1815
+cli/app.py,sha256=PwYDnhdCJjSHpDqPjwlhHQoHtirZUNv1WHkG9Hr0Ius,24805
+cli/app.tcss,sha256=fImM5JxlTCWvD4i3OmpJpBOEE8HGo87Q9E8rKbOKEGU,10416
+cli/utils.py,sha256=GkyVTkIjNsnEEYCVD2l5snQybReXknfg5RihKXWuK4w,1846
 cli/widgets/__init__.py,sha256=1vj31CrJyxZROLthkKr79i_GbNyj8g3q60ZQPbJHK5k,300
 cli/widgets/confirmation.py,sha256=s6h3ZY98xHeeF3G-OtHYYw-xPlAP6K7i73jo_ftOMQc,9400
 cli/widgets/conversation.py,sha256=vqI3eq7qQrn4UD8fB8rBr33kIesrLpNVhNIp3MdGeOM,1519
@@ -12,8 +12,8 @@ kader/__init__.py,sha256=QXb0aQvySAiNmhP2kNMNtuuzG_eSUgRVcTRSafko1r0,602
 kader/config.py,sha256=B1s1PNgZ5SrFEJU5TtJG-ZAc7Umff4cwyHR7mfQgeLA,4261
 kader/agent/__init__.py,sha256=UJzUw9NIzggCrhIBHC6nJnfzkhCjCZnIzmD6uUn2SNA,159
 kader/agent/agents.py,sha256=lo41hlkPm3CStI9VAwSOR6IYhCBkqQJ48Ego5XN1XU8,4299
-kader/agent/base.py,sha256=qWT53Fuw3I61X9wvZFDNJ8YnYSxBJKdnOH1122cWP2s,36452
-kader/agent/logger.py,sha256=Y8Ig6Jab_jEDUCStAnv-zmBf8u7Ubpe5ry-zaPmj0Kk,6582
+kader/agent/base.py,sha256=3SzXH93JW5LGI30c3EL_onol3UFWd0lCqi5gWOaXq8o,36452
+kader/agent/logger.py,sha256=3vFwz_yycSBU-5mcdalfZ3KBVT9P_20Q-WT5Al8yIXo,5796
 kader/memory/__init__.py,sha256=VUzzhGOWvO_2aYB6uuavmtNI8l94K7H3uPn4_1MVUUs,1473
 kader/memory/conversation.py,sha256=h6Bamd8_rYnk0Bwt4MJWZRfv2wxCcg6eUxPvzP-tIyA,11810
 kader/memory/session.py,sha256=VhRPEO474SlwM5UOuFt-b_28sJs3j4SNrobCZvoP5Os,10811
@@ -39,7 +39,7 @@ kader/tools/rag.py,sha256=37Nd49D5R_DlWmMyhSdSvst_XFOnoxpaFNtlbLEt6qM,15653
 kader/tools/todo.py,sha256=omirxoG7_KVHAmMoD12DGmn7scqRaewbI1cqWm0ShUo,7735
 kader/tools/utils.py,sha256=bfq7b1vpA1qBaL_QZYBFTqOM35-omu_UeDjo6v0rxEg,14176
 kader/tools/web.py,sha256=2Aqy0nO7ZwNLAqE9IWjCg5y8qnhbt-AIZOHy02XgbxA,8464
-kader-0.1.1.dist-info/METADATA,sha256=EEFa_a5JeTZV9CZ8wKchfbYv1NXyZhUuHIu7zburgnU,9490
-kader-0.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-kader-0.1.1.dist-info/entry_points.txt,sha256=TK0VOtrfDFqZ8JQfxpuAHHvDLHyoiafUjS-VOixl02c,39
-kader-0.1.1.dist-info/RECORD,,
+kader-0.1.3.dist-info/METADATA,sha256=UbSQYvgdw-4AWNgfGv22VafMPPkY54nFQp5PgKq-QMA,9521
+kader-0.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+kader-0.1.3.dist-info/entry_points.txt,sha256=TK0VOtrfDFqZ8JQfxpuAHHvDLHyoiafUjS-VOixl02c,39
+kader-0.1.3.dist-info/RECORD,,