dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 00:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updating args message for named config

Browse source
This commit is contained in:
sltptr 2025-05-16 18:36:04 -07:00
parent 1f3a8f493c
commit b49b95664f
2 changed files with 22 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/args.py
View file

@ -766,8 +766,8 @@ def get_parser(default_config_files, git_root):
is_config_file=True, is_config_file=True,
metavar="CONFIG_FILE", metavar="CONFIG_FILE",
help=( help=(
"Specify the config file (default: search for .aider.conf.yml in git root, cwd" "Specify the config file (default: searches for .aider.conf.yml then .aider.conf.yaml"
" or home directory)" " in git root, cwd or home directory)"
), ),
).complete = shtab.FILE ).complete = shtab.FILE
# This is a duplicate of the argument in the preparser and is a no-op by this time of # This is a duplicate of the argument in the preparser and is a no-op by this time of

129
tests/basic/test_main.py
View file

@ -49,11 +49,7 @@ class TestMain(TestCase):
main(["--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput()) main(["--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput())
def test_main_with_emptqy_dir_new_file(self): def test_main_with_emptqy_dir_new_file(self):
main( main(["foo.txt", "--yes", "--no-git", "--exit"], input=DummyInput(), output=DummyOutput())
["foo.txt", "--yes", "--no-git", "--exit"],
input=DummyInput(),
output=DummyOutput(),
)
self.assertTrue(os.path.exists("foo.txt")) self.assertTrue(os.path.exists("foo.txt"))
@patch("aider.repo.GitRepo.get_commit_message", return_value="mock commit message") @patch("aider.repo.GitRepo.get_commit_message", return_value="mock commit message")
@ -65,11 +61,7 @@ class TestMain(TestCase):
@patch("aider.repo.GitRepo.get_commit_message", return_value="mock commit message") @patch("aider.repo.GitRepo.get_commit_message", return_value="mock commit message")
def test_main_with_empty_git_dir_new_files(self, _): def test_main_with_empty_git_dir_new_files(self, _):
make_repo() make_repo()
main( main(["--yes", "foo.txt", "bar.txt", "--exit"], input=DummyInput(), output=DummyOutput())
["--yes", "foo.txt", "bar.txt", "--exit"],
input=DummyInput(),
output=DummyOutput(),
)
self.assertTrue(os.path.exists("foo.txt")) self.assertTrue(os.path.exists("foo.txt"))
self.assertTrue(os.path.exists("bar.txt")) self.assertTrue(os.path.exists("bar.txt"))
@ -259,11 +251,7 @@ class TestMain(TestCase):
patch("aider.main.check_version") as mock_check_version, patch("aider.main.check_version") as mock_check_version,
patch("aider.main.InputOutput") as mock_input_output, patch("aider.main.InputOutput") as mock_input_output,
): ):
main( main(["--exit", "--check-update"], input=DummyInput(), output=DummyOutput())
["--exit", "--check-update"],
input=DummyInput(),
output=DummyOutput(),
)
mock_check_version.assert_called_once() mock_check_version.assert_called_once()
mock_input_output.assert_called_once() mock_input_output.assert_called_once()
@ -299,11 +287,7 @@ class TestMain(TestCase):
# Mock InputOutput to capture the configuration # Mock InputOutput to capture the configuration
with patch("aider.main.InputOutput") as MockInputOutput: with patch("aider.main.InputOutput") as MockInputOutput:
MockInputOutput.return_value.get_input.return_value = None MockInputOutput.return_value.get_input.return_value = None
main( main(["--dark-mode", "--no-git", "--exit"], input=DummyInput(), output=DummyOutput())
["--dark-mode", "--no-git", "--exit"],
input=DummyInput(),
output=DummyOutput(),
)
# Ensure InputOutput was called # Ensure InputOutput was called
MockInputOutput.assert_called_once() MockInputOutput.assert_called_once()
# Check if the code_theme setting is for dark mode # Check if the code_theme setting is for dark mode
@ -314,11 +298,7 @@ class TestMain(TestCase):
# Mock InputOutput to capture the configuration # Mock InputOutput to capture the configuration
with patch("aider.main.InputOutput") as MockInputOutput: with patch("aider.main.InputOutput") as MockInputOutput:
MockInputOutput.return_value.get_input.return_value = None MockInputOutput.return_value.get_input.return_value = None
main( main(["--light-mode", "--no-git", "--exit"], input=DummyInput(), output=DummyOutput())
["--light-mode", "--no-git", "--exit"],
input=DummyInput(),
output=DummyOutput(),
)
# Ensure InputOutput was called # Ensure InputOutput was called
MockInputOutput.assert_called_once() MockInputOutput.assert_called_once()
# Check if the code_theme setting is for light mode # Check if the code_theme setting is for light mode
@ -450,15 +430,6 @@ class TestMain(TestCase):
home_config.write_text("model: gpt-3.5-turbo\nmap-tokens: 1024\n") home_config.write_text("model: gpt-3.5-turbo\nmap-tokens: 1024\n")
named_config.write_text("model: gpt-4-1106-preview\nmap-tokens: 8192\n") named_config.write_text("model: gpt-4-1106-preview\nmap-tokens: 8192\n")
# Also create .aider.conf.yaml files for each location, with different values
home_config_yaml = fake_home / ".aider.conf.yaml"
git_config_yaml = git_dir / ".aider.conf.yaml"
cwd_config_yaml = cwd / ".aider.conf.yaml"
cwd_config_yaml.write_text("model: gpt-4-yaml-cwd\nmap-tokens: 1111\n")
git_config_yaml.write_text("model: gpt-4-yaml-git\nmap-tokens: 2222\n")
home_config_yaml.write_text("model: gpt-4-yaml-home\nmap-tokens: 3333\n")
with ( with (
patch("pathlib.Path.home", return_value=fake_home), patch("pathlib.Path.home", return_value=fake_home),
patch("aider.coders.Coder.create") as MockCoder, patch("aider.coders.Coder.create") as MockCoder,
@ -473,47 +444,28 @@ class TestMain(TestCase):
self.assertEqual(kwargs["main_model"].name, "gpt-4-1106-preview") self.assertEqual(kwargs["main_model"].name, "gpt-4-1106-preview")
self.assertEqual(kwargs["map_tokens"], 8192) self.assertEqual(kwargs["map_tokens"], 8192)
# Test loading from current working directory (.yml should take precedence) # Test loading from current working directory
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput()) main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args _, kwargs = MockCoder.call_args
print("kwargs:", kwargs) # Add this line for debugging
self.assertIn("main_model", kwargs, "main_model key not found in kwargs")
self.assertEqual(kwargs["main_model"].name, "gpt-4-32k") self.assertEqual(kwargs["main_model"].name, "gpt-4-32k")
self.assertEqual(kwargs["map_tokens"], 4096) self.assertEqual(kwargs["map_tokens"], 4096)
# Remove .yml, should fall back to .yaml in cwd # Test loading from git root
cwd_config.unlink() cwd_config.unlink()
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput()) main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args _, kwargs = MockCoder.call_args
self.assertEqual(kwargs["main_model"].name, "gpt-4-yaml-cwd")
self.assertEqual(kwargs["map_tokens"], 1111)
# Remove .yaml in cwd, should load from git root .yml
cwd_config_yaml.unlink()
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args
self.assertEqual(kwargs["main_model"].name, "gpt-4") self.assertEqual(kwargs["main_model"].name, "gpt-4")
self.assertEqual(kwargs["map_tokens"], 2048) self.assertEqual(kwargs["map_tokens"], 2048)
# Remove .yml in git root, should fall back to .yaml in git root # Test loading from home directory
git_config.unlink() git_config.unlink()
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput()) main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args _, kwargs = MockCoder.call_args
self.assertEqual(kwargs["main_model"].name, "gpt-4-yaml-git")
self.assertEqual(kwargs["map_tokens"], 2222)
# Remove .yaml in git root, should load from home .yml
git_config_yaml.unlink()
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args
self.assertEqual(kwargs["main_model"].name, "gpt-3.5-turbo") self.assertEqual(kwargs["main_model"].name, "gpt-3.5-turbo")
self.assertEqual(kwargs["map_tokens"], 1024) self.assertEqual(kwargs["map_tokens"], 1024)
# Remove .yml in home, should fall back to .yaml in home
home_config.unlink()
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
_, kwargs = MockCoder.call_args
self.assertEqual(kwargs["main_model"].name, "gpt-4-yaml-home")
self.assertEqual(kwargs["map_tokens"], 3333)
def test_map_tokens_option(self): def test_map_tokens_option(self):
with GitTemporaryDirectory(): with GitTemporaryDirectory():
with patch("aider.coders.base_coder.RepoMap") as MockRepoMap: with patch("aider.coders.base_coder.RepoMap") as MockRepoMap:
@ -807,14 +759,7 @@ class TestMain(TestCase):
patch("aider.models.Model.set_reasoning_effort") as mock_set_reasoning, patch("aider.models.Model.set_reasoning_effort") as mock_set_reasoning,
): ):
main( main(
[ ["--model", "gpt-3.5-turbo", "--reasoning-effort", "3", "--yes", "--exit"],
"--model",
"gpt-3.5-turbo",
"--reasoning-effort",
"3",
"--yes",
"--exit",
],
input=DummyInput(), input=DummyInput(),
output=DummyOutput(), output=DummyOutput(),
) )
@ -896,16 +841,7 @@ class TestMain(TestCase):
def test_api_key_multiple(self): def test_api_key_multiple(self):
# Test setting multiple API keys # Test setting multiple API keys
with GitTemporaryDirectory(): with GitTemporaryDirectory():
main( main(["--api-key", "anthropic=key1", "--api-key", "openai=key2", "--exit", "--yes"])
[
"--api-key",
"anthropic=key1",
"--api-key",
"openai=key2",
"--exit",
"--yes",
]
)
self.assertEqual(os.environ.get("ANTHROPIC_API_KEY"), "key1") self.assertEqual(os.environ.get("ANTHROPIC_API_KEY"), "key1")
self.assertEqual(os.environ.get("OPENAI_API_KEY"), "key2") self.assertEqual(os.environ.get("OPENAI_API_KEY"), "key2")
@ -1032,10 +968,7 @@ class TestMain(TestCase):
# Test Anthropic API key # Test Anthropic API key
os.environ["ANTHROPIC_API_KEY"] = "test-key" os.environ["ANTHROPIC_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("sonnet", coder.main_model.name.lower()) self.assertIn("sonnet", coder.main_model.name.lower())
del os.environ["ANTHROPIC_API_KEY"] del os.environ["ANTHROPIC_API_KEY"]
@ -1043,10 +976,7 @@ class TestMain(TestCase):
# Test DeepSeek API key # Test DeepSeek API key
os.environ["DEEPSEEK_API_KEY"] = "test-key" os.environ["DEEPSEEK_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("deepseek", coder.main_model.name.lower()) self.assertIn("deepseek", coder.main_model.name.lower())
del os.environ["DEEPSEEK_API_KEY"] del os.environ["DEEPSEEK_API_KEY"]
@ -1054,10 +984,7 @@ class TestMain(TestCase):
# Test OpenRouter API key # Test OpenRouter API key
os.environ["OPENROUTER_API_KEY"] = "test-key" os.environ["OPENROUTER_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("openrouter/", coder.main_model.name.lower()) self.assertIn("openrouter/", coder.main_model.name.lower())
del os.environ["OPENROUTER_API_KEY"] del os.environ["OPENROUTER_API_KEY"]
@ -1065,10 +992,7 @@ class TestMain(TestCase):
# Test OpenAI API key # Test OpenAI API key
os.environ["OPENAI_API_KEY"] = "test-key" os.environ["OPENAI_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("gpt-4", coder.main_model.name.lower()) self.assertIn("gpt-4", coder.main_model.name.lower())
del os.environ["OPENAI_API_KEY"] del os.environ["OPENAI_API_KEY"]
@ -1076,10 +1000,7 @@ class TestMain(TestCase):
# Test Gemini API key # Test Gemini API key
os.environ["GEMINI_API_KEY"] = "test-key" os.environ["GEMINI_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("gemini", coder.main_model.name.lower()) self.assertIn("gemini", coder.main_model.name.lower())
del os.environ["GEMINI_API_KEY"] del os.environ["GEMINI_API_KEY"]
@ -1097,10 +1018,7 @@ class TestMain(TestCase):
os.environ["ANTHROPIC_API_KEY"] = "test-key" os.environ["ANTHROPIC_API_KEY"] = "test-key"
os.environ["OPENAI_API_KEY"] = "test-key" os.environ["OPENAI_API_KEY"] = "test-key"
coder = main( coder = main(
["--exit", "--yes"], ["--exit", "--yes"], input=DummyInput(), output=DummyOutput(), return_coder=True
input=DummyInput(),
output=DummyOutput(),
return_coder=True,
) )
self.assertIn("sonnet", coder.main_model.name.lower()) self.assertIn("sonnet", coder.main_model.name.lower())
del os.environ["ANTHROPIC_API_KEY"] del os.environ["ANTHROPIC_API_KEY"]
@ -1130,20 +1048,13 @@ class TestMain(TestCase):
def test_reasoning_effort_option(self): def test_reasoning_effort_option(self):
coder = main( coder = main(
[ ["--reasoning-effort", "3", "--no-check-model-accepts-settings", "--yes", "--exit"],
"--reasoning-effort",
"3",
"--no-check-model-accepts-settings",
"--yes",
"--exit",
],
input=DummyInput(), input=DummyInput(),
output=DummyOutput(), output=DummyOutput(),
return_coder=True, return_coder=True,
) )
self.assertEqual( self.assertEqual(
coder.main_model.extra_params.get("extra_body", {}).get("reasoning_effort"), coder.main_model.extra_params.get("extra_body", {}).get("reasoning_effort"), "3"
"3",
) )
def test_thinking_tokens_option(self): def test_thinking_tokens_option(self):