From cacba526b31234104032bcf8af5c0a7889b7f173 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 7 Dec 2024 11:23:03 -0800
Subject: [PATCH] refactor: reorganize API key and environment settings
 arguments

---
 aider/args.py | 55 ++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/aider/args.py b/aider/args.py
index e2aaceeb6..a209fa871 100644
--- a/aider/args.py
+++ b/aider/args.py
@@ -32,14 +32,6 @@ def get_parser(default_config_files, git_root):
     group.add_argument(
         "files", metavar="FILE", nargs="*", help="files to edit with an LLM (optional)"
     )
-    group.add_argument(
-        "--openai-api-key",
-        help="Specify the OpenAI API key",
-    )
-    group.add_argument(
-        "--anthropic-api-key",
-        help="Specify the Anthropic API key",
-    )
     group.add_argument(
         "--model",
         metavar="MODEL",
@@ -140,12 +132,14 @@ def get_parser(default_config_files, git_root):
     )
 
     ##########
-    group = parser.add_argument_group("Model Settings")
+    group = parser.add_argument_group("API Keys and settings")
     group.add_argument(
-        "--list-models",
-        "--models",
-        metavar="MODEL",
-        help="List known models which match the (partial) MODEL name",
+        "--openai-api-key",
+        help="Specify the OpenAI API key",
+    )
+    group.add_argument(
+        "--anthropic-api-key",
+        help="Specify the Anthropic API key",
     )
     group.add_argument(
         "--openai-api-base",
@@ -167,6 +161,27 @@ def get_parser(default_config_files, git_root):
         "--openai-organization-id",
         help="Specify the OpenAI organization ID",
     )
+    group.add_argument(
+        "--set-env",
+        action="append",
+        metavar="ENV_VAR_NAME=value",
+        help="Set an environment variable (can be used multiple times)",
+        default=[],
+    )
+    group.add_argument(
+        "--api-key",
+        action="append",
+        metavar="PROVIDER=KEY",
+        help="Set an API key for a provider (eg: --api-key anthropic=sk-123)",
+        default=[],
+    )
+    group = parser.add_argument_group("Model Settings")
+    group.add_argument(
+        "--list-models",
+        "--models",
+        metavar="MODEL",
+        help="List known models which match the (partial) MODEL name",
+    )
     group.add_argument(
         "--model-settings-file",
         metavar="MODEL_SETTINGS_FILE",
@@ -758,20 +773,6 @@ def get_parser(default_config_files, git_root):
         "--editor",
         help="Specify which editor to use for the /editor command",
     )
-    group.add_argument(
-        "--set-env",
-        action="append",
-        metavar="ENV_VAR_NAME=value",
-        help="Set an environment variable (can be used multiple times)",
-        default=[],
-    )
-    group.add_argument(
-        "--api-key",
-        action="append",
-        metavar="PROVIDER=KEY",
-        help="Set an API key for a provider (eg: --api-key anthropic=sk-123)",
-        default=[],
-    )
 
     ##########
     group = parser.add_argument_group("Voice Settings")