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

dashscope/utils/oss_utils.py

@@ -0,0 +1,133 @@
+import mimetypes
+import os
+from datetime import datetime
+from http import HTTPStatus
+from time import mktime
+from typing import List
+from urllib.parse import unquote_plus, urlparse
+from wsgiref.handlers import format_date_time
+
+import requests
+from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
+from dashscope.client.base_api import GetMixin
+from dashscope.common.constants import (FILE_PATH_SCHEMA,
+                                        REQUEST_CONTENT_AUDIO,
+                                        REQUEST_CONTENT_IMAGE,
+                                        REQUEST_CONTENT_TEXT)
+from dashscope.common.error import InvalidInput, UploadFileException
+from dashscope.common.logging import logger
+from dashscope.common.utils import get_user_agent
+
+
+class OssUtils(GetMixin):
+    SUB_PATH = 'uploads'
+
+    @classmethod
+    def _decode_response_error(cls, response: requests.Response):
+        if 'application/json' in response.headers.get('content-type', ''):
+            message = response.json()
+        else:
+            message = response.content.decode('utf-8')
+        return message
+
+    @classmethod
+    def upload(cls,
+               model: str,
+               file_path: str,
+               api_key: str = None,
+               **kwargs) -> DashScopeAPIResponse:
+        """Upload file for model fine-tune or other tasks.
+
+        Args:
+            file_path (str): The local file name to upload.
+            purpose (str): The purpose of the file[fine-tune|inference]
+            description (str, optional): The file description message.
+            api_key (str, optional): The api key. Defaults to None.
+
+        Returns:
+            DashScopeAPIResponse: The upload information
+        """
+        upload_info = cls.get_upload_certificate(model=model, api_key=api_key)
+        if upload_info.status_code != HTTPStatus.OK:
+            return None
+        upload_info = upload_info.output
+        headers = {}
+        headers = {'user-agent': get_user_agent()}
+        headers['Accept'] = 'application/json'
+        headers['Date'] = format_date_time(mktime(datetime.now().timetuple()))
+        form_data = {}
+        form_data['OSSAccessKeyId'] = upload_info['oss_access_key_id']
+        form_data['Signature'] = upload_info['signature']
+        form_data['policy'] = upload_info['policy']
+        form_data['key'] = upload_info['upload_dir'] + \
+            '/' + os.path.basename(file_path)
+        form_data['x-oss-object-acl'] = upload_info['x_oss_object_acl']
+        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:
+            response = session.post(url,
+                                    files=files,
+                                    data=form_data,
+                                    headers=headers,
+                                    timeout=3600)
+            if response.status_code == HTTPStatus.OK:
+                return 'oss://' + form_data['key']
+            else:
+                logger.error(
+                    'Uploading file: %s to oss failed! error: %s' %
+                    (file_path, cls._decode_response_error(response=response)))
+                return None
+
+    @classmethod
+    def get_upload_certificate(cls,
+                               model: str,
+                               api_key: str = None,
+                               **kwargs) -> DashScopeAPIResponse:
+        """Get a oss upload certificate.
+
+        Args:
+            api_key (str, optional): The api key. Defaults to None.
+
+        Returns:
+            DashScopeAPIResponse: The job info
+        """
+        params = {'action': 'getPolicy'}
+        params['model'] = model
+        return super().get(None, api_key, params=params, **kwargs)
+
+
+def check_and_upload(model, elem: dict, key: str, api_key):
+    is_upload = False
+    content = elem[key]
+    if content.startswith(FILE_PATH_SCHEMA):
+        file_path = unquote_plus(urlparse(content).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)
+    return is_upload
+
+
+def preprocess_message_element(model: str, elem: List[dict], api_key: str):
+    is_upload = False
+    if REQUEST_CONTENT_TEXT in elem:
+        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_TEXT,
+                                     api_key)
+    elif REQUEST_CONTENT_IMAGE in elem:
+        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_IMAGE,
+                                     api_key)
+    elif REQUEST_CONTENT_AUDIO in elem:
+        is_upload = check_and_upload(model, elem, REQUEST_CONTENT_AUDIO,
+                                     api_key)
+    return is_upload

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.12.0'
+__version__ = '1.13.1'

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

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

dashscope-1.13.1.dist-info/RECORD

@@ -0,0 +1,59 @@
+dashscope/__init__.py,sha256=ZxCknpY8JWS4tnlSiH-2rIRnjSJwuCgeY7P5wb_nJgs,1897
+dashscope/cli.py,sha256=30Qbd6EvbIBFtE-cPgkaTkKZzMZuyo2YPjLZQ8z9UME,22964
+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=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=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
+dashscope/api_entities/api_request_factory.py,sha256=yRCY9OVGagsEvid6RXwvwiQv_8ZTEqYaKXnVLd9F9pA,4281
+dashscope/api_entities/base_request.py,sha256=cXUL7xqSV8wBr5d-1kx65AO3IsRR9A_ps6Lok-v-MKM,926
+dashscope/api_entities/dashscope_response.py,sha256=1KdBib5xOftcKXLzTETe5LElGy2mB8IG8E3JZrGOaAY,15814
+dashscope/api_entities/http_request.py,sha256=8bNtylkE98h1SeCrxTPow4Dqy3wPXWp9wHPdeWAIDe8,9637
+dashscope/api_entities/websocket_request.py,sha256=VK4488_3Qi2Rwx7i1FGb-lPu_BSNZAoedOqnHzOxTH8,15844
+dashscope/audio/__init__.py,sha256=vlw0TFVRdeRWfzmJxhzarVUqkMs-DZNf4GiMtm3C8XE,45
+dashscope/audio/asr/__init__.py,sha256=-s180qWn_JPSpCo1q0aDJJ5HQ3zTzD4z5yUwsRqH4aU,275
+dashscope/audio/asr/asr_phrase_manager.py,sha256=BNrRBGGoAW_rcxoi_euh6bRktJO6asTiGroE8PMh1Xg,6641
+dashscope/audio/asr/recognition.py,sha256=Rw88mdZuHV2pTb_aa8uc3NMVHODpdK8kdNZ9KcYOzPk,17112
+dashscope/audio/asr/transcription.py,sha256=o2EAxwwEF9exQLFlcLakMJ8w76pksPrWzbybq5IFq2M,7964
+dashscope/audio/tts/__init__.py,sha256=fbnieZX9yNFNh5BsxLpLXb63jlxzxrdCJakV3ignjlQ,194
+dashscope/audio/tts/speech_synthesizer.py,sha256=wKcpUo6L1yc0OZUajUh0xbtYubTkm-M89IGSAyDwLBo,7425
+dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/client/base_api.py,sha256=1YTlwY2_tlvMLaz6oGh1BNQt5GT_Xx3obS6nKOvnpkY,31749
+dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/common/api_key.py,sha256=5Stp0odL5JSuIO3qJBp23QNppuGbqhhvKPS66qbMs0I,1986
+dashscope/common/constants.py,sha256=2zF1l2BDnDDa7oFSfg3gLV34A-6Lr-3_o8QfX60rkCk,2640
+dashscope/common/env.py,sha256=oQOZW5JyEeTSde394un2lpDJ5RBh4fMU9hBfbtrKKkc,869
+dashscope/common/error.py,sha256=ihgDx08P2fw0cB-0HsA6MMgO0vY-6yIhxXHlIIF8c0Y,1641
+dashscope/common/logging.py,sha256=ecGxylG3bWES_Xv5-BD6ep4_0Ciu7F6ZPBjiZtu9Jx4,984
+dashscope/common/message_manager.py,sha256=i5149WzDk6nWmdFaHzYx4USXMBeX18GKSI-F4fLwbN0,1097
+dashscope/common/utils.py,sha256=UZSK6AStBVriVTR5wdxfcKTBDzCEN6PLyEv3avZ8YwQ,6679
+dashscope/embeddings/__init__.py,sha256=-dxHaoxZZVuP-wAGUIa3sNNh8CQwaeWj2UlqsDy1sV4,240
+dashscope/embeddings/batch_text_embedding.py,sha256=M8jvdz304Oh5ZwegHWGwTda9AezYsgVC59HnweuCagY,7977
+dashscope/embeddings/batch_text_embedding_response.py,sha256=WziXlQsFIkL1kPc_7lRG1HtqgkO5vVThtnNqExJggNU,2000
+dashscope/embeddings/multimodal_embedding.py,sha256=a6aQYR1Ikmh4ZOGldfVTP0KDAlCVzM6pxDj2pNd5w3M,3779
+dashscope/embeddings/text_embedding.py,sha256=X7_FBM57gQQCu8xb-W-jTlSsathaCiAtW0mdb19N-PM,1714
+dashscope/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/io/input_output.py,sha256=iZ1X1x1btdoZK2VeC9JsKkag2eaXwqfNT3Q6SrmRi2w,3941
+dashscope/nlp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/nlp/understanding.py,sha256=uVkf_4iULnlnuGmEX3taKiHgzxu173vvgVwY5EO2C2Y,2803
+dashscope/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/protocol/websocket.py,sha256=z-v6PGx3L4zYBANuC48s7SWSQSwRCDoh0zcfhv9Bf8U,561
+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=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,,

dashscope-1.12.0.dist-info/RECORD

@@ -1,56 +0,0 @@
-dashscope/__init__.py,sha256=xZqahcgHwKtVXW56okOnDUGLhakbaPwZGCT0wCjJjtI,1973
-dashscope/cli.py,sha256=30Qbd6EvbIBFtE-cPgkaTkKZzMZuyo2YPjLZQ8z9UME,22964
-dashscope/deployment.py,sha256=uhlQYOiu1baMQxQnFmRwI6ces0I-_DKp8uej_L0v1eY,4400
-dashscope/file.py,sha256=Dv2Fz3DLbcye2uuQxyQwRM7ky27OthouLXIpSQagQy4,3324
-dashscope/finetune.py,sha256=4ZubAL0Znt7Nmj7qwOGvXAuUSzjFd5GUFgzfREvH27c,5008
-dashscope/model.py,sha256=iuIfal-vOo0yav0HXPdA7f93vd5JNTGIAdCG_WIYkW8,1158
-dashscope/version.py,sha256=68GNJTQv5qIW_NND-ON34BeDlaBPM89Dp34LgcTS2k8,23
-dashscope/aigc/__init__.py,sha256=s-MCA87KYiVumYtKtJi5IMN7xelSF6TqEU3s3_7RF-Y,327
-dashscope/aigc/code_generation.py,sha256=NrXK4mREfZkvRV7emmeQPiw7gykhSzP1aJzOd9t3RVA,10591
-dashscope/aigc/conversation.py,sha256=Pn7AkJ2cihybHZGojmIr141VsMxyYHH6z-TWrSbskDE,11659
-dashscope/aigc/generation.py,sha256=P6MlpotBQwF5mQ3GSDsuDHa1mhaa77UHXzGY4r2fLdQ,7702
-dashscope/aigc/image_synthesis.py,sha256=P5KFBqYLSNrztyxdrOjpBgUDLt-o6FKVa7JyIOWxbYQ,7789
-dashscope/aigc/multimodal_conversation.py,sha256=iQylBpyhW7wms9iPnsLzBDdGD5krcahCKn-sbclQDU0,4121
-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=HwleZWJAHD_5ufvI3mYUO-ZjZtHon4wQX_Y2mE_zqkU,5471
-dashscope/api_entities/api_request_factory.py,sha256=tYG6rl8NxbTjpAhQXSuAhmk6cUJqL7o63N3w2OMt3Lg,4412
-dashscope/api_entities/base_request.py,sha256=cXUL7xqSV8wBr5d-1kx65AO3IsRR9A_ps6Lok-v-MKM,926
-dashscope/api_entities/dashscope_response.py,sha256=lwIwuQDDKpg2utuhhGCCUBprJ8duyL_oRcLn53cOox4,15798
-dashscope/api_entities/http_request.py,sha256=8bNtylkE98h1SeCrxTPow4Dqy3wPXWp9wHPdeWAIDe8,9637
-dashscope/api_entities/websocket_request.py,sha256=VK4488_3Qi2Rwx7i1FGb-lPu_BSNZAoedOqnHzOxTH8,15844
-dashscope/audio/__init__.py,sha256=vlw0TFVRdeRWfzmJxhzarVUqkMs-DZNf4GiMtm3C8XE,45
-dashscope/audio/asr/__init__.py,sha256=NShkWnph8E6MvyIg3pmakyVf5gDqkl7wlqz_KzMsfVc,198
-dashscope/audio/asr/recognition.py,sha256=1sLVo60_FNyiJEf6xAQgcD86Bn6Fg7FF74kFuOgLU9U,14280
-dashscope/audio/asr/transcription.py,sha256=0B7xC2AeqdL16G5OSD-GUdM0qlh-dKQ5GLtMv-9sQRQ,5614
-dashscope/audio/tts/__init__.py,sha256=fbnieZX9yNFNh5BsxLpLXb63jlxzxrdCJakV3ignjlQ,194
-dashscope/audio/tts/speech_synthesizer.py,sha256=wKcpUo6L1yc0OZUajUh0xbtYubTkm-M89IGSAyDwLBo,7425
-dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/client/base_api.py,sha256=OwNc8YOXAqRl3VHdHOqOnywXY3k-j5VGNn64boplDCg,31622
-dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/common/api_key.py,sha256=5Stp0odL5JSuIO3qJBp23QNppuGbqhhvKPS66qbMs0I,1986
-dashscope/common/constants.py,sha256=6IR7Vjy4k7_E7A7zHI0WHhiopD4nLK7HV74i4ncjLWk,2518
-dashscope/common/env.py,sha256=oQOZW5JyEeTSde394un2lpDJ5RBh4fMU9hBfbtrKKkc,869
-dashscope/common/error.py,sha256=zbWWjgBXWFNtyVBMQpjuLhOKN4k5XlyByrHn1yWy4Qc,1592
-dashscope/common/logging.py,sha256=ecGxylG3bWES_Xv5-BD6ep4_0Ciu7F6ZPBjiZtu9Jx4,984
-dashscope/common/message_manager.py,sha256=i5149WzDk6nWmdFaHzYx4USXMBeX18GKSI-F4fLwbN0,1097
-dashscope/common/utils.py,sha256=7V5yplWMh85S02y9h0z3WnRbNlnd1V2u0deDft0Ft0g,6435
-dashscope/embeddings/__init__.py,sha256=-dxHaoxZZVuP-wAGUIa3sNNh8CQwaeWj2UlqsDy1sV4,240
-dashscope/embeddings/batch_text_embedding.py,sha256=dFYAp_rLvTbaxY5KccwdL4NGlFJ9aVb_6TzmYeZLPNo,7919
-dashscope/embeddings/batch_text_embedding_response.py,sha256=WziXlQsFIkL1kPc_7lRG1HtqgkO5vVThtnNqExJggNU,2000
-dashscope/embeddings/multimodal_embedding.py,sha256=nN4d_D7RddsRVfrdbhAvvmSzFM_9CUJz6ZvGBLFK334,2871
-dashscope/embeddings/text_embedding.py,sha256=nI-d4zcuZA_tpfu7ktI5SZ8V-dGngVclZwxGFAh4qmE,1666
-dashscope/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/io/input_output.py,sha256=iZ1X1x1btdoZK2VeC9JsKkag2eaXwqfNT3Q6SrmRi2w,3941
-dashscope/nlp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/nlp/understanding.py,sha256=IvTXvA6DFCXcuab9BWE8bg93iCcraWu9OZim2TEk8vg,2800
-dashscope/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/protocol/websocket.py,sha256=z-v6PGx3L4zYBANuC48s7SWSQSwRCDoh0zcfhv9Bf8U,561
-dashscope/tokenizers/__init__.py,sha256=J9EGOJELDrsD8lvTUn1fRDyUAh4wLyw0zlYozuBVA6M,72
-dashscope/tokenizers/tokenization.py,sha256=WhSdiH0Bu-pGQCsJfC91LL_y5tVDzCtQ7tTs2Tox-HY,4543
-dashscope-1.12.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.12.0.dist-info/METADATA,sha256=A88s1-328ycf2ZAprSnt6YQhtUThhXKRjeU3Em7D9VE,7220
-dashscope-1.12.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.12.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.12.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.12.0.dist-info/RECORD,,