Merge 'integration_2024-12-23_644381953026' into 'master'

merge branch integration_2024-12-23_644381953026 into master

See merge request: !461

Author: liuweiwei-xyz

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.116",
-	"meta_commit": "a8e26faf0844df58acde265bda1bb8a840c66f23"
+	"lasted": "1.0.117",
+	"meta_commit": "2210833c30450b487401a215db24501634363c42"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.116"
+VERSION = "1.0.117"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkarkruntime/_client.py

@@ -325,7 +325,7 @@ def _load_cert_by_ak_sk(self, ep: str) -> str:
             resp: volcenginesdkark.GetEndpointCertificateResponse = self.api_instance.get_endpoint_certificate(
                 get_endpoint_certificate_request)
         except ApiException as e:
-            raise ArkAPIError("Getting Certificate failed: %s\n" % e)
+            raise ArkAPIError("Getting model vendor encryption certificate failed: %s\n" % e)
 
         return resp.pca_instance_certificate
 

volcenginesdkarkruntime/resources/chat/completions.py

@@ -3,6 +3,7 @@
 from typing import Dict, List, Union, Iterable, Optional, Callable, Iterator, AsyncIterator
 
 import httpx
+import warnings
 from typing_extensions import Literal
 
 from ..._types import Body, Query, Headers
@@ -32,7 +33,6 @@
 
 __all__ = ["Completions", "AsyncCompletions"]
 
-
 class Completions(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CompletionsWithRawResponse:
@@ -50,10 +50,20 @@ def _process_messages(self, messages: Iterable[ChatCompletionMessageParam],
                 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'))))
+                    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("content type {} is not supported end-to-end encryption".
+                    raise TypeError("encryption is not supported for content type {}".
                                     format(type(message.get('content'))))
 
     def _encrypt(self, model: str, messages: Iterable[ChatCompletionMessageParam], extra_headers: Headers
@@ -177,8 +187,21 @@ def _process_messages(self, messages: Iterable[ChatCompletionMessageParam],
                 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("content type {} is not supported end-to-end encryption".
+                    raise TypeError("encryption is not supported for content type {}".
                                     format(type(message.get('content'))))
 
     def _encrypt(self, model: str, messages: Iterable[ChatCompletionMessageParam], extra_headers: Headers

volcenginesdkarkruntime/types/chat/chat_completion_audio.py

@@ -0,0 +1,22 @@
+from ..._models import BaseModel
+
+__all__ = ["ChatCompletionAudio"]
+
+
+class ChatCompletionAudio(BaseModel):
+    id: str
+    """Unique identifier for this audio response."""
+
+    data: str
+    """
+    Base64 encoded audio bytes generated by the model.
+    """
+
+    expires_at: int
+    """
+    The Unix timestamp (in seconds) for when this audio response will no longer be
+    accessible on the server for use in multi-turn conversations.
+    """
+
+    transcript: str
+    """Transcript of the audio generated by the model."""

volcenginesdkarkruntime/types/chat/chat_completion_message.py

@@ -3,6 +3,7 @@
 
 from ..._models import BaseModel
 from .chat_completion_message_tool_call import ChatCompletionMessageToolCall
+from .chat_completion_audio import ChatCompletionAudio
 
 __all__ = ["ChatCompletionMessage", "FunctionCall"]
 
@@ -36,3 +37,6 @@ class ChatCompletionMessage(BaseModel):
 
     tool_calls: Optional[List[ChatCompletionMessageToolCall]] = None
     """The tool calls generated by the model, such as function calls."""
+
+    audio: Optional[ChatCompletionAudio] = None
+    """Audio response from the model."""

volcenginesdkclb/models/create_listener_request.py

@@ -37,7 +37,9 @@ class CreateListenerRequest(object):
         'acl_status': 'str',
         'acl_type': 'str',
         'bandwidth': 'int',
+        'cert_center_certificate_id': 'str',
         'certificate_id': 'str',
+        'certificate_source': 'str',
         'client_body_timeout': 'int',
         'client_header_timeout': 'int',
         'connection_drain_enabled': 'str',
@@ -73,7 +75,9 @@ class CreateListenerRequest(object):
         'acl_status': 'AclStatus',
         'acl_type': 'AclType',
         'bandwidth': 'Bandwidth',
+        'cert_center_certificate_id': 'CertCenterCertificateId',
         'certificate_id': 'CertificateId',
+        'certificate_source': 'CertificateSource',
         'client_body_timeout': 'ClientBodyTimeout',
         'client_header_timeout': 'ClientHeaderTimeout',
         'connection_drain_enabled': 'ConnectionDrainEnabled',
@@ -104,7 +108,7 @@ class CreateListenerRequest(object):
         'tags': 'Tags'
     }
 
-    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, certificate_id=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, tags=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, cert_center_certificate_id=None, certificate_id=None, certificate_source=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, tags=None, _configuration=None):  # noqa: E501
         """CreateListenerRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -114,7 +118,9 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
         self._acl_status = None
         self._acl_type = None
         self._bandwidth = None
+        self._cert_center_certificate_id = None
         self._certificate_id = None
+        self._certificate_source = None
         self._client_body_timeout = None
         self._client_header_timeout = None
         self._connection_drain_enabled = None
@@ -153,8 +159,12 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
             self.acl_type = acl_type
         if bandwidth is not None:
             self.bandwidth = bandwidth
+        if cert_center_certificate_id is not None:
+            self.cert_center_certificate_id = cert_center_certificate_id
         if certificate_id is not None:
             self.certificate_id = certificate_id
+        if certificate_source is not None:
+            self.certificate_source = certificate_source
         if client_body_timeout is not None:
             self.client_body_timeout = client_body_timeout
         if client_header_timeout is not None:
@@ -292,6 +302,27 @@ def bandwidth(self, bandwidth):
 
         self._bandwidth = bandwidth
 
+    @property
+    def cert_center_certificate_id(self):
+        """Gets the cert_center_certificate_id of this CreateListenerRequest.  # noqa: E501
+
+
+        :return: The cert_center_certificate_id of this CreateListenerRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._cert_center_certificate_id
+
+    @cert_center_certificate_id.setter
+    def cert_center_certificate_id(self, cert_center_certificate_id):
+        """Sets the cert_center_certificate_id of this CreateListenerRequest.
+
+
+        :param cert_center_certificate_id: The cert_center_certificate_id of this CreateListenerRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._cert_center_certificate_id = cert_center_certificate_id
+
     @property
     def certificate_id(self):
         """Gets the certificate_id of this CreateListenerRequest.  # noqa: E501
@@ -313,6 +344,27 @@ def certificate_id(self, certificate_id):
 
         self._certificate_id = certificate_id
 
+    @property
+    def certificate_source(self):
+        """Gets the certificate_source of this CreateListenerRequest.  # noqa: E501
+
+
+        :return: The certificate_source of this CreateListenerRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._certificate_source
+
+    @certificate_source.setter
+    def certificate_source(self, certificate_source):
+        """Sets the certificate_source of this CreateListenerRequest.
+
+
+        :param certificate_source: The certificate_source of this CreateListenerRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._certificate_source = certificate_source
+
     @property
     def client_body_timeout(self):
         """Gets the client_body_timeout of this CreateListenerRequest.  # noqa: E501