Dev/errors

dashscope/api_entities/aiohttp_request.py

@@ -17,7 +17,10 @@
 )
 from dashscope.common.error import UnsupportedHTTPMethod
 from dashscope.common.logging import logger
-from dashscope.common.utils import async_to_sync
+from dashscope.common.utils import (
+    async_to_sync,
+    _handle_aiohttp_failed_response,
+)
 
 
 class AioHttpRequest(AioBaseRequest):
@@ -162,19 +165,24 @@ async def _handle_response(  # pylint: disable=too-many-branches
                     if "request_id" in msg:
                         request_id = msg["request_id"]
                 except json.JSONDecodeError:
+                    msg = None
                     yield DashScopeAPIResponse(
                         request_id=request_id,
                         status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-                        code="Unknown",
+                        code=None,
                         message=data,
                     )
                     continue
-                if is_error:
+                if is_error and msg is not None:
                     yield DashScopeAPIResponse(
                         request_id=request_id,
                         status_code=status_code,
-                        code=msg["code"],
-                        message=msg["message"],
+                        code=msg.get("code")
+                        or msg.get("error_code")
+                        or f"http_{status_code}",
+                        message=msg.get("message")
+                        or msg.get("error_message")
+                        or f"HTTP {status_code} error",
                     )
                 else:
                     yield DashScopeAPIResponse(
@@ -219,39 +227,7 @@ async def _handle_response(  # pylint: disable=too-many-branches
                 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 _handle_aiohttp_failed_response(response)
 
     # pylint: disable=too-many-branches
     async def _handle_request(self):

dashscope/api_entities/http_request.py

@@ -228,8 +228,10 @@ async def _handle_aio_request(self):  # pylint: disable=too-many-branches
                 if should_close:
                     await session.close()
         except Exception as e:
-            logger.debug(e)
-            raise e
+            logger.error(f"Async request failed: {e}", exc_info=True)
+            from dashscope.common.error import DashScopeException
+
+            raise DashScopeException(str(e)) from e
 
     @staticmethod
     def __handle_parameters(params: dict) -> dict:
@@ -291,7 +293,7 @@ async def _handle_aio_response(  # pylint: disable=too-many-branches, too-many-s
                     yield DashScopeAPIResponse(
                         request_id=request_id,
                         status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-                        code="Unknown",
+                        code=None,
                         message=data,
                         headers=headers,
                     )
@@ -300,8 +302,12 @@ async def _handle_aio_response(  # pylint: disable=too-many-branches, too-many-s
                     yield DashScopeAPIResponse(
                         request_id=request_id,
                         status_code=status_code,
-                        code=msg["code"],
-                        message=msg["message"],
+                        code=msg.get("code")
+                        or msg.get("error_code")
+                        or f"http_{status_code}",
+                        message=msg.get("message")
+                        or msg.get("error_message")
+                        or f"HTTP {status_code} error",
                         headers=headers,
                     )
                 else:
@@ -401,7 +407,7 @@ def _handle_response(  # pylint: disable=too-many-branches
                         request_id=request_id,
                         status_code=HTTPStatus.BAD_REQUEST,
                         output=None,
-                        code="Unknown",
+                        code=None,
                         message=data,
                         headers=headers,
                     )
@@ -411,10 +417,12 @@ def _handle_response(  # pylint: disable=too-many-branches
                         request_id=request_id,
                         status_code=status_code,
                         output=None,
-                        code=msg["code"]
-                        if "code" in msg
-                        else None,  # noqa E501
-                        message=msg["message"] if "message" in msg else None,
+                        code=msg.get("code")
+                        or msg.get("error_code")
+                        or f"http_{status_code}",
+                        message=msg.get("message")
+                        or msg.get("error_message")
+                        or f"HTTP {status_code} error",
                         headers=headers,
                     )  # noqa E501
                 else:
@@ -517,5 +525,7 @@ def _handle_request(self):  # pylint: disable=too-many-branches
                 if should_close:
                     session.close()
         except Exception as e:
-            logger.debug(e)
-            raise e
+            logger.error(f"Sync request failed: {e}", exc_info=True)
+            from dashscope.common.error import DashScopeException
+
+            raise DashScopeException(str(e)) from e

dashscope/api_entities/websocket_request.py

@@ -112,7 +112,9 @@ async def aio_call(self):
                 pass
             return result
 
-    async def connection_handler(self):  # pylint: disable=too-many-branches
+    async def connection_handler(
+        self,
+    ):  # pylint: disable=too-many-branches,too-many-statements
         try:
             task_id = None
             async with aiohttp.ClientSession(
@@ -203,26 +205,45 @@ async def connection_handler(self):  # pylint: disable=too-many-branches
             )
         except aiohttp.WSServerHandshakeError as e:
             code = e.status
-            msg = e.message
+            original_msg = e.message or ""
+
             if e.status in [HTTPStatus.FORBIDDEN, HTTPStatus.UNAUTHORIZED]:
-                msg = "Unauthorized, your api-key is invalid!"
+                friendly_hint = "Unauthorized, your api-key may be invalid!"
+                msg = (
+                    f"{friendly_hint} (Server details: {original_msg})"
+                    if original_msg
+                    else friendly_hint
+                )
             elif e.status == HTTPStatus.SERVICE_UNAVAILABLE:
-                msg = SERVICE_503_MESSAGE
+                friendly_hint = SERVICE_503_MESSAGE
+                msg = (
+                    f"{friendly_hint} (Server details: {original_msg})"
+                    if original_msg
+                    else friendly_hint
+                )
             else:
-                pass
+                msg = (
+                    original_msg
+                    or f"WebSocket handshake failed with status {e.status}"
+                )
+
+            # Note: For WebSocket handshake errors, code uses format
+            # "WS_HANDSHAKE_{status_code}" to distinguish from business errors.
+            # This is a special case.
             yield DashScopeAPIResponse(
                 request_id=task_id,
                 status_code=code,
-                code=code,
+                code=f"WS_HANDSHAKE_{code}" if code else "WS_HANDSHAKE_FAILED",
                 message=msg,
             )
         except BaseException as e:
             logger.exception(e)
+            exception_name = type(e).__name__
             yield DashScopeAPIResponse(
                 request_id="",
                 status_code=-1,
-                code="Unknown",
-                message=f"Error type: {type(e)}, message: {e}",
+                code="",
+                message=f"[SDK Internal Error] {exception_name}: {e}",
             )
 
     def _to_DashScopeAPIResponse(self, task_id, is_binary, result):