Merge branch 'main' into add-batches

llama_stack/apis/common/errors.py

@@ -67,5 +67,14 @@ class SessionNotFoundError(ValueError):
 class ConflictError(ValueError):
     """raised when an operation cannot be performed due to a conflict with the current state"""
 
-    def __init__(self, message: str) -> None:
+    pass
+
+
+class ModelTypeError(TypeError):
+    """raised when a model is present but not the correct type"""
+
+    def __init__(self, model_name: str, model_type: str, expected_model_type: str) -> None:
+        message = (
+            f"Model '{model_name}' is of type '{model_type}' rather than the expected type '{expected_model_type}'"
+        )
         super().__init__(message)