Merge branch 'main' into feature/web-search-0410

s the commit.

Author: jinhaiyang

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zhipuai"
-version = "2.1.5.20250106"
+version = "2.1.5.20250410"
 description = "A SDK library for accessing big model apis from ZhipuAI"
 authors = ["Zhipu AI"]
 readme = "README.md"

tests/integration_tests/test_assistant.py

@@ -1,9 +1,8 @@
-import os
 import logging
 import logging.config
 import zhipuai
 from zhipuai import ZhipuAI
-
+import json
 
 def test_assistant(logging_conf) -> None:
     logging.config.dictConfig(logging_conf)  # type: ignore
@@ -12,7 +11,6 @@ def test_assistant(logging_conf) -> None:
 
         generate = client.assistant.conversation(
             assistant_id="659e54b1b8006379b4b2abd6",
-            model="glm-4-assistant",
             messages=[
                 {
                     "role": "user",
@@ -73,3 +71,41 @@ def test_assistant_query_conversation_usage(logging_conf) -> None:
         print(err)
     except zhipuai.core._errors.APIStatusError as err:
         print(err)
+
+
+def test_translate_api(logging_conf) -> None:
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 填写您自己的APIKey
+    try:
+        translate_response = client.assistant.conversation(
+            assistant_id="9996ijk789lmn012o345p999",
+            messages=[
+                {
+                    "role": "user",
+                    "content": [{
+                        "type": "text",
+                        "text": "你好呀"
+                    }]
+                }
+            ],
+            stream=True,
+            attachments=None,
+            metadata=None,
+            request_id="request_1790291013237211136",
+            user_id="12345678",
+            extra_parameters = {
+                "translate": {
+                    "from": "zh",
+                    "to": "en"
+                }
+            }
+        )
+        for chunk in translate_response:
+            print(chunk.choices[0].delta)
+        #print(translate_response)
+    except zhipuai.core._errors.APIRequestFailedError as err:
+        print(err)
+    except zhipuai.core._errors.APIInternalError as err:
+        print(err)
+    except zhipuai.core._errors.APIStatusError as err:
+        print(err)

tests/integration_tests/test_charglm3.py

@@ -68,17 +68,17 @@ def test_async_completions():
     except zhipuai.core._errors.APIStatusError as err:
         print(err)
 
-def test_retrieve_completion_result():
-    client = ZhipuAI()  # 请填写您自己的APIKey
-    try:
-        response = client.chat.asyncCompletions.retrieve_completion_result(id="1014908592669352541650991")
-        print(response)
-
-
-    except zhipuai.core._errors.APIRequestFailedError as err:
-        print(err) 
-    except zhipuai.core._errors.APIInternalError as err:
-        print(err)
-
-if __name__ == "__main__":
-    test_retrieve_completion_result()
+# def test_retrieve_completion_result():
+#     client = ZhipuAI()  # 请填写您自己的APIKey
+#     try:
+#         response = client.chat.asyncCompletions.retrieve_completion_result(id="1014908592669352541650991")
+#         print(response)
+#
+#
+#     except zhipuai.core._errors.APIRequestFailedError as err:
+#         print(err)
+#     except zhipuai.core._errors.APIInternalError as err:
+#         print(err)
+
+# if __name__ == "__main__":
+#     test_retrieve_completion_result()

tests/integration_tests/test_code_geex.py

@@ -22,7 +22,7 @@ def test_code_geex(logging_conf):
                 {
                     "role": "system",
                     "content": """你是一位智能编程助手，你叫CodeGeeX。你会为用户回答关于编程、代码、计算机方面的任何问题，并提供格式规范、可以执行、准确安全的代码，并在必要时提供详细的解释。
-                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。 
+                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。
                     请用中文回答。"""
                 },
                 {
@@ -74,7 +74,7 @@ def test_code_geex_async(logging_conf):
                 {
                     "role": "system",
                     "content": """你是一位智能编程助手，你叫CodeGeeX。你会为用户回答关于编程、代码、计算机方面的任何问题，并提供格式规范、可以执行、准确安全的代码，并在必要时提供详细的解释。
-                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。 
+                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。
                     请用中文回答。"""
                 },
                 {

zhipuai/api_resource/assistant/assistant.py

@@ -33,30 +33,31 @@ def __init__(self, client: "ZhipuAI") -> None:
     def conversation(
             self,
             assistant_id: str,
-            model: str,
             messages: List[assistant_create_params.ConversationMessage],
+            model: str = None,
             *,
-            stream: bool = True,
+            stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN,
             conversation_id: Optional[str] = None,
             attachments: Optional[List[assistant_create_params.AssistantAttachments]] = None,
             metadata: dict | None = None,
             request_id: str = None,
             user_id: str = None,
+            extra_parameters: Optional[assistant_create_params.ExtraParameters] = None,
             extra_headers: Headers | None = None,
             extra_body: Body | None = None,
             timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> StreamResponse[AssistantCompletion]:
+    ) -> AssistantCompletion | StreamResponse[AssistantCompletion]:
         body = deepcopy_minimal(
             {
                 "assistant_id": assistant_id,
-                "model": model,
                 "messages": messages,
                 "stream": stream,
                 "conversation_id": conversation_id,
                 "attachments": attachments,
                 "metadata": metadata,
                 "request_id": request_id,
                 "user_id": user_id,
+                "extra_parameters": extra_parameters
             }
         )
         return self._post(
@@ -66,7 +67,7 @@ def conversation(
                 extra_headers=extra_headers, extra_body=extra_body, timeout=timeout
             ),
             cast_type=AssistantCompletion,
-            stream=stream or True,
+            stream=stream or False,
             stream_cls=StreamResponse[AssistantCompletion],
         )
 

zhipuai/types/assistant/assistant_create_params.py

@@ -28,3 +28,11 @@ class AssistantParameters(TypedDict, total=False):
     messages: List[ConversationMessage]  # 会话消息体
     attachments: Optional[List[AssistantAttachments]]  # 会话指定的文件，非必填
     metadata: Optional[dict]  # 元信息，拓展字段，非必填
+
+class TranslateParameters(TypedDict, total=False):
+    from_language: str
+    to_language: str
+
+class ExtraParameters(TypedDict, total=False):
+    translate: TranslateParameters
+