code-puppy 0.0.157__tar.gz → 0.0.159__tar.gz

{code_puppy-0.0.157 → code_puppy-0.0.159}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.157
+Version: 0.0.159
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/command_line/command_handler.py

@@ -1,9 +1,6 @@
 import os
 
-from code_puppy.command_line.model_picker_completion import (
-    load_model_names,
-    update_model_in_input,
-)
+from code_puppy.command_line.model_picker_completion import update_model_in_input
 from code_puppy.command_line.motd import print_motd
 from code_puppy.command_line.utils import make_directory_table
 from code_puppy.config import get_config_keys
@@ -60,7 +57,7 @@ def get_commands_help():
     )
     help_lines.append(
         Text("/compact", style="cyan")
-        + Text("              Summarize and compact current chat history")
+        + Text("              Summarize and compact current chat history (uses compaction_strategy config)")
     )
     help_lines.append(
         Text("/dump_context", style="cyan")
@@ -137,18 +134,18 @@ def handle_command(command: str):
 
             before_tokens = sum(estimate_tokens_for_message(m) for m in history)
             compaction_strategy = get_compaction_strategy()
+            protected_tokens = get_protected_token_count()
             emit_info(
                 f"🤔 Compacting {len(history)} messages using {compaction_strategy} strategy... (~{before_tokens} tokens)"
             )
 
             if compaction_strategy == "truncation":
-                protected_tokens = get_protected_token_count()
                 compacted = truncation(history, protected_tokens)
                 summarized_messages = []  # No summarization in truncation mode
             else:
                 # Default to summarization
                 compacted, summarized_messages = summarize_messages(
-                    history, with_protection=False
+                    history, with_protection=True
                 )
 
             if not compacted:
@@ -372,6 +369,9 @@ def handle_command(command: str):
             # Convert /model to /m for internal processing
             model_command = command.replace("/model", "/m", 1)
 
+        # If no model matched, show available models
+        from code_puppy.command_line.model_picker_completion import load_model_names
+        
         new_input = update_model_in_input(model_command)
         if new_input is not None:
             from code_puppy.agents.runtime_manager import get_runtime_agent_manager
@@ -383,7 +383,6 @@ def handle_command(command: str):
             manager.reload_agent()
             emit_success(f"Active model set and loaded: {model}")
             return True
-        # If no model matched, show available models
         model_names = load_model_names()
         emit_warning("Usage: /model <model-name> or /m <model-name>")
         emit_warning(f"Available models: {', '.join(model_names)}")

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/config.py

@@ -110,6 +110,8 @@ def get_config_keys():
         "yolo_mode",
         "model",
         "compaction_strategy",
+        "protected_token_count",
+        "compaction_threshold",
         "message_limit",
         "allow_recursion",
     ]
@@ -162,7 +164,7 @@ _default_model_cache = None
 def _default_model_from_models_json():
     """Attempt to load the first model name from models.json.
 
-    Falls back to the hard-coded default (``claude-4-0-sonnet``) if the file
+    Falls back to the hard-coded default (``gpt-5``) if the file
     cannot be read for any reason or is empty.
     """
     global _default_model_cache
@@ -176,11 +178,17 @@ def _default_model_from_models_json():
         from code_puppy.model_factory import ModelFactory
 
         models_config = ModelFactory.load_config()
-        first_key = next(iter(models_config))  # Raises StopIteration if empty
-        _default_model_cache = first_key
-        return first_key
+        if models_config:
+            # Get the first key from the models config
+            first_key = next(iter(models_config))
+            _default_model_cache = first_key
+            return first_key
+        else:
+            # If models_config is empty, fall back to gpt-5
+            _default_model_cache = "gpt-5"
+            return "gpt-5"
     except Exception:
-        # Any problem (network, file missing, empty dict, etc.) => fall back
+        # Any problem (network, file missing, empty dict, etc.) => fall back to gpt-5
         _default_model_cache = "gpt-5"
         return "gpt-5"
 
@@ -196,8 +204,7 @@ def _validate_model_exists(model_name: str) -> bool:
     try:
         from code_puppy.model_factory import ModelFactory
 
-        models_config_path = os.path.join(CONFIG_DIR, "models.json")
-        models_config = ModelFactory.load_config(models_config_path)
+        models_config = ModelFactory.load_config()
         exists = model_name in models_config
 
         # Cache the result
@@ -485,4 +492,4 @@ def save_command_to_history(command: str):
         error_msg = (
             f"❌ An unexpected error occurred while saving command history: {str(e)}"
         )
-        direct_console.print(f"[bold red]{error_msg}[/bold red]")
+        direct_console.print(f"[bold red]{error_msg}[/bold red]")

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/messaging/queue_console.py

@@ -58,9 +58,10 @@ class QueueConsole:
                     from rich.console import Console
 
                     string_io = StringIO()
-                    # Use markup=False to prevent interpretation of square brackets as markup
+                    # Use markup=True to properly process rich styling
+                    # Use a reasonable width to prevent wrapping issues
                     temp_console = Console(
-                        file=string_io, width=80, legacy_windows=False, markup=False
+                        file=string_io, width=80, legacy_windows=False, markup=True
                     )
                     temp_console.print(v)
                     processed_values.append(string_io.getvalue().rstrip("\n"))

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/model_factory.py

@@ -14,6 +14,7 @@ from pydantic_ai.providers.anthropic import AnthropicProvider
 from pydantic_ai.providers.google_gla import GoogleGLAProvider
 from pydantic_ai.providers.openai import OpenAIProvider
 from pydantic_ai.providers.cerebras import CerebrasProvider
+from pydantic_ai.providers.openrouter import OpenRouterProvider
 
 from . import callbacks
 from .config import EXTRA_MODELS_FILE
@@ -248,6 +249,34 @@ class ModelFactory:
             setattr(model, "provider", provider)
             return model
 
+        elif model_type == "openrouter":
+            # Get API key from config, which can be an environment variable reference or raw value
+            api_key_config = model_config.get("api_key")
+            api_key = None
+
+            if api_key_config:
+                if api_key_config.startswith("$"):
+                    # It's an environment variable reference
+                    env_var_name = api_key_config[1:]  # Remove the $ prefix
+                    api_key = os.environ.get(env_var_name)
+                    if api_key is None:
+                        raise ValueError(
+                            f"OpenRouter API key environment variable '{env_var_name}' not found or is empty. "
+                            f"Please set the environment variable: export {env_var_name}=your_value"
+                        )
+                else:
+                    # It's a raw API key value
+                    api_key = api_key_config
+            else:
+                # No API key in config, try to get it from the default environment variable
+                api_key = os.environ.get("OPENROUTER_API_KEY")
+
+            provider = OpenRouterProvider(api_key=api_key)
+
+            model = OpenAIChatModel(model_name=model_config["name"], provider=provider)
+            setattr(model, "provider", provider)
+            return model
+
         elif model_type == "round_robin":
             # Get the list of model names to use in the round-robin
             model_names = model_config.get("models")

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/models.json

@@ -87,12 +87,6 @@
     },
     "context_length": 64000
   },
-  "openrouter": {
-    "type": "openrouter",
-    "name": "meta-llama/llama-4-maverick:free",
-    "api_key": "$OPENROUTER_API_KEY",
-    "context_length": 131072
-  },
   "azure-gpt-4.1": {
     "type": "azure_openai",
     "name": "gpt-4.1",

{code_puppy-0.0.157 → code_puppy-0.0.159}/code_puppy/tui/components/chat_view.py

@@ -261,8 +261,35 @@ class ChatView(VerticalScroll):
         else:
             separator = "\n"
 
-        # Update the message content
-        last_message.content += separator + message.content
+        # Handle content concatenation carefully to preserve Rich objects
+        if hasattr(last_message.content, "__rich_console__") or hasattr(message.content, "__rich_console__"):
+            # If either content is a Rich object, convert both to text and concatenate
+            from io import StringIO
+            from rich.console import Console
+            
+            # Convert existing content to string
+            if hasattr(last_message.content, "__rich_console__"):
+                string_io = StringIO()
+                temp_console = Console(file=string_io, width=80, legacy_windows=False, markup=False)
+                temp_console.print(last_message.content)
+                existing_content = string_io.getvalue().rstrip("\n")
+            else:
+                existing_content = str(last_message.content)
+            
+            # Convert new content to string
+            if hasattr(message.content, "__rich_console__"):
+                string_io = StringIO()
+                temp_console = Console(file=string_io, width=80, legacy_windows=False, markup=False)
+                temp_console.print(message.content)
+                new_content = string_io.getvalue().rstrip("\n")
+            else:
+                new_content = str(message.content)
+            
+            # Combine as plain text
+            last_message.content = existing_content + separator + new_content
+        else:
+            # Both are strings, safe to concatenate
+            last_message.content += separator + message.content
 
         # Update the widget based on message type
         if last_message.type == MessageType.AGENT_RESPONSE:
@@ -282,25 +309,15 @@ class ChatView(VerticalScroll):
                 copy_button.update_text_to_copy(last_message.content)
         else:
             # Handle other message types
-            content = last_message.content
-
-            # Apply the same rendering logic as in add_message
-            if (
-                "[" in content
-                and "]" in content
-                and (
-                    content.strip().startswith("$ ")
-                    or content.strip().startswith("git ")
-                )
-            ):
-                # Treat as literal text
-                last_widget.update(Text(content))
-            else:
-                # Try to render markup
-                try:
-                    last_widget.update(Text.from_markup(content))
-                except Exception:
-                    last_widget.update(Text(content))
+            # After the content concatenation above, content is always a string
+            # Try to parse markup when safe to do so
+            try:
+                # Try to parse as markup first - this handles rich styling correctly
+                last_widget.update(Text.from_markup(last_message.content))
+            except Exception:
+                # If markup parsing fails, fall back to plain text
+                # This handles cases where content contains literal square brackets
+                last_widget.update(Text(last_message.content))
 
         # Add the new message to our tracking lists
         self.messages.append(message)

{code_puppy-0.0.157 → code_puppy-0.0.159}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.157"
+version = "0.0.159"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.11"