fix: ciphertext error (#1872)

This commit is contained in:
takatost 2024-01-03 11:20:46 +08:00 committed by GitHub
parent 4de27d0404
commit 5a2aa83030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 17 deletions

View File

@ -6,8 +6,6 @@ import json
from typing import Optional, Generator, Union, List, cast 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.entities.common_entities import I18nObject
from core.model_runtime.utils import helper from core.model_runtime.utils import helper

View File

@ -452,11 +452,14 @@ class ProviderManager:
for variable in provider_credential_secret_variables: for variable in provider_credential_secret_variables:
if variable in provider_credentials: if variable in provider_credentials:
provider_credentials[variable] = encrypter.decrypt_token_with_decoding( try:
provider_credentials.get(variable), provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
decoding_rsa_key, provider_credentials.get(variable),
decoding_cipher_rsa decoding_rsa_key,
) decoding_cipher_rsa
)
except ValueError:
pass
custom_provider_configuration = CustomProviderConfiguration( custom_provider_configuration = CustomProviderConfiguration(
credentials=provider_credentials credentials=provider_credentials
@ -481,11 +484,14 @@ class ProviderManager:
for variable in model_credential_secret_variables: for variable in model_credential_secret_variables:
if variable in provider_model_credentials: if variable in provider_model_credentials:
provider_model_credentials[variable] = encrypter.decrypt_token_with_decoding( try:
provider_model_credentials.get(variable), provider_model_credentials[variable] = encrypter.decrypt_token_with_decoding(
decoding_rsa_key, provider_model_credentials.get(variable),
decoding_cipher_rsa decoding_rsa_key,
) decoding_cipher_rsa
)
except ValueError:
pass
custom_model_configurations.append( custom_model_configurations.append(
CustomModelConfiguration( CustomModelConfiguration(
@ -577,11 +583,14 @@ class ProviderManager:
for variable in provider_credential_secret_variables: for variable in provider_credential_secret_variables:
if variable in provider_credentials: if variable in provider_credentials:
provider_credentials[variable] = encrypter.decrypt_token_with_decoding( try:
provider_credentials.get(variable), provider_credentials[variable] = encrypter.decrypt_token_with_decoding(
decoding_rsa_key, provider_credentials.get(variable),
decoding_cipher_rsa decoding_rsa_key,
) decoding_cipher_rsa
)
except ValueError:
pass
current_using_credentials = provider_credentials current_using_credentials = provider_credentials
else: else: