From f0637ba3325c4f369929092edbcff26497ebc9a9 Mon Sep 17 00:00:00 2001 From: takatost Date: Fri, 8 Nov 2024 23:09:52 +0800 Subject: [PATCH] fix: create basic app causing internal error when default model is not exist --- api/core/model_manager.py | 2 +- api/core/provider_manager.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/core/model_manager.py b/api/core/model_manager.py index 29d47fc104..011c51aad4 100644 --- a/api/core/model_manager.py +++ b/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 diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py index 2224aaab80..534da4622b 100644 --- a/api/core/provider_manager.py +++ b/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(