Merge branch 'main' into task/des-2506-changes-to-simulation

designsafe/libs/fedora/fedora_operations.py

@@ -392,6 +392,13 @@ def amend_project_fedora(project_id, version=None):
     return res
 
 
+def has_associations(child, parents):
+    for parent in parents:
+        if parent.uuid not in child.associationIds:
+            return False
+    return True
+
+
 def walk_experimental(project_id, version=None):
     """
     Walk an experimental project and reconstruct parent/child relationships

designsafe/libs/fedora/fr_operations.py

@@ -11,7 +11,7 @@
 from requests.packages.urllib3.util.retry import Retry
 from designsafe.apps.data.models.elasticsearch import IndexedPublication
 from django.contrib.auth import get_user_model
-from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest
+from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest, has_associations
 import logging
 logger = logging.getLogger(__name__)
 

designsafe/libs/fedora/hyb_sim_operations.py

@@ -12,10 +12,11 @@
 from designsafe.apps.data.models.elasticsearch import IndexedPublication
 from django.contrib.auth import get_user_model
 from designsafe.apps.api.publications.operations import _get_user_by_username
-from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest
+from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest, has_associations
 import logging
 logger = logging.getLogger(__name__)
 
+
 def walk_hyb_sim(project_id, version=None):
     """
     Walk an experimental project and reconstruct parent/child relationships
@@ -127,7 +128,7 @@ def walk_hyb_sim(project_id, version=None):
 
 
             coordinator_list = filter(
-                lambda coordinator: global_model.uuid in coordinator.value.globalModels,
+                lambda coordinator: global_model.uuid in coordinator.value.globalModels and has_associations(coordinator, [global_model, hyb_sim]),
                 getattr(doc, 'coordinators', []))
             for coordinator in coordinator_list:
                 # Do stuff with coordinator.
@@ -145,7 +146,7 @@ def walk_hyb_sim(project_id, version=None):
                 }
 
                 coordinator_output_list = filter(
-                    lambda coordinator_output: coordinator.uuid in coordinator_output.value.coordinators,
+                    lambda coordinator_output: coordinator.uuid in coordinator_output.value.coordinators and has_associations(coordinator_output, [hyb_sim, global_model, coordinator]),
                     getattr(doc, 'coordinator_outputs', []))
                 for coordinator_output in coordinator_output_list:
                     # Do stuff with coordinator output.
@@ -166,7 +167,7 @@ def walk_hyb_sim(project_id, version=None):
 
 
                 sim_sub_list = filter(
-                    lambda sim_sub: coordinator.uuid in sim_sub.value.coordinators,
+                    lambda sim_sub: coordinator.uuid in sim_sub.value.coordinators and has_associations(sim_sub, [hyb_sim, global_model, coordinator]),
                     getattr(doc, 'sim_substructures', []))
                 for sim_sub in sim_sub_list:
                     # Do stuff with sim substructure.
@@ -185,7 +186,7 @@ def walk_hyb_sim(project_id, version=None):
                     }
 
                     sim_out_list = filter(
-                        lambda sim_out: sim_sub.uuid in sim_out.value.simSubstructures,
+                        lambda sim_out: sim_sub.uuid in sim_out.value.simSubstructures and has_associations(sim_out, [hyb_sim, global_model]),
                         getattr(doc, 'sim_outputs', []))
                     for sim_out in sim_out_list:
                         # Do stuff with sim output.
@@ -205,7 +206,7 @@ def walk_hyb_sim(project_id, version=None):
                     relation_map.append(sim_sub_map)
 
                 exp_sub_list = filter(
-                    lambda exp_sub: coordinator.uuid in exp_sub.value.coordinators,
+                    lambda exp_sub: coordinator.uuid in exp_sub.value.coordinators and has_associations(exp_sub, [hyb_sim, global_model]),
                     getattr(doc, 'exp_substructures', []))
                 for exp_sub in exp_sub_list:
                     # Do stuff with experimental substructure.
@@ -224,7 +225,7 @@ def walk_hyb_sim(project_id, version=None):
                     }
 
                     exp_out_list = filter(
-                        lambda exp_out: exp_sub.uuid in exp_out.value.expSubstructures,
+                        lambda exp_out: exp_sub.uuid in exp_out.value.expSubstructures and has_associations(exp_out, [hyb_sim, global_model]),
                         getattr(doc, 'exp_outputs', []))
                     for exp_out in exp_out_list:
                         # Do stuff with experimental output.

designsafe/libs/fedora/sim_operations.py

@@ -12,7 +12,7 @@
 from designsafe.apps.data.models.elasticsearch import IndexedPublication
 from django.contrib.auth import get_user_model
 from designsafe.apps.api.publications.operations import _get_user_by_username
-from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest, generate_report_experimental
+from designsafe.libs.fedora.fedora_operations import format_metadata_for_fedora, fedora_post, fedora_update, create_fc_version, upload_manifest, generate_manifest, generate_report_experimental, has_associations
 import logging
 logger = logging.getLogger(__name__)
 
@@ -113,7 +113,7 @@ def walk_sim(project_id, version=None):
             }
 
             inputs = filter(
-            lambda input: model.uuid in input.value.modelConfigs,
+            lambda input: model.uuid in input.value.modelConfigs and has_associations(input, [model, sim]),
             getattr(doc, 'inputs', [])
             )
 
@@ -133,7 +133,7 @@ def walk_sim(project_id, version=None):
                 }
 
                 outputs = filter(
-                lambda output: input.uuid in output.value.simInputs,
+                lambda output: input.uuid in output.value.simInputs and has_associations(output, [input, model, sim]),
                 getattr(doc, 'outputs', [])
                 )