Merge branch 'main' into feature/source_channel

Author: jinhaiyang

.github/workflows/_release.yml

@@ -154,19 +154,19 @@ jobs:
             --extra-index-url https://test.pypi.org/simple/ \
             "$PKG_NAME==$VERSION"
 
-      - name: Run unit tests
-        run: make tests
-        env:
-          ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
-          ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
-        working-directory: ${{ inputs.working-directory }}
+      # - name: Run unit tests
+      #   run: make tests
+      #   env:
+      #     ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
+      #     ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
+      #   working-directory: ${{ inputs.working-directory }}
 
-      - name: Run integration tests
-        env:
-          ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
-          ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
-        run: make integration_tests
-        working-directory: ${{ inputs.working-directory }}
+      # - name: Run integration tests
+      #   env:
+      #     ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
+      #     ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
+      #   run: make integration_tests
+      #   working-directory: ${{ inputs.working-directory }}
 
   publish:
     needs:

pyproject.toml

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

tests/integration_tests/test_moderation.py

@@ -0,0 +1,32 @@
+import os.path
+
+from zhipuai import ZhipuAI
+import zhipuai
+import time
+
+import logging
+import logging.config
+
+
+def test_completions_temp0(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI(api_key="",disable_token_cache = False)  # 填写您自己的APIKey
+    try:
+        # 生成request_id
+        request_id = time.time()
+        print(f"request_id:{request_id}")
+        response = client.moderation.moderations.create(
+            model="moderation",
+            input={
+                "type": "text",
+                "text": "hello world "
+            }
+        )
+        print(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_web_search.py

@@ -15,7 +15,8 @@ def test_web_search(logging_conf):
             count=50,
             search_domain_filter="finance.sina.com.cn",
             search_recency_filter="oneYear",
-            content_size="high"
+            content_size="high",
+            search_intent=True,
         )
         print(response)
 

zhipuai/_client.py

@@ -67,6 +67,7 @@ def __init__(
         self.assistant = api_resource.Assistant(self)
         self.web_search = api_resource.WebSearchApi(self)
         self.audio = api_resource.audio.Audio(self)
+        self.moderation = api_resource.moderation.Moderation(self)
 
     @property
     @override

zhipuai/api_resource/__init__.py

@@ -37,6 +37,10 @@
     Audio
 )
 
+from .moderation import (
+    Moderation
+)
+
 from .web_search import (
     WebSearchApi
 )
@@ -55,5 +59,6 @@
     'Knowledge',
     'Tools',
     'Assistant',
-    'Audio'
-]
+    'Audio',
+    'Moderation'
+]

zhipuai/api_resource/moderation/__init__.py

@@ -0,0 +1,7 @@
+from .moderation import (
+    Moderation
+)
+
+__all__ = [
+    'Moderation'
+]

zhipuai/api_resource/moderation/moderation.py

@@ -0,0 +1,10 @@
+from typing import TYPE_CHECKING
+
+from .moderations import Moderations
+from ...core import BaseAPI, cached_property
+
+__all__ = ["Moderation"]
+class Moderation(BaseAPI):
+    @cached_property
+    def moderations(self) -> Moderations:
+        return Moderations(self._client)

zhipuai/api_resource/moderation/moderations.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from typing import Union, List, TYPE_CHECKING, Dict
+
+import logging
+from ...core import BaseAPI, deepcopy_minimal
+from ...types.moderation.moderation_completion import Completion
+
+
+logger = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from ..._client import ZhipuAI
+
+
+class Moderations(BaseAPI):
+    def __init__(self, client: "ZhipuAI") -> None:
+        super().__init__(client)
+
+    def create(
+            self,
+            *,
+            model: str,
+            input: Union[str, List[str], Dict],
+    ) -> Completion:
+
+        body = deepcopy_minimal({
+            "model": model,
+            "input": input
+        })
+        return self._post(
+            "/moderations",
+            body=body,
+            cast_type=Completion
+        )
+
+

zhipuai/api_resource/web_search/web_search.py

@@ -38,6 +38,7 @@ def web_search(
             search_domain_filter: Optional[str] | NotGiven = NOT_GIVEN,
             search_recency_filter: Optional[str] | NotGiven = NOT_GIVEN,
             content_size: Optional[str] | NotGiven = NOT_GIVEN,
+            search_intent: Optional[bool] | NotGiven = NOT_GIVEN,
             extra_headers: Headers | None = None,
             extra_body: Body | None = None,
             timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
@@ -54,6 +55,7 @@ def web_search(
                 "search_domain_filter": search_domain_filter,
                 "search_recency_filter": search_recency_filter,
                 "content_size": content_size,
+                "search_intent": search_intent,
             })
         return self._post(
             "/web_search",