volcengine-python-sdk 4.0.28__py2.py3-none-any.whl → 4.0.29__py2.py3-none-any.whl

{volcengine_python_sdk-4.0.28.dist-info → volcengine_python_sdk-4.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: volcengine-python-sdk
-Version: 4.0.28
+Version: 4.0.29
 Summary: Volcengine SDK for Python
 Home-page: https://github.com/volcengine/volcengine-python-sdk
 Author-email: volc-engine <volc-sdk-team@bytedance.com>

{volcengine_python_sdk-4.0.28.dist-info → volcengine_python_sdk-4.0.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
-volcengine_python_sdk-4.0.28.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-volcengine_python_sdk-4.0.28.dist-info/licenses/NOTICE.md,sha256=dqWX0O4-gFqGLdHJsXAiF6Q8JHlu_3nFaQSmrMHzujM,254
+volcengine_python_sdk-4.0.29.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+volcengine_python_sdk-4.0.29.dist-info/licenses/NOTICE.md,sha256=dqWX0O4-gFqGLdHJsXAiF6Q8JHlu_3nFaQSmrMHzujM,254
 volcenginesdkacep/__init__.py,sha256=3s-7qd2wmDxCNBxqB3hOyWRA-Y-ULFvO8s55SNaDK_0,5330
 volcenginesdkacep/api/__init__.py,sha256=MCzGEBg4XwY5aDIDy8nitUz4vu_2xmRRY83V6lqt460,138
 volcenginesdkacep/api/acep_api.py,sha256=-rT8B9FBEvCJqe5SDwT-T52On-E3JuUSWtKzawVbWx4,69095
@@ -1123,7 +1123,7 @@ volcenginesdkark/models/validation_set_for_get_model_customization_job_output.py
 volcenginesdkark/models/validation_set_for_list_model_customization_jobs_output.py,sha256=dFb4WCUsjz8yn5xW2uT2meRKwDKt7kt6u2ug1n3sOCE,5535
 volcenginesdkarkruntime/__init__.py,sha256=FYzidHcI2GwLEIuWYhktcQBf8PNL1Z5_31KD9ZyJYqA,624
 volcenginesdkarkruntime/_base_client.py,sha256=2PYXBY3bts6biNTCz2g7lrOyFBeuz4YSjWzY-narVCY,41584
-volcenginesdkarkruntime/_client.py,sha256=6CKVDLDODNFoHIW69okl7A-5MCMxVCry6ge1NMFnZG4,21322
+volcenginesdkarkruntime/_client.py,sha256=txoMEMUv30vPPPkC8yB1k_Tzxc1z2CsIh8FiqYLosN4,21389
 volcenginesdkarkruntime/_compat.py,sha256=dDGQBZRyEamAVvDQxkO6j7f0e2mQ0a9RFKORU9R3A_I,7592
 volcenginesdkarkruntime/_constants.py,sha256=tuP_2Rs02LWpSC8qe-5eOR88uHhmJmbs4B4a0TzVFxo,1297
 volcenginesdkarkruntime/_exceptions.py,sha256=yrycAtmUhNCHzUpiMAH751VsnKOwiIOgmxPQSZVm-hQ,5611
@@ -1137,7 +1137,7 @@ volcenginesdkarkruntime/_streaming.py,sha256=Lb0208Nx0jS4xqcn0lNfoMk7GOoNTsFib6x
 volcenginesdkarkruntime/_types.py,sha256=Uxw2QRV5xxpFT-KMVZTfhPQ2fUxasBXd6_KOE0Lns0o,5711
 volcenginesdkarkruntime/pagination.py,sha256=JQL-FOVlq_hFBFWF7KIFxec_2tY49cbnbBCi5IQKJJc,3600
 volcenginesdkarkruntime/_utils/__init__.py,sha256=NqVO483WvJgVCEISA_9XYg8rqRtX9N_-FfEANE-97Qw,2370
-volcenginesdkarkruntime/_utils/_key_agreement.py,sha256=aDPTlwAAPWJ4rzEq7zhCUXxKseI2jWh0UPF92Hy2bGY,7812
+volcenginesdkarkruntime/_utils/_key_agreement.py,sha256=XSZEW263XvQ0pbQferFqAOchOG0wF_GR4fmP1KV1ajo,7978
 volcenginesdkarkruntime/_utils/_logs.py,sha256=KDuFwKpOXO8ZKpWrOg50EWwHaJi0GwfasyZigrVKmAM,1062
 volcenginesdkarkruntime/_utils/_model_breaker.py,sha256=X_4p7urLGc2ywyroraalm1xgkGiUZNOykiAFFeVrTpk,2962
 volcenginesdkarkruntime/_utils/_streams.py,sha256=cxnM5nXHsX05Alk8swYqE8TTb0CzeSVqZUquuOwqN1g,734
@@ -1159,6 +1159,7 @@ volcenginesdkarkruntime/common/streaming/chat/_types.py,sha256=S6uKRNIdyLsoTu5U4
 volcenginesdkarkruntime/resources/__init__.py,sha256=USdf08NaOD74qnIZ1DmFeyH1P6eMcWQnvsDBGXkHR-Q,1667
 volcenginesdkarkruntime/resources/classification.py,sha256=jS-QhlQxYc-ldGZiWig1M-iNwE23RMh_v4Q0E0EAo_E,3932
 volcenginesdkarkruntime/resources/embeddings.py,sha256=Ln23pHlDGALn50aw_SnTdo8OPzzqFjlaJ5JdpYnTjYs,4189
+volcenginesdkarkruntime/resources/encryption.py,sha256=JljEvp9Xc8wJwm-gL-FOd_03IXi6rTZ4_cAvdZjhnLs,7712
 volcenginesdkarkruntime/resources/multimodal_embeddings.py,sha256=gNlD3kNLi-biLN-Zahscd-We-bLDpqgEMQbAhrjbHv8,4710
 volcenginesdkarkruntime/resources/tokenization.py,sha256=5bw_isLTjdvbn2MiF1t4rI2VhQiK6hdl2yx-HL3ib_4,3977
 volcenginesdkarkruntime/resources/batch/__init__.py,sha256=ZW11xRglBO85ZS-Z8SlCdAO18-oNIIPo6If1F3bhA3c,72
@@ -1171,18 +1172,18 @@ volcenginesdkarkruntime/resources/batch/chat/chat.py,sha256=Pheq0k_Ld9Em3HmkFFyg
 volcenginesdkarkruntime/resources/batch/chat/completions.py,sha256=DLbthi8RksTRSA4VUy5LDI2yxQ64_SxO8NIpjsyjrdU,13153
 volcenginesdkarkruntime/resources/batch_chat/__init__.py,sha256=3P5FoN2nk7vQMax7dNzYdkII0Hv6DU6T4ZEQ1dh7DS4,532
 volcenginesdkarkruntime/resources/batch_chat/chat.py,sha256=rmNmUjqB8OORcK0fSI4b9C0K8X_TFjE8lHvcTZ7rplk,973
-volcenginesdkarkruntime/resources/batch_chat/completions.py,sha256=CPu583r8z-Kc2M85EG9X0LPAvu3_ixH1_W7L-fDtEck,18536
+volcenginesdkarkruntime/resources/batch_chat/completions.py,sha256=uH5Mf251EYFtOzRUIi67gsIJGMO2iwT2Naf8_Bvh0UA,12999
 volcenginesdkarkruntime/resources/beta/__init__.py,sha256=qGjUlIzRM_KEjS_F_u3noCoAIvCsfHlqoQrO8S_jt9k,445
 volcenginesdkarkruntime/resources/beta/beta.py,sha256=nzVyjqGrQss7zoDJOGvKGVPXSSzhZizISSm_8jQRb2I,2423
 volcenginesdkarkruntime/resources/beta/chat/__init__.py,sha256=A-NN9ktR3wUytfQk1djgQTM9A6x_PUN5bqzqNRyIEzU,621
 volcenginesdkarkruntime/resources/beta/chat/chat.py,sha256=mpHbn7PzeltaWn4ik_8micetGlTHiOjmLgKS0QBDc8Y,955
-volcenginesdkarkruntime/resources/beta/chat/completions.py,sha256=9Db7VELigoTDoGCBC2psjHCwtOIIWbPcDRCqJlQLiso,18307
+volcenginesdkarkruntime/resources/beta/chat/completions.py,sha256=AnyV0qcMFTOhwP4REfsqdddQN9PQYJRky5QrpwggL-E,18884
 volcenginesdkarkruntime/resources/bot/__init__.py,sha256=YjHp05ym0Cfh-9i9R3ku7W0vZwn8bLi9H6tPIn73XFA,524
 volcenginesdkarkruntime/resources/bot/chat.py,sha256=Zj6GnTuZwpdnzCV7Q45HTvK363csEPQ7KyooPAqlvFM,965
 volcenginesdkarkruntime/resources/bot/completions.py,sha256=Dca7szOhyZTZYVIJVK4HB7qyQyY9RJkwC4ifPP1EJqc,9125
 volcenginesdkarkruntime/resources/chat/__init__.py,sha256=61VSlUJ3DwQpVJMwKE_kIqwqabLGIAiMuabAswDF1aw,512
 volcenginesdkarkruntime/resources/chat/chat.py,sha256=UCt3sfUpu-SPNLvHLAZNtOIv7VL9AAiuWUUGZsYjIr4,953
-volcenginesdkarkruntime/resources/chat/completions.py,sha256=EKJXwMaSGK-SF3QN8G7lUxzytSo8XEyWJDjqncozXlA,18102
+volcenginesdkarkruntime/resources/chat/completions.py,sha256=fkjiHwjyV5dvV1N1gBBAT0AJdRLmfbLJeztyvb8aJDY,9887
 volcenginesdkarkruntime/resources/content_generation/__init__.py,sha256=eEtK2GEGtfVv_EWJN6BelShzUxyEQjWxNdHuvvXMgYk,643
 volcenginesdkarkruntime/resources/content_generation/content_generation.py,sha256=J3yiGK_IROqj8aTfcj15mh4bCBj69ooYaCB_J3QhjTQ,892
 volcenginesdkarkruntime/resources/content_generation/tasks.py,sha256=gHPzaJhRy6yVgezUKWiC5igVq8Qh1SaqDr9qX767Bdg,9637
@@ -1190,7 +1191,7 @@ volcenginesdkarkruntime/resources/context/__init__.py,sha256=IUvx1XilwE6K0upLvKu
 volcenginesdkarkruntime/resources/context/completions.py,sha256=1TDpqoVLTgDcNthnebxAUEA5W3kXb9AewZT8X8zSiZM,8647
 volcenginesdkarkruntime/resources/context/context.py,sha256=8ql5cSPH3KkhhJo5IruFi4m2LX0ERdKWomfqODhppL0,3694
 volcenginesdkarkruntime/resources/images/__init__.py,sha256=M3K0FIhxguASekiH-goR6t-iNt-OSlzBA5_E_JqoW5I,575
-volcenginesdkarkruntime/resources/images/images.py,sha256=F4TpIS-UW2QIab2m_mrGsby5vxSwyyMPsgjWUN2vUU0,10568
+volcenginesdkarkruntime/resources/images/images.py,sha256=c5ysp9tJKBsGfqWhZJA6yu35Gw2WMjYE1008pD5Q0w8,11394
 volcenginesdkarkruntime/resources/responses/__init__.py,sha256=MKPYX2Bfz3fH4eBS8-nSBg6NXFrPWLZe6OSVMIZmtKg,623
 volcenginesdkarkruntime/resources/responses/input_items.py,sha256=K2kBo-Rz8ivV4Hf55w7DLAeA4bBcfag5_Tr8PJimvbU,9173
 volcenginesdkarkruntime/resources/responses/responses.py,sha256=eqwRX5nh0_kCEhuEQe-El6UHRSIPZ1Qfp-DRZSX6xRE,11749
@@ -1233,7 +1234,7 @@ volcenginesdkarkruntime/types/chat/completion_create_params.py,sha256=nvZYy845s_
 volcenginesdkarkruntime/types/chat/parsed_chat_completion.py,sha256=gGfw1v2xycPDAVux8ket6DjEqSE68e-ib_6U6nSsYhs,1801
 volcenginesdkarkruntime/types/chat/parsed_function_tool_call.py,sha256=dn3o68LxySJ-ODXUUshJLHbQs34rTZfOqH7rftKN_mM,1111
 volcenginesdkarkruntime/types/content_generation/__init__.py,sha256=qGjUlIzRM_KEjS_F_u3noCoAIvCsfHlqoQrO8S_jt9k,445
-volcenginesdkarkruntime/types/content_generation/content_generation_task.py,sha256=HwTi1mBuenJQf1CuyHRP85ttN2Ts5hFPmEHnWFiC98U,1746
+volcenginesdkarkruntime/types/content_generation/content_generation_task.py,sha256=uhVlQI8QlGK4OiTpAambdDGAd8mMyBUQYgg57umCpwM,2127
 volcenginesdkarkruntime/types/content_generation/content_generation_task_id.py,sha256=AGFX0T-JbpRv73g_M5QqawYbtL3-rObG2ffCvZTo-EM,599
 volcenginesdkarkruntime/types/content_generation/create_task_content_param.py,sha256=8a8_aPM4Yp67oPtOFebukyTEyD84gdiTFf2R4ZhpQnE,1262
 volcenginesdkarkruntime/types/content_generation/list_content_generation_tasks_response.py,sha256=lPbt7JD6HZHZ3YyLWdfseXjjvqXlTBNdykdRamAGYS8,1062
@@ -1243,11 +1244,11 @@ volcenginesdkarkruntime/types/context/context_chat_completion_chunk.py,sha256=3u
 volcenginesdkarkruntime/types/context/context_create_params.py,sha256=7_dI5-bvEDts6z5DVdcYat1w0EzYTU4HTDHClGRIqSI,1540
 volcenginesdkarkruntime/types/context/create_context_response.py,sha256=_udIYj8gGQBeYHVe1EZ615drqLbiUQZfvLjo-ufAPUM,1173
 volcenginesdkarkruntime/types/context/truncation_strategy.py,sha256=2Eb8jGyRPUAwlKpgnGTccs4ddBRN5XiPhe99HxSyxj8,898
-volcenginesdkarkruntime/types/images/__init__.py,sha256=6Df1UsTAI1YB4h4JHsuCxTu6GMvFGMbivLtNBeU2Olg,581
+volcenginesdkarkruntime/types/images/__init__.py,sha256=6DG33DNvt85JCOTHwCDkmJqjZDUBxhmBvfNKQpsrxsA,629
 volcenginesdkarkruntime/types/images/image_gen_completed_event.py,sha256=rORuqoDhCIF_61t430cmdwMbe3df3Y-k3oZ-Ps1fn8k,1326
 volcenginesdkarkruntime/types/images/image_gen_generating_event.py,sha256=9OBPmm7fuIiBmpxXdZaAjNlJKTO45Y0M5h4zyiitleU,1337
 volcenginesdkarkruntime/types/images/image_gen_stream_event.py,sha256=kd-gmU0xNJXpiuboLVjfWxV1vkvE1GIUnbLPf4NjeOU,880
-volcenginesdkarkruntime/types/images/images.py,sha256=tWyYOenGsFayPGO879C4DemsSt8ofaTNIQNs2DbCwzw,1681
+volcenginesdkarkruntime/types/images/images.py,sha256=huxXapTPNJez-Rc_o_YDIVCnt9OAxRtuPL_D9QH-IA0,1815
 volcenginesdkarkruntime/types/multimodal_embedding/__init__.py,sha256=ds2bIDk8cPjW8gvQqTsUePR1k8wZLnsoAagtxiNwdN8,1138
 volcenginesdkarkruntime/types/multimodal_embedding/embedding_content_part_image_param.py,sha256=247-QJkW4PJTzwIZSKLJ3VI1SeYNvUQiiWdYMfJuaB0,933
 volcenginesdkarkruntime/types/multimodal_embedding/embedding_content_part_text_param.py,sha256=CsrlVCwUHoeUk5oyf5qVjdqgUNzOzAKuLjWzkks-IIM,797
@@ -1346,6 +1347,7 @@ volcenginesdkarkruntime/types/responses/tool_param.py,sha256=Ol4qEJFpG2dn-WNpTnV
 volcenginesdkarkruntime/types/responses/web_search_tool.py,sha256=rrEuYIkNVEh43obyXAYB6_z50VUrC_WGeTWC5DKehSs,1424
 volcenginesdkarkruntime/types/responses/web_search_tool_param.py,sha256=DCfJ3K3ja_oZuU0a7YYb_TliDBdBRZdJ86Dc3_iwwQQ,1493
 volcenginesdkarkruntime/types/shared/__init__.py,sha256=tCTl_UIdDzJt5IuaiFd_9ouOXaQurdXKPzE7fO-LVVQ,726
+volcenginesdkarkruntime/types/shared/reasoning_effort.py,sha256=JMFgGWQPaCAo516QvuwC6tUXjTv7U3fE6nQ6Cn7fvD0,636
 volcenginesdkarkruntime/types/shared/response_format_json_object.py,sha256=Y7CwtsU50-OdIZCcTP7eqtGjJVCBA82Co9Qdf34Sfpg,710
 volcenginesdkarkruntime/types/shared/response_format_json_schema.py,sha256=Wa2P5MpSsaUOE51GuJVTQQ_-PHA7622Zeu-g1kDKlmc,1807
 volcenginesdkarkruntime/types/shared/response_format_text.py,sha256=8dIt5hweiD9M6BgDToARo9H9uSXQ4RIUxxfa4pgeR_w,684
@@ -3718,8 +3720,8 @@ volcenginesdkcloudtrail20180101/models/trail_for_describe_trails_output.py,sha25
 volcenginesdkcloudtrail20180101/models/update_trail_request.py,sha256=B3ekQIluA7_EJS-lDVFfS9opp_Q0AA85o7feAxhRCuQ,12596
 volcenginesdkcloudtrail20180101/models/update_trail_response.py,sha256=Gw7FcSWqHtttRxkuWdFuh9A69ZHcwHWEf2K8S9AfWQQ,10744
 volcenginesdkcore/__init__.py,sha256=hXXJZvkXO1--TZxyZTuFowfJp0BoBo6c3KYbGNuVc9k,239
-volcenginesdkcore/api_client.py,sha256=FA4RemZ45gsG5sK9KVZH0jt4oIfXian7sxRR5pFHgEw,18297
-volcenginesdkcore/configuration.py,sha256=LVxdguKmOururWWsTQlw5Mta9gJhsSfpmbudNv7sLVg,11181
+volcenginesdkcore/api_client.py,sha256=5YKOCPoflprXwEReVptuo3RTJyM2Ye1Vrn00qcQpY0E,18297
+volcenginesdkcore/configuration.py,sha256=4b1EivuZIFfXL2F1pw2bMO4RJaxk7IaPdzxovpUMrhw,11181
 volcenginesdkcore/flatten.py,sha256=g3r61JS_AO7WV6ClRDkXgtnVXcw3c7tbZjeLAJxkSLc,3811
 volcenginesdkcore/metadata.py,sha256=uEwumzeIwgfu3_QBUk6BU_MQg_snF92Kke1J2L5TcGc,3419
 volcenginesdkcore/model.py,sha256=f3cvQ6QiQfecClucu-_-l5xVI3W5_vF-EKkjwZu7Vjc,177
@@ -15787,7 +15789,7 @@ volcenginesdkwafruntime/api/__init__.py,sha256=di_9IIKQ0HCuzkGrTyZ6h38iP7y1xelH8
 volcenginesdkwafruntime/api/waf_runtime_api.py,sha256=eWgdzFcwflEkhkNrPzZL1mqSid7O1OWiwHGUyWJvZNA,4035
 volcenginesdkwafruntime/models/__init__.py,sha256=di_9IIKQ0HCuzkGrTyZ6h38iP7y1xelH8_IJbKi4aWA,71
 volcenginesdkwafruntime/models/llm_stream_session.py,sha256=U9cig3fuZRBT4Ov8_cUsWDKXcMLNjBDxKt-7IoewoUw,1589
-volcengine_python_sdk-4.0.28.dist-info/METADATA,sha256=QtHBWG2TUuewxKHoeUTEA8VPQrP7kogsAOXfaadCGH4,7166
-volcengine_python_sdk-4.0.28.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-volcengine_python_sdk-4.0.28.dist-info/top_level.txt,sha256=G6o20WnuJE_ejkFO9rwzjW7R6BUcHe2IicZFnAbhuZA,2364
-volcengine_python_sdk-4.0.28.dist-info/RECORD,,
+volcengine_python_sdk-4.0.29.dist-info/METADATA,sha256=SNmaI54r3ded8jKEk0BpNhW4W3IvSclTtt1gWdniXJ8,7166
+volcengine_python_sdk-4.0.29.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+volcengine_python_sdk-4.0.29.dist-info/top_level.txt,sha256=G6o20WnuJE_ejkFO9rwzjW7R6BUcHe2IicZFnAbhuZA,2364
+volcengine_python_sdk-4.0.29.dist-info/RECORD,,

volcenginesdkarkruntime/_client.py

@@ -143,7 +143,7 @@ class Ark(SyncAPIClient):
             self._sts_token_manager = StsTokenManager(self.ak, self.sk, self.region)
         return self._sts_token_manager.get(endpoint_id)
 
-    def _get_endpoint_certificate(self, endpoint_id: str) -> tuple[key_agreement_client, str, str]:
+    def _get_endpoint_certificate(self, endpoint_id: str) -> Tuple[key_agreement_client, str, str, float]:
         if self._certificate_manager is None:
             cert_path = os.environ.get("E2E_CERTIFICATE_PATH")
             if (
@@ -279,7 +279,7 @@ class AsyncArk(AsyncAPIClient):
             self._sts_token_manager = StsTokenManager(self.ak, self.sk, self.region)
         return self._sts_token_manager.get(bot_id, resource_type="bot")
 
-    def _get_endpoint_certificate(self, endpoint_id: str) -> tuple[key_agreement_client, str, str]:
+    def _get_endpoint_certificate(self, endpoint_id: str) -> Tuple[key_agreement_client, str, str, float]:
         if self._certificate_manager is None:
             cert_path = os.environ.get("E2E_CERTIFICATE_PATH")
             if (
@@ -429,7 +429,7 @@ class E2ECertificateManager(object):
         base_url: str | URL = BASE_URL,
         api_key: str | None = None,
     ):
-        self._certificate_manager: Dict[str, Tuple[key_agreement_client, str, str]] = {}
+        self._certificate_manager: Dict[str, Tuple[key_agreement_client, str, str, float]] = {}
 
         # local cache prepare
         self._init_local_cert_cache()
@@ -522,7 +522,7 @@ class E2ECertificateManager(object):
                 cert_pem = None
                 with open(cert_file_path, "r") as f:
                     cert_pem = f.read()
-                ring, key = get_cert_info(cert_pem)
+                ring, key, _ = get_cert_info(cert_pem)
                 # check cert is complement with AICC/PCA
                 if (ring == "" or key == "") and not self._aicc_enabled:
                     return cert_pem
@@ -545,7 +545,7 @@ class E2ECertificateManager(object):
                     "failed to create certificate directory %s: %s\n" % (self._cert_storage_path, e)
                 )
 
-    def get(self, ep: str) -> tuple[key_agreement_client, str, str]:
+    def get(self, ep: str) -> Tuple[key_agreement_client, str, str, float]:
         if ep not in self._certificate_manager:
             cert_pem = self._load_cert_locally(ep)
             if cert_pem is None:
@@ -556,12 +556,13 @@ class E2ECertificateManager(object):
                 else:
                     cert_pem = self._load_cert_by_ak_sk(ep)
                 self._save_cert_to_file(ep, cert_pem)
-            ring, key = get_cert_info(cert_pem)
+            ring, key, exp_time = get_cert_info(cert_pem)
             self._certificate_manager[ep] = (
                 key_agreement_client(
                     certificate_pem_string=cert_pem
                 ),
                 ring,
                 key,
+                exp_time,
             )
         return self._certificate_manager[ep]

volcenginesdkarkruntime/_utils/_key_agreement.py

@@ -17,7 +17,7 @@ import base64
 from typing import Tuple
 
 
-def get_cert_info(cert_pem: str) -> Tuple[str, str]:
+def get_cert_info(cert_pem: str) -> Tuple[str, str, float]:
     import re
     from cryptography import x509
     from cryptography.hazmat.backends import default_backend
@@ -27,10 +27,10 @@ def get_cert_info(cert_pem: str) -> Tuple[str, str]:
         dns = cert.extensions.get_extension_for_class(
             x509.SubjectAlternativeName).value.get_values_for_type(x509.DNSName)
         if dns and len(dns) > 1 and re.match(r"^ring\..*$", dns[0]) and re.match(r"^key\..*$", dns[1]):
-            return dns[0][5:], dns[1][4:]
+            return dns[0][5:], dns[1][4:], cert.not_valid_after_utc.timestamp()
     except Exception:
         pass
-    return "", ""
+    return "", "", cert.not_valid_after_utc.timestamp()
 
 
 def aes_gcm_encrypt_bytes(
@@ -92,6 +92,20 @@ def aes_gcm_decrypt_base64_string(key: bytes, nonce: bytes, ciphertext: str) ->
 base64_pattern = r'(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})'
 
 
+def decrypt_corner_case(key: bytes, nonce: bytes, data: str) -> str:
+    """decrypt_corner_case Decrypt corner case data"""
+    if len(data) < 24:
+        return ''
+    for i in range(20, len(data), 4):
+        try:
+            decrypted = aes_gcm_decrypt_base64_string(key, nonce, data[:i+4])
+            if i+4 == len(data):
+                return decrypted
+            return decrypted + decrypt_corner_case(key, nonce, data[i+4:])
+        except Exception:
+            pass
+
+
 def aes_gcm_decrypt_base64_list(key: bytes, nonce: bytes, ciphertext: str) -> str:
     # Decrypt
     base64_array = re.findall(base64_pattern, ciphertext)
@@ -100,17 +114,7 @@ def aes_gcm_decrypt_base64_list(key: bytes, nonce: bytes, ciphertext: str) -> st
         try:
             result.append(aes_gcm_decrypt_base64_string(key, nonce, b64))
         except Exception:
-            for i in range(20, len(b64), 4):
-                try:
-                    decrypted = aes_gcm_decrypt_base64_string(
-                        key, nonce, b64[:i+4])
-                    result.append(decrypted)
-                    decrypted = aes_gcm_decrypt_base64_string(
-                        key, nonce, b64[i+4:])
-                    result.append(decrypted)
-                    break
-                except Exception:
-                    pass
+            result.append(decrypt_corner_case(key, nonce, b64))
     return ''.join(result)
 
 

volcenginesdkarkruntime/resources/batch_chat/completions.py

@@ -20,12 +20,11 @@ from typing import Dict, List, Union, Iterable, Optional, Callable
 from typing_extensions import Literal
 
 import httpx
-import warnings
 
 from ..._exceptions import ArkAPITimeoutError, ArkAPIConnectionError, ArkAPIStatusError
 from ..._types import Body, Query, Headers
-from ..._utils import with_sts_token, async_with_sts_token, deepcopy_minimal
-from ..._utils._key_agreement import aes_gcm_decrypt_base64_string
+from ..._utils import with_sts_token, async_with_sts_token
+from ..encryption import with_e2e_encryption, async_with_e2e_encryption
 from ..._base_client import make_request_options
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._compat import cached_property
@@ -50,43 +49,10 @@ from ..._constants import (
 __all__ = ["Completions", "AsyncCompletions"]
 
 
-def _process_messages(
-    messages: Iterable[ChatCompletionMessageParam], f: Callable[[str], str]
-):
-    for message in messages:
-        if message.get("content", None) is not None:
-            current_content = message.get("content")
-            if isinstance(current_content, str):
-                message["content"] = f(current_content)
-            elif isinstance(current_content, Iterable):
-                for part in current_content:
-                    if part.get("type", None) == "text":
-                        part["text"] = f(part["text"])
-                    elif part.get("type", None) == "image_url":
-                        if part["image_url"]["url"].startswith("data:"):
-                            part["image_url"]["url"] = f(part["image_url"]["url"])
-                        else:
-                            warnings.warn(
-                                "encryption is not supported for image url, "
-                                "please use base64 image if you want encryption"
-                            )
-                    else:
-                        raise TypeError(
-                            "encryption is not supported for content type {}".format(
-                                type(part)
-                            )
-                        )
-            else:
-                raise TypeError(
-                    "encryption is not supported for content type {}".format(
-                        type(message.get("content"))
-                    )
-                )
-
-
 def _calculate_retry_timeout(retry_times) -> float:
     nbRetries = min(retry_times, MAX_RETRY_DELAY / INITIAL_RETRY_DELAY)
-    sleep_seconds = min(INITIAL_RETRY_DELAY * pow(2, nbRetries), MAX_RETRY_DELAY)
+    sleep_seconds = min(INITIAL_RETRY_DELAY *
+                        pow(2, nbRetries), MAX_RETRY_DELAY)
     # Apply some jitter, plus-or-minus half a second.
     jitter = 1 - 0.25 * random()
     timeout = sleep_seconds * jitter
@@ -126,58 +92,8 @@ class Completions(SyncAPIResource):
     def with_raw_response(self) -> CompletionsWithRawResponse:
         return CompletionsWithRawResponse(self)
 
-    def _process_messages(
-        self, messages: Iterable[ChatCompletionMessageParam], f: Callable[[str], str]
-    ):
-        for message in messages:
-            if message.get("content", None) is not None:
-                current_content = message.get("content")
-                if isinstance(current_content, str):
-                    message["content"] = f(current_content)
-                elif isinstance(current_content, Iterable):
-                    raise TypeError(
-                        "content type {} is not supported end-to-end encryption".format(
-                            type(message.get("content"))
-                        )
-                    )
-                else:
-                    raise TypeError(
-                        "content type {} is not supported end-to-end encryption".format(
-                            type(message.get("content"))
-                        )
-                    )
-
-    def _encrypt(
-        self,
-        model: str,
-        messages: Iterable[ChatCompletionMessageParam],
-        extra_headers: Headers,
-    ) -> tuple[bytes, bytes]:
-        client = self._client._get_endpoint_certificate(model)
-        _crypto_key, _crypto_nonce, session_token = client.generate_ecies_key_pair()
-        extra_headers["X-Session-Token"] = session_token
-        _process_messages(
-            messages,
-            lambda x: client.encrypt_string_with_key(_crypto_key, _crypto_nonce, x),
-        )
-        return _crypto_key, _crypto_nonce
-
-    def _decrypt(
-        self, key: bytes, nonce: bytes, resp: ChatCompletion
-    ) -> ChatCompletion:
-        if resp.choices is not None:
-            for index, choice in enumerate(resp.choices):
-                if (
-                    choice.message is not None and choice.finish_reason != 'content_filter'
-                    and choice.message.content is not None
-                ):
-                    choice.message.content = aes_gcm_decrypt_base64_string(
-                        key, nonce, choice.message.content
-                    )
-                resp.choices[index] = choice
-        return resp
-
     @with_sts_token
+    @with_e2e_encryption
     def create(
         self,
         *,
@@ -208,14 +124,6 @@ class Completions(SyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None = None,
     ) -> ChatCompletion:
-        is_encrypt = False
-        if (
-            extra_headers is not None
-            and extra_headers.get(ARK_E2E_ENCRYPTION_HEADER, None) == "true"
-        ):
-            is_encrypt = True
-            messages = deepcopy_minimal(messages)
-            e2e_key, e2e_nonce = self._encrypt(model, messages, extra_headers)
         retryTimes = 0
         last_time = self._get_request_last_time(timeout)
         model_breaker = self._client.get_model_breaker(model)
@@ -273,8 +181,6 @@ class Completions(SyncAPIResource):
                     continue
                 else:
                     raise err
-            if is_encrypt:
-                resp = self._decrypt(e2e_key, e2e_nonce, resp)
             return resp
 
     def _get_request_last_time(self, timeout):
@@ -289,7 +195,8 @@ class Completions(SyncAPIResource):
             timeoutSeconds = timeout
         else:
             raise TypeError(
-                "timeout type {} is not supported".format(type(self._client.timeout))
+                "timeout type {} is not supported".format(
+                    type(self._client.timeout))
             )
         return datetime.now() + timedelta(seconds=timeoutSeconds)
 
@@ -299,37 +206,8 @@ class AsyncCompletions(AsyncAPIResource):
     def with_raw_response(self) -> AsyncCompletionsWithRawResponse:
         return AsyncCompletionsWithRawResponse(self)
 
-    def _encrypt(
-        self,
-        model: str,
-        messages: Iterable[ChatCompletionMessageParam],
-        extra_headers: Headers,
-    ) -> tuple[bytes, bytes]:
-        client = self._client._get_endpoint_certificate(model)
-        _crypto_key, _crypto_nonce, session_token = client.generate_ecies_key_pair()
-        extra_headers["X-Session-Token"] = session_token
-        _process_messages(
-            messages,
-            lambda x: client.encrypt_string_with_key(_crypto_key, _crypto_nonce, x),
-        )
-        return _crypto_key, _crypto_nonce
-
-    async def _decrypt(
-        self, key: bytes, nonce: bytes, resp: ChatCompletion
-    ) -> ChatCompletion:
-        if resp.choices is not None:
-            for index, choice in enumerate(resp.choices):
-                if (
-                    choice.message is not None and choice.finish_reason != 'content_filter'
-                    and choice.message.content is not None
-                ):
-                    choice.message.content = aes_gcm_decrypt_base64_string(
-                        key, nonce, choice.message.content
-                    )
-                resp.choices[index] = choice
-        return resp
-
     @async_with_sts_token
+    @async_with_e2e_encryption
     async def create(
         self,
         *,
@@ -360,14 +238,6 @@ class AsyncCompletions(AsyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None = None,
     ) -> ChatCompletion:
-        is_encrypt = False
-        if (
-            extra_headers is not None
-            and extra_headers.get(ARK_E2E_ENCRYPTION_HEADER, None) == "true"
-        ):
-            is_encrypt = True
-            messages = deepcopy_minimal(messages)
-            e2e_key, e2e_nonce = self._encrypt(model, messages, extra_headers)
 
         retryTimes = 0
         last_time = self._get_request_last_time(timeout)
@@ -426,8 +296,6 @@ class AsyncCompletions(AsyncAPIResource):
                     continue
                 else:
                     raise err
-            if is_encrypt:
-                resp = await self._decrypt(e2e_key, e2e_nonce, resp)
             return resp
 
     def _get_request_last_time(self, timeout):
@@ -442,7 +310,8 @@ class AsyncCompletions(AsyncAPIResource):
             timeoutSeconds = timeout
         else:
             raise TypeError(
-                "timeout type {} is not supported".format(type(self._client.timeout))
+                "timeout type {} is not supported".format(
+                    type(self._client.timeout))
             )
         return datetime.now() + timedelta(seconds=timeoutSeconds)
 

volcenginesdkarkruntime/resources/beta/chat/completions.py

@@ -56,6 +56,8 @@ from ....types.chat.chat_completion_stream_options_param import (
 from ....types.chat.chat_completion_tool_choice_option_param import (
     ChatCompletionToolChoiceOptionParam,
 )
+from ....types.shared.reasoning_effort import ReasoningEffort
+
 
 __all__ = ["Completions", "AsyncCompletions"]
 
@@ -100,6 +102,7 @@ class Completions(SyncAPIResource):
         top_logprobs: Optional[int] | NotGiven = NOT_GIVEN,
         top_p: Optional[float] | NotGiven = NOT_GIVEN,
         user: str | NotGiven = NOT_GIVEN,
+        reasoning_effort: Optional[ReasoningEffort] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -147,6 +150,7 @@ class Completions(SyncAPIResource):
                     "top_logprobs": top_logprobs,
                     "top_p": top_p,
                     "user": user,
+                    "reasoning_effort": reasoning_effort,
                 },
                 completion_create_params.CompletionCreateParams,
             ),
@@ -188,6 +192,7 @@ class Completions(SyncAPIResource):
         top_logprobs: Optional[int] | NotGiven = NOT_GIVEN,
         top_p: Optional[float] | NotGiven = NOT_GIVEN,
         user: str | NotGiven = NOT_GIVEN,
+        reasoning_effort: Optional[ReasoningEffort] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -202,6 +207,7 @@ class Completions(SyncAPIResource):
 
         api_request: partial[Stream[ChatCompletionChunk]] = partial(
             self._client.chat.completions.create,
+            reasoning_effort=reasoning_effort,
             messages=messages,
             model=model,
             stream=True,
@@ -274,6 +280,7 @@ class AsyncCompletions(AsyncAPIResource):
         top_logprobs: Optional[int] | NotGiven = NOT_GIVEN,
         top_p: Optional[float] | NotGiven = NOT_GIVEN,
         user: str | NotGiven = NOT_GIVEN,
+        reasoning_effort: Optional[ReasoningEffort] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -321,6 +328,7 @@ class AsyncCompletions(AsyncAPIResource):
                     "top_logprobs": top_logprobs,
                     "top_p": top_p,
                     "user": user,
+                    "reasoning_effort": reasoning_effort,
                 },
                 completion_create_params.CompletionCreateParams,
             ),
@@ -362,6 +370,7 @@ class AsyncCompletions(AsyncAPIResource):
         top_logprobs: Optional[int] | NotGiven = NOT_GIVEN,
         top_p: Optional[float] | NotGiven = NOT_GIVEN,
         user: str | NotGiven = NOT_GIVEN,
+        reasoning_effort: Optional[ReasoningEffort] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -397,6 +406,7 @@ class AsyncCompletions(AsyncAPIResource):
             top_logprobs=top_logprobs,
             top_p=top_p,
             user=user,
+            reasoning_effort=reasoning_effort,
             extra_headers=extra_headers,
             extra_query=extra_query,
             extra_body=extra_body,