@platforma-open/milaboratories.immune-assay-data.workflow 1.8.0 → 1.8.1

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/immune-assay-data/immune-assay-data/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.immune-assay-data.workflow@1.8.0 build /home/runner/work/immune-assay-data/immune-assay-data/workflow
+> @platforma-open/milaboratories.immune-assay-data.workflow@1.8.1 build /home/runner/work/immune-assay-data/immune-assay-data/workflow
 > rm -rf dist && pl-tengo check && pl-tengo build
 
 Processing "src/analysis.tpl.tengo"...

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @platforma-open/milaboratories.immune-assay-data.workflow
 
+## 1.8.1
+
+### Patch Changes
+
+- 36ed105: Improve empty input detection
+- Updated dependencies [36ed105]
+  - @platforma-open/milaboratories.immune-assay-data.check-content-empty@1.0.1
+
 ## 1.8.0
 
 ### Minor Changes

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@platforma-open/milaboratories.immune-assay-data.workflow",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "type": "module",
   "description": "Tengo-based template",
   "dependencies": {
     "@platforma-sdk/workflow-tengo": "5.9.1",
     "@platforma-open/soedinglab.software-mmseqs2": "1.18.3",
-    "@platforma-open/milaboratories.immune-assay-data.add-header": "1.1.3",
     "@platforma-open/milaboratories.immune-assay-data.prepare-fasta": "1.1.3",
+    "@platforma-open/milaboratories.immune-assay-data.add-header": "1.1.3",
     "@platforma-open/milaboratories.immune-assay-data.coverage-mode-calc": "1.2.0",
     "@platforma-open/milaboratories.immune-assay-data.fasta-to-tsv": "1.1.3",
-    "@platforma-open/milaboratories.immune-assay-data.xlsx-to-csv": "1.1.0"
+    "@platforma-open/milaboratories.immune-assay-data.xlsx-to-csv": "1.1.0",
+    "@platforma-open/milaboratories.immune-assay-data.check-content-empty": "1.0.1"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "2.4.27"
+    "@platforma-sdk/tengo-builder": "2.4.28"
   },
   "scripts": {
     "build": "rm -rf dist && pl-tengo check && pl-tengo build",

package/src/analysis.tpl.tengo

@@ -12,6 +12,7 @@ fastaToTsvSw := assets.importSoftware("@platforma-open/milaboratories.immune-ass
 addHeaderSw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.add-header:main")
 covModeCalcSw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.coverage-mode-calc:main")
 xlsxToCsvSw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.xlsx-to-csv:main")
+checkContentEmptySw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.check-content-empty:main")
 
 runAlignmentTpl := assets.importTemplate(":run-alignment")
 checkContentEmptyTpl := assets.importTemplate(":check-content-empty")
@@ -274,16 +275,24 @@ self.body(func(args) {
 		arg("-o").arg("results_with_header.tsv").
 		addFile("results.tsv", mmseqsOutput).
 		saveFile("results_with_header.tsv").
-		saveFileContent("results_with_header.tsv").
 		run()
 
 	mmseqsResultTsv := addHeaderRun.getFile("results_with_header.tsv")
-	mmseqsResultContent := addHeaderRun.getFileContent("results_with_header.tsv")
 
-	// Use subtemplate to check if file is empty
+	// Check if results are empty (only header line or nothing)
+	checkResultsRun := exec.builder().
+		software(checkContentEmptySw).
+		arg("-i").arg("input.file").
+		arg("-n").arg("2"). // Require at least 2 non-empty lines (header + 1 data line)
+		addFile("input.file", mmseqsResultTsv).
+		saveStdoutContent().
+		mem("8GiB").
+		cpu(1).
+		inLightQueue().
+		run()
+
 	checkResult := render.create(checkContentEmptyTpl, {
-		content: mmseqsResultContent,
-		mode: "headerOnly"
+		content: checkResultsRun.getStdoutContent()
 	})
 	emptyResults := checkResult.output("result")
 

package/src/check-content-empty.tpl.tengo

@@ -4,18 +4,6 @@ text := import("text")
 self.defineOutputs("result")
 
 self.body(func(args) {
-    content := string(args.content.getData())
-    mode := args.mode
-
-    isEmpty := false
-    if mode == "raw" {
-        // No header line (e.g. FASTA): empty content means no data
-        isEmpty = text.trim_space(content) == ""
-    } else if mode == "headerOnly" {
-        // File has a header line (e.g. TSV with added header): empty means <= 1 line
-        lines := text.split(text.trim_space(content), "\n")
-        isEmpty = len(lines) <= 1
-    }
-
-    return { result: isEmpty }
+    // 'content' is the stdout of the check-software (already a "true"/"false" string)
+    return { result: text.trim_space(string(args.content.getData())) == "true" }
 })

package/src/main.tpl.tengo

@@ -16,6 +16,7 @@ processOutputsTpl := assets.importTemplate(":process-outputs")
 checkContentEmptyTpl := assets.importTemplate(":check-content-empty")
 
 prepareFastaSw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.prepare-fasta:main")
+checkContentEmptySw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.check-content-empty:main")
 
 wf.prepare(func(args){
 	bundleBuilder := wf.createPBundleBuilder()
@@ -103,15 +104,23 @@ wf.body(func(args) {
 		arg("--seq_col").arg("sequence").
 		arg("--id_col").arg("seqId").
 		saveFile("output.fasta").
-		saveFileContent("output.fasta").
 		run()
 	clonesFasta := clonesFastaRun.getFile("output.fasta")
-	clonesFastaContent := clonesFastaRun.getFileContent("output.fasta")
 
 	// Check if clones are empty before running mmseqs2
+	checkClonesRun := exec.builder().
+		software(checkContentEmptySw).
+		arg("-i").arg("input.file").
+		arg("-n").arg("1").
+		addFile("input.file", clonesFasta).
+		saveStdoutContent().
+		mem("8GiB").
+		cpu(1).
+		inLightQueue().
+		run()
+
 	checkClonesResult := render.create(checkContentEmptyTpl, {
-		content: clonesFastaContent,
-		mode: "raw"
+		content: checkClonesRun.getStdoutContent()
 	})
 	emptyClonesInput := checkClonesResult.output("result")