Merge branch 'integration_2025-04-17_865081244162' into tis-Python-2024-07-31-online-1094-2025_04_08_12_33_28

# Conflicts:
#	meta.json
#	setup.py
#	volcenginesdkcore/api_client.py
#	volcenginesdkcore/configuration.py

Author: volc-sdk-team

volcenginesdkarkruntime/types/chat/chat_completion_assistant_message_param.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-from typing import Iterable, Optional
+from typing import Union, Iterable, Optional
 from typing_extensions import Literal, Required, TypedDict
 
 from .chat_completion_message_tool_call_param import ChatCompletionMessageToolCallParam
+from .chat_completion_content_part_param import ChatCompletionContentPartParam
 
 __all__ = ["ChatCompletionAssistantMessageParam", "FunctionCall"]
 
@@ -25,7 +26,7 @@ class ChatCompletionAssistantMessageParam(TypedDict, total=False):
     role: Required[Literal["assistant"]]
     """The role of the messages author, in this case `assistant`."""
 
-    content: Optional[str]
+    content: Optional[Union[str, Iterable[ChatCompletionContentPartParam]]]
     """The contents of the assistant message.
 
     Required unless `tool_calls` or `function_call` is specified.

volcenginesdkarkruntime/types/chat/chat_completion_system_message_param.py

@@ -1,14 +1,15 @@
 from __future__ import annotations
 
-from typing import Optional
-
+from typing import Union, Iterable, Optional
 from typing_extensions import Literal, Required, TypedDict
 
+from .chat_completion_content_part_param import ChatCompletionContentPartParam
+
 __all__ = ["ChatCompletionSystemMessageParam"]
 
 
 class ChatCompletionSystemMessageParam(TypedDict, total=False):
-    content: Required[str]
+    content: Required[Union[str, Iterable[ChatCompletionContentPartParam]]]
     """The contents of the system message."""
 
     role: Required[Literal["system"]]

volcenginesdkarkruntime/types/chat/chat_completion_tool_message_param.py

@@ -1,14 +1,15 @@
 from __future__ import annotations
 
-from typing import Optional
+from typing import Optional, Union, Iterable
 
 from typing_extensions import Literal, Required, TypedDict
+from .chat_completion_content_part_param import ChatCompletionContentPartParam
 
 __all__ = ["ChatCompletionToolMessageParam"]
 
 
 class ChatCompletionToolMessageParam(TypedDict, total=False):
-    content: Required[str]
+    content: Required[Union[str, Iterable[ChatCompletionContentPartParam]]]
     """The contents of the tool message."""
 
     role: Required[Literal["tool"]]

volcenginesdkbilling/models/renew_instance_request.py

@@ -38,7 +38,8 @@ class RenewInstanceRequest(object):
         'product': 'str',
         'renew_related_instance': 'bool',
         'renewal_duration': 'int',
-        'renewal_duration_unit': 'str'
+        'renewal_duration_unit': 'str',
+        'united_expire_day': 'str'
     }
 
     attribute_map = {
@@ -47,10 +48,11 @@ class RenewInstanceRequest(object):
         'product': 'Product',
         'renew_related_instance': 'RenewRelatedInstance',
         'renewal_duration': 'RenewalDuration',
-        'renewal_duration_unit': 'RenewalDurationUnit'
+        'renewal_duration_unit': 'RenewalDurationUnit',
+        'united_expire_day': 'UnitedExpireDay'
     }
 
-    def __init__(self, client_token=None, instance_id=None, product=None, renew_related_instance=None, renewal_duration=None, renewal_duration_unit=None, _configuration=None):  # noqa: E501
+    def __init__(self, client_token=None, instance_id=None, product=None, renew_related_instance=None, renewal_duration=None, renewal_duration_unit=None, united_expire_day=None, _configuration=None):  # noqa: E501
         """RenewInstanceRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -62,6 +64,7 @@ def __init__(self, client_token=None, instance_id=None, product=None, renew_rela
         self._renew_related_instance = None
         self._renewal_duration = None
         self._renewal_duration_unit = None
+        self._united_expire_day = None
         self.discriminator = None
 
         if client_token is not None:
@@ -73,6 +76,8 @@ def __init__(self, client_token=None, instance_id=None, product=None, renew_rela
         if renewal_duration is not None:
             self.renewal_duration = renewal_duration
         self.renewal_duration_unit = renewal_duration_unit
+        if united_expire_day is not None:
+            self.united_expire_day = united_expire_day
 
     @property
     def client_token(self):
@@ -206,6 +211,27 @@ def renewal_duration_unit(self, renewal_duration_unit):
 
         self._renewal_duration_unit = renewal_duration_unit
 
+    @property
+    def united_expire_day(self):
+        """Gets the united_expire_day of this RenewInstanceRequest.  # noqa: E501
+
+
+        :return: The united_expire_day of this RenewInstanceRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._united_expire_day
+
+    @united_expire_day.setter
+    def united_expire_day(self, united_expire_day):
+        """Sets the united_expire_day of this RenewInstanceRequest.
+
+
+        :param united_expire_day: The united_expire_day of this RenewInstanceRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._united_expire_day = united_expire_day
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}