Merge branch 'llmshield/dev-online-1.7.0' into 'integration_2025-12-05_1090426788098'

feat: [development task] llm shield (1902675)

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

Author: BitsAdmin

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 = ""