dashscope 1.20.2__py3-none-any.whl → 1.20.4__py3-none-any.whl

dashscope/audio/tts_v2/speech_synthesizer.py

@@ -345,7 +345,7 @@ class SpeechSynthesizer:
         self.__submit_text(text)
         return None
 
-    def streaming_complete(self, complete_timeout_millis=10000):
+    def streaming_complete(self, complete_timeout_millis=600000):
         """
         Synchronously stop the streaming input speech synthesis task.
         Wait for all remaining synthesized audio before returning
@@ -376,14 +376,18 @@ class SpeechSynthesizer:
         self._is_started = False
 
     def __waiting_for_complete(self, timeout):
-        if not self.complete_event.wait(timeout=timeout / 1000):
-            raise TimeoutError(
-                'speech synthesizer wait for complete timeout 10000ms')
+        if timeout is not None and timeout > 0:
+            if not self.complete_event.wait(timeout=timeout / 1000):
+                raise TimeoutError(
+                    f'speech synthesizer wait for complete timeout {timeout}ms'
+                )
+        else:
+            self.complete_event.wait()
         self.close()
         self._stopped.set()
         self._is_started = False
 
-    def async_streaming_complete(self, complete_timeout_millis=10000):
+    def async_streaming_complete(self, complete_timeout_millis=600000):
         """
         Asynchronously stop the streaming input speech synthesis task, returns immediately.
         You need to listen and handle the STREAM_INPUT_TTS_EVENT_SYNTHESIS_COMPLETE event in the on_event callback.
@@ -445,6 +449,7 @@ class SpeechSynthesizer:
                         self.callback.on_close()
                     else:
                         logger.error(f'TaskFailed: {message}')
+                        raise Exception(f'TaskFailed: {message}')
                 elif EventType.GENERATED == event:
                     if self.callback:
                         self.callback.on_event(message)
@@ -452,6 +457,7 @@ class SpeechSynthesizer:
                     pass
             except json.JSONDecodeError:
                 logger.error('Failed to parse message as JSON.')
+                raise Exception('Failed to parse message as JSON.')
         elif isinstance(message, (bytes, bytearray)):
             # 如果失败，认为是二进制消息
             logger.debug('<<<recv binary {}'.format(len(message)))
@@ -510,10 +516,10 @@ class SpeechSynthesizer:
     # WebSocket关闭的回调函数
     def on_close(self, ws, close_status_code, close_msg):
         pass
-        # print("### websocket closed msg [{}]{} ###".format(close_status_code, close_msg))
 
     # WebSocket发生错误的回调函数
     def on_error(self, ws, error):
+        print(f'websocket closed due to {error}')
         raise Exception(f'websocket closed due to {error}')
 
     # 关闭WebSocket连接

dashscope/utils/oss_utils.py

@@ -11,10 +11,7 @@ import requests
 
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.client.base_api import GetMixin
-from dashscope.common.constants import (FILE_PATH_SCHEMA,
-                                        REQUEST_CONTENT_AUDIO,
-                                        REQUEST_CONTENT_IMAGE,
-                                        REQUEST_CONTENT_TEXT)
+from dashscope.common.constants import FILE_PATH_SCHEMA
 from dashscope.common.error import InvalidInput, UploadFileException
 from dashscope.common.logging import logger
 from dashscope.common.utils import get_user_agent
@@ -124,49 +121,41 @@ def upload_file(model: str, upload_path: str, api_key: str):
     return None
 
 
-def check_and_upload(model, elem: dict, key: str, api_key):
+def check_and_upload(model, elem: dict, api_key):
     is_upload = False
-    content = elem[key]
-    if content.startswith(FILE_PATH_SCHEMA):
-        parse_result = urlparse(content)
-        if parse_result.netloc:
-            file_path = parse_result.netloc + unquote_plus(parse_result.path)
-        else:
-            file_path = unquote_plus(parse_result.path)
-        if os.path.exists(file_path):
-            file_url = OssUtils.upload(model=model,
-                                       file_path=file_path,
-                                       api_key=api_key)
-            if file_url is None:
-                raise UploadFileException('Uploading file: %s failed' %
-                                          content)
-            elem[key] = file_url
-            is_upload = True
-        else:
-            raise InvalidInput('The file: %s is not exists!' % file_path)
-    elif not content.startswith('http'):
-        if os.path.exists(content):
-            file_url = OssUtils.upload(model=model,
-                                       file_path=content,
-                                       api_key=api_key)
-            if file_url is None:
-                raise UploadFileException('Uploading file: %s failed' %
-                                          content)
-            elem[key] = file_url
-            is_upload = True
+    for key, content in elem.items():
+        if content.startswith(FILE_PATH_SCHEMA):
+            parse_result = urlparse(content)
+            if parse_result.netloc:
+                file_path = parse_result.netloc + unquote_plus(
+                    parse_result.path)
+            else:
+                file_path = unquote_plus(parse_result.path)
+            if os.path.exists(file_path):
+                file_url = OssUtils.upload(model=model,
+                                           file_path=file_path,
+                                           api_key=api_key)
+                if file_url is None:
+                    raise UploadFileException('Uploading file: %s failed' %
+                                              content)
+                elem[key] = file_url
+                is_upload = True
+            else:
+                raise InvalidInput('The file: %s is not exists!' % file_path)
+        elif not content.startswith('http'):
+            if os.path.exists(content):
+                file_url = OssUtils.upload(model=model,
+                                           file_path=content,
+                                           api_key=api_key)
+                if file_url is None:
+                    raise UploadFileException('Uploading file: %s failed' %
+                                              content)
+                elem[key] = file_url
+                is_upload = True
 
     return is_upload
 
 
 def preprocess_message_element(model: str, elem: List[dict], api_key: str):
-    is_upload = False
-    if REQUEST_CONTENT_TEXT in elem:
-        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_TEXT,
-                                     api_key)
-    elif REQUEST_CONTENT_IMAGE in elem:
-        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_IMAGE,
-                                     api_key)
-    elif REQUEST_CONTENT_AUDIO in elem:
-        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_AUDIO,
-                                     api_key)
+    is_upload = check_and_upload(model, elem, api_key)
     return is_upload

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.20.2'
+__version__ = '1.20.4'

{dashscope-1.20.2.dist-info → dashscope-1.20.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashscope
-Version: 1.20.2
+Version: 1.20.4
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud

{dashscope-1.20.2.dist-info → dashscope-1.20.4.dist-info}/RECORD

@@ -6,7 +6,7 @@ dashscope/files.py,sha256=QgJjwhtn9F548nCA8jD8OvE6aQEj-20hZqJgYXsUdQU,3930
 dashscope/finetune.py,sha256=_tflDUvu0KagSoCzLaf0hofpG_P8NU6PylL8CPjVhrA,6243
 dashscope/model.py,sha256=UPOn1qMYFhX-ovXi3BMxZEBk8qOK7WLJOYHMbPZwYBo,1440
 dashscope/models.py,sha256=1-bc-Ue68zurgu_y6RhfFr9uzeQMF5AZq-C32lJGMGU,1224
-dashscope/version.py,sha256=6KIFuOk_uHObRUtO_hf7gfIcH-9norzWjEkjzb1Dclg,23
+dashscope/version.py,sha256=F9uXsS9G7U6denIIAr8vp6GOvDWEm4lYN6mAx36-rZE,23
 dashscope/aigc/__init__.py,sha256=s-MCA87KYiVumYtKtJi5IMN7xelSF6TqEU3s3_7RF-Y,327
 dashscope/aigc/code_generation.py,sha256=KAJVrGp6tiNFBBg64Ovs9RfcP5SrIhrbW3wdA89NKso,10885
 dashscope/aigc/conversation.py,sha256=xRoJlCR-IXHjSdkDrK74a9ut1FJg0FZhTNXZAJC18MA,14231
@@ -36,7 +36,7 @@ dashscope/audio/asr/transcription.py,sha256=1WAg9WH89antVzRYEKXb5LQP9xylZmX4YKp7
 dashscope/audio/tts/__init__.py,sha256=fbnieZX9yNFNh5BsxLpLXb63jlxzxrdCJakV3ignjlQ,194
 dashscope/audio/tts/speech_synthesizer.py,sha256=dnKx9FDDdO_ETHAjhK8zaMVaH6SfoTtN5YxXXqgY1JA,7571
 dashscope/audio/tts_v2/__init__.py,sha256=ve5a81qTbWDcRaSuritZtJBzryOIol2_dxzfqqdCw-k,345
-dashscope/audio/tts_v2/speech_synthesizer.py,sha256=RenOvxp6BOs_-E_K5akMEBFw9G0HXoLnvHw1IOTUgeU,18991
+dashscope/audio/tts_v2/speech_synthesizer.py,sha256=bpzj9gx2D_FfOzgsjU-GBGmeWvEdewNPFd447mOgM-o,19220
 dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/client/base_api.py,sha256=rXN97XGyDhCCaD_dz_clpFDjOJfpGjqiH7yX3LaD-GE,41233
 dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -81,10 +81,10 @@ dashscope/tokenizers/tokenization.py,sha256=G6cSEmVLr3pjXUC3EOU9ot8MYxNnOQ4wOB2m
 dashscope/tokenizers/tokenizer.py,sha256=y6P91qTCYo__pEx_0VHAcj9YECfbUdRqZU1fdGTjF4o,1154
 dashscope/tokenizers/tokenizer_base.py,sha256=REDhzRyDT13iequ61-a6_KcTy0GFKlihQve5HkyoyRs,656
 dashscope/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/utils/oss_utils.py,sha256=fi8-PPsN-iR-iv5k2NS5Z8nlWkpgUhr56FRWm4BDh4A,6984
-dashscope-1.20.2.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.20.2.dist-info/METADATA,sha256=I52DKGYRGq77FO4pFbQwUHN-2g4qLLNz-jMO0DMQ008,6641
-dashscope-1.20.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.20.2.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.20.2.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.20.2.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=Ha4VdeO5D4lHa-xE3-iUdZFOsHS5pe_Oz1Tg5P605bY,6487
+dashscope-1.20.4.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.4.dist-info/METADATA,sha256=2r20We1APpu60VMdSe6UXLYXuHXywQZC-hkGyF-RYRc,6641
+dashscope-1.20.4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.4.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.20.4.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.4.dist-info/RECORD,,