Skip to content

Commit 647f080

Browse files
author
liuhuiqi.7
committed
feat(crypto): fix bug
1 parent 17c45a0 commit 647f080

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

volcenginesdkarkruntime/_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,4 +596,6 @@ def get(self, ep: str) -> key_agreement_client:
596596
else:
597597
cert_pem = self._load_cert_by_ak_sk(ep)
598598
self._save_cert_to_file(ep, cert_pem)
599-
self._certificate_manager[ep] = key_agreement_client(certificate_pem_string=cert_pem)
599+
client = key_agreement_client(certificate_pem_string=cert_pem)
600+
self._certificate_manager[ep] = client
601+
return client

volcenginesdkarkruntime/resources/encryption.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,15 @@ def _content_encryption(args, kwargs):
155155
messages = deepcopy(kwargs["messages"])
156156
ark_client = args[0]._client
157157
client = ark_client._get_endpoint_certificate(model)
158-
ring_id, key_id = client.get_cert_ring_key_id()
159-
exp_time = client.get_cert_expiration_time()
160158
_crypto_key, _crypto_nonce, session_token = client.generate_ecies_key_pair()
161159
extra_headers["X-Session-Token"] = session_token
162160
_process_messages(
163161
messages,
164162
lambda x: client.encrypt_string_with_key(_crypto_key, _crypto_nonce, x),
165163
)
166-
info = {"ExpireTime": exp_time}
164+
info = {"ExpireTime": client.get_cert_expiration_time()}
167165
if os.environ.get("VOLC_ARK_ENCRYPTION") == "AICC":
166+
ring_id, key_id = client.get_cert_ring_key_id()
168167
info["Version"] = "AICCv0.1"
169168
info["KeyID"] = key_id
170169
info["RingID"] = ring_id

0 commit comments

Comments
 (0)