mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-30 01:04:59 +00:00
a8acca9366
# Context:
USER: add a --dry-run arg, no env, default false. pass it into Coder and set self.dry_run
ASSISTANT: I will add a `--dry-run` argument to the `main.py` file and pass it to the `Coder` class. Then, I will set the `self.dry_run` attribute in the `Coder` class.
Here are the changes:
```python
aider/main.py
<<<<<<< ORIGINAL
parser.add_argument(
"--show-diffs",
action="store_true",
help=f"Show diffs when committing changes (default: False, ${env_prefix}SHOW_DIFFS)",
default=bool(int(os.environ.get(f"{env_prefix}SHOW_DIFFS", 0))),
)
=======
parser.add_argument(
"--dry-run",
action="store_true",
help="Perform a dry run without applying changes (default: False)",
default=False,
)
parser.add_argument(
"--show-diffs",
action="store_true",
help=f"Show diffs when committing changes (default: False, ${env_prefix}SHOW_DIFFS)",
default=bool(int(os.environ.get(f"{env_prefix}SHOW_DIFFS", 0))),
)
>>>>>>> UPDATED
```
```python
aider/main.py
<<<<<<< ORIGINAL
io = InputOutput(
args.pretty,
args.yes,
args.input_history_file,
args.chat_history_file,
input=input,
output=output,
)
coder = Coder(
args.model,
fnames,
pretty,
args.show_diffs,
args.auto_commits,
io,
)
=======
io = InputOutput(
args.pretty,
args.yes,
args.input_history_file,
args.chat_history_file,
input=input,
output=output,
)
coder = Coder(
args.model,
fnames,
pretty,
args.show_diffs,
args.auto_commits,
io,
args.dry_run,
)
>>>>>>> UPDATED
```
```python
aider/coder.py
<<<<<<< ORIGINAL
def __init__(self, main_model, fnames, pretty, show_diffs, auto_commits, io):
self.abs_fnames = set()
self.io = io
self.auto_commits = auto_commits
=======
def __init__(self, main_model, fnames, pretty, show_diffs, auto_commits, io, dry_run):
self.abs_fnames = set()
self.io = io
self.auto_commits = auto_commits
self.dry_run = dry_run
>>>>>>> UPDATED
```
Please review the changes and let me know if you need any further modifications.
578 lines
18 KiB
Python
Executable file
578 lines
18 KiB
Python
Executable file
#!/usr/bin/env python
|
|
|
|
import os
|
|
import sys
|
|
import traceback
|
|
import time
|
|
from openai.error import RateLimitError
|
|
|
|
from rich.console import Console
|
|
from rich.live import Live
|
|
from rich.markdown import Markdown
|
|
from pathlib import Path
|
|
|
|
import git
|
|
import openai
|
|
|
|
# from aider.dump import dump
|
|
from aider import utils
|
|
from aider import prompts
|
|
from aider.commands import Commands
|
|
|
|
openai.api_key = os.getenv("OPENAI_API_KEY")
|
|
|
|
|
|
class Coder:
|
|
abs_fnames = None
|
|
repo = None
|
|
last_aider_commit_hash = None
|
|
last_asked_for_commit_time = 0
|
|
|
|
def __init__(self, main_model, fnames, pretty, show_diffs, auto_commits, io, dry_run):
|
|
self.abs_fnames = set()
|
|
|
|
self.io = io
|
|
|
|
self.auto_commits = auto_commits
|
|
self.dry_run = dry_run
|
|
|
|
if pretty:
|
|
self.console = Console()
|
|
else:
|
|
self.console = Console(force_terminal=True, no_color=True)
|
|
|
|
self.commands = Commands(self.io, self)
|
|
self.main_model = main_model
|
|
if main_model == "gpt-3.5-turbo":
|
|
self.io.tool_error(
|
|
f"Aider doesn't work well with {main_model}, use gpt-4 for best results."
|
|
)
|
|
|
|
self.set_repo(fnames)
|
|
|
|
if not self.repo:
|
|
self.io.tool_error("No suitable git repo, will not automatically commit edits.")
|
|
self.find_common_root()
|
|
|
|
self.pretty = pretty
|
|
self.show_diffs = show_diffs
|
|
|
|
def find_common_root(self):
|
|
if self.abs_fnames:
|
|
common_prefix = os.path.commonpath(list(self.abs_fnames))
|
|
self.root = os.path.dirname(common_prefix)
|
|
else:
|
|
self.root = os.getcwd()
|
|
|
|
self.io.tool(f"Common root directory: {self.root}")
|
|
|
|
def set_repo(self, cmd_line_fnames):
|
|
if not cmd_line_fnames:
|
|
cmd_line_fnames = ["."]
|
|
|
|
repo_paths = []
|
|
for fname in cmd_line_fnames:
|
|
fname = Path(fname)
|
|
if not fname.exists():
|
|
self.io.tool(f"Creating empty file {fname}")
|
|
fname.parent.mkdir(parents=True, exist_ok=True)
|
|
fname.touch()
|
|
|
|
try:
|
|
repo_path = git.Repo(fname, search_parent_directories=True).git_dir
|
|
repo_paths.append(repo_path)
|
|
except git.exc.InvalidGitRepositoryError:
|
|
pass
|
|
|
|
if fname.is_dir():
|
|
continue
|
|
|
|
self.io.tool(f"Added {fname} to the chat")
|
|
|
|
fname = fname.resolve()
|
|
self.abs_fnames.add(str(fname))
|
|
|
|
num_repos = len(set(repo_paths))
|
|
|
|
if num_repos == 0:
|
|
self.io.tool_error("Files are not in a git repo.")
|
|
return
|
|
if num_repos > 1:
|
|
self.io.tool_error("Files are in different git repos.")
|
|
return
|
|
|
|
# https://github.com/gitpython-developers/GitPython/issues/427
|
|
repo = git.Repo(repo_paths.pop(), odbt=git.GitDB)
|
|
|
|
self.root = repo.working_tree_dir
|
|
|
|
new_files = []
|
|
for fname in self.abs_fnames:
|
|
relative_fname = self.get_rel_fname(fname)
|
|
tracked_files = set(repo.git.ls_files().splitlines())
|
|
if relative_fname not in tracked_files:
|
|
new_files.append(relative_fname)
|
|
|
|
if new_files:
|
|
rel_repo_dir = os.path.relpath(repo.git_dir, os.getcwd())
|
|
|
|
self.io.tool(f"Files not tracked in {rel_repo_dir}:")
|
|
for fn in new_files:
|
|
self.io.tool(f" - {fn}")
|
|
if self.io.confirm_ask("Add them?"):
|
|
for relative_fname in new_files:
|
|
repo.git.add(relative_fname)
|
|
self.io.tool(f"Added {relative_fname} to the git repo")
|
|
show_files = ", ".join(new_files)
|
|
commit_message = f"Added new files to the git repo: {show_files}"
|
|
repo.git.commit("-m", commit_message, "--no-verify")
|
|
commit_hash = repo.head.commit.hexsha[:7]
|
|
self.io.tool(f"Commit {commit_hash} {commit_message}")
|
|
else:
|
|
self.io.tool_error("Skipped adding new files to the git repo.")
|
|
return
|
|
|
|
self.repo = repo
|
|
|
|
def get_files_content(self, fnames=None):
|
|
if not fnames:
|
|
fnames = self.abs_fnames
|
|
|
|
prompt = ""
|
|
for fname in fnames:
|
|
relative_fname = self.get_rel_fname(fname)
|
|
prompt += utils.quoted_file(fname, relative_fname)
|
|
return prompt
|
|
|
|
def get_files_messages(self):
|
|
files_content = prompts.files_content_prefix
|
|
files_content += self.get_files_content()
|
|
|
|
all_content = files_content
|
|
|
|
if self.repo is not None:
|
|
tracked_files = set(self.repo.git.ls_files().splitlines())
|
|
files_listing = "\n".join(tracked_files)
|
|
repo_content = prompts.repo_content_prefix
|
|
repo_content += files_listing
|
|
|
|
all_content = repo_content + "\n\n" + files_content
|
|
|
|
files_messages = [
|
|
dict(role="user", content=all_content),
|
|
dict(role="assistant", content="Ok."),
|
|
dict(
|
|
role="system",
|
|
content=prompts.files_content_suffix + prompts.system_reminder,
|
|
),
|
|
]
|
|
|
|
return files_messages
|
|
|
|
def run(self):
|
|
self.done_messages = []
|
|
self.cur_messages = []
|
|
|
|
self.num_control_c = 0
|
|
|
|
while True:
|
|
try:
|
|
new_user_message = self.run_loop()
|
|
while new_user_message:
|
|
new_user_message = self.send_new_user_message(new_user_message)
|
|
|
|
except KeyboardInterrupt:
|
|
self.num_control_c += 1
|
|
if self.num_control_c >= 2:
|
|
break
|
|
self.io.tool_error("^C again to quit")
|
|
except EOFError:
|
|
return
|
|
|
|
def should_auto_commit(self, inp):
|
|
is_commit_command = inp and inp.startswith("/commit")
|
|
|
|
if not self.auto_commits:
|
|
return
|
|
if not self.repo:
|
|
return
|
|
if not self.repo.is_dirty():
|
|
return
|
|
if is_commit_command:
|
|
return
|
|
if self.last_asked_for_commit_time >= self.get_last_modified():
|
|
return
|
|
return True
|
|
|
|
def run_loop(self):
|
|
inp = self.io.get_input(self.abs_fnames, self.commands)
|
|
|
|
self.num_control_c = 0
|
|
|
|
if self.should_auto_commit(inp):
|
|
self.commit(ask=True, which="repo_files")
|
|
|
|
# files changed, move cur messages back behind the files messages
|
|
self.done_messages += self.cur_messages
|
|
self.done_messages += [
|
|
dict(role="user", content=prompts.files_content_local_edits),
|
|
dict(role="assistant", content="Ok."),
|
|
]
|
|
self.cur_messages = []
|
|
|
|
if not inp:
|
|
return
|
|
|
|
if inp.startswith("/"):
|
|
return self.commands.run(inp)
|
|
|
|
return self.send_new_user_message(inp)
|
|
|
|
def send_new_user_message(self, inp):
|
|
self.cur_messages += [
|
|
dict(role="user", content=inp),
|
|
]
|
|
|
|
messages = [
|
|
dict(role="system", content=prompts.main_system + prompts.system_reminder),
|
|
]
|
|
messages += self.done_messages
|
|
messages += self.get_files_messages()
|
|
messages += self.cur_messages
|
|
|
|
# utils.show_messages(messages, "all")
|
|
|
|
content, interrupted = self.send(messages)
|
|
if interrupted:
|
|
self.io.tool_error("\n\n^C KeyboardInterrupt")
|
|
content += "\n^C KeyboardInterrupt"
|
|
|
|
self.cur_messages += [
|
|
dict(role="assistant", content=content),
|
|
]
|
|
|
|
self.io.tool()
|
|
if interrupted:
|
|
return
|
|
|
|
try:
|
|
edited = self.update_files(content, inp)
|
|
except ValueError as err:
|
|
err = err.args[0]
|
|
self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...")
|
|
self.io.tool_error(str(err))
|
|
return err
|
|
|
|
except Exception as err:
|
|
print(err)
|
|
print()
|
|
traceback.print_exc()
|
|
edited = None
|
|
|
|
if edited and self.auto_commits:
|
|
self.auto_commit()
|
|
|
|
add_rel_files_message = self.check_for_file_mentions(content)
|
|
if add_rel_files_message:
|
|
return add_rel_files_message
|
|
|
|
def auto_commit(self):
|
|
res = self.commit(history=self.cur_messages, prefix="aider: ")
|
|
if res:
|
|
commit_hash, commit_message = res
|
|
self.last_aider_commit_hash = commit_hash
|
|
|
|
saved_message = prompts.files_content_gpt_edits.format(
|
|
hash=commit_hash,
|
|
message=commit_message,
|
|
)
|
|
else:
|
|
# TODO: if not self.repo then the files_content_gpt_no_edits isn't appropriate
|
|
self.io.tool_error("Warning: no changes found in tracked files.")
|
|
saved_message = prompts.files_content_gpt_no_edits
|
|
|
|
self.done_messages += self.cur_messages
|
|
self.done_messages += [
|
|
dict(role="user", content=saved_message),
|
|
dict(role="assistant", content="Ok."),
|
|
]
|
|
self.cur_messages = []
|
|
return
|
|
|
|
def check_for_file_mentions(self, content):
|
|
words = set(word for word in content.split())
|
|
|
|
# drop sentence punctuation from the end
|
|
words = set(word.rstrip(",.!;") for word in words)
|
|
|
|
# strip away all kinds of quotes
|
|
quotes = "".join(['"', "'", "`"])
|
|
words = set(word.strip(quotes) for word in words)
|
|
|
|
addable_rel_fnames = set(self.get_all_relative_files()) - set(
|
|
self.get_inchat_relative_files()
|
|
)
|
|
|
|
mentioned_rel_fnames = set()
|
|
for word in words:
|
|
if word in addable_rel_fnames:
|
|
mentioned_rel_fnames.add(word)
|
|
|
|
if not mentioned_rel_fnames:
|
|
return
|
|
|
|
for rel_fname in mentioned_rel_fnames:
|
|
self.io.tool(rel_fname)
|
|
|
|
if not self.io.confirm_ask("Add these files to the chat?"):
|
|
return
|
|
|
|
for rel_fname in mentioned_rel_fnames:
|
|
self.abs_fnames.add(os.path.abspath(os.path.join(self.root, rel_fname)))
|
|
|
|
return prompts.added_files.format(fnames=", ".join(mentioned_rel_fnames))
|
|
|
|
def send(self, messages, model=None, silent=False):
|
|
if not model:
|
|
model = self.main_model
|
|
|
|
self.resp = ""
|
|
interrupted = False
|
|
try:
|
|
while True:
|
|
try:
|
|
completion = openai.ChatCompletion.create(
|
|
model=model,
|
|
messages=messages,
|
|
temperature=0,
|
|
stream=True,
|
|
)
|
|
break
|
|
except RateLimitError:
|
|
retry_after = 1
|
|
# print(f"Rate limit exceeded. Retrying in {retry_after} seconds.")
|
|
time.sleep(retry_after)
|
|
|
|
self.show_send_output(completion, silent)
|
|
except KeyboardInterrupt:
|
|
interrupted = True
|
|
|
|
if not silent:
|
|
self.io.ai_output(self.resp)
|
|
|
|
return self.resp, interrupted
|
|
|
|
def show_send_output(self, completion, silent):
|
|
live = None
|
|
if self.pretty and not silent:
|
|
live = Live(vertical_overflow="scroll")
|
|
|
|
try:
|
|
if live:
|
|
live.start()
|
|
|
|
for chunk in completion:
|
|
if chunk.choices[0].finish_reason not in (None, "stop"):
|
|
assert False, "Exceeded context window!"
|
|
|
|
try:
|
|
text = chunk.choices[0].delta.content
|
|
self.resp += text
|
|
except AttributeError:
|
|
continue
|
|
|
|
if silent:
|
|
continue
|
|
|
|
if self.pretty:
|
|
md = Markdown(self.resp, style="blue", code_theme="default")
|
|
live.update(md)
|
|
else:
|
|
sys.stdout.write(text)
|
|
sys.stdout.flush()
|
|
finally:
|
|
if live:
|
|
live.stop()
|
|
|
|
def update_files(self, content, inp):
|
|
# might raise ValueError for malformed ORIG/UPD blocks
|
|
edits = list(utils.find_original_update_blocks(content))
|
|
|
|
edited = set()
|
|
for path, original, updated in edits:
|
|
full_path = os.path.abspath(os.path.join(self.root, path))
|
|
|
|
if full_path not in self.abs_fnames:
|
|
if not Path(full_path).exists():
|
|
question = f"Allow creation of new file {path}?" # noqa: E501
|
|
else:
|
|
question = (
|
|
f"Allow edits to {path} which was not previously provided?" # noqa: E501
|
|
)
|
|
if not self.io.confirm_ask(question):
|
|
self.io.tool_error(f"Skipping edit to {path}")
|
|
continue
|
|
|
|
if not Path(full_path).exists():
|
|
Path(full_path).parent.mkdir(parents=True, exist_ok=True)
|
|
Path(full_path).touch()
|
|
|
|
self.abs_fnames.add(full_path)
|
|
|
|
# Check if the file is already in the repo
|
|
if self.repo:
|
|
tracked_files = set(self.repo.git.ls_files().splitlines())
|
|
relative_fname = self.get_rel_fname(full_path)
|
|
if relative_fname not in tracked_files and self.io.confirm_ask(
|
|
f"Add {path} to git?"
|
|
):
|
|
self.repo.git.add(full_path)
|
|
|
|
edited.add(path)
|
|
if utils.do_replace(full_path, original, updated):
|
|
self.io.tool(f"Applied edit to {path}")
|
|
else:
|
|
self.io.tool_error(f"Failed to apply edit to {path}")
|
|
|
|
return edited
|
|
|
|
def get_context_from_history(self, history):
|
|
context = ""
|
|
if history:
|
|
context += "# Context:\n"
|
|
for msg in history:
|
|
context += msg["role"].upper() + ": " + msg["content"] + "\n"
|
|
return context
|
|
|
|
def get_commit_message(self, diffs, context):
|
|
diffs = "# Diffs:\n" + diffs
|
|
|
|
messages = [
|
|
dict(role="system", content=prompts.commit_system),
|
|
dict(role="user", content=context + diffs),
|
|
]
|
|
|
|
commit_message, interrupted = self.send(
|
|
messages,
|
|
model="gpt-3.5-turbo",
|
|
silent=True,
|
|
)
|
|
|
|
commit_message = commit_message.strip().strip('"').strip()
|
|
|
|
if interrupted:
|
|
self.io.tool_error(
|
|
"Unable to get commit message from gpt-3.5-turbo. Use /commit to try again."
|
|
)
|
|
return
|
|
|
|
return commit_message
|
|
|
|
def commit(self, history=None, prefix=None, ask=False, message=None, which="chat_files"):
|
|
repo = self.repo
|
|
if not repo:
|
|
return
|
|
|
|
if not repo.is_dirty():
|
|
return
|
|
|
|
def get_dirty_files_and_diffs(file_list):
|
|
diffs = ""
|
|
relative_dirty_files = []
|
|
for fname in file_list:
|
|
relative_fname = self.get_rel_fname(fname)
|
|
relative_dirty_files.append(relative_fname)
|
|
|
|
try:
|
|
current_branch_commit_count = len(list(repo.iter_commits(repo.active_branch)))
|
|
except git.exc.GitCommandError:
|
|
current_branch_commit_count = None
|
|
|
|
if not current_branch_commit_count:
|
|
continue
|
|
|
|
if self.pretty:
|
|
these_diffs = repo.git.diff("HEAD", "--color", "--", relative_fname)
|
|
else:
|
|
these_diffs = repo.git.diff("HEAD", relative_fname)
|
|
|
|
if these_diffs:
|
|
diffs += these_diffs + "\n"
|
|
|
|
return relative_dirty_files, diffs
|
|
|
|
if which == "repo_files":
|
|
all_files = [os.path.join(self.root, f) for f in self.get_all_relative_files()]
|
|
relative_dirty_fnames, diffs = get_dirty_files_and_diffs(all_files)
|
|
elif which == "chat_files":
|
|
relative_dirty_fnames, diffs = get_dirty_files_and_diffs(self.abs_fnames)
|
|
else:
|
|
raise ValueError(f"Invalid value for 'which': {which}")
|
|
|
|
if self.show_diffs or ask:
|
|
# don't use io.tool() because we don't want to log or further colorize
|
|
print(diffs)
|
|
|
|
context = self.get_context_from_history(history)
|
|
if message:
|
|
commit_message = message
|
|
else:
|
|
commit_message = self.get_commit_message(diffs, context)
|
|
|
|
if prefix:
|
|
commit_message = prefix + commit_message
|
|
|
|
if ask:
|
|
if which == "repo_files":
|
|
self.io.tool("Git repo has uncommitted changes.")
|
|
else:
|
|
self.io.tool("Files have uncommitted changes.")
|
|
|
|
res = self.io.prompt_ask(
|
|
"Commit before the chat proceeds [y/n/commit message]?",
|
|
default=commit_message,
|
|
).strip()
|
|
self.last_asked_for_commit_time = self.get_last_modified()
|
|
|
|
self.io.tool()
|
|
|
|
if res.lower() in ["n", "no"]:
|
|
self.io.tool_error("Skipped commmit.")
|
|
return
|
|
if res.lower() not in ["y", "yes"] and res:
|
|
commit_message = res
|
|
|
|
repo.git.add(*relative_dirty_fnames)
|
|
|
|
full_commit_message = commit_message + "\n\n" + context
|
|
repo.git.commit("-m", full_commit_message, "--no-verify")
|
|
commit_hash = repo.head.commit.hexsha[:7]
|
|
self.io.tool(f"Commit {commit_hash} {commit_message}")
|
|
|
|
return commit_hash, commit_message
|
|
|
|
def get_rel_fname(self, fname):
|
|
return os.path.relpath(fname, self.root)
|
|
|
|
def get_inchat_relative_files(self):
|
|
files = [self.get_rel_fname(fname) for fname in self.abs_fnames]
|
|
return sorted(set(files))
|
|
|
|
def get_all_relative_files(self):
|
|
if self.repo:
|
|
files = self.repo.git.ls_files().splitlines()
|
|
else:
|
|
files = self.get_inchat_relative_files()
|
|
|
|
return sorted(set(files))
|
|
|
|
def get_all_abs_files(self):
|
|
files = self.get_all_relative_files()
|
|
files = [os.path.abspath(os.path.join(self.root, path)) for path in files]
|
|
return files
|
|
|
|
def get_last_modified(self):
|
|
files = self.get_all_abs_files()
|
|
if not files:
|
|
return 0
|
|
return max(Path(path).stat().st_mtime for path in files)
|