atk-common 1.50.0__py3-none-any.whl → 1.52.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- atk_common/http_response_utils.py +13 -2
- atk_common/mq_utils.py +3 -1
- {atk_common-1.50.0.dist-info → atk_common-1.52.0.dist-info}/METADATA +1 -1
- {atk_common-1.50.0.dist-info → atk_common-1.52.0.dist-info}/RECORD +7 -7
- {atk_common-1.50.0.dist-info → atk_common-1.52.0.dist-info}/WHEEL +0 -0
- {atk_common-1.50.0.dist-info → atk_common-1.52.0.dist-info}/licenses/license.txt +0 -0
- {atk_common-1.50.0.dist-info → atk_common-1.52.0.dist-info}/top_level.txt +0 -0
@@ -6,6 +6,17 @@ from atk_common.error_utils import get_error_entity, resend_error_entity
|
|
6
6
|
from atk_common.http_utils import is_http_status_internal, is_http_status_ok
|
7
7
|
from atk_common.internal_response_utils import is_response_http
|
8
8
|
|
9
|
+
def convert_response_data(data):
|
10
|
+
if isinstance(data, dict):
|
11
|
+
return json.dumps(data)
|
12
|
+
elif isinstance(data, list):
|
13
|
+
return json.dumps(data)
|
14
|
+
elif isinstance(data, str):
|
15
|
+
json_data = json.loads(data)
|
16
|
+
return json.dumps(json_data)
|
17
|
+
else:
|
18
|
+
return data
|
19
|
+
|
9
20
|
# If response['status'] == 0 (OK, http status = 200): create Response and return response['responseMsg']
|
10
21
|
# If http status == 500:
|
11
22
|
# If response['status'] == 1 (HTTP): resend received error entity
|
@@ -14,12 +25,12 @@ from atk_common.internal_response_utils import is_response_http
|
|
14
25
|
def http_response(method, response, container_info):
|
15
26
|
if is_http_status_ok(response['statusCode']):
|
16
27
|
return Response(
|
17
|
-
response=
|
28
|
+
response=convert_response_data(response['responseMsg']),
|
18
29
|
status=HTTPStatus.OK,
|
19
30
|
mimetype=response['contentType'],
|
20
31
|
headers=response['httpHeaders']
|
21
32
|
)
|
22
|
-
|
33
|
+
elif is_http_status_internal(response['statusCode']):
|
23
34
|
if is_response_http(response):
|
24
35
|
return resend_error_entity(response['responseMsg'])
|
25
36
|
return get_error_entity(response['responseMsg'], method, ApiErrorType.INTERNAL, response['statusCode'], container_info)
|
atk_common/mq_utils.py
CHANGED
@@ -9,7 +9,9 @@ def decode_message(body, message):
|
|
9
9
|
content_encoding = message.headers.get('content_encoding')
|
10
10
|
if content_encoding is not None and content_encoding == 'gzip':
|
11
11
|
body = gzip.decompress(body)
|
12
|
-
if message.content_type == '
|
12
|
+
if message.content_type is None or message.content_type == '':
|
13
|
+
return body
|
14
|
+
elif message.content_type == 'application/json':
|
13
15
|
return body
|
14
16
|
elif message.content_type == 'application/octet-stream':
|
15
17
|
return body
|
@@ -6,11 +6,11 @@ atk_common/env_utils.py,sha256=66v-S0vlkJNaun6ay1XcOGRtYJb4Ce4odJsWxuaHsQc,373
|
|
6
6
|
atk_common/error_utils.py,sha256=kO-VQlajD8SO9MBxj8MHZRTK_uBXgPa09hy6pfjqZBY,2622
|
7
7
|
atk_common/file_utils.py,sha256=UDwcRquO9IrqRrlUM0t-_g4R1-FKt8ZqQinSEqXOAk8,112
|
8
8
|
atk_common/hash_utils.py,sha256=S_9o89CdI4lUQbVaqc85TDcqyDNuo30_E3VBaOrZKko,1047
|
9
|
-
atk_common/http_response_utils.py,sha256=
|
9
|
+
atk_common/http_response_utils.py,sha256=xS3d3AkfpNDkvRRGSfdGhSaIR6MM0ZIC5N9ZoJs4cNo,1794
|
10
10
|
atk_common/http_utils.py,sha256=Av6wMa9984zQqXSrU3jndxLQO1xwv9U7YDFvJqZQAuo,664
|
11
11
|
atk_common/internal_response_utils.py,sha256=2X9eLFEy1pO3Aesj1IRXg2yprwNcBDM5_dXaA5vfmMI,694
|
12
12
|
atk_common/log_utils.py,sha256=tw6Ph8oTpxrGYe_BcDTYkgrYmFAb1IxTXTodqctAIiY,504
|
13
|
-
atk_common/mq_utils.py,sha256=
|
13
|
+
atk_common/mq_utils.py,sha256=IDni2Y2AVezsJGTwPY9QPZ95b8RT8osBKHhbYcWbp_U,1131
|
14
14
|
atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
|
15
15
|
atk_common/response_utils.py,sha256=AxlmwkFoDU5XcFOzBQiuZxAQgswihpKXHSo1T0JJw3Q,556
|
16
16
|
atk_common/enums/__init__.py,sha256=AZfflF9B7Wi1nveIxAEiUAKnQ_KQtbofcXUJuZf9cWs,2565
|
@@ -52,7 +52,7 @@ atk_common/enums/speed_control_status_type_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe
|
|
52
52
|
atk_common/enums/speed_control_stop_reason.py,sha256=pvLS6fpDhsCiIDAmiQBsHctxZnq-Dl2BOgJOxQnT5Hc,200
|
53
53
|
atk_common/enums/test_image_type_enum.py,sha256=HUjxJorehnzRXMNF2uHk2DrAJ3Y_ajQvp0jW-mtlOhU,140
|
54
54
|
atk_common/enums/violation_type_enum.py,sha256=01qTHOj-O8bOc-nwIHVnxLosm4cusD_YuqXM3ZsiRRk,86
|
55
|
-
atk_common-1.
|
55
|
+
atk_common-1.52.0.dist-info/licenses/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
|
56
56
|
atk_package/__init__.py,sha256=NcsmwFadivgIeWV0-5ACZxqmfo4EzTkJX0r4N6DFAdg,820
|
57
57
|
atk_package/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
|
58
58
|
atk_package/env_utils.py,sha256=bXOrxM3fZUslqfmZt75iphbEJHbG4riJa8XOVzPwIII,313
|
@@ -65,7 +65,7 @@ atk_package/enums/__init__.py,sha256=EtUr_--MQj1Rc_R0sF_ELXIThmhpfmhDWq3YaK9oQMk
|
|
65
65
|
atk_package/enums/command_status_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
|
66
66
|
atk_package/enums/speed_control_status_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
|
67
67
|
shared_python_atk_enforcement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
68
|
-
atk_common-1.
|
69
|
-
atk_common-1.
|
70
|
-
atk_common-1.
|
71
|
-
atk_common-1.
|
68
|
+
atk_common-1.52.0.dist-info/METADATA,sha256=mnPGn22w9mEzdPv3y0Lc7QfdaCki8RQwfaGupLZhzb0,1464
|
69
|
+
atk_common-1.52.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
|
70
|
+
atk_common-1.52.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
|
71
|
+
atk_common-1.52.0.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|