SIENTIAPDE-1102

Refactor OPC activity to enhance data writing and confidence processing; update tests accordingly

laborious/workflows/sub_workflows/format_and_export_prediction.py

@@ -68,20 +68,8 @@ class FormatAndExportPrediction():
                 start_to_close_timeout=timedelta(seconds=60)
             )
 
-        # write to postgres
-        postgres_holder = workflow.execute_activity_method(
-            Activities.export_data_to_postgres,
-            {
-                'schema': input_data['schema'],
-                'table_name': input_data['table_name'],
-                'data': prediction
-            },
-            retry_policy=retry_policy,
-            start_to_close_timeout=timedelta(seconds=60)
-        )
-
         # write to opc
-        opc_holder = workflow.execute_activity_method(
+        prediction = await workflow.execute_activity_method(
             Activities.write_opc_data,
             {
                 'opc_output_config': input_data['opc_output_config'],
@@ -91,5 +79,14 @@ class FormatAndExportPrediction():
             start_to_close_timeout=timedelta(seconds=60)
         )
 
-        await postgres_holder
-        await opc_holder
+        # write to postgres
+        await workflow.execute_activity_method(
+            Activities.export_data_to_postgres,
+            {
+                'schema': input_data['schema'],
+                'table_name': input_data['table_name'],
+                'data': prediction,
+            },
+            retry_policy=retry_policy,
+            start_to_close_timeout=timedelta(seconds=60)
+        )