Skip to content

Commit 150fca9

Browse files
committed
Fixed exception message
1 parent e93a144 commit 150fca9

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

src/python_ms_core/core/queue/models/queue_message.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import json
22
from datetime import datetime
33
from typing import Union, List
4-
from dataclasses import dataclass, asdict
5-
from typing import Optional
4+
from dataclasses import dataclass
5+
from ...resource_errors import ExceptionHandler
66

77

88
class Validations:
@@ -42,6 +42,7 @@ def send(self):
4242
def get_items(self):
4343
return self.queue
4444

45+
@ExceptionHandler.decorated
4546
def data_from(self):
4647
data = self
4748
if isinstance(data, str):
@@ -56,7 +57,8 @@ def data_from(self):
5657
return QueueMessage(**kwargs)
5758
except Exception as e:
5859
error = str(e).replace('QueueMessage', 'Invalid parameter,')
59-
raise TypeError(error)
60+
error = error.replace('__init__()', 'QueueMessage')
61+
raise TypeError(f'{error} \nStatus code: 400')
6062

6163
def to_dict(self):
6264
if isinstance(self, QueueMessage):

src/python_ms_core/core/resource_errors/__init__.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import azure
2+
import operator
23
from functools import wraps
34
from .errors import BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, ConflictError, \
45
UnProcessableError, TooManyRequestError, ServiceError, TimeOutError
@@ -8,15 +9,19 @@ def parse_error(base_message, error):
89
message = error
910
status_code = 0
1011
description = ''
11-
complete_message = error.split('\n')
12-
if len(complete_message) > 0:
12+
if error.__class__ == TypeError:
13+
error = str(error)
14+
15+
complete_message = error.split('\n') if operator.contains(str(error), '\n') else [error]
16+
17+
if complete_message and len(complete_message) > 0:
1318
message = complete_message[0]
14-
if len(complete_message) > 1:
19+
if complete_message and len(complete_message) > 1:
1520
status_code_string = complete_message[1]
1621
status_code_string = status_code_string.split('Status code: ')
1722
if len(status_code_string) == 2:
1823
status_code = int(status_code_string[1])
19-
if len(complete_message) > 2:
24+
if complete_message and len(complete_message) > 2:
2025
description_string = complete_message[2]
2126
description_string = description_string.split('Description: ')
2227
if len(description_string) == 2:

0 commit comments

Comments
 (0)