dashscope 1.13.0__py3-none-any.whl → 1.13.2__py3-none-any.whl

dashscope/aigc/conversation.py

@@ -100,6 +100,7 @@ class Conversation(BaseApi):
 
         qwen_turbo = 'qwen-turbo'
         qwen_plus = 'qwen-plus'
+        qen_max = 'qwen-max'
 
     def __init__(self, history: History = None) -> None:
         """Init a chat.
@@ -171,15 +172,37 @@ class Conversation(BaseApi):
                     tokens with top_p probability mass. So 0.1 means only
                     the tokens comprising the top 10% probability mass are
                     considered.
+                top_k(int, `optional`): The size of the sample candidate set when generated.  # noqa E501
+                    For example, when the value is 50, only the 50 highest-scoring tokens  # noqa E501
+                    in a single generation form a randomly sampled candidate set. # noqa E501
+                    The larger the value, the higher the randomness generated;  # noqa E501
+                    the smaller the value, the higher the certainty generated. # noqa E501
+                    The default value is 0, which means the top_k policy is  # noqa E501
+                    not enabled. At this time, only the top_p policy takes effect. # noqa E501
                 enable_search(bool, `optional`): Whether to enable web search(quark).  # noqa E501
                     Currently works best only on the first round of conversation.
-                    Default to False.
+                    Default to False, support model: [qwen-turbo].
+                customized_model_id(str, required) The enterprise-specific
+                    large model id, which needs to be generated from the
+                    operation background of the enterprise-specific
+                    large model product, support model: [bailian-v1].
                 result_format(str, `optional`): [message|text] Set result result format. # noqa E501
                     Default result is text
-                output_in_full(bool, `optional`): Used to control the streaming output mode. # noqa E501
+                incremental_output(bool, `optional`): Used to control the streaming output mode. # noqa E501
                     If true, the subsequent output will include the previously input content. # noqa E501
-                    Otherwise, the subsequent output will not include the previously output
-                    content. Default True.
+                    Otherwise, the subsequent output will not include the previously output # noqa E501
+                    content. Default false.
+                stop(list[str] or list[list[int]], `optional`): Used to control the generation to stop  # noqa E501
+                    when encountering setting str or token ids, the result will not include # noqa E501
+                    stop words or tokens.
+                max_tokens(int, `optional`): The maximum token num expected to be output. It should be # noqa E501
+                    noted that the length generated by the model will only be less than max_tokens,  # noqa E501
+                    not necessarily equal to it. If max_tokens is set too large, the service will # noqa E501
+                    directly prompt that the length exceeds the limit. It is generally # noqa E501
+                    not recommended to set this value.
+                repetition_penalty(float, `optional`): Used to control the repeatability when generating models.  # noqa E501
+                    Increasing repetition_penalty can reduce the duplication of model generation.  # noqa E501
+                    1.0 means no punishment.
         Raises:
             InputRequired: The prompt cannot be empty.
             InvalidInput: The history and auto_history are mutually exclusive.

dashscope/aigc/generation.py

@@ -28,6 +28,7 @@ class Generation(BaseApi):
         dolly_12b_v2 = 'dolly-12b-v2'
         qwen_turbo = 'qwen-turbo'
         qwen_plus = 'qwen-plus'
+        qen_max = 'qwen-max'
 
     @classmethod
     def call(
@@ -78,6 +79,13 @@ class Generation(BaseApi):
                     tokens with top_p probability mass. So 0.1 means only
                     the tokens comprising the top 10% probability mass are
                     considered[qwen-turbo,bailian-v1].
+                top_k(int, `optional`): The size of the sample candidate set when generated.  # noqa E501
+                    For example, when the value is 50, only the 50 highest-scoring tokens  # noqa E501
+                    in a single generation form a randomly sampled candidate set. # noqa E501
+                    The larger the value, the higher the randomness generated;  # noqa E501
+                    the smaller the value, the higher the certainty generated. # noqa E501
+                    The default value is 0, which means the top_k policy is  # noqa E501
+                    not enabled. At this time, only the top_p policy takes effect. # noqa E501
                 enable_search(bool, `optional`): Whether to enable web search(quark).  # noqa E501
                     Currently works best only on the first round of conversation.
                     Default to False, support model: [qwen-turbo].
@@ -87,10 +95,21 @@ class Generation(BaseApi):
                     large model product, support model: [bailian-v1].
                 result_format(str, `optional`): [message|text] Set result result format. # noqa E501
                     Default result is text
-                output_in_full(bool, `optional`): Used to control the streaming output mode. # noqa E501
+                incremental_output(bool, `optional`): Used to control the streaming output mode. # noqa E501
                     If true, the subsequent output will include the previously input content. # noqa E501
-                    Otherwise, the subsequent output will not include the previously output
-                    content. Default True.
+                    Otherwise, the subsequent output will not include the previously output # noqa E501
+                    content. Default false.
+                stop(list[str] or list[list[int]], `optional`): Used to control the generation to stop  # noqa E501
+                    when encountering setting str or token ids, the result will not include # noqa E501
+                    stop words or tokens.
+                max_tokens(int, `optional`): The maximum token num expected to be output. It should be # noqa E501
+                    noted that the length generated by the model will only be less than max_tokens,  # noqa E501
+                    not necessarily equal to it. If max_tokens is set too large, the service will # noqa E501
+                    directly prompt that the length exceeds the limit. It is generally # noqa E501
+                    not recommended to set this value.
+                repetition_penalty(float, `optional`): Used to control the repeatability when generating models.  # noqa E501
+                    Increasing repetition_penalty can reduce the duplication of model generation.  # noqa E501
+                    1.0 means no punishment.
         Raises:
             InvalidInput: The history and auto_history are mutually exclusive.
 

dashscope/aigc/image_synthesis.py

@@ -14,6 +14,7 @@ class ImageSynthesis(BaseAsyncApi):
     """
     class Models:
         wanx_v1 = 'wanx-v1'
+        wanx_sketch_to_image_v1 = 'wanx-sketch-to-image-v1'
 
     @classmethod
     def call(cls,
@@ -22,6 +23,7 @@ class ImageSynthesis(BaseAsyncApi):
              negative_prompt: Any = None,
              images: List[str] = None,
              api_key: str = None,
+             sketch_image_url: str = None,
              **kwargs) -> ImageSynthesisResponse:
         """Call image(s) synthesis service and get result.
 
@@ -29,16 +31,21 @@ class ImageSynthesis(BaseAsyncApi):
             model (str): The model, reference ``Models``.
             prompt (Any): The prompt for image(s) synthesis.
             negative_prompt (Any): The negative_prompt. Defaults to None.
-            images (List[str]): The input list of images url.
+            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.
+                Defaults to None.
             **kwargs:
-                n(int, `optional`): Number of images to synthesis,
-                    Currently fixed at 4.
-                size(str, `optional`): The output image(s) size(width*height),
-                    Currently fixed at 1024*1024. Default 1024*1024
+                n(int, `optional`): Number of images to synthesis.
+                size(str, `optional`): The output image(s) size(width*height).
                 similarity(float, `optional`): The similarity between the
                     output image and the input image
-
+                sketch_weight(int, optional): How much the input sketch
+                    affects the output image[0-10], only for wanx-sketch-to-image-v1. # noqa E501
+                    Default 10.
+                realisticness(int, optional): The realisticness of the output
+                    image[0-10], only for wanx-sketch-to-image-v1. Default 5
 
         Raises:
             InputRequired: The prompt cannot be empty.
@@ -51,6 +58,7 @@ class ImageSynthesis(BaseAsyncApi):
                             negative_prompt,
                             images,
                             api_key=api_key,
+                            sketch_image_url=sketch_image_url,
                             **kwargs)
 
     @classmethod
@@ -60,6 +68,7 @@ class ImageSynthesis(BaseAsyncApi):
                    negative_prompt: Any = None,
                    images: List[str] = None,
                    api_key: str = None,
+                   sketch_image_url: str = None,
                    **kwargs) -> ImageSynthesisResponse:
         """Create a image(s) synthesis task, and return task information.
 
@@ -69,11 +78,18 @@ class ImageSynthesis(BaseAsyncApi):
             negative_prompt (Any): The negative_prompt. Defaults to None.
             images (List[str]): The input list of images url.
             api_key (str, optional): The api api_key. Defaults to None.
+            sketch_image_url (str, optional): Only for wanx-sketch-to-image-v1.
+                Defaults to None.
             **kwargs(wanx-v1):
                 n(int, `optional`): Number of images to synthesis.
                 size: The output image(s) size, Default 1024*1024
                 similarity(float, `optional`): The similarity between the
-                    output image and the input image
+                    output image and the input image.
+                sketch_weight(int, optional): How much the input sketch
+                    affects the output image[0-10], only for wanx-sketch-to-image-v1. # noqa E501
+                    Default 10.
+                realisticness(int, optional): The realisticness of the output
+                    image[0-10], only for wanx-sketch-to-image-v1. Default 5
 
         Raises:
             InputRequired: The prompt cannot be empty.
@@ -90,6 +106,8 @@ class ImageSynthesis(BaseAsyncApi):
             input[NEGATIVE_PROMPT] = negative_prompt
         if images is not None:
             input[IMAGES] = images
+        if sketch_image_url is not None and sketch_image_url:
+            input['sketch_image_url'] = sketch_image_url
         response = super().async_call(model=model,
                                       task_group=task_group,
                                       task=ImageSynthesis.task,

dashscope/aigc/multimodal_conversation.py

@@ -1,3 +1,4 @@
+import copy
 from typing import Generator, List, Union
 
 from dashscope.api_entities.dashscope_response import \
@@ -78,12 +79,13 @@ class MultiModalConversation(BaseApi):
         if model is None or not model:
             raise ModelRequired('Model is required!')
         task_group, _ = _get_task_group_and_task(__name__)
-        has_upload = cls._preprocess_messages(model, messages, api_key)
+        msg_copy = copy.deepcopy(messages)
+        has_upload = cls._preprocess_messages(model, msg_copy, api_key)
         if has_upload:
             headers = kwargs.pop('headers', {})
             headers['X-DashScope-OssResourceResolve'] = 'enable'
             kwargs['headers'] = headers
-        input = {'messages': messages}
+        input = {'messages': msg_copy}
         response = super().call(model=model,
                                 task_group=task_group,
                                 task=MultiModalConversation.task,

dashscope/utils/oss_utils.py

@@ -1,3 +1,4 @@
+import mimetypes
 import os
 from datetime import datetime
 from http import HTTPStatus
@@ -13,7 +14,7 @@ from dashscope.common.constants import (FILE_PATH_SCHEMA,
                                         REQUEST_CONTENT_AUDIO,
                                         REQUEST_CONTENT_IMAGE,
                                         REQUEST_CONTENT_TEXT)
-from dashscope.common.error import UploadFileException
+from dashscope.common.error import InvalidInput, UploadFileException
 from dashscope.common.logging import logger
 from dashscope.common.utils import get_user_agent
 
@@ -64,6 +65,7 @@ class OssUtils(GetMixin):
         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:
@@ -112,6 +114,8 @@ def check_and_upload(model, elem: dict, key: str, api_key):
                                           content)
             elem[key] = file_url
             is_upload = True
+        else:
+            raise InvalidInput('The file: %s is not exists!' % file_path)
     return is_upload
 
 

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.13.0'
+__version__ = '1.13.2'

{dashscope-1.13.0.dist-info → dashscope-1.13.2.dist-info}/METADATA

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

{dashscope-1.13.0.dist-info → dashscope-1.13.2.dist-info}/RECORD

@@ -4,13 +4,13 @@ dashscope/deployment.py,sha256=uhlQYOiu1baMQxQnFmRwI6ces0I-_DKp8uej_L0v1eY,4400
 dashscope/file.py,sha256=Dv2Fz3DLbcye2uuQxyQwRM7ky27OthouLXIpSQagQy4,3324
 dashscope/finetune.py,sha256=5QlIcnFCfSjN3gn9A2FO0kLUDa9Rx_jSc44ezT3aBEo,5118
 dashscope/model.py,sha256=iuIfal-vOo0yav0HXPdA7f93vd5JNTGIAdCG_WIYkW8,1158
-dashscope/version.py,sha256=622hD3qJqhv4C6pyrO23lfTGvr4puThdOJtb-JpmMHU,23
+dashscope/version.py,sha256=VBBsQLpPZXlY1ESE6pAXYNUQLhcteUIvGwOsPHrTOs4,23
 dashscope/aigc/__init__.py,sha256=s-MCA87KYiVumYtKtJi5IMN7xelSF6TqEU3s3_7RF-Y,327
 dashscope/aigc/code_generation.py,sha256=bizJb3zGZx3pB74FKMIcnOi_6jkxpKgx__6urzqhQ_E,10627
-dashscope/aigc/conversation.py,sha256=AU6gv52JYe8tBPZjYGJe2Aa2z50Nasb3f5Bhe4qlAGM,12022
-dashscope/aigc/generation.py,sha256=FxEOFpgwkLLL2gLMr1YHJ0mz-jz3MKTjBN7SUBbzgxY,8157
-dashscope/aigc/image_synthesis.py,sha256=P5KFBqYLSNrztyxdrOjpBgUDLt-o6FKVa7JyIOWxbYQ,7789
-dashscope/aigc/multimodal_conversation.py,sha256=L6HgyPILZZBoh0sazCyDu9e_8q0Mw6UQm9yLiOIRyeo,5173
+dashscope/aigc/conversation.py,sha256=_-LcNzeSG82Gjo1HzyI3eQxmgLVKSC7llUnjRjvYC_4,14089
+dashscope/aigc/generation.py,sha256=4nOaejsgyK3Qh_orcbWbao1NCNtklBa7OdqnAczysgU,9909
+dashscope/aigc/image_synthesis.py,sha256=Y20B_hpCe-uLKR661hvFpjQVk9jFfNtiPpiBkYiHAA0,8996
+dashscope/aigc/multimodal_conversation.py,sha256=D5JYLLxwdGsgCrYeF0gNvE1kR5Vbmq1g0MiRU-4hlZQ,5228
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/api_entities/aiohttp_request.py,sha256=1WuvODWcm-merZnAFpxV2Y9QohcB3hSGS_YkwK18O7g,10359
 dashscope/api_entities/api_request_data.py,sha256=JUMcfpJjKXEZLCBSFIDpgoaeQYk5uK9-CwhM4OHIHFQ,5463
@@ -50,10 +50,10 @@ dashscope/protocol/websocket.py,sha256=z-v6PGx3L4zYBANuC48s7SWSQSwRCDoh0zcfhv9Bf
 dashscope/tokenizers/__init__.py,sha256=zRNBe3ONNOA3T2gnxhlG3PTjkVOQBUYotMMJAruyk70,71
 dashscope/tokenizers/tokenization.py,sha256=WhSdiH0Bu-pGQCsJfC91LL_y5tVDzCtQ7tTs2Tox-HY,4543
 dashscope/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/utils/oss_utils.py,sha256=RG-MreDSvpvdG4ua5rcfmjQKybHYG6a4ffZbnYlHblQ,5134
-dashscope-1.13.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.13.0.dist-info/METADATA,sha256=Fs2lwECVcYmFvtfw1nxt_ZntrmYd1tEMbgks0OeTeY4,7220
-dashscope-1.13.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.13.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.13.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.13.0.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=arw_ZbRefOrWwzyE7l1HBz8VQcbwNfmEfJHB2-TCVp8,5330
+dashscope-1.13.2.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.13.2.dist-info/METADATA,sha256=kQwr3xgT8vpMECyTf_bHaUMtAJZ1go4pPsvxFktrN-s,7220
+dashscope-1.13.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.13.2.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.13.2.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.13.2.dist-info/RECORD,,