Merge branch 'main' into swe-bench

aider/args.py

@@ -67,7 +67,7 @@ def get_parser(default_config_files, git_root):
         const=gpt_4_model,
         help=f"Use {gpt_4_model} model for the main chat",
     )
-    gpt_4o_model = "openai/gpt-4o"
+    gpt_4o_model = "gpt-4o"
     group.add_argument(
         "--4o",
         action="store_const",

aider/models.py

@@ -11,7 +11,7 @@ from PIL import Image
 from aider.dump import dump  # noqa: F401
 from aider.litellm import litellm
 
-DEFAULT_MODEL_NAME = "openai/gpt-4o"
+DEFAULT_MODEL_NAME = "gpt-4o"
 
 
 @dataclass
@@ -94,6 +94,16 @@ MODEL_SETTINGS = [
         lazy=True,
         reminder_as_sys_msg=True,
     ),
+    ModelSettings(
+        "gpt-4o",
+        "diff",
+        weak_model_name="gpt-3.5-turbo",
+        use_repo_map=True,
+        send_undo_reply=True,
+        accepts_images=True,
+        lazy=True,
+        reminder_as_sys_msg=True,
+    ),
     ModelSettings(
         "gpt-4-0125-preview",
         "udiff",