Moved all model names into an enum

aider/coder.py

@@ -17,6 +17,7 @@ from rich.markdown import Markdown
 from aider import prompts, utils
 from aider.commands import Commands
 from aider.repomap import RepoMap
+from aider.utils import Models
 
 # from .dump import dump
 
@@ -39,7 +40,7 @@ class Coder:
     def __init__(
         self,
         io,
-        main_model="gpt-4",
+        main_model=Models.GPT4.value,
         fnames=None,
         pretty=True,
         show_diffs=False,
@@ -73,10 +74,10 @@ class Coder:
 
         self.commands = Commands(self.io, self)
         if not self.check_model_availability(main_model):
-            main_model = "gpt-3.5-turbo"
+            main_model = Models.GPT35.value
 
         self.main_model = main_model
-        if main_model == "gpt-3.5-turbo":
+        if main_model == Models.GPT35.value:
             self.io.tool_output(
                 f"Using {main_model}: showing diffs and disabling ctags/repo-maps.",
             )
@@ -106,7 +107,7 @@ class Coder:
             self.gpt_prompts.repo_content_prefix,
         )
 
-        if main_model != "gpt-3.5-turbo":
+        if main_model != Models.GPT35.value:
             if self.repo_map.has_ctags:
                 self.io.tool_output("Using ctags to build repo-map.")
 
@@ -299,7 +300,7 @@ class Coder:
         ]
 
         main_sys = self.gpt_prompts.main_system
-        if self.main_model == "gpt-4":
+        if self.main_model == Models.GPT4.value:
             main_sys += "\n" + self.gpt_prompts.system_reminder
 
         messages = [
@@ -326,7 +327,7 @@ class Coder:
         if edit_error:
             return edit_error
 
-        if self.main_model == "gpt=4" or (self.main_model == "gpt-3.5-turbo" and not edited):
+        if self.main_model == "gpt=4" or (self.main_model == Models.GPT35.value and not edited):
             # Don't add assistant messages to the history if they contain "edits"
             # Because those edits are actually fully copies of the file!
             # That wastes too much context window.
@@ -562,7 +563,9 @@ class Coder:
 
     def get_commit_message(self, diffs, context):
         if len(diffs) >= 4 * 1024 * 4:
-            self.io.tool_error("Diff is too large for gpt-3.5-turbo to generate a commit message.")
+            self.io.tool_error(
+                f"Diff is too large for {Models.GPT35.value} to generate a commit message."
+            )
             return
 
         diffs = "# Diffs:\n" + diffs
@@ -575,12 +578,13 @@ class Coder:
         try:
             commit_message, interrupted = self.send(
                 messages,
-                model="gpt-3.5-turbo",
+                model=Models.GPT35.value,
                 silent=True,
             )
         except openai.error.InvalidRequestError:
             self.io.tool_error(
-                "Failed to generate commit message using gpt-3.5-turbo due to an invalid request."
+                f"Failed to generate commit message using {Models.GPT35.value} due to an invalid"
+                " request."
             )
             return
 
@@ -590,7 +594,7 @@ class Coder:
 
         if interrupted:
             self.io.tool_error(
-                "Unable to get commit message from gpt-3.5-turbo. Use /commit to try again."
+                f"Unable to get commit message from {Models.GPT35.value}. Use /commit to try again."
             )
             return
 
@@ -715,9 +719,9 @@ class Coder:
         return set(self.get_all_relative_files()) - set(self.get_inchat_relative_files())
 
     def apply_updates(self, content):
-        if self.main_model == "gpt-4":
+        if self.main_model == Models.GPT4.value:
             method = self.update_files_gpt4
-        elif self.main_model == "gpt-3.5-turbo":
+        elif self.main_model == Models.GPT35.value:
             method = self.update_files_gpt35
         else:
             raise ValueError(f"apply_updates() doesn't support {self.main_model}")

aider/commands.py

@@ -7,6 +7,7 @@ import git
 from prompt_toolkit.completion import Completion
 
 from aider import prompts
+from aider.utils import Models
 
 
 class Commands:
@@ -118,7 +119,7 @@ class Commands:
             "was reset and removed from git.\n"
         )
 
-        if self.coder.main_model != "gpt-3.5-turbo":
+        if self.coder.main_model != Models.GPT35.value:
             return prompts.undo_command_reply
 
     def cmd_diff(self, args):

aider/main.py

@@ -6,6 +6,7 @@ import git
 
 from aider.coder import Coder
 from aider.io import InputOutput
+from aider.utils import Models
 
 
 def get_git_root():
@@ -75,15 +76,15 @@ def main(args=None, input=None, output=None):
     parser.add_argument(
         "--model",
         metavar="MODEL",
-        default="gpt-4",
-        help="Specify the model to use for the main chat (default: gpt-4)",
+        default=Models.GPT4.value,
+        help=f"Specify the model to use for the main chat (default: {Models.GPT4.value})",
     )
     parser.add_argument(
         "-3",
         action="store_const",
         dest="model",
-        const="gpt-3.5-turbo",
-        help="Use gpt-3.5-turbo model for the main chat (not advised)",
+        const=Models.GPT35.value,
+        help=f"Use {Models.GPT35.value} model for the main chat (not advised)",
     )
     parser.add_argument(
         "--pretty",

aider/repomap.py

@@ -14,6 +14,8 @@ from pygments.lexers import guess_lexer_for_filename
 from pygments.token import Token
 from pygments.util import ClassNotFound
 
+from aider.utils import Models
+
 from .dump import dump  # noqa: F402
 
 
@@ -64,7 +66,12 @@ class RepoMap:
     TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}"
 
     def __init__(
-        self, map_tokens=1024, root=None, main_model="gpt-4", io=None, repo_content_prefix=None
+        self,
+        map_tokens=1024,
+        root=None,
+        main_model=Models.GPT4.value,
+        io=None,
+        repo_content_prefix=None,
     ):
         self.io = io
 

aider/utils.py

@@ -1,11 +1,17 @@
 import math
 import re
 from difflib import SequenceMatcher
+from enum import Enum
 from pathlib import Path
 
 # from aider.dump import dump
 
 
+class Models(Enum):
+    GPT4 = "gpt-4"
+    GPT35 = "gpt-3.5-turbo"
+
+
 def try_dotdotdots(whole, part, replace):
     """
     See if the edit block has ... lines.