dashscope 1.20.13__py3-none-any.whl → 1.20.14__py3-none-any.whl

dashscope/app/application.py

@@ -4,14 +4,17 @@
 @Date    :   2024-02-24
 @Desc    :   Application calls for both http and http sse
 """
-from typing import Generator, Union
+import copy
+from typing import Generator, Union, List
 
 from dashscope.api_entities.api_request_factory import _build_api_request
 from dashscope.app.application_response import ApplicationResponse
 from dashscope.client.base_api import BaseApi
 from dashscope.common.api_key import get_default_api_key
-from dashscope.common.constants import HISTORY, PROMPT
+from dashscope.common.constants import HISTORY, PROMPT, DEPRECATED_MESSAGE, MESSAGES
 from dashscope.common.error import InputRequired, InvalidInput
+from dashscope.api_entities.dashscope_response import Message, Role
+from dashscope.common.logging import logger
 
 
 class Application(BaseApi):
@@ -20,6 +23,7 @@ class Application(BaseApi):
     """API for app completion calls.
 
     """
+
     class DocReferenceType:
         """ doc reference type for rag completion """
 
@@ -31,21 +35,23 @@ class Application(BaseApi):
     def _validate_params(cls, api_key, app_id):
         if api_key is None:
             api_key = get_default_api_key()
+
         if app_id is None or not app_id:
             raise InputRequired('App id is required!')
+
         return api_key, app_id
 
     @classmethod
     def call(
-        cls,
-        app_id: str,
-        prompt: str,
-        history: list = None,
-        workspace: str = None,
-        api_key: str = None,
-        **kwargs
-    ) -> Union[ApplicationResponse, Generator[ApplicationResponse, None,
-                                              None]]:
+            cls,
+            app_id: str,
+            prompt: str = None,
+            history: list = None,
+            workspace: str = None,
+            api_key: str = None,
+            messages: List[Message] = None,
+            **kwargs
+    ) -> Union[ApplicationResponse, Generator[ApplicationResponse, None, None]]:
         """Call app completion service.
 
         Args:
@@ -59,6 +65,7 @@ class Application(BaseApi):
             workspace(str, `optional`): Workspace for app completion call
             api_key (str, optional): The api api_key, can be None,
                 if None, will get by default rule(TODO: api key doc).
+            messages(list): The generation messages.
 
             **kwargs:
                 stream(bool, `optional`): Enable server-sent events
@@ -112,8 +119,8 @@ class Application(BaseApi):
 
         api_key, app_id = Application._validate_params(api_key, app_id)
 
-        if prompt is None or not prompt:
-            raise InputRequired('prompt is required!')
+        if (prompt is None or not prompt) and (messages is None or len(messages) == 0):
+            raise InputRequired('prompt or messages is required!')
 
         if workspace is not None and workspace:
             headers = kwargs.pop('headers', {})
@@ -121,7 +128,7 @@ class Application(BaseApi):
             kwargs['headers'] = headers
 
         input, parameters = cls._build_input_parameters(
-            prompt, history, **kwargs)
+            prompt, history, messages, **kwargs)
         request = _build_api_request(model='',
                                      input=input,
                                      task_group=Application.task_group,
@@ -142,10 +149,22 @@ class Application(BaseApi):
             return ApplicationResponse.from_api_response(response)
 
     @classmethod
-    def _build_input_parameters(cls, prompt, history, **kwargs):
+    def _build_input_parameters(cls, prompt, history, messages, **kwargs):
         parameters = {}
 
-        input_param = {HISTORY: history, PROMPT: prompt}
+        input_param = {}
+        if messages is not None:
+            msgs = copy.deepcopy(messages)
+            if prompt is not None and prompt:
+                msgs.append({'role': Role.USER, 'content': prompt})
+            input_param = {MESSAGES: msgs}
+        elif history is not None and history:
+            logger.warning(DEPRECATED_MESSAGE)
+            input_param[HISTORY] = history
+            if prompt is not None and prompt:
+                input_param[PROMPT] = prompt
+        else:
+            input_param[PROMPT] = prompt
 
         session_id = kwargs.pop('session_id', None)
         if session_id is not None and session_id:

dashscope/app/application_response.py

@@ -68,6 +68,7 @@ class ApplicationDocReference(DictMixin):
     text: str
     biz_id: str
     images: List[str]
+    page_number: List[int]
 
     def __init__(self,
                  index_id: str = None,
@@ -78,6 +79,7 @@ class ApplicationDocReference(DictMixin):
                  text: str = None,
                  biz_id: str = None,
                  images: List[str] = None,
+                 page_number: List[int] = None,
                  **kwargs):
         """ Doc references for retrieval result.
 
@@ -100,6 +102,7 @@ class ApplicationDocReference(DictMixin):
                          text=text,
                          biz_id=biz_id,
                          images=images,
+                         page_number=page_number,
                          **kwargs)
 
 

dashscope/audio/asr/vocabulary.py

@@ -36,11 +36,11 @@ class VocabularyService(BaseApi):
         self._kwargs = kwargs
         self._last_request_id = None
         self.model = model
-        if self.model == None:
+        if self.model is None:
             self.model = 'speech-biasing'
 
     def __call_with_input(self, input):
-        try_count = 0        
+        try_count = 0
         while True:
             try:
                 response = super().call(model=self.model,

dashscope/audio/tts_v2/enrollment.py

@@ -36,7 +36,7 @@ class VoiceEnrollmentService(BaseApi):
         self._kwargs = kwargs
         self._last_request_id = None
         self.model = model
-        if self.model == None:
+        if self.model is None:
             self.model = 'voice-enrollment'
 
     def __call_with_input(self, input):

dashscope/client/base_api.py

@@ -178,9 +178,9 @@ class AsyncTaskGetMixin():
                 }
         if custom_headers:
             headers = {
-                    **custom_headers,
-                    **headers,
-                }         
+                **custom_headers,
+                **headers,
+            }
         with requests.Session() as session:
             logger.debug('Starting request: %s' % status_url)
             response = session.get(status_url,

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.20.13'
+__version__ = '1.20.14'

{dashscope-1.20.13.dist-info → dashscope-1.20.14.dist-info}/METADATA

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

{dashscope-1.20.13.dist-info → dashscope-1.20.14.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=S_Jpp_0DyAr58XdPBnt8Vp3igXO6V6giLNnGEK_HJHQ,24
+dashscope/version.py,sha256=f2v96-65Z-gg0WsfONkq43TxOuOMUup-4S2fb1hhRjA,24
 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
@@ -22,8 +22,8 @@ dashscope/api_entities/dashscope_response.py,sha256=Bp1T7HwVlkOvpMNg-AEjz-BScxhL
 dashscope/api_entities/http_request.py,sha256=pYE8qRMu9CaQDiugPlXeYoaj_diBv-ZDExCD3WNhehI,13259
 dashscope/api_entities/websocket_request.py,sha256=Xr6IJ9WqrIw5ouBQLpgoRSwL1C09jkb4u1EZdxhVQy0,15039
 dashscope/app/__init__.py,sha256=UiN_9i--z84Dw5wUehOh_Tkk_9Gq_td_Kbz1dobBEKg,62
-dashscope/app/application.py,sha256=QdFSUgQCDDwEaJtlKkbrxrw1lXBCZB7eOX7P1D3GNgU,8532
-dashscope/app/application_response.py,sha256=U5I8Yb1IlXzj2L5a1OAl55i0MCB3kG9Qp4aY17_73pI,6886
+dashscope/app/application.py,sha256=Cnd62LFpG70XJUo4Oibry9KzXPhPNmNkKFD4R5YuGTA,9343
+dashscope/app/application_response.py,sha256=0pulI3O3z4R4h_YaDwzVimamo3XwTXGy5TiHCzysTBg,7011
 dashscope/assistants/__init__.py,sha256=i9N5OxHgY7edlOhTdPyC0N5Uc0uMCkB2vbMPDCD1zX0,383
 dashscope/assistants/assistant_types.py,sha256=1jNL30TOlrkiYhvCaB3E8jkPLG8CnQ6I3tHpYXZCsD0,4211
 dashscope/assistants/assistants.py,sha256=NYahIDqhtnOcQOmnhZsjc5F5jvBUQcce8-fbrJXHVnQ,10833
@@ -34,14 +34,14 @@ dashscope/audio/asr/asr_phrase_manager.py,sha256=EjtbI3zz9UQGS1qv6Yb4zzEMj4OJJVX
 dashscope/audio/asr/recognition.py,sha256=a4zIkIMiWwOEApP9k9ZC9jGDr7CP7BqB6Cy1dBVTN4g,18978
 dashscope/audio/asr/transcribe.py,sha256=HfZYpvpVfvGRAIIIzX65Af33E6vsIFGd_qqhQ8LaNcM,9651
 dashscope/audio/asr/transcription.py,sha256=D8CW0XDqJuEJVmNFJ6qczTysSV3Sz_rzk2C6NIKTtVc,9042
-dashscope/audio/asr/vocabulary.py,sha256=880u5CGh8Ky9iWXDf_7cUuHfL5AGmw8JJRCbRThVCMI,6484
+dashscope/audio/asr/vocabulary.py,sha256=2MHxeaL0ANWk-TILrHhArKSdj0d5M_YHw0cnjB-E4dY,6476
 dashscope/audio/tts/__init__.py,sha256=fbnieZX9yNFNh5BsxLpLXb63jlxzxrdCJakV3ignjlQ,194
 dashscope/audio/tts/speech_synthesizer.py,sha256=dnKx9FDDdO_ETHAjhK8zaMVaH6SfoTtN5YxXXqgY1JA,7571
 dashscope/audio/tts_v2/__init__.py,sha256=5UfyDBYnuGgOy9KMxEIXA2U2ihcXutdZc1cqJudy-8M,282
-dashscope/audio/tts_v2/enrollment.py,sha256=sUkOEUsP8RXREMtTkAeDTYfrQJ6lPnM_Y-DeefXB_Q4,6140
+dashscope/audio/tts_v2/enrollment.py,sha256=mvkYMj9WzqEztZb8zc56fm8Obw7ON9USrEYhATU6rcs,6140
 dashscope/audio/tts_v2/speech_synthesizer.py,sha256=lATasQJB8HlB_yYm90qqW6zIAE1CQFxBxhnch6xdg9s,19285
 dashscope/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dashscope/client/base_api.py,sha256=rXN97XGyDhCCaD_dz_clpFDjOJfpGjqiH7yX3LaD-GE,41233
+dashscope/client/base_api.py,sha256=D1lRDr_k58Vwd3jvmsMx4UtTjwdngx182LPYvmtXZjQ,41212
 dashscope/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/common/api_key.py,sha256=5Stp0odL5JSuIO3qJBp23QNppuGbqhhvKPS66qbMs0I,1986
 dashscope/common/base_type.py,sha256=C9xP6WuN5pOzviZ2g3X2EPcigldtFE0VlaUmjyNnUUk,4619
@@ -85,9 +85,9 @@ dashscope/tokenizers/tokenizer.py,sha256=y6P91qTCYo__pEx_0VHAcj9YECfbUdRqZU1fdGT
 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=7vZ2Lypxwiit8VcAqAvr3cCyhVfaLapDiNuF-H3ZCD4,7332
-dashscope-1.20.13.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.20.13.dist-info/METADATA,sha256=LdYg6imH5DQJpKnK2iRS77l5js8bPweeV2yO-M6AfcA,6642
-dashscope-1.20.13.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.20.13.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.20.13.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.20.13.dist-info/RECORD,,
+dashscope-1.20.14.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.20.14.dist-info/METADATA,sha256=BjqLaIu_UNVWxAYRXU8wsrrr4I8qsr08dUtKcm-LGyY,6642
+dashscope-1.20.14.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.20.14.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.20.14.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.20.14.dist-info/RECORD,,