import codecs import os import shutil import sys import tempfile from io import StringIO from pathlib import Path from unittest import TestCase import git from aider.coders import Coder from aider.commands import Commands from aider.dump import dump # noqa: F401 from aider.io import InputOutput from aider.models import Model from aider.utils import ChdirTemporaryDirectory, GitTemporaryDirectory, make_repo class TestCommands(TestCase): def setUp(self): self.original_cwd = os.getcwd() self.tempdir = tempfile.mkdtemp() os.chdir(self.tempdir) self.GPT35 = Model("gpt-3.5-turbo") def tearDown(self): os.chdir(self.original_cwd) shutil.rmtree(self.tempdir, ignore_errors=True) def test_cmd_add(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Call the cmd_add method with 'foo.txt' and 'bar.txt' as a single string commands.cmd_add("foo.txt bar.txt") # Check if both files have been created in the temporary directory self.assertTrue(os.path.exists("foo.txt")) self.assertTrue(os.path.exists("bar.txt")) def test_cmd_add_bad_glob(self): # https://github.com/paul-gauthier/aider/issues/293 io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) commands.cmd_add("**.txt") def test_cmd_add_with_glob_patterns(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Create some test files with open("test1.py", "w") as f: f.write("print('test1')") with open("test2.py", "w") as f: f.write("print('test2')") with open("test.txt", "w") as f: f.write("test") # Call the cmd_add method with a glob pattern commands.cmd_add("*.py") # Check if the Python files have been added to the chat session self.assertIn(str(Path("test1.py").resolve()), coder.abs_fnames) self.assertIn(str(Path("test2.py").resolve()), coder.abs_fnames) # Check if the text file has not been added to the chat session self.assertNotIn(str(Path("test.txt").resolve()), coder.abs_fnames) def test_cmd_add_no_match(self): # yes=False means we will *not* create the file when it is not found io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Call the cmd_add method with a non-existent file pattern commands.cmd_add("*.nonexistent") # Check if no files have been added to the chat session self.assertEqual(len(coder.abs_fnames), 0) def test_cmd_add_no_match_but_make_it(self): # yes=True means we *will* create the file when it is not found io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = Path("[abc].nonexistent") # Call the cmd_add method with a non-existent file pattern commands.cmd_add(str(fname)) # Check if no files have been added to the chat session self.assertEqual(len(coder.abs_fnames), 1) self.assertTrue(fname.exists()) def test_cmd_add_drop_directory(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Create a directory and add files to it using pathlib Path("test_dir").mkdir() Path("test_dir/another_dir").mkdir() Path("test_dir/test_file1.txt").write_text("Test file 1") Path("test_dir/test_file2.txt").write_text("Test file 2") Path("test_dir/another_dir/test_file.txt").write_text("Test file 3") # Call the cmd_add method with a directory commands.cmd_add("test_dir test_dir/test_file2.txt") # Check if the files have been added to the chat session self.assertIn(str(Path("test_dir/test_file1.txt").resolve()), coder.abs_fnames) self.assertIn(str(Path("test_dir/test_file2.txt").resolve()), coder.abs_fnames) self.assertIn(str(Path("test_dir/another_dir/test_file.txt").resolve()), coder.abs_fnames) commands.cmd_drop("test_dir/another_dir") self.assertIn(str(Path("test_dir/test_file1.txt").resolve()), coder.abs_fnames) self.assertIn(str(Path("test_dir/test_file2.txt").resolve()), coder.abs_fnames) self.assertNotIn( str(Path("test_dir/another_dir/test_file.txt").resolve()), coder.abs_fnames ) # Issue #139 /add problems when cwd != git_root # remember the proper abs path to this file abs_fname = str(Path("test_dir/another_dir/test_file.txt").resolve()) # chdir to someplace other than git_root Path("side_dir").mkdir() os.chdir("side_dir") # add it via it's git_root referenced name commands.cmd_add("test_dir/another_dir/test_file.txt") # it should be there, but was not in v0.10.0 self.assertIn(abs_fname, coder.abs_fnames) # drop it via it's git_root referenced name commands.cmd_drop("test_dir/another_dir/test_file.txt") # it should be there, but was not in v0.10.0 self.assertNotIn(abs_fname, coder.abs_fnames) def test_cmd_drop_with_glob_patterns(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) subdir = Path("subdir") subdir.mkdir() (subdir / "subtest1.py").touch() (subdir / "subtest2.py").touch() Path("test1.py").touch() Path("test2.py").touch() # Add some files to the chat session commands.cmd_add("*.py") self.assertEqual(len(coder.abs_fnames), 2) # Call the cmd_drop method with a glob pattern commands.cmd_drop("*2.py") self.assertIn(str(Path("test1.py").resolve()), coder.abs_fnames) self.assertNotIn(str(Path("test2.py").resolve()), coder.abs_fnames) def test_cmd_add_bad_encoding(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Create a new file foo.bad which will fail to decode as utf-8 with codecs.open("foo.bad", "w", encoding="iso-8859-15") as f: f.write("ÆØÅ") # Characters not present in utf-8 commands.cmd_add("foo.bad") self.assertEqual(coder.abs_fnames, set()) def test_cmd_git(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) with GitTemporaryDirectory() as tempdir: # Create a file in the temporary directory with open(f"{tempdir}/test.txt", "w") as f: f.write("test") coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # Run the cmd_git method with the arguments "commit -a -m msg" commands.cmd_git("add test.txt") commands.cmd_git("commit -a -m msg") # Check if the file has been committed to the repository repo = git.Repo(tempdir) files_in_repo = repo.git.ls_files() self.assertIn("test.txt", files_in_repo) def test_cmd_tokens(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) commands.cmd_add("foo.txt bar.txt") # Redirect the standard output to an instance of io.StringIO stdout = StringIO() sys.stdout = stdout commands.cmd_tokens("") # Reset the standard output sys.stdout = sys.__stdout__ # Get the console output console_output = stdout.getvalue() self.assertIn("foo.txt", console_output) self.assertIn("bar.txt", console_output) def test_cmd_add_from_subdir(self): repo = git.Repo.init() repo.config_writer().set_value("user", "name", "Test User").release() repo.config_writer().set_value("user", "email", "testuser@example.com").release() # Create three empty files and add them to the git repository filenames = ["one.py", Path("subdir") / "two.py", Path("anotherdir") / "three.py"] for filename in filenames: file_path = Path(filename) file_path.parent.mkdir(parents=True, exist_ok=True) file_path.touch() repo.git.add(str(file_path)) repo.git.commit("-m", "added") filenames = [str(Path(fn).resolve()) for fn in filenames] ### os.chdir("subdir") io = InputOutput(pretty=False, yes=True) coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # this should get added commands.cmd_add(str(Path("anotherdir") / "three.py")) # this should add one.py commands.cmd_add("*.py") self.assertIn(filenames[0], coder.abs_fnames) self.assertNotIn(filenames[1], coder.abs_fnames) self.assertIn(filenames[2], coder.abs_fnames) def test_cmd_add_from_subdir_again(self): with GitTemporaryDirectory(): io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) Path("side_dir").mkdir() os.chdir("side_dir") # add a file that is in the side_dir with open("temp.txt", "w"): pass # this was blowing up with GitCommandError, per: # https://github.com/paul-gauthier/aider/issues/201 commands.cmd_add("temp.txt") def test_cmd_commit(self): with GitTemporaryDirectory(): fname = "test.txt" with open(fname, "w") as f: f.write("test") repo = git.Repo() repo.git.add(fname) repo.git.commit("-m", "initial") io = InputOutput(pretty=False, yes=True) coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) self.assertFalse(repo.is_dirty()) with open(fname, "w") as f: f.write("new") self.assertTrue(repo.is_dirty()) commit_message = "Test commit message" commands.cmd_commit(commit_message) self.assertFalse(repo.is_dirty()) def test_cmd_add_from_outside_root(self): with ChdirTemporaryDirectory() as tmp_dname: root = Path("root") root.mkdir() os.chdir(str(root)) io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) outside_file = Path(tmp_dname) / "outside.txt" outside_file.touch() # This should not be allowed! # https://github.com/paul-gauthier/aider/issues/178 commands.cmd_add("../outside.txt") self.assertEqual(len(coder.abs_fnames), 0) def test_cmd_add_from_outside_git(self): with ChdirTemporaryDirectory() as tmp_dname: root = Path("root") root.mkdir() os.chdir(str(root)) make_repo() io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) outside_file = Path(tmp_dname) / "outside.txt" outside_file.touch() # This should not be allowed! # It was blowing up with GitCommandError, per: # https://github.com/paul-gauthier/aider/issues/178 commands.cmd_add("../outside.txt") self.assertEqual(len(coder.abs_fnames), 0) def test_cmd_add_filename_with_special_chars(self): with ChdirTemporaryDirectory(): io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = Path("with[brackets].txt") fname.touch() commands.cmd_add(str(fname)) self.assertIn(str(fname.resolve()), coder.abs_fnames) def test_cmd_add_dirname_with_special_chars(self): with ChdirTemporaryDirectory(): io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) dname = Path("with[brackets]") dname.mkdir() fname = dname / "filename.txt" fname.touch() commands.cmd_add(str(dname)) self.assertIn(str(fname.resolve()), coder.abs_fnames) def test_cmd_add_abs_filename(self): with ChdirTemporaryDirectory(): io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = Path("file.txt") fname.touch() commands.cmd_add(str(fname.resolve())) self.assertIn(str(fname.resolve()), coder.abs_fnames) def test_cmd_add_quoted_filename(self): with ChdirTemporaryDirectory(): io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = Path("file with spaces.txt") fname.touch() commands.cmd_add(f'"{fname}"') self.assertIn(str(fname.resolve()), coder.abs_fnames) def test_cmd_add_existing_with_dirty_repo(self): with GitTemporaryDirectory(): repo = git.Repo() files = ["one.txt", "two.txt"] for fname in files: Path(fname).touch() repo.git.add(fname) repo.git.commit("-m", "initial") commit = repo.head.commit.hexsha # leave a dirty `git rm` repo.git.rm("one.txt") io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) # There's no reason this /add should trigger a commit commands.cmd_add("two.txt") self.assertEqual(commit, repo.head.commit.hexsha) # Windows is throwing: # PermissionError: [WinError 32] The process cannot access # the file because it is being used by another process repo.git.commit("-m", "cleanup") del coder del commands del repo def test_cmd_add_unicode_error(self): # Initialize the Commands and InputOutput objects io = InputOutput(pretty=False, yes=True) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = "file.txt" encoding = "utf-16" some_content_which_will_error_if_read_with_encoding_utf8 = "ÅÍÎÏ".encode(encoding) with open(fname, "wb") as f: f.write(some_content_which_will_error_if_read_with_encoding_utf8) commands.cmd_add("file.txt") self.assertEqual(coder.abs_fnames, set()) def test_cmd_add_drop_untracked_files(self): with GitTemporaryDirectory(): repo = git.Repo() io = InputOutput(pretty=False, yes=False) from aider.coders import Coder coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) fname = Path("test.txt") fname.touch() self.assertEqual(len(coder.abs_fnames), 0) commands.cmd_add(str(fname)) files_in_repo = repo.git.ls_files() self.assertNotIn(str(fname), files_in_repo) self.assertEqual(len(coder.abs_fnames), 1) commands.cmd_drop(str(fname)) self.assertEqual(len(coder.abs_fnames), 0) def test_cmd_undo_with_dirty_files_not_in_last_commit(self): with GitTemporaryDirectory() as repo_dir: repo = git.Repo(repo_dir) io = InputOutput(pretty=False, yes=True) coder = Coder.create(self.GPT35, None, io) commands = Commands(io, coder) other_path = Path(repo_dir) / "other_file.txt" other_path.write_text("other content") repo.git.add(str(other_path)) # Create and commit a file filename = "test_file.txt" file_path = Path(repo_dir) / filename file_path.write_text("first content") repo.git.add(filename) repo.git.commit("-m", "first commit") file_path.write_text("second content") repo.git.add(filename) repo.git.commit("-m", "second commit") # Store the commit hash last_commit_hash = repo.head.commit.hexsha[:7] coder.aider_commit_hashes.add(last_commit_hash) file_path.write_text("dirty content") # Attempt to undo the last commit commands.cmd_undo("") # Check that the last commit is still present self.assertEqual(last_commit_hash, repo.head.commit.hexsha[:7]) # Put back the initial content (so it's not dirty now) file_path.write_text("second content") other_path.write_text("dirty content") commands.cmd_undo("") self.assertNotEqual(last_commit_hash, repo.head.commit.hexsha[:7]) self.assertEqual(file_path.read_text(), "first content") self.assertEqual(other_path.read_text(), "dirty content") del coder del commands del repo def test_cmd_add_aiderignored_file(self): with GitTemporaryDirectory(): repo = git.Repo() fname1 = "ignoreme1.txt" fname2 = "ignoreme2.txt" fname3 = "dir/ignoreme3.txt" Path(fname2).touch() repo.git.add(str(fname2)) repo.git.commit("-m", "initial") aignore = Path(".aiderignore") aignore.write_text(f"{fname1}\n{fname2}\ndir\n") io = InputOutput(yes=True) coder = Coder.create( self.GPT35, None, io, fnames=[fname1, fname2], aider_ignore_file=str(aignore) ) commands = Commands(io, coder) commands.cmd_add(f"{fname1} {fname2} {fname3}") self.assertNotIn(fname1, str(coder.abs_fnames)) self.assertNotIn(fname2, str(coder.abs_fnames)) self.assertNotIn(fname3, str(coder.abs_fnames))