dashscope 1.21.0__py3-none-any.whl → 1.22.1__py3-none-any.whl

dashscope/audio/tts_v2/enrollment.py

@@ -67,7 +67,7 @@ class VoiceEnrollmentService(BaseApi):
     def create_voice(self, target_model: str, prefix: str, url: str) -> str:
         '''
         创建新克隆音色
-        param: target_model 克隆音色对应的语音识别模型版本
+        param: target_model 克隆音色对应的语音合成模型版本
         param: prefix 音色自定义前缀，仅允许数字和小写字母，小于十个字符。
         param: url 用于克隆的音频文件url
         return: voice_id

dashscope/audio/tts_v2/speech_synthesizer.py

@@ -275,6 +275,7 @@ class SpeechSynthesizer:
         self._start_stream_timestamp = -1
         self._first_package_timestamp = -1
         self._recv_audio_length = 0
+        self.last_response = None
 
     def __send_str(self, data: str):
         logger.debug('>>>send {}'.format(data))
@@ -313,6 +314,11 @@ class SpeechSynthesizer:
         while (not (self.ws.sock and self.ws.sock.connected)
                and (time.time() - start_time) < timeout):
             time.sleep(0.1)  # 短暂休眠，避免密集轮询
+        if not (self.ws.sock and self.ws.sock.connected):
+            raise TimeoutError(
+                'websocket connection could not established within 5s. '
+                'Please check your network connection, firewall settings, or server status.'
+            )
         self.__send_str(request)
         if not self.start_event.wait(10):
             raise TimeoutError('start speech synthesizer failed within 5s.')
@@ -434,6 +440,7 @@ class SpeechSynthesizer:
             try:
                 # 尝试将消息解析为JSON
                 json_data = json.loads(message)
+                self.last_response = json_data
                 event = json_data['header'][EVENT_KEY]
                 # 调用JSON回调
                 if EventType.STARTED == event:
@@ -471,7 +478,7 @@ class SpeechSynthesizer:
             self._recv_audio_length += len(message) / (2 * self.sample_rate /
                                                        1000)
             current = time.time() * 1000
-            current_rtf = (current - self._first_package_timestamp
+            current_rtf = (current - self._start_stream_timestamp
                            ) / self._recv_audio_length
             logger.debug('total audio {} ms, current_rtf: {}'.format(
                 self._recv_audio_length, current_rtf))
@@ -531,3 +538,11 @@ class SpeechSynthesizer:
     # 获取上一个任务的taskId
     def get_last_request_id(self):
         return self.last_request_id
+
+    def get_first_package_delay(self):
+        """First Package Delay is the time between start sending text and receive first audio package
+        """
+        return self._first_package_timestamp - self._start_stream_timestamp
+
+    def get_response(self):
+        return self.last_response

dashscope/client/base_api.py

@@ -2,9 +2,8 @@ import time
 from http import HTTPStatus
 from typing import Any, Dict, Iterator, List, Union
 
-import requests
-
 import dashscope
+import requests
 from dashscope.api_entities.api_request_factory import _build_api_request
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.common.api_key import get_default_api_key
@@ -173,9 +172,9 @@ class AsyncTaskGetMixin():
         status_url = _normalization_url(base_url, 'tasks', task_id)
         custom_headers = kwargs.pop('headers', None)
         headers = {
-                    **_workspace_header(workspace),
-                    **default_headers(api_key),
-                }
+            **_workspace_header(workspace),
+            **default_headers(api_key),
+        }
         if custom_headers:
             headers = {
                 **custom_headers,

dashscope/common/utils.py

@@ -11,7 +11,6 @@ from urllib.parse import urlparse
 
 import aiohttp
 import requests
-
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.common.api_key import get_default_api_key
 from dashscope.common.constants import SSE_CONTENT_TYPE

dashscope/embeddings/batch_text_embedding_response.py

@@ -1,7 +1,6 @@
 from http import HTTPStatus
 
 from attr import dataclass
-
 from dashscope.api_entities.dashscope_response import (DashScopeAPIResponse,
                                                        DictMixin)
 

dashscope/utils/oss_utils.py

@@ -8,7 +8,6 @@ from urllib.parse import unquote_plus, urlparse
 from wsgiref.handlers import format_date_time
 
 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

dashscope/utils/temporary_storage.py

@@ -0,0 +1,160 @@
+from dataclasses import dataclass
+import mimetypes
+import os
+from datetime import datetime
+from http import HTTPStatus
+from time import mktime
+from typing import List
+from urllib.parse import unquote_plus, urlparse
+from wsgiref.handlers import format_date_time
+import time
+import threading
+
+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.error import InvalidInput, UploadFileException
+from dashscope.common.logging import logger
+from dashscope.common.utils import get_user_agent
+
+@dataclass
+class UploadToken:
+    token: str = None
+    expire_time: int = None
+
+class UploadTokenMeta(type):
+    def __init__(cls):
+        cls._tokens = {} # key model, value: token and expire_time
+        cls._lock = threading.Lock() # lock set
+        
+    @property
+    def token(cls, model):
+        current_time = time.perf_counter()
+        upload_token: UploadToken = cls._tokens[model] if model in cls._tokens else None
+        if upload_token is not None and current_time < upload_token.expire_time:
+            return upload_token.token
+        else:
+            return None
+    
+    @token.setter
+    def token(cls, model: str, upload_token: UploadToken):
+        cls._lock.acquire()
+        cls._tokens[model] = upload_token
+        cls._lock.release()
+    
+
+class OssUtils(GetMixin, metaclass=UploadTokenMeta):
+    SUB_PATH = 'uploads'
+
+    @classmethod
+    def _decode_response_error(cls, response: requests.Response):
+        if 'application/json' in response.headers.get('content-type', ''):
+            message = response.json()
+        else:
+            message = response.content.decode('utf-8')
+        return message
+
+    @classmethod
+    def upload(cls,
+               model: str,
+               file_path: str,
+               api_key: str = None,
+               **kwargs) -> DashScopeAPIResponse:
+        """Upload file for model fine-tune or other tasks.
+
+        Args:
+            file_path (str): The local file name to upload.
+            purpose (str): The purpose of the file[fine-tune|inference]
+            description (str, optional): The file description message.
+            api_key (str, optional): The api key. Defaults to None.
+
+        Returns:
+            DashScopeAPIResponse: The upload information
+        """
+        upload_token = cls.token(model)
+        if upload_token is None:
+            upload_info = cls.get_upload_certificate(model=model, api_key=api_key)            
+            if upload_info.status_code != HTTPStatus.OK:
+                raise UploadFileException(
+                    'Get upload certificate failed, code: %s, message: %s' %
+                    (upload_info.code, upload_info.message))
+            upload_info = upload_info.output
+            cls.token = xx
+        
+        upload_info = upload_info.output
+        headers = {}
+        headers = {'user-agent': get_user_agent()}
+        headers['Accept'] = 'application/json'
+        headers['Date'] = format_date_time(mktime(datetime.now().timetuple()))
+        form_data = {}
+        form_data['OSSAccessKeyId'] = upload_info['oss_access_key_id']
+        form_data['Signature'] = upload_info['signature']
+        form_data['policy'] = upload_info['policy']
+        form_data['key'] = upload_info['upload_dir'] + \
+            '/' + os.path.basename(file_path)
+        form_data['x-oss-object-acl'] = upload_info['x_oss_object_acl']
+        form_data['x-oss-forbid-overwrite'] = upload_info[
+            'x_oss_forbid_overwrite']
+        form_data['success_action_status'] = '200'
+        form_data['x-oss-content-type'] = mimetypes.guess_type(file_path)[0]
+        url = upload_info['upload_host']
+        files = {'file': open(file_path, 'rb')}
+        with requests.Session() as session:
+            response = session.post(url,
+                                    files=files,
+                                    data=form_data,
+                                    headers=headers,
+                                    timeout=3600)
+            if response.status_code == HTTPStatus.OK:
+                return 'oss://' + form_data['key']
+            else:
+                msg = (
+                    'Uploading file: %s to oss failed, error: %s' %
+                    (file_path, cls._decode_response_error(response=response)))
+                logger.error(msg)
+                raise UploadFileException(msg)
+
+    @classmethod
+    def get_upload_certificate(cls,
+                               model: str,
+                               api_key: str = None,
+                               **kwargs) -> DashScopeAPIResponse:
+        """Get a oss upload certificate.
+
+        Args:
+            api_key (str, optional): The api key. Defaults to None.
+
+        Returns:
+            DashScopeAPIResponse: The job info
+        """
+        params = {'action': 'getPolicy'}
+        params['model'] = model
+        return super().get(None, api_key, params=params, **kwargs)
+
+
+def upload_file(model: str, upload_path: str, api_key: str):
+    if upload_path.startswith(FILE_PATH_SCHEMA):
+        parse_result = urlparse(upload_path)
+        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' %
+                                          upload_path)
+            return file_url
+        else:
+            raise InvalidInput('The file: %s is not exists!' % file_path)
+    return None
+
+
+

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.21.0'
+__version__ = '1.22.1'

{dashscope-1.21.0.dist-info → dashscope-1.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashscope
-Version: 1.21.0
+Version: 1.22.1
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud
@@ -18,6 +18,7 @@ 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
@@ -221,5 +222,3 @@ Coming soon.
 
 ## License
 This project is licensed under the Apache License (Version 2.0).
-
-

{dashscope-1.21.0.dist-info → dashscope-1.22.1.dist-info}/RECORD

@@ -1,13 +1,11 @@
 dashscope/__init__.py,sha256=_9PaKXKpYc6PXO35BjcH3R0As9sTsXGOW2iQ6R5HAVc,3011
 dashscope/cli.py,sha256=amegoTkGOs6TlHMdoo4JVOqBePo3lGs745rc7leEyrE,24020
-dashscope/deployment.py,sha256=ljmVi-ny6SjEs8v4oIGNWIw8UQTorE7dl5QJv7dEPIQ,5728
-dashscope/file.py,sha256=Dv2Fz3DLbcye2uuQxyQwRM7ky27OthouLXIpSQagQy4,3324
 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=sYFfnMKW3_pCoUqTSWWoBwqO-qPtJaDtBAgvBJqMx4I,23
+dashscope/version.py,sha256=sUm-r83NIqFP93EJcBrI6UFP5e6fmMbnDa6TglGqS1o,23
 dashscope/aigc/__init__.py,sha256=xmdalVw7wS0cLIuU8Q0qk0q8XGw-iGk8NnQwAQZ3jAc,391
+dashscope/aigc/chat_completion.py,sha256=28puJrtHkqTMZlyKLXb3UjSuICy2OPvysj9a6oNU7Vs,14585
 dashscope/aigc/code_generation.py,sha256=KAJVrGp6tiNFBBg64Ovs9RfcP5SrIhrbW3wdA89NKso,10885
 dashscope/aigc/conversation.py,sha256=xRoJlCR-IXHjSdkDrK74a9ut1FJg0FZhTNXZAJC18MA,14231
 dashscope/aigc/generation.py,sha256=53oMCmN5ZbqeqAsKxmdunXlRh-XP8ZtnA7hB2id4Koo,17897
@@ -15,13 +13,14 @@ dashscope/aigc/image_synthesis.py,sha256=UWHW-nvf7_aDZKr4uZDusVHjqWr9TSZjCsZI8YS
 dashscope/aigc/multimodal_conversation.py,sha256=SlNnnsUPV19gdx8fYJAtsMFWPNGY6vhk5IGHZ5ZczpI,5369
 dashscope/aigc/video_synthesis.py,sha256=gbp5XG_DMVN0JnBOgxftdwsCIyrV7nM2gVnlyO8X-ek,10400
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/api_entities/aiohttp_request.py,sha256=aE3AeWba8Ig_xHMYjrAdkq0N61l_L2VFTG6HYh912X0,10229
-dashscope/api_entities/api_request_data.py,sha256=JUMcfpJjKXEZLCBSFIDpgoaeQYk5uK9-CwhM4OHIHFQ,5463
-dashscope/api_entities/api_request_factory.py,sha256=j4VOA1qKzvsK6-BOHGyA35oqsMkNoc4xZe9GHefV0fU,4947
+dashscope/api_entities/aiohttp_request.py,sha256=ZFbdpJh7SwHnBzbYLhqr_FdcDVRgLVMLhLUS_vXbUGs,10228
+dashscope/api_entities/api_request_data.py,sha256=QHGgIShcQ1jANO1szfsqUGtYix1nD2RN4LyC_fNciCM,5462
+dashscope/api_entities/api_request_factory.py,sha256=iLjOqZkbuQkn9JVduI39XPrhm1UefekAekaNqxFpNLM,5061
 dashscope/api_entities/base_request.py,sha256=cXUL7xqSV8wBr5d-1kx65AO3IsRR9A_ps6Lok-v-MKM,926
-dashscope/api_entities/dashscope_response.py,sha256=4a8Iya8RBUnVdzGmzoj6NvaaEeEnodGAD7evBrqEXfU,19832
-dashscope/api_entities/http_request.py,sha256=pYE8qRMu9CaQDiugPlXeYoaj_diBv-ZDExCD3WNhehI,13259
-dashscope/api_entities/websocket_request.py,sha256=Xr6IJ9WqrIw5ouBQLpgoRSwL1C09jkb4u1EZdxhVQy0,15039
+dashscope/api_entities/chat_completion_types.py,sha256=U1nYR5krZYbCedPwlRufJok3hz95mm4kYn2mp20hNAc,12807
+dashscope/api_entities/dashscope_response.py,sha256=FC9zGLNb2iu5fl4bJNcjLnVren_4kNGRW0i9xs4b4Q8,19839
+dashscope/api_entities/http_request.py,sha256=Pr6mr01uXELK9LwIPXrJAhNtGMkWH3gQYORXShRiQRo,13258
+dashscope/api_entities/websocket_request.py,sha256=XzLj9vsJfBAhYMyRRcbEBoJu_dAVm0HpM60k46lBqBw,16281
 dashscope/app/__init__.py,sha256=UiN_9i--z84Dw5wUehOh_Tkk_9Gq_td_Kbz1dobBEKg,62
 dashscope/app/application.py,sha256=Cnd62LFpG70XJUo4Oibry9KzXPhPNmNkKFD4R5YuGTA,9343
 dashscope/app/application_response.py,sha256=0pulI3O3z4R4h_YaDwzVimamo3XwTXGy5TiHCzysTBg,7011
@@ -30,19 +29,19 @@ dashscope/assistants/assistant_types.py,sha256=1jNL30TOlrkiYhvCaB3E8jkPLG8CnQ6I3
 dashscope/assistants/assistants.py,sha256=NYahIDqhtnOcQOmnhZsjc5F5jvBUQcce8-fbrJXHVnQ,10833
 dashscope/assistants/files.py,sha256=pwLVJ_pjpRFWyfI_MRvhH7Si7FzGDj4ChzZgWTpLOhg,6699
 dashscope/audio/__init__.py,sha256=-ZRxrK-gV4QsUtlThIT-XwqB6vmyEsnhxIxdLmhCUuc,61
-dashscope/audio/asr/__init__.py,sha256=kFdx3IYsdfGGDDlQmUjvtd2kqifuEekwlPBEOUvXvEY,406
+dashscope/audio/asr/__init__.py,sha256=VaWX5DRWcB81_5z2o7IPwz6Jrs9vFFJ5GEVarzVOvPY,1004
 dashscope/audio/asr/asr_phrase_manager.py,sha256=EjtbI3zz9UQGS1qv6Yb4zzEMj4OJJVXmwkqZyIrzvEA,7642
-dashscope/audio/asr/recognition.py,sha256=a4zIkIMiWwOEApP9k9ZC9jGDr7CP7BqB6Cy1dBVTN4g,18978
-dashscope/audio/asr/transcribe.py,sha256=HfZYpvpVfvGRAIIIzX65Af33E6vsIFGd_qqhQ8LaNcM,9651
+dashscope/audio/asr/recognition.py,sha256=7ApnKJKVp1JS6e6KBZzM8y1yiMB2fEun07S6BOvqfrs,20699
 dashscope/audio/asr/transcription.py,sha256=D8CW0XDqJuEJVmNFJ6qczTysSV3Sz_rzk2C6NIKTtVc,9042
+dashscope/audio/asr/translation_recognizer.py,sha256=j1oKgggSA2HDdEJAOJ4jY78_bK0FGwpfIf_AxbrAzWM,39629
 dashscope/audio/asr/vocabulary.py,sha256=2MHxeaL0ANWk-TILrHhArKSdj0d5M_YHw0cnjB-E4dY,6476
 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=5UfyDBYnuGgOy9KMxEIXA2U2ihcXutdZc1cqJudy-8M,282
-dashscope/audio/tts_v2/enrollment.py,sha256=mvkYMj9WzqEztZb8zc56fm8Obw7ON9USrEYhATU6rcs,6140
-dashscope/audio/tts_v2/speech_synthesizer.py,sha256=lATasQJB8HlB_yYm90qqW6zIAE1CQFxBxhnch6xdg9s,19285
+dashscope/audio/tts_v2/enrollment.py,sha256=pFxiB_F9jmNnyikabA710QVCVih8Q7AQPLIO4aGKfc8,6140
+dashscope/audio/tts_v2/speech_synthesizer.py,sha256=JPS9LRfWX4VD-BZHAJcBh3Vfwn7oVueAnN0zXhnIqhQ,19928
 dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/client/base_api.py,sha256=D1lRDr_k58Vwd3jvmsMx4UtTjwdngx182LPYvmtXZjQ,41212
+dashscope/client/base_api.py,sha256=RH8ztQgx1WPRXZVfvt5rbhu45IXFdaw8HSbHN5k8AF8,41187
 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
@@ -51,14 +50,14 @@ dashscope/common/env.py,sha256=oQOZW5JyEeTSde394un2lpDJ5RBh4fMU9hBfbtrKKkc,869
 dashscope/common/error.py,sha256=Q7GRhniP-7ap4HBpU69frRdKgKLwmH4ySYxCtupsr60,2638
 dashscope/common/logging.py,sha256=ecGxylG3bWES_Xv5-BD6ep4_0Ciu7F6ZPBjiZtu9Jx4,984
 dashscope/common/message_manager.py,sha256=i5149WzDk6nWmdFaHzYx4USXMBeX18GKSI-F4fLwbN0,1097
-dashscope/common/utils.py,sha256=pMrJJWO3YV77VUFRhoKT7SdCMlopmXx0TgSzPuI3OYM,15388
+dashscope/common/utils.py,sha256=Sw5UB_WH3lFnbwZO3RoA2V6DCHgthjaetW5mN9JM5BE,15387
 dashscope/customize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/customize/customize_types.py,sha256=ZtEwSXA4dbjIYr5vgQQNkMuXyC2BNmznGuaF6b7jwr0,4803
 dashscope/customize/deployments.py,sha256=LIkM-hmJHcJZCKV6WJIPSXQ5CAhB5PUxnt5mqKbVbfE,5189
 dashscope/customize/finetunes.py,sha256=iFnEUMGY6FGogVClIJMEeFhUwfYi7gD05Iq1-eMP2M0,8311
 dashscope/embeddings/__init__.py,sha256=-dxHaoxZZVuP-wAGUIa3sNNh8CQwaeWj2UlqsDy1sV4,240
 dashscope/embeddings/batch_text_embedding.py,sha256=P32LFO9v7ehdJsl0c32In94hUET6K6AaGJ_pDRtFqco,8791
-dashscope/embeddings/batch_text_embedding_response.py,sha256=WziXlQsFIkL1kPc_7lRG1HtqgkO5vVThtnNqExJggNU,2000
+dashscope/embeddings/batch_text_embedding_response.py,sha256=hf17wfhJKvX3ggnigOiTqD4O1lFhx_NG_O1ioKCx0gk,1999
 dashscope/embeddings/multimodal_embedding.py,sha256=yojtGNoT2N54g0jcAYUwNIiwzueun1ouqS0S0tvnyQc,3966
 dashscope/embeddings/text_embedding.py,sha256=I3zRvuT2HWcaZYH-zrtGcAQmzuLQxFswIHJMiQXfaJQ,2009
 dashscope/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,10 +84,11 @@ 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=Ci_3gkvVGq_2kWzDA90lM7VoMoewAvCkoFcQTbPj8bI,7332
-dashscope-1.21.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.21.0.dist-info/METADATA,sha256=vIJ9LChy9z3oLteT9IifLTqwTceHE8SMO7_ymLMJU3A,6641
-dashscope-1.21.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.21.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.21.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.21.0.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=TlqaMAmVRtBJIm5aIaXsrRZGKc_7cwWQ7liMB2f9Css,7331
+dashscope/utils/temporary_storage.py,sha256=CWBpEmuIthYg5DhU_qu63DbF2dsmqnLdKFkbWF8yX6A,6072
+dashscope-1.22.1.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.22.1.dist-info/METADATA,sha256=xk089kHugSTlkhuy17skH7fOIT60VivJMcsYUUKAI-4,6661
+dashscope-1.22.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.22.1.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
+dashscope-1.22.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.22.1.dist-info/RECORD,,

{dashscope-1.21.0.dist-info → dashscope-1.22.1.dist-info}/entry_points.txt

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

dashscope/audio/asr/transcribe.py

@@ -1,270 +0,0 @@
-import asyncio
-import os
-from http import HTTPStatus
-from typing import Any, Dict
-from urllib.parse import urlparse
-
-import aiohttp
-
-from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
-from dashscope.client.base_api import BaseApi
-from dashscope.common.constants import ApiProtocol, HTTPMethod
-from dashscope.common.error import InputRequired
-from dashscope.common.utils import _get_task_group_and_task
-
-
-class Transcribe(BaseApi):
-    """API for File Transcriber models.
-
-    """
-
-    MAX_QUERY_TRY_COUNT = 3
-
-    @classmethod
-    def call(cls, model: str, file: str, **kwargs) -> DashScopeAPIResponse:
-        """Call file transcriber model service.
-
-        Args:
-            model (str): The requested model, such as paraformer-16k-1
-            file (str): The local path or URL of the file.
-            channel_id (List[int], optional): The selected channel_id of audio file. # noqa: E501
-
-        Returns:
-            DashScopeAPIResponse: The response body.
-
-        Raises:
-            InputRequired: The file cannot be empty.
-        """
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-        return loop.run_until_complete(cls.async_call(model, file, **kwargs))
-
-    @classmethod
-    async def async_call(cls, model: str, file: str,
-                         **kwargs) -> DashScopeAPIResponse:
-        """Async call file transcriber model service.
-
-        Args:
-            model (str): The requested model, such as paraformer-16k-1
-            file (str): The local path or URL of the file.
-            channel_id (List[int], optional): The selected channel_id of audio file. # noqa: E501
-
-        Returns:
-            DashScopeAPIResponse: The response body.
-
-        Raises:
-            InputRequired: The file cannot be empty.
-        """
-        cls.is_url = cls._validate_file(file)
-        cls.file_name = file
-        cls.model_id = model
-
-        request = {'file': cls.file_name, 'is_url': cls.is_url}
-
-        # launch transcribe request, and get task info.
-        task = await cls._async_launch_requests(request, **kwargs)
-
-        response = await cls._async_get_result(task, **kwargs)
-
-        return response
-
-    @classmethod
-    async def _async_launch_requests(cls, request: Dict[str, Any], **kwargs):
-        """Async submit transcribe request.
-
-        Args:
-            inputs (Dict[str, Any]): The input parameters.
-
-        Returns:
-            task (Dict[str, Any]): The result of the task request.
-        """
-        inputs = {'file_link': request['file']}
-        task = {'file': request['file']}
-        local_file = None
-        try_count: int = 0
-        response = DashScopeAPIResponse(id='', code=HTTPStatus.OK, output=None)
-        if not request['is_url']:
-            try:
-                local_file = open(inputs['file_link'], 'rb')
-            except IOError as e:
-                raise InputRequired(f'File cannot be opened. {e}')
-
-            kwargs['form'] = {'av_file': local_file}
-
-        task_name, function = _get_task_group_and_task(__name__)
-        kwargs['async_request'] = True
-        kwargs['query'] = False
-
-        while True:
-            try:
-                response = await super().async_call(
-                    model=cls.model_id,
-                    task_group='audio',
-                    task=task_name,
-                    function=function,
-                    input=inputs,
-                    api_protocol=ApiProtocol.HTTP,
-                    http_method=HTTPMethod.POST,
-                    **kwargs)
-
-                task['request_id'] = response.id
-                task['code'] = response.code
-                task['status'] = response.status
-
-                if response.code == HTTPStatus.OK and response.output is not None:  # noqa: E501
-                    task.update(response.output)
-                else:
-                    task['message'] = response.message
-
-                break
-
-            except (asyncio.TimeoutError, aiohttp.ClientConnectorError) as e:
-                try_count += 1
-                if try_count > Transcribe.MAX_QUERY_TRY_COUNT:
-                    task['request_id'] = response.id
-                    task['code'] = HTTPStatus.REQUEST_TIMEOUT
-                    task['status'] = response.status
-                    task['message'] = str(e)
-                    break
-                else:
-                    await asyncio.sleep(2)
-                    continue
-            except Exception as e:
-                task['request_id'] = response.id
-                task['code'] = HTTPStatus.BAD_REQUEST
-                task['status'] = response.status
-                task['message'] = str(e)
-                break
-
-        if local_file is not None:
-            local_file.close()
-
-        return task
-
-    @classmethod
-    async def _async_get_result(cls, task, **kwargs):
-        """Async get transcribe result by polling.
-
-        Args:
-            task (Dict[str, Any]): The info of the task request.
-
-        Returns:
-            DashScopeAPIResponse: The response body.
-        """
-        request = task
-        responses = []
-        item = {}
-        response = DashScopeAPIResponse(id=request['request_id'],
-                                        code=request['code'],
-                                        output=None,
-                                        status=request['status'],
-                                        message=request['message'])
-
-        if request['code'] != HTTPStatus.OK:
-            item['file'] = request['file']
-            item['request_id'] = response.id
-            item['code'] = request['code']
-            item['status'] = request['status']
-            item['message'] = request['message']
-            responses.append(item)
-        else:
-            try_count: int = 0
-            while True:
-                item['file'] = request['file']
-                item['task_Id'] = request['task_id']
-
-                try:
-                    inputs = {}
-                    inputs['task_Id'] = request['task_id']
-                    kwargs['async_request'] = True
-                    kwargs['query'] = True
-
-                    response = await super().async_call(
-                        model=cls.model_id,
-                        task_group=None,
-                        task='tasks',
-                        input=inputs,
-                        task_id=inputs['task_Id'],
-                        api_protocol=ApiProtocol.HTTP,
-                        http_method=HTTPMethod.GET,
-                        **kwargs)
-                except (asyncio.TimeoutError,
-                        aiohttp.ClientConnectorError) as e:
-                    try_count += 1
-                    if try_count > Transcribe.MAX_QUERY_TRY_COUNT:
-                        item['request_id'] = response.id
-                        item['code'] = HTTPStatus.REQUEST_TIMEOUT
-                        item['status'] = response.status
-                        item['message'] = str(e)
-                        responses.append(item)
-                        break
-                    else:
-                        await asyncio.sleep(2)
-                        continue
-                except Exception as e:
-                    item['request_id'] = response.id
-                    item['code'] = HTTPStatus.BAD_REQUEST
-                    item['status'] = response.status
-                    item['message'] = str(e)
-                    responses.append(item)
-                    break
-
-                try_count = 0
-                item['request_id'] = response.id
-                item['code'] = response.code
-                item['status'] = response.status
-
-                if response.code == HTTPStatus.OK:
-                    if 'task_status' in response.output:
-                        task_status = response.output['task_status']
-                        if task_status == 'QUEUING' or task_status == 'PROCESSING':  # noqa: E501
-                            await asyncio.sleep(2)
-                            continue
-
-                    item.update(response.output)
-                else:
-                    item['message'] = response.message
-
-                responses.append(item)
-                break
-
-        output = {}
-        output['results'] = responses
-
-        return DashScopeAPIResponse(id=response.id,
-                                    code=response.code,
-                                    status=response.status,
-                                    message=response.message,
-                                    output=output)
-
-    @classmethod
-    def _validate_file(cls, file: str):
-        """Check the validity of the file
-        and whether the file is a URL or a local path.
-
-        Args:
-            file (str): The local path or URL of the file.
-
-        Returns:
-            bool: Whether the file is a URL.
-        """
-        if file is None or len(file) == 0:
-            raise InputRequired(
-                'Input an illegal file, please ensure that the file type is a local path or URL!'  # noqa: *
-            )
-
-        if os.path.isfile(file):
-            return False
-        else:
-            result = urlparse(file)
-            if result.scheme is not None and len(result.scheme) > 0:
-                if result.scheme != 'http' and result.scheme != 'https':
-                    raise InputRequired(
-                        f'The URL protocol({result.scheme}) of file({file}) is not http or https.'  # noqa: *
-                    )
-            else:
-                raise InputRequired(
-                    f'Input an illegal file({file}), maybe the file is inexistent.'  # noqa: *
-                )
-
-        return True