Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions tests/integration_tests/test_assistant.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,7 +11,6 @@ def test_assistant(logging_conf) -> None:

generate = client.assistant.conversation(
assistant_id="659e54b1b8006379b4b2abd6",
model="glm-4-assistant",
messages=[
{
"role": "user",
Expand Down Expand Up @@ -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)
11 changes: 6 additions & 5 deletions zhipuai/api_resource/assistant/assistant.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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],
)

Expand Down
8 changes: 8 additions & 0 deletions zhipuai/types/assistant/assistant_create_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -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