Merge pull request #13 from lengjiayi/main

[Add] cosyvoice call api enbale ssml

Author: kevinlin09

dashscope/audio/asr/vocabulary.py

@@ -12,14 +12,15 @@
 
 
 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 @@ def create_vocabulary(self, target_model: str, prefix: str,
             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 @@ def list_vocabularies(self,
             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 @@ def query_vocabulary(self, vocabulary_id: str) -> List[dict]:
             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 @@ def update_vocabulary(self, vocabulary_id: str,
             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 @@ def delete_vocabulary(self, vocabulary_id: str) -> None:
             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 @@
 
 
 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 @@ def create_voice(self, target_model: str, prefix: str, url: str) -> str:
             '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 @@ def list_voices(self,
                 '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 @@ def query_voice(self, voice_id: str) -> List[str]:
             '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 @@ def update_voice(self, voice_id: str, url: str) -> None:
             '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 @@ def delete_voice(self, voice_id: str) -> None:
             '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 @@ def getStartRequest(self, additional_params=None):
                 'task_group': 'audio',
                 'task': 'tts',
                 'function': 'SpeechSynthesizer',
-                'input': {
-                    'text': ''
-                },
+                'input': {},
                 'parameters': {
                     'voice': self.voice,
                     'volume': self.volume,
@@ -179,9 +177,7 @@ def getFinishRequest(self):
                 'streaming': WebsocketStreamingMode.DUPLEX,
             },
             'payload': {
-                'input': {
-                    'text': ''
-                },
+                'input': {},
             },
         }
         return json.dumps(cmd)
@@ -514,6 +510,10 @@ def call(self, text: str, timeout_millis=None):
             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()