@platforma-open/milaboratories.mixcr-shm-trees.workflow 3.5.1 → 3.6.1

package/.turbo/turbo-build.log

@@ -1,5 +1,6 @@
+ WARN  Issue while reading "/home/runner/work/mixcr-shm-trees/mixcr-shm-trees/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.mixcr-shm-trees.workflow@3.5.1 build /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow
+> @platforma-open/milaboratories.mixcr-shm-trees.workflow@3.6.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"...
@@ -7,6 +8,7 @@ Processing "src/main.tpl.tengo"...
 Processing "src/prepare-donor-column.lib.tengo"...
 Processing "src/process.tpl.tengo"...
 Processing "src/reconstruct-shm-trees.tpl.tengo"...
+Processing "src/request-library.tpl.tengo"...
 Processing "src/soi-export.lib.tengo"...
 Processing "src/soi.tpl.tengo"...
 Processing "src/tablesAggregation.lib.tengo"...
@@ -17,8 +19,9 @@ No syntax errors found.
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/lib/soi-export.lib.tengo
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/lib/tablesAggregation.lib.tengo
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/tpl/reconstruct-shm-trees.plj.gz
+  info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/tpl/request-library.plj.gz
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/tpl/soi.plj.gz
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/tpl/process.plj.gz
   info:   - writing /home/runner/work/mixcr-shm-trees/mixcr-shm-trees/workflow/dist/tengo/tpl/main.plj.gz
-  info: 
+  info: Template Pack build done.
   info: Template Pack build done.

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @platforma-open/milaboratories.mixcr-shm-trees.workflow
 
+## 3.6.1
+
+### Patch Changes
+
+- 9e53ea9: Fix for await criteria
+
+## 3.6.0
+
+### Minor Changes
+
+- b8af059: SDK Upgrade
+- b8af059: Custom library support
+
 ## 3.5.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,5 +1,6 @@
 module.exports = { Templates: {
   'reconstruct-shm-trees': { type: 'from-file', path: require.resolve('./tengo/tpl/reconstruct-shm-trees.plj.gz') },
+  'request-library': { type: 'from-file', path: require.resolve('./tengo/tpl/request-library.plj.gz') },
   'soi': { type: 'from-file', path: require.resolve('./tengo/tpl/soi.plj.gz') },
   'process': { type: 'from-file', path: require.resolve('./tengo/tpl/process.plj.gz') },
   'main': { type: 'from-file', path: require.resolve('./tengo/tpl/main.plj.gz') }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 declare type TemplateFromFile = { readonly type: "from-file"; readonly path: string; };
-declare type TplName = "reconstruct-shm-trees" | "soi" | "process" | "main";
+declare type TplName = "reconstruct-shm-trees" | "request-library" | "soi" | "process" | "main";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -1,6 +1,7 @@
 import { resolve } from 'node:path';
 export const Templates = {
   'reconstruct-shm-trees': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/reconstruct-shm-trees.plj.gz') },
+  'request-library': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/request-library.plj.gz') },
   'soi': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/soi.plj.gz') },
   'process': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/process.plj.gz') },
   'main': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/main.plj.gz') }

package/package.json

@@ -1,23 +1,21 @@
 {
   "name": "@platforma-open/milaboratories.mixcr-shm-trees.workflow",
-  "version": "3.5.1",
+  "version": "3.6.1",
   "type": "module",
   "description": "Tengo-based template",
   "//": {
     "build": "node ./scripts/build-static.mjs src/pfconv_params.json src/pfconv_params.lib.tengo && rm -rf dist && pl-tengo check && pl-tengo build && ./create_tags.sh"
   },
   "dependencies": {
-    "@platforma-sdk/workflow-tengo": "^3.1.0"
+    "@platforma-sdk/workflow-tengo": "^4.2.0"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "^2.0.2",
-    "@milaboratories/software-pframes-conv": "^2.1.20",
-    "@platforma-open/milaboratories.software-small-binaries": "^1.15.19",
+    "@platforma-sdk/tengo-builder": "^2.1.3",
     "@platforma-open/milaboratories.software-mixcr": "4.7.0-139-develop",
     "@platforma-open/milaboratories.software-mitool": "2.3.1-5-main",
     "@platforma-open/milaboratories.software-ptransform": "^1.3.1",
-    "@platforma-sdk/test": "^1.25.0",
-    "vitest": "^2.1.8",
+    "@platforma-sdk/test": "^1.30.4",
+    "vitest": "~2.1.8",
     "typescript": "~5.6.3"
   },
   "scripts": {

package/src/main.tpl.tengo

@@ -6,6 +6,7 @@ ll := import("@platforma-sdk/workflow-tengo:ll")
 pframes := import("@platforma-sdk/workflow-tengo:pframes")
 
 processTpl := assets.importTemplate(":process")
+requestLibraryTpl := assets.importTemplate(":request-library")
 
 wf.body(func(args) {
 	if is_undefined(args.donorColumn) {
@@ -19,13 +20,15 @@ wf.body(func(args) {
 	// we could not use array as request for waiting (see below), so we store datasets in a dictionary
 	datasets := {}
 	for datasetRef in args.datasetColumns {
-		if is_undefined(datasetRef) {
-			ll.panic("Dataset is undefined")
-		}
-		// it's blockId of MiXCR, we suppose that it procuce only one clns column
+		// we assume that mixcr block produces exactly one clns column
 		datasets[datasetRef.blockId] = wf.resolve(datasetRef)
 	}
 
+	library := render.createEphemeral(requestLibraryTpl, {
+		datasets: datasets,
+		ctx: wf.getParentBCtx()
+	}).output("library")
+
 	donorColumn := wf.resolve(args.donorColumn)
 
 	// The problem is that refs for data is not resolved.
@@ -34,6 +37,7 @@ wf.body(func(args) {
 	results := render.createEphemeral(processTpl, {
 		datasets: datasets,
 		donorColumn: donorColumn,
+		library: library,
 		params: {
 			downsampling: args.downsampling,
 			sequencesOfInterest: args.sequencesOfInterest

package/src/process.tpl.tengo

@@ -6,6 +6,7 @@ maps := import("@platforma-sdk/workflow-tengo:maps")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
 xsv := import("@platforma-sdk/workflow-tengo:pframes.xsv")
+smart := import("@platforma-sdk/workflow-tengo:smart")
 text := import("text")
 json := import("json")
 exportSettings := import(":export-settings")
@@ -20,6 +21,8 @@ self.awaitState("datasets", { wildcard: "*" }, "AllInputsSet")
 self.awaitState("datasets", { wildcard: "*" }, "data", "InputsLocked")
 // but we need spec already
 self.awaitState("datasets", { wildcard: "*" }, "spec", "ResourceReady")
+self.awaitState("library", "spec", "ResourceReady")
+self.awaitState("library", "data", "AllInputsSet") // change to InputsLocked after fix
 self.awaitState("donorColumn", "ResourceReady")
 self.awaitState("params", "ResourceReady")
 
@@ -36,6 +39,8 @@ self.body(func(inputs) {
 		cellsAssembled: false
 	}
 
+	library := inputs.library
+
 	// clonotypingBlockId -> "bulk" | "sc"
 	datasetTypes := {}
 
@@ -78,6 +83,8 @@ self.body(func(inputs) {
 	shmTreeNodesWithClonesTableOptions := exportSettings.shmTreeNodesWithClonesTableOptions(dataDescription, inputs.donorColumn)
 	shmTreeNodesUniqueIsotypeTableOptions := exportSettings.shmTreeNodesUniqueIsotypeTableOptions(dataDescription)
 
+	libraryFormat := library.spec.annotations["pl7.app/vdj/libraryFormat"]
+
 	// TODO that call is too low level. Should be replaced with something that works with pColumns, not data only
 	mixcrResults := llPFrames.aggregate(
 		// files to iterate through
@@ -131,9 +138,13 @@ self.body(func(inputs) {
 			shmTreeNodesWithClonesTableOptions: shmTreeNodesWithClonesTableOptions,
 			shmTreeNodesWithClonesTableArgs: shmTreeNodesWithClonesTableOptions.cmdArgs,
 			shmTreeNodesUniqueIsotypeTableOptions: shmTreeNodesUniqueIsotypeTableOptions,
+			library: is_undefined(library) ? smart.createNullResource() : library.data,
 			globalParams: maps.merge(
 				inputs.params,
-				{ datasetTypes: datasetTypes }
+				{
+					datasetTypes: datasetTypes,
+					libraryFormat: libraryFormat
+				}
 			)
 		}
 	)
@@ -143,7 +154,7 @@ self.body(func(inputs) {
 		additionalAxesSpec: dataGroupedByDonorId.spec["axesSpec"][:1]
 	}
 
-	ll.print("__THE_LOG__ " + string(json.encode(additionalArgsForImportTsv)))
+	// ll.print("__THE_LOG__ " + string(json.encode(additionalArgsForImportTsv)))
 
 	trees := xsv.importFileMap(
         mixcrResults.output("trees"),

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

@@ -33,19 +33,28 @@ self.body(func(inputs) {
     globalParams := inputs.globalParams
     datasetTypes := globalParams.datasetTypes
     downsampling := globalParams.downsampling
-
-    // ll.print("__THE_LOG__ " + json.encode(datasetTypes))
-    // ll.print("__THE_LOG__ " + json.encode(downsampling))
+    library := inputs.library
+    libraryFormat := globalParams.libraryFormat
 
     ll.assert(!is_undefined(datasetTypes), "datasetTypes undefined")
 
-    seed := times.time_string(times.now())
+    addLibraryFile := func(cmdBuilder) {
+        if !is_undefined(library) {
+            if libraryFormat == "repseqio.json.gz" {
+                cmdBuilder.addFile("library.json.gz", library)
+            } else {
+                cmdBuilder.addFile("library.json", library)
+            }
+        }
+    }
+
+    // seed := times.time_string(times.now())
 
     allelesCmdBuilder := exec.builder().
         printErrStreamToStdout().
         secret("MI_LICENSE", "MI_LICENSE").
         env("MI_PROGRESS_PREFIX", progressPrefix).
-        env("SEED", seed).
+        // env("SEED", seed).
         software(mixcrSw).
         arg("findAlleles").
         arg("--report").arg("report.txt").
@@ -55,6 +64,8 @@ self.body(func(inputs) {
         // template specifies where result files will be written
         arg("--output-template").arg("alleles/{file_name}.clns")
 
+    addLibraryFile(allelesCmdBuilder)
+
     if !is_undefined(globalParams.seed) {
         allelesCmdBuilder.env("SEED", globalParams.seed)
     }
@@ -104,11 +115,9 @@ self.body(func(inputs) {
             ll.panic("Unknown downsampling type: " + downsampling.type)
         }
 
-        // ll.print("__THE_LOG__ " + downsamplingParam)
-
         for input in toProcess {
             if datasetTypes[input.clonotypingBlockId] == "bulk" {
-                downsamplingCmd := exec.builder().
+                downsamplingCmdBuilder := exec.builder().
                     printErrStreamToStdout().
                     secret("MI_LICENSE", "MI_LICENSE").
                     env("MI_PROGRESS_PREFIX", progressPrefix).
@@ -118,8 +127,9 @@ self.body(func(inputs) {
                     arg(downsamplingParam).
                     arg("clones.clns").
                     addFile("clones.clns", input.alleles).
-                    saveFile("clones.downsampled.clns").
-                    run()
+                    saveFile("clones.downsampled.clns")
+                addLibraryFile(downsamplingCmdBuilder)
+                downsamplingCmd := downsamplingCmdBuilder.run()
                 input.alleles = downsamplingCmd.getFile("clones.downsampled.clns")
             }
         }
@@ -129,7 +139,6 @@ self.body(func(inputs) {
         printErrStreamToStdout().
         secret("MI_LICENSE", "MI_LICENSE").
         env("MI_PROGRESS_PREFIX", progressPrefix).
-        env("SEED", seed).
         software(mixcrSw).
         arg("findShmTrees").
         arg("--report").arg("report.txt").
@@ -141,6 +150,8 @@ self.body(func(inputs) {
         shmTreesCmdBuilder.env("SEED", globalParams.seed)
     }
 
+    addLibraryFile(shmTreesCmdBuilder)
+
     for input in toProcess {
         shmTreesCmdBuilder.
             addFile(input.fileName, input.alleles).
@@ -151,15 +162,18 @@ self.body(func(inputs) {
 
     shmTrees := shmTreesCmdBuilder.run()
     outputShmt := shmTrees.getFile("output.shmt")
-    
+
     // export trees without nodes
     shmTreeExportsCmdBuilder := exec.builder().
         printErrStreamToStdout().
+        dontSaveStdoutOrStderr().
         inLightQueue().
         secret("MI_LICENSE", "MI_LICENSE").
         software(mixcrSw).
         arg("exportShmTrees")
 
+    addLibraryFile(shmTreeExportsCmdBuilder)
+
     for arg in inputs.shmTreeTableArgs {
         shmTreeExportsCmdBuilder = shmTreeExportsCmdBuilder.arg(arg)
     }
@@ -178,11 +192,14 @@ self.body(func(inputs) {
     // export tree nodes with data uniq for the node
     shmTreeNodesExportsCmdBuilder := exec.builder().
         printErrStreamToStdout().
+        dontSaveStdoutOrStderr().
         inLightQueue().
         secret("MI_LICENSE", "MI_LICENSE").
         software(mixcrSw).
         arg("exportShmTreesWithNodes")
 
+    addLibraryFile(shmTreeNodesExportsCmdBuilder)
+
     for arg in inputs.shmTreeNodesTableOptions.cmdArgs {
         shmTreeNodesExportsCmdBuilder = shmTreeNodesExportsCmdBuilder.arg(arg)
     }
@@ -201,6 +218,7 @@ self.body(func(inputs) {
     // export nodes with clones. For each node could be several clones
     shmTreeNodesWithClonesExportsCmdBuilder := exec.builder().
         printErrStreamToStdout().
+        dontSaveStdoutOrStderr().
         inLightQueue().
         secret("MI_LICENSE", "MI_LICENSE").
         env("MI_PROGRESS_PREFIX", progressPrefix).
@@ -209,6 +227,8 @@ self.body(func(inputs) {
         // don't export nodes that don't have clones
         arg("--only-observed")
 
+    addLibraryFile(shmTreeNodesWithClonesExportsCmdBuilder)
+
     for arg in inputs.shmTreeNodesWithClonesTableArgs {
         shmTreeNodesWithClonesExportsCmdBuilder = shmTreeNodesWithClonesExportsCmdBuilder.arg(arg)
     }

package/src/request-library.tpl.tengo

@@ -0,0 +1,42 @@
+smart := import("@platforma-sdk/workflow-tengo:smart")
+bquery := import("@platforma-sdk/workflow-tengo:workflow.bquery")
+ll := import("@platforma-sdk/workflow-tengo:ll")
+self := import("@platforma-sdk/workflow-tengo:tpl")
+
+self.awaitState("datasets", { wildcard: "*" }, "spec", "ResourceReady")
+self.awaitState("datasets", { wildcard: "*" }, "ref", "ResourceReady")
+
+self.body(func(args) {
+	datasets := args.datasets
+	ctx := args.ctx
+
+	// undefined - not initialized
+	// "" - no custom library, built-in library will be used
+	// "...." - custom library id, to be requested from the context
+	libraryId := undefined
+
+	for _, dataset in datasets {
+		dsLibraryId := dataset.spec.annotations["pl7.app/vdj/libraryId"]
+		if is_undefined(libraryId) {
+			libraryId = !is_undefined(dsLibraryId) ? dsLibraryId : ""
+		} else {
+			if libraryId != dsLibraryId {
+				ll.panic("All datasets should have the same libraryId. Got " + libraryId + " and " + dsLibraryId)
+			}
+		}
+	}
+
+	if libraryId == "" || is_undefined(libraryId) {
+		return { library: smart.createNullResource() }
+	} else {
+		querySpec := {
+			type: "And",
+			operands: [
+				{ type: "Name", name: "pl7.app/vdj/library" },
+				{ type: "Domain", domain: { "pl7.app/vdj/libraryId": libraryId } }
+			]
+		}
+		return { library: bquery.create(querySpec, ctx, { single: true, errIfMissing: true }) }
+	}
+})
+