@platforma-open/milaboratories.mixcr-clonotyping-2.workflow 3.12.1 → 3.13.0

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@3.12.1 build /home/runner/work/mixcr-clonotyping/mixcr-clonotyping/workflow
+> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@3.13.0 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,11 @@
 # @platforma-open/milaboratories.mixcr-clonotyping.workflow
 
+## 3.13.0
+
+### Minor Changes
+
+- 27f25bc: isProductive values changed to true or false
+
 ## 3.12.1
 
 ### Patch Changes

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

@@ -754,10 +754,10 @@ calculateExportSpecs := func(presetSpecForBack, sampleIdAxisSpec, blockId) {
 				spec: {
 					valueType: "String",
 					name: variant.specName,
-					annotations: a(orderP, variant.visibility, {
-						"pl7.app/label": variant.label,
-						"pl7.app/isDiscreteFilter": "true",
-						"pl7.app/discreteValues": string(json.encode(["True", "False"])) } )
+                    annotations: a(orderP, variant.visibility, {
+                        "pl7.app/label": variant.label,
+                        "pl7.app/isDiscreteFilter": "true",
+                        "pl7.app/discreteValues": string(json.encode(["true", "false"])) } )
 				}
 			} ]
 		exportArgs += [ [ variant.arg, productiveFeature ] ]

package/package.json

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

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

@@ -754,10 +754,10 @@ calculateExportSpecs := func(presetSpecForBack, sampleIdAxisSpec, blockId) {
 				spec: {
 					valueType: "String",
 					name: variant.specName,
-					annotations: a(orderP, variant.visibility, {
-						"pl7.app/label": variant.label,
-						"pl7.app/isDiscreteFilter": "true",
-						"pl7.app/discreteValues": string(json.encode(["True", "False"])) } )
+                    annotations: a(orderP, variant.visibility, {
+                        "pl7.app/label": variant.label,
+                        "pl7.app/isDiscreteFilter": "true",
+                        "pl7.app/discreteValues": string(json.encode(["true", "false"])) } )
 				}
 			} ]
 		exportArgs += [ [ variant.arg, productiveFeature ] ]

package/src/mixcr-export.tpl.tengo

@@ -35,9 +35,10 @@ self.body(func(inputs) {
 		ll.assert(len(cellTagColumns) == 1, "cellTagColumns must be a single column when hashCellKey is false")
 	}
 
-	mainAbundanceColumnUnnormalizedArgs := params.mainAbundanceColumnUnnormalizedArgs
-	mainAbundanceColumnIsReadCount := params.mainAbundanceColumnIsReadCount == true
-	mainIsProductiveArgs := params.mainIsProductiveArgs
+    mainAbundanceColumnUnnormalizedArgs := params.mainAbundanceColumnUnnormalizedArgs
+    mainAbundanceColumnIsReadCount := params.mainAbundanceColumnIsReadCount == true
+    mainIsProductiveArgs := params.mainIsProductiveArgs
+    mainIsProductiveColumn := params.mainIsProductiveColumn
 
 	exportMemGB := undefined 
 	if !is_undefined(inputs.perProcessMemGB) {
@@ -127,9 +128,18 @@ self.body(func(inputs) {
 	}
 	dfMain := wfMain.frame(frameInputMap, { inferSchema: false, id: "input_table" })
 
-	dfMain.addColumns(
-		pt.col("readCount").round().cast("Long").alias("readCount")
-	)
+    dfMain.addColumns(
+        pt.col("readCount").round().cast("Long").alias("readCount")
+    )
+    // Normalize isProductive column casing to strictly "true"/"false"
+    if !is_undefined(mainIsProductiveColumn) {
+        dfMain.addColumns(
+            pt.when(pt.col(mainIsProductiveColumn).strToUpper().eq("TRUE")).
+                then(pt.lit("true")).
+                otherwise(pt.lit("false")).
+                alias(mainIsProductiveColumn)
+        )
+    }
 	dfMain.addColumns(
 		hashKeyDerivationExpressionPt(clonotypeKeyColumns).alias("clonotypeKey")
 	)
@@ -174,11 +184,20 @@ self.body(func(inputs) {
 
 		dfSingleCell := wfSingleCell.frame(unprocessedTsvForSingleCell, frameLoadOps)
 
-		if mainAbundanceColumnIsReadCount {
-			dfSingleCell.addColumns(
-				pt.col("readCount").round().cast("Long").alias("readCount")
-			)
-		}
+        if mainAbundanceColumnIsReadCount {
+            dfSingleCell.addColumns(
+                pt.col("readCount").round().cast("Long").alias("readCount")
+            )
+        }
+        // Normalize isProductive column casing to strictly "true"/"false"
+        if !is_undefined(mainIsProductiveColumn) {
+            dfSingleCell.addColumns(
+                pt.when(pt.col(mainIsProductiveColumn).strToUpper().eq("TRUE")).
+                    then(pt.lit("true")).
+                    otherwise(pt.lit("false")).
+                    alias(mainIsProductiveColumn)
+            )
+        }
 
 		dfSingleCell.addColumns(
 			hashKeyDerivationExpressionPt(clonotypeKeyColumns).alias("clonotypeKey"),

package/src/process-single-cell.tpl.tengo

@@ -100,8 +100,8 @@ self.body(func(inputs) {
 		)
 
 		// Prepare expressions for chainRank ordering
-		// 1. isProductiveNumeric: "True" -> 0, "False" -> 1 (for ascending sort)
-		isProductiveNumericExpr := pt.when(pt.col(mainIsProductiveColumn).eq("True")).
+        // 1. isProductiveNumeric: true -> 0, false -> 1 (case-insensitive)
+        isProductiveNumericExpr := pt.when(pt.col(mainIsProductiveColumn).strToUpper().eq("TRUE")).
 			then(pt.lit(0)).
 			otherwise(pt.lit(1))