dashscope 1.23.3__py3-none-any.whl → 1.23.4__py3-none-any.whl

dashscope/aigc/image_synthesis.py

@@ -171,7 +171,7 @@ class ImageSynthesis(BaseAsyncApi):
                 model, mask_image_url, api_key)
             if is_upload:
                 has_upload = True
-            input['mask_image_url'] = mask_image_url
+            input['mask_image_url'] = res_mask_image_url
 
         if base_image_url is not None and base_image_url:
             is_upload, res_base_image_url = check_and_upload_local(

dashscope/audio/asr/vocabulary.py

@@ -12,14 +12,15 @@ from dashscope.common.logging import logger
 
 
 class VocabularyServiceException(Exception):
-    def __init__(self, status_code: int, code: str,
+    def __init__(self, request_id: str, status_code: int, code: str,
                  error_message: str) -> None:
+        self._request_id = request_id
         self._status_code = status_code
         self._code = code
         self._error_message = error_message
 
     def __str__(self):
-        return f'Status Code: {self._status_code}, Code: {self._code}, Error Message: {self._error_message}'
+        return f'Request: {self._request_id}, Status Code: {self._status_code}, Code: {self._code}, Error Message: {self._error_message}'
 
 
 class VocabularyService(BaseApi):
@@ -86,7 +87,7 @@ class VocabularyService(BaseApi):
             self._last_request_id = response.request_id
             return response.output['vocabulary_id']
         else:
-            raise VocabularyServiceException(response.status_code,
+            raise VocabularyServiceException(response.request_id, response.status_code,
                                              response.code, response.message)
 
     def list_vocabularies(self,
@@ -117,7 +118,7 @@ class VocabularyService(BaseApi):
             self._last_request_id = response.request_id
             return response.output['vocabulary_list']
         else:
-            raise VocabularyServiceException(response.status_code,
+            raise VocabularyServiceException(response.request_id, response.status_code,
                                              response.code, response.message)
 
     def query_vocabulary(self, vocabulary_id: str) -> List[dict]:
@@ -134,7 +135,7 @@ class VocabularyService(BaseApi):
             self._last_request_id = response.request_id
             return response.output
         else:
-            raise VocabularyServiceException(response.status_code,
+            raise VocabularyServiceException(response.request_id, response.status_code,
                                              response.code, response.message)
 
     def update_vocabulary(self, vocabulary_id: str,
@@ -153,7 +154,7 @@ class VocabularyService(BaseApi):
             self._last_request_id = response.request_id
             return
         else:
-            raise VocabularyServiceException(response.status_code,
+            raise VocabularyServiceException(response.request_id, response.status_code,
                                              response.code, response.message)
 
     def delete_vocabulary(self, vocabulary_id: str) -> None:
@@ -169,7 +170,7 @@ class VocabularyService(BaseApi):
             self._last_request_id = response.request_id
             return
         else:
-            raise VocabularyServiceException(response.status_code,
+            raise VocabularyServiceException(response.request_id, response.status_code,
                                              response.code, response.message)
 
     def get_last_request_id(self):

dashscope/audio/tts_v2/enrollment.py

@@ -12,14 +12,15 @@ from dashscope.common.logging import logger
 
 
 class VoiceEnrollmentException(Exception):
-    def __init__(self, status_code: int, code: str,
+    def __init__(self, request_id: str, status_code: int, code: str,
                  error_message: str) -> None:
+        self._request_id = request_id
         self._status_code = status_code
         self._code = code
         self._error_message = error_message
 
     def __str__(self):
-        return f'Status Code: {self._status_code}, Code: {self._code}, Error Message: {self._error_message}'
+        return f'Request: {self._request_id}, Status Code: {self._status_code}, Code: {self._code}, Error Message: {self._error_message}'
 
 
 class VoiceEnrollmentService(BaseApi):
@@ -81,11 +82,11 @@ class VoiceEnrollmentService(BaseApi):
             'prefix': prefix,
             'url': url,
         }, )
+        self._last_request_id = response.request_id
         if response.status_code == 200:
-            self._last_request_id = response.request_id
             return response.output['voice_id']
         else:
-            raise VoiceEnrollmentException(response.status_code, response.code,
+            raise VoiceEnrollmentException(response.request_id, response.status_code, response.code,
                                            response.message)
 
     def list_voices(self,
@@ -111,11 +112,11 @@ class VoiceEnrollmentService(BaseApi):
                 'page_index': page_index,
                 'page_size': page_size,
             }, )
+        self._last_request_id = response.request_id
         if response.status_code == 200:
-            self._last_request_id = response.request_id
             return response.output['voice_list']
         else:
-            raise VoiceEnrollmentException(response.status_code, response.code,
+            raise VoiceEnrollmentException(response.request_id, response.status_code, response.code,
                                            response.message)
 
     def query_voice(self, voice_id: str) -> List[str]:
@@ -128,11 +129,11 @@ class VoiceEnrollmentService(BaseApi):
             'action': 'query_voice',
             'voice_id': voice_id,
         }, )
+        self._last_request_id = response.request_id
         if response.status_code == 200:
-            self._last_request_id = response.request_id
             return response.output
         else:
-            raise VoiceEnrollmentException(response.status_code, response.code,
+            raise VoiceEnrollmentException(response.request_id, response.status_code, response.code,
                                            response.message)
 
     def update_voice(self, voice_id: str, url: str) -> None:
@@ -146,11 +147,11 @@ class VoiceEnrollmentService(BaseApi):
             'voice_id': voice_id,
             'url': url,
         }, )
+        self._last_request_id = response.request_id
         if response.status_code == 200:
-            self._last_request_id = response.request_id
             return
         else:
-            raise VoiceEnrollmentException(response.status_code, response.code,
+            raise VoiceEnrollmentException(response.request_id, response.status_code, response.code,
                                            response.message)
 
     def delete_voice(self, voice_id: str) -> None:
@@ -162,11 +163,11 @@ class VoiceEnrollmentService(BaseApi):
             'action': 'delete_voice',
             'voice_id': voice_id,
         }, )
+        self._last_request_id = response.request_id
         if response.status_code == 200:
-            self._last_request_id = response.request_id
             return
         else:
-            raise VoiceEnrollmentException(response.status_code, response.code,
+            raise VoiceEnrollmentException(response.request_id, response.status_code, response.code,
                                            response.message)
 
     def get_last_request_id(self):

dashscope/audio/tts_v2/speech_synthesizer.py

@@ -134,9 +134,7 @@ class Request:
                 'task_group': 'audio',
                 'task': 'tts',
                 'function': 'SpeechSynthesizer',
-                'input': {
-                    'text': ''
-                },
+                'input': {},
                 'parameters': {
                     'voice': self.voice,
                     'volume': self.volume,
@@ -179,9 +177,7 @@ class Request:
                 'streaming': WebsocketStreamingMode.DUPLEX,
             },
             'payload': {
-                'input': {
-                    'text': ''
-                },
+                'input': {},
             },
         }
         return json.dumps(cmd)
@@ -514,6 +510,10 @@ class SpeechSynthesizer:
             otherwise, it will wait indefinitely.
         """
         # print('还不支持非流式语音合成sdk调用大模型，使用流式模拟')
+        if self.additional_params is None:
+            self.additional_params = {"enable_ssml":True}
+        else:
+            self.additional_params["enable_ssml"] = True
         if not self.callback:
             self.callback = ResultCallback()
         self.__start_stream()

dashscope/version.py

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

{dashscope-1.23.3.dist-info → dashscope-1.23.4.dist-info}/METADATA

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

{dashscope-1.23.3.dist-info → dashscope-1.23.4.dist-info}/RECORD

@@ -3,13 +3,13 @@ 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=KoL2HDS3KUg-imtukZreW80cuyVG_B6Uy4FbPH7nZe4,74
+dashscope/version.py,sha256=rYR28JeS4-X9sqFHDXfo67jzYyRueQgOduJuayh5uEs,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
 dashscope/aigc/conversation.py,sha256=95xEEY4ThZJysj5zy3aMw7ql9KLJVfD_1iHv9QZ17Ew,14282
 dashscope/aigc/generation.py,sha256=xMcMu16rICTdjZiD_sPqYV_Ltdp4ewGzzfC7JD9VApY,17948
-dashscope/aigc/image_synthesis.py,sha256=RGyjhSl1-5YzaYBtAMaoemh6Ij_Xw0l_z9IGKD5qgWI,13359
+dashscope/aigc/image_synthesis.py,sha256=Jgqmyv4jRxikgX7J18QrKKQ4OZAMxs6Q6YXObae3DhI,13363
 dashscope/aigc/multimodal_conversation.py,sha256=1rZZRk_1lCdbVs7Rx1kJ5LvwWE1put5p_dQKdCX0ysY,5574
 dashscope/aigc/video_synthesis.py,sha256=XQ3-NKYFmj5cIbUbLTbI0-FyC_fQp8eds6QmD1ZHj_0,13015
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,14 +34,14 @@ dashscope/audio/asr/asr_phrase_manager.py,sha256=vHOLExaKCtjedkihIu7gyfQyarR9rN5
 dashscope/audio/asr/recognition.py,sha256=b_aAPvOKjpWdSiYhM_hp30sZ06QdmNBSDJwhiv78kHM,20932
 dashscope/audio/asr/transcription.py,sha256=lYzPjh7jJQwjMoxx8-AY0YCMBKNKO0bi7xd5tZGSHPc,9094
 dashscope/audio/asr/translation_recognizer.py,sha256=JgBmhkIl_kqH8uVwop6Fba5KlXccftKFrhaygN9PKjU,39680
-dashscope/audio/asr/vocabulary.py,sha256=TEmN4JqXFpg9c1o3BUyj-rA7L58T85iURukJIupEiv0,6528
+dashscope/audio/asr/vocabulary.py,sha256=N0pMS2x1lDxqJ14FgTGKctfuVkR2_hlEsCNWFcgYpTY,6717
 dashscope/audio/qwen_tts/__init__.py,sha256=JS3axY1grqO0aTIJufZ3KS1JsU6yf6y4K2CQlNvUK9I,132
 dashscope/audio/qwen_tts/speech_synthesizer.py,sha256=7LHR-PXhn-VE1cCOp_82Jq0zE9rMc3xy3dszUeyLLNs,2927
 dashscope/audio/tts/__init__.py,sha256=xYpMFseUZGgqgj_70zcX2VsLv-L7qxJ3d-bbdj_hO0I,245
 dashscope/audio/tts/speech_synthesizer.py,sha256=vD1xQV-rew8qAsIaAGH5amsNtB0SqdtNhVHhJHGQ-xk,7622
 dashscope/audio/tts_v2/__init__.py,sha256=me9a3_7KsHQxcJ8hx4SeKlY1e_ThHVvGMw7Yn0uoscM,333
-dashscope/audio/tts_v2/enrollment.py,sha256=DlkV4P1unbtgg9vQNfDfnBqA61yYtIwRHgUdwPh4AF4,6192
-dashscope/audio/tts_v2/speech_synthesizer.py,sha256=aL_VNKMYwiw5pKv3SvuAzWtZF0bpyvntc3Kh_iJroNM,19980
+dashscope/audio/tts_v2/enrollment.py,sha256=-nrlywYSOP73Bm9ETTSxNnlp-B8ezJcUmd59mVvyvgk,6361
+dashscope/audio/tts_v2/speech_synthesizer.py,sha256=qUoLga8HpvNVdbN5n_orxrgZ28yD6Lhwuwqeoi1T7yA,20056
 dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/client/base_api.py,sha256=aWNy_xm02GXuLKVgWnYJht2nI4ZHSGfYIcr52SML15A,41239
 dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -87,9 +87,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.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dashscope-1.23.3.dist-info/METADATA,sha256=lqzVJ_GvC8JbdUYLTDjC2OL0bdp1Vzk5RaMD9aFIkYE,6798
-dashscope-1.23.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.23.3.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.23.3.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.23.3.dist-info/RECORD,,
+dashscope-1.23.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dashscope-1.23.4.dist-info/METADATA,sha256=AyHZs_Sy4pMKuqtcXIb7HeYRho4kWAxr8T5yD3tia-o,6798
+dashscope-1.23.4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.23.4.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.23.4.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.23.4.dist-info/RECORD,,