Merge branch 'feat/add_bot_sts_token_async' into 'integration_2025-06-19_956583143170'

feat: [development task] ark runtime (1361604)

See merge request iaasng/volcengine-python-sdk!677

Author: BitsAdmin

setup.py

@@ -29,7 +29,7 @@
             "httpx>=0.23.0, <1",
             "anyio>=3.5.0, <5",
             "cached-property; python_version < '3.8'",
-            "cryptography>=43.0.3, <43.0.4"
+            "cryptography>=42.0.0"
         ]
     },
 )

volcenginesdkarkruntime/_client.py

@@ -245,6 +245,13 @@ def _get_endpoint_sts_token(self, endpoint_id: str):
             self._sts_token_manager = StsTokenManager(self.ak, self.sk, self.region)
         return self._sts_token_manager.get(endpoint_id)
 
+    def _get_bot_sts_token(self, bot_id: str):
+        if self._sts_token_manager is None:
+            if self.ak is None or self.sk is None:
+                raise ArkAPIError("must set ak and sk before get endpoint token.")
+            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) -> key_agreement_client:
         if self._certificate_manager is None:
             cert_path = os.environ.get("E2E_CERTIFICATE_PATH")

volcenginesdkarkruntime/_utils/_key_agreement.py

@@ -69,13 +69,13 @@ def marshal_cryptography_pub_key(key) -> bytes:
 class key_agreement_client:
     def __init__(self, certificate_pem_string: str) -> None:
         """Load cert and extract public key"""
-        __fixed_version__ = "43.0.3"  # version check
+        __fixed_version__ = "42.0.0"  # version check
         from cryptography import __version__
 
-        if __version__ != __fixed_version__:
+        if __version__ < __fixed_version__:
             raise Exception(
-                "The cryptography package of Ark SDK only supports version {}, "
-                "please install the cryptography package by using pip install cryptography=={}".format(
+                "The cryptography package of Ark SDK only supports versions after {}, "
+                'please install the cryptography package by using pip install "cryptography>={}"'.format(
                     __fixed_version__, __fixed_version__
                 )
             )

volcenginesdkarkruntime/resources/batch_chat/completions.py

@@ -155,7 +155,10 @@ def _decrypt(
     ) -> ChatCompletion:
         if resp.choices is not None:
             for index, choice in enumerate(resp.choices):
-                if choice.message is not None and choice.message.content is not None:
+                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
                     )
@@ -299,7 +302,10 @@ async def _decrypt(
     ) -> ChatCompletion:
         if resp.choices is not None:
             for index, choice in enumerate(resp.choices):
-                if choice.message is not None and choice.message.content is not None:
+                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
                     )

volcenginesdkarkruntime/resources/chat/completions.py

@@ -107,7 +107,10 @@ def _decrypt_chunk(
         for chunk in resp:
             if chunk.choices is not None:
                 for index, choice in enumerate(chunk.choices):
-                    if choice.delta is not None and choice.delta.content is not None:
+                    if (
+                        choice.delta is not None and choice.delta.content is not None
+                        and choice.finish_reason != 'content_filter'
+                    ):
                         choice.delta.content = aes_gcm_decrypt_base64_string(
                             key, nonce, choice.delta.content
                         )
@@ -124,7 +127,7 @@ def _decrypt(
             if resp.choices is not None:
                 for index, choice in enumerate(resp.choices):
                     if (
-                        choice.message is not None
+                        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(
@@ -163,6 +166,7 @@ def create(
         tool_choice: ChatCompletionToolChoiceOptionParam | None = None,
         response_format: completion_create_params.ResponseFormat | None = None,
         thinking: completion_create_params.Thinking | None = None,
+        max_completion_tokens: Optional[int] | None = None,
         user: str | None = None,
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
@@ -203,6 +207,7 @@ def create(
                 "tool_choice": tool_choice,
                 "response_format": response_format,
                 "thinking": thinking,
+                "max_completion_tokens": max_completion_tokens,
             },
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -250,7 +255,10 @@ async def _decrypt_chunk(
         async for chunk in resp:
             if chunk.choices is not None:
                 for index, choice in enumerate(chunk.choices):
-                    if choice.delta is not None and choice.delta.content is not None:
+                    if (
+                        choice.delta is not None and choice.delta.content is not None
+                        and choice.finish_reason != 'content_filter'
+                    ):
                         choice.delta.content = aes_gcm_decrypt_base64_string(
                             key, nonce, choice.delta.content
                         )
@@ -267,7 +275,7 @@ async def _decrypt(
             if resp.choices is not None:
                 for index, choice in enumerate(resp.choices):
                     if (
-                        choice.message is not None
+                        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(
@@ -307,6 +315,7 @@ async def create(
         tool_choice: ChatCompletionToolChoiceOptionParam | None = None,
         response_format: completion_create_params.ResponseFormat | None = None,
         thinking: completion_create_params.Thinking | None = None,
+        max_completion_tokens: Optional[int] | None = None,
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
@@ -346,6 +355,7 @@ async def create(
                 "tool_choice": tool_choice,
                 "response_format": response_format,
                 "thinking": thinking,
+                "max_completion_tokens": max_completion_tokens,
             },
             options=make_request_options(
                 extra_headers=extra_headers,