dashscope 1.18.0__py3-none-any.whl → 1.18.1__py3-none-any.whl

dashscope/common/error.py

@@ -58,6 +58,27 @@ class UnsupportedData(DashScopeException):
     pass
 
 
+class AssistantError(DashScopeException):
+    def __init__(self, **kwargs):
+        self.message = None
+        self.code = None
+        self.request_id = None
+        if 'message' in kwargs:
+            import json
+            msg = json.loads(kwargs['message'])
+            if 'request_id' in msg:
+                self.request_id = msg['request_id']
+            if 'code' in msg:
+                self.code = msg['code']
+            if 'message' in msg:
+                self.message = msg['message']
+
+    def __str__(self):
+        msg = 'Request failed, request_id: %s, code: %s, message: %s' % (  # noqa E501
+            self.request_id, self.code, self.message)
+        return msg
+
+
 # for server send generation or inference error.
 class RequestFailure(DashScopeException):
     def __init__(self,

dashscope/common/utils.py

@@ -188,7 +188,6 @@ def _handle_stream(response: requests.Response):
         if line:
             line = line.decode('utf8')
             line = line.rstrip('\n').rstrip('\r')
-            print(line)
             if line.startswith('id:'):
                 id = line[len('id:'):]
                 event.id = id.strip()

dashscope/threads/runs/runs.py

@@ -5,7 +5,8 @@ from typing import Dict, List, Optional
 from dashscope.client.base_api import (CancelMixin, CreateMixin,
                                        GetStatusMixin, ListObjectMixin,
                                        UpdateMixin)
-from dashscope.common.error import InputRequired, TimeoutException
+from dashscope.common.error import (AssistantError, InputRequired,
+                                    TimeoutException)
 from dashscope.common.logging import logger
 from dashscope.threads.thread_types import (Run, RunList, RunStep,
                                             RunStepDelta, Thread,
@@ -156,7 +157,7 @@ class Runs(CreateMixin, CancelMixin, ListObjectMixin, GetStatusMixin,
             'thread.message.delta': ThreadMessageDelta,
             'thread.message.completed': ThreadMessage,
             'thread.message.incomplete': ThreadMessage,
-            'error': item,
+            'error': AssistantError,
         }
         if (event in event_object_map):
             return event_object_map[event](**item)

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.18.0'
+__version__ = '1.18.1'

{dashscope-1.18.0.dist-info → dashscope-1.18.1.dist-info}/METADATA

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

{dashscope-1.18.0.dist-info → dashscope-1.18.1.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=UPOn1qMYFhX-ovXi3BMxZEBk8qOK7WLJOYHMbPZwYBo,1440
-dashscope/version.py,sha256=q8fI5ieuQmE0i1govJ0GSDS7ZYmdLjENalxa2NdG9VQ,23
+dashscope/version.py,sha256=I5ZqRqhAJhmCPjHV4Y-aZSwFiizEYHBBRN0cXvrD1-A,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
@@ -42,10 +42,10 @@ dashscope/common/api_key.py,sha256=5Stp0odL5JSuIO3qJBp23QNppuGbqhhvKPS66qbMs0I,1
 dashscope/common/base_type.py,sha256=wKqLGrr2o9bpI43ws1P0YCuJmoS17J9_Rw_uuYHjIFQ,4531
 dashscope/common/constants.py,sha256=86Zc45f1-OEgNdLTu-4_Pl0U3wRyi5qFt4E7dLlaglU,2327
 dashscope/common/env.py,sha256=oQOZW5JyEeTSde394un2lpDJ5RBh4fMU9hBfbtrKKkc,869
-dashscope/common/error.py,sha256=eFUSBNERfXYQ4g3bVka_IGuRG1A06Zf6njObBtR2z6E,1951
+dashscope/common/error.py,sha256=Q7GRhniP-7ap4HBpU69frRdKgKLwmH4ySYxCtupsr60,2638
 dashscope/common/logging.py,sha256=ecGxylG3bWES_Xv5-BD6ep4_0Ciu7F6ZPBjiZtu9Jx4,984
 dashscope/common/message_manager.py,sha256=i5149WzDk6nWmdFaHzYx4USXMBeX18GKSI-F4fLwbN0,1097
-dashscope/common/utils.py,sha256=AqpU4Lh6C64-Uy-BLybpRz01HqlmcAgVqlqN73tD1I0,12041
+dashscope/common/utils.py,sha256=5jg7q5NE0LE1NigbpfrOkqXjPYqb-3jfFOh7g-nWB1Q,12017
 dashscope/embeddings/__init__.py,sha256=-dxHaoxZZVuP-wAGUIa3sNNh8CQwaeWj2UlqsDy1sV4,240
 dashscope/embeddings/batch_text_embedding.py,sha256=P32LFO9v7ehdJsl0c32In94hUET6K6AaGJ_pDRtFqco,8791
 dashscope/embeddings/batch_text_embedding_response.py,sha256=WziXlQsFIkL1kPc_7lRG1HtqgkO5vVThtnNqExJggNU,2000
@@ -67,7 +67,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=24zFdIldjKUMN2EFiHv9unm9fgnD5irkurYtRfm0gQ0,18698
+dashscope/threads/runs/runs.py,sha256=Cvy5FD0x1Z9c5qayYeNpoL_QIqH4yxgqdGplCk3soRw,18762
 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
@@ -76,9 +76,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=fi8-PPsN-iR-iv5k2NS5Z8nlWkpgUhr56FRWm4BDh4A,6984
-dashscope-1.18.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.18.0.dist-info/METADATA,sha256=O7GFznTd2fn-87dJSUvcIfZkhTcGv_KBxPf9s3Cvbiw,6609
-dashscope-1.18.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.18.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.18.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.18.0.dist-info/RECORD,,
+dashscope-1.18.1.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.18.1.dist-info/METADATA,sha256=33M-0CZybEgQltO9zFJSM4xHpCSEzO2IabuoaJJFbdI,6609
+dashscope-1.18.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.18.1.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.18.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.18.1.dist-info/RECORD,,