Skip to content
Snippets Groups Projects
Commit 82c0257b authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

you can't merge dictionaries if they're no longer dictionaries - sigh

parent 2113cc48
No related branches found
No related tags found
3 merge requests!1605Merge 2.8.2.3 work to main,!1525merge dicts, not strings,!1524you can't merge dictionaries if they're no longer dictionaries - sigh
Pipeline #12830 passed
......@@ -454,7 +454,7 @@ class WrestWorkflowMetadata:
if data:
# This should have all the ancillary and science product names
# It returns from the query as a list of tuples, so it must be flattened
make_json = json.dumps({"file_list": list(sum(data, ()))})
make_json = {"file_list": list(sum(data, ()))}
else:
self.logger.error(f"ERROR: Failed to fetch products from product ID {product_group_id}")
else:
......@@ -470,8 +470,8 @@ class WrestWorkflowMetadata:
cursor.execute(input_group_query, {"pg_id": product_group_id})
input_data = cursor.fetchall()
if input_data:
input_info = json.dumps({"input_group_locator": input_data[0][0]})
input_info = {"input_group_locator": input_data[0][0]}
make_json = {**make_json, **input_info}
finally:
self.conn.close()
return make_json
return json.dumps(make_json)
......@@ -874,6 +874,7 @@ def main(global_config, **settings):
factory=lookup_request,
)
# route for retrieving a list of requests viable for clean up
config.add_route(
"list_stale_requests",
"/workflows/requests/stale/{days}",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment