Merge "integration_2026-02-26_1118030915074" into "tis-Python-2024-07-31-online-2284-2026_02_25_16_10_47"

Conflicts:
pyproject.toml

Author: bytestarter

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "volcengine-python-sdk"
-version = "5.0.10"
+version = "5.0.11"
 authors = [
     {name = "volc-engine", email = "volc-sdk-team@bytedance.com"},
 ]

volcenginesdkarkruntime/resources/files.py

@@ -65,7 +65,7 @@ def create(
         *,
         file: FileTypes,
         purpose: FilePurpose,
-        expires_at: datetime.datetime | int | None = None,
+        expire_at: datetime.datetime | int | None = None,
         preprocess_configs: PreprocessConfigs | None = None,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -83,7 +83,7 @@ def create(
 
           purpose: The intended purpose of the uploaded file. Only `user_data` is supported.
 
-          expires_at: The expiration time for a file in Unix timestamp format. By default, files expires after 7 days.
+          expire_at: The expiration time for a file in Unix timestamp format. By default, files expires after 7 days.
 
           extra_headers: Send extra headers
 
@@ -97,7 +97,7 @@ def create(
             {
                 "file": file,
                 "purpose": purpose,
-                "expires_at": expires_at,
+                "expire_at": expire_at,
                 "preprocess_configs": preprocess_configs,
             }
         )

volcenginesdkarkruntime/resources/images/images.py

@@ -24,6 +24,7 @@
     OptimizePromptOptions,
     SequentialImageGenerationOptions,
     ImagesResponse,
+    ContentGenerationTool
 )
 from ...types.images.image_gen_stream_event import ImageGenStreamEvent
 from ..._types import Body, Query, Headers
@@ -53,6 +54,8 @@ def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Optional[Literal[False]] | NotGiven = NOT_GIVEN,
     ) -> ImagesResponse:
         ...
@@ -86,6 +89,8 @@ def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Literal[True],
     ) -> Stream[ImageGenStreamEvent]: ...
 
@@ -110,6 +115,8 @@ def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: bool,
     ) -> ImagesResponse | Stream[ImageGenStreamEvent]: ...
 
@@ -134,6 +141,8 @@ def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN,
     ) -> ImagesResponse | Stream[ImageGenStreamEvent]:
         resp = self._post(
@@ -159,6 +168,12 @@ def generate(
                     if sequential_image_generation_options is not None
                     else None
                 ),
+                "tools": (
+                    [t.model_dump(mode="json") for t in tools]
+                    if tools is not None
+                    else None
+                ),
+                "output_format": output_format,
                 "stream": stream,
             },
             options=make_request_options(
@@ -197,6 +212,8 @@ async def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Optional[Literal[False]] | NotGiven = NOT_GIVEN,
     ) -> ImagesResponse: ...
 
@@ -221,6 +238,8 @@ async def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Literal[True],
     ) -> AsyncStream[ImageGenStreamEvent]: ...
 
@@ -245,6 +264,8 @@ async def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: bool,
     ) -> ImagesResponse | AsyncStream[ImageGenStreamEvent]: ...
 
@@ -269,6 +290,8 @@ async def generate(
         sequential_image_generation: str | None = None,
         sequential_image_generation_options: SequentialImageGenerationOptions
         | None = None,
+        tools: list[ContentGenerationTool] | None = None,
+        output_format: str | None = None,
         stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN,
     ) -> ImagesResponse | AsyncStream[ImageGenStreamEvent]:
         return await self._post(
@@ -294,6 +317,12 @@ async def generate(
                     if sequential_image_generation_options is not None
                     else None
                 ),
+                "tools": (
+                    [t.model_dump(mode="json") for t in tools]
+                    if tools is not None
+                    else None
+                ),
+                "output_format": output_format,
                 "stream": stream,
             },
             options=make_request_options(

volcenginesdkarkruntime/types/images/__init__.py

@@ -13,11 +13,13 @@
     OptimizePromptOptions,
     SequentialImageGenerationOptions,
     ImagesResponse,
+    ContentGenerationTool
 )
 
 
 __all__ = [
     "OptimizePromptOptions",
     "SequentialImageGenerationOptions",
     "ImagesResponse",
+    "ContentGenerationTool"
 ]

volcenginesdkarkruntime/types/images/image_gen_completed_event.py

@@ -10,18 +10,25 @@
 # This modified file is released under the same license.
 
 
+from typing import List, Optional
 from volcenginesdkarkruntime._models import BaseModel
 
 __all__ = ["ImageGenCompletedEvent"]
 
 
+class ToolUsage(BaseModel):
+    web_search: Optional[int] = None
+    """The number of web search."""
+
 class Usage(BaseModel):
     generated_images: int
     """The number of images generated."""
     output_tokens: int
     """The number of output tokens."""
     total_tokens: int
     """The total number of tokens."""
+    tool_usage: Optional[ToolUsage] = None
+    """The total number of images generated by this request."""
 
 
 class Error(BaseModel):

volcenginesdkarkruntime/types/images/images.py

@@ -17,6 +17,7 @@
     "OptimizePromptOptions",
     "SequentialImageGenerationOptions",
     "ImagesResponse",
+    "ContentGenerationTool"
 ]
 
 
@@ -30,9 +31,20 @@ class SequentialImageGenerationOptions(BaseModel):
     """ Maximum number of images to generate in this request; effective only when the multi-image feature is enabled """
 
 
+class ToolUsage(BaseModel):
+    web_search: Optional[int] = None
+    """The number of web search."""
+
+
 class Usage(BaseModel):
     generated_images: int
     """The number of images generated."""
+    output_tokens: Optional[int] = None
+    """The number of images generated by this request."""
+    total_tokens: Optional[int] = None
+    """The total number of images generated by this request."""
+    tool_usage: Optional[ToolUsage] = None
+    """The total number of images generated by this request."""
 
 
 class Image(BaseModel):
@@ -54,6 +66,11 @@ class Error(BaseModel):
     """The error code for failed image generation"""
 
 
+class ContentGenerationTool(BaseModel):
+    type: str
+    """The content generation tool used to generate the images."""
+
+
 class ImagesResponse(BaseModel):
     model: str
     """The model used to generated the images."""
@@ -69,3 +86,6 @@ class ImagesResponse(BaseModel):
 
     created_at: int
     """The Unix timestamp when the image was generated."""
+
+    tool: List[ContentGenerationTool]
+    """ The tool used to generate the image."""

volcenginesdkcbr/__init__.py

@@ -56,6 +56,8 @@
 from volcenginesdkcbr.models.describe_restore_jobs_response import DescribeRestoreJobsResponse
 from volcenginesdkcbr.models.describe_vaults_request import DescribeVaultsRequest
 from volcenginesdkcbr.models.describe_vaults_response import DescribeVaultsResponse
+from volcenginesdkcbr.models.describe_zones_request import DescribeZonesRequest
+from volcenginesdkcbr.models.describe_zones_response import DescribeZonesResponse
 from volcenginesdkcbr.models.disable_backup_policy_request import DisableBackupPolicyRequest
 from volcenginesdkcbr.models.disable_backup_policy_response import DisableBackupPolicyResponse
 from volcenginesdkcbr.models.enable_backup_policy_request import EnableBackupPolicyRequest
@@ -67,10 +69,8 @@
 from volcenginesdkcbr.models.filters_for_describe_restore_jobs_input import FiltersForDescribeRestoreJobsInput
 from volcenginesdkcbr.models.filters_for_describe_vaults_input import FiltersForDescribeVaultsInput
 from volcenginesdkcbr.models.job_for_describe_restore_jobs_output import JobForDescribeRestoreJobsOutput
-from volcenginesdkcbr.models.meta_information_for_create_backup_plan_input import MetaInformationForCreateBackupPlanInput
-from volcenginesdkcbr.models.meta_information_for_create_backup_resource_input import MetaInformationForCreateBackupResourceInput
-from volcenginesdkcbr.models.meta_information_for_describe_backup_resources_output import MetaInformationForDescribeBackupResourcesOutput
-from volcenginesdkcbr.models.meta_information_for_update_backup_plan_input import MetaInformationForUpdateBackupPlanInput
+from volcenginesdkcbr.models.list_tags_for_resources_request import ListTagsForResourcesRequest
+from volcenginesdkcbr.models.list_tags_for_resources_response import ListTagsForResourcesResponse
 from volcenginesdkcbr.models.plan_for_describe_backup_plans_output import PlanForDescribeBackupPlansOutput
 from volcenginesdkcbr.models.plan_for_describe_backup_resources_output import PlanForDescribeBackupResourcesOutput
 from volcenginesdkcbr.models.policy_for_describe_backup_plans_output import PolicyForDescribeBackupPlansOutput
@@ -79,7 +79,15 @@
 from volcenginesdkcbr.models.resource_for_describe_backup_resources_output import ResourceForDescribeBackupResourcesOutput
 from volcenginesdkcbr.models.resource_list_for_create_backup_plan_input import ResourceListForCreateBackupPlanInput
 from volcenginesdkcbr.models.resource_list_for_update_backup_plan_input import ResourceListForUpdateBackupPlanInput
+from volcenginesdkcbr.models.tag_filter_for_describe_vaults_input import TagFilterForDescribeVaultsInput
+from volcenginesdkcbr.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
+from volcenginesdkcbr.models.tag_for_create_vault_input import TagForCreateVaultInput
 from volcenginesdkcbr.models.tag_for_describe_vaults_output import TagForDescribeVaultsOutput
+from volcenginesdkcbr.models.tag_for_tag_resources_input import TagForTagResourcesInput
+from volcenginesdkcbr.models.tag_resources_request import TagResourcesRequest
+from volcenginesdkcbr.models.tag_resources_response import TagResourcesResponse
+from volcenginesdkcbr.models.untag_resources_request import UntagResourcesRequest
+from volcenginesdkcbr.models.untag_resources_response import UntagResourcesResponse
 from volcenginesdkcbr.models.update_backup_plan_request import UpdateBackupPlanRequest
 from volcenginesdkcbr.models.update_backup_plan_response import UpdateBackupPlanResponse
 from volcenginesdkcbr.models.update_backup_policy_request import UpdateBackupPolicyRequest
@@ -89,3 +97,4 @@
 from volcenginesdkcbr.models.update_restore_job_request import UpdateRestoreJobRequest
 from volcenginesdkcbr.models.update_restore_job_response import UpdateRestoreJobResponse
 from volcenginesdkcbr.models.vault_list_for_describe_vaults_output import VaultListForDescribeVaultsOutput
+from volcenginesdkcbr.models.zone_for_describe_zones_output import ZoneForDescribeZonesOutput