Merge 'integration_2025-05-22_911100755970' into 'master'

merge branch integration_2025-05-22_911100755970 into master

See merge request: !619

Author: volc-sdk-team

README.md

@@ -132,7 +132,6 @@ configuration.host = 'ecs.cn-beijing-autodriving.volcengineapi.com'
 注：
 
 - Service中存在_符号时，Endpoint时需转为-符号。存在大写字母时需转成小写。
-- 并非所有云产品和Region都支持标准域名，具体请前往您所使用的产品-API参考中查看。
 
 ### SDK 示例 ###
 

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "3.0.2",
-	"meta_commit": "3ab604af6041e27d5f3fdf33a715978cc2e3c5a1"
+	"lasted": "3.0.3",
+	"meta_commit": "d39d73a1b07d173697dac5f0c8c96321d3ba9a63"
 }

setup.py

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

volcenginesdkarkruntime/resources/batch_chat/completions.py

@@ -8,6 +8,7 @@
 from typing_extensions import Literal
 
 import httpx
+import warnings
 
 from ..._exceptions import ArkAPITimeoutError, ArkAPIConnectionError, ArkAPIStatusError
 from ..._types import Body, Query, Headers
@@ -37,6 +38,39 @@
 __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)
@@ -79,27 +113,6 @@ 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,
@@ -109,7 +122,7 @@ def _encrypt(
         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
-        self._process_messages(
+        _process_messages(
             messages,
             lambda x: client.encrypt_string_with_key(_crypto_key, _crypto_nonce, x),
         )
@@ -244,21 +257,6 @@ class AsyncCompletions(AsyncAPIResource):
     def with_raw_response(self) -> AsyncCompletionsWithRawResponse:
         return AsyncCompletionsWithRawResponse(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)
-                else:
-                    raise TypeError(
-                        "content type {} is not supported end-to-end encryption".format(
-                            type(message.get("content"))
-                        )
-                    )
-
     def _encrypt(
         self,
         model: str,
@@ -268,7 +266,7 @@ def _encrypt(
         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
-        self._process_messages(
+        _process_messages(
             messages,
             lambda x: client.encrypt_string_with_key(_crypto_key, _crypto_nonce, x),
         )
@@ -379,9 +377,7 @@ async def create(
                 else:
                     raise err
             if is_encrypt:
-                resp = self._decrypt(e2e_key, e2e_nonce, resp)
-                if is_encrypt:
-                    resp = await self._decrypt(e2e_key, e2e_nonce, resp)
+                resp = await self._decrypt(e2e_key, e2e_nonce, resp)
             return resp
 
     def _get_request_last_time(self, timeout):

volcenginesdkcore/api_client.py

@@ -63,7 +63,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/3.0.2'
+        self.user_agent = 'volcstack-python-sdk/3.0.3'
         self.client_side_validation = configuration.client_side_validation
 
         self.interceptor_chain = InterceptorChain()

volcenginesdkcore/configuration.py

@@ -257,5 +257,5 @@ def to_debug_report(self):
                "OS: {env}\n" \
                "Python Version: {pyversion}\n" \
                "Version of the API: 0.1.0\n" \
-               "SDK Package Version: 3.0.2".\
+               "SDK Package Version: 3.0.3".\
             format(env=sys.platform, pyversion=sys.version)

volcenginesdkcore/endpoint/providers/default_provider.py

@@ -423,6 +423,12 @@ def get_endpoint_for(self, region, suffix=endpoint_suffix):
         global_endpoint='',
         region_endpoint_map={},
     ),
+    'fasttrack': ServiceEndpointInfo(
+        service='fasttrack',
+        is_global=False,
+        global_endpoint='',
+        region_endpoint_map={},
+    ),
 }
 
 bootstrap_region = {

volcenginesdkfasttrack/__init__.py

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+# flake8: noqa
+
+"""
+    fasttrack
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: common-version
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+# import apis into sdk package
+from volcenginesdkfasttrack.api.fasttrack_api import FASTTRACKApi
+
+# import models into sdk package
+from volcenginesdkfasttrack.models.describe_vortex_ip_attributes_request import DescribeVortexIPAttributesRequest
+from volcenginesdkfasttrack.models.describe_vortex_ip_attributes_response import DescribeVortexIPAttributesResponse
+from volcenginesdkfasttrack.models.describe_web_scraper_attributes_request import DescribeWebScraperAttributesRequest
+from volcenginesdkfasttrack.models.describe_web_scraper_attributes_response import DescribeWebScraperAttributesResponse
+from volcenginesdkfasttrack.models.white_list_entry_for_describe_vortex_ip_attributes_output import WhiteListEntryForDescribeVortexIPAttributesOutput

volcenginesdkfasttrack/api/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from volcenginesdkfasttrack.api.fasttrack_api import FASTTRACKApi