dashscope 1.22.0__py3-none-any.whl → 1.22.2__py3-none-any.whl

dashscope/aigc/multimodal_conversation.py

@@ -121,8 +121,10 @@ class MultiModalConversation(BaseApi):
         for message in messages:
             content = message['content']
             for elem in content:
-                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/api_entities/dashscope_response.py

@@ -480,16 +480,25 @@ class VideoSynthesisOutput(DictMixin):
 class ImageSynthesisUsage(DictMixin):
     image_count: int
 
-    def __init__(self, image_count: int, **kwargs):
+    def __init__(self, image_count: int = None, **kwargs):
         super().__init__(image_count=image_count, **kwargs)
 
 
 @dataclass(init=False)
 class VideoSynthesisUsage(DictMixin):
     video_count: int
+    video_duration: int
+    video_ratio: str
 
-    def __init__(self, video_count: int = 1, **kwargs):
-        super().__init__(video_count=video_count, **kwargs)
+    def __init__(self,
+                 video_count: int = 1,
+                 video_duration: int = 0,
+                 video_ratio: str = '',
+                 **kwargs):
+        super().__init__(video_count=video_count,
+                         video_duration=video_duration,
+                         video_ratio=video_ratio,
+                         **kwargs)
 
 
 @dataclass(init=False)

dashscope/embeddings/multimodal_embedding.py

@@ -104,7 +104,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/version.py

@@ -1 +1 @@
-__version__ = '1.22.0'
+__version__ = '1.22.2'

{dashscope-1.22.0.dist-info → dashscope-1.22.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashscope
-Version: 1.22.0
+Version: 1.22.2
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud
@@ -76,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
 

{dashscope-1.22.0.dist-info → dashscope-1.22.2.dist-info}/RECORD

@@ -6,20 +6,20 @@ 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=SDK5izPcJa4KNexMqsTGqKMhzuz-w_ifY4M7gq-3Eno,23
+dashscope/version.py,sha256=VzBJug2jhAHnqtcPEyOBjewkNpFsBuxDvTGCG_kKqzk,23
 dashscope/aigc/__init__.py,sha256=xmdalVw7wS0cLIuU8Q0qk0q8XGw-iGk8NnQwAQZ3jAc,391
 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=UWHW-nvf7_aDZKr4uZDusVHjqWr9TSZjCsZI8YSWaek,11052
-dashscope/aigc/multimodal_conversation.py,sha256=SlNnnsUPV19gdx8fYJAtsMFWPNGY6vhk5IGHZ5ZczpI,5369
+dashscope/aigc/multimodal_conversation.py,sha256=NPg4gjG24zKdu7lQ4wH2v2m9n_rfZERTLf5tjy5fQyg,5523
 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=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/dashscope_response.py,sha256=3e-W0UnfPGTsrd_DiZaD_xeq2I5CnrXFMEMRoHHDga8,20131
 dashscope/api_entities/http_request.py,sha256=Pr6mr01uXELK9LwIPXrJAhNtGMkWH3gQYORXShRiQRo,13258
 dashscope/api_entities/websocket_request.py,sha256=h3RcvgvXpyzF8xvC4hqNUkev6HGN_YgO5emvqYaXw78,16094
 dashscope/app/__init__.py,sha256=UiN_9i--z84Dw5wUehOh_Tkk_9Gq_td_Kbz1dobBEKg,62
@@ -60,7 +60,7 @@ dashscope/customize/finetunes.py,sha256=iFnEUMGY6FGogVClIJMEeFhUwfYi7gD05Iq1-eMP
 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=hf17wfhJKvX3ggnigOiTqD4O1lFhx_NG_O1ioKCx0gk,1999
-dashscope/embeddings/multimodal_embedding.py,sha256=yojtGNoT2N54g0jcAYUwNIiwzueun1ouqS0S0tvnyQc,3966
+dashscope/embeddings/multimodal_embedding.py,sha256=EvXoVRExkenpeRE8Nqfas0Vrl5wzCZCJIxfgbOI7Qv0,4058
 dashscope/embeddings/text_embedding.py,sha256=I3zRvuT2HWcaZYH-zrtGcAQmzuLQxFswIHJMiQXfaJQ,2009
 dashscope/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/io/input_output.py,sha256=iZ1X1x1btdoZK2VeC9JsKkag2eaXwqfNT3Q6SrmRi2w,3941
@@ -87,9 +87,9 @@ dashscope/tokenizers/tokenizer.py,sha256=y6P91qTCYo__pEx_0VHAcj9YECfbUdRqZU1fdGT
 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=TlqaMAmVRtBJIm5aIaXsrRZGKc_7cwWQ7liMB2f9Css,7331
-dashscope-1.22.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.22.0.dist-info/METADATA,sha256=ZmeEprSXjdVtgfudY4kN8L0XSN8EughpPz7y3OyCwkM,6641
-dashscope-1.22.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.22.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.22.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.22.0.dist-info/RECORD,,
+dashscope-1.22.2.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.22.2.dist-info/METADATA,sha256=Cf_GT_W-HPppanGcy9RBKHS40yWSfL93_IXwc0SxAzc,6798
+dashscope-1.22.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.22.2.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.22.2.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.22.2.dist-info/RECORD,,