@platforma-open/milaboratories.mixcr-clonotyping-2.workflow 2.20.4 → 2.20.6

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/mixcr-clonotyping/mixcr-clonotyping/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.20.4 build /home/runner/work/mixcr-clonotyping/mixcr-clonotyping/workflow
+> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.20.6 build /home/runner/work/mixcr-clonotyping/mixcr-clonotyping/workflow
 > rm -rf dist && pl-tengo check && pl-tengo build
 
   info: Skipping unknown file type: test/columns.test.ts

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @platforma-open/milaboratories.mixcr-clonotyping.workflow
 
+## 2.20.6
+
+### Patch Changes
+
+- 47f13d9: Fix for multiple clonotype label columns in SC analysis
+
+## 2.20.5
+
+### Patch Changes
+
+- 1ca5594: Another memory requesting optimization
+
 ## 2.20.4
 
 ### Patch Changes

package/dist/tengo/lib/calculate-export-specs.lib.tengo

@@ -747,7 +747,11 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		[ "-topChains" ]
 	]
 
-	columnsSpecPerClonotypeNoAggregates += [ clonotypeLabelColumn ]
+	if isSingleCell {
+		columnsSpecPerClonotypeAggregates += [ clonotypeLabelColumn ]
+	} else {
+		columnsSpecPerClonotypeNoAggregates += [ clonotypeLabelColumn ]
+	}
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-open/milaboratories.mixcr-clonotyping-2.workflow",
-  "version": "2.20.4",
+  "version": "2.20.6",
   "description": "Tengo-based template",
   "dependencies": {
     "@platforma-sdk/workflow-tengo": "^4.8.0",

package/src/calculate-export-specs.lib.tengo

@@ -747,7 +747,11 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		[ "-topChains" ]
 	]
 
-	columnsSpecPerClonotypeNoAggregates += [ clonotypeLabelColumn ]
+	if isSingleCell {
+		columnsSpecPerClonotypeAggregates += [ clonotypeLabelColumn ]
+	} else {
+		columnsSpecPerClonotypeNoAggregates += [ clonotypeLabelColumn ]
+	}
 
 	// All columns are added
 

package/src/calculate-preset-info.tpl.tengo

@@ -25,7 +25,7 @@ self.body(func(inputs) {
 
 	mixcrExportPresetCmdBuilder := exec.builder().
 		inUiQueue().
-		mem("200MiB").
+		mem("1GiB").
 		software(mixcrSw).
 		secret("MI_LICENSE", "MI_LICENSE").
 		printErrStreamToStdout().
@@ -56,7 +56,7 @@ self.body(func(inputs) {
 
 	mixcrForBackCmd := exec.builder().
 		inUiQueue().
-		mem("200MiB").
+		mem("1GiB").
 		software(mixcrSw).
 		secret("MI_LICENSE", "MI_LICENSE").
 		printErrStreamToStdout().

package/src/list-presets.tpl.tengo

@@ -15,8 +15,8 @@ self.body(func(inputs) {
 	// ll.print("__THE_LOG__ feats.computeLimits " + feats.computeLimits)
 	ll.print("__THE_LOG__ asdhjkajsdjasdjk")
 	listPresets := exec.builder().
-		inMediumQueue().
-		mem("202MiB").
+		inUiQueue().
+		mem("1GiB").
 		software(mixcrSw).
 		secret("MI_LICENSE", "MI_LICENSE").
 		arg("listPresetSpecificationsForUI").

package/src/mixcr-analyze.tpl.tengo

@@ -10,6 +10,7 @@ exec := import("@platforma-sdk/workflow-tengo:exec")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 pcolumn := import("@platforma-sdk/workflow-tengo:pframes.pcolumn")
 times := import("times")
+text := import("text")
 maps := import("@platforma-sdk/workflow-tengo:maps")
 
 json := import("json")
@@ -44,11 +45,14 @@ self.body(func(inputs) {
 
 	hasAssembleContigs := false
 	hasAssembleCells := false
+	hasMiToolSteps := false
 	for stage in presetContent.pipeline {
 		if stage == "assembleContigs" {
 			hasAssembleContigs = true
 		} else if stage == "assembleCells" {
 			hasAssembleCells = true
+		} else if text.has_prefix(stage, "mitool-") {
+			hasMiToolSteps = true
 		}
 	}
 
@@ -64,13 +68,16 @@ self.body(func(inputs) {
 		printErrStreamToStdout().
 		env("MI_PROGRESS_PREFIX", progressPrefix).
 		software(mixcrSw).
-		cpu(32).
+		cpu(16).
 		secret("MI_LICENSE", "MI_LICENSE").
 		arg("analyze").arg("--use-local-temp")
 
-	if hasAssembleContigs || hasAssembleCells {
+	if hasMiToolSteps {
+		// allow to use more memory for single cell analysis with mitool pre-
+		mixcrCmdBuilder.mem("192GiB")
+	} else if hasAssembleContigs || hasAssembleCells {
 		// allow to use more memory for single cell analysis
-		mixcrCmdBuilder.mem("128GiB")
+		mixcrCmdBuilder.mem("110GiB")
 	} else {
 		mixcrCmdBuilder.mem("64GiB")
 	}