@platforma-open/milaboratories.immune-assay-data.workflow 1.8.1 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +3 -1
- package/CHANGELOG.md +16 -0
- package/dist/index.cjs +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -0
- package/dist/tengo/tpl/analysis.plj.gz +0 -0
- package/dist/tengo/tpl/build-outputs.plj.gz +0 -0
- package/dist/tengo/tpl/check-content-empty.plj.gz +0 -0
- package/dist/tengo/tpl/extract-unique-values.plj.gz +0 -0
- package/dist/tengo/tpl/get-unique-values.plj.gz +0 -0
- package/dist/tengo/tpl/main.plj.gz +0 -0
- package/dist/tengo/tpl/prerun.plj.gz +0 -0
- package/dist/tengo/tpl/process-outputs.plj.gz +0 -0
- package/dist/tengo/tpl/run-alignment.plj.gz +0 -0
- package/package.json +3 -3
- package/src/main.tpl.tengo +3 -0
- package/src/prerun.tpl.tengo +17 -0
- package/src/run-alignment.tpl.tengo +10 -3
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
WARN Issue while reading "/home/runner/work/immune-assay-data/immune-assay-data/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
|
|
2
2
|
|
|
3
|
-
> @platforma-open/milaboratories.immune-assay-data.workflow@1.
|
|
3
|
+
> @platforma-open/milaboratories.immune-assay-data.workflow@1.10.0 build /home/runner/work/immune-assay-data/immune-assay-data/workflow
|
|
4
4
|
> rm -rf dist && pl-tengo check && pl-tengo build
|
|
5
5
|
|
|
6
6
|
Processing "src/analysis.tpl.tengo"...
|
|
@@ -9,6 +9,7 @@ Processing "src/check-content-empty.tpl.tengo"...
|
|
|
9
9
|
Processing "src/extract-unique-values.tpl.tengo"...
|
|
10
10
|
Processing "src/get-unique-values.tpl.tengo"...
|
|
11
11
|
Processing "src/main.tpl.tengo"...
|
|
12
|
+
Processing "src/prerun.tpl.tengo"...
|
|
12
13
|
Processing "src/process-outputs.tpl.tengo"...
|
|
13
14
|
Processing "src/run-alignment.tpl.tengo"...
|
|
14
15
|
No syntax errors found.
|
|
@@ -17,6 +18,7 @@ No syntax errors found.
|
|
|
17
18
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/check-content-empty.plj.gz
|
|
18
19
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/extract-unique-values.plj.gz
|
|
19
20
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/get-unique-values.plj.gz
|
|
21
|
+
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/prerun.plj.gz
|
|
20
22
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/process-outputs.plj.gz
|
|
21
23
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/run-alignment.plj.gz
|
|
22
24
|
info: - writing /home/runner/work/immune-assay-data/immune-assay-data/workflow/dist/tengo/tpl/analysis.plj.gz
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @platforma-open/milaboratories.immune-assay-data.workflow
|
|
2
2
|
|
|
3
|
+
## 1.10.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 29a44a2: Improved performance on large datasets
|
|
8
|
+
|
|
9
|
+
## 1.9.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 4a7083b: Fix assay file import to support remote (non-local) files
|
|
14
|
+
|
|
15
|
+
Previously, column detection used `lsDriver.getLocalFileContent()` which only works for locally-mounted files. Files from remote storages would silently fail, leaving the block unconfigurable.
|
|
16
|
+
|
|
17
|
+
Now uses a prerun workflow step to import the file and expose it as a blob, and `ReactiveFileContent` in the UI to read it via `blobDriver` — the same pattern used by samples-and-data. This works for both local and remote files.
|
|
18
|
+
|
|
3
19
|
## 1.8.1
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
package/dist/index.cjs
CHANGED
|
@@ -3,6 +3,7 @@ module.exports = { Templates: {
|
|
|
3
3
|
'check-content-empty': { type: 'from-file', path: require.resolve('./tengo/tpl/check-content-empty.plj.gz') },
|
|
4
4
|
'extract-unique-values': { type: 'from-file', path: require.resolve('./tengo/tpl/extract-unique-values.plj.gz') },
|
|
5
5
|
'get-unique-values': { type: 'from-file', path: require.resolve('./tengo/tpl/get-unique-values.plj.gz') },
|
|
6
|
+
'prerun': { type: 'from-file', path: require.resolve('./tengo/tpl/prerun.plj.gz') },
|
|
6
7
|
'process-outputs': { type: 'from-file', path: require.resolve('./tengo/tpl/process-outputs.plj.gz') },
|
|
7
8
|
'run-alignment': { type: 'from-file', path: require.resolve('./tengo/tpl/run-alignment.plj.gz') },
|
|
8
9
|
'analysis': { type: 'from-file', path: require.resolve('./tengo/tpl/analysis.plj.gz') },
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
declare type TemplateFromFile = { readonly type: "from-file"; readonly path: string; };
|
|
2
|
-
declare type TplName = "build-outputs" | "check-content-empty" | "extract-unique-values" | "get-unique-values" | "process-outputs" | "run-alignment" | "analysis" | "main";
|
|
2
|
+
declare type TplName = "build-outputs" | "check-content-empty" | "extract-unique-values" | "get-unique-values" | "prerun" | "process-outputs" | "run-alignment" | "analysis" | "main";
|
|
3
3
|
declare const Templates: Record<TplName, TemplateFromFile>;
|
|
4
4
|
export { Templates };
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,7 @@ export const Templates = {
|
|
|
4
4
|
'check-content-empty': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check-content-empty.plj.gz') },
|
|
5
5
|
'extract-unique-values': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/extract-unique-values.plj.gz') },
|
|
6
6
|
'get-unique-values': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/get-unique-values.plj.gz') },
|
|
7
|
+
'prerun': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/prerun.plj.gz') },
|
|
7
8
|
'process-outputs': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/process-outputs.plj.gz') },
|
|
8
9
|
'run-alignment': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/run-alignment.plj.gz') },
|
|
9
10
|
'analysis': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/analysis.plj.gz') },
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@platforma-open/milaboratories.immune-assay-data.workflow",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Tengo-based template",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@platforma-sdk/workflow-tengo": "5.
|
|
7
|
+
"@platforma-sdk/workflow-tengo": "5.11.0",
|
|
8
8
|
"@platforma-open/soedinglab.software-mmseqs2": "1.18.3",
|
|
9
9
|
"@platforma-open/milaboratories.immune-assay-data.prepare-fasta": "1.1.3",
|
|
10
10
|
"@platforma-open/milaboratories.immune-assay-data.add-header": "1.1.3",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"@platforma-open/milaboratories.immune-assay-data.check-content-empty": "1.0.1"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
|
-
"@platforma-sdk/tengo-builder": "2.
|
|
17
|
+
"@platforma-sdk/tengo-builder": "2.5.5"
|
|
18
18
|
},
|
|
19
19
|
"scripts": {
|
|
20
20
|
"build": "rm -rf dist && pl-tengo check && pl-tengo build",
|
package/src/main.tpl.tengo
CHANGED
|
@@ -11,10 +11,13 @@ text := import("text")
|
|
|
11
11
|
render := import("@platforma-sdk/workflow-tengo:render")
|
|
12
12
|
strings := import("@platforma-sdk/workflow-tengo:strings")
|
|
13
13
|
|
|
14
|
+
prerunTpl := assets.importTemplate(":prerun")
|
|
14
15
|
analysisTpl := assets.importTemplate(":analysis")
|
|
15
16
|
processOutputsTpl := assets.importTemplate(":process-outputs")
|
|
16
17
|
checkContentEmptyTpl := assets.importTemplate(":check-content-empty")
|
|
17
18
|
|
|
19
|
+
wf.setPreRun(prerunTpl)
|
|
20
|
+
|
|
18
21
|
prepareFastaSw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.prepare-fasta:main")
|
|
19
22
|
checkContentEmptySw := assets.importSoftware("@platforma-open/milaboratories.immune-assay-data.check-content-empty:main")
|
|
20
23
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
wf := import("@platforma-sdk/workflow-tengo:workflow")
|
|
2
|
+
file := import("@platforma-sdk/workflow-tengo:file")
|
|
3
|
+
|
|
4
|
+
wf.body(func(args) {
|
|
5
|
+
if is_undefined(args.fileHandle) {
|
|
6
|
+
return { outputs: {}, exports: {} }
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
importedFile := file.importFile(args.fileHandle)
|
|
10
|
+
|
|
11
|
+
return {
|
|
12
|
+
outputs: {
|
|
13
|
+
assayFile: file.exportFile(importedFile.file)
|
|
14
|
+
},
|
|
15
|
+
exports: {}
|
|
16
|
+
}
|
|
17
|
+
})
|
|
@@ -2,6 +2,7 @@ self := import("@platforma-sdk/workflow-tengo:tpl")
|
|
|
2
2
|
ll := import("@platforma-sdk/workflow-tengo:ll")
|
|
3
3
|
exec := import("@platforma-sdk/workflow-tengo:exec")
|
|
4
4
|
assets:= import("@platforma-sdk/workflow-tengo:assets")
|
|
5
|
+
math := import("math")
|
|
5
6
|
mmseqsSw := assets.importSoftware("@platforma-open/soedinglab.software-mmseqs2:main")
|
|
6
7
|
|
|
7
8
|
self.defineOutputs("mmseqsOutput")
|
|
@@ -16,15 +17,20 @@ self.body(func(args) {
|
|
|
16
17
|
clonesFasta := args.clonesFasta
|
|
17
18
|
assayFasta := args.assayFasta
|
|
18
19
|
|
|
19
|
-
|
|
20
|
-
cpu := 1
|
|
20
|
+
baseMemGiB := 64
|
|
21
21
|
if !is_undefined(args.metaInputs.mem) {
|
|
22
|
-
|
|
22
|
+
baseMemGiB = args.metaInputs.mem
|
|
23
23
|
}
|
|
24
|
+
mem := string(int(math.max(64, baseMemGiB))) + "GiB"
|
|
25
|
+
cpu := 1
|
|
24
26
|
if !is_undefined(args.metaInputs.cpu) {
|
|
25
27
|
cpu = args.metaInputs.cpu
|
|
26
28
|
}
|
|
27
29
|
|
|
30
|
+
// Cap mmseqs2 in-RAM usage to 80% of allocated memory so it splits to disk
|
|
31
|
+
// rather than getting OOM-killed by the kernel on large datasets.
|
|
32
|
+
memLimit := "{int(ceil(system.ram.gb * 0.8))}" + "G"
|
|
33
|
+
|
|
28
34
|
mmseqs := exec.builder().
|
|
29
35
|
software(mmseqsSw).
|
|
30
36
|
mem(mem).
|
|
@@ -34,6 +40,7 @@ self.body(func(args) {
|
|
|
34
40
|
arg("clones.fasta").
|
|
35
41
|
arg("results.tsv").
|
|
36
42
|
arg("tmp").
|
|
43
|
+
arg("--split-memory-limit").argWithVar(memLimit).
|
|
37
44
|
arg("--threads").arg(string(cpu)).
|
|
38
45
|
arg("--max-seqs").arg("10000").
|
|
39
46
|
arg("--search-type").arg(mmseqsSearchType).
|