aider-ce 0.88.20__py3-none-any.whl → 0.88.38__py3-none-any.whl

aider/tools/replace_all.py

@@ -1,4 +1,5 @@
-from .tool_utils import (
+from aider.tools.utils.base_tool import BaseTool
+from aider.tools.utils.helpers import (
     ToolError,
     apply_change,
     format_tool_result,
@@ -6,121 +7,107 @@ from .tool_utils import (
     handle_tool_error,
     validate_file_for_edit,
 )
-
-schema = {
-    "type": "function",
-    "function": {
-        "name": "ReplaceAll",
-        "description": "Replace all occurrences of text in a file.",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "file_path": {"type": "string"},
-                "find_text": {"type": "string"},
-                "replace_text": {"type": "string"},
-                "change_id": {"type": "string"},
-                "dry_run": {"type": "boolean", "default": False},
+from aider.tools.utils.output import tool_body_unwrapped, tool_footer, tool_header
+
+
+class Tool(BaseTool):
+    NORM_NAME = "replaceall"
+    SCHEMA = {
+        "type": "function",
+        "function": {
+            "name": "ReplaceAll",
+            "description": "Replace all occurrences of text in a file.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "file_path": {"type": "string"},
+                    "find_text": {"type": "string"},
+                    "replace_text": {"type": "string"},
+                    "change_id": {"type": "string"},
+                    "dry_run": {"type": "boolean", "default": False},
+                },
+                "required": ["file_path", "find_text", "replace_text"],
             },
-            "required": ["file_path", "find_text", "replace_text"],
         },
-    },
-}
-
-# Normalized tool name for lookup
-NORM_NAME = "replaceall"
-
-
-def _execute_replace_all(coder, file_path, find_text, replace_text, change_id=None, dry_run=False):
-    """
-    Replace all occurrences of text in a file using utility functions.
-    """
-    # Get absolute file path
-    abs_path = coder.abs_root_path(file_path)
-    rel_path = coder.get_rel_fname(abs_path)
-    tool_name = "ReplaceAll"
-    try:
-        # 1. Validate file and get content
-        abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
-
-        # 2. Count occurrences
-        count = original_content.count(find_text)
-        if count == 0:
-            coder.io.tool_warning(f"Text '{find_text}' not found in file '{file_path}'")
-            return "Warning: Text not found in file"
-
-        # 3. Perform the replacement
-        new_content = original_content.replace(find_text, replace_text)
-
-        if original_content == new_content:
-            coder.io.tool_warning("No changes made: replacement text is identical to original")
-            return "Warning: No changes made (replacement identical to original)"
+    }
+
+    @classmethod
+    def execute(cls, coder, file_path, find_text, replace_text, change_id=None, dry_run=False):
+        """
+        Replace all occurrences of text in a file using utility functions.
+        """
+        # Get absolute file path
+        abs_path = coder.abs_root_path(file_path)
+        rel_path = coder.get_rel_fname(abs_path)
+        tool_name = "ReplaceAll"
+        try:
+            # 1. Validate file and get content
+            abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
+
+            # 2. Count occurrences
+            count = original_content.count(find_text)
+            if count == 0:
+                coder.io.tool_warning(f"Text '{find_text}' not found in file '{file_path}'")
+                return "Warning: Text not found in file"
+
+            # 3. Perform the replacement
+            new_content = original_content.replace(find_text, replace_text)
+
+            if original_content == new_content:
+                coder.io.tool_warning("No changes made: replacement text is identical to original")
+                return "Warning: No changes made (replacement identical to original)"
+
+            # 4. Generate diff for feedback
+            diff_examples = generate_unified_diff_snippet(original_content, new_content, rel_path)
+
+            # 5. Handle dry run
+            if dry_run:
+                dry_run_message = (
+                    f"Dry run: Would replace {count} occurrences of '{find_text}' in {file_path}."
+                )
+                return format_tool_result(
+                    coder,
+                    tool_name,
+                    "",
+                    dry_run=True,
+                    dry_run_message=dry_run_message,
+                    diff_snippet=diff_examples,
+                )
+
+            # 6. Apply Change (Not dry run)
+            metadata = {"find_text": find_text, "replace_text": replace_text, "occurrences": count}
+            final_change_id = apply_change(
+                coder,
+                abs_path,
+                rel_path,
+                original_content,
+                new_content,
+                "replaceall",
+                metadata,
+                change_id,
+            )
 
-        # 4. Generate diff for feedback
-        diff_examples = generate_unified_diff_snippet(original_content, new_content, rel_path)
+            coder.files_edited_by_tools.add(rel_path)
 
-        # 5. Handle dry run
-        if dry_run:
-            dry_run_message = (
-                f"Dry run: Would replace {count} occurrences of '{find_text}' in {file_path}."
-            )
+            # 7. Format and return result
+            success_message = f"Replaced {count} occurrences in {file_path}"
             return format_tool_result(
                 coder,
                 tool_name,
-                "",
-                dry_run=True,
-                dry_run_message=dry_run_message,
+                success_message,
+                change_id=final_change_id,
                 diff_snippet=diff_examples,
             )
 
-        # 6. Apply Change (Not dry run)
-        metadata = {"find_text": find_text, "replace_text": replace_text, "occurrences": count}
-        final_change_id = apply_change(
-            coder,
-            abs_path,
-            rel_path,
-            original_content,
-            new_content,
-            "replaceall",
-            metadata,
-            change_id,
-        )
-
-        coder.files_edited_by_tools.add(rel_path)
-
-        # 7. Format and return result
-        success_message = f"Replaced {count} occurrences in {file_path}"
-        return format_tool_result(
-            coder, tool_name, success_message, change_id=final_change_id, diff_snippet=diff_examples
-        )
-
-    except ToolError as e:
-        # Handle errors raised by utility functions
-        return handle_tool_error(coder, tool_name, e, add_traceback=False)
-    except Exception as e:
-        # Handle unexpected errors
-        return handle_tool_error(coder, tool_name, e)
-
-
-def process_response(coder, params):
-    """
-    Process the ReplaceAll tool response.
-
-    Args:
-        coder: The Coder instance
-        params: Dictionary of parameters
-
-    Returns:
-        str: Result message
-    """
-    file_path = params.get("file_path")
-    find_text = params.get("find_text")
-    replace_text = params.get("replace_text")
-    change_id = params.get("change_id")
-    dry_run = params.get("dry_run", False)
-
-    if file_path is not None and find_text is not None and replace_text is not None:
-        return _execute_replace_all(coder, file_path, find_text, replace_text, change_id, dry_run)
-    else:
-        return (
-            "Error: Missing required parameters for ReplaceAll (file_path, find_text, replace_text)"
-        )
+        except ToolError as e:
+            # Handle errors raised by utility functions
+            return handle_tool_error(coder, tool_name, e, add_traceback=False)
+        except Exception as e:
+            # Handle unexpected errors
+            return handle_tool_error(coder, tool_name, e)
+
+    @classmethod
+    def format_output(cls, coder, mcp_server, tool_response):
+        tool_header(coder=coder, mcp_server=mcp_server, tool_response=tool_response)
+        tool_body_unwrapped(coder=coder, tool_response=tool_response)
+        tool_footer(coder=coder, tool_response=tool_response)

aider/tools/replace_line.py

@@ -1,173 +1,135 @@
-import os
 import traceback
 
-schema = {
-    "type": "function",
-    "function": {
-        "name": "ReplaceLine",
-        "description": "Replace a single line in a file.",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "file_path": {"type": "string"},
-                "line_number": {"type": "integer"},
-                "new_content": {"type": "string"},
-                "change_id": {"type": "string"},
-                "dry_run": {"type": "boolean", "default": False},
+from aider.tools.utils.base_tool import BaseTool
+from aider.tools.utils.helpers import ToolError, validate_file_for_edit
+from aider.tools.utils.output import tool_body_unwrapped, tool_footer, tool_header
+
+
+class Tool(BaseTool):
+    NORM_NAME = "replaceline"
+    SCHEMA = {
+        "type": "function",
+        "function": {
+            "name": "ReplaceLine",
+            "description": "Replace a single line in a file.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "file_path": {"type": "string"},
+                    "line_number": {"type": "integer"},
+                    "new_content": {"type": "string"},
+                    "change_id": {"type": "string"},
+                    "dry_run": {"type": "boolean", "default": False},
+                },
+                "required": ["file_path", "line_number", "new_content"],
             },
-            "required": ["file_path", "line_number", "new_content"],
         },
-    },
-}
-
-# Normalized tool name for lookup
-NORM_NAME = "replaceline"
-
-
-def _execute_replace_line(
-    coder, file_path, line_number, new_content, change_id=None, dry_run=False
-):
-    """
-    Replace a specific line identified by line number.
-    Useful for fixing errors identified by error messages or linters.
-
-    Parameters:
-    - coder: The Coder instance
-    - file_path: Path to the file to modify
-    - line_number: The line number to replace (1-based)
-    - new_content: New content for the line
-    - change_id: Optional ID for tracking the change
-    - dry_run: If True, simulate the change without modifying the file
-
-    Returns a result message.
-    """
-    try:
-        # Get absolute file path
-        abs_path = coder.abs_root_path(file_path)
-        rel_path = coder.get_rel_fname(abs_path)
-
-        # Check if file exists
-        if not os.path.isfile(abs_path):
-            coder.io.tool_error(f"File '{file_path}' not found")
-            return "Error: File not found"
-
-        # Check if file is in editable context
-        if abs_path not in coder.abs_fnames:
-            if abs_path in coder.abs_read_only_fnames:
-                coder.io.tool_error(f"File '{file_path}' is read-only. Use MakeEditable first.")
-                return "Error: File is read-only. Use MakeEditable first."
-            else:
-                coder.io.tool_error(f"File '{file_path}' not in context")
-                return "Error: File not in context"
-
-        # Reread file content immediately before modification
-        file_content = coder.io.read_text(abs_path)
-        if file_content is None:
-            coder.io.tool_error(f"Could not read file '{file_path}' before ReplaceLine operation.")
-            return f"Error: Could not read file '{file_path}'"
-
-        # Split into lines
-        lines = file_content.splitlines()
-
-        # Validate line number
-        if not isinstance(line_number, int):
-            try:
-                line_number = int(line_number)
-            except ValueError:
-                coder.io.tool_error(f"Line number must be an integer, got '{line_number}'")
+    }
+
+    @classmethod
+    def execute(cls, coder, file_path, line_number, new_content, change_id=None, dry_run=False):
+        """
+        Replace a specific line identified by line number.
+        Useful for fixing errors identified by error messages or linters.
+
+        Parameters:
+        - coder: The Coder instance
+        - file_path: Path to the file to modify
+        - line_number: The line number to replace (1-based)
+        - new_content: New content for the line
+        - change_id: Optional ID for tracking the change
+        - dry_run: If True, simulate the change without modifying the file
+
+        Returns a result message.
+        """
+        try:
+            # 1. Validate file and get content
+            abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
+            lines = original_content.splitlines()
+
+            # Validate line number
+            if not isinstance(line_number, int):
+                try:
+                    line_number = int(line_number)
+                except ValueError:
+                    coder.io.tool_error(f"Line number must be an integer, got '{line_number}'")
+                    coder.io.tool_error(
+                        f"Invalid line_number value: '{line_number}'. Must be an integer."
+                    )
+                    return f"Error: Invalid line_number value '{line_number}'"
+
+            # Convert 1-based line number to 0-based index
+            idx = line_number - 1
+
+            if idx < 0 or idx >= len(lines):
                 coder.io.tool_error(
-                    f"Invalid line_number value: '{line_number}'. Must be an integer."
+                    f"Line number {line_number} is out of range for file '{file_path}' (has"
+                    f" {len(lines)} lines)."
                 )
-                return f"Error: Invalid line_number value '{line_number}'"
+                return f"Error: Line number {line_number} out of range"
 
-        # Convert 1-based line number to 0-based index
-        idx = line_number - 1
+            # Store original content for change tracking
+            original_line = lines[idx]
 
-        if idx < 0 or idx >= len(lines):
-            coder.io.tool_error(
-                f"Line number {line_number} is out of range for file '{file_path}' (has"
-                f" {len(lines)} lines)."
-            )
-            return f"Error: Line number {line_number} out of range"
+            # Replace the line
+            lines[idx] = new_content
 
-        # Store original content for change tracking
-        original_content = file_content
-        original_line = lines[idx]
+            # Join lines back into a string
+            new_content_full = "\n".join(lines)
 
-        # Replace the line
-        lines[idx] = new_content
+            if original_content == new_content_full:
+                coder.io.tool_warning("No changes made: new line content is identical to original")
+                return "Warning: No changes made (new content identical to original)"
 
-        # Join lines back into a string
-        new_content_full = "\n".join(lines)
+            # Create a readable diff for the line replacement
+            diff = f"Line {line_number}:\n- {original_line}\n+ {new_content}"
 
-        if original_content == new_content_full:
-            coder.io.tool_warning("No changes made: new line content is identical to original")
-            return "Warning: No changes made (new content identical to original)"
+            # Handle dry run
+            if dry_run:
+                coder.io.tool_output(f"Dry run: Would replace line {line_number} in {file_path}")
+                return f"Dry run: Would replace line {line_number}. Diff:\n{diff}"
 
-        # Create a readable diff for the line replacement
-        diff = f"Line {line_number}:\n- {original_line}\n+ {new_content}"
+            # --- Apply Change (Not dry run) ---
+            coder.io.write_text(abs_path, new_content_full)
 
-        # Handle dry run
-        if dry_run:
-            coder.io.tool_output(f"Dry run: Would replace line {line_number} in {file_path}")
-            return f"Dry run: Would replace line {line_number}. Diff:\n{diff}"
+            # Track the change
+            try:
+                metadata = {
+                    "line_number": line_number,
+                    "original_line": original_line,
+                    "new_line": new_content,
+                }
+                change_id = coder.change_tracker.track_change(
+                    file_path=rel_path,
+                    change_type="replaceline",
+                    original_content=original_content,
+                    new_content=new_content_full,
+                    metadata=metadata,
+                    change_id=change_id,
+                )
+            except Exception as track_e:
+                coder.io.tool_error(f"Error tracking change for ReplaceLine: {track_e}")
+                change_id = "TRACKING_FAILED"
 
-        # --- Apply Change (Not dry run) ---
-        coder.io.write_text(abs_path, new_content_full)
+            coder.files_edited_by_tools.add(rel_path)
 
-        # Track the change
-        try:
-            metadata = {
-                "line_number": line_number,
-                "original_line": original_line,
-                "new_line": new_content,
-            }
-            change_id = coder.change_tracker.track_change(
-                file_path=rel_path,
-                change_type="replaceline",
-                original_content=original_content,
-                new_content=new_content_full,
-                metadata=metadata,
-                change_id=change_id,
+            # Improve feedback
+            coder.io.tool_output(
+                f"✅ Replaced line {line_number} in {file_path} (change_id: {change_id})"
             )
-        except Exception as track_e:
-            coder.io.tool_error(f"Error tracking change for ReplaceLine: {track_e}")
-            change_id = "TRACKING_FAILED"
-
-        coder.files_edited_by_tools.add(rel_path)
-
-        # Improve feedback
-        coder.io.tool_output(
-            f"✅ Replaced line {line_number} in {file_path} (change_id: {change_id})"
-        )
-        return f"Successfully replaced line {line_number} (change_id: {change_id}). Diff:\n{diff}"
-
-    except Exception as e:
-        coder.io.tool_error(f"Error in ReplaceLine: {str(e)}\n{traceback.format_exc()}")
-        return f"Error: {str(e)}"
-
-
-def process_response(coder, params):
-    """
-    Process the ReplaceLine tool response.
-
-    Args:
-        coder: The Coder instance
-        params: Dictionary of parameters
-
-    Returns:
-        str: Result message
-    """
-    file_path = params.get("file_path")
-    line_number = params.get("line_number")
-    new_content = params.get("new_content")
-    change_id = params.get("change_id")
-    dry_run = params.get("dry_run", False)
-
-    if file_path is not None and line_number is not None and new_content is not None:
-        return _execute_replace_line(coder, file_path, line_number, new_content, change_id, dry_run)
-    else:
-        return (
-            "Error: Missing required parameters for ReplaceLine (file_path,"
-            " line_number, new_content)"
-        )
+            return (
+                f"Successfully replaced line {line_number} (change_id: {change_id}). Diff:\n{diff}"
+            )
+
+        except ToolError as e:
+            coder.io.tool_error(f"Error in ReplaceLine: {str(e)}")
+            return f"Error: {str(e)}"
+        except Exception as e:
+            coder.io.tool_error(f"Error in ReplaceLine: {str(e)}\n{traceback.format_exc()}")
+            return f"Error: {str(e)}"
+
+    @classmethod
+    def format_output(cls, coder, mcp_server, tool_response):
+        tool_header(coder=coder, mcp_server=mcp_server, tool_response=tool_response)
+        tool_body_unwrapped(coder=coder, tool_response=tool_response)
+        tool_footer(coder=coder, tool_response=tool_response)