Merge "integration_2026-02-27_1118277572610" into "vpn-Python-2020-04-01-online-2272-2026_02_10_20_20_48"

Conflicts:
pyproject.toml

Author: bytestarter

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "volcengine-python-sdk"
-version = "5.0.10"
+version = "5.0.12"
 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."""

volcenginesdkbilling/models/list_for_list_amortized_cost_bill_daily_output.py

@@ -132,6 +132,7 @@ class ListForListAmortizedCostBillDailyOutput(object):
         'real_value': 'str',
         'region': 'str',
         'region_code': 'str',
+        'resource_id': 'str',
         'round_amount': 'str',
         'saving_plan_original_amount': 'str',
         'seller_customer_name': 'str',
@@ -257,6 +258,7 @@ class ListForListAmortizedCostBillDailyOutput(object):
         'real_value': 'RealValue',
         'region': 'Region',
         'region_code': 'RegionCode',
+        'resource_id': 'ResourceID',
         'round_amount': 'RoundAmount',
         'saving_plan_original_amount': 'SavingPlanOriginalAmount',
         'seller_customer_name': 'SellerCustomerName',
@@ -282,7 +284,7 @@ class ListForListAmortizedCostBillDailyOutput(object):
         'zone_code': 'ZoneCode'
     }
 
-    def __init__(self, amortized_begin_time=None, amortized_day=None, amortized_end_time=None, amortized_month=None, amortized_type=None, bill_category=None, bill_id=None, bill_period=None, billing_function=None, billing_method_code=None, billing_mode=None, busi_period=None, business_mode=None, config_name=None, configuration_code=None, count=None, country_region=None, coupon_amount=None, currency=None, currency_settlement=None, daily_amortized_coupon_amount=None, daily_amortized_discount_bill_amount=None, daily_amortized_original_bill_amount=None, daily_amortized_paid_amount=None, daily_amortized_payable_amount=None, daily_amortized_posttax_amount=None, daily_amortized_pre_tax_payable_amount=None, daily_amortized_pre_tax_real_value=None, daily_amortized_preferential_bill_amount=None, daily_amortized_pretax_amount=None, daily_amortized_real_value=None, daily_amortized_round_amount=None, daily_amortized_saving_plan_original_amount=None, daily_amortized_settle_payable_amount=None, daily_amortized_settle_posttax_amount=None, daily_amortized_settle_pre_tax_payable_amount=None, daily_amortized_settle_pre_tax_real_value=None, daily_amortized_settle_pretax_amount=None, daily_amortized_settle_real_value=None, daily_amortized_settle_tax_amount=None, daily_amortized_tax_amount=None, deduction_use_duration=None, discount_bill_amount=None, discount_biz_billing_function=None, effective_factor=None, element=None, element_code=None, expand_field=None, expense_time=None, factor=None, factor_code=None, instance_name=None, instance_no=None, main_contract_number=None, now_amortized_coupon_amount=None, now_amortized_discount_bill_amount=None, now_amortized_original_bill_amount=None, now_amortized_paid_amount=None, now_amortized_payable_amount=None, now_amortized_posttax_amount=None, now_amortized_pre_tax_payable_amount=None, now_amortized_pre_tax_real_value=None, now_amortized_preferential_bill_amount=None, now_amortized_pretax_amount=None, now_amortized_real_value=None, now_amortized_round_amount=None, now_amortized_saving_plan_original_amount=None, now_amortized_settle_payable_amount=None, now_amortized_settle_posttax_amount=None, now_amortized_settle_pre_tax_payable_amount=None, now_amortized_settle_pre_tax_real_value=None, now_amortized_settle_pretax_amount=None, now_amortized_settle_real_value=None, now_amortized_settle_tax_amount=None, now_amortized_tax_amount=None, original_bill_amount=None, original_order_no=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, posttax_amount=None, pre_tax_payable_amount=None, pre_tax_real_value=None, preferential_bill_amount=None, pretax_amount=None, price=None, price_unit=None, product=None, product_zh=None, project=None, project_display_name=None, real_value=None, region=None, region_code=None, round_amount=None, saving_plan_original_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, settle_payable_amount=None, settle_posttax_amount=None, settle_pre_tax_payable_amount=None, settle_pre_tax_real_value=None, settle_pretax_amount=None, settle_real_value=None, settle_tax_amount=None, split_item_id=None, split_item_name=None, subject_name=None, tag=None, tax=None, tax_rate=None, unit=None, use_duration=None, use_duration_unit=None, zone=None, zone_code=None, _configuration=None):  # noqa: E501
+    def __init__(self, amortized_begin_time=None, amortized_day=None, amortized_end_time=None, amortized_month=None, amortized_type=None, bill_category=None, bill_id=None, bill_period=None, billing_function=None, billing_method_code=None, billing_mode=None, busi_period=None, business_mode=None, config_name=None, configuration_code=None, count=None, country_region=None, coupon_amount=None, currency=None, currency_settlement=None, daily_amortized_coupon_amount=None, daily_amortized_discount_bill_amount=None, daily_amortized_original_bill_amount=None, daily_amortized_paid_amount=None, daily_amortized_payable_amount=None, daily_amortized_posttax_amount=None, daily_amortized_pre_tax_payable_amount=None, daily_amortized_pre_tax_real_value=None, daily_amortized_preferential_bill_amount=None, daily_amortized_pretax_amount=None, daily_amortized_real_value=None, daily_amortized_round_amount=None, daily_amortized_saving_plan_original_amount=None, daily_amortized_settle_payable_amount=None, daily_amortized_settle_posttax_amount=None, daily_amortized_settle_pre_tax_payable_amount=None, daily_amortized_settle_pre_tax_real_value=None, daily_amortized_settle_pretax_amount=None, daily_amortized_settle_real_value=None, daily_amortized_settle_tax_amount=None, daily_amortized_tax_amount=None, deduction_use_duration=None, discount_bill_amount=None, discount_biz_billing_function=None, effective_factor=None, element=None, element_code=None, expand_field=None, expense_time=None, factor=None, factor_code=None, instance_name=None, instance_no=None, main_contract_number=None, now_amortized_coupon_amount=None, now_amortized_discount_bill_amount=None, now_amortized_original_bill_amount=None, now_amortized_paid_amount=None, now_amortized_payable_amount=None, now_amortized_posttax_amount=None, now_amortized_pre_tax_payable_amount=None, now_amortized_pre_tax_real_value=None, now_amortized_preferential_bill_amount=None, now_amortized_pretax_amount=None, now_amortized_real_value=None, now_amortized_round_amount=None, now_amortized_saving_plan_original_amount=None, now_amortized_settle_payable_amount=None, now_amortized_settle_posttax_amount=None, now_amortized_settle_pre_tax_payable_amount=None, now_amortized_settle_pre_tax_real_value=None, now_amortized_settle_pretax_amount=None, now_amortized_settle_real_value=None, now_amortized_settle_tax_amount=None, now_amortized_tax_amount=None, original_bill_amount=None, original_order_no=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, posttax_amount=None, pre_tax_payable_amount=None, pre_tax_real_value=None, preferential_bill_amount=None, pretax_amount=None, price=None, price_unit=None, product=None, product_zh=None, project=None, project_display_name=None, real_value=None, region=None, region_code=None, resource_id=None, round_amount=None, saving_plan_original_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, settle_payable_amount=None, settle_posttax_amount=None, settle_pre_tax_payable_amount=None, settle_pre_tax_real_value=None, settle_pretax_amount=None, settle_real_value=None, settle_tax_amount=None, split_item_id=None, split_item_name=None, subject_name=None, tag=None, tax=None, tax_rate=None, unit=None, use_duration=None, use_duration_unit=None, zone=None, zone_code=None, _configuration=None):  # noqa: E501
         """ListForListAmortizedCostBillDailyOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -387,6 +389,7 @@ def __init__(self, amortized_begin_time=None, amortized_day=None, amortized_end_
         self._real_value = None
         self._region = None
         self._region_code = None
+        self._resource_id = None
         self._round_amount = None
         self._saving_plan_original_amount = None
         self._seller_customer_name = None
@@ -610,6 +613,8 @@ def __init__(self, amortized_begin_time=None, amortized_day=None, amortized_end_
             self.region = region
         if region_code is not None:
             self.region_code = region_code
+        if resource_id is not None:
+            self.resource_id = resource_id
         if round_amount is not None:
             self.round_amount = round_amount
         if saving_plan_original_amount is not None:
@@ -2736,6 +2741,27 @@ def region_code(self, region_code):
 
         self._region_code = region_code
 
+    @property
+    def resource_id(self):
+        """Gets the resource_id of this ListForListAmortizedCostBillDailyOutput.  # noqa: E501
+
+
+        :return: The resource_id of this ListForListAmortizedCostBillDailyOutput.  # noqa: E501
+        :rtype: str
+        """
+        return self._resource_id
+
+    @resource_id.setter
+    def resource_id(self, resource_id):
+        """Sets the resource_id of this ListForListAmortizedCostBillDailyOutput.
+
+
+        :param resource_id: The resource_id of this ListForListAmortizedCostBillDailyOutput.  # noqa: E501
+        :type: str
+        """
+
+        self._resource_id = resource_id
+
     @property
     def round_amount(self):
         """Gets the round_amount of this ListForListAmortizedCostBillDailyOutput.  # noqa: E501