From 93f4a46996b2347b8901ae2054f63d0ae1374d32 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Thu, 18 Apr 2024 09:29:26 -0700
Subject: [PATCH] reorg

---
 aider/main.py                        | 6 ++----
 aider/{models/model.py => models.py} | 6 +++++-
 aider/models/__init__.py             | 5 -----
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename aider/{models/model.py => models.py} (99%)
 delete mode 100644 aider/models/__init__.py

diff --git a/aider/main.py b/aider/main.py
index 3e0e8ec65..765f35900 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -582,14 +582,12 @@ def main(argv=None, input=None, output=None, force_git_root=None):
 
     # Check in advance that we have model metadata
     try:
-        litellm.get_model_info(args.model)
-    except Exception as err:
+        main_model = models.Model(args.model)
+    except models.NoModelInfo as err:
         io.tool_error(f"Unknown model {args.model}.")
         io.tool_error(str(err))
         return 1
 
-    main_model = models.Model(args.model)
-
     try:
         coder = Coder.create(
             main_model=main_model,
diff --git a/aider/models/model.py b/aider/models.py
similarity index 99%
rename from aider/models/model.py
rename to aider/models.py
index 9ff629d05..bd7ab3e76 100644
--- a/aider/models/model.py
+++ b/aider/models.py
@@ -1,17 +1,21 @@
 import json
 import math
 from dataclasses import dataclass, fields
+from typing import Optional
 
 import litellm
-from typing import Optional
 from PIL import Image
 
 from aider.dump import dump
 
+DEFAULT_MODEL_NAME = "gpt-4-1106-preview"
+
+
 class NoModelInfo(Exception):
     """
     Exception raised when model information cannot be retrieved.
     """
+
     def __init__(self, message: Optional[str] = None):
         super().__init__(message or "No model information available.")
 
diff --git a/aider/models/__init__.py b/aider/models/__init__.py
deleted file mode 100644
index d79c4232c..000000000
--- a/aider/models/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .model import Model
-
-DEFAULT_MODEL_NAME = "gpt-4-1106-preview"
-
-__all__ = [Model, DEFAULT_MODEL_NAME]