Merge 'integration_2025-12-05_1090426788098' into 'master'

merge branch integration_2025-12-05_1090426788098 into master

See merge request: !960

Author: bytestarter

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "4.0.38",
-	"meta_commit": "e60d1dac65afce094c79dc5d468eb2944895cfcc"
+	"lasted": "4.0.39",
+	"meta_commit": "5a2562338054fe229d68b76792324123d044c794"
 }

setup.py

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

volcenginesdkcore/api_client.py

@@ -64,7 +64,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/4.0.38'
+        self.user_agent = 'volcstack-python-sdk/4.0.39'
         self.client_side_validation = configuration.client_side_validation
 
         self.interceptor_chain = InterceptorChain()

volcenginesdkcore/configuration.py

@@ -272,7 +272,7 @@ def to_debug_report(self):
                "OS: {env}\n" \
                "Python Version: {pyversion}\n" \
                "Version of the API: 0.1.0\n" \
-               "SDK Package Version: 4.0.38".\
+               "SDK Package Version: 4.0.39".\
             format(env=sys.platform, pyversion=sys.version)
 
     @property

volcenginesdkllmshield/__init__.py

@@ -15,12 +15,13 @@
 from __future__ import absolute_import
 
 # 导入API模块
-from volcenginesdkllmshield.api.llm_shield_sdk_v2 import ClientV2
+from volcenginesdkllmshield.api.llm_shield_sdk_v2 import ClientV2, SetServiceDev, GetServiceCode
 from volcenginesdkllmshield.api.llm_shield_sdk_v2 import (
     ContentTypeV2,
     DecisionTypeV2,
     UserAction,
     MatchSource,
+    MultiPart,
     MessageV2,
     ModerateV2Request,
     RiskMatchV2,
@@ -43,7 +44,9 @@
     GenerateSummarizeV2,
     GenerateStreamResult,
     GenerateStreamV2ResponseData,
-    CustomJSONEncoder
+    CustomJSONEncoder,
+    SetServiceDev,
+    GetServiceCode
 )
 
 
@@ -56,6 +59,7 @@
     'UserAction',
     'MatchSource',
     # 数据模型
+    'MultiPart',
     'MessageV2',
     'ModerateV2Request',
     'RiskMatchV2',
@@ -79,4 +83,6 @@
     'GenerateStreamResult',
     'GenerateStreamV2ResponseData',
     'CustomJSONEncoder',
+    'SetServiceDev',
+    'GetServiceCode',
 ]

volcenginesdkllmshield/api/llm_shield_sdk_v2.py

@@ -3,9 +3,11 @@
 from datetime import datetime, date
 from uuid import UUID
 import requests
+from requests.adapters import HTTPAdapter
 import json
+import os
 
-from ..models.llm_shield_sign import request_sign, Version
+from ..models.llm_shield_sign import request_sign, Version, SetServiceDev, GetServiceCode
 
 LLM_STREAM_SEND_BASE_WINDOW_V2 = 10
 LLM_STREAM_SEND_EXPONENT_V2 = 2
@@ -17,7 +19,7 @@ class ContentTypeV2:
     AUDIO = 2
     IMAGE = 3
     VIDEO = 4
-
+    FILE = 5
 
 # 定义决策类型常量
 class DecisionTypeV2:
@@ -44,11 +46,21 @@ class MatchSource:
     USER_CONTENTLIB = 3
 
 
+# 定义消息结构体
+class MultiPart(BaseModel):
+    content: str = Field("", alias="Content")
+    content_type: int = Field(ContentTypeV2.TEXT, alias="ContentType")
+
+    class Config:
+        populate_by_name = True
+
+
 # 定义消息结构体
 class MessageV2(BaseModel):
     role: str = Field("", alias="Role")
     content: str = Field("", alias="Content")
     content_type: int = Field(ContentTypeV2.TEXT, alias="ContentType")
+    multi_part: Optional[List[MultiPart]] = Field(None, alias="MultiPart")
 
     class Config:
         populate_by_name = True
@@ -198,6 +210,7 @@ class ModerateV2Result(BaseModel):
     risk_info: RiskInfoV2 = Field(default_factory=RiskInfoV2, alias="RiskInfo")
     decision: DecisionV2 = Field(default_factory=DecisionV2, alias="Decision")
     permit_info: PermitInfoV2 = Field(default_factory=PermitInfoV2, alias="PermitInfo")
+    content_info: str = Field("", alias="ContentInfo")
     degraded: bool = Field(False, alias="Degraded")
     degrade_reason: str = Field("", alias="DegradeReason")
 
@@ -295,7 +308,6 @@ class GenerateStreamV2ResponseData(BaseModel):
     class Config:
         populate_by_name = True
 
-
 # 定义客户端类
 class ClientV2:
     def __init__(self, url: str, ak: str, sk: str, region: str, timeout: float):
@@ -306,6 +318,23 @@ def __init__(self, url: str, ak: str, sk: str, region: str, timeout: float):
         self.http_client = requests.Session()
         self.http_client.timeout = timeout
 
+    def SetProxy(self, proxy: dict):
+        if proxy:
+            self.http_client.proxies = proxy
+        else:
+            self.http_client.proxies.clear()
+
+    def SetConnMax(self, connMax):
+        if connMax > 0:
+            adapter = HTTPAdapter(
+                pool_connections=connMax,  # 全局连接池数量：最多维护多少个 Host 的连接池
+                pool_maxsize=connMax,   # 单 Host 最大连接数：控制并发的核心（= 目标并发数）
+                pool_block=False  # 连接池满时是否阻塞：False=非阻塞（超时抛异常），True=阻塞等待
+            )
+            # 将适配器挂载到 Session：所有 HTTP/HTTPS 请求都使用该连接池
+            self.http_client.mount("http://", adapter)
+            self.http_client.mount("https://", adapter)
+
     def Moderate(self, request: Optional[ModerateV2Request] = None) -> ModerateV2Response:
         path = "/v2/moderate"
         action = "Moderate"

volcenginesdkllmshield/models/llm_shield_sign.py

@@ -22,11 +22,27 @@
 import requests
 
 # 以下参数视服务不同而不同，一个服务内通常是一致的
-Service = "llmshield"
 Version = "2025-08-31"
 ContentType = "application/json"
 Method = "POST"
 
+ServiceCodeDev = "llmshield_dev"
+ServiceCodeOnline = "llmshield"
+Service = ServiceCodeOnline
+
+
+def SetServiceDev(IsDev: bool):
+    global Service, ServiceCodeDev, ServiceCodeOnline
+    if IsDev:
+        Service = ServiceCodeDev
+    else:
+        Service = ServiceCodeOnline
+
+
+def GetServiceCode():
+    global Service
+    return Service
+
 
 def norm_query(params):
     query = ""

volcenginesdktis/__init__.py

@@ -22,6 +22,7 @@
 from volcenginesdktis.models.agent_for_get_agent_list_output import AgentForGetAgentListOutput
 from volcenginesdktis.models.buy_resource_package_request import BuyResourcePackageRequest
 from volcenginesdktis.models.buy_resource_package_response import BuyResourcePackageResponse
+from volcenginesdktis.models.category_for_get_speaker_list_output import CategoryForGetSpeakerListOutput
 from volcenginesdktis.models.clear_device_long_memory_request import ClearDeviceLongMemoryRequest
 from volcenginesdktis.models.clear_device_long_memory_response import ClearDeviceLongMemoryResponse
 from volcenginesdktis.models.device_info_list_for_get_quota_info_output import DeviceInfoListForGetQuotaInfoOutput
@@ -31,9 +32,11 @@
 from volcenginesdktis.models.get_quota_info_response import GetQuotaInfoResponse
 from volcenginesdktis.models.get_speaker_list_request import GetSpeakerListRequest
 from volcenginesdktis.models.get_speaker_list_response import GetSpeakerListResponse
+from volcenginesdktis.models.language_for_get_speaker_list_output import LanguageForGetSpeakerListOutput
 from volcenginesdktis.models.push_msg_to_device_request import PushMsgToDeviceRequest
 from volcenginesdktis.models.push_msg_to_device_response import PushMsgToDeviceResponse
 from volcenginesdktis.models.quota_info_list_for_get_quota_info_output import QuotaInfoListForGetQuotaInfoOutput
 from volcenginesdktis.models.speaker_for_get_speaker_list_output import SpeakerForGetSpeakerListOutput
 from volcenginesdktis.models.top_action_dispatch_request import TopActionDispatchRequest
 from volcenginesdktis.models.top_action_dispatch_response import TopActionDispatchResponse
+from volcenginesdktis.models.voice_config_for_get_speaker_list_output import VoiceConfigForGetSpeakerListOutput

volcenginesdktis/models/__init__.py

@@ -18,6 +18,7 @@
 from volcenginesdktis.models.agent_for_get_agent_list_output import AgentForGetAgentListOutput
 from volcenginesdktis.models.buy_resource_package_request import BuyResourcePackageRequest
 from volcenginesdktis.models.buy_resource_package_response import BuyResourcePackageResponse
+from volcenginesdktis.models.category_for_get_speaker_list_output import CategoryForGetSpeakerListOutput
 from volcenginesdktis.models.clear_device_long_memory_request import ClearDeviceLongMemoryRequest
 from volcenginesdktis.models.clear_device_long_memory_response import ClearDeviceLongMemoryResponse
 from volcenginesdktis.models.device_info_list_for_get_quota_info_output import DeviceInfoListForGetQuotaInfoOutput
@@ -27,9 +28,11 @@
 from volcenginesdktis.models.get_quota_info_response import GetQuotaInfoResponse
 from volcenginesdktis.models.get_speaker_list_request import GetSpeakerListRequest
 from volcenginesdktis.models.get_speaker_list_response import GetSpeakerListResponse
+from volcenginesdktis.models.language_for_get_speaker_list_output import LanguageForGetSpeakerListOutput
 from volcenginesdktis.models.push_msg_to_device_request import PushMsgToDeviceRequest
 from volcenginesdktis.models.push_msg_to_device_response import PushMsgToDeviceResponse
 from volcenginesdktis.models.quota_info_list_for_get_quota_info_output import QuotaInfoListForGetQuotaInfoOutput
 from volcenginesdktis.models.speaker_for_get_speaker_list_output import SpeakerForGetSpeakerListOutput
 from volcenginesdktis.models.top_action_dispatch_request import TopActionDispatchRequest
 from volcenginesdktis.models.top_action_dispatch_response import TopActionDispatchResponse
+from volcenginesdktis.models.voice_config_for_get_speaker_list_output import VoiceConfigForGetSpeakerListOutput

volcenginesdktis/models/agent_for_get_agent_list_output.py

@@ -33,31 +33,41 @@ class AgentForGetAgentListOutput(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'asr_lang': 'str',
+        'description': 'str',
         'id': 'str',
         'name': 'str',
         'speaker_id': 'str',
         'speaker_type': 'str'
     }
 
     attribute_map = {
+        'asr_lang': 'AsrLang',
+        'description': 'Description',
         'id': 'ID',
         'name': 'Name',
         'speaker_id': 'SpeakerID',
         'speaker_type': 'SpeakerType'
     }
 
-    def __init__(self, id=None, name=None, speaker_id=None, speaker_type=None, _configuration=None):  # noqa: E501
+    def __init__(self, asr_lang=None, description=None, id=None, name=None, speaker_id=None, speaker_type=None, _configuration=None):  # noqa: E501
         """AgentForGetAgentListOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._asr_lang = None
+        self._description = None
         self._id = None
         self._name = None
         self._speaker_id = None
         self._speaker_type = None
         self.discriminator = None
 
+        if asr_lang is not None:
+            self.asr_lang = asr_lang
+        if description is not None:
+            self.description = description
         if id is not None:
             self.id = id
         if name is not None:
@@ -67,6 +77,48 @@ def __init__(self, id=None, name=None, speaker_id=None, speaker_type=None, _conf
         if speaker_type is not None:
             self.speaker_type = speaker_type
 
+    @property
+    def asr_lang(self):
+        """Gets the asr_lang of this AgentForGetAgentListOutput.  # noqa: E501
+
+
+        :return: The asr_lang of this AgentForGetAgentListOutput.  # noqa: E501
+        :rtype: str
+        """
+        return self._asr_lang
+
+    @asr_lang.setter
+    def asr_lang(self, asr_lang):
+        """Sets the asr_lang of this AgentForGetAgentListOutput.
+
+
+        :param asr_lang: The asr_lang of this AgentForGetAgentListOutput.  # noqa: E501
+        :type: str
+        """
+
+        self._asr_lang = asr_lang
+
+    @property
+    def description(self):
+        """Gets the description of this AgentForGetAgentListOutput.  # noqa: E501
+
+
+        :return: The description of this AgentForGetAgentListOutput.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this AgentForGetAgentListOutput.
+
+
+        :param description: The description of this AgentForGetAgentListOutput.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def id(self):
         """Gets the id of this AgentForGetAgentListOutput.  # noqa: E501