dashscope 1.20.0__py3-none-any.whl → 1.20.1__py3-none-any.whl

dashscope/audio/asr/transcription.py

@@ -114,6 +114,7 @@ class Transcription(BaseAsyncApi):
         task: Union[str, TranscriptionResponse],
         api_key: str = None,
         workspace: str = None,
+        **kwargs
     ) -> TranscriptionResponse:
         """Fetch the status of task, including results of batch transcription when task_status is SUCCEEDED.  # noqa: E501
 
@@ -131,7 +132,8 @@ class Transcription(BaseAsyncApi):
             try:
                 response = super().fetch(task,
                                          api_key=api_key,
-                                         workspace=workspace)
+                                         workspace=workspace,
+                                         **kwargs)
             except (asyncio.TimeoutError, aiohttp.ClientConnectorError) as e:
                 logger.error(e)
                 try_count += 1
@@ -150,6 +152,7 @@ class Transcription(BaseAsyncApi):
         task: Union[str, TranscriptionResponse],
         api_key: str = None,
         workspace: str = None,
+        **kwargs
     ) -> TranscriptionResponse:
         """Poll task until the final results of transcription is obtained.
 
@@ -161,7 +164,7 @@ class Transcription(BaseAsyncApi):
         Returns:
             TranscriptionResponse: The result of batch transcription.
         """
-        response = super().wait(task, api_key=api_key, workspace=workspace)
+        response = super().wait(task, api_key=api_key, workspace=workspace, **kwargs)
         return TranscriptionResponse.from_api_response(response)
 
     @classmethod

dashscope/audio/tts_v2/speech_synthesizer.py

@@ -250,6 +250,7 @@ class SpeechSynthesizer:
             speech_rate=speech_rate,
             pitch_rate=pitch_rate,
         )
+        self.last_request_id = self.request.task_id
         self.start_event = threading.Event()
         self.complete_event = threading.Event()
         self._stopped = threading.Event()
@@ -474,3 +475,7 @@ class SpeechSynthesizer:
     # 关闭WebSocket连接
     def close(self):
         self.ws.close()
+
+    # 获取上一个任务的taskId
+    def get_last_request_id(self):
+        return self.last_request_id

dashscope/client/base_api.py

@@ -171,13 +171,20 @@ class AsyncTaskGetMixin():
              **kwargs) -> DashScopeAPIResponse:
         base_url = kwargs.pop('base_address', None)
         status_url = _normalization_url(base_url, 'tasks', task_id)
+        custom_headers = kwargs.pop('headers', None)
+        headers = {
+                    **_workspace_header(workspace),
+                    **default_headers(api_key),
+                }
+        if custom_headers:
+            headers = {
+                    **custom_headers,
+                    **headers,
+                }         
         with requests.Session() as session:
             logger.debug('Starting request: %s' % status_url)
             response = session.get(status_url,
-                                   headers={
-                                       **_workspace_header(workspace),
-                                       **default_headers(api_key),
-                                   },
+                                   headers=headers,
                                    timeout=DEFAULT_REQUEST_TIMEOUT_SECONDS)
             logger.debug('Starting processing response: %s' % status_url)
             return _handle_http_response(response)

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.20.0'
+__version__ = '1.20.1'

{dashscope-1.20.0.dist-info → dashscope-1.20.1.dist-info}/METADATA

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

{dashscope-1.20.0.dist-info → dashscope-1.20.1.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=-WF9fGbBAG3Ia-pZ8ruKLHehAzfQDko1EUE6tUtxI8M,23
+dashscope/version.py,sha256=50ZydhgZIM_dwezjbX2voC6nDV_wx5kxvUuz3Nl2Eig,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
@@ -32,13 +32,13 @@ dashscope/audio/__init__.py,sha256=-ZRxrK-gV4QsUtlThIT-XwqB6vmyEsnhxIxdLmhCUuc,6
 dashscope/audio/asr/__init__.py,sha256=-s180qWn_JPSpCo1q0aDJJ5HQ3zTzD4z5yUwsRqH4aU,275
 dashscope/audio/asr/asr_phrase_manager.py,sha256=EjtbI3zz9UQGS1qv6Yb4zzEMj4OJJVXmwkqZyIrzvEA,7642
 dashscope/audio/asr/recognition.py,sha256=F2iz6hyXg16Z6DGlPwGpKfRNcAZIIsqXnNPtaZp4Fzo,17369
-dashscope/audio/asr/transcription.py,sha256=e5O1U51GT-OQPu-wWN2w_T7l6IopWuGMVkheOGdNCkk,8836
+dashscope/audio/asr/transcription.py,sha256=1WAg9WH89antVzRYEKXb5LQP9xylZmX4YKp7v5oMYjY,8931
 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=yxBSV14z-1XEhuwl-ziZcRnGM1ZEHl26-UdWLocNClU,16490
+dashscope/audio/tts_v2/speech_synthesizer.py,sha256=sv5f4vi17rFcYDif5bSS4UuX_2eVUL2q5rTnXK1EoAg,16650
 dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/client/base_api.py,sha256=rww7uoDJtKxgiFQlBpZ8p__J0087cJWhvUxtdb3rrTE,41064
+dashscope/client/base_api.py,sha256=rXN97XGyDhCCaD_dz_clpFDjOJfpGjqiH7yX3LaD-GE,41233
 dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/common/api_key.py,sha256=5Stp0odL5JSuIO3qJBp23QNppuGbqhhvKPS66qbMs0I,1986
 dashscope/common/base_type.py,sha256=C9xP6WuN5pOzviZ2g3X2EPcigldtFE0VlaUmjyNnUUk,4619
@@ -82,9 +82,9 @@ dashscope/tokenizers/tokenizer.py,sha256=y6P91qTCYo__pEx_0VHAcj9YECfbUdRqZU1fdGT
 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.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.20.0.dist-info/METADATA,sha256=kihsPZv9KJsRIziMd9I0kMzdmq7Al_IQFix-9xLbh68,6641
-dashscope-1.20.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.20.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.20.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.20.0.dist-info/RECORD,,
+dashscope-1.20.1.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.1.dist-info/METADATA,sha256=pcY6Qv8KtqGlNAiqRr0JEfAzXBH8N56KlUD3o3expoA,6641
+dashscope-1.20.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.1.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.20.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.1.dist-info/RECORD,,