code-puppy 0.0.59__py3-none-any.whl → 0.0.61__py3-none-any.whl

code_puppy/agent.py

@@ -18,12 +18,23 @@ from code_puppy.tools.common import console
 
 MODELS_JSON_PATH = os.environ.get("MODELS_JSON_PATH", None)
 
-# Load puppy rules if provided
+# Puppy rules loader
 PUPPY_RULES_PATH = Path(".puppy_rules")
 PUPPY_RULES = None
-if PUPPY_RULES_PATH.exists():
-    with open(PUPPY_RULES_PATH, "r") as f:
-        PUPPY_RULES = f.read()
+
+
+def load_puppy_rules(path=None):
+    global PUPPY_RULES
+    rules_path = Path(path) if path else PUPPY_RULES_PATH
+    if rules_path.exists():
+        with open(rules_path, "r") as f:
+            PUPPY_RULES = f.read()
+    else:
+        PUPPY_RULES = None
+
+
+# Load at import
+load_puppy_rules()
 
 
 class AgentResponse(pydantic.BaseModel):

code_puppy/agent_prompts.py

@@ -30,6 +30,7 @@ File Operations:
    - edit_file(path, diff): Use this single tool to create new files, overwrite entire files, perform targeted replacements, or delete snippets depending on the JSON/raw payload provided.
    - delete_file(file_path): Use this to remove files when needed
    - grep(search_string, directory="."): Use this to recursively search for a string across files starting from the specified directory, capping results at 200 matches.
+   - code_map(directory="."): Use this to generate a code map for the specified directory.
 
 Tool Usage Instructions:
 
@@ -49,7 +50,7 @@ Example (create):
 edit_file("src/example.py", "print('hello')\n")
 ```
 
-Example (replacement):
+Example (replacement): -- YOU SHOULD PREFER THIS AS THE PRIMARY WAY TO EDIT FILES.
 ```json
 edit_file(
   "src/example.py",

code_puppy/command_line/meta_command_handler.py

@@ -6,6 +6,7 @@ from code_puppy.command_line.model_picker_completion import (
     load_model_names,
     update_model_in_input,
 )
+from code_puppy.config import get_config_keys
 from code_puppy.command_line.utils import make_directory_table
 
 META_COMMANDS_HELP = """
@@ -20,9 +21,15 @@ META_COMMANDS_HELP = """
 
 
 def handle_meta_command(command: str, console: Console) -> bool:
+    """
+    Handle meta/config commands prefixed with '~'.
+    Returns True if the command was handled (even if just an error/help), False if not.
+    """
+    command = command.strip()
+
     # ~codemap (code structure visualization)
     if command.startswith("~codemap"):
-        from code_puppy.tools.code_map import make_code_map
+        from code_puppy.tools.ts_code_map import make_code_map
 
         tokens = command.split()
         if len(tokens) > 1:
@@ -30,16 +37,11 @@ def handle_meta_command(command: str, console: Console) -> bool:
         else:
             target_dir = os.getcwd()
         try:
-            tree = make_code_map(target_dir, show_doc=True)
-            console.print(tree)
+            make_code_map(target_dir, ignore_tests=True)
         except Exception as e:
             console.print(f"[red]Error generating code map:[/red] {e}")
         return True
-    """
-    Handle meta/config commands prefixed with '~'.
-    Returns True if the command was handled (even if just an error/help), False if not.
-    """
-    command = command.strip()
+
     if command.startswith("~cd"):
         tokens = command.split()
         if len(tokens) == 1:
@@ -83,7 +85,7 @@ def handle_meta_command(command: str, console: Console) -> bool:
 
     if command.startswith("~set"):
         # Syntax: ~set KEY=VALUE or ~set KEY VALUE
-        from code_puppy.config import get_config_keys, set_config_value
+        from code_puppy.config import set_config_value
 
         tokens = command.split(None, 2)
         argstr = command[len("~set") :].strip()
@@ -100,8 +102,9 @@ def handle_meta_command(command: str, console: Console) -> bool:
             key = tokens[1]
             value = ""
         else:
-            console.print("[yellow]Usage:[/yellow] ~set KEY=VALUE or ~set KEY VALUE")
-            console.print("Config keys: " + ", ".join(get_config_keys()))
+            console.print(
+                f"[yellow]Usage:[/yellow] ~set KEY=VALUE or ~set KEY VALUE\nConfig keys: {', '.join(get_config_keys())}"
+            )
             return True
         if key:
             set_config_value(key, value)
@@ -116,9 +119,11 @@ def handle_meta_command(command: str, console: Console) -> bool:
         # Try setting model and show confirmation
         new_input = update_model_in_input(command)
         if new_input is not None:
+            from code_puppy.command_line.model_picker_completion import get_active_model
             from code_puppy.agent import get_code_generation_agent
 
             model = get_active_model()
+            # Make sure this is called for the test
             get_code_generation_agent(force_reload=True)
             console.print(
                 f"[bold green]Active model set and loaded:[/bold green] [cyan]{model}[/cyan]"
@@ -126,8 +131,8 @@ def handle_meta_command(command: str, console: Console) -> bool:
             return True
         # If no model matched, show available models
         model_names = load_model_names()
+        console.print("[yellow]Usage:[/yellow] ~m <model-name>")
         console.print(f"[yellow]Available models:[/yellow] {', '.join(model_names)}")
-        console.print("[yellow]Usage:[/yellow] ~m <model_name>")
         return True
     if command in ("~help", "~h"):
         console.print(META_COMMANDS_HELP)

code_puppy/command_line/prompt_toolkit_completion.py

@@ -33,53 +33,60 @@ class SetCompleter(Completer):
         self.trigger = trigger
 
     def get_completions(self, document, complete_event):
-        text = document.text_before_cursor
-        if not text.strip().startswith(self.trigger):
+        text_before_cursor = document.text_before_cursor
+        stripped_text_for_trigger_check = text_before_cursor.lstrip()
+
+        if not stripped_text_for_trigger_check.startswith(self.trigger):
             return
-        # If the only thing typed is exactly '~set', suggest space
-        if text.strip() == self.trigger:
+
+        # Determine the part of the text that is relevant for this completer
+        # This handles cases like "  ~set foo" where the trigger isn't at the start of the string
+        actual_trigger_pos = text_before_cursor.find(self.trigger)
+        effective_input = text_before_cursor[
+            actual_trigger_pos:
+        ]  # e.g., "~set keypart" or "~set " or "~set"
+
+        tokens = effective_input.split()
+
+        # Case 1: Input is exactly the trigger (e.g., "~set") and nothing more (not even a trailing space on effective_input).
+        # Suggest adding a space.
+        if (
+            len(tokens) == 1
+            and tokens[0] == self.trigger
+            and not effective_input.endswith(" ")
+        ):
             yield Completion(
-                self.trigger + " ",
-                start_position=-len(self.trigger),
-                display=f"{self.trigger} ",
-                display_meta="set config",
+                text=self.trigger + " ",  # Text to insert
+                start_position=-len(tokens[0]),  # Replace the trigger itself
+                display=self.trigger + " ",  # Visual display
+                display_meta="set config key",
             )
-        tokens = text.strip().split()
-        # completion for the first arg after ~set
-        if len(tokens) == 1:
-            # user just typed ~set <-- suggest config keys
-            base = ""
-        else:
-            base = tokens[1]
+            return
+
+        # Case 2: Input is trigger + space (e.g., "~set ") or trigger + partial key (e.g., "~set partial")
+        base_to_complete = ""
+        if len(tokens) > 1:  # e.g., ["~set", "partialkey"]
+            base_to_complete = tokens[1]
+        # If len(tokens) == 1, it implies effective_input was like "~set ", so base_to_complete remains ""
+        # This means we list all keys.
+
         # --- SPECIAL HANDLING FOR 'model' KEY ---
-        if base == "model":
+        if base_to_complete == "model":
             # Don't return any completions -- let ModelNameCompleter handle it
             return
         for key in get_config_keys():
             if key == "model":
                 continue  # exclude 'model' from regular ~set completions
-            if key.startswith(base):
+            if key.startswith(base_to_complete):
                 prev_value = get_value(key)
-                # Ensure there's a space after '~set' if it's the only thing typed
-                if text.strip() == self.trigger or text.strip() == self.trigger + "":
-                    prefix = self.trigger + " "  # Always enforce a space
-                    insert_text = (
-                        f"{prefix}{key} = {prev_value}"
-                        if prev_value is not None
-                        else f"{prefix}{key} = "
-                    )
-                    sp = -len(text)
-                else:
-                    insert_text = (
-                        f"{key} = {prev_value}"
-                        if prev_value is not None
-                        else f"{key} = "
-                    )
-                    sp = -len(base)
-                # Make it obvious the value part is from before
+                value_part = f" = {prev_value}" if prev_value is not None else " = "
+                completion_text = f"{key}{value_part}"
+
                 yield Completion(
-                    insert_text,
-                    start_position=sp,
+                    completion_text,
+                    start_position=-len(
+                        base_to_complete
+                    ),  # Correctly replace only the typed part of the key
                     display_meta=f"puppy.cfg key (was: {prev_value})"
                     if prev_value is not None
                     else "puppy.cfg key",

code_puppy/model_factory.py

@@ -1,14 +1,9 @@
-import asyncio
 import json
 import os
-import threading
-import time
-from collections import deque
 from typing import Any, Dict
 
 import httpx
 from anthropic import AsyncAnthropic
-from httpx import Response
 from openai import AsyncAzureOpenAI  # For Azure OpenAI client
 from pydantic_ai.models.anthropic import AnthropicModel
 from pydantic_ai.models.gemini import GeminiModel
@@ -27,98 +22,6 @@ from pydantic_ai.providers.openai import OpenAIProvider
 #   Example: "X-Api-Key": "$OPENAI_API_KEY" will use the value from os.environ.get("OPENAI_API_KEY")
 
 
-def make_client(
-    max_requests_per_minute: int = 10, max_retries: int = 3, retry_base_delay: int = 10
-) -> httpx.AsyncClient:
-    # Create a rate limiter using a token bucket approach
-    class RateLimiter:
-        def __init__(self, max_requests_per_minute):
-            self.max_requests_per_minute = max_requests_per_minute
-            self.interval = (
-                60.0 / max_requests_per_minute
-            )  # Time between requests in seconds
-            self.request_times = deque(maxlen=max_requests_per_minute)
-            self.lock = threading.Lock()
-
-        async def acquire(self):
-            """Wait until a request can be made according to the rate limit."""
-            while True:
-                with self.lock:
-                    now = time.time()
-
-                    # Remove timestamps older than 1 minute
-                    while self.request_times and now - self.request_times[0] > 60:
-                        self.request_times.popleft()
-
-                    # If we haven't reached the limit, add the timestamp and proceed
-                    if len(self.request_times) < self.max_requests_per_minute:
-                        self.request_times.append(now)
-                        return
-
-                    # Otherwise, calculate the wait time until we can make another request
-                    oldest = self.request_times[0]
-                    wait_time = max(0, oldest + 60 - now)
-
-                if wait_time > 0:
-                    print(
-                        f"Rate limit would be exceeded. Waiting {wait_time:.2f} seconds before sending request."
-                    )
-                    await asyncio.sleep(wait_time)
-                else:
-                    # Try again immediately
-                    continue
-
-    # Create the rate limiter instance
-    rate_limiter = RateLimiter(max_requests_per_minute)
-
-    def should_retry(response: Response) -> bool:
-        return response.status_code == 429 or (500 <= response.status_code < 600)
-
-    async def request_hook(request):
-        # Wait until we can make a request according to our rate limit
-        await rate_limiter.acquire()
-        return request
-
-    async def response_hook(response: Response) -> Response:
-        retries = getattr(response.request, "_retries", 0)
-
-        if should_retry(response) and retries < max_retries:
-            setattr(response.request, "_retries", retries + 1)
-
-            delay = retry_base_delay * (2**retries)
-
-            if response.status_code == 429:
-                print(
-                    f"Rate limit exceeded. Retrying in {delay:.2f} seconds (attempt {retries + 1}/{max_retries})"
-                )
-            else:
-                print(
-                    f"Server error {response.status_code}. Retrying in {delay:.2f} seconds (attempt {retries + 1}/{max_retries})"
-                )
-
-            await asyncio.sleep(delay)
-
-            new_request = response.request.copy()
-            async with httpx.AsyncClient() as client:
-                # Apply rate limiting to the retry request as well
-                await rate_limiter.acquire()
-                new_response = await client.request(
-                    new_request.method,
-                    str(new_request.url),
-                    headers=new_request.headers,
-                    content=new_request.content,
-                    params=dict(new_request.url.params),
-                )
-                return new_response
-        return response
-
-    # Setup both request and response hooks
-    event_hooks = {"request": [request_hook], "response": [response_hook]}
-
-    client = httpx.AsyncClient(event_hooks=event_hooks)
-    return client
-
-
 def get_custom_config(model_config):
     custom_config = model_config.get("custom_endpoint", {})
     if not custom_config:
@@ -167,17 +70,6 @@ class ModelFactory:
 
         model_type = model_config.get("type")
 
-        # Common configuration for rate limiting and retries
-        max_requests_per_minute = model_config.get("max_requests_per_minute", 100)
-        max_retries = model_config.get("max_retries", 3)
-        retry_base_delay = model_config.get("retry_base_delay", 1.0)
-
-        client = make_client(
-            max_requests_per_minute=max_requests_per_minute,
-            max_retries=max_retries,
-            retry_base_delay=retry_base_delay,
-        )
-
         if model_type == "gemini":
             provider = GoogleGLAProvider(api_key=os.environ.get("GEMINI_API_KEY", ""))
 

code_puppy/models.json

@@ -1,38 +1,23 @@
 {
   "gemini-2.5-flash-preview-05-20": {
     "type": "gemini",
-    "name": "gemini-2.5-flash-preview-05-20",
-    "max_requests_per_minute": 10,
-    "max_retries": 3,
-    "retry_base_delay": 10
+    "name": "gemini-2.5-flash-preview-05-20"
   },
   "gpt-4.1": {
     "type": "openai",
-    "name": "gpt-4.1",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 10
+    "name": "gpt-4.1"
   },
   "gpt-4.1-mini": {
     "type": "openai",
-    "name": "gpt-4.1-mini",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 10
+    "name": "gpt-4.1-mini"
   },
   "gpt-4.1-nano": {
     "type": "openai",
-    "name": "gpt-4.1-nano",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 10
+    "name": "gpt-4.1-nano"
   },
   "gpt-4.1-custom": {
     "type": "custom_openai",
     "name": "gpt-4.1-custom",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 10,
     "custom_endpoint": {
       "url": "https://my.cute.endpoint:8080",
       "headers": {
@@ -44,9 +29,6 @@
   "ollama-llama3.3": {
     "type": "custom_openai",
     "name": "llama3.3",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 5,
     "custom_endpoint": {
       "url": "http://localhost:11434/v1"
     }
@@ -54,9 +36,6 @@
   "meta-llama/Llama-3.3-70B-Instruct-Turbo": {
     "type": "custom_openai",
     "name": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 5,
     "custom_endpoint": {
       "url": "https://api.together.xyz/v1",
       "api_key": "$TOGETHER_API_KEY"
@@ -65,9 +44,6 @@
   "grok-3-mini-fast": {
     "type": "custom_openai",
     "name": "grok-3-mini-fast",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 5,
     "custom_endpoint": {
       "url": "https://api.x.ai/v1",
       "api_key": "$XAI_API_KEY"
@@ -76,9 +52,6 @@
   "azure-gpt-4.1": {
     "type": "azure_openai",
     "name": "gpt-4.1",
-    "max_requests_per_minute": 100,
-    "max_retries": 3,
-    "retry_base_delay": 5,
     "api_version": "2024-12-01-preview",
     "api_key": "$AZURE_OPENAI_API_KEY",
     "azure_endpoint": "$AZURE_OPENAI_ENDPOINT"

code_puppy/tools/command_runner.py

@@ -136,12 +136,17 @@ def run_shell_command(
     except Exception as e:
         console.print_exception(show_locals=True)
         console.print("[dim]" + "-" * 60 + "[/dim]\n")
+        # Ensure stdout and stderr are always defined
+        if "stdout" not in locals():
+            stdout = None
+        if "stderr" not in locals():
+            stderr = None
         return {
             "success": False,
             "command": command,
             "error": f"Error executing command: {str(e)}",
-            "stdout": stdout[-1000:],
-            "stderr": stderr[-1000:],
+            "stdout": stdout[-1000:] if stdout else None,
+            "stderr": stderr[-1000:] if stderr else None,
             "exit_code": -1,
             "timeout": False,
         }

code_puppy/tools/common.py

@@ -1,4 +1,5 @@
 import os
+import fnmatch
 
 from typing import Optional, Tuple
 
@@ -8,6 +9,56 @@ from rich.console import Console
 NO_COLOR = bool(int(os.environ.get("CODE_PUPPY_NO_COLOR", "0")))
 console = Console(no_color=NO_COLOR)
 
+
+# -------------------
+# Shared ignore patterns/helpers
+# -------------------
+IGNORE_PATTERNS = [
+    "**/node_modules/**",
+    "**/node_modules/**/*.js",
+    "node_modules/**",
+    "node_modules",
+    "**/.git/**",
+    "**/.git",
+    ".git/**",
+    ".git",
+    "**/__pycache__/**",
+    "**/__pycache__",
+    "__pycache__/**",
+    "__pycache__",
+    "**/.DS_Store",
+    ".DS_Store",
+    "**/.env",
+    ".env",
+    "**/.venv/**",
+    "**/.venv",
+    "**/venv/**",
+    "**/venv",
+    "**/.idea/**",
+    "**/.idea",
+    "**/.vscode/**",
+    "**/.vscode",
+    "**/dist/**",
+    "**/dist",
+    "**/build/**",
+    "**/build",
+    "**/*.pyc",
+    "**/*.pyo",
+    "**/*.pyd",
+    "**/*.so",
+    "**/*.dll",
+    "**/.*",
+]
+
+
+def should_ignore_path(path: str) -> bool:
+    """Return True if *path* matches any pattern in IGNORE_PATTERNS."""
+    for pattern in IGNORE_PATTERNS:
+        if fnmatch.fnmatch(path, pattern):
+            return True
+    return False
+
+
 JW_THRESHOLD = 0.95