Merge branch 'tweaking-wresters' into '2.8.2.1-DEVELOMENT'

merge dicts, not strings

See merge request !1525

apps/cli/utilities/aat_wrest/aat_wrest/metadata_wrester.py

@@ -386,13 +386,12 @@ class WrestWorkflowMetadata:
             cursor.execute(query, {"spl": spl})
             data = cursor.fetchall()
             if data:
-                make_json = json.dumps(
-                    {
+                make_json = {
                         "product_type": str(data[0][0]).lower().replace(" ", "_"),
                         "telescope": data[0][1],
                         "projectCode": data[0][2],
                     }
-                )
+
             else:
                 self.logger.error(
                     f"ERROR: aat-wrest query returned no results!"
@@ -454,7 +453,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,7 +469,7 @@ 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()

apps/cli/utilities/aat_wrest/aat_wrest/wrest.py

@@ -158,12 +158,13 @@ def determine_wrester(connection: MDDBConnector, args: argparse.Namespace):
     elif args.product:
         data = WrestWorkflowMetadata(connection, spl=args.product).wrest_product_info()
     elif args.curator:
-        data = WrestWorkflowMetadata(connection, spl=args.curator).wrest_curator()
+        data_dict = WrestWorkflowMetadata(connection, spl=args.curator).wrest_curator()
+        data = json.dumps(data_dict)
     elif args.curator_products:
         general_data = WrestWorkflowMetadata(connection, spl=args.curator_products).wrest_curator()
         connection2 = MDDBConnector()
         product_data = WrestWorkflowMetadata(connection2, spl=args.curator_products).wrest_curator_products()
-        data = {**general_data, **product_data}
+        data = json.dumps({**general_data, **product_data})
     else:
         data = None
 

services/workflow/workflow/server.py

@@ -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}",