Updated entity_message to be collected per input

Author: Ryan Cali

pydra/engine/audit.py

@@ -182,19 +182,24 @@ def audit_task(self, task):
         else:
             command = None
 
-        path_hash_dict = {}
-
         attr_list = attr_fields(task.inputs)
         for attrs in attr_list:
             if attrs.type in [File, Directory]:
                 input_name = attrs.name
                 input_path = os.path.abspath(getattr(task.inputs, input_name))
                 file_hash = hash_file(input_path)
-                path_hash_dict[input_path] = file_hash
+                entity_id = f"uid:{gen_uuid()}"
+                entity_message = {
+                    "@id": entity_id, 
+                    "Label": print(entity_label),
+                    "AtLocation": input_path,
+                    "GeneratedBy": "test",  
+                    "@type": "input",
+                    "digest": file_hash 
+                }
+                self.audit_message(entity_message, AuditFlag.PROV)
+
 
-        # get the hash for the output
-        input_paths = list(path_hash_dict.keys())
-        input_paths_hash = list(path_hash_dict.values())
 
         if command is not None:
             cmd_name = command.split()[0]
@@ -222,15 +227,9 @@ def audit_task(self, task):
             "StartedAtTime": now(),
             "AssociatedWith": version_cmd,
         }
-        entity_id = f"uid:{gen_uuid()}"
-        entity_message = {
-            "@id": entity_id,
-            "Label": print(entity_label),
-            "AtLocation": input_paths,  #
-            "GeneratedBy": "test",
-            "@type": "input",
-            "digest": input_paths_hash,
-        }
+        
+
 
         self.audit_message(start_message, AuditFlag.PROV)
-        self.audit_message(entity_message, AuditFlag.PROV)
+    
+

pydra/engine/tests/test_task.py

@@ -1264,7 +1264,7 @@ def testfunc(a: int, b: float = 0.1) -> ty.NamedTuple("Output", [("out", float)]
     from glob import glob
 
     assert len(glob(str(tmpdir / funky.checksum / "proc*.log"))) == 1
-    assert len(glob(str(message_path / "*.jsonld"))) == 8
+    assert len(glob(str(message_path / "*.jsonld"))) == 7
 
     # commented out to speed up testing
     collect_messages(tmpdir / funky.checksum, message_path, ld_op="compact")