From 5a2aa83030c0886b5158dafa7441eb43588b34b0 Mon Sep 17 00:00:00 2001
From: takatost <takatost@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:20:46 +0800
Subject: [PATCH] fix: ciphertext error (#1872)

---
 .../openai_api_compatible/llm/llm.py          |  2 -
 api/core/provider_manager.py                  | 39 ++++++++++++-------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py b/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
index ed9af7c9f6..bfb6aff164 100644
--- a/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
+++ b/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
@@ -6,8 +6,6 @@ import json
 
 from typing import Optional, Generator, Union, List, cast
 
-from sympy import comp
-
 from core.model_runtime.entities.common_entities import I18nObject
 from core.model_runtime.utils import helper
 
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index da5fcaf458..4572ff7507 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -452,11 +452,14 @@ class ProviderManager:
 
             for variable in provider_credential_secret_variables:
                 if variable in provider_credentials:
-                    provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
-                        provider_credentials.get(variable),
-                        decoding_rsa_key,
-                        decoding_cipher_rsa
-                    )
+                    try:
+                        provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
+                            provider_credentials.get(variable),
+                            decoding_rsa_key,
+                            decoding_cipher_rsa
+                        )
+                    except ValueError:
+                        pass
 
             custom_provider_configuration = CustomProviderConfiguration(
                 credentials=provider_credentials
@@ -481,11 +484,14 @@ class ProviderManager:
 
             for variable in model_credential_secret_variables:
                 if variable in provider_model_credentials:
-                    provider_model_credentials[variable] = encrypter.decrypt_token_with_decoding(
-                        provider_model_credentials.get(variable),
-                        decoding_rsa_key,
-                        decoding_cipher_rsa
-                    )
+                    try:
+                        provider_model_credentials[variable] = encrypter.decrypt_token_with_decoding(
+                            provider_model_credentials.get(variable),
+                            decoding_rsa_key,
+                            decoding_cipher_rsa
+                        )
+                    except ValueError:
+                        pass
 
             custom_model_configurations.append(
                 CustomModelConfiguration(
@@ -577,11 +583,14 @@ class ProviderManager:
 
                 for variable in provider_credential_secret_variables:
                     if variable in provider_credentials:
-                        provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
-                            provider_credentials.get(variable),
-                            decoding_rsa_key,
-                            decoding_cipher_rsa
-                        )
+                        try:
+                            provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
+                                provider_credentials.get(variable),
+                                decoding_rsa_key,
+                                decoding_cipher_rsa
+                            )
+                        except ValueError:
+                            pass
 
                 current_using_credentials = provider_credentials
             else: