code-puppy 0.0.162__tar.gz → 0.0.164__tar.gz

{code_puppy-0.0.162 → code_puppy-0.0.164}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.162
+Version: 0.0.164
 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.162 → code_puppy-0.0.164}/code_puppy/agent.py

@@ -6,7 +6,6 @@ from pydantic_ai import Agent
 from pydantic_ai.settings import ModelSettings
 from pydantic_ai.usage import UsageLimits
 
-from code_puppy.agents import get_current_agent_config
 from code_puppy.message_history_processor import (
     get_model_context_length,
     message_history_accumulator,
@@ -136,11 +135,12 @@ def reload_code_generation_agent(message_group: str | None):
 
     # Check if current agent has a pinned model
     from code_puppy.agents import get_current_agent_config
+
     agent_config = get_current_agent_config()
     agent_model_name = None
-    if hasattr(agent_config, 'get_model_name'):
+    if hasattr(agent_config, "get_model_name"):
         agent_model_name = agent_config.get_model_name()
-    
+
     # Use agent-specific model if pinned, otherwise use global model
     model_name = agent_model_name if agent_model_name else get_model_name()
     emit_info(
@@ -203,17 +203,18 @@ def get_code_generation_agent(force_reload=False, message_group: str | None = No
 
     # Get the global model name
     global_model_name = get_model_name()
-    
+
     # Check if current agent has a pinned model
     from code_puppy.agents import get_current_agent_config
+
     agent_config = get_current_agent_config()
     agent_model_name = None
-    if hasattr(agent_config, 'get_model_name'):
+    if hasattr(agent_config, "get_model_name"):
         agent_model_name = agent_config.get_model_name()
-    
+
     # Use agent-specific model if pinned, otherwise use global model
     model_name = agent_model_name if agent_model_name else global_model_name
-    
+
     if _code_generation_agent is None or _LAST_MODEL_NAME != model_name or force_reload:
         return reload_code_generation_agent(message_group)
     return _code_generation_agent

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/agents/agent_creator_agent.py

@@ -28,15 +28,17 @@ class AgentCreatorAgent(BaseAgent):
     def get_system_prompt(self) -> str:
         available_tools = get_available_tool_names()
         agents_dir = get_user_agents_directory()
-        
+
         # Load available models dynamically
         models_config = ModelFactory.load_config()
         model_descriptions = []
         for model_name, model_info in models_config.items():
-            model_type = model_info.get('type', 'Unknown')
-            context_length = model_info.get('context_length', 'Unknown')
-            model_descriptions.append(f"- **{model_name}**: {model_type} model with {context_length} context")
-        
+            model_type = model_info.get("type", "Unknown")
+            context_length = model_info.get("context_length", "Unknown")
+            model_descriptions.append(
+                f"- **{model_name}**: {model_type} model with {context_length} context"
+            )
+
         available_models_str = "\n".join(model_descriptions)
 
         return f"""You are the Agent Creator! 🏗️ Your mission is to help users create awesome JSON agent files through an interactive process.

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/command_line/command_handler.py

@@ -57,7 +57,9 @@ def get_commands_help():
     )
     help_lines.append(
         Text("/compact", style="cyan")
-        + Text("              Summarize and compact current chat history (uses compaction_strategy config)")
+        + Text(
+            "              Summarize and compact current chat history (uses compaction_strategy config)"
+        )
     )
     help_lines.append(
         Text("/dump_context", style="cyan")
@@ -371,7 +373,7 @@ def handle_command(command: str):
 
         # 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
@@ -406,76 +408,76 @@ def handle_command(command: str):
         from code_puppy.agents.json_agent import discover_json_agents
         from code_puppy.command_line.model_picker_completion import load_model_names
         import json
-        
+
         tokens = command.split()
-        
+
         if len(tokens) != 3:
             emit_warning("Usage: /pin_model <agent-name> <model-name>")
-            
+
             # Show available models and JSON agents
             available_models = load_model_names()
             json_agents = discover_json_agents()
-            
+
             emit_info("Available models:")
             for model in available_models:
                 emit_info(f"  [cyan]{model}[/cyan]")
-                
+
             if json_agents:
                 emit_info("\nAvailable JSON agents:")
                 for agent_name, agent_path in json_agents.items():
                     emit_info(f"  [cyan]{agent_name}[/cyan] ({agent_path})")
             return True
-            
+
         agent_name = tokens[1].lower()
         model_name = tokens[2]
-        
+
         # Check if model exists
         available_models = load_model_names()
         if model_name not in available_models:
             emit_error(f"Model '{model_name}' not found")
             emit_warning(f"Available models: {', '.join(available_models)}")
             return True
-            
+
         # Check that we're modifying a JSON agent (not a built-in Python agent)
         json_agents = discover_json_agents()
         if agent_name not in json_agents:
             emit_error(f"JSON agent '{agent_name}' not found")
-            
+
             # Show available JSON agents
             if json_agents:
                 emit_info("Available JSON agents:")
                 for name, path in json_agents.items():
                     emit_info(f"  [cyan]{name}[/cyan] ({path})")
             return True
-            
+
         agent_file_path = json_agents[agent_name]
-        
+
         # Load, modify, and save the agent configuration
         try:
             with open(agent_file_path, "r", encoding="utf-8") as f:
                 agent_config = json.load(f)
-                
+
             # Set the model
             agent_config["model"] = model_name
-            
+
             # Save the updated configuration
             with open(agent_file_path, "w", encoding="utf-8") as f:
                 json.dump(agent_config, f, indent=2, ensure_ascii=False)
-                
+
             emit_success(f"Model '{model_name}' pinned to agent '{agent_name}'")
-            
+
             # If this is the current agent, reload it to use the new model
             from code_puppy.agents import get_current_agent_config
             from code_puppy.agents.runtime_manager import get_runtime_agent_manager
-            
+
             current_agent = get_current_agent_config()
             if current_agent.name == agent_name:
                 manager = get_runtime_agent_manager()
                 manager.reload_agent()
                 emit_info(f"Active agent reloaded with pinned model '{model_name}'")
-            
+
             return True
-            
+
         except Exception as e:
             emit_error(f"Failed to pin model to agent '{agent_name}': {e}")
             return True

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/command_line/prompt_toolkit_completion.py

@@ -147,9 +147,9 @@ def get_prompt_with_active_model(base: str = ">>> "):
 
     # Check if current agent has a pinned model
     agent_model = None
-    if current_agent and hasattr(current_agent, 'get_model_name'):
+    if current_agent and hasattr(current_agent, "get_model_name"):
         agent_model = current_agent.get_model_name()
-    
+
     # Determine which model to display
     if agent_model and agent_model != global_model:
         # Show both models when they differ

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/config.py

@@ -492,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.162 → code_puppy-0.0.164}/code_puppy/model_factory.py

@@ -95,9 +95,20 @@ class ModelFactory:
                 config = json.load(f)
 
         if pathlib.Path(EXTRA_MODELS_FILE).exists():
-            with open(EXTRA_MODELS_FILE, "r") as f:
-                extra_config = json.load(f)
-                config.update(extra_config)
+            try:
+                with open(EXTRA_MODELS_FILE, "r") as f:
+                    extra_config = json.load(f)
+                    config.update(extra_config)
+            except json.JSONDecodeError as e:
+                logging.getLogger(__name__).warning(
+                    f"Failed to load extra models config from {EXTRA_MODELS_FILE}: Invalid JSON - {e}\n"
+                    f"Please check your extra_models.json file for syntax errors."
+                )
+            except Exception as e:
+                logging.getLogger(__name__).warning(
+                    f"Failed to load extra models config from {EXTRA_MODELS_FILE}: {e}\n"
+                    f"The extra models configuration will be ignored."
+                )
         return config
 
     @staticmethod

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/tools/command_runner.py

@@ -12,7 +12,6 @@ from pydantic_ai import RunContext
 from rich.markdown import Markdown
 from rich.text import Text
 
-from code_puppy.callbacks import on_run_shell_command
 from code_puppy.messaging import (
     emit_divider,
     emit_error,
@@ -497,7 +496,7 @@ def share_your_reasoning(
 def register_agent_run_shell_command(agent):
     """Register only the agent_run_shell_command tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def agent_run_shell_command(
         context: RunContext, command: str = "", cwd: str = None, timeout: int = 60
     ) -> ShellCommandOutput:
@@ -553,7 +552,7 @@ def register_agent_run_shell_command(agent):
 def register_agent_share_your_reasoning(agent):
     """Register only the agent_share_your_reasoning tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def agent_share_your_reasoning(
         context: RunContext, reasoning: str = "", next_steps: str | None = None
     ) -> ReasoningOutput:

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/tools/file_modifications.py

@@ -20,7 +20,6 @@ import json_repair
 from pydantic import BaseModel
 from pydantic_ai import RunContext
 
-from code_puppy.callbacks import on_delete_file, on_edit_file
 from code_puppy.messaging import emit_error, emit_info, emit_warning
 from code_puppy.tools.common import _find_best_window, generate_group_id
 
@@ -451,7 +450,7 @@ def _delete_file(
 def register_edit_file(agent):
     """Register only the edit_file tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def edit_file(
         context: RunContext,
         payload: EditFilePayload | str = "",
@@ -468,17 +467,20 @@ def register_edit_file(agent):
             payload: One of three payload types:
 
                 ContentPayload:
+                    - file_path (str): Path to file
                     - content (str): Full file content to write
                     - overwrite (bool, optional): Whether to overwrite existing files.
                       Defaults to False (safe mode).
 
                 ReplacementsPayload:
+                    - file_path (str): Path to file
                     - replacements (List[Replacement]): List of text replacements where
                       each Replacement contains:
                       - old_str (str): Exact text to find and replace
                       - new_str (str): Replacement text
 
                 DeleteSnippetPayload:
+                    - file_path (str): Path to file
                     - delete_snippet (str): Exact text snippet to remove from file
 
         Returns:
@@ -492,7 +494,7 @@ def register_edit_file(agent):
 
         Examples:
             >>> # Create new file with content
-            >>> payload = {"file_path": "hello.py", "content": "print('Hello!')"}
+            >>> payload = {"file_path": "hello.py", "content": "print('Hello!')", "overwrite": true}
             >>> result = edit_file(ctx, payload)
 
             >>> # Replace text in existing file
@@ -519,6 +521,28 @@ def register_edit_file(agent):
             - Use delete_snippet for removing specific code blocks
         """
         # Handle string payload parsing (for models that send JSON strings)
+
+        parse_error_message = """Examples:
+            >>> # Create new file with content
+            >>> payload = {"file_path": "hello.py", "content": "print('Hello!')", "overwrite": true}
+            >>> result = edit_file(ctx, payload)
+
+            >>> # Replace text in existing file
+            >>> payload = {
+            ...     "file_path": "config.py",
+            ...     "replacements": [
+            ...         {"old_str": "debug = False", "new_str": "debug = True"}
+            ...     ]
+            ... }
+            >>> result = edit_file(ctx, payload)
+
+            >>> # Delete snippet from file
+            >>> payload = {
+            ...     "file_path": "main.py",
+            ...     "delete_snippet": "# TODO: remove this comment"
+            ... }
+            >>> result = edit_file(ctx, payload)"""
+
         if isinstance(payload, str):
             try:
                 # Fallback for weird models that just can't help but send json strings...
@@ -536,15 +560,15 @@ def register_edit_file(agent):
                     return {
                         "success": False,
                         "path": file_path,
-                        "message": "One of 'content', 'replacements', or 'delete_snippet' must be provided in payload.",
+                        "message": f"One of 'content', 'replacements', or 'delete_snippet' must be provided in payload. Refer to the following examples: {parse_error_message}",
                         "changed": False,
                     }
             except Exception as e:
                 return {
                     "success": False,
-                    "path": 'Not retrievable in Payload',
-                    "message": f"edit_file call failed: {str(e)}",
-                    "changed": False
+                    "path": "Not retrievable in Payload",
+                    "message": f"edit_file call failed: {str(e)} - this means the tool failed to parse your inputs. Refer to the following examples: {parse_error_message}",
+                    "changed": False,
                 }
 
         # Call _edit_file which will extract file_path from payload and handle group_id generation
@@ -557,7 +581,7 @@ def register_edit_file(agent):
 def register_delete_file(agent):
     """Register only the delete_file tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def delete_file(context: RunContext, file_path: str = "") -> Dict[str, Any]:
         """Safely delete files with comprehensive logging and diff generation.
 

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/tools/file_operations.py

@@ -603,7 +603,7 @@ def register_list_files(agent):
     """Register only the list_files tool."""
     from code_puppy.config import get_allow_recursion
 
-    @agent.tool(strict=False)
+    @agent.tool
     def list_files(
         context: RunContext, directory: str = ".", recursive: bool = True
     ) -> ListFileOutput:
@@ -672,7 +672,7 @@ def register_list_files(agent):
 def register_read_file(agent):
     """Register only the read_file tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def read_file(
         context: RunContext,
         file_path: str = "",
@@ -730,7 +730,7 @@ def register_read_file(agent):
 def register_grep(agent):
     """Register only the grep tool."""
 
-    @agent.tool(strict=False)
+    @agent.tool
     def grep(
         context: RunContext, search_string: str = "", directory: str = "."
     ) -> GrepOutput:

{code_puppy-0.0.162 → code_puppy-0.0.164}/code_puppy/tui/components/chat_view.py

@@ -262,29 +262,35 @@ class ChatView(VerticalScroll):
             separator = "\n"
 
         # Handle content concatenation carefully to preserve Rich objects
-        if hasattr(last_message.content, "__rich_console__") or hasattr(message.content, "__rich_console__"):
+        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 = 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 = 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:

{code_puppy-0.0.162 → code_puppy-0.0.164}/pyproject.toml

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