From 855e787175f19359cd37bdc39759414bad19b895 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Wed, 17 Apr 2024 15:02:39 -0700
Subject: [PATCH] removed skip-model-avail-check

---
 aider/coders/base_coder.py | 28 ----------------------------
 aider/main.py              | 12 ++++--------
 aider/models/openai.py     |  3 ++-
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 1285cb99c..2a7ed05e7 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -63,7 +63,6 @@ class Coder:
         edit_format=None,
         io=None,
         client=None,
-        skip_model_availabily_check=False,
         **kwargs,
     ):
         from . import EditBlockCoder, UnifiedDiffCoder, WholeFileCoder
@@ -71,15 +70,6 @@ class Coder:
         if not main_model:
             main_model = models.Model.create(models.DEFAULT_MODEL_NAME)
 
-        if not skip_model_availabily_check and not main_model.always_available:
-            if not check_model_availability(io, client, main_model):
-                fallback_model = models.GPT35_0125
-                io.tool_error(
-                    f"API key does not support {main_model.name}, falling back to"
-                    f" {fallback_model.name}"
-                )
-                main_model = fallback_model
-
         if edit_format is None:
             edit_format = main_model.edit_format
 
@@ -1052,21 +1042,3 @@ class Coder:
         # files changed, move cur messages back behind the files messages
         # self.move_back_cur_messages(self.gpt_prompts.files_content_local_edits)
         return True
-
-
-def check_model_availability(io, client, main_model):
-    try:
-        available_models = client.models.list()
-    except openai.NotFoundError:
-        # Azure sometimes returns 404?
-        # https://discord.com/channels/1131200896827654144/1182327371232186459
-        io.tool_error(f"Unable to list available models, proceeding with {main_model.name}")
-        return True
-
-    model_ids = sorted(model.id for model in available_models)
-    if main_model.name in model_ids:
-        return True
-
-    available_models = ", ".join(model_ids)
-    io.tool_error(f"API key supports: {available_models}")
-    return False
diff --git a/aider/main.py b/aider/main.py
index 5fee2b3fe..0d4993f24 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -170,13 +170,6 @@ def main(argv=None, input=None, output=None, force_git_root=None):
         default=default_model,
         help=f"Specify the model to use for the main chat (default: {default_model})",
     )
-    core_group.add_argument(
-        "--skip-model-availability-check",
-        metavar="SKIP_MODEL_AVAILABILITY_CHECK",
-        action=argparse.BooleanOptionalAction,
-        default=False,
-        help="Override to skip model availability check (default: False)",
-    )
     default_4_model = "gpt-4-0613"
     core_group.add_argument(
         "--4",
@@ -576,12 +569,16 @@ def main(argv=None, input=None, output=None, force_git_root=None):
         os.environ["OPENAI_ORGANIZATION"] = args.openai_organization_id
 
     res = litellm.validate_environment(args.model)
+
     missing_keys = res.get("missing_keys")
     if missing_keys:
         io.tool_error(f"To use model {args.model}, please set these environment variables:")
         for key in missing_keys:
             io.tool_error(f"- {key}")
         return 1
+    elif not res["keys_in_environment"]:
+        io.tool_error(f"Unknown model {args.model}.")
+        return 1
 
     main_model = models.Model.create(args.model, None)
 
@@ -590,7 +587,6 @@ def main(argv=None, input=None, output=None, force_git_root=None):
             main_model=main_model,
             edit_format=args.edit_format,
             io=io,
-            skip_model_availabily_check=args.skip_model_availability_check,
             client=None,
             ##
             fnames=fnames,
diff --git a/aider/models/openai.py b/aider/models/openai.py
index 534df0eca..e5f5adebd 100644
--- a/aider/models/openai.py
+++ b/aider/models/openai.py
@@ -133,7 +133,8 @@ class OpenAIModel(Model):
         try:
             self.tokenizer = tiktoken.encoding_for_model(true_name)
         except KeyError:
-            raise ValueError(f"No known tokenizer for model: {name}")
+            self.tokenizer = None
+            # raise ValueError(f"No known tokenizer for model: {name}")
 
         model_info = self.lookup_model_info(true_name)
         if not model_info: