dashscope 1.20.6__py3-none-any.whl → 1.20.7__py3-none-any.whl

dashscope/utils/oss_utils.py

@@ -124,36 +124,42 @@ def upload_file(model: str, upload_path: str, api_key: str):
 def check_and_upload(model, elem: dict, api_key):
     is_upload = False
     for key, content in elem.items():
+        # support video:[images] for qwen2-vl
+        is_list = isinstance(content, list)
+        contents = content if is_list else [content]
+
         if key in ['image', 'video', 'audio', 'text']:
-            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)
-                    elem[key] = 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)
-                    elem[key] = file_url
-                    is_upload = True
+            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
+        elem[key] = contents if is_list else contents[0]
 
     return is_upload
 

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.20.6'
+__version__ = '1.20.7'

{dashscope-1.20.6.dist-info → dashscope-1.20.7.dist-info}/METADATA

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

{dashscope-1.20.6.dist-info → dashscope-1.20.7.dist-info}/RECORD

@@ -3,7 +3,7 @@ dashscope/cli.py,sha256=amegoTkGOs6TlHMdoo4JVOqBePo3lGs745rc7leEyrE,24020
 dashscope/files.py,sha256=QgJjwhtn9F548nCA8jD8OvE6aQEj-20hZqJgYXsUdQU,3930
 dashscope/model.py,sha256=UPOn1qMYFhX-ovXi3BMxZEBk8qOK7WLJOYHMbPZwYBo,1440
 dashscope/models.py,sha256=1-bc-Ue68zurgu_y6RhfFr9uzeQMF5AZq-C32lJGMGU,1224
-dashscope/version.py,sha256=6axGZRlohq7vksayxvwN9xJ80lUuSFmXPRMwGYpne_w,23
+dashscope/version.py,sha256=gQu6hE6vB8heRmWsFGU7BDL4DsK0RiBB-W17n8BWDPA,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
@@ -77,10 +77,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=zxe2NtIwcVWclVM24Ls0Flnkl66NMsUpr7TnH_6w5hs,6693
-dashscope-1.20.6.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.20.6.dist-info/METADATA,sha256=mOswMqzMSwkTw9q8O5k_xu2OqiA5jSpJFEAMpaniIIA,6661
-dashscope-1.20.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.20.6.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
-dashscope-1.20.6.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.20.6.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=TSBh7MJK4ZH40Mxd8wNEsG8nQLNhQjWRjW3itHsvoZ0,7023
+dashscope-1.20.7.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.7.dist-info/METADATA,sha256=BBs0rgqbL8wqwlTSjnlM8flMtvKrjGOhiOIsjZCT-xM,6661
+dashscope-1.20.7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.7.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
+dashscope-1.20.7.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.7.dist-info/RECORD,,