@platforma-sdk/workflow-tengo 3.1.0 → 3.2.0

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

@@ -4,6 +4,7 @@
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
 feats := import("@platforma-sdk/workflow-tengo:feats")
+validation := import("@platforma-sdk/workflow-tengo:validation")
 
 assets := import("@platforma-sdk/workflow-tengo:assets")
 smart := import("@platforma-sdk/workflow-tengo:smart")
@@ -15,7 +16,6 @@ path := import("@platforma-sdk/workflow-tengo:path")
 render := import("@platforma-sdk/workflow-tengo:render")
 enum := import("enum")
 oop := import("@platforma-sdk/workflow-tengo:oop")
-validation := import("@platforma-sdk/workflow-tengo:validation")
 constants := import("@platforma-sdk/workflow-tengo:constants")
 limits := import("@platforma-sdk/workflow-tengo:exec.limits")
 monetization := import("@platforma-sdk/workflow-tengo:exec.monetization_internal")
@@ -50,7 +50,6 @@ builder := func() {
 
 
 	queue := execConstants.HEAVY_QUEUE
-	hasLimits := false
 	cpuRequest := undefined
 	ramRequest := undefined
 
@@ -254,7 +253,6 @@ builder := func() {
 		cpu: func(amount) {
 			validation.assertType(amount, "number", "exec.builder.cpu: amount of cores must be a number")
 			ll.assert(amount > 0, "exec.builder.cpu: amount of cores should be greater than 0")
-			hasLimits = true
 			cpuRequest = amount
 
 			return self
@@ -274,7 +272,6 @@ 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")
-			hasLimits = true
 			ramRequest = amount
 
 			return self
@@ -728,11 +725,11 @@ builder := func() {
 			}
 
 			serviceExecInputs := {}
-			if hasLimits && feats.workdirLimits {
+			if feats.workdirLimits || feats.computeLimits {
 				serviceExecInputs.quota = limits.quotaBuilder().
 					queue(queue).
-					cpu(cpuRequest).
-					ram(ramRequest).
+					cpu(cpuRequest). // 'undefined' value is OK and makes runner to apply default queue limits
+					ram(ramRequest). // 'undefined' value is OK and makes runner to apply default queue limits
 					build()
 			}
 

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

@@ -143,7 +143,69 @@ storageSpaceRequestBuilder := func() {
 	return self
 }
 
+_RTYPE_COMPUTE_REQUEST              := func(executor) { return { Name: "ComputeRequest/" + executor, Version: "1" } }
+_CR_DEFAULT_EXECUTOR_ID             := "executor"
+_CR_FIELD_REQUEST                   := "request"    // input
+_CR_FIELD_ALLOCATION                := "allocation" // output
+
+computeRequestBuilder := func() {
+	self := undefined
+
+	quota := undefined
+	executor := _CR_DEFAULT_EXECUTOR_ID
+
+	self = ll.toStrict({
+
+
+
+
+
+
+		quota: func(ref) {
+			validation.assertType(ref, validation.reference, "exec.limits.quota: quota must be a valid reference to Quota resource")
+			quota = ref
+
+			return self
+		},
+
+
+
+
+
+
+
+		executor: func(execID) {
+			validation.assertType(execID, "string", "exec.limits.executor: executor ID should be a string")
+			executor = execID
+
+			return self
+		},
+
+
+
+
+
+
+		build: func() {
+			ll.assert(smart.isReference(quota), "exec.limits.build: quota of ComputeRequest must be a valid reference")
+
+			rType := _RTYPE_COMPUTE_REQUEST(executor)
+			requestBuilder := smart.ephemeralBuilder(rType)
+			requestBuilder.getField(_CR_FIELD_REQUEST).set(quota)
+
+			return ll.toStrict(
+				oop.inherit(requestBuilder, {
+					allocation: requestBuilder.getField(_CR_FIELD_ALLOCATION)
+				})
+			)
+		}
+	})
+
+	return self
+}
+
 export ll.toStrict({
 	quotaBuilder:                    quotaBuilder,
-	storageSpaceRequestBuilder:      storageSpaceRequestBuilder
+	storageSpaceRequestBuilder:      storageSpaceRequestBuilder,
+	computeRequestBuilder:           computeRequestBuilder
 })

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

@@ -3,22 +3,33 @@
 
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
+validation := import("@platforma-sdk/workflow-tengo:validation")
 feats := import("@platforma-sdk/workflow-tengo:feats")
+oop := import("@platforma-sdk/workflow-tengo:oop")
 
 maps := import("@platforma-sdk/workflow-tengo:maps")
-oop := import("@platforma-sdk/workflow-tengo:oop")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 json := import("json")
 constants := import("@platforma-sdk/workflow-tengo:exec.constants")
 slices := import("@platforma-sdk/workflow-tengo:slices")
+limits := import("@platforma-sdk/workflow-tengo:exec.limits")
 
-_RTYPE_RUN_COMMAND := { Name: "RunCommand/executor", Version: "1" }
+_RTYPE_RUN_COMMAND_V1 := { Name: "RunCommand/executor", Version: "1" }
+_RTYPE_RUN_COMMAND_V2 := { Name: "RunCommand/executor", 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" }
 _RTYPE_RUN_COMMAND_REFS := { Name: "RunCommandRefs", Version: "1" }
 
+
+_FIELD_ALLOCATION := "allocation" // not in v1
+_FIELD_REFS := "refs"
+_FIELD_CMD := "cmd"
+_FIELD_ARGS := "args"
+_FIELD_OPTIONS := "options"
 _FIELD_WORKDIR_IN := "workdirIn"
+
+
 _FIELD_WORKDIR_OUT := "workdirOut"
 
 
@@ -66,7 +77,14 @@ _createExpressionArg := func(argTpl) {
 
 
 builder := func(workdir) {
-	res := smart.ephemeralBuilder(_RTYPE_RUN_COMMAND)
+	res := undefined
+
+	if feats.computeLimits {
+		res = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_V2)
+	} else {
+		res = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_V1)
+	}
+
 	res.getField(_FIELD_WORKDIR_IN).set(workdir)
 
 	self := undefined
@@ -76,6 +94,7 @@ builder := func(workdir) {
 	envs := {}
 	queue := ""
 	refs := {}
+	_allocation := undefined
 
 	substRules := {}
 	hasPatternArgs := false // TODO: deprecated, remove after a month of expressionRefs in prod.
@@ -92,6 +111,17 @@ builder := func(workdir) {
 
 
 
+		allocation: func(allocation) {
+			validation.assertType(allocation, validation.reference, "runcmd.builder: allocation should be a valid reference")
+			_allocation = allocation
+			return self
+		},
+
+
+
+
+
+
 		cmd: func(commandName) {
 			cmd = _createSimpleArg(commandName)
 			return self
@@ -366,11 +396,21 @@ builder := func(workdir) {
 				"runcmd.builder().build: expression arguments must be enabled only if platforma backend supports expressions, found: %v",
 				hasExpressionArgs)
 
+			if feats.computeLimits {
+				if !smart.isReference(_allocation) {
+
+
+					_quota := limits.quotaBuilder().queue(queue).build()
+					_allocation = limits.computeRequestBuilder().quota(_quota).build().allocation
+				}
+				self.getField(_FIELD_ALLOCATION).set(_allocation)
+			}
+
 			refsRes := smart.createMapResourceWithType(_RTYPE_RUN_COMMAND_REFS, refs)
-			self.getField("refs").set(refsRes)
+			self.getField(_FIELD_REFS).set(refsRes)
 
 			cmdRes := smart.createValueResource(_RTYPE_RUN_COMMAND_CMD, json.encode(cmd))
-			self.getField("cmd").set(cmdRes)
+			self.getField(_FIELD_CMD).set(cmdRes)
 
 			options := {
 				queueName: queue,
@@ -383,10 +423,10 @@ builder := func(workdir) {
 			}
 
 			optionsRes := smart.createValueResource(_RTYPE_RUN_COMMAND_OPTIONS, json.encode(options))
-			self.getField("options").set(optionsRes)
+			self.getField(_FIELD_OPTIONS).set(optionsRes)
 
 			argsRes := smart.createValueResource(_RTYPE_RUN_COMMAND_ARGS, json.encode(args))
-			self.getField("args").set(argsRes)
+			self.getField(_FIELD_ARGS).set(argsRes)
 
 			res := ll.toStrict(oop.inherit(self.lockAndBuild(), {
 				"workdir": self.outputs()[_FIELD_WORKDIR_OUT],

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

@@ -6,11 +6,12 @@ ll := import("@platforma-sdk/workflow-tengo:ll")
 
 _api := plapi.apiVersion
 if is_undefined(_api) {
-    _api = 0
+	_api = 0
 }
 
 export ll.toStrict({
-    pureFutureFields:           _api >= 1,
-    commandExpressions:         _api >= 2,
-    workdirLimits:              _api >= 4
+	pureFutureFields:           _api >= 1, // 'pure' future fields magic that provides deduplication
+	commandExpressions:         _api >= 2, // rich expressions in command arguments ( {{ system.ram_bytes / 20 }} )
+	workdirLimits:              _api >= 4, // workdir storage controller can limit concurrency
+	computeLimits:              _api >= 8  // runner can plan CPU and RAM
 })

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

@@ -6,6 +6,7 @@ json := import("json")
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
 feats := import("@platforma-sdk/workflow-tengo:feats")
+validation := import("@platforma-sdk/workflow-tengo:validation")
 
 assets := import("@platforma-sdk/workflow-tengo:assets")
 constants := import("@platforma-sdk/workflow-tengo:constants")
@@ -15,7 +16,6 @@ sets := import("@platforma-sdk/workflow-tengo:sets")
 slices := import("@platforma-sdk/workflow-tengo:slices")
 path := import("@platforma-sdk/workflow-tengo:path")
 enum := import("enum")
-validation := import("@platforma-sdk/workflow-tengo:validation")
 render := import("@platforma-sdk/workflow-tengo:render")
 
 _WD_CREATE_FIELD_ALLOCATION := "allocation"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",