Skip to content

Exceptions: Added Error Detail, ArgumentName, ArgumentValue and retur… #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Exceptions: Added Error Detail, ArgumentName, ArgumentValue and retur… #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions alibabacloud_oss_v2/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@ def _to_service_error(response: HttpResponse) -> exceptions.ServiceError:
code = 'BadErrorResponse'
message = ''
ec = ''
error_detail = ''
argument_name = ''
argument_value = ''
request_id = ''
err_body = b''
try:
Expand All @@ -656,6 +659,9 @@ def _to_service_error(response: HttpResponse) -> exceptions.ServiceError:
message = error_fileds.get('Message', '')
code = error_fileds.get('Code', '')
ec = error_fileds.get('EC', '')
error_detail = error_fileds.get('ErrorDetail', '')
argument_name = error_fileds.get('ArgumentName', '')
argument_value = error_fileds.get('ArgumentValue', '')
request_id = error_fileds.get('RequestId', '')
else:
message = f'Expect root node Error, but get {root.tag}.'
Expand All @@ -679,6 +685,9 @@ def _to_service_error(response: HttpResponse) -> exceptions.ServiceError:
message=message,
request_id=request_id or response.headers.get('x-oss-request-id', ''),
ec=ec or response.headers.get('x-oss-ec', ''),
error_detail=error_detail,
argument_name=argument_name,
argument_value=argument_value,
timestamp=timestamp,
request_target=f'{response.request.method} {response.request.url}',
snapshot=content,
Expand All @@ -695,6 +704,9 @@ def _to_service_error_json(response: HttpResponse) -> exceptions.ServiceError:
code = 'BadErrorResponse'
message = ''
ec = ''
error_detail = ''
argument_name = ''
argument_value = ''
request_id = ''
err_body = b''
try:
Expand All @@ -711,6 +723,9 @@ def _to_service_error_json(response: HttpResponse) -> exceptions.ServiceError:
message = error_fileds.get('Message', '')
code = error_fileds.get('Code', '')
ec = error_fileds.get('EC', '')
error_detail = error_fileds.get('ErrorDetail', '')
argument_name = error_fileds.get('ArgumentName', '')
argument_value = error_fileds.get('ArgumentValue', '')
request_id = error_fileds.get('RequestId', '')
else:
message = f'Expect root node Error, but get {root.keys()}.'
Expand All @@ -734,6 +749,9 @@ def _to_service_error_json(response: HttpResponse) -> exceptions.ServiceError:
message=message,
request_id=request_id or response.headers.get('x-oss-request-id', ''),
ec=ec or response.headers.get('x-oss-ec', ''),
error_detail=error_detail,
argument_name=argument_name,
argument_value=argument_value,
timestamp=timestamp,
request_target=f'{response.request.method} {response.request.url}',
snapshot=content,
Expand Down
9 changes: 9 additions & 0 deletions alibabacloud_oss_v2/aio/_aioclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@ async def _to_service_error(response: AsyncHttpResponse) -> exceptions.ServiceEr
code = 'BadErrorResponse'
message = ''
ec = ''
error_detail = ''
argument_name = ''
argument_value = ''
request_id = ''
err_body = b''
try:
Expand All @@ -368,6 +371,9 @@ async def _to_service_error(response: AsyncHttpResponse) -> exceptions.ServiceEr
message = error_fileds.get('Message', '')
code = error_fileds.get('Code', '')
ec = error_fileds.get('EC', '')
error_detail = error_fileds.get('ErrorDetail', '')
argument_name = error_fileds.get('ArgumentName', '')
argument_value = error_fileds.get('ArgumentValue', '')
request_id = error_fileds.get('RequestId', '')
else:
message = f'Expect root node Error, but get {root.tag}.'
Expand All @@ -391,6 +397,9 @@ async def _to_service_error(response: AsyncHttpResponse) -> exceptions.ServiceEr
message=message,
request_id=request_id or response.headers.get('x-oss-request-id', ''),
ec=ec or response.headers.get('x-oss-ec', ''),
error_detail=error_detail,
argument_name=argument_name,
argument_value=argument_value,
timestamp=timestamp,
request_target=f'{response.request.method} {response.request.url}',
snapshot=content,
Expand Down
6 changes: 6 additions & 0 deletions alibabacloud_oss_v2/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ class ServiceError(BaseError):
Request Id: {request_id}.\n\
Message: {message}.\n\
EC: {ec}.\n\
ErrorDetail: {error_detail}\n\
ArgumentName: {argument_name}\n\
ArgumentValue: {argument_value}\n\
Timestamp: {timestamp}.\n\
Request Endpoint: {request_target}.'

Expand All @@ -119,6 +122,9 @@ def __init__(self, **kwargs):
self.message = kwargs.get("message", None)
self.request_id = kwargs.get("request_id", None)
self.ec = kwargs.get("ec", None)
self.error_detail = kwargs.get("error_detail", None)
self.argument_name = kwargs.get("argument_name", None)
self.argument_value = kwargs.get("argument_value", None)
self.timestamp = kwargs.get("timestamp", None)
self.request_target = kwargs.get("request_target", None)
self.snapshot = kwargs.get("snapshot", None)
Expand Down