@platforma-open/milaboratories.mixcr-shm-trees.workflow 3.3.0 → 3.3.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @platforma-open/milaboratories.mixcr-shm-trees.workflow@3.3.0 build /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow
+> @platforma-open/milaboratories.mixcr-shm-trees.workflow@3.3.1 build /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow
 > rm -rf dist && pl-tengo check && pl-tengo build
 
 Processing "src/export-settings.lib.tengo"...

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @platforma-open/milaboratories.mixcr-shm-trees.workflow
 
+## 3.3.1
+
+### Patch Changes
+
+- d8d8f49: Additional ensure uniqueness step in trees reconstruction workflow
+
 ## 3.3.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-open/milaboratories.mixcr-shm-trees.workflow",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "type": "module",
   "description": "Tengo-based template",
   "//": {

package/src/process.tpl.tengo

@@ -122,6 +122,7 @@ self.body(func(inputs) {
 		{
 			shmTreeTableArgs: shmTreeTableOptions.cmdArgs,
 			shmTreeNodesTableOptions: shmTreeNodesTableOptions,
+			shmTreeNodesWithClonesTableOptions: shmTreeNodesWithClonesTableOptions,
 			shmTreeNodesWithClonesTableArgs: shmTreeNodesWithClonesTableOptions.cmdArgs,
 			globalParams: maps.merge(
 				inputs.params,

package/src/reconstruct-shm-trees.tpl.tengo

@@ -194,37 +194,40 @@ self.body(func(inputs) {
 
     // aggregating by-nodes output to make it uniquely addressable by it's native key
 
-    aggregations := []
-	for col in inputs.shmTreeNodesTableOptions.pfconvParams.columns {
-		aggregations = append(aggregations, {
-			type: "first",
-			src: col.column,
-			dst: col.column
-		})
-	}
-
-    keyColumns := []
-    for axis in inputs.shmTreeNodesTableOptions.pfconvParams.axes {
-		keyColumns = append(keyColumns, axis.column)
-	}
-
-	aggregationWorkflow := { steps: [ {
-			type: "aggregate",
-			groupBy: keyColumns,
-			aggregations: aggregations
-		} ] }
-
-	aggregateCmd := exec.builder().
-        printErrStreamToStdout().
-        software(paggregateSw).
-        arg("--workflow").arg("wf.json").
-		writeFile("wf.json", json.encode(aggregationWorkflow)).
-		arg("input.tsv").addFile("input.tsv", shmTreeNodesTsvRaw).
-		arg("output.tsv").saveFile("output.tsv").
-		run()
+    ensureUniqueness := func(inputTsv, pfConvParams) {
+        aggregations := []
+        for col in pfConvParams.columns {
+            aggregations = append(aggregations, {
+                type: "first",
+                src: col.column,
+                dst: col.column
+            })
+        }
+
+        keyColumns := []
+        for axis in pfConvParams.axes {
+            keyColumns = append(keyColumns, axis.column)
+        }
 
-	shmTreeNodesTsv := aggregateCmd.getFile("output.tsv")
+        aggregationWorkflow := { steps: [ {
+                type: "aggregate",
+                groupBy: keyColumns,
+                aggregations: aggregations
+            } ] }
+
+        aggregateCmd := exec.builder().
+            printErrStreamToStdout().
+            software(paggregateSw).
+            arg("--workflow").arg("wf.json").
+            writeFile("wf.json", json.encode(aggregationWorkflow)).
+            arg("input.tsv").addFile("input.tsv", inputTsv).
+            arg("output.tsv").saveFile("output.tsv").
+            run()
+
+        return aggregateCmd.getFile("output.tsv")
+    }
 
+	shmTreeNodesTsv := ensureUniqueness(shmTreeNodesTsvRaw, inputs.shmTreeNodesTableOptions.pfconvParams)
 
     // export nodes with clones. For each node could be several clones
     shmTreeNodesWithClonesExportsCmdBuilder := exec.builder().
@@ -248,7 +251,9 @@ self.body(func(inputs) {
         saveFile("output.tsv")
 
     shmTreeNodesWithClonesExports := shmTreeNodesWithClonesExportsCmdBuilder.run()
-    shmTreeNodesWithClonesTsv := shmTreeNodesWithClonesExports.getFile("output.tsv")
+    shmTreeNodesWithClonesTsvRaw := shmTreeNodesWithClonesExports.getFile("output.tsv")
+
+    shmTreeNodesWithClonesTsv := ensureUniqueness(shmTreeNodesWithClonesTsvRaw, inputs.shmTreeNodesWithClonesTableOptions.pfconvParams)
 
     return {
         trees: shmTreeTsv,