dashscope 1.19.0__py3-none-any.whl → 1.19.1__py3-none-any.whl

dashscope/api_entities/http_request.py

@@ -10,7 +10,10 @@ from dashscope.common.constants import (DEFAULT_REQUEST_TIMEOUT_SECONDS,
                                         SSE_CONTENT_TYPE, HTTPMethod)
 from dashscope.common.error import UnsupportedHTTPMethod
 from dashscope.common.logging import logger
-from dashscope.common.utils import _handle_stream
+from dashscope.common.utils import (_handle_aio_stream,
+                                    _handle_aiohttp_failed_response,
+                                    _handle_http_failed_response,
+                                    _handle_stream)
 
 
 class HttpRequest(AioBaseRequest):
@@ -127,38 +130,25 @@ class HttpRequest(AioBaseRequest):
                     async for rsp in self._handle_aio_response(response):
                         yield rsp
         except aiohttp.ClientConnectorError as e:
-            logger.error(e)
-            raise e
-        except Exception as e:
-            logger.error(e)
-            raise e
-
-    async def _handle_aio_stream(self, response):
-        # TODO define done message.
-        is_error = False
-        status_code = HTTPStatus.BAD_REQUEST
-        async for line in response.content:
-            if line:
-                line = line.decode('utf8')
-                line = line.rstrip('\n').rstrip('\r')
-                if line.startswith('event:error'):
-                    is_error = True
-                elif line.startswith('status:'):
-                    status_code = line[len('status:'):]
-                    status_code = int(status_code.strip())
-                elif line.startswith('data:'):
-                    line = line[len('data:'):]
-                    yield (is_error, status_code, line)
-                    if is_error:
-                        break
-                else:
-                    continue  # ignore heartbeat...
+            logger.exception(e)
+            yield DashScopeAPIResponse(-1,
+                                       '',
+                                       'Unknown',
+                                       message='Error type: %s, message: %s' %
+                                       (type(e), e))
+        except BaseException as e:
+            logger.exception(e)
+            yield DashScopeAPIResponse(-1,
+                                       '',
+                                       'Unknown',
+                                       message='Error type: %s, message: %s' %
+                                       (type(e), e))
 
     async def _handle_aio_response(self, response: aiohttp.ClientResponse):
         request_id = ''
         if (response.status == HTTPStatus.OK and self.stream
                 and SSE_CONTENT_TYPE in response.content_type):
-            async for is_error, status_code, data in self._handle_aio_stream(
+            async for is_error, status_code, data in _handle_aio_stream(
                     response):
                 try:
                     output = None
@@ -217,29 +207,7 @@ class HttpRequest(AioBaseRequest):
                                        output=output,
                                        usage=usage)
         else:
-            if 'application/json' in response.content_type:
-                error = await response.json()
-                if 'request_id' in error:
-                    request_id = error['request_id']
-                if 'message' not in error:
-                    message = ''
-                    logger.error('Request: %s failed, status: %s' %
-                                 (self.url, response.status))
-                else:
-                    message = error['message']
-                    logger.error(
-                        'Request: %s failed, status: %s, message: %s' %
-                        (self.url, response.status, error['message']))
-                yield DashScopeAPIResponse(request_id=request_id,
-                                           status_code=response.status,
-                                           code=error['code'],
-                                           message=message)
-            else:
-                msg = await response.read()
-                yield DashScopeAPIResponse(request_id=request_id,
-                                           status_code=response.status,
-                                           code='Unknown',
-                                           message=msg.decode('utf-8'))
+            yield await _handle_aiohttp_failed_response(response)
 
     def _handle_response(self, response: requests.Response):
         request_id = ''
@@ -306,33 +274,7 @@ class HttpRequest(AioBaseRequest):
                                            output=output,
                                            usage=usage)
         else:
-            if 'application/json' in response.headers.get('content-type', ''):
-                error = response.json()
-                if 'request_id' in error:
-                    request_id = error['request_id']
-                if 'message' not in error:
-                    message = ''
-                    logger.error('Request: %s failed, status: %s' %
-                                 (self.url, response.status_code))
-                else:
-                    message = error['message']
-                    logger.error(
-                        'Request: %s failed, status: %s, message: %s' %
-                        (self.url, response.status_code, error['message']))
-                yield DashScopeAPIResponse(
-                    request_id=request_id,
-                    status_code=response.status_code,
-                    output=None,
-                    code=error['code']
-                    if 'code' in error else None,  # noqa E501
-                    message=message)
-            else:
-                msg = response.content
-                yield DashScopeAPIResponse(request_id=request_id,
-                                           status_code=response.status_code,
-                                           output=None,
-                                           code='Unknown',
-                                           message=msg.decode('utf-8'))
+            yield _handle_http_failed_response(response)
 
     def _handle_request(self):
         try:
@@ -364,6 +306,10 @@ class HttpRequest(AioBaseRequest):
                                                 self.method)
                 for rsp in self._handle_response(response):
                     yield rsp
-        except Exception as e:
+        except BaseException as e:
             logger.error(e)
-            raise e
+            yield DashScopeAPIResponse(-1,
+                                       '',
+                                       'Unknown',
+                                       message='Error type: %s, message: %s' %
+                                       (type(e), e))

dashscope/api_entities/websocket_request.py

@@ -154,6 +154,13 @@ class WebSocketRequest(AioBaseRequest):
                                        status_code=code,
                                        code=code,
                                        message=msg)
+        except BaseException as e:
+            logger.exception(e)
+            yield DashScopeAPIResponse(request_id='',
+                                       status_code=-1,
+                                       code='Unknown',
+                                       message='Error type: %s, message: %s' %
+                                       (type(e), e))
 
     def _to_DashScopeAPIResponse(self, task_id, is_binary, result):
         if is_binary:

dashscope/common/utils.py

@@ -2,6 +2,8 @@ import asyncio
 import json
 import os
 import platform
+import queue
+import threading
 from dataclasses import dataclass
 from http import HTTPStatus
 from typing import Dict
@@ -75,7 +77,8 @@ def is_url(url: str):
         return False
 
 
-def iter_over_async(ait, loop):
+def iter_over_async(ait):
+    loop = asyncio.get_event_loop_policy().new_event_loop()
     ait = ait.__aiter__()
 
     async def get_next():
@@ -85,18 +88,41 @@ def iter_over_async(ait, loop):
         except StopAsyncIteration:
             return True, None
 
+    def iter_thread(loop, message_queue):
+        while True:
+            try:
+                done, obj = loop.run_until_complete(get_next())
+                if done:
+                    message_queue.put((True, None, None))
+                    break
+                message_queue.put((False, None, obj))
+            except BaseException as e:  # noqa E722
+                logger.exception(e)
+                message_queue.put((True, e, None))
+                break
+
+    message_queue = queue.Queue()
+    x = threading.Thread(target=iter_thread,
+                         args=(loop, message_queue),
+                         name='iter_async_thread')
+    x.start()
     while True:
-        done, obj = loop.run_until_complete(get_next())
-        if done:
-            loop.close()
+        finished, error, obj = message_queue.get()
+        if finished:
+            if error is not None:
+                yield DashScopeAPIResponse(
+                    -1,
+                    '',
+                    'Unknown',
+                    message='Error type: %s, message: %s' %
+                    (type(error), error))
             break
-        yield obj
+        else:
+            yield obj
 
 
 def async_to_sync(async_generator):
-    loop = asyncio.get_event_loop_policy().new_event_loop()
-    asyncio.set_event_loop(loop)
-    for message in iter_over_async(async_generator, loop):
+    for message in iter_over_async(async_generator):
         yield message
 
 
@@ -211,29 +237,46 @@ def _handle_stream(response: requests.Response):
                 continue  # ignore heartbeat...
 
 
+def _handle_error_message(error, status_code, flattened_output):
+    code = None
+    msg = ''
+    request_id = ''
+    if flattened_output:
+        error['status_code'] = status_code
+        return error
+    if 'message' in error:
+        msg = error['message']
+    if 'msg' in error:
+        msg = error['msg']
+    if 'code' in error:
+        code = error['code']
+    if 'request_id' in error:
+        request_id = error['request_id']
+    return DashScopeAPIResponse(request_id=request_id,
+                                status_code=status_code,
+                                code=code,
+                                message=msg)
+
+
 def _handle_http_failed_response(
         response: requests.Response,
         flattened_output: bool = False) -> DashScopeAPIResponse:
-    msg = ''
-    code = None
     request_id = ''
     if 'application/json' in response.headers.get('content-type', ''):
         error = response.json()
-        if flattened_output:
-            error['status_code'] = response.status_code
-            return error
-        if 'message' in error:
-            msg = error['message']
-        if 'msg' in error:
-            msg = error['msg']
-        if 'code' in error:
-            code = error['code']
-        if 'request_id' in error:
-            request_id = error['request_id']
+        return _handle_error_message(error, response.status_code,
+                                     flattened_output)
+    elif SSE_CONTENT_TYPE in response.headers.get('content-type', ''):
+        msgs = response.content.decode('utf-8').split('\n')
+        for msg in msgs:
+            if msg.startswith('data:'):
+                error = json.loads(msg.replace('data:', '').strip())
+                return _handle_error_message(error, response.status_code,
+                                             flattened_output)
         return DashScopeAPIResponse(request_id=request_id,
                                     status_code=response.status_code,
-                                    code=code,
-                                    message=msg)
+                                    code='Unknown',
+                                    message=msgs)
     else:
         msg = response.content.decode('utf-8')
         if flattened_output:
@@ -244,6 +287,49 @@ def _handle_http_failed_response(
                                     message=msg)
 
 
+async def _handle_aio_stream(response):
+    # TODO define done message.
+    is_error = False
+    status_code = HTTPStatus.BAD_REQUEST
+    async for line in response.content:
+        if line:
+            line = line.decode('utf8')
+            line = line.rstrip('\n').rstrip('\r')
+            if line.startswith('event:error'):
+                is_error = True
+            elif line.startswith('status:'):
+                status_code = line[len('status:'):]
+                status_code = int(status_code.strip())
+            elif line.startswith('data:'):
+                line = line[len('data:'):]
+                yield (is_error, status_code, line)
+                if is_error:
+                    break
+            else:
+                continue  # ignore heartbeat...
+
+
+async def _handle_aiohttp_failed_response(
+        response: requests.Response,
+        flattened_output: bool = False) -> DashScopeAPIResponse:
+    request_id = ''
+    if 'application/json' in response.content_type:
+        error = await response.json()
+        return _handle_error_message(error, response.status, flattened_output)
+    elif SSE_CONTENT_TYPE in response.content_type:
+        async for _, _, data in _handle_aio_stream(response):
+            error = json.loads(data)
+        return _handle_error_message(error, response.status, flattened_output)
+    else:
+        msg = response.content.decode('utf-8')
+        if flattened_output:
+            return {'status_code': response.status, 'message': msg}
+        return DashScopeAPIResponse(request_id=request_id,
+                                    status_code=response.status,
+                                    code='Unknown',
+                                    message=msg)
+
+
 def _handle_http_response(response: requests.Response,
                           flattened_output: bool = False):
     response = _handle_http_stream_response(response, flattened_output)

dashscope/version.py

@@ -1 +1 @@
-__version__ = '1.19.0'
+__version__ = '1.19.1'

{dashscope-1.19.0.dist-info → dashscope-1.19.1.dist-info}/METADATA

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

{dashscope-1.19.0.dist-info → dashscope-1.19.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=1-bc-Ue68zurgu_y6RhfFr9uzeQMF5AZq-C32lJGMGU,1224
-dashscope/version.py,sha256=PvMTFqtUFNQdVjEOjF4SwqihC40AoILowDbGracDUXA,23
+dashscope/version.py,sha256=_HUAUi-u8hG8FcFLMpMxSECPn6Si10Hn8M1DGJyxUkQ,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
@@ -19,8 +19,8 @@ dashscope/api_entities/api_request_data.py,sha256=JUMcfpJjKXEZLCBSFIDpgoaeQYk5uK
 dashscope/api_entities/api_request_factory.py,sha256=4p-qxMuvCA0CmUHdH19QaUCaHmlLHAM1X2Jd4YKt5c0,4661
 dashscope/api_entities/base_request.py,sha256=cXUL7xqSV8wBr5d-1kx65AO3IsRR9A_ps6Lok-v-MKM,926
 dashscope/api_entities/dashscope_response.py,sha256=Bp1T7HwVlkOvpMNg-AEjz-BScxhLUXMXlE8ApXTtfhQ,17872
-dashscope/api_entities/http_request.py,sha256=sSaHknlFOgSN4XLpOX0xztllPlwMms-dI7cLlOgCUig,16418
-dashscope/api_entities/websocket_request.py,sha256=IaydqRvOSr5IdSSpnX8Vc8rRoVldjfcrLvDxTnPep9g,14676
+dashscope/api_entities/http_request.py,sha256=UeS8_rhApA_FnuPv56B2Ruu1l9O1Bd6NiB9KNboWW50,14011
+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=AegGVsk3dDzYACoYRNNjo3eG-2wrDd0dlOjYHpF0r2Y,7949
 dashscope/app/application_response.py,sha256=AR_dEtfDsS7SqOyUqZmiosdgos1bDnXUvZn7XV_OzAs,6714
@@ -45,7 +45,7 @@ dashscope/common/env.py,sha256=oQOZW5JyEeTSde394un2lpDJ5RBh4fMU9hBfbtrKKkc,869
 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=5jg7q5NE0LE1NigbpfrOkqXjPYqb-3jfFOh7g-nWB1Q,12017
+dashscope/common/utils.py,sha256=YHs9PvL2BInfzgJazMEDdzOfMzmhudf0J083ieNWXkc,15398
 dashscope/customize/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dashscope/customize/customize_types.py,sha256=ZtEwSXA4dbjIYr5vgQQNkMuXyC2BNmznGuaF6b7jwr0,4803
 dashscope/customize/deployments.py,sha256=LIkM-hmJHcJZCKV6WJIPSXQ5CAhB5PUxnt5mqKbVbfE,5189
@@ -80,9 +80,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.19.0.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
-dashscope-1.19.0.dist-info/METADATA,sha256=_g9jJF6fHX67RDkeclS5Rfso_F-xgSP_lV8puUof84I,6609
-dashscope-1.19.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-dashscope-1.19.0.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
-dashscope-1.19.0.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
-dashscope-1.19.0.dist-info/RECORD,,
+dashscope-1.19.1.dist-info/LICENSE,sha256=Izp5L1DF1Mbza6qojkqNNWlE_mYLnr4rmzx2EBF8YFw,11413
+dashscope-1.19.1.dist-info/METADATA,sha256=pURfnZ-PzopFwsIK_l3RiK_ST0qSBNCmHZK2JsEZYic,6609
+dashscope-1.19.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+dashscope-1.19.1.dist-info/entry_points.txt,sha256=raEp5dOuj8whJ7yqZlDM8WQ5p2RfnGrGNo0QLQEnatY,50
+dashscope-1.19.1.dist-info/top_level.txt,sha256=woqavFJK9zas5xTqynmALqOtlafghjsk63Xk86powTU,10
+dashscope-1.19.1.dist-info/RECORD,,