reorg

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)
+        main_model = models.Model(args.model)
-    except Exception as err:
+    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,

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.")
 

aider/models/__init__.py

@@ -1,5 +0,0 @@
-from .model import Model
-
-DEFAULT_MODEL_NAME = "gpt-4-1106-preview"
-
-__all__ = [Model, DEFAULT_MODEL_NAME]