Skip to content

Fix db error reporting #93

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix db error reporting #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82f6902
First attempt at fixing DB error propagation
peterwilton-ttam Jan 5, 2021
d967eab
Revert "First attempt at fixing DB error propagation"
peterwilton-ttam Jan 5, 2021
456540d
Second version of fixing DB response
peterwilton-ttam Jan 5, 2021
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
12 changes: 7 additions & 5 deletions services/metadata_service/api/artifact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ async def get_artifacts_by_task(self, request):
)

filtered_body = ArtificatsApi._filter_artifacts_by_attempt_id(
artifacts.body)
artifacts)
return web.Response(
status=artifacts.response_code, body=json.dumps(filtered_body)
)
Expand Down Expand Up @@ -181,7 +181,7 @@ async def get_artifacts_by_step(self, request):
)

filtered_body = ArtificatsApi._filter_artifacts_by_attempt_id(
artifacts.body)
artifacts)
return web.Response(
status=artifacts.response_code, body=json.dumps(filtered_body)
)
Expand Down Expand Up @@ -216,7 +216,7 @@ async def get_artifacts_by_run(self, request):

artifacts = await self._async_table.get_artifacts_in_runs(flow_name, run_number)
filtered_body = ArtificatsApi._filter_artifacts_by_attempt_id(
artifacts.body)
artifacts)
return web.Response(
status=artifacts.response_code, body=json.dumps(filtered_body)
)
Expand Down Expand Up @@ -352,9 +352,11 @@ def _get_latest_attempt_id(artifacts):

@staticmethod
def _filter_artifacts_by_attempt_id(artifacts):
attempt_id = ArtificatsApi._get_latest_attempt_id(artifacts)
if artifacts.response_code != 200:
return artifacts.body
attempt_id = ArtificatsApi._get_latest_attempt_id(artifacts.body)
result = []
for artifact in artifacts:
for artifact in artifacts.body:
if artifact['attempt_id'] == attempt_id:
result.append(artifact)

Expand Down