Merge branch 'refs/heads/fix/chore-fix' into dev/plugin-deploy

api/core/model_manager.py

@@ -409,7 +409,7 @@ class ModelManager:
 
         return ModelInstance(provider_model_bundle, model)
 
-    def get_default_provider_model_name(self, tenant_id: str, model_type: ModelType) -> tuple[str, str]:
+    def get_default_provider_model_name(self, tenant_id: str, model_type: ModelType) -> tuple[str | None, str | None]:
         """
         Return first provider and the first model in the provider
         :param tenant_id: tenant id

api/core/provider_manager.py

@@ -270,7 +270,7 @@ class ProviderManager:
             ),
         )
 
-    def get_first_provider_first_model(self, tenant_id: str, model_type: ModelType) -> tuple[str, str]:
+    def get_first_provider_first_model(self, tenant_id: str, model_type: ModelType) -> tuple[str | None, str | None]:
         """
         Get names of first model and its provider
 
@@ -283,6 +283,9 @@ class ProviderManager:
         # get available models from provider_configurations
         all_models = provider_configurations.get_models(model_type=model_type, only_active=False)
 
+        if not all_models:
+            return None, None
+
         return all_models[0].provider.provider, all_models[0].model
 
     def update_default_model_record(