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

dashscope/threads/runs/runs.py

@@ -386,12 +386,6 @@ class Runs(CreateMixin, CancelMixin, ListObjectMixin, GetStatusMixin,
                           thread_id=thread_id,
                           workspace=workspace,
                           api_key=api_key)
-            import json
-            print(
-                json.dumps(run,
-                           default=lambda o: o.__dict__,
-                           sort_keys=True,
-                           indent=4))
             if run.status_code == HTTPStatus.OK:
                 if hasattr(run, 'status'):
                     if run.status in [

dashscope/utils/oss_utils.py

@@ -121,8 +121,51 @@ def upload_file(model: str, upload_path: str, api_key: str):
     return None
 
 
+def check_and_upload_local(model: str, content: str, api_key: str):
+    """Check the content is local file path, upload and return the url
+
+    Args:
+        model (str): Which model to upload.
+        content (str): The content.
+        api_key (_type_): The api key.
+
+    Raises:
+        UploadFileException: Upload failed.
+        InvalidInput: The input is invalid
+
+    Returns:
+        _type_: if upload return True and file_url otherwise False, origin content.
+    """
+    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)
+            return True, file_url
+        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)
+            return True, file_url
+    return False, content
+
+
 def check_and_upload(model, elem: dict, api_key):
-    is_upload = False
+    has_upload = False
     for key, content in elem.items():
         # support video:[images] for qwen2-vl
         is_list = isinstance(content, list)
@@ -130,38 +173,14 @@ def check_and_upload(model, elem: dict, api_key):
 
         if key in ['image', 'video', 'audio', 'text']:
             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
+                is_upload, file_url = check_and_upload_local(
+                    model, content, api_key)
+                if is_upload:
+                    contents[i] = file_url
+                    has_upload = True
         elem[key] = contents if is_list else contents[0]
 
-    return is_upload
+    return has_upload
 
 
 def preprocess_message_element(model: str, elem: List[dict], api_key: str):

dashscope/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dashscope
-Version: 1.20.7
+Version: 1.20.9
 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
@@ -222,3 +221,5 @@ Coming soon.
 
 ## License
 This project is licensed under the Apache License (Version 2.0).
+
+

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

@@ -1,14 +1,17 @@
 dashscope/__init__.py,sha256=lIBZR5fWUiO1L62J_17Gri7Dwk9kCf2xhWl8eRw8bkQ,2933
 dashscope/cli.py,sha256=amegoTkGOs6TlHMdoo4JVOqBePo3lGs745rc7leEyrE,24020
+dashscope/deployment.py,sha256=ljmVi-ny6SjEs8v4oIGNWIw8UQTorE7dl5QJv7dEPIQ,5728
+dashscope/file.py,sha256=Dv2Fz3DLbcye2uuQxyQwRM7ky27OthouLXIpSQagQy4,3324
 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=gQu6hE6vB8heRmWsFGU7BDL4DsK0RiBB-W17n8BWDPA,23
+dashscope/version.py,sha256=rW_OBoIurR44z0-gRCL1GiR4KuiexcDQ6XLZw1HMwZs,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
 dashscope/aigc/generation.py,sha256=53oMCmN5ZbqeqAsKxmdunXlRh-XP8ZtnA7hB2id4Koo,17897
-dashscope/aigc/image_synthesis.py,sha256=_TGkh4L_yBNQNmoJUKlfXfljKfxX-SSyxHHQBDm1AC8,10418
+dashscope/aigc/image_synthesis.py,sha256=UWHW-nvf7_aDZKr4uZDusVHjqWr9TSZjCsZI8YSWaek,11052
 dashscope/aigc/multimodal_conversation.py,sha256=SlNnnsUPV19gdx8fYJAtsMFWPNGY6vhk5IGHZ5ZczpI,5369
 dashscope/api_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/api_entities/aiohttp_request.py,sha256=aE3AeWba8Ig_xHMYjrAdkq0N61l_L2VFTG6HYh912X0,10229
@@ -29,6 +32,7 @@ dashscope/audio/__init__.py,sha256=-ZRxrK-gV4QsUtlThIT-XwqB6vmyEsnhxIxdLmhCUuc,6
 dashscope/audio/asr/__init__.py,sha256=-s180qWn_JPSpCo1q0aDJJ5HQ3zTzD4z5yUwsRqH4aU,275
 dashscope/audio/asr/asr_phrase_manager.py,sha256=EjtbI3zz9UQGS1qv6Yb4zzEMj4OJJVXmwkqZyIrzvEA,7642
 dashscope/audio/asr/recognition.py,sha256=cEooE3wGf8kKfJIVbaXEytl5X6F0hMsLe8g4Bj9Fn4w,18768
+dashscope/audio/asr/transcribe.py,sha256=HfZYpvpVfvGRAIIIzX65Af33E6vsIFGd_qqhQ8LaNcM,9651
 dashscope/audio/asr/transcription.py,sha256=1WAg9WH89antVzRYEKXb5LQP9xylZmX4YKp7v5oMYjY,8931
 dashscope/audio/tts/__init__.py,sha256=fbnieZX9yNFNh5BsxLpLXb63jlxzxrdCJakV3ignjlQ,194
 dashscope/audio/tts/speech_synthesizer.py,sha256=dnKx9FDDdO_ETHAjhK8zaMVaH6SfoTtN5YxXXqgY1JA,7571
@@ -62,6 +66,7 @@ dashscope/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 dashscope/protocol/websocket.py,sha256=z-v6PGx3L4zYBANuC48s7SWSQSwRCDoh0zcfhv9Bf8U,561
 dashscope/rerank/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/rerank/text_rerank.py,sha256=1L-RLUxMCvNhbMud1FUG6YFWT7ZV979fzhMEuVjJ1oI,2398
+dashscope/resources/qwen.tiktoken,sha256=srG437XMXwJLr8NzEhxquj9m-aWgJp4kNHCh3hajMYY,2561218
 dashscope/threads/__init__.py,sha256=md5bsHekHHGOg3uQrBCk8f4BCNnA1AuI_-LDf92pNVU,621
 dashscope/threads/thread_types.py,sha256=SwAJNi-RbqFXlrztDUCt0q0MfgfJLHyYl9qWrQDmQQo,18280
 dashscope/threads/threads.py,sha256=dD72xklN71KFGBVoBVHEbCbZADwLbi9yGS9LbFpnlAI,7665
@@ -69,7 +74,7 @@ dashscope/threads/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 dashscope/threads/messages/files.py,sha256=wi0nJ2zsPWOw2Jn-ZkxA3URZBIrkGxqM_uAPfXY1xv0,3820
 dashscope/threads/messages/messages.py,sha256=Zjmyf3rT1XSdn33hPrqOY6DSWUVL7pDEapG03FREPV8,8419
 dashscope/threads/runs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/threads/runs/runs.py,sha256=Cvy5FD0x1Z9c5qayYeNpoL_QIqH4yxgqdGplCk3soRw,18762
+dashscope/threads/runs/runs.py,sha256=ux4VH_lxxHCw1XOqngzmsm9kwTR3jS0wX27xoAswHlY,18549
 dashscope/threads/runs/steps.py,sha256=pLNR-5g7zvYkvC-p4sZGVgYHd1jqxBerM2WFyB358H8,3638
 dashscope/tokenizers/__init__.py,sha256=Oy5FMT37Non6e1YxdHQ89U93Dy3CG1Ez0gBa771KZo0,200
 dashscope/tokenizers/qwen_tokenizer.py,sha256=dCnT9-9NrqPS85bEhjlPULUfDADVRhlleYwM_ILgCeI,4111
@@ -77,10 +82,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=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,,
+dashscope/utils/oss_utils.py,sha256=7vZ2Lypxwiit8VcAqAvr3cCyhVfaLapDiNuF-H3ZCD4,7332
+dashscope-1.20.9.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.9.dist-info/METADATA,sha256=n0YxcRTLCxVG5CnYICYV2ysSWYQMCYeG65bc7xsdYig,6641
+dashscope-1.20.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.9.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.20.9.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.9.dist-info/RECORD,,

{dashscope-1.20.7.dist-info → dashscope-1.20.9.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 dashscope = dashscope.cli:main
+