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

dashscope/assistants/files.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.assistants.assistant_types import (AssistantFile,
                                                   AssistantFileList,
                                                   DeleteResponse)

dashscope/audio/__init__.py

@@ -1,3 +1,5 @@
-from . import asr, tts, tts_v2
+# Copyright (c) Alibaba, Inc. and its affiliates.
 
-__all__ = [asr, tts, tts_v2]
+from . import asr, tts, tts_v2, qwen_tts
+
+__all__ = [asr, tts, tts_v2, qwen_tts]

dashscope/audio/asr/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from .asr_phrase_manager import AsrPhraseManager
 from .recognition import Recognition, RecognitionCallback, RecognitionResult
 from .transcription import Transcription

dashscope/audio/asr/asr_phrase_manager.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from http import HTTPStatus
 from typing import Any, Dict
 

dashscope/audio/asr/recognition.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import json
 import os
 import threading

dashscope/audio/asr/transcription.py

@@ -1,8 +1,11 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import asyncio
 import time
 from typing import List, Union
 
 import aiohttp
+
 from dashscope.api_entities.dashscope_response import (DashScopeAPIResponse,
                                                        TranscriptionResponse)
 from dashscope.client.base_api import BaseAsyncApi

dashscope/audio/asr/translation_recognizer.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import json
 import os
 import threading

dashscope/audio/asr/vocabulary.py

@@ -1,8 +1,11 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import asyncio
 import time
 from typing import List
 
 import aiohttp
+
 from dashscope.client.base_api import BaseApi
 from dashscope.common.constants import ApiProtocol, HTTPMethod
 from dashscope.common.logging import logger

dashscope/audio/qwen_tts/__init__.py

@@ -0,0 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
+from .speech_synthesizer import SpeechSynthesizer
+
+__all__ = [SpeechSynthesizer]

dashscope/audio/qwen_tts/speech_synthesizer.py

@@ -0,0 +1,77 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
+from typing import Generator, Union
+
+from dashscope.api_entities.dashscope_response import \
+    TextToSpeechResponse
+from dashscope.client.base_api import BaseApi
+from dashscope.common.error import InputRequired, ModelRequired
+
+
+class SpeechSynthesizer(BaseApi):
+    """Text-to-speech interface.
+    """
+
+    task_group = 'aigc'
+    task = 'multimodal-generation'
+    function = 'generation'
+
+    class Models:
+        qwen_tts = 'qwen-tts'
+
+    @classmethod
+    def call(
+        cls,
+        model: str,
+        text: str,
+        api_key: str = None,
+        workspace: str = None,
+        **kwargs
+    ) -> Union[TextToSpeechResponse, Generator[
+            TextToSpeechResponse, None, None]]:
+        """Call the conversation model service.
+
+        Args:
+            model (str): The requested model, such as 'qwen-tts'
+            text (str): Text content used for speech synthesis.
+            api_key (str, optional): The api api_key, can be None,
+                if None, will retrieve by rule [1].
+                [1]: https://help.aliyun.com/zh/dashscope/developer-reference/api-key-settings. # noqa E501
+            workspace (str): The dashscope workspace id.
+            **kwargs:
+                stream(bool, `optional`): Enable server-sent events
+                    (ref: https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events)  # noqa E501
+                    the result will back partially[qwen-turbo,bailian-v1].
+                voice: str
+                    Voice name.
+
+        Raises:
+            InputRequired: The input must include the text parameter.
+            ModelRequired: The input must include the model parameter.
+
+        Returns:
+            Union[TextToSpeechResponse,
+                  Generator[TextToSpeechResponse, None, None]]: If
+            stream is True, return Generator, otherwise TextToSpeechResponse.
+        """
+        if not text:
+            raise InputRequired('text is required!')
+        if model is None or not model:
+            raise ModelRequired('Model is required!')
+        input = {'text': text}
+        if 'voice' in kwargs:
+            input['voice'] = kwargs.pop('voice')
+        response = super().call(model=model,
+                                task_group=SpeechSynthesizer.task_group,
+                                task=SpeechSynthesizer.task,
+                                function=SpeechSynthesizer.function,
+                                api_key=api_key,
+                                input=input,
+                                workspace=workspace,
+                                **kwargs)
+        is_stream = kwargs.get('stream', False)
+        if is_stream:
+            return (TextToSpeechResponse.from_api_response(rsp)
+                    for rsp in response)
+        else:
+            return TextToSpeechResponse.from_api_response(response)

dashscope/audio/tts/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from .speech_synthesizer import (ResultCallback, SpeechSynthesisResult,
                                  SpeechSynthesizer)
 

dashscope/audio/tts/speech_synthesizer.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from http import HTTPStatus
 from typing import Dict, List
 

dashscope/audio/tts_v2/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from .enrollment import VoiceEnrollmentException, VoiceEnrollmentService
 from .speech_synthesizer import AudioFormat, ResultCallback, SpeechSynthesizer
 

dashscope/audio/tts_v2/enrollment.py

@@ -1,8 +1,11 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import asyncio
 import time
 from typing import List
 
 import aiohttp
+
 from dashscope.client.base_api import BaseApi
 from dashscope.common.constants import ApiProtocol, HTTPMethod
 from dashscope.common.logging import logger

dashscope/audio/tts_v2/speech_synthesizer.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import json
 import platform
 import threading
@@ -5,8 +7,9 @@ import time
 import uuid
 from enum import Enum, unique
 
-import dashscope
 import websocket
+
+import dashscope
 from dashscope.common.error import InputRequired, InvalidTask, ModelRequired
 from dashscope.common.logging import logger
 from dashscope.protocol.websocket import (ACTION_KEY, EVENT_KEY, HEADER,

dashscope/client/base_api.py

@@ -1,9 +1,12 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import time
 from http import HTTPStatus
 from typing import Any, Dict, Iterator, List, Union
 
-import dashscope
 import requests
+
+import dashscope
 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

dashscope/common/api_key.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import Optional
 

dashscope/common/base_type.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import dataclasses
 from dataclasses import dataclass
 from typing import Any, List

dashscope/common/constants.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from http import HTTPStatus
 from pathlib import Path
 

dashscope/common/env.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 
 from dashscope.common.constants import (DASHSCOPE_API_KEY_ENV,

dashscope/common/error.py

@@ -1,3 +1,6 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
+
 class DashScopeException(Exception):
     pass
 

dashscope/common/logging.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import logging
 import os
 

dashscope/common/message_manager.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from collections import deque
 from typing import List
 

dashscope/common/utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import asyncio
 import json
 import os
@@ -11,6 +13,7 @@ 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/customize/customize_types.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dataclasses import dataclass
 from http import HTTPStatus
 from typing import Dict, List

dashscope/customize/deployments.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.client.base_api import (CreateMixin, DeleteMixin, GetMixin,
                                        ListMixin, PutMixin, StreamEventMixin)
 from dashscope.customize.customize_types import (Deployment, DeploymentDelete,

dashscope/customize/finetunes.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import time
 from http import HTTPStatus
 from typing import Iterator, Union

dashscope/embeddings/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from .batch_text_embedding import BatchTextEmbedding
 from .batch_text_embedding_response import BatchTextEmbeddingResponse
 from .text_embedding import TextEmbedding

dashscope/embeddings/batch_text_embedding.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import Union
 
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse

dashscope/embeddings/batch_text_embedding_response.py

@@ -1,6 +1,9 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from http import HTTPStatus
 
 from attr import dataclass
+
 from dashscope.api_entities.dashscope_response import (DashScopeAPIResponse,
                                                        DictMixin)
 

dashscope/embeddings/multimodal_embedding.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dataclasses import dataclass
 from typing import List
 
@@ -104,7 +106,8 @@ class MultiModalEmbedding(BaseApi):
         """
         has_upload = False
         for elem in input:
-            is_upload = preprocess_message_element(model, elem, api_key)
-            if is_upload and not has_upload:
-                has_upload = True
+            if not isinstance(elem, (int, float, bool, str, bytes, bytearray)):
+                is_upload = preprocess_message_element(model, elem, api_key)
+                if is_upload and not has_upload:
+                    has_upload = True
         return has_upload

dashscope/embeddings/text_embedding.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import List, Union
 
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse

dashscope/files.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse

dashscope/io/input_output.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import base64
 import io
 from typing import Generator

dashscope/model.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.client.base_api import GetMixin, ListMixin
 

dashscope/models.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.client.base_api import GetMixin, ListMixin
 

dashscope/nlp/understanding.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.client.base_api import BaseApi
 from dashscope.common.error import InputRequired, ModelRequired

dashscope/protocol/websocket.py

@@ -1,3 +1,6 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
+
 class WebsocketStreamingMode:
     # TODO how to know request is duplex or other.
     NONE = 'none'  # no stream

dashscope/rerank/text_rerank.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import List
 
 from dashscope.api_entities.dashscope_response import ReRankResponse

dashscope/threads/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 # yapf: disable
 
 from dashscope.threads.messages.messages import Messages

dashscope/threads/messages/files.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.client.base_api import GetStatusMixin, ListObjectMixin
 from dashscope.common.error import InputRequired
 from dashscope.threads.thread_types import MessageFile, MessageFileList

dashscope/threads/messages/messages.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import Dict, List, Optional
 
 from dashscope.client.base_api import (CreateMixin, GetStatusMixin,

dashscope/threads/runs/runs.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import time
 from http import HTTPStatus
 from typing import Dict, List, Optional

dashscope/threads/runs/steps.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from dashscope.client.base_api import GetStatusMixin, ListObjectMixin
 from dashscope.common.error import InputRequired
 from dashscope.threads.thread_types import RunStep, RunStepList

dashscope/threads/thread_types.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 # adapter from openai sdk
 # yapf: disable
 from dataclasses import dataclass

dashscope/threads/threads.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import Dict, List, Optional
 
 from dashscope.assistants.assistant_types import DeleteResponse

dashscope/tokenizers/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from .tokenization import Tokenization
 from .tokenizer import get_tokenizer, list_tokenizers
 from .tokenizer_base import Tokenizer

dashscope/tokenizers/qwen_tokenizer.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import base64
 import unicodedata
 from typing import Collection, Dict, List, Set, Union

dashscope/tokenizers/tokenization.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import copy
 from typing import Any, List
 

dashscope/tokenizers/tokenizer.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import os
 from typing import List
 

dashscope/tokenizers/tokenizer_base.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 from typing import List
 
 

dashscope/utils/oss_utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) Alibaba, Inc. and its affiliates.
+
 import mimetypes
 import os
 from datetime import datetime
@@ -8,6 +10,7 @@ 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/version.py

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

{dashscope-1.22.1.dist-info → dashscope-1.23.0.dist-info}/LICENSE

@@ -1,5 +1,3 @@
-Copyright 2023-2024 Alibaba DashScope. All rights reserved.
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -188,7 +186,7 @@ Copyright 2023-2024 Alibaba DashScope. All rights reserved.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020-2023 Alibaba DashScope.
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -200,4 +198,4 @@ Copyright 2023-2024 Alibaba DashScope. All rights reserved.
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashscope
-Version: 1.22.1
+Version: 1.23.0
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud
@@ -18,7 +18,6 @@ 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
@@ -77,7 +76,7 @@ else:
 
 ## API Key Authentication
 
-The SDK uses API key for authentication. Please refer to [official documentation](https://dashscope.aliyun.com) regarding how to obtain your api-key.
+The SDK uses API key for authentication. Please refer to [official documentation for alibabacloud china](https://www.alibabacloud.com/help/en/model-studio/) and [official documentation for alibabacloud international](https://www.alibabacloud.com/help/en/model-studio/) regarding how to obtain your api-key.
 
 ### Using the API Key
 
@@ -222,3 +221,5 @@ Coming soon.
 
 ## License
 This project is licensed under the Apache License (Version 2.0).
+
+