@platforma-sdk/workflow-tengo 4.7.2 → 4.7.4

package/dist/tengo/lib/exec.lib.tengo

@@ -219,6 +219,16 @@ builder := func() {
 
 
 
+
+
+		setQueue: func(newQueue) {
+			queue = newQueue
+			return self
+		},
+
+
+
+
 		inHeavyQueue: func() {
 			queue = execConstants.HEAVY_QUEUE
 			return self
@@ -272,9 +282,9 @@ builder := func() {
 
 
 
-		ram: func(amount) {
-			validation.assertType(amount, ["or", "number", "string"], "exec.builder.ram: RAM amount should be a number or string")
-			ll.assert(is_string(amount) || amount > 0, "exec.builder.ram: amount in bytes should be greater than 0")
+		mem: func(amount) {
+			validation.assertType(amount, ["or", "number", "string"], "exec.builder.mem: RAM amount should be a number or string")
+			ll.assert(is_string(amount) || amount > 0, "exec.builder.mem: amount in bytes should be greater than 0")
 			ramRequest = amount
 
 			return self
@@ -285,6 +295,16 @@ builder := func() {
 
 
 
+		ram: func(amount) {
+			self.mem(amount)
+			return self
+		},
+
+
+
+
+
+
 
 		cache: func(time) {
 			ll.assert(

package/dist/tengo/lib/pframes.lib.tengo

@@ -174,6 +174,12 @@ __primitiveValueTypes := { "Int": true, "Long": true, "Float": true, "Double": t
 
 
 
+
+
+
+
+
+
 
 
 
@@ -236,6 +242,16 @@ processColumn := func(input, bodyTpl, outputs, ...opts) {
 		passKey: opts.passKey
 	}
 
+	if !is_undefined(opts.cpu) {
+		processTemplateParams.cpu = opts.cpu
+	}
+	if !is_undefined(opts.mem) {
+		processTemplateParams.mem = opts.mem
+	}
+	if !is_undefined(opts.queue) {
+		processTemplateParams.queue = opts.queue
+	}
+
 
 
 	isPotentiallyPartitioned := __primitiveValueTypes[input.spec.valueType]

package/dist/tengo/lib/pframes.xsv-builder.lib.tengo

@@ -5,6 +5,7 @@ pSpec := import("@platforma-sdk/workflow-tengo:pframes.spec")
 pBuilder := import("@platforma-sdk/workflow-tengo:pframes.builder")
 xsv := import("@platforma-sdk/workflow-tengo:pframes.xsv")
 canonical := import("@platforma-sdk/workflow-tengo:canonical")
+execConstants := import("@platforma-sdk/workflow-tengo:exec.constants")
 
 xsvFileBuilder := func(xsvType) {
     ll.assert(xsvType == "csv" || xsvType == "tsv", "xsvType must be 'csv' or 'tsv'")
@@ -19,6 +20,10 @@ xsvFileBuilder := func(xsvType) {
     nextSequentialId := 1
     nextPFrameKeyIndex := 1
 
+    cpu := undefined
+    mem := undefined
+    queue := undefined
+
     getSpecDistiller := func() {
         if is_undefined(distiller) {
             columnsToDistill := []
@@ -322,6 +327,64 @@ xsvFileBuilder := func(xsvType) {
 
 
 
+        inHeavyQueue: func() {
+            queue = execConstants.HEAVY_QUEUE
+            return self
+        },
+
+
+
+
+        inMediumQueue: func() {
+            queue = execConstants.MEDIUM_QUEUE
+            return self
+        },
+
+
+
+
+        inLightQueue: func() {
+            queue = execConstants.LIGHT_QUEUE
+            return self
+        },
+
+
+
+
+        inUiQueue: func() {
+            queue = execConstants.UI_TASKS_QUEUE
+            return self
+        },
+
+
+
+
+
+
+        cpu: func(amount) {
+            cpu = amount
+            return self
+        },
+
+
+
+
+
+
+
+
+
+
+
+
+        mem: func(amount) {
+            mem = amount
+            return self
+        },
+
+
+
+
 
 
 
@@ -548,7 +611,19 @@ xsvFileBuilder := func(xsvType) {
             }
 
             pFrame := _constructPFrameAndDistillSpecs().pFrame
-            return xsv.exportFrame(pFrame, xsvType, currentExportParams)
+
+            ops := {}
+            if !is_undefined(cpu) {
+                ops.cpu = cpu
+            }
+            if !is_undefined(mem) {
+                ops.mem = mem
+            }
+            if !is_undefined(queue) {
+                ops.queue = queue
+            }
+
+            return xsv.exportFrame(pFrame, xsvType, currentExportParams, ops)
         },
 
 
@@ -586,7 +661,18 @@ xsvFileBuilder := func(xsvType) {
             pFrame := buildOutput.pFrame
             uniqueAxes := buildOutput.uniqueAxes
 
-            tableResource := xsv.exportFrame(pFrame, xsvType, finalExportParams)
+            ops := {}
+            if !is_undefined(cpu) {
+                ops.cpu = cpu
+            }
+            if !is_undefined(mem) {
+                ops.mem = mem
+            }
+            if !is_undefined(queue) {
+                ops.queue = queue
+            }
+
+            tableResource := xsv.exportFrame(pFrame, xsvType, finalExportParams, ops)
 
             schema := []
 

package/dist/tengo/lib/pframes.xsv-import-file.lib.tengo

@@ -6,6 +6,7 @@ objects := import("@platforma-sdk/workflow-tengo:objects")
 util := import("@platforma-sdk/workflow-tengo:pframes.util")
 json := import("json")
 constants := import("@platforma-sdk/workflow-tengo:pframes.constants")
+execConstants := import("@platforma-sdk/workflow-tengo:exec.constants")
 
 transposeXsvSw := assets.importSoftware("@platforma-open/milaboratories.software-small-binaries:table-converter")
 pfconvSw := assets.importSoftware("@milaboratories/software-pframes-conv:main")
@@ -52,6 +53,34 @@ getColumnSpec := func(axesSpec, col) {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 importFile := func(xsvFile, xsvType, spec, ...ops) {
 	ll.assert(xsvType == "csv" || xsvType == "tsv", "expected one of [tsv, csv] types, found: " + xsvType)
 
@@ -67,7 +96,7 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 
 	xsvFileName := "file." + xsvType
 
-	ops := renderOps({ dataOnly: false, splitDataAndSpec: false }, ops...)
+	ops := renderOps({ dataOnly: false, splitDataAndSpec: false, queue: execConstants.LIGHT_QUEUE }, ops...)
 
 	if ops.transpose != undefined {
 
@@ -78,8 +107,17 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 
 		transposeXsv := exec.builder().
 			software(transposeXsvSw).
-			printErrStreamToStdout().
-			inLightQueue()
+			printErrStreamToStdout()
+
+		if ops.queue != undefined {
+			transposeXsv.setQueue(ops.queue)
+		}
+		if ops.cpu != undefined {
+			transposeXsv.cpu(ops.cpu)
+		}
+		if ops.mem != undefined {
+			transposeXsv.mem(ops.mem)
+		}
 
 		if (tops.separator != undefined) {
 			transposeXsv = transposeXsv.arg("-input-separator").arg(tops.separator)
@@ -126,15 +164,25 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 	pfconv := exec.builder().
 		software(pfconvSw).
 		printErrStreamToStdout().
-		inLightQueue().
 		arg("importCsv").
 		arg(xsvFileName).
 		arg("-p").arg("spec.json").
 		arg("-o").arg("out").
 		addFile(xsvFileName, xsvFile).
 		writeFile("spec.json", json.encode(pureSpec)).
-		processWorkdir("pf", importDirTpl, pureSpec).
-		run()
+		processWorkdir("pf", importDirTpl, pureSpec)
+
+	if ops.queue != undefined {
+		pfconv.setQueue(ops.queue)
+	}
+	if ops.cpu != undefined {
+		pfconv.cpu(ops.cpu)
+	}
+	if ops.mem != undefined {
+		pfconv.mem(ops.mem)
+	}
+
+	pfconv = pfconv.run()
 
 
 	pf := pfconv.getProcessorResult("pf")

package/dist/tengo/lib/pframes.xsv.lib.tengo

@@ -80,6 +80,9 @@ getColumnSpec := func(axesSpec, col) {
 
 
 
+
+
+
 
 
 
@@ -133,6 +136,9 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 
 
 
+
+
+
 
 
 
@@ -153,11 +159,25 @@ importFileMap := func(xsvMap, xsvType, spec, ...ops) {
 	pureSpec := decomposedSpec.purifiedCfg
 	columnsSpec := decomposedSpec.columnsSpec
 
+	templateOps := {
+		dataOnly: true,
+		transpose: ops.transpose
+	}
+	if !is_undefined(ops.cpu) {
+		templateOps.cpu = ops.cpu
+	}
+	if !is_undefined(ops.mem) {
+		templateOps.mem = ops.mem
+	}
+	if !is_undefined(ops.queue) {
+		templateOps.queue = ops.queue
+	}
+
 	r := render.createEphemeral(importXsvMapTpl, {
 		xsvMap: xsvMap,
 		xsvType: xsvType,
 		spec: pureSpec,
-		ops: { dataOnly: true, transpose: ops.transpose }
+		ops: templateOps
 	})
 
 	if ops.dataOnly && ops.splitDataAndSpec {
@@ -257,6 +277,9 @@ isStructuredPfMap := func(pf) {
 
 
 
+
+
+
 
 
 

package/dist/tengo/lib/pt.lib.tengo

@@ -6,6 +6,7 @@ exec := import("@platforma-sdk/workflow-tengo:exec")
 json := import("json")
 text := import("text")
 slices := import("@platforma-sdk/workflow-tengo:slices")
+execConstants := import("@platforma-sdk/workflow-tengo:exec.constants")
 
 
 
@@ -67,6 +68,10 @@ workflow := func() {
 	anonymousFilesCounter := 0
 	anonymousDFCounter := 0
 
+	cpu := undefined
+	mem := undefined
+	queue := execConstants.MEDIUM_QUEUE
+
 	self := undefined
 
 	id := workflowCounter
@@ -266,13 +271,71 @@ workflow := func() {
 
 
 
+		inHeavyQueue: func() {
+			queue = execConstants.HEAVY_QUEUE
+			return self
+		},
+
+
+
+
+		inMediumQueue: func() {
+			queue = execConstants.MEDIUM_QUEUE
+			return self
+		},
+
+
+
+
+		inLightQueue: func() {
+			queue = execConstants.LIGHT_QUEUE
+			return self
+		},
+
+
+
+
+		inUiQueue: func() {
+			queue = execConstants.UI_TASKS_QUEUE
+			return self
+		},
+
+
+
+
+
+
+		cpu: func(amount) {
+			cpu = amount
+			return self
+		},
+
+
+
+
+
+
+
+
+
+
+
+
+		mem: func(amount) {
+			mem = amount
+			return self
+		},
+
+
+
+
 
 
 
 		run: func() {
 			ptablerSw := assets.importSoftware("@platforma-open/milaboratories.software-ptabler:main")
 			ptablerCmdBuilder := exec.builder().
-				inMediumQueue().
+				setQueue(queue).
 				printErrStreamToStdout().
 				dontSaveStdoutOrStderr().
 				software(ptablerSw).
@@ -281,6 +344,14 @@ workflow := func() {
 					workflow: steps
 				}));
 
+			if !is_undefined(cpu) {
+				ptablerCmdBuilder.cpu(cpu)
+			}
+
+			if !is_undefined(mem) {
+				ptablerCmdBuilder.mem(mem)
+			}
+
 			for inFile in inFiles {
 				if !is_undefined(inFile.file) {
 					ptablerCmdBuilder.addFile(inFile.name, inFile.file)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "4.7.2",
+  "version": "4.7.4",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -21,7 +21,7 @@
     "@platforma-open/milaboratories.software-ptabler": "1.6.0"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "^2.1.8"
+    "@platforma-sdk/tengo-builder": "^2.1.10"
   },
   "scripts": {
     "type-check": "pl-tengo check",