Code geex (#38)

glide-the · web-flow · commit 0ae6633c7298 · 2024-07-04T19:23:50.000+08:00
* codegeex代码示例

* codegeex增加异步参数
diff --git a/tests/integration_tests/test_code_geex.py b/tests/integration_tests/test_code_geex.py
@@ -0,0 +1,128 @@
+import os.path
+
+from zhipuai import ZhipuAI
+import zhipuai
+import time
+
+import logging
+import logging.config
+
+
+def test_code_geex(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 填写您自己的APIKey
+    try:
+        # 生成request_id
+        request_id = time.time()
+        print(f"request_id:{request_id}")
+        response = client.chat.completions.create(
+            request_id=request_id,
+            model="codegeex-4",
+            messages=[
+                {
+                    "role": "system",
+                    "content": """你是一位智能编程助手，你叫CodeGeeX。你会为用户回答关于编程、代码、计算机方面的任何问题，并提供格式规范、可以执行、准确安全的代码，并在必要时提供详细的解释。
+                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。 
+                    请用中文回答。"""
+                },
+                {
+                    "role": "user",
+                    "content": """写一个快速排序函数"""
+                }
+            ],
+            top_p=0.7,
+            temperature=0.9,
+            max_tokens=2000,
+            stop=["<|endoftext|>", "<|user|>", "<|assistant|>", "<|observation|>"],
+            extra={
+                "target": {
+                    "path": "11111",
+                    "language": "Python",
+                    "code_prefix": "EventSource.Factory factory = EventSources.createFactory(OkHttpUtils.getInstance());",
+                    "code_suffix": "TaskMonitorLocal taskMonitorLocal = getTaskMonitorLocal(algoMqReq);"
+                },
+                "contexts": [
+                    {
+                        "path": "/1/2",
+                        "code": "if(!sensitiveUser){ZpTraceUtils.addAsyncAttribute(algoMqReq.getTaskOrderNo(), ApiTraceProperty.request_params.getCode(), modelSendMap);"
+                    }
+
+                ]
+            }
+        )
+        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)
+
+
+def test_code_geex_async(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 填写您自己的APIKey
+    try:
+        # 生成request_id
+        request_id = time.time()
+        print(f"request_id:{request_id}")
+        response = client.chat.asyncCompletions.create(
+            request_id=request_id,
+            model="codegeex-4",
+            messages=[
+                {
+                    "role": "system",
+                    "content": """你是一位智能编程助手，你叫CodeGeeX。你会为用户回答关于编程、代码、计算机方面的任何问题，并提供格式规范、可以执行、准确安全的代码，并在必要时提供详细的解释。
+                    任务：请为输入代码提供格式规范的注释，包含多行注释和单行注释，请注意不要改动原始代码，只需要添加注释。 
+                    请用中文回答。"""
+                },
+                {
+                    "role": "user",
+                    "content": """写一个快速排序函数"""
+                }
+            ],
+            top_p=0.7,
+            temperature=0.9,
+            max_tokens=2000,
+            stop=["<|endoftext|>", "<|user|>", "<|assistant|>", "<|observation|>"],
+            extra={
+                "target": {
+                    "path": "11111",
+                    "language": "Python",
+                    "code_prefix": "EventSource.Factory factory = EventSources.createFactory(OkHttpUtils.getInstance());",
+                    "code_suffix": "TaskMonitorLocal taskMonitorLocal = getTaskMonitorLocal(algoMqReq);"
+                },
+                "contexts": [
+                    {
+                        "path": "/1/2",
+                        "code": "if(!sensitiveUser){ZpTraceUtils.addAsyncAttribute(algoMqReq.getTaskOrderNo(), ApiTraceProperty.request_params.getCode(), modelSendMap);"
+                    }
+
+                ]
+            }
+        )
+        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)
+
+
+def test_geex_result(logging_conf):
+    logging.config.dictConfig(logging_conf)  # type: ignore
+    client = ZhipuAI()  # 请填写您自己的APIKey
+    try:
+        response = client.chat.asyncCompletions.retrieve_completion_result(id="1014908807577524653187108")
+        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)
diff --git a/zhipuai/api_resource/chat/async_completions.py b/zhipuai/api_resource/chat/async_completions.py
@@ -1,14 +1,18 @@
 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import Union, List, Optional, TYPE_CHECKING, Dict
 
 import httpx
+import logging
 from typing_extensions import Literal
 
-from ...core import BaseAPI
+from ...core import BaseAPI, maybe_transform, drop_prefix_image_data
 from ...core import NotGiven, NOT_GIVEN, Headers, Body
 from ...core import make_request_options
 from ...types.chat.async_chat_completion import AsyncTaskStatus, AsyncCompletion
+from ...types.chat.code_geex import code_geex_params
+
+logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
     from ..._client import ZhipuAI
@@ -18,7 +22,6 @@ class AsyncCompletions(BaseAPI):
     def __init__(self, client: "ZhipuAI") -> None:
         super().__init__(client)
 
-
     def create(
             self,
             *,
@@ -34,33 +37,58 @@ def create(
             sensitive_word_check: Optional[object] | NotGiven = NOT_GIVEN,
             tools: Optional[object] | NotGiven = NOT_GIVEN,
             tool_choice: str | NotGiven = NOT_GIVEN,
-            meta: Optional[Dict[str,str]] | NotGiven = NOT_GIVEN,
+            meta: Optional[Dict[str, str]] | NotGiven = NOT_GIVEN,
+            extra: Optional[code_geex_params.CodeGeexExtra] | NotGiven = NOT_GIVEN,
             extra_headers: Headers | None = None,
             extra_body: Body | None = None,
-            disable_strict_validation: Optional[bool] | None = None,
             timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> AsyncTaskStatus:
         _cast_type = AsyncTaskStatus
+        logger.debug(f"temperature:{temperature}, top_p:{top_p}")
+        if temperature is not None and temperature != NOT_GIVEN:
+
+            if temperature <= 0:
+                do_sample = False
+                temperature = 0.01
+                # logger.warning("temperature:取值范围是：(0.0, 1.0) 开区间，do_sample重写为:false（参数top_p temperture不生效）")
+            if temperature >= 1:
+                temperature = 0.99
+                # logger.warning("temperature:取值范围是：(0.0, 1.0) 开区间")
+        if top_p is not None and top_p != NOT_GIVEN:
 
-        if disable_strict_validation:
-            _cast_type = object
+            if top_p >= 1:
+                top_p = 0.99
+                # logger.warning("top_p:取值范围是：(0.0, 1.0) 开区间，不能等于 0 或 1")
+            if top_p <= 0:
+                top_p = 0.01
+                # logger.warning("top_p:取值范围是：(0.0, 1.0) 开区间，不能等于 0 或 1")
+
+        logger.debug(f"temperature:{temperature}, top_p:{top_p}")
+        if isinstance(messages, List):
+            for item in messages:
+                if item.get('content'):
+                    item['content'] = drop_prefix_image_data(item['content'])
+
+        body = {
+            "model": model,
+            "request_id": request_id,
+            "temperature": temperature,
+            "top_p": top_p,
+            "do_sample": do_sample,
+            "max_tokens": max_tokens,
+            "seed": seed,
+            "messages": messages,
+            "stop": stop,
+            "sensitive_word_check": sensitive_word_check,
+            "tools": tools,
+            "tool_choice": tool_choice,
+            "meta": meta,
+            "extra": maybe_transform(extra, code_geex_params.CodeGeexExtra),
+        }
         return self._post(
             "/async/chat/completions",
-            body={
-                "model": model,
-                "request_id": request_id,
-                "temperature": temperature,
-                "top_p": top_p,
-                "do_sample": do_sample,
-                "max_tokens": max_tokens,
-                "seed": seed,
-                "messages": messages,
-                "stop": stop,
-                "sensitive_word_check": sensitive_word_check,
-                "tools": tools,
-                "tool_choice": tool_choice,
-                "meta": meta,
-            },
+
+            body=body,
             options=make_request_options(
                 extra_headers=extra_headers, extra_body=extra_body, timeout=timeout
             ),
@@ -69,22 +97,17 @@ def create(
         )
 
     def retrieve_completion_result(
-        self,
-        id: str,
-        extra_headers: Headers | None = None,
-        extra_body: Body | None = None,
-        disable_strict_validation: Optional[bool] | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+            self,
+            id: str,
+            extra_headers: Headers | None = None,
+            extra_body: Body | None = None,
+            timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> Union[AsyncCompletion, AsyncTaskStatus]:
-        _cast_type = Union[AsyncCompletion,AsyncTaskStatus]
-        if disable_strict_validation:
-            _cast_type = object
+        _cast_type = Union[AsyncCompletion, AsyncTaskStatus]
         return self._get(
             path=f"/async-result/{id}",
             cast_type=_cast_type,
             options=make_request_options(
                 extra_headers=extra_headers, extra_body=extra_body, timeout=timeout
             ),
         )
-
-
diff --git a/zhipuai/api_resource/chat/completions.py b/zhipuai/api_resource/chat/completions.py
@@ -1,17 +1,18 @@
 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import Union, List, Optional, TYPE_CHECKING, Dict
 
 import httpx
 import logging
 from typing_extensions import Literal
 
-from ...core import BaseAPI
+from ...core import BaseAPI, deepcopy_minimal, maybe_transform, drop_prefix_image_data
 from ...core import NotGiven, NOT_GIVEN, Headers, Query, Body
 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.chat.code_geex import code_geex_params
 
 logger = logging.getLogger(__name__)
 
@@ -40,6 +41,7 @@ def create(
             tools: Optional[object] | NotGiven = NOT_GIVEN,
             tool_choice: str | NotGiven = NOT_GIVEN,
             meta: Optional[Dict[str,str]] | NotGiven = NOT_GIVEN,
+            extra: Optional[code_geex_params.CodeGeexExtra] | NotGiven = NOT_GIVEN,
             extra_headers: Headers | None = None,
             extra_body: Body | None = None,
             timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
@@ -67,26 +69,28 @@ def create(
         if isinstance(messages, List):
             for item in messages:
                 if item.get('content'):
-                    item['content'] = self._drop_prefix_image_data(item['content'])
+                    item['content'] = drop_prefix_image_data(item['content'])
 
+        body = deepcopy_minimal({
+            "model": model,
+            "request_id": request_id,
+            "temperature": temperature,
+            "top_p": top_p,
+            "do_sample": do_sample,
+            "max_tokens": max_tokens,
+            "seed": seed,
+            "messages": messages,
+            "stop": stop,
+            "sensitive_word_check": sensitive_word_check,
+            "stream": stream,
+            "tools": tools,
+            "tool_choice": tool_choice,
+            "meta": meta,
+            "extra": maybe_transform(extra, code_geex_params.CodeGeexExtra),
+        })
         return self._post(
             "/chat/completions",
-            body={
-                "model": model,
-                "request_id": request_id,
-                "temperature": temperature,
-                "top_p": top_p,
-                "do_sample": do_sample,
-                "max_tokens": max_tokens,
-                "seed": seed,
-                "messages": messages,
-                "stop": stop,
-                "sensitive_word_check": sensitive_word_check,
-                "stream": stream,
-                "tools": tools,
-                "tool_choice": tool_choice,
-                "meta": meta,
-            },
+            body=body,
             options=make_request_options(
                 extra_headers=extra_headers, extra_body=extra_body, timeout=timeout
             ),
@@ -95,19 +99,4 @@ def create(
             stream_cls=StreamResponse[ChatCompletionChunk],
         )
 
-    def _drop_prefix_image_data(self, content: Union[str,List[dict]]) -> Union[str,List[dict]]:
-        """
-        删除 ;base64, 前缀
-        :param image_data:
-        :return:
-        """
-        if isinstance(content, List):
-            for data in content:
-                if data.get('type') == 'image_url':
-                    image_data = data.get("image_url").get("url")
-                    if image_data.startswith("data:image/"):
-                        image_data = image_data.split("base64,")[-1]
-                        data["image_url"]["url"] = image_data
-
-        return content
 
diff --git a/zhipuai/core/__init__.py b/zhipuai/core/__init__.py
@@ -58,6 +58,7 @@
     maybe_transform,
     deepcopy_minimal,
     extract_files,
+    drop_prefix_image_data,
 )
 
 from ._sse_client import StreamResponse
diff --git a/zhipuai/core/_utils/__init__.py b/zhipuai/core/_utils/__init__.py
@@ -29,6 +29,7 @@
     get_required_header as get_required_header,
     maybe_coerce_boolean as maybe_coerce_boolean,
     maybe_coerce_integer as maybe_coerce_integer,
+    drop_prefix_image_data as drop_prefix_image_data,
 )
 
 
diff --git a/zhipuai/core/_utils/_utils.py b/zhipuai/core/_utils/_utils.py
diff --git a/zhipuai/types/chat/code_geex/code_geex_params.py b/zhipuai/types/chat/code_geex/code_geex_params.py

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`maybe_transform,`
`59`	`59`	`deepcopy_minimal,`
`60`	`60`	`extract_files,`
	`61`	`+ drop_prefix_image_data,`
`61`	`62`	`)`
`62`	`63`
`63`	`64`	`from ._sse_client import StreamResponse`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`get_required_header as get_required_header,`
`30`	`30`	`maybe_coerce_boolean as maybe_coerce_boolean,`
`31`	`31`	`maybe_coerce_integer as maybe_coerce_integer,`
	`32`	`+ drop_prefix_image_data as drop_prefix_image_data,`
`32`	`33`	`)`
`33`	`34`
`34`	`35`