diff --git a/api/core/model_runtime/errors/invoke.py b/api/core/model_runtime/errors/invoke.py index fc51f5c748..0513cfaf67 100644 --- a/api/core/model_runtime/errors/invoke.py +++ b/api/core/model_runtime/errors/invoke.py @@ -8,6 +8,9 @@ class InvokeError(Exception): def __init__(self, description: Optional[str] = None) -> None: self.description = description + def __str__(self): + return self.description or self.__class__.__name__ + class InvokeConnectionError(InvokeError): """Raised when the Invoke returns connection error.""" diff --git a/api/libs/rsa.py b/api/libs/rsa.py index 21e9b1437e..6aaa811e69 100644 --- a/api/libs/rsa.py +++ b/api/libs/rsa.py @@ -5,7 +5,6 @@ from Crypto.Cipher import PKCS1_OAEP, AES from Crypto.PublicKey import RSA from Crypto.Random import get_random_bytes -from core.helper.lru_cache import LRUCache from extensions.ext_redis import redis_client from extensions.ext_storage import storage @@ -46,15 +45,7 @@ def encrypt(text, public_key): return prefix_hybrid + encrypted_data -tenant_rsa_keys = LRUCache(capacity=1000) - - def get_decrypt_decoding(tenant_id): - rsa_key = tenant_rsa_keys.get(tenant_id) - if rsa_key: - cipher_rsa = PKCS1_OAEP.new(rsa_key) - return rsa_key, cipher_rsa - filepath = "privkeys/{tenant_id}".format(tenant_id=tenant_id) + "/private.pem" cache_key = 'tenant_privkey:{hash}'.format(hash=hashlib.sha3_256(filepath.encode()).hexdigest()) @@ -70,8 +61,6 @@ def get_decrypt_decoding(tenant_id): rsa_key = RSA.import_key(private_key) cipher_rsa = PKCS1_OAEP.new(rsa_key) - tenant_rsa_keys.put(tenant_id, rsa_key) - return rsa_key, cipher_rsa