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

aider/tools/replace_text.py

@@ -1,4 +1,8 @@
-from .tool_utils import (
+import difflib
+import json
+
+from aider.tools.utils.base_tool import BaseTool
+from aider.tools.utils.helpers import (
     ToolError,
     apply_change,
     format_tool_result,
@@ -6,182 +10,177 @@ from .tool_utils import (
     handle_tool_error,
     validate_file_for_edit,
 )
-
-schema = {
-    "type": "function",
-    "function": {
-        "name": "ReplaceText",
-        "description": "Replace text in a file.",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "file_path": {"type": "string"},
-                "find_text": {"type": "string"},
-                "replace_text": {"type": "string"},
-                "near_context": {"type": "string"},
-                "occurrence": {"type": "integer", "default": 1},
-                "change_id": {"type": "string"},
-                "dry_run": {"type": "boolean", "default": False},
+from aider.tools.utils.output import color_markers, tool_footer, tool_header
+
+
+class Tool(BaseTool):
+    NORM_NAME = "replacetext"
+    SCHEMA = {
+        "type": "function",
+        "function": {
+            "name": "ReplaceText",
+            "description": "Replace text in a file.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "file_path": {"type": "string"},
+                    "find_text": {"type": "string"},
+                    "replace_text": {"type": "string"},
+                    "near_context": {"type": "string"},
+                    "occurrence": {"type": "integer", "default": 1},
+                    "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 = "replacetext"
-
-
-def _execute_replace_text(
-    coder,
-    file_path,
-    find_text,
-    replace_text,
-    near_context=None,
-    occurrence=1,
-    change_id=None,
-    dry_run=False,
-):
-    """
-    Replace specific text with new text, optionally using nearby context for disambiguation.
-    Uses utility functions for validation, finding occurrences, and applying changes.
-    """
-    tool_name = "ReplaceText"
-    try:
-        # 1. Validate file and get content
-        abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
-
-        # 2. Find occurrences using helper function
-        # Note: _find_occurrences is currently on the Coder class, not in tool_utils
-        occurrences = coder._find_occurrences(original_content, find_text, near_context)
-
-        if not occurrences:
-            err_msg = f"Text '{find_text}' not found"
-            if near_context:
-                err_msg += f" near context '{near_context}'"
-            err_msg += f" in file '{file_path}'."
-            raise ToolError(err_msg)
-
-        # 3. Select the occurrence index
-        num_occurrences = len(occurrences)
+    }
+
+    @classmethod
+    def execute(
+        cls,
+        coder,
+        file_path,
+        find_text,
+        replace_text,
+        near_context=None,
+        occurrence=1,
+        change_id=None,
+        dry_run=False,
+    ):
+        """
+        Replace specific text with new text, optionally using nearby context for disambiguation.
+        Uses utility functions for validation, finding occurrences, and applying changes.
+        """
+        tool_name = "ReplaceText"
         try:
-            occurrence = int(occurrence)
-            if occurrence == -1:
-                if num_occurrences == 0:
-                    raise ToolError(f"Text '{find_text}' not found, cannot select last occurrence.")
-                target_idx = num_occurrences - 1
-            elif 1 <= occurrence <= num_occurrences:
-                target_idx = occurrence - 1  # Convert 1-based to 0-based
-            else:
-                err_msg = (
-                    f"Occurrence number {occurrence} is out of range. Found"
-                    f" {num_occurrences} occurrences of '{find_text}'"
-                )
+            # 1. Validate file and get content
+            abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
+
+            # 2. Find occurrences using helper function
+            # Note: _find_occurrences is currently on the Coder class, not in tool_utils
+            occurrences = coder._find_occurrences(original_content, find_text, near_context)
+
+            if not occurrences:
+                err_msg = f"Text '{find_text}' not found"
                 if near_context:
-                    err_msg += f" near '{near_context}'"
-                err_msg += f" in '{file_path}'."
+                    err_msg += f" near context '{near_context}'"
+                err_msg += f" in file '{file_path}'."
                 raise ToolError(err_msg)
-        except ValueError:
-            raise ToolError(f"Invalid occurrence value: '{occurrence}'. Must be an integer.")
 
-        start_index = occurrences[target_idx]
+            # 3. Select the occurrence index
+            num_occurrences = len(occurrences)
+            try:
+                occurrence = int(occurrence)
+                if occurrence == -1:
+                    if num_occurrences == 0:
+                        raise ToolError(
+                            f"Text '{find_text}' not found, cannot select last occurrence."
+                        )
+                    target_idx = num_occurrences - 1
+                elif 1 <= occurrence <= num_occurrences:
+                    target_idx = occurrence - 1  # Convert 1-based to 0-based
+                else:
+                    err_msg = (
+                        f"Occurrence number {occurrence} is out of range. Found"
+                        f" {num_occurrences} occurrences of '{find_text}'"
+                    )
+                    if near_context:
+                        err_msg += f" near '{near_context}'"
+                    err_msg += f" in '{file_path}'."
+                    raise ToolError(err_msg)
+            except ValueError:
+                raise ToolError(f"Invalid occurrence value: '{occurrence}'. Must be an integer.")
+
+            start_index = occurrences[target_idx]
+
+            # 4. Perform the replacement
+            new_content = (
+                original_content[:start_index]
+                + replace_text
+                + original_content[start_index + len(find_text) :]
+            )
 
-        # 4. Perform the replacement
-        new_content = (
-            original_content[:start_index]
-            + replace_text
-            + original_content[start_index + len(find_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)"
 
-        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)"
+            # 5. Generate diff for feedback
+            # Note: _generate_diff_snippet is currently on the Coder class
+            diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
+            occurrence_str = f"occurrence {occurrence}" if num_occurrences > 1 else "text"
 
-        # 5. Generate diff for feedback
-        # Note: _generate_diff_snippet is currently on the Coder class
-        diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
-        occurrence_str = f"occurrence {occurrence}" if num_occurrences > 1 else "text"
+            # 6. Handle dry run
+            if dry_run:
+                dry_run_message = (
+                    f"Dry run: Would replace {occurrence_str} 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_snippet,
+                )
 
-        # 6. Handle dry run
-        if dry_run:
-            dry_run_message = (
-                f"Dry run: Would replace {occurrence_str} of '{find_text}' in {file_path}."
+            # 7. Apply Change (Not dry run)
+            metadata = {
+                "start_index": start_index,
+                "find_text": find_text,
+                "replace_text": replace_text,
+                "near_context": near_context,
+                "occurrence": occurrence,
+            }
+            final_change_id = apply_change(
+                coder,
+                abs_path,
+                rel_path,
+                original_content,
+                new_content,
+                "replacetext",
+                metadata,
+                change_id,
             )
+
+            coder.files_edited_by_tools.add(rel_path)
+            # 8. Format and return result
+            success_message = f"Replaced {occurrence_str} 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_snippet,
             )
 
-        # 7. Apply Change (Not dry run)
-        metadata = {
-            "start_index": start_index,
-            "find_text": find_text,
-            "replace_text": replace_text,
-            "near_context": near_context,
-            "occurrence": occurrence,
-        }
-        final_change_id = apply_change(
-            coder,
-            abs_path,
-            rel_path,
-            original_content,
-            new_content,
-            "replacetext",
-            metadata,
-            change_id,
+        except ToolError as e:
+            # Handle errors raised by utility functions or explicitly raised here
+            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):
+        color_start, color_end = color_markers(coder)
+        params = json.loads(tool_response.function.arguments)
+        diff = difflib.unified_diff(
+            params["find_text"].splitlines(),
+            params["replace_text"].splitlines(),
+            lineterm="",
+            n=float("inf"),
         )
 
-        coder.files_edited_by_tools.add(rel_path)
-        # 8. Format and return result
-        success_message = f"Replaced {occurrence_str} in {file_path}"
-        return format_tool_result(
-            coder, tool_name, success_message, change_id=final_change_id, diff_snippet=diff_snippet
-        )
+        tool_header(coder=coder, mcp_server=mcp_server, tool_response=tool_response)
 
-    except ToolError as e:
-        # Handle errors raised by utility functions or explicitly raised here
-        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 ReplaceText 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")
-    near_context = params.get("near_context")
-    occurrence = params.get("occurrence", 1)
-    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_text(
-            coder,
-            file_path,
-            find_text,
-            replace_text,
-            near_context,
-            occurrence,
-            change_id,
-            dry_run,
-        )
-    else:
-        return (
-            "Error: Missing required parameters for ReplaceText (file_path,"
-            " find_text, replace_text)"
-        )
+        coder.io.tool_output("")
+        coder.io.tool_output(f"{color_start}file_path:{color_end}")
+        coder.io.tool_output(params["file_path"])
+        coder.io.tool_output("")
+
+        coder.io.tool_output(f"{color_start}diff:{color_end}")
+        coder.io.tool_output("\n".join(list(diff)[2:]))
+        coder.io.tool_output("")
+
+        tool_footer(coder=coder, tool_response=tool_response)

aider/tools/show_numbered_context.py

@@ -1,147 +1,121 @@
 import os
 
-from .tool_utils import ToolError, handle_tool_error, resolve_paths
-
-schema = {
-    "type": "function",
-    "function": {
-        "name": "ShowNumberedContext",
-        "description": "Show numbered lines of context around a pattern or line number.",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "file_path": {"type": "string"},
-                "pattern": {"type": "string"},
-                "line_number": {"type": "integer"},
-                "context_lines": {"type": "integer", "default": 3},
+from aider.tools.utils.base_tool import BaseTool
+from aider.tools.utils.helpers import ToolError, handle_tool_error, resolve_paths
+
+
+class Tool(BaseTool):
+    NORM_NAME = "shownumberedcontext"
+    SCHEMA = {
+        "type": "function",
+        "function": {
+            "name": "ShowNumberedContext",
+            "description": "Show numbered lines of context around a pattern or line number.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "file_path": {"type": "string"},
+                    "pattern": {"type": "string"},
+                    "line_number": {"type": "integer"},
+                    "context_lines": {"type": "integer", "default": 3},
+                },
+                "required": ["file_path"],
             },
-            "required": ["file_path"],
         },
-    },
-}
-
-# Normalized tool name for lookup
-NORM_NAME = "shownumberedcontext"
-
-
-def execute_show_numbered_context(
-    coder, file_path, pattern=None, line_number=None, context_lines=3
-):
-    """
-    Displays numbered lines from file_path centered around a target location
-    (pattern or line_number), without adding the file to context.
-    Uses utility functions for path resolution and error handling.
-    """
-    tool_name = "ShowNumberedContext"
-    try:
-        # 1. Validate arguments
-        if not (pattern is None) ^ (line_number is None):
-            raise ToolError("Provide exactly one of 'pattern' or 'line_number'.")
-
-        # 2. Resolve path
-        abs_path, rel_path = resolve_paths(coder, file_path)
-        if not os.path.exists(abs_path):
-            # Check existence after resolving, as resolve_paths doesn't guarantee existence
-            raise ToolError(f"File not found: {file_path}")
-
-        # 3. Read file content
-        content = coder.io.read_text(abs_path)
-        if content is None:
-            raise ToolError(f"Could not read file: {file_path}")
-        lines = content.splitlines()
-        num_lines = len(lines)
-
-        # 4. Determine center line index
-        center_line_idx = -1
-        found_by = ""
-
-        if line_number is not None:
-            try:
-                line_number_int = int(line_number)
-                if 1 <= line_number_int <= num_lines:
-                    center_line_idx = line_number_int - 1  # Convert to 0-based index
-                    found_by = f"line {line_number_int}"
+    }
+
+    @classmethod
+    def execute(cls, coder, file_path, pattern=None, line_number=None, context_lines=3):
+        """
+        Displays numbered lines from file_path centered around a target location
+        (pattern or line_number), without adding the file to context.
+        Uses utility functions for path resolution and error handling.
+        """
+        tool_name = "ShowNumberedContext"
+        try:
+            # 1. Validate arguments
+            if not (pattern is None) ^ (line_number is None):
+                raise ToolError("Provide exactly one of 'pattern' or 'line_number'.")
+
+            # 2. Resolve path
+            abs_path, rel_path = resolve_paths(coder, file_path)
+            if not os.path.exists(abs_path):
+                # Check existence after resolving, as resolve_paths doesn't guarantee existence
+                raise ToolError(f"File not found: {file_path}")
+
+            # 3. Read file content
+            content = coder.io.read_text(abs_path)
+            if content is None:
+                raise ToolError(f"Could not read file: {file_path}")
+            lines = content.splitlines()
+            num_lines = len(lines)
+
+            # 4. Determine center line index
+            center_line_idx = -1
+            found_by = ""
+
+            if line_number is not None:
+                try:
+                    line_number_int = int(line_number)
+                    if 1 <= line_number_int <= num_lines:
+                        center_line_idx = line_number_int - 1  # Convert to 0-based index
+                        found_by = f"line {line_number_int}"
+                    else:
+                        raise ToolError(
+                            f"Line number {line_number_int} is out of range (1-{num_lines}) for"
+                            f" {file_path}."
+                        )
+                except ValueError:
+                    raise ToolError(f"Invalid line number '{line_number}'. Must be an integer.")
+
+            elif pattern is not None:
+                # TODO: Update this section for multiline pattern support later
+                first_match_line_idx = -1
+                for i, line in enumerate(lines):
+                    if pattern in line:
+                        first_match_line_idx = i
+                        break
+
+                if first_match_line_idx != -1:
+                    center_line_idx = first_match_line_idx
+                    found_by = f"pattern '{pattern}' on line {center_line_idx + 1}"
                 else:
-                    raise ToolError(
-                        f"Line number {line_number_int} is out of range (1-{num_lines}) for"
-                        f" {file_path}."
-                    )
+                    raise ToolError(f"Pattern '{pattern}' not found in {file_path}.")
+
+            if center_line_idx == -1:
+                # Should not happen if logic above is correct, but as a safeguard
+                raise ToolError("Internal error: Could not determine center line.")
+
+            # 5. Calculate context window
+            try:
+                context_lines_int = int(context_lines)
+                if context_lines_int < 0:
+                    raise ValueError("Context lines must be non-negative")
             except ValueError:
-                raise ToolError(f"Invalid line number '{line_number}'. Must be an integer.")
-
-        elif pattern is not None:
-            # TODO: Update this section for multiline pattern support later
-            first_match_line_idx = -1
-            for i, line in enumerate(lines):
-                if pattern in line:
-                    first_match_line_idx = i
-                    break
-
-            if first_match_line_idx != -1:
-                center_line_idx = first_match_line_idx
-                found_by = f"pattern '{pattern}' on line {center_line_idx + 1}"
-            else:
-                raise ToolError(f"Pattern '{pattern}' not found in {file_path}.")
-
-        if center_line_idx == -1:
-            # Should not happen if logic above is correct, but as a safeguard
-            raise ToolError("Internal error: Could not determine center line.")
-
-        # 5. Calculate context window
-        try:
-            context_lines_int = int(context_lines)
-            if context_lines_int < 0:
-                raise ValueError("Context lines must be non-negative")
-        except ValueError:
-            coder.io.tool_warning(
-                f"Invalid context_lines value '{context_lines}', using default 3."
-            )
-            context_lines_int = 3
-
-        start_line_idx = max(0, center_line_idx - context_lines_int)
-        end_line_idx = min(num_lines - 1, center_line_idx + context_lines_int)
-
-        # 6. Format output
-        # Use rel_path for user-facing messages
-        output_lines = [f"Displaying context around {found_by} in {rel_path}:"]
-        max_line_num_width = len(str(end_line_idx + 1))  # Width for padding
-
-        for i in range(start_line_idx, end_line_idx + 1):
-            line_num_str = str(i + 1).rjust(max_line_num_width)
-            output_lines.append(f"{line_num_str} | {lines[i]}")
-
-        # Log success and return the formatted context directly
-        coder.io.tool_output(f"Successfully retrieved context for {rel_path}")
-        return "\n".join(output_lines)
-
-    except ToolError as e:
-        # Handle expected errors raised by utility functions or validation
-        return handle_tool_error(coder, tool_name, e, add_traceback=False)
-    except Exception as e:
-        # Handle unexpected errors during processing
-        return handle_tool_error(coder, tool_name, e)
-
-
-def process_response(coder, params):
-    """
-    Process the ShowNumberedContext tool response.
-
-    Args:
-        coder: The Coder instance
-        params: Dictionary of parameters
-
-    Returns:
-        str: Result message
-    """
-    file_path = params.get("file_path")
-    pattern = params.get("pattern")
-    line_number = params.get("line_number")
-    context_lines = params.get("context_lines", 3)
-
-    if file_path is not None and (pattern is not None or line_number is not None):
-        return execute_show_numbered_context(coder, file_path, pattern, line_number, context_lines)
-    else:
-        return (
-            "Error: Missing required parameters for ViewNumberedContext (file_path"
-            " and either pattern or line_number)"
-        )
+                coder.io.tool_warning(
+                    f"Invalid context_lines value '{context_lines}', using default 3."
+                )
+                context_lines_int = 3
+
+            start_line_idx = max(0, center_line_idx - context_lines_int)
+            end_line_idx = min(num_lines - 1, center_line_idx + context_lines_int)
+
+            # 6. Format output
+            # Use rel_path for user-facing messages
+            output_lines = [f"Displaying context around {found_by} in {rel_path}:"]
+            max_line_num_width = len(str(end_line_idx + 1))  # Width for padding
+
+            for i in range(start_line_idx, end_line_idx + 1):
+                line_num_str = str(i + 1).rjust(max_line_num_width)
+                output_lines.append(f"{line_num_str} | {lines[i]}")
+
+            # Log success and return the formatted context directly
+            coder.io.tool_output(f"Successfully retrieved context for {rel_path}")
+            return "\n".join(output_lines)
+
+        except ToolError as e:
+            # Handle expected errors raised by utility functions or validation
+            return handle_tool_error(coder, tool_name, e, add_traceback=False)
+        except Exception as e:
+            # Handle unexpected errors during processing
+            return handle_tool_error(coder, tool_name, e)