dashscope 1.23.5__py3-none-any.whl → 1.23.6__py3-none-any.whl

dashscope/multimodal/multimodal_constants.py

@@ -25,3 +25,4 @@ RESPONSE_NAME_RESPONDING_ENDED = "RespondingEnded"  # AI语音应答结束
 RESPONSE_NAME_SPEECH_CONTENT = "SpeechContent"  # 用户语音识别出的文本，流式全量输出
 RESPONSE_NAME_RESPONDING_CONTENT = "RespondingContent"  # 统对外输出的文本，流式全量输出
 RESPONSE_NAME_ERROR = "Error"  # 服务端对话中报错
+RESPONSE_NAME_HEART_BEAT = "HeartBeat"  # 心跳消息

dashscope/multimodal/multimodal_dialog.py

@@ -127,10 +127,10 @@ class MultiModalDialog:
     """
 
     def __init__(self,
-                 workspace_id: str,
                  app_id: str,
                  request_params: RequestParameters,
                  multimodal_callback: MultiModalCallback,
+                 workspace_id: str = None,
                  url: str = None,
                  api_key: str = None,
                  dialog_id: str = None,
@@ -140,7 +140,7 @@ class MultiModalDialog:
                 创建一个语音对话会话。
 
                 此方法用于初始化一个新的voice_chat会话，设置必要的参数以准备开始与模型的交互。
-                ：param workspace_id: 客户的workspace_id
+                ：param workspace_id: 客户的workspace_id 主工作空间id,非必填字段
                 :param app_id: 客户在管控台创建的应用id，可以根据值规律确定使用哪个对话系统
                 :param request_params: 请求参数集合
                 :param url: (str) API的URL地址。
@@ -185,7 +185,8 @@ class MultiModalDialog:
 
     def _on_close(self, ws, close_status_code, close_msg):
         try:
-            logger.debug("WebSocket connection closed with status {} and message {}".format(close_status_code, close_msg))
+            logger.debug(
+                "WebSocket connection closed with status {} and message {}".format(close_status_code, close_msg))
             if close_status_code is None:
                 close_status_code = 1000
             if close_msg is None:
@@ -257,6 +258,16 @@ class MultiModalDialog:
         _send_speech_json = self.request.generate_common_direction_request("LocalRespondingEnded", self.dialog_id)
         self._send_text_frame(_send_speech_json)
 
+    def send_heart_beat(self):
+        """发送心跳"""
+        _send_speech_json = self.request.generate_common_direction_request("HeartBeat", self.dialog_id)
+        self._send_text_frame(_send_speech_json)
+
+    def update_info(self, parameters: RequestToRespondParameters = None):
+        """更新信息"""
+        _send_speech_json = self.request.generate_update_info_json(direction_name="UpdateInfo", dialog_id=self.dialog_id, parameters=parameters)
+        self._send_text_frame(_send_speech_json)
+
     def stop(self):
         if self.ws is None or not self.ws.sock or not self.ws.sock.connected:
             self._callback.on_close(1001, "websocket is not connected")
@@ -372,10 +383,10 @@ class _Request:
 
     def generate_start_request(self, direction_name: str,
                                dialog_id: str,
-                               workspace_id: str,
                                app_id: str,
                                request_params: RequestParameters,
-                               model: str = None
+                               model: str = None,
+                               workspace_id: str = None
                                ) -> str:
         """
         构建语音聊天服务的启动请求数据.
@@ -383,7 +394,7 @@ class _Request:
         :param request_params: start请求body中的parameters
         :param direction_name:
         :param dialog_id: 对话ID.
-        :param workspace_id: 管控台工作区id
+        :param workspace_id: 管控台工作空间id, 非必填字段。
         :param model: 模型
         :return: 启动请求字典.
         """
@@ -428,7 +439,6 @@ class _Request:
         }
         return json.dumps(cmd)
 
-    @abstractmethod
     def generate_request_to_response_json(self, direction_name: str, dialog_id: str, request_type: str, text: str,
                                           parameters: RequestToRespondParameters = None) -> str:
         """
@@ -458,6 +468,29 @@ class _Request:
         }
         return json.dumps(cmd)
 
+    def generate_update_info_json(self, direction_name: str, dialog_id: str,parameters: RequestToRespondParameters = None) -> str:
+        """
+        构建语音聊天服务的命令请求数据.
+        :param direction_name: 命令.
+        :param parameters: 命令请求body中的parameters
+        :return: 命令请求字典.
+        """
+        self._get_dash_request_header(ActionType.CONTINUE)
+
+        custom_input = RequestToRespondBodyInput(
+            app_id=self.app_id,
+            directive=direction_name,
+            dialog_id=dialog_id,
+        )
+
+        self._get_dash_request_payload(direction_name, dialog_id, self.app_id, request_params=parameters,
+                                       custom_input=custom_input)
+        cmd = {
+            "header": self.header,
+            "payload": self.payload
+        }
+        return json.dumps(cmd)
+
     def _get_dash_request_header(self, action: str):
         """
         构建多模对话请求的请求协议Header
@@ -560,6 +593,8 @@ class _Response:
                 self._handle_responding_content(payload)
             elif response_event == RESPONSE_NAME_ERROR:
                 self._callback.on_error(json.dumps(response_json))
+            elif response_event == RESPONSE_NAME_HEART_BEAT:
+                logger.debug("Server response heart beat")
             else:
                 logger.error("Unknown response name: {}", response_event)
         except json.JSONDecodeError:

dashscope/multimodal/multimodal_request_params.py

@@ -198,6 +198,7 @@ class BizParams:
     tool_prompts: dict = field(default=None)
     user_prompt_params: dict = field(default=None)
     user_query_params: dict = field(default=None)
+    videos: list = field(default=None)
 
     def to_dict(self):
         params = {}
@@ -211,6 +212,8 @@ class BizParams:
             params["user_prompt_params"] = self.user_prompt_params
         if self.user_query_params is not None:
             params["user_query_params"] = self.user_query_params
+        if self.videos is not None:
+            params["videos"] = self.videos
         return params
 
 
@@ -256,7 +259,7 @@ class RequestToRespondBodyInput(DashPayloadInput):
     app_id: str
     directive: str
     dialog_id: str
-    type_: str = field(metadata={"alias": "type"})
+    type_: str = field(metadata={"alias": "type"}, default= None)
     text: str = field(default="")
 
     def to_dict(self):
@@ -266,4 +269,4 @@ class RequestToRespondBodyInput(DashPayloadInput):
             "dialog_id": self.dialog_id,
             "type": self.type_,
             "text": self.text
-        }
+        }

dashscope/version.py

@@ -1,3 +1,3 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 
-__version__ = '1.23.5'
+__version__ = '1.23.6'

{dashscope-1.23.5.dist-info → dashscope-1.23.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dashscope
-Version: 1.23.5
+Version: 1.23.6
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud
@@ -18,11 +18,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: requests
 Requires-Dist: websocket-client
 Provides-Extra: tokenizer
-Requires-Dist: tiktoken ; extra == 'tokenizer'
+Requires-Dist: tiktoken; extra == "tokenizer"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h4 align="center">
     <p>
@@ -221,5 +235,3 @@ Coming soon.
 
 ## License
 This project is licensed under the Apache License (Version 2.0).
-
-

{dashscope-1.23.5.dist-info → dashscope-1.23.6.dist-info}/RECORD

@@ -3,7 +3,7 @@ dashscope/cli.py,sha256=amegoTkGOs6TlHMdoo4JVOqBePo3lGs745rc7leEyrE,24020
 dashscope/files.py,sha256=vRDQygm3lOqBZR73o7KNHs1iTBVuvLncuwJNxIYjzAU,3981
 dashscope/model.py,sha256=B5v_BtYLPqj6raClejBgdKg6WTGwhH_f-20pvsQqmsk,1491
 dashscope/models.py,sha256=dE4mzXkl85G343qVylSGpURPRdA5pZSqXlx6PcxqC_Q,1275
-dashscope/version.py,sha256=AEebMkhuRmXDos0SQUqvNS4ui-KBHqJSwnTbSjynlLU,74
+dashscope/version.py,sha256=VtJV154d4VNke5BkkccDtVlsLdOM6gdSce36vOpcfbU,74
 dashscope/aigc/__init__.py,sha256=AuRhu_vA1K0tbs_C6DgcZYhTvxMuzDgpwHJNHzEPIHg,442
 dashscope/aigc/chat_completion.py,sha256=ONlyyssIbfaKKcFo7cEKhHx5OCF2XX810HFzIExW1ho,14813
 dashscope/aigc/code_generation.py,sha256=p_mxDKJLQMW0IjFD46JRlZuEZCRESSVKEfLlAevBtqw,10936
@@ -66,9 +66,9 @@ dashscope/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/io/input_output.py,sha256=0aXrRJFo1ZqYm_AJWR_w88O4-Btn9np2zUhrrUdBdfw,3992
 dashscope/multimodal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/multimodal/dialog_state.py,sha256=CtOdfGWhq0ePG3bc8-7inhespETtPD4QDli1513hd1A,1522
-dashscope/multimodal/multimodal_constants.py,sha256=MlKJkOIGoEzp3c3jXzeEE4zw0oNHv4HkEQeJGx7kLaM,1228
-dashscope/multimodal/multimodal_dialog.py,sha256=21yIQyrRzRcfDSbo0IMcEu-KYMji70cEH1p3NLsSR-Q,22372
-dashscope/multimodal/multimodal_request_params.py,sha256=chFDxPvbKcEyLEkVdsBFWUChsHaKnBAvPcG-IOjVRq4,7775
+dashscope/multimodal/multimodal_constants.py,sha256=z_QVq01E43FAqKQnDu9vdf89d1zuYlWyANewWTEXVJM,1282
+dashscope/multimodal/multimodal_dialog.py,sha256=HymlaQYp7SgJdoKbT27SNiviyRRoM91zklNBwTHmm1Q,23939
+dashscope/multimodal/multimodal_request_params.py,sha256=7A4UhsbYjcX7aAJwWI1xZEt0e1bSgPcu5pJAinaZyx0,7907
 dashscope/nlp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/nlp/understanding.py,sha256=00ado-ibYEzBRT0DgKGd3bohQDNW73xnFhJ_1aa87lw,2880
 dashscope/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,9 +92,9 @@ dashscope/tokenizers/tokenizer.py,sha256=3FQVDvMNkCW9ccYeJdjrd_PIMMD3Xv7aNZkaYOE
 dashscope/tokenizers/tokenizer_base.py,sha256=5EJIFuizMWESEmLmbd38yJnfeHmPnzZPwsO4aOGjpl4,707
 dashscope/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/utils/oss_utils.py,sha256=L5LN3lN8etVxSL_jkZydstvEKpnTG9CY0zcvPGQ5LBo,7383
-dashscope-1.23.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dashscope-1.23.5.dist-info/METADATA,sha256=tERMxFGxdS3EOMhTiNl3jaQCAf-k40aUNJXZsMERc5s,6798
-dashscope-1.23.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.23.5.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.23.5.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.23.5.dist-info/RECORD,,
+dashscope-1.23.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dashscope-1.23.6.dist-info/METADATA,sha256=l1m0KB4CgXdVltrY8r0NwntIgRE3-a5MKApSuhy8pks,7095
+dashscope-1.23.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dashscope-1.23.6.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
+dashscope-1.23.6.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.23.6.dist-info/RECORD,,

{dashscope-1.23.5.dist-info → dashscope-1.23.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{dashscope-1.23.5.dist-info → dashscope-1.23.6.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 dashscope = dashscope.cli:main
-