dashscope 1.23.1__py3-none-any.whl → 1.23.3__py3-none-any.whl

dashscope/aigc/image_synthesis.py

@@ -19,6 +19,8 @@ class ImageSynthesis(BaseAsyncApi):
         wanx_v1 = 'wanx-v1'
         wanx_sketch_to_image_v1 = 'wanx-sketch-to-image-v1'
 
+        wanx_2_1_imageedit = 'wanx2.1-imageedit'
+
     @classmethod
     def call(cls,
              model: str,
@@ -31,6 +33,9 @@ class ImageSynthesis(BaseAsyncApi):
              workspace: str = None,
              extra_input: Dict = None,
              task: str = None,
+             function: str = None,
+             mask_image_url: str = None,
+             base_image_url: str = None,
              **kwargs) -> ImageSynthesisResponse:
         """Call image(s) synthesis service and get result.
 
@@ -47,6 +52,11 @@ class ImageSynthesis(BaseAsyncApi):
             workspace (str): The dashscope workspace id.
             extra_input (Dict): The extra input parameters.
             task (str): The task of api, ref doc.
+            function (str): The specific functions to be achieved. like:
+                colorization,super_resolution,expand,remove_watermaker,doodle,
+                description_edit_with_mask,description_edit,stylization_local,stylization_all
+            base_image_url (str): Enter the URL address of the target edited image.
+            mask_image_url (str): Provide the URL address of the image of the marked area by the user. It should be consistent with the image resolution of the base_image_url.
             **kwargs:
                 n(int, `optional`): Number of images to synthesis.
                 size(str, `optional`): The output image(s) size(width*height).
@@ -74,6 +84,9 @@ class ImageSynthesis(BaseAsyncApi):
                             workspace=workspace,
                             extra_input=extra_input,
                             task=task,
+                            function=function,
+                            mask_image_url=mask_image_url,
+                            base_image_url=base_image_url,
                             **kwargs)
 
     @classmethod
@@ -88,6 +101,9 @@ class ImageSynthesis(BaseAsyncApi):
                    workspace: str = None,
                    extra_input: Dict = None,
                    task: str = None,
+                   function: str = None,
+                   mask_image_url: str = None,
+                   base_image_url: str = None,
                    **kwargs) -> ImageSynthesisResponse:
         """Create a image(s) synthesis task, and return task information.
 
@@ -102,6 +118,11 @@ class ImageSynthesis(BaseAsyncApi):
             workspace (str): The dashscope workspace id.
             extra_input (Dict): The extra input parameters.
             task (str): The task of api, ref doc.
+            function (str): The specific functions to be achieved. like:
+                colorization,super_resolution,expand,remove_watermaker,doodle,
+                description_edit_with_mask,description_edit,stylization_local,stylization_all
+            base_image_url (str): Enter the URL address of the target edited image.
+            mask_image_url (str): Provide the URL address of the image of the marked area by the user. It should be consistent with the image resolution of the base_image_url.
             **kwargs(wanx-v1):
                 n(int, `optional`): Number of images to synthesis.
                 size: The output image(s) size, Default 1024*1024
@@ -122,7 +143,7 @@ class ImageSynthesis(BaseAsyncApi):
         """
         if prompt is None or not prompt:
             raise InputRequired('prompt is required!')
-        task_group, function = _get_task_group_and_task(__name__)
+        task_group, f = _get_task_group_and_task(__name__)
         input = {PROMPT: prompt}
         has_upload = False
         if negative_prompt is not None:
@@ -141,6 +162,24 @@ class ImageSynthesis(BaseAsyncApi):
             if is_upload:
                 has_upload = True
             input['ref_img'] = ref_img
+
+        if function is not None and function:
+            input['function'] = function
+
+        if mask_image_url is not None and mask_image_url:
+            is_upload, res_mask_image_url = check_and_upload_local(
+                model, mask_image_url, api_key)
+            if is_upload:
+                has_upload = True
+            input['mask_image_url'] = mask_image_url
+
+        if base_image_url is not None and base_image_url:
+            is_upload, res_base_image_url = check_and_upload_local(
+                model, base_image_url, api_key)
+            if is_upload:
+                has_upload = True
+            input['base_image_url'] = res_base_image_url
+
         if extra_input is not None and extra_input:
             input = {**input, **extra_input}
 
@@ -149,11 +188,16 @@ class ImageSynthesis(BaseAsyncApi):
             headers['X-DashScope-OssResourceResolve'] = 'enable'
             kwargs['headers'] = headers
 
+        if task is None:
+            task = ImageSynthesis.task
+        if model is not None and model and 'imageedit' in model:
+            task = 'image2image'
+
         response = super().async_call(
             model=model,
             task_group=task_group,
-            task=ImageSynthesis.task if task is None else task,
-            function=function,
+            task=task,
+            function=f,
             api_key=api_key,
             input=input,
             workspace=workspace,

dashscope/aigc/video_synthesis.py

@@ -16,15 +16,25 @@ class VideoSynthesis(BaseAsyncApi):
     """API for video synthesis.
     """
     class Models:
+        """@deprecated, use wanx2.1-t2v-plus instead"""
         wanx_txt2video_pro = 'wanx-txt2video-pro'
+        """@deprecated, use wanx2.1-i2v-plus instead"""
         wanx_img2video_pro = 'wanx-img2video-pro'
+
         wanx_2_1_t2v_turbo = 'wanx2.1-t2v-turbo'
         wanx_2_1_t2v_plus = 'wanx2.1-t2v-plus'
 
+        wanx_2_1_i2v_plus = 'wanx2.1-i2v-plus'
+        wanx_2_1_i2v_turbo = 'wanx2.1-i2v-turbo'
+
+        wanx_2_1_kf2v_plus = 'wanx2.1-kf2v-plus'
+        wanx_kf2v = 'wanx-kf2v'
+
     @classmethod
     def call(cls,
              model: str,
-             prompt: Any,
+             prompt: Any = None,
+             # """@deprecated, use prompt_extend in parameters """
              extend_prompt: bool = True,
              negative_prompt: str = None,
              template: str = None,
@@ -33,13 +43,17 @@ class VideoSynthesis(BaseAsyncApi):
              extra_input: Dict = None,
              workspace: str = None,
              task: str = None,
+             head_frame: str = None,
+             tail_frame: str = None,
+             first_frame_url: str = None,
+             last_frame_url: str = None,
              **kwargs) -> VideoSynthesisResponse:
         """Call video synthesis service and get result.
 
         Args:
             model (str): The model, reference ``Models``.
             prompt (Any): The prompt for video synthesis.
-            extend_prompt (bool): The extend_prompt. Whether to enable write expansion. The default value is True.
+            extend_prompt (bool): @deprecated, use prompt_extend in parameters
             negative_prompt (str): The negative prompt is the opposite of the prompt meaning.
             template (str): LoRa input, such as gufeng, katong, etc.
             img_url (str): The input image url, Generate the URL of the image referenced by the video.
@@ -47,6 +61,8 @@ class VideoSynthesis(BaseAsyncApi):
             workspace (str): The dashscope workspace id.
             extra_input (Dict): The extra input parameters.
             task (str): The task of api, ref doc.
+            first_frame_url (str): The URL of the first frame image for generating the video.
+            last_frame_url (str): The URL of the last frame image for generating the video.
             **kwargs:
                 size(str, `optional`): The output video size(width*height).
                 duration(int, optional): The duration. Duration of video generation. The default value is 5, in seconds.
@@ -68,13 +84,18 @@ class VideoSynthesis(BaseAsyncApi):
                             workspace=workspace,
                             extra_input=extra_input,
                             task=task,
+                            head_frame=head_frame,
+                            tail_frame=tail_frame,
+                            first_frame_url=first_frame_url,
+                            last_frame_url=last_frame_url,
                             **kwargs)
 
     @classmethod
     def async_call(cls,
                    model: str,
-                   prompt: Any,
+                   prompt: Any = None,
                    img_url: str = None,
+                   # """@deprecated, use prompt_extend in parameters """
                    extend_prompt: bool = True,
                    negative_prompt: str = None,
                    template: str = None,
@@ -82,13 +103,17 @@ class VideoSynthesis(BaseAsyncApi):
                    extra_input: Dict = None,
                    workspace: str = None,
                    task: str = None,
+                   head_frame: str = None,
+                   tail_frame: str = None,
+                   first_frame_url: str = None,
+                   last_frame_url: str = None,
                    **kwargs) -> VideoSynthesisResponse:
         """Create a video synthesis task, and return task information.
 
         Args:
             model (str): The model, reference ``Models``.
             prompt (Any): The prompt for video synthesis.
-            extend_prompt (bool): The extend_prompt. Whether to enable write expansion. The default value is True.
+            extend_prompt (bool): @deprecated, use prompt_extend in parameters
             negative_prompt (str): The negative prompt is the opposite of the prompt meaning.
             template (str): LoRa input, such as gufeng, katong, etc.
             img_url (str): The input image url, Generate the URL of the image referenced by the video.
@@ -96,6 +121,8 @@ class VideoSynthesis(BaseAsyncApi):
             workspace (str): The dashscope workspace id.
             extra_input (Dict): The extra input parameters.
             task (str): The task of api, ref doc.
+            first_frame_url (str): The URL of the first frame image for generating the video.
+            last_frame_url (str): The URL of the last frame image for generating the video.
             **kwargs:
                 size(str, `optional`): The output video size(width*height).
                 duration(int, optional): The duration. Duration of video generation. The default value is 5, in seconds.
@@ -108,27 +135,63 @@ class VideoSynthesis(BaseAsyncApi):
             DashScopeAPIResponse: The video synthesis
                 task id in the response.
         """
-        if prompt is None or not prompt:
-            raise InputRequired('prompt is required!')
         task_group, function = _get_task_group_and_task(__name__)
         inputs = {PROMPT: prompt, 'extend_prompt': extend_prompt}
         if negative_prompt:
             inputs['negative_prompt'] = negative_prompt
         if template:
             inputs['template'] = template
+        if function:
+            inputs['function'] = function
+
         has_upload = False
+
         if img_url is not None and img_url:
             is_upload, res_img_url = check_and_upload_local(
                 model, img_url, api_key)
             if is_upload:
                 has_upload = True
             inputs['img_url'] = res_img_url
+
+        if head_frame is not None and head_frame:
+            is_upload, res_head_frame = check_and_upload_local(
+                model, head_frame, api_key)
+            if is_upload:
+                has_upload = True
+            inputs['head_frame'] = res_head_frame
+
+        if tail_frame is not None and tail_frame:
+            is_upload, res_tail_frame = check_and_upload_local(
+                model, tail_frame, api_key)
+            if is_upload:
+                has_upload = True
+            inputs['tail_frame'] = res_tail_frame
+
+        if first_frame_url is not None and first_frame_url:
+            is_upload, res_first_frame_url = check_and_upload_local(
+                model, first_frame_url, api_key)
+            if is_upload:
+                has_upload = True
+            inputs['first_frame_url'] = res_first_frame_url
+
+        if last_frame_url is not None and last_frame_url:
+            is_upload, res_last_frame_url = check_and_upload_local(
+                model, last_frame_url, api_key)
+            if is_upload:
+                has_upload = True
+            inputs['last_frame_url'] = res_last_frame_url
+
         if extra_input is not None and extra_input:
             inputs = {**inputs, **extra_input}
         if has_upload:
             headers = kwargs.pop('headers', {})
             headers['X-DashScope-OssResourceResolve'] = 'enable'
             kwargs['headers'] = headers
+
+        if task is None:
+            task = VideoSynthesis.task
+        if model is not None and model and 'kf2v' in model:
+            task = 'image2video'
         response = super().async_call(
             model=model,
             task_group=task_group,

dashscope/api_entities/dashscope_response.py

@@ -119,7 +119,7 @@ class Message(DictMixin):
     role: str
     content: Union[str, List]
 
-    def __init__(self, role: str, content: str, **kwargs):
+    def __init__(self, role: str, content: str = None, **kwargs):
         super().__init__(role=role, content=content, **kwargs)
 
     @classmethod
@@ -145,7 +145,7 @@ class Choice(DictMixin):
                  message: Message = None,
                  **kwargs):
         msgObject = None
-        if message is not None:
+        if message is not None and message:
             msgObject = Message(**message)
         super().__init__(finish_reason=finish_reason,
                          message=msgObject,

dashscope/version.py

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

{dashscope-1.23.1.dist-info → dashscope-1.23.3.dist-info}/METADATA

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

{dashscope-1.23.1.dist-info → dashscope-1.23.3.dist-info}/RECORD

@@ -3,22 +3,22 @@ dashscope/cli.py,sha256=amegoTkGOs6TlHMdoo4JVOqBePo3lGs745rc7leEyrE,24020
 dashscope/files.py,sha256=vRDQygm3lOqBZR73o7KNHs1iTBVuvLncuwJNxIYjzAU,3981
 dashscope/model.py,sha256=B5v_BtYLPqj6raClejBgdKg6WTGwhH_f-20pvsQqmsk,1491
 dashscope/models.py,sha256=dE4mzXkl85G343qVylSGpURPRdA5pZSqXlx6PcxqC_Q,1275
-dashscope/version.py,sha256=h8mNfC3pOSDtQBGgRx7xUV5hh-9lzeH_p2wEDLSH2lU,74
+dashscope/version.py,sha256=KoL2HDS3KUg-imtukZreW80cuyVG_B6Uy4FbPH7nZe4,74
 dashscope/aigc/__init__.py,sha256=AuRhu_vA1K0tbs_C6DgcZYhTvxMuzDgpwHJNHzEPIHg,442
 dashscope/aigc/chat_completion.py,sha256=ONlyyssIbfaKKcFo7cEKhHx5OCF2XX810HFzIExW1ho,14813
 dashscope/aigc/code_generation.py,sha256=p_mxDKJLQMW0IjFD46JRlZuEZCRESSVKEfLlAevBtqw,10936
 dashscope/aigc/conversation.py,sha256=95xEEY4ThZJysj5zy3aMw7ql9KLJVfD_1iHv9QZ17Ew,14282
 dashscope/aigc/generation.py,sha256=xMcMu16rICTdjZiD_sPqYV_Ltdp4ewGzzfC7JD9VApY,17948
-dashscope/aigc/image_synthesis.py,sha256=v4SzJdKjPhVgRk_pZY9mRz3LHjIzY22larIpXomRMuA,11103
+dashscope/aigc/image_synthesis.py,sha256=RGyjhSl1-5YzaYBtAMaoemh6Ij_Xw0l_z9IGKD5qgWI,13359
 dashscope/aigc/multimodal_conversation.py,sha256=1rZZRk_1lCdbVs7Rx1kJ5LvwWE1put5p_dQKdCX0ysY,5574
-dashscope/aigc/video_synthesis.py,sha256=QO9JXrriT0ZN-GF3AFznNx9G_NEYQr_Wmo4qpXjzVN0,10451
+dashscope/aigc/video_synthesis.py,sha256=XQ3-NKYFmj5cIbUbLTbI0-FyC_fQp8eds6QmD1ZHj_0,13015
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/api_entities/aiohttp_request.py,sha256=1L7XdIJ9L65cQmX8x9JCR4t5hNIMDrbiWADfKKp9yfo,10280
 dashscope/api_entities/api_request_data.py,sha256=04rpYPNK1HkT3iTPJmZpquH621xcBbe8R8EGrDJSLt0,5514
 dashscope/api_entities/api_request_factory.py,sha256=yRzRKlFeoEyTyiXwyw_1hTKbkf6Sb5SaKZJU--Gfm3w,5112
 dashscope/api_entities/base_request.py,sha256=W2SzrSAGFS6V8DErfSrayQtSL0T4iO7BrC8flr7nt1w,977
 dashscope/api_entities/chat_completion_types.py,sha256=1WMWPszhM3HaJBVz-ZXx-El4D8-RfVUL3ym65xsDRLk,11435
-dashscope/api_entities/dashscope_response.py,sha256=HRs-rmH_c4f0Nml8GLPxxiHAzAOdlZAZv51utkXL54U,22054
+dashscope/api_entities/dashscope_response.py,sha256=qNNB86h5Gb_4uHjBD_4lx6UckyQzSdaTgjze1prc12M,22073
 dashscope/api_entities/http_request.py,sha256=vgfykwSOdPom4bQVFOtXIEPYTuE_4QVNGtZ2EJ0t9lM,13310
 dashscope/api_entities/websocket_request.py,sha256=PS0FU854-HjTbKa68f4GHa7-noFRMzKySJGfPkrrBjw,16146
 dashscope/app/__init__.py,sha256=xvSvU8O7m5u7vgIvJXTJektJZxmjT2Rpt_YwePH88XE,113
@@ -87,9 +87,9 @@ dashscope/tokenizers/tokenizer.py,sha256=3FQVDvMNkCW9ccYeJdjrd_PIMMD3Xv7aNZkaYOE
 dashscope/tokenizers/tokenizer_base.py,sha256=5EJIFuizMWESEmLmbd38yJnfeHmPnzZPwsO4aOGjpl4,707
 dashscope/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/utils/oss_utils.py,sha256=L5LN3lN8etVxSL_jkZydstvEKpnTG9CY0zcvPGQ5LBo,7383
-dashscope-1.23.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dashscope-1.23.1.dist-info/METADATA,sha256=1H-smB0IaGLj1Ldw02AQM9Lke56bJ6RzuxikJwBhmz0,6798
-dashscope-1.23.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.23.1.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.23.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.23.1.dist-info/RECORD,,
+dashscope-1.23.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dashscope-1.23.3.dist-info/METADATA,sha256=lqzVJ_GvC8JbdUYLTDjC2OL0bdp1Vzk5RaMD9aFIkYE,6798
+dashscope-1.23.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.23.3.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.23.3.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.23.3.dist-info/RECORD,,