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

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.1'

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

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

{dashscope-1.13.0.dist-info → dashscope-1.13.1.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=AWOJJXuaKFwrwxYimWHjFlOhtOJuGrGuiJ0JN7ehebE,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/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.1.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.13.1.dist-info/METADATA,sha256=fbh1Abw_GJl4A36dunooOlWOPdzCMyczuZ4x-_HTMK4,7220
+dashscope-1.13.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.13.1.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.13.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.13.1.dist-info/RECORD,,