From 0d3cd3b16a5d202a1f5d2bc703c13c41bb67f43a Mon Sep 17 00:00:00 2001 From: John Wang Date: Tue, 18 Jul 2023 14:34:09 +0800 Subject: [PATCH] fix: azure provider select error when use custom azure provider (#587) --- api/core/llm/llm_builder.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/api/core/llm/llm_builder.py b/api/core/llm/llm_builder.py index 50cd1b620e..f054939fd5 100644 --- a/api/core/llm/llm_builder.py +++ b/api/core/llm/llm_builder.py @@ -128,9 +128,13 @@ class LLMBuilder: azure_openai_provider = BaseProvider.get_valid_provider(tenant_id, ProviderName.AZURE_OPENAI.value) provider = None - if openai_provider: + if openai_provider and openai_provider.provider_type == ProviderType.CUSTOM.value: provider = openai_provider - elif azure_openai_provider: + elif azure_openai_provider and azure_openai_provider.provider_type == ProviderType.CUSTOM.value: + provider = azure_openai_provider + elif openai_provider and openai_provider.provider_type == ProviderType.SYSTEM.value: + provider = openai_provider + elif azure_openai_provider and azure_openai_provider.provider_type == ProviderType.SYSTEM.value: provider = azure_openai_provider if not provider: @@ -139,9 +143,6 @@ class LLMBuilder: f"Please go to Settings -> Model Provider to complete your provider credentials." ) - if provider.provider_type == ProviderType.SYSTEM.value: - provider_name = 'openai' - else: - provider_name = provider.provider_name + provider_name = provider.provider_name return provider_name