dashscope 1.20.8__py3-none-any.whl → 1.20.9__py3-none-any.whl

dashscope/aigc/image_synthesis.py

@@ -6,6 +6,7 @@ from dashscope.client.base_api import BaseAsyncApi
 from dashscope.common.constants import IMAGES, NEGATIVE_PROMPT, PROMPT
 from dashscope.common.error import InputRequired
 from dashscope.common.utils import _get_task_group_and_task
+from dashscope.utils.oss_utils import check_and_upload_local
 
 
 class ImageSynthesis(BaseAsyncApi):
@@ -38,7 +39,8 @@ class ImageSynthesis(BaseAsyncApi):
             images (List[str]): The input list of images url,
                 currently not supported.
             api_key (str, optional): The api api_key. Defaults to None.
-            sketch_image_url (str, optional): Only for wanx-sketch-to-image-v1.
+            sketch_image_url (str, optional): Only for wanx-sketch-to-image-v1,
+                can be local file.
                 Defaults to None.
             workspace (str): The dashscope workspace id.
             extra_input (Dict): The extra input parameters.
@@ -120,17 +122,31 @@ class ImageSynthesis(BaseAsyncApi):
             raise InputRequired('prompt is required!')
         task_group, function = _get_task_group_and_task(__name__)
         input = {PROMPT: prompt}
+        has_upload = False
         if negative_prompt is not None:
             input[NEGATIVE_PROMPT] = negative_prompt
         if images is not None:
             input[IMAGES] = images
         if sketch_image_url is not None and sketch_image_url:
+            is_upload, sketch_image_url = check_and_upload_local(
+                model, sketch_image_url, api_key)
+            if is_upload:
+                has_upload = True
             input['sketch_image_url'] = sketch_image_url
         if ref_img is not None and ref_img:
+            is_upload, ref_img = check_and_upload_local(
+                model, ref_img, api_key)
+            if is_upload:
+                has_upload = True
             input['ref_img'] = ref_img
         if extra_input is not None and extra_input:
             input = {**input, **extra_input}
 
+        if has_upload:
+            headers = kwargs.pop('headers', {})
+            headers['X-DashScope-OssResourceResolve'] = 'enable'
+            kwargs['headers'] = headers
+
         response = super().async_call(
             model=model,
             task_group=task_group,

dashscope/audio/asr/transcribe.py

@@ -0,0 +1,270 @@
+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

dashscope/threads/runs/runs.py

@@ -386,12 +386,6 @@ class Runs(CreateMixin, CancelMixin, ListObjectMixin, GetStatusMixin,
                           thread_id=thread_id,
                           workspace=workspace,
                           api_key=api_key)
-            import json
-            print(
-                json.dumps(run,
-                           default=lambda o: o.__dict__,
-                           sort_keys=True,
-                           indent=4))
             if run.status_code == HTTPStatus.OK:
                 if hasattr(run, 'status'):
                     if run.status in [

dashscope/utils/oss_utils.py

@@ -121,8 +121,51 @@ def upload_file(model: str, upload_path: str, api_key: str):
     return None
 
 
+def check_and_upload_local(model: str, content: str, api_key: str):
+    """Check the content is local file path, upload and return the url
+
+    Args:
+        model (str): Which model to upload.
+        content (str): The content.
+        api_key (_type_): The api key.
+
+    Raises:
+        UploadFileException: Upload failed.
+        InvalidInput: The input is invalid
+
+    Returns:
+        _type_: if upload return True and file_url otherwise False, origin content.
+    """
+    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)
+            return True, file_url
+        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)
+            return True, file_url
+    return False, content
+
+
 def check_and_upload(model, elem: dict, api_key):
-    is_upload = False
+    has_upload = False
     for key, content in elem.items():
         # support video:[images] for qwen2-vl
         is_list = isinstance(content, list)
@@ -130,38 +173,14 @@ def check_and_upload(model, elem: dict, api_key):
 
         if key in ['image', 'video', 'audio', 'text']:
             for i, content in enumerate(contents):
-                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)
-                        contents[i] = 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)
-                        contents[i] = file_url
-                        is_upload = True
+                is_upload, file_url = check_and_upload_local(
+                    model, content, api_key)
+                if is_upload:
+                    contents[i] = file_url
+                    has_upload = True
         elem[key] = contents if is_list else contents[0]
 
-    return is_upload
+    return has_upload
 
 
 def preprocess_message_element(model: str, elem: List[dict], api_key: str):

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.20.8'
+__version__ = '1.20.9'

{dashscope-1.20.8.dist-info → dashscope-1.20.9.dist-info}/METADATA

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

{dashscope-1.20.8.dist-info → dashscope-1.20.9.dist-info}/RECORD

@@ -6,12 +6,12 @@ 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=528qtkrW31Rybnpunug78DmLVf7Ys8Mn-aRU-fFyAdA,23
+dashscope/version.py,sha256=rW_OBoIurR44z0-gRCL1GiR4KuiexcDQ6XLZw1HMwZs,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
 dashscope/aigc/generation.py,sha256=53oMCmN5ZbqeqAsKxmdunXlRh-XP8ZtnA7hB2id4Koo,17897
-dashscope/aigc/image_synthesis.py,sha256=_TGkh4L_yBNQNmoJUKlfXfljKfxX-SSyxHHQBDm1AC8,10418
+dashscope/aigc/image_synthesis.py,sha256=UWHW-nvf7_aDZKr4uZDusVHjqWr9TSZjCsZI8YSWaek,11052
 dashscope/aigc/multimodal_conversation.py,sha256=SlNnnsUPV19gdx8fYJAtsMFWPNGY6vhk5IGHZ5ZczpI,5369
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/api_entities/aiohttp_request.py,sha256=aE3AeWba8Ig_xHMYjrAdkq0N61l_L2VFTG6HYh912X0,10229
@@ -32,6 +32,7 @@ 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=cEooE3wGf8kKfJIVbaXEytl5X6F0hMsLe8g4Bj9Fn4w,18768
+dashscope/audio/asr/transcribe.py,sha256=HfZYpvpVfvGRAIIIzX65Af33E6vsIFGd_qqhQ8LaNcM,9651
 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
@@ -73,7 +74,7 @@ dashscope/threads/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 dashscope/threads/messages/files.py,sha256=wi0nJ2zsPWOw2Jn-ZkxA3URZBIrkGxqM_uAPfXY1xv0,3820
 dashscope/threads/messages/messages.py,sha256=Zjmyf3rT1XSdn33hPrqOY6DSWUVL7pDEapG03FREPV8,8419
 dashscope/threads/runs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/threads/runs/runs.py,sha256=Cvy5FD0x1Z9c5qayYeNpoL_QIqH4yxgqdGplCk3soRw,18762
+dashscope/threads/runs/runs.py,sha256=ux4VH_lxxHCw1XOqngzmsm9kwTR3jS0wX27xoAswHlY,18549
 dashscope/threads/runs/steps.py,sha256=pLNR-5g7zvYkvC-p4sZGVgYHd1jqxBerM2WFyB358H8,3638
 dashscope/tokenizers/__init__.py,sha256=Oy5FMT37Non6e1YxdHQ89U93Dy3CG1Ez0gBa771KZo0,200
 dashscope/tokenizers/qwen_tokenizer.py,sha256=dCnT9-9NrqPS85bEhjlPULUfDADVRhlleYwM_ILgCeI,4111
@@ -81,10 +82,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=TSBh7MJK4ZH40Mxd8wNEsG8nQLNhQjWRjW3itHsvoZ0,7023
-dashscope-1.20.8.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.20.8.dist-info/METADATA,sha256=M4hx1_1AZmfHDck7Aw4tYEKT4Fe3Ogf_iXFlIGU_cBc,6641
-dashscope-1.20.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.20.8.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.20.8.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.20.8.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=7vZ2Lypxwiit8VcAqAvr3cCyhVfaLapDiNuF-H3ZCD4,7332
+dashscope-1.20.9.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.9.dist-info/METADATA,sha256=n0YxcRTLCxVG5CnYICYV2ysSWYQMCYeG65bc7xsdYig,6641
+dashscope-1.20.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.9.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.20.9.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.9.dist-info/RECORD,,