diff --git a/aider/args.py b/aider/args.py index e4b27a884..04ceb3ba2 100644 --- a/aider/args.py +++ b/aider/args.py @@ -39,7 +39,7 @@ def get_parser(default_config_files, git_root): default=None, help="Specify the model to use for the main chat", ) - + # Add deprecated model shortcut arguments add_deprecated_model_args(parser, group) diff --git a/aider/deprecated.py b/aider/deprecated.py index c9268ab65..dcb3f5475 100644 --- a/aider/deprecated.py +++ b/aider/deprecated.py @@ -96,30 +96,30 @@ def handle_deprecated_model_args(args, io): "4_turbo": "gpt-4-1106-preview", "35turbo": "gpt-3.5-turbo", "deepseek": "deepseek/deepseek-chat", - "o1_mini": "o1-mini", + "o1_mini": "o1-mini", "o1_preview": "o1-preview", } - + # Check if any deprecated args are used for arg_name, model_name in model_map.items(): arg_name_clean = arg_name.replace("-", "_") if hasattr(args, arg_name_clean) and getattr(args, arg_name_clean): # Find preferred name to display in warning from aider.models import MODEL_ALIASES - + display_name = model_name # Check if there's a shorter alias for this model for alias, full_name in MODEL_ALIASES.items(): if full_name == model_name: display_name = alias break - + # Show the warning io.tool_warning( - f"The --{arg_name.replace('_', '-')} flag is deprecated and will be removed in a future version. " - f"Please use --model {display_name} instead." + f"The --{arg_name.replace('_', '-')} flag is deprecated and will be removed in a" + f" future version. Please use --model {display_name} instead." ) - + # Set the model args.model = model_name break diff --git a/aider/main.py b/aider/main.py index 48fbd7b1b..3d721b52d 100644 --- a/aider/main.py +++ b/aider/main.py @@ -589,7 +589,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F if args.openai_api_key: os.environ["OPENAI_API_KEY"] = args.openai_api_key - + # Handle deprecated model shortcut args handle_deprecated_model_args(args, io) if args.openai_api_base: