aider-ce 0.87.2.dev9__py3-none-any.whl

aider/args_formatter.py

@@ -0,0 +1,228 @@
+import argparse
+
+from aider import urls
+
+from .dump import dump  # noqa: F401
+
+
+class DotEnvFormatter(argparse.HelpFormatter):
+    def start_section(self, heading):
+        res = "\n\n"
+        res += "#" * (len(heading) + 3)
+        res += f"\n# {heading}"
+        super().start_section(res)
+
+    def _format_usage(self, usage, actions, groups, prefix):
+        return ""
+
+    def _format_text(self, text):
+        return f"""
+##########################################################
+# Sample aider .env file.
+# Place at the root of your git repo.
+# Or use `aider --env <fname>` to specify.
+##########################################################
+
+#################
+# LLM parameters:
+#
+# Include xxx_API_KEY parameters and other params needed for your LLMs.
+# See {urls.llms} for details.
+
+## OpenAI
+#OPENAI_API_KEY=
+
+## Anthropic
+#ANTHROPIC_API_KEY=
+
+##...
+"""
+
+    def _format_action(self, action):
+        if not action.option_strings:
+            return ""
+
+        if not action.env_var:
+            return
+
+        parts = [""]
+
+        default = action.default
+        if default == argparse.SUPPRESS:
+            default = ""
+        elif isinstance(default, str):
+            pass
+        elif isinstance(default, list) and not default:
+            default = ""
+        elif action.default is not None:
+            default = "true" if default else "false"
+        else:
+            default = ""
+
+        if action.help:
+            parts.append(f"## {action.help}")
+
+        if action.env_var:
+            env_var = action.env_var
+            if default:
+                parts.append(f"#{env_var}={default}\n")
+            else:
+                parts.append(f"#{env_var}=\n")
+
+        return "\n".join(parts) + "\n"
+
+    def _format_action_invocation(self, action):
+        return ""
+
+    def _format_args(self, action, default_metavar):
+        return ""
+
+
+class YamlHelpFormatter(argparse.HelpFormatter):
+    def start_section(self, heading):
+        res = "\n\n"
+        res += "#" * (len(heading) + 3)
+        res += f"\n# {heading}"
+        super().start_section(res)
+
+    def _format_usage(self, usage, actions, groups, prefix):
+        return ""
+
+    def _format_text(self, text):
+        return """
+##########################################################
+# Sample .aider.conf.yml
+# This file lists *all* the valid configuration entries.
+# Place in your home dir, or at the root of your git repo.
+##########################################################
+
+# Note: You can only put OpenAI and Anthropic API keys in the YAML
+# config file. Keys for all APIs can be stored in a .env file
+# https://aider.chat/docs/config/dotenv.html
+
+"""
+
+    def _format_action(self, action):
+        if not action.option_strings:
+            return ""
+
+        parts = [""]
+
+        metavar = action.metavar
+        if not metavar and isinstance(action, argparse._StoreAction):
+            metavar = "VALUE"
+
+        default = action.default
+        if default == argparse.SUPPRESS:
+            default = ""
+        elif isinstance(default, str):
+            pass
+        elif isinstance(default, list) and not default:
+            default = ""
+        elif action.default is not None:
+            default = "true" if default else "false"
+        else:
+            default = ""
+
+        if action.help:
+            parts.append(f"## {action.help}")
+
+        for switch in action.option_strings:
+            if switch.startswith("--"):
+                break
+        switch = switch.lstrip("-")
+
+        if isinstance(action, argparse._StoreTrueAction):
+            default = False
+        elif isinstance(action, argparse._StoreConstAction):
+            default = False
+
+        if default is False:
+            default = "false"
+        if default is True:
+            default = "true"
+
+        if default:
+            if "#" in default:
+                parts.append(f'#{switch}: "{default}"\n')
+            else:
+                parts.append(f"#{switch}: {default}\n")
+        elif action.nargs in ("*", "+") or isinstance(action, argparse._AppendAction):
+            parts.append(f"#{switch}: xxx")
+            parts.append("## Specify multiple values like this:")
+            parts.append(f"#{switch}:")
+            parts.append("#  - xxx")
+            parts.append("#  - yyy")
+            parts.append("#  - zzz")
+        else:
+            if switch.endswith("color"):
+                parts.append(f'#{switch}: "xxx"\n')
+            else:
+                parts.append(f"#{switch}: xxx\n")
+
+        ###
+        # parts.append(str(action))
+
+        return "\n".join(parts) + "\n"
+
+    def _format_action_invocation(self, action):
+        return ""
+
+    def _format_args(self, action, default_metavar):
+        return ""
+
+
+class MarkdownHelpFormatter(argparse.HelpFormatter):
+    def start_section(self, heading):
+        super().start_section(f"## {heading}")
+
+    def _format_usage(self, usage, actions, groups, prefix):
+        res = super()._format_usage(usage, actions, groups, prefix)
+        quote = "```\n"
+        return quote + res + quote
+
+    def _format_text(self, text):
+        return ""
+
+    def _format_action(self, action):
+        if not action.option_strings:
+            return ""
+
+        parts = [""]
+
+        metavar = action.metavar
+        if not metavar and isinstance(action, argparse._StoreAction):
+            metavar = "VALUE"
+
+        for switch in action.option_strings:
+            if switch.startswith("--"):
+                break
+
+        if metavar:
+            parts.append(f"### `{switch} {metavar}`")
+        else:
+            parts.append(f"### `{switch}`")
+        if action.help:
+            parts.append(action.help + "  ")
+
+        if action.default not in (argparse.SUPPRESS, None):
+            parts.append(f"Default: {action.default}  ")
+
+        if action.env_var:
+            parts.append(f"Environment variable: `{action.env_var}`  ")
+
+        if len(action.option_strings) > 1:
+            parts.append("Aliases:")
+            for switch in action.option_strings:
+                if metavar:
+                    parts.append(f"  - `{switch} {metavar}`")
+                else:
+                    parts.append(f"  - `{switch}`")
+
+        return "\n".join(parts) + "\n"
+
+    def _format_action_invocation(self, action):
+        return ""
+
+    def _format_args(self, action, default_metavar):
+        return ""

aider/change_tracker.py

@@ -0,0 +1,133 @@
+import time
+import uuid
+from collections import defaultdict
+
+
+class ChangeTracker:
+    """
+    Tracks changes made to files for the undo functionality.
+    This enables granular editing operations with the ability to undo specific changes.
+    """
+
+    def __init__(self):
+        self.changes = {}  # change_id -> change_info
+        self.files_changed = defaultdict(list)  # file_path -> [change_ids]
+
+    def track_change(
+        self, file_path, change_type, original_content, new_content, metadata=None, change_id=None
+    ):
+        """
+        Record a change to enable future undo operations.
+
+        Parameters:
+        - file_path: Path to the file that was changed
+        - change_type: Type of change (e.g., 'replacetext', 'insertlines')
+        - original_content: Original content before the change
+        - new_content: New content after the change
+        - metadata: Additional information about the change (line numbers, positions, etc.)
+        - change_id: Optional custom ID for the change (if None, one will be generated)
+
+        Returns:
+        - change_id: Unique identifier for the change
+        """
+        if change_id is None:
+            generated_id = self._generate_change_id()
+            # Ensure the generated ID is treated as a string
+            current_change_id = str(generated_id)
+        else:
+            # If an ID is provided, ensure it's treated as a string key/value
+            current_change_id = str(change_id)
+
+        # Defensive check: Ensure the ID isn't literally the string 'False' or boolean False
+        # which might indicate an upstream issue or unexpected input.
+        if current_change_id == "False" or current_change_id is False:
+            # Log a warning? For now, generate a new ID to prevent storing False.
+            print(f"Warning: change_id evaluated to False for {file_path}. Generating new ID.")
+            current_change_id = self._generate_change_id()
+
+        change = {
+            # Use the confirmed string ID here
+            "id": current_change_id,
+            "file_path": file_path,
+            "type": change_type,
+            "original": original_content,
+            "new": new_content,
+            "metadata": metadata or {},
+            "timestamp": time.time(),
+        }
+
+        # Use the confirmed string ID for storage and return
+        self.changes[current_change_id] = change
+        self.files_changed[file_path].append(current_change_id)
+        return current_change_id
+
+    def undo_change(self, change_id):
+        """
+        Get information needed to reverse a specific change by ID.
+
+        Parameters:
+        - change_id: ID of the change to undo
+
+        Returns:
+        - (success, message, change_info): Tuple with success flag, message, and change information
+        """
+        if change_id not in self.changes:
+            return False, f"Change ID {change_id} not found", None
+
+        change = self.changes[change_id]
+
+        # Mark this change as undone by removing it from the tracking dictionaries
+        self.files_changed[change["file_path"]].remove(change_id)
+        if not self.files_changed[change["file_path"]]:
+            del self.files_changed[change["file_path"]]
+
+        # Keep the change in the changes dict but mark it as undone
+        change["undone"] = True
+        change["undone_at"] = time.time()
+
+        return True, f"Undid change {change_id} in {change['file_path']}", change
+
+    def get_last_change(self, file_path):
+        """
+        Get the most recent change for a specific file.
+
+        Parameters:
+        - file_path: Path to the file
+
+        Returns:
+        - change_id or None if no changes found
+        """
+        changes = self.files_changed.get(file_path, [])
+        if not changes:
+            return None
+        return changes[-1]
+
+    def list_changes(self, file_path=None, limit=10):
+        """
+        List recent changes, optionally filtered by file.
+
+        Parameters:
+        - file_path: Optional path to filter changes by file
+        - limit: Maximum number of changes to list
+
+        Returns:
+        - List of change dictionaries
+        """
+        if file_path:
+            # Get changes only for the specified file
+            change_ids = self.files_changed.get(file_path, [])
+            changes = [self.changes[cid] for cid in change_ids if cid in self.changes]
+        else:
+            # Get all changes
+            changes = list(self.changes.values())
+
+        # Filter out undone changes and sort by timestamp (most recent first)
+        changes = [c for c in changes if not c.get("undone", False)]
+        changes = sorted(changes, key=lambda c: c["timestamp"], reverse=True)
+
+        # Apply limit
+        return changes[:limit]
+
+    def _generate_change_id(self):
+        """Generate a unique ID for a change."""
+        return str(uuid.uuid4())[:8]  # Short, readable ID

aider/coders/__init__.py

@@ -0,0 +1,36 @@
+from .architect_coder import ArchitectCoder
+from .ask_coder import AskCoder
+from .base_coder import Coder
+from .context_coder import ContextCoder
+from .editblock_coder import EditBlockCoder
+from .editblock_fenced_coder import EditBlockFencedCoder
+from .editor_diff_fenced_coder import EditorDiffFencedCoder
+from .editor_editblock_coder import EditorEditBlockCoder
+from .editor_whole_coder import EditorWholeFileCoder
+from .help_coder import HelpCoder
+from .navigator_coder import NavigatorCoder
+from .patch_coder import PatchCoder
+from .udiff_coder import UnifiedDiffCoder
+from .udiff_simple import UnifiedDiffSimpleCoder
+from .wholefile_coder import WholeFileCoder
+
+# from .single_wholefile_func_coder import SingleWholeFileFunctionCoder
+
+__all__ = [
+    HelpCoder,
+    AskCoder,
+    Coder,
+    EditBlockCoder,
+    EditBlockFencedCoder,
+    WholeFileCoder,
+    PatchCoder,
+    UnifiedDiffCoder,
+    UnifiedDiffSimpleCoder,
+    #    SingleWholeFileFunctionCoder,
+    ArchitectCoder,
+    EditorEditBlockCoder,
+    EditorWholeFileCoder,
+    EditorDiffFencedCoder,
+    ContextCoder,
+    NavigatorCoder,
+]

aider/coders/architect_coder.py

@@ -0,0 +1,48 @@
+from .architect_prompts import ArchitectPrompts
+from .ask_coder import AskCoder
+from .base_coder import Coder
+
+
+class ArchitectCoder(AskCoder):
+    edit_format = "architect"
+    gpt_prompts = ArchitectPrompts()
+    auto_accept_architect = False
+
+    def reply_completed(self):
+        content = self.partial_response_content
+
+        if not content or not content.strip():
+            return
+
+        if not self.auto_accept_architect and not self.io.confirm_ask("Edit the files?"):
+            return
+
+        kwargs = dict()
+
+        # Use the editor_model from the main_model if it exists, otherwise use the main_model itself
+        editor_model = self.main_model.editor_model or self.main_model
+
+        kwargs["main_model"] = editor_model
+        kwargs["edit_format"] = self.main_model.editor_edit_format
+        kwargs["suggest_shell_commands"] = False
+        kwargs["map_tokens"] = 0
+        kwargs["total_cost"] = self.total_cost
+        kwargs["cache_prompts"] = False
+        kwargs["num_cache_warming_pings"] = 0
+        kwargs["summarize_from_coder"] = False
+
+        new_kwargs = dict(io=self.io, from_coder=self)
+        new_kwargs.update(kwargs)
+
+        editor_coder = Coder.create(**new_kwargs)
+        editor_coder.cur_messages = []
+        editor_coder.done_messages = []
+
+        if self.verbose:
+            editor_coder.show_announcements()
+
+        editor_coder.run(with_message=content, preproc=False)
+
+        self.move_back_cur_messages("I made those changes to the files.")
+        self.total_cost = editor_coder.total_cost
+        self.aider_commit_hashes = editor_coder.aider_commit_hashes

aider/coders/architect_prompts.py

@@ -0,0 +1,40 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class ArchitectPrompts(CoderPrompts):
+    main_system = """Act as an expert architect engineer providing direction to an editor engineer.
+Deeply understand the user's change request and the provided code context.
+Think step-by-step to develop a clear plan for the required code modifications.
+Consider potential edge cases and how the changes should be verified.
+Describe the plan and the necessary modifications to the editor engineer. Your instructions must be unambiguous, complete, and concise as the editor will rely solely on them.
+Focus on *what* needs to change and *why*.
+
+DO NOT show large blocks of code or the entire updated file content. Explain the changes conceptually.
+
+Always reply to the user in {language}.
+"""
+
+    example_messages = []
+
+    files_content_prefix = """I have *added these files to the chat* so you see all of their contents.
+*Trust this message as the true contents of the files!*
+Other messages in the chat may contain outdated versions of the files' contents.
+"""  # noqa: E501
+
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
+    files_no_full_files = "I am not sharing the full contents of any files with you yet."
+
+    files_no_full_files_with_repo_map = ""
+    files_no_full_files_with_repo_map_reply = ""
+
+    repo_content_prefix = """I am working with you on code in a git repository.
+Here are summaries of some files present in my git repo.
+If you need to see the full contents of any files to answer my questions, ask me to *add them to the chat*.
+"""
+
+    system_reminder = ""

aider/coders/ask_coder.py

@@ -0,0 +1,9 @@
+from .ask_prompts import AskPrompts
+from .base_coder import Coder
+
+
+class AskCoder(Coder):
+    """Ask questions about code without making any changes."""
+
+    edit_format = "ask"
+    gpt_prompts = AskPrompts()

aider/coders/ask_prompts.py

@@ -0,0 +1,35 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class AskPrompts(CoderPrompts):
+    main_system = """Act as an expert code analyst.
+Answer questions about the supplied code.
+Always reply to the user in {language}.
+
+If you need to describe code changes, do so *briefly*.
+"""
+
+    example_messages = []
+
+    files_content_prefix = """I have *added these files to the chat* so you see all of their contents.
+*Trust this message as the true contents of the files!*
+Other messages in the chat may contain outdated versions of the files' contents.
+"""  # noqa: E501
+
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
+    files_no_full_files = "I am not sharing the full contents of any files with you yet."
+
+    files_no_full_files_with_repo_map = ""
+    files_no_full_files_with_repo_map_reply = ""
+
+    repo_content_prefix = """I am working with you on code in a git repository.
+Here are summaries of some files present in my git repo.
+If you need to see the full contents of any files to answer my questions, ask me to *add them to the chat*.
+"""
+
+    system_reminder = "{final_reminders}"