@platforma-sdk/workflow-tengo 5.8.0 → 5.8.1

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,18 +22,22 @@ _RTYPE_QUOTA := { Name: "Quota", Version: "1" }
 
 
 
-getRunnerType := func(queueName) {
+getResourceTypes := func(queueName) {
 
-	runner := feats.getRunnerFor(queueName)
-	if !is_undefined(runner) {
-		return runner
+	result := feats.getResourceTypes(queueName)
+	if !is_undefined(result) {
+		return result
 	}
 
 
-	if feats.hasBatch && !slices.hasElement([ constants.UI_TASKS_QUEUE ], queueName) {
-		return constants.RUNNER_BATCH
+	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" }
 	}
-	return constants.RUNNER_EXECUTOR
 }
 
 
@@ -168,9 +171,6 @@ storageSpaceRequestBuilder := func() {
 	return self
 }
 
-_computeRequestResourceType := func(runnerType) {
-	return { Name: "ComputeRequest/" + runnerType, Version: "1" }
-}
 
 _CR_FIELD_REQUEST                   := "request"    // input
 _CR_FIELD_ALLOCATION                := "allocation" // output
@@ -216,8 +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")
 
-			runnerType := getRunnerType(queue_name)
-			requestBuilder := smart.ephemeralBuilder(_computeRequestResourceType(runnerType))
+			resourceTypes := getResourceTypes(queue_name)
+			requestBuilder := smart.ephemeralBuilder(resourceTypes.computeRequest)
 
 			requestBuilder.getField(_CR_FIELD_REQUEST).set(quota)
 
@@ -235,7 +235,7 @@ computeRequestBuilder := func() {
 }
 
 export ll.toStrict({
-	getRunnerType:                   getRunnerType,
+	getResourceTypes:                getResourceTypes,
 	quotaBuilder:                    quotaBuilder,
 	storageSpaceRequestBuilder:      storageSpaceRequestBuilder,
 	computeRequestBuilder:           computeRequestBuilder

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

@@ -19,10 +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" }
-
-_runCommandResourceType := func(runnerType) {
-	return { Name: "RunCommand/" + runnerType, 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" }
@@ -671,8 +667,8 @@ builder := func(workdir, ...initialState) {
 
 			ll.assert(!is_undefined(queue), "runcmd.builder.build: queue is required for any command run")
 
-			runnerType := limits.getRunnerType(queue)
-			runRes = smart.ephemeralBuilder(_runCommandResourceType(runnerType))
+			resourceTypes := limits.getResourceTypes(queue)
+			runRes = smart.ephemeralBuilder(resourceTypes.runCommand)
 
 			runRes.getField(_FIELD_WORKDIR_IN).set(workdir)
 

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

@@ -31,15 +31,15 @@ _hasRunner := func(e_id) {
 }
 
 
-_hasGetRunnerFor := ll.methodExists(plapi, "getRunnerFor")
+_hasGetResourceTypesFor := ll.methodExists(plapi, "getResourceTypesFor")
 
 
 
-_getRunnerFor := func(queueName) {
-	if !_hasGetRunnerFor {
+_getResourceTypesFor := func(queueName) {
+	if !_hasGetResourceTypesFor {
 		return undefined
 	}
-	return plapi.getRunnerFor(queueName)
+	return plapi.getResourceTypesFor(queueName)
 }
 
 export ll.toStrict({
@@ -47,7 +47,7 @@ export ll.toStrict({
 	hasBatch:                   _hasRunner("batch"),        // batch system execution is available
 
 
-	getRunnerFor:               _getRunnerFor,
+	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/workdir.lib.tengo

@@ -323,7 +323,7 @@ _fill := func() {
 					quotaBuilder.ram(ram)
 				}
 
-				if limits.getRunnerType(queue) == execConstants.RUNNER_BATCH {
+				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.8.0",
+  "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.26",
-    "@platforma-open/milaboratories.software-ptexter": "1.2.0",
-    "@platforma-open/milaboratories.software-ptabler": "1.14.0"
+    "@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.8"
+    "@platforma-sdk/tengo-builder": "2.4.11"
   },
   "scripts": {
     "type-check": "pl-tengo check",