Merge remote-tracking branch 'origin/main'

Author: jinhaiyang

tests/integration_tests/asr1.wav

@@ -0,0 +1,45 @@
+from zhipuai import ZhipuAI
+import zhipuai
+
+import logging
+import logging.config
+
+
+def test_transcriptions(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 填写您自己的APIKey
+    try:
+        with open("asr1.wav", "rb") as audio_file:
+            transcriptResponse = client.audio.transcriptions.create(
+                model="glm-asr",
+                file=audio_file,
+                stream=False
+            )
+            print(transcriptResponse)
+    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)
+
+
+def test_transcriptions_stream(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 填写您自己的APIKey
+    try:
+        with open("asr1.wav", "rb") as audio_file:
+            transcriptResponse = client.audio.transcriptions.create(
+                model="glm-asr",
+                file=audio_file,
+                stream=True
+            )
+            for item in transcriptResponse:
+                print(item)
+    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_transcriptions.py

@@ -63,6 +63,7 @@ def __init__(
         self.videos = api_resource.Videos(self)
         self.assistant = api_resource.Assistant(self)
         self.web_search = api_resource.WebSearchApi(self)
+        self.audio = api_resource.audio.Audio(self)
 
     @property
     @override

zhipuai/_client.py

@@ -33,6 +33,9 @@
 from .assistant import (
     Assistant,
 )
+from .audio import (
+    Audio
+)
 
 from .web_search import (
     WebSearchApi
@@ -52,5 +55,5 @@
     'Knowledge',
     'Tools',
     'Assistant',
-
+    'Audio'
 ]

zhipuai/api_resource/__init__.py

@@ -0,0 +1,13 @@
+from .audio import (
+    Audio
+)
+
+from .transcriptions import (
+    Transcriptions
+)
+
+
+__all__ = [
+    'Audio',
+    'Transcriptions'
+]

zhipuai/api_resource/audio/__init__.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from ...core import BaseAPI, cached_property
+from .transcriptions import Transcriptions
+
+
+
+__all__ = ["Audio"]
+class Audio(BaseAPI):
+    @cached_property
+    def transcriptions(self) -> Transcriptions:
+        return Transcriptions(self._client)

zhipuai/api_resource/audio/audio.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, List, Mapping, cast, Optional, Dict
+from ...types.audio import transcriptions_create_param
+
+import httpx
+import logging
+from typing_extensions import Literal
+
+from ...core import BaseAPI, deepcopy_minimal, maybe_transform, drop_prefix_image_data
+from ...core import make_request_options
+from ...core import StreamResponse
+from ...types.chat.chat_completion import Completion
+from ...types.chat.chat_completion_chunk import ChatCompletionChunk
+from ...types.sensitive_word_check import SensitiveWordCheckRequest
+from ...core import NOT_GIVEN, Body, Headers, NotGiven, FileTypes
+from zhipuai.core._utils import extract_files
+
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from ..._client import ZhipuAI
+
+
+__all__ = ["Transcriptions"]
+
+class Transcriptions(BaseAPI):
+    def __init__(self, client: "ZhipuAI") -> None:
+        super().__init__(client)
+
+    def create(
+            self,
+            *,
+            file: FileTypes,
+            model: str,
+            request_id: Optional[str] | NotGiven = NOT_GIVEN,
+            user_id: Optional[str] | NotGiven = NOT_GIVEN,
+            stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN,
+            temperature: Optional[float] | NotGiven = NOT_GIVEN,
+            sensitive_word_check: Optional[SensitiveWordCheckRequest] | NotGiven = NOT_GIVEN,
+            extra_headers: Headers | None = None,
+            extra_body: Body | None = None,
+            timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN
+    ) -> Completion | StreamResponse[ChatCompletionChunk]:
+        if temperature is not None and temperature != NOT_GIVEN:
+            if temperature <= 0:
+                temperature = 0.01
+            if temperature >= 1:
+                temperature = 0.99
+
+        body = deepcopy_minimal({
+            "model": model,
+            "file": file,
+            "request_id": request_id,
+            "user_id": user_id,
+            "temperature": temperature,
+            "sensitive_word_check": sensitive_word_check,
+            "stream": stream
+        })
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
+        if files:
+            extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._post(
+            "/audio/transcriptions",
+            body=maybe_transform(body, transcriptions_create_param.TranscriptionsParam),
+            files=files,
+            options=make_request_options(
+                extra_headers=extra_headers, extra_body=extra_body, timeout=timeout
+            ),
+            cast_type=Completion,
+            stream=stream or False,
+            stream_cls=StreamResponse[ChatCompletionChunk],
+        )

zhipuai/api_resource/audio/transcriptions.py

@@ -0,0 +1,6 @@
+
+from .transcriptions_create_param import(
+    TranscriptionsParam
+)
+
+__all__ = ["TranscriptionsParam"]

zhipuai/types/audio/__init__.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from typing import List, Optional
+
+from typing_extensions import Literal, Required, TypedDict
+__all__ = ["TranscriptionsParam"]
+
+from ..sensitive_word_check import SensitiveWordCheckRequest
+
+class TranscriptionsParam(TypedDict, total=False):
+    model: str
+    """模型编码"""
+    temperature:float
+    """采样温度"""
+    stream: bool
+    """是否流式输出"""
+    sensitive_word_check: Optional[SensitiveWordCheckRequest]
+    request_id: str
+    """由用户端传参，需保证唯一性；用于区分每次请求的唯一标识，用户端不传时平台会默认生成。"""
+    user_id: str
+    """用户端。"""