aider-ce 0.87.13.dev3__py3-none-any.whl → 0.88.1__py3-none-any.whl

aider/tools/git.py

@@ -0,0 +1,142 @@
+from aider.repo import ANY_GIT_ERROR
+
+git_diff_schema = {
+    "type": "function",
+    "function": {
+        "name": "git_diff",
+        "description": (
+            "Show the diff between the current working directory and a git branch or commit."
+        ),
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "branch": {
+                    "type": "string",
+                    "description": "The branch or commit hash to diff against. Defaults to HEAD.",
+                },
+            },
+            "required": [],
+        },
+    },
+}
+
+
+def _execute_git_diff(coder, branch=None):
+    """
+    Show the diff between the current working directory and a git branch or commit.
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        if branch:
+            diff = coder.repo.diff_commits(False, branch, "HEAD")
+        else:
+            diff = coder.repo.diff_commits(False, "HEAD", None)
+
+        if not diff:
+            return "No differences found."
+        return diff
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git diff: {e}")
+        return f"Error running git diff: {e}"
+
+
+git_log_schema = {
+    "type": "function",
+    "function": {
+        "name": "git_log",
+        "description": "Show the git log.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "limit": {
+                    "type": "integer",
+                    "description": "The maximum number of commits to show. Defaults to 10.",
+                },
+            },
+            "required": [],
+        },
+    },
+}
+
+
+def _execute_git_log(coder, limit=10):
+    """
+    Show the git log.
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        commits = list(coder.repo.repo.iter_commits(max_count=limit))
+        log_output = []
+        for commit in commits:
+            short_hash = commit.hexsha[:8]
+            message = commit.message.strip().split("\n")[0]
+            log_output.append(f"{short_hash} {message}")
+        return "\n".join(log_output)
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git log: {e}")
+        return f"Error running git log: {e}"
+
+
+git_show_schema = {
+    "type": "function",
+    "function": {
+        "name": "git_show",
+        "description": "Show various types of objects (blobs, trees, tags, and commits).",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "object": {
+                    "type": "string",
+                    "description": "The object to show. Defaults to HEAD.",
+                },
+            },
+            "required": [],
+        },
+    },
+}
+
+
+def _execute_git_show(coder, object="HEAD"):
+    """
+    Show various types of objects (blobs, trees, tags, and commits).
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        return coder.repo.repo.git.show(object)
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git show: {e}")
+        return f"Error running git show: {e}"
+
+
+git_status_schema = {
+    "type": "function",
+    "function": {
+        "name": "git_status",
+        "description": "Show the working tree status.",
+        "parameters": {
+            "type": "object",
+            "properties": {},
+            "required": [],
+        },
+    },
+}
+
+
+def _execute_git_status(coder):
+    """
+    Show the working tree status.
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        return coder.repo.repo.git.status()
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git status: {e}")
+        return f"Error running git status: {e}"

aider/tools/grep.py

@@ -1,9 +1,54 @@
-import shlex
 import shutil
 from pathlib import Path
 
+import oslex
+
 from aider.run_cmd import run_cmd_subprocess
 
+grep_schema = {
+    "type": "function",
+    "function": {
+        "name": "Grep",
+        "description": "Search for a pattern in files.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "pattern": {
+                    "type": "string",
+                    "description": "The pattern to search for.",
+                },
+                "file_pattern": {
+                    "type": "string",
+                    "description": "Glob pattern for files to search. Defaults to '*'.",
+                },
+                "directory": {
+                    "type": "string",
+                    "description": "Directory to search in. Defaults to '.'.",
+                },
+                "use_regex": {
+                    "type": "boolean",
+                    "description": "Whether to use regex. Defaults to False.",
+                },
+                "case_insensitive": {
+                    "type": "boolean",
+                    "description": (
+                        "Whether to perform a case-insensitive search. Defaults to False."
+                    ),
+                },
+                "context_before": {
+                    "type": "integer",
+                    "description": "Number of lines to show before a match. Defaults to 5.",
+                },
+                "context_after": {
+                    "type": "integer",
+                    "description": "Number of lines to show after a match. Defaults to 5.",
+                },
+            },
+            "required": ["pattern"],
+        },
+    },
+}
+
 
 def _find_search_tool():
     """Find the best available command-line search tool (rg, ag, grep)."""
@@ -117,7 +162,7 @@ def _execute_grep(
         cmd_args.extend([pattern, str(search_dir_path)])
 
         # Convert list to command string for run_cmd_subprocess
-        command_string = shlex.join(cmd_args)
+        command_string = oslex.join(cmd_args)
 
         coder.io.tool_output(f"⚙️ Executing {tool_name}: {command_string}")
 

aider/tools/indent_lines.py

@@ -10,6 +10,29 @@ from .tool_utils import (
     validate_file_for_edit,
 )
 
+indent_lines_schema = {
+    "type": "function",
+    "function": {
+        "name": "IndentLines",
+        "description": "Indent a block of lines in a file.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {"type": "string"},
+                "start_pattern": {"type": "string"},
+                "end_pattern": {"type": "string"},
+                "line_count": {"type": "integer"},
+                "indent_levels": {"type": "integer", "default": 1},
+                "near_context": {"type": "string"},
+                "occurrence": {"type": "integer", "default": 1},
+                "change_id": {"type": "string"},
+                "dry_run": {"type": "boolean", "default": False},
+            },
+            "required": ["file_path", "start_pattern"],
+        },
+    },
+}
+
 
 def _execute_indent_lines(
     coder,
@@ -138,6 +161,8 @@ def _execute_indent_lines(
             change_id,
         )
 
+        coder.files_edited_by_tools.add(rel_path)
+
         # 8. Format and return result
         action_past = "Indented" if indent_levels > 0 else "Unindented"
         success_message = (

aider/tools/insert_block.py

@@ -12,6 +12,30 @@ from .tool_utils import (
     validate_file_for_edit,
 )
 
+insert_block_schema = {
+    "type": "function",
+    "function": {
+        "name": "InsertBlock",
+        "description": "Insert a block of content into a file.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {"type": "string"},
+                "content": {"type": "string"},
+                "after_pattern": {"type": "string"},
+                "before_pattern": {"type": "string"},
+                "occurrence": {"type": "integer", "default": 1},
+                "change_id": {"type": "string"},
+                "dry_run": {"type": "boolean", "default": False},
+                "position": {"type": "string", "enum": ["top", "bottom"]},
+                "auto_indent": {"type": "boolean", "default": True},
+                "use_regex": {"type": "boolean", "default": False},
+            },
+            "required": ["file_path", "content"],
+        },
+    },
+}
+
 
 def _execute_insert_block(
     coder,
@@ -187,6 +211,8 @@ def _execute_insert_block(
             change_id,
         )
 
+        coder.files_edited_by_tools.add(rel_path)
+
         # 9. Format and return result
         if position:
             success_message = f"Inserted block {pattern_type} {file_path}"

aider/tools/list_changes.py

@@ -1,6 +1,21 @@
 import traceback
 from datetime import datetime
 
+list_changes_schema = {
+    "type": "function",
+    "function": {
+        "name": "ListChanges",
+        "description": "List recent changes made.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {"type": "string"},
+                "limit": {"type": "integer", "default": 10},
+            },
+        },
+    },
+}
+
 
 def _execute_list_changes(coder, file_path=None, limit=10):
     """

aider/tools/ls.py

@@ -1,7 +1,30 @@
 import os
 
+ls_schema = {
+    "type": "function",
+    "function": {
+        "name": "Ls",
+        "description": "List files in a directory.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "directory": {
+                    "type": "string",
+                    "description": "The directory to list.",
+                },
+            },
+            "required": ["directory"],
+        },
+    },
+}
 
-def execute_ls(coder, dir_path):
+
+def execute_ls(coder, dir_path=None, directory=None):
+    # Handle both positional and keyword arguments for backward compatibility
+    if dir_path is None and directory is not None:
+        dir_path = directory
+    elif dir_path is None:
+        return "Error: Missing directory parameter"
     """
     List files in directory and optionally add some to context.
 

aider/tools/make_editable.py

@@ -1,5 +1,23 @@
 import os
 
+make_editable_schema = {
+    "type": "function",
+    "function": {
+        "name": "MakeEditable",
+        "description": "Make a read-only file editable.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {
+                    "type": "string",
+                    "description": "The path to the file to make editable.",
+                },
+            },
+            "required": ["file_path"],
+        },
+    },
+}
+
 
 # Keep the underscore prefix as this function is primarily for internal coder use
 def _execute_make_editable(coder, file_path):

aider/tools/make_readonly.py

@@ -1,3 +1,22 @@
+make_readonly_schema = {
+    "type": "function",
+    "function": {
+        "name": "MakeReadonly",
+        "description": "Make an editable file read-only.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {
+                    "type": "string",
+                    "description": "The path to the file to make read-only.",
+                },
+            },
+            "required": ["file_path"],
+        },
+    },
+}
+
+
 def _execute_make_readonly(coder, file_path):
     """
     Convert an editable file to a read-only file.

aider/tools/remove.py

@@ -1,5 +1,27 @@
 import time
 
+remove_schema = {
+    "type": "function",
+    "function": {
+        "name": "Remove",
+        "description": (
+            "Remove a file from the chat context. Should be used proactively to keep con"
+            "Should be used after editing a file when all edits are done "
+            "and the file is no longer necessary in context."
+        ),
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {
+                    "type": "string",
+                    "description": "The path to the file to remove.",
+                },
+            },
+            "required": ["file_path"],
+        },
+    },
+}
+
 
 def _execute_remove(coder, file_path):
     """

aider/tools/replace_all.py

@@ -7,6 +7,25 @@ from .tool_utils import (
     validate_file_for_edit,
 )
 
+replace_all_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"],
+        },
+    },
+}
+
 
 def _execute_replace_all(coder, file_path, find_text, replace_text, change_id=None, dry_run=False):
     """
@@ -63,6 +82,8 @@ def _execute_replace_all(coder, file_path, find_text, replace_text, change_id=No
             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(

aider/tools/replace_line.py

@@ -1,6 +1,25 @@
 import os
 import traceback
 
+replace_line_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"],
+        },
+    },
+}
+
 
 def _execute_replace_line(
     coder, file_path, line_number, new_content, change_id=None, dry_run=False
@@ -112,7 +131,7 @@ def _execute_replace_line(
             coder.io.tool_error(f"Error tracking change for ReplaceLine: {track_e}")
             change_id = "TRACKING_FAILED"
 
-        coder.aider_edited_files.add(rel_path)
+        coder.files_edited_by_tools.add(rel_path)
 
         # Improve feedback
         coder.io.tool_output(

aider/tools/replace_lines.py

@@ -8,6 +8,26 @@ from .tool_utils import (
     handle_tool_error,
 )
 
+replace_lines_schema = {
+    "type": "function",
+    "function": {
+        "name": "ReplaceLines",
+        "description": "Replace a range of lines in a file.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {"type": "string"},
+                "start_line": {"type": "integer"},
+                "end_line": {"type": "integer"},
+                "new_content": {"type": "string"},
+                "change_id": {"type": "string"},
+                "dry_run": {"type": "boolean", "default": False},
+            },
+            "required": ["file_path", "start_line", "end_line", "new_content"],
+        },
+    },
+}
+
 
 def _execute_replace_lines(
     coder, file_path, start_line, end_line, new_content, change_id=None, dry_run=False
@@ -139,7 +159,7 @@ def _execute_replace_lines(
             change_id,
         )
 
-        coder.aider_edited_files.add(rel_path)
+        coder.files_edited_by_tools.add(rel_path)
         replaced_count = end_line - start_line + 1
         new_count = len(new_lines)
 

aider/tools/replace_text.py

@@ -7,6 +7,27 @@ from .tool_utils import (
     validate_file_for_edit,
 )
 
+replace_text_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"],
+        },
+    },
+}
+
 
 def _execute_replace_text(
     coder,
@@ -111,6 +132,7 @@ def _execute_replace_text(
             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(

aider/tools/show_numbered_context.py

@@ -2,6 +2,24 @@ import os
 
 from .tool_utils import ToolError, handle_tool_error, resolve_paths
 
+show_numbered_context_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"],
+        },
+    },
+}
+
 
 def execute_show_numbered_context(
     coder, file_path, pattern=None, line_number=None, context_lines=3

aider/tools/undo_change.py

@@ -1,5 +1,20 @@
 import traceback
 
+undo_change_schema = {
+    "type": "function",
+    "function": {
+        "name": "UndoChange",
+        "description": "Undo a previously applied change.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "change_id": {"type": "string"},
+                "file_path": {"type": "string"},
+            },
+        },
+    },
+}
+
 
 def _execute_undo_change(coder, change_id=None, file_path=None):
     """