Skip to content

[ATLAS-4658] Simply if clauses in AtlasClient.call_api #158

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 8 commits into from
Closed

[ATLAS-4658] Simply if clauses in AtlasClient.call_api #158

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90a77f5
Simply if clauses in AtlasClient.call_api
dolfinus Jan 17, 2022
3a366be
Update base_client.py
dolfinus Aug 17, 2022
cdebe1f
Update base_client.py
dolfinus Aug 17, 2022
4293522
Update base_client.py
dolfinus Aug 17, 2022
64ebbbf
Merge branch 'master' into improve_call_api
dolfinus Mar 25, 2023
80beee5
[ATLAS-4658] Apply PR changes
dolfinus Jun 5, 2023
7c798a2
Merge branch 'master' into improve_call_api
dolfinus Jun 7, 2023
e6a63c2
Update base_client.py
dolfinus Jun 7, 2023
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
11 changes: 3 additions & 8 deletions intg/src/main/python/apache_atlas/client/base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ def call_api(self, api, response_type=None, query_params=None, request_obj=None)
log.debug("Accept : %s", api.produces)

response = self.session.request(api.method.value, path, **params)

if response is None:
return None

log.debug("HTTP Status: %s", response.status_code)

if response.status_code == api.expected_status:
Expand All @@ -84,9 +80,8 @@ def call_api(self, api, response_type=None, query_params=None, request_obj=None)
if response.content is None:
return None

log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response)
try:
log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response)

log.debug(response.json())

if response_type == str:
Expand All @@ -95,9 +90,9 @@ def call_api(self, api, response_type=None, query_params=None, request_obj=None)
return type_coerce(response.json(), response_type)
except Exception as e:
log.exception("Exception occurred while parsing response")

raise AtlasServiceException(api, response) from e
elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE:

if response.status_code == HTTPStatus.SERVICE_UNAVAILABLE:
log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE)

raise AtlasServiceException(api, response)