@platforma-sdk/workflow-tengo 5.7.3 → 5.8.1

package/dist/tengo/lib/annotations.lib.tengo

@@ -50,7 +50,7 @@ computeAnnotations := func(inputs) {
 	
 	columnsFromExpressions := util.extractColumnsFromExpressions(slices.map(steps, func(step) { return step.value }))
 	additionalColumns := is_array(inputs.additionalColumns) ? inputs.additionalColumns : []
-	columns := columnsFromExpressions + additionalColumns
+	columns := slices.unique(columnsFromExpressions + additionalColumns)
 	
 	bundleBuilder := wf.createPBundleBuilder()
 	bundleBuilder.addAnchor("main", anchorRef)

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

@@ -11,6 +11,10 @@ MEDIUM_QUEUE   := "medium"
 LIGHT_QUEUE    := "light"
 UI_TASKS_QUEUE := "ui-tasks"
 
+
+RUNNER_BATCH    := "batch"    // batch system execution (k8s jobs, etc.)
+RUNNER_EXECUTOR := "executor" // local binary execution
+
 export ll.toStrict({
 	ARG_TYPE_STRING: ARG_TYPE_STRING,
 	ARG_TYPE_EXPRESSION: ARG_TYPE_EXPRESSION,
@@ -21,5 +25,8 @@ export ll.toStrict({
 	UI_TASKS_QUEUE: UI_TASKS_QUEUE,
 	LIGHT_QUEUE: LIGHT_QUEUE,
 	MEDIUM_QUEUE: MEDIUM_QUEUE,
-	HEAVY_QUEUE: HEAVY_QUEUE
+	HEAVY_QUEUE: HEAVY_QUEUE,
+
+	RUNNER_BATCH: RUNNER_BATCH,
+	RUNNER_EXECUTOR: RUNNER_EXECUTOR
 })

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

@@ -9,7 +9,6 @@ ll := import("@platforma-sdk/workflow-tengo:ll")
 
 oop := import("@platforma-sdk/workflow-tengo:oop")
 validation := import("@platforma-sdk/workflow-tengo:validation")
-slices := import("@platforma-sdk/workflow-tengo:slices")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 json := import("json")
 constants := import("@platforma-sdk/workflow-tengo:exec.constants")
@@ -23,8 +22,22 @@ _RTYPE_QUOTA := { Name: "Quota", Version: "1" }
 
 
 
-useBatch := func(queueName) {
-	return feats.hasBatch && !slices.hasElement([ constants.UI_TASKS_QUEUE ], queueName)
+getResourceTypes := func(queueName) {
+
+	result := feats.getResourceTypes(queueName)
+	if !is_undefined(result) {
+		return result
+	}
+
+
+	runnerType := constants.RUNNER_EXECUTOR
+	if feats.hasBatch && queueName != constants.UI_TASKS_QUEUE {
+		runnerType = constants.RUNNER_BATCH
+	}
+	return {
+		runCommand:     { Name: "RunCommand/" + runnerType, Version: "2" },
+		computeRequest: { Name: "ComputeRequest/" + runnerType, Version: "1" }
+	}
 }
 
 
@@ -158,8 +171,6 @@ storageSpaceRequestBuilder := func() {
 	return self
 }
 
-_RTYPE_COMPUTE_REQUEST_EXECUTOR_V1  := { Name: "ComputeRequest/executor", Version: "1" }
-_RTYPE_COMPUTE_REQUEST_BATCH_V1     := { Name: "ComputeRequest/batch", Version: "1" }
 
 _CR_FIELD_REQUEST                   := "request"    // input
 _CR_FIELD_ALLOCATION                := "allocation" // output
@@ -205,13 +216,8 @@ computeRequestBuilder := func() {
 			ll.assert(smart.isReference(quota), "exec.limits.build: quota of ComputeRequest must be a valid reference")
 			ll.assert(queue_name != "", "exec.limits.build: queue name is required for computeRequestBuilder")
 
-			requestBuilder := undefined
-
-			if useBatch(queue_name) {
-				requestBuilder = smart.ephemeralBuilder(_RTYPE_COMPUTE_REQUEST_BATCH_V1)
-			} else {
-				requestBuilder = smart.ephemeralBuilder(_RTYPE_COMPUTE_REQUEST_EXECUTOR_V1)
-			}
+			resourceTypes := getResourceTypes(queue_name)
+			requestBuilder := smart.ephemeralBuilder(resourceTypes.computeRequest)
 
 			requestBuilder.getField(_CR_FIELD_REQUEST).set(quota)
 
@@ -229,7 +235,7 @@ computeRequestBuilder := func() {
 }
 
 export ll.toStrict({
-	useBatch:                        useBatch,
+	getResourceTypes:                getResourceTypes,
 	quotaBuilder:                    quotaBuilder,
 	storageSpaceRequestBuilder:      storageSpaceRequestBuilder,
 	computeRequestBuilder:           computeRequestBuilder

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

@@ -19,8 +19,6 @@ limits := import("@platforma-sdk/workflow-tengo:exec.limits")
 delayedCompAlloc := import("@platforma-sdk/workflow-tengo:exec.delayed-compute-allocation")
 
 _RTYPE_RUN_COMMAND_V1 := { Name: "RunCommand/executor", Version: "1" }
-_RTYPE_RUN_COMMAND_EXEC_V2 := { Name: "RunCommand/executor", Version: "2" }
-_RTYPE_RUN_COMMAND_BATCH_V2 := { Name: "RunCommand/batch", Version: "2" }
 _RTYPE_RUN_COMMAND_CMD := { Name: "RunCommandCmd", Version: "1" }
 _RTYPE_RUN_COMMAND_ARGS := { Name: "RunCommandArgs", Version: "1" }
 _RTYPE_RUN_COMMAND_OPTIONS := { Name: "run-command/options", Version: "1" }
@@ -669,17 +667,8 @@ builder := func(workdir, ...initialState) {
 
 			ll.assert(!is_undefined(queue), "runcmd.builder.build: queue is required for any command run")
 
-			useBatch := limits.useBatch(queue)
-
-			if useBatch {
-
-
-
-				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_BATCH_V2)
-
-			} else {
-				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_EXEC_V2)
-			}
+			resourceTypes := limits.getResourceTypes(queue)
+			runRes = smart.ephemeralBuilder(resourceTypes.runCommand)
 
 			runRes.getField(_FIELD_WORKDIR_IN).set(workdir)
 

package/dist/tengo/lib/feats.lib.tengo

@@ -30,10 +30,25 @@ _hasRunner := func(e_id) {
 	return !is_undefined(_executors[e_id])
 }
 
+
+_hasGetResourceTypesFor := ll.methodExists(plapi, "getResourceTypesFor")
+
+
+
+_getResourceTypesFor := func(queueName) {
+	if !_hasGetResourceTypesFor {
+		return undefined
+	}
+	return plapi.getResourceTypesFor(queueName)
+}
+
 export ll.toStrict({
 	hasExec:                    _hasRunner("executor"),     // local binary execution is available
 	hasBatch:                   _hasRunner("batch"),        // batch system execution is available
 
+
+	getResourceTypes:           _getResourceTypesFor,
+
 	pureFutureFields:           _isEnabled("pureFutureFields")   || _api >= 1, // 'pure' future fields magic that provides deduplication
 	commandExpressions:         _isEnabled("commandExpressions") || _api >= 2, // rich expressions in command arguments ( {{ system.ram_bytes / 20 }} )
 

package/dist/tengo/lib/slices.lib.tengo

@@ -376,6 +376,24 @@ sortUnique := func(list) {
     return quickSortInPlace(uniqueList)
 }
 
+
+
+
+
+
+
+unique := func(list) {
+	arr := []
+	map := {}
+	for _, item in list {
+		if is_undefined(map[item]) {
+			arr = append(arr, item)
+			map[item] = true
+		}
+	}
+	return arr
+}
+
 export ll.toStrict({
 	length: length,
 	safeAppend: safeAppend,
@@ -396,5 +414,6 @@ export ll.toStrict({
 	fromSet: fromSet,
 	slice: slice,
 	normalize: normalize,
-	sortUnique: sortUnique
+	sortUnique: sortUnique,
+	unique: unique
 })

package/dist/tengo/lib/workdir.lib.tengo

@@ -323,7 +323,7 @@ _fill := func() {
 					quotaBuilder.ram(ram)
 				}
 
-				if limits.useBatch(queue) {
+				if limits.getResourceTypes(queue).runCommand.Name == "RunCommand/" + execConstants.RUNNER_BATCH {
 					quotaBuilder.queue(execConstants.BATCH_QUEUE)
 				} else {
 					quotaBuilder.queue(queue)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "5.7.3",
+  "version": "5.8.1",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -17,12 +17,12 @@
   ],
   "dependencies": {
     "@milaboratories/software-pframes-conv": "2.2.9",
-    "@platforma-open/milaboratories.software-small-binaries": "^1.15.25",
+    "@platforma-open/milaboratories.software-small-binaries": "^2.0.1",
     "@platforma-open/milaboratories.software-ptabler": "1.14.0",
     "@platforma-open/milaboratories.software-ptexter": "1.2.0"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "2.4.2"
+    "@platforma-sdk/tengo-builder": "2.4.11"
   },
   "scripts": {
     "type-check": "pl-tengo check",