dashscope 1.24.0__py3-none-any.whl → 1.24.2__py3-none-any.whl

dashscope/cli.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import argparse
+import json
 import sys
 import time
 import os
@@ -216,7 +217,8 @@ class Oss:
 
         oss_url = OssUtils.upload(model=args.model,
                                   file_path=file_path,
-                                  api_key=api_key)
+                                  api_key=api_key,
+                                  base_address=args.base_url)
 
         if not oss_url:
             print('Failed to upload file: %s' % file_path)
@@ -229,7 +231,8 @@ class Files:
     def upload(cls, args):
         rsp = dashscope.Files.upload(file_path=args.file,
                                      purpose=args.purpose,
-                                     description=args.description)
+                                     description=args.description,
+                                     base_address=args.base_url)
         print(rsp)
         if rsp.status_code == HTTPStatus.OK:
             print('Upload success, file id: %s' %
@@ -239,32 +242,31 @@ class Files:
 
     @classmethod
     def get(cls, args):
-        rsp = dashscope.Files.get(file_id=args.id)
+        rsp = dashscope.Files.get(file_id=args.id, base_address=args.base_url)
         if rsp.status_code == HTTPStatus.OK:
-            print('file_id: %s, name: %s, description: %s' %
-                  (rsp.output['file_id'], rsp.output['name'],
-                   rsp.output['description']))
+            if rsp.output:
+                print('file info:\n%s' % json.dumps(rsp.output, ensure_ascii=False, indent=4))
+            else:
+                print('There is no uploaded file.')
         else:
             print_failed_message(rsp)
 
     @classmethod
     def list(cls, args):
         rsp = dashscope.Files.list(page=args.start_page,
-                                   page_size=args.page_size)
+                                   page_size=args.page_size,
+                                   base_address=args.base_url)
         if rsp.status_code == HTTPStatus.OK:
-            if rsp.output is not None:
-                for f in rsp.output['files']:
-                    print('file_id: %s, name: %s, description: %s, time: %s' %
-                          (f['file_id'], f['name'], f['description'],
-                           f['gmt_create']))
+            if rsp.output:
+                print('file list info:\n%s' % json.dumps(rsp.output, ensure_ascii=False, indent=4))
             else:
-                print('There is no uploaded file.')
+                print('There is no uploaded files.')
         else:
             print_failed_message(rsp)
 
     @classmethod
     def delete(cls, args):
-        rsp = dashscope.Files.delete(args.id)
+        rsp = dashscope.Files.delete(args.id, base_address=args.base_url)
         if rsp.status_code == HTTPStatus.OK:
             print('Delete success')
         else:
@@ -529,6 +531,13 @@ def main():
         required=False,
         help='The dashscope api key',
     )
+    oss_upload.add_argument(
+        '-u',
+        '--base_url',
+        type=str,
+        help='The base url.',
+        required=False,
+    )
     oss_upload.set_defaults(func=Oss.upload)
 
     file_upload = sub_parsers.add_parser('files.upload')
@@ -555,21 +564,45 @@ def main():
         help='The file description.',
         required=False,
     )
+    file_upload.add_argument(
+        '-u',
+        '--base_url',
+        type=str,
+        help='The base url.',
+        required=False,
+    )
     file_upload.set_defaults(func=Files.upload)
+
     file_get = sub_parsers.add_parser('files.get')
     file_get.add_argument('-i',
                           '--id',
                           type=str,
                           required=True,
                           help='The file ID')
+    file_get.add_argument(
+        '-u',
+        '--base_url',
+        type=str,
+        help='The base url.',
+        required=False,
+    )
     file_get.set_defaults(func=Files.get)
+
     file_delete = sub_parsers.add_parser('files.delete')
     file_delete.add_argument('-i',
                              '--id',
                              type=str,
                              required=True,
                              help='The files ID')
+    file_delete.add_argument(
+        '-u',
+        '--base_url',
+        type=str,
+        help='The base url.',
+        required=False,
+    )
     file_delete.set_defaults(func=Files.delete)
+
     file_list = sub_parsers.add_parser('files.list')
     file_list.add_argument('-s',
                            '--start_page',
@@ -581,6 +614,13 @@ def main():
                            type=int,
                            default=10,
                            help='The page size, default 10')
+    file_list.add_argument(
+        '-u',
+        '--base_url',
+        type=str,
+        help='The base url.',
+        required=False,
+    )
     file_list.set_defaults(func=Files.list)
 
     deployments_call = sub_parsers.add_parser('deployments.call')

dashscope/multimodal/multimodal_request_params.py

@@ -81,6 +81,7 @@ class Upstream:
     type: str = field(default="AudioOnly")  # 上行类型：AudioOnly 仅语音通话; AudioAndVideo 上传视频
     mode: str = field(default="tap2talk")  # 客户端交互模式 push2talk/tap2talk/duplex
     # sample_rate: int  # 合成音频采样率
+    pass_through_params: dict = field(default=None)
 
     def to_dict(self):
         upstream: dict = {

dashscope/multimodal/tingwu/tingwu.py

@@ -0,0 +1,80 @@
+from typing import Dict, Any
+
+from dashscope.api_entities.api_request_factory import _build_api_request
+from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
+from dashscope.client.base_api import BaseApi
+from dashscope.common.error import ModelRequired
+
+
+class TingWu(BaseApi):
+    """API for TingWu APP.
+
+    """
+
+    task = None
+    task_group = None
+    function = None
+
+    @classmethod
+    def call(
+            cls,
+            model: str,
+            user_defined_input: Dict[str, Any],
+            parameters: Dict[str, Any] = None,
+            api_key: str = None,
+            **kwargs
+    ) -> DashScopeAPIResponse:
+        """Call generation model service.
+
+        Args:
+            model (str): The requested model, such as qwen-turbo
+            api_key (str, optional): The api api_key, can be None,
+                if None, will get by default rule(TODO: api key doc).
+            user_defined_input: custom input
+            parameters: custom parameters
+            **kwargs:
+                base_address: base address
+                additional parameters for request
+
+        Raises:
+            InvalidInput: The history and auto_history are mutually exclusive.
+
+        Returns:
+            Union[GenerationResponse,
+                  Generator[GenerationResponse, None, None]]: If
+            stream is True, return Generator, otherwise GenerationResponse.
+        """
+        if model is None or not model:
+            raise ModelRequired('Model is required!')
+        input_config, parameters = cls._build_input_parameters(input_config=user_defined_input,
+                                                               params=parameters,
+                                                               **kwargs)
+
+        request = _build_api_request(
+            model=model,
+            input=input_config,
+            api_key=api_key,
+            task_group=TingWu.task_group,
+            task=TingWu.task,
+            function=TingWu.function,
+            is_service=False,
+            **parameters)
+        response = request.call()
+
+        return response
+
+    @classmethod
+    def _build_input_parameters(cls,
+                                input_config,
+                                params: Dict[str, Any] = None,
+                                **kwargs):
+        parameters = {}
+        if params is not None:
+            parameters = params
+
+        input_param = input_config
+
+        if kwargs.keys() is not None:
+            for key in kwargs.keys():
+                parameters[key] = kwargs[key]
+        return input_param, {**parameters, **kwargs}

dashscope/utils/oss_utils.py

@@ -47,7 +47,7 @@ class OssUtils(GetMixin):
         Returns:
             DashScopeAPIResponse: The upload information
         """
-        upload_info = cls.get_upload_certificate(model=model, api_key=api_key)
+        upload_info = cls.get_upload_certificate(model=model, api_key=api_key, **kwargs)
         if upload_info.status_code != HTTPStatus.OK:
             raise UploadFileException(
                 'Get upload certificate failed, code: %s, message: %s' %

dashscope/version.py

@@ -1,3 +1,3 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 
-__version__ = '1.24.0'
+__version__ = '1.24.2'

{dashscope-1.24.0.dist-info → dashscope-1.24.2.dist-info}/METADATA

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

{dashscope-1.24.0.dist-info → dashscope-1.24.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 dashscope/__init__.py,sha256=__BY0dzgFX5Bt50WL-2PJmI8EYOmnpXhABQntdqDtSM,3062
-dashscope/cli.py,sha256=BfABF8T7uVttfHTSCqGiIcA_XuiYUfCnQ9WLvSUV0Ys,25646
+dashscope/cli.py,sha256=64oGkevgX0RHPPmMg0sevXDgaFLQNA_0vdtjQ7Z2pHM,26492
 dashscope/files.py,sha256=vRDQygm3lOqBZR73o7KNHs1iTBVuvLncuwJNxIYjzAU,3981
 dashscope/model.py,sha256=B5v_BtYLPqj6raClejBgdKg6WTGwhH_f-20pvsQqmsk,1491
 dashscope/models.py,sha256=dE4mzXkl85G343qVylSGpURPRdA5pZSqXlx6PcxqC_Q,1275
-dashscope/version.py,sha256=Jh_ywQtA3fN22w5spp6Y1H_sgZduUBIV7g5eOVdEETE,74
+dashscope/version.py,sha256=tFrHRbI2SJLqcZ_I7s27rempXOnJ1PnfN0UpyIemTGE,74
 dashscope/aigc/__init__.py,sha256=AuRhu_vA1K0tbs_C6DgcZYhTvxMuzDgpwHJNHzEPIHg,442
 dashscope/aigc/chat_completion.py,sha256=ONlyyssIbfaKKcFo7cEKhHx5OCF2XX810HFzIExW1ho,14813
 dashscope/aigc/code_generation.py,sha256=p_mxDKJLQMW0IjFD46JRlZuEZCRESSVKEfLlAevBtqw,10936
@@ -73,7 +73,9 @@ dashscope/multimodal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 dashscope/multimodal/dialog_state.py,sha256=CtOdfGWhq0ePG3bc8-7inhespETtPD4QDli1513hd1A,1522
 dashscope/multimodal/multimodal_constants.py,sha256=z_QVq01E43FAqKQnDu9vdf89d1zuYlWyANewWTEXVJM,1282
 dashscope/multimodal/multimodal_dialog.py,sha256=HymlaQYp7SgJdoKbT27SNiviyRRoM91zklNBwTHmm1Q,23939
-dashscope/multimodal/multimodal_request_params.py,sha256=9Dlvyy0u67K5FtMfWkCRLHKsevTM8jvT2V-OljZP5sM,8350
+dashscope/multimodal/multimodal_request_params.py,sha256=Lbxf_kLnFUkhty8AU9wL7ws9tYbmhHPVmsiXLdynlJg,8402
+dashscope/multimodal/tingwu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dashscope/multimodal/tingwu/tingwu.py,sha256=01d-QOeuB1QmRhiZqbXJ8pHoGqT0C-xZTjIs_ZBXOyw,2613
 dashscope/nlp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/nlp/understanding.py,sha256=00ado-ibYEzBRT0DgKGd3bohQDNW73xnFhJ_1aa87lw,2880
 dashscope/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -96,10 +98,10 @@ dashscope/tokenizers/tokenization.py,sha256=ubQBJ_yw_MoHuHxZcK9NarZSSbyExloeSOLI
 dashscope/tokenizers/tokenizer.py,sha256=3FQVDvMNkCW9ccYeJdjrd_PIMMD3Xv7aNZkaYOE4XX4,1205
 dashscope/tokenizers/tokenizer_base.py,sha256=5EJIFuizMWESEmLmbd38yJnfeHmPnzZPwsO4aOGjpl4,707
 dashscope/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/utils/oss_utils.py,sha256=VHdHBVYNmWEWS2Kgz_2xMwCtqJqDVjWb5logIkESBsA,7497
-dashscope-1.24.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dashscope-1.24.0.dist-info/METADATA,sha256=eQBLGwKE2J2qwexyNLfsvm8bAcyzyAMgYnBY6EIrSBU,7123
-dashscope-1.24.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dashscope-1.24.0.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
-dashscope-1.24.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.24.0.dist-info/RECORD,,
+dashscope/utils/oss_utils.py,sha256=0BrMogT1PgNAWLYx947akgw_lcLsaVIIMAL1KUtaB88,7507
+dashscope-1.24.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dashscope-1.24.2.dist-info/METADATA,sha256=W7cXJ-appClSQXDftF5s2agUBHZHKaqrfPZ_oKZ35N4,7123
+dashscope-1.24.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dashscope-1.24.2.dist-info/entry_points.txt,sha256=e9C3sOf9zDYL0O5ROEGX6FT8w-QK_kaGRWmPZDHAFys,49
+dashscope-1.24.2.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.24.2.dist-info/RECORD,,