@platforma-sdk/workflow-tengo 4.9.1 → 4.9.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 declare type TemplateFromFile = { readonly type: "from-file"; readonly path: string; };
-declare type TplName = "ll.get-field" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "workflow.query-anchored" | "exec.delayed-compute-allocation.impl" | "exec.monetization_to_json" | "exec.python.install-deps" | "exec.python.venv-bin-path" | "pframes.export-multiple-pcolumns" | "pframes.slice-data" | "check_network.create_workdir_from_storage" | "check_network.download_blob" | "check_network.upload_blob" | "check_network.upload_template" | "exec.R.create-renv" | "exec.exec-impl" | "exec.monetization_info" | "exec.python.create-venv" | "exec.load-software.impl" | "exec.exec" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "pframes.process-pcolumn-data" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
+declare type TplName = "ll.get-field" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "workflow.query-anchored" | "check_network.workdir_type_name_extractor" | "exec.delayed-compute-allocation.impl" | "exec.monetization_to_json" | "exec.python.install-deps" | "exec.python.venv-bin-path" | "pframes.export-multiple-pcolumns" | "pframes.slice-data" | "check_network.create_workdir_from_storage" | "check_network.download_blob" | "check_network.upload_blob" | "check_network.upload_template" | "exec.R.create-renv" | "exec.exec-impl" | "exec.monetization_info" | "exec.python.create-venv" | "exec.load-software.impl" | "exec.exec" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "pframes.process-pcolumn-data" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -7,6 +7,7 @@ module.exports = { Templates: {
   'workdir.save': { type: 'from-file', path: require.resolve('./tengo/tpl/workdir.save.plj.gz') },
   'workflow.build-ctx': { type: 'from-file', path: require.resolve('./tengo/tpl/workflow.build-ctx.plj.gz') },
   'workflow.query-anchored': { type: 'from-file', path: require.resolve('./tengo/tpl/workflow.query-anchored.plj.gz') },
+  'check_network.workdir_type_name_extractor': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.workdir_type_name_extractor.plj.gz') },
   'exec.delayed-compute-allocation.impl': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.delayed-compute-allocation.impl.plj.gz') },
   'exec.monetization_to_json': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_to_json.plj.gz') },
   'exec.python.install-deps': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.python.install-deps.plj.gz') },

package/dist/index.mjs

@@ -8,6 +8,7 @@ export const Templates = {
   'workdir.save': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/workdir.save.plj.gz') },
   'workflow.build-ctx': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/workflow.build-ctx.plj.gz') },
   'workflow.query-anchored': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/workflow.query-anchored.plj.gz') },
+  'check_network.workdir_type_name_extractor': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.workdir_type_name_extractor.plj.gz') },
   'exec.delayed-compute-allocation.impl': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.delayed-compute-allocation.impl.plj.gz') },
   'exec.monetization_to_json': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_to_json.plj.gz') },
   'exec.python.install-deps': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.python.install-deps.plj.gz') },

package/dist/tengo/lib/exec.R.internal.lib.tengo

@@ -6,6 +6,7 @@ runcmd := import("@platforma-sdk/workflow-tengo:exec.runcmd")
 path := import("@platforma-sdk/workflow-tengo:path")
 desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
 constants := import("@platforma-sdk/workflow-tengo:exec.constants")
+pkg := import("@platforma-sdk/workflow-tengo:exec.package")
 
 rVenvInputSchema := {
 	operationMode: "string",
@@ -22,9 +23,9 @@ runRBuilder := func(operationMode, wd, rPackage, rDescriptor) {
 	rule := feats.commandExpressions ? "R" : "{R}"
 
 	builder := runcmd.builder(wd).
-		inQueue("light").
-		cpu(1).
-		mem("1GiB").
+		inQueue(pkg.DEFAULT_ALLOCATION_QUEUE).
+		cpu(pkg.DEFAULT_ALLOCATION_CPU).
+		mem(pkg.DEFAULT_ALLOCATION_RAM).
 		ref("r-run-environment", rPackage).
 		substitutionRule(rule, "r-run-environment").
 		addPathTyped(t, path.join("{R}", rDescriptor.binDir)).

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

@@ -17,7 +17,6 @@ render := import("@platforma-sdk/workflow-tengo:render")
 enum := import("enum")
 oop := import("@platforma-sdk/workflow-tengo:oop")
 constants := import("@platforma-sdk/workflow-tengo:constants")
-limits := import("@platforma-sdk/workflow-tengo:exec.limits")
 monetization := import("@platforma-sdk/workflow-tengo:exec.monetization_internal")
 execConstants := import("@platforma-sdk/workflow-tengo:exec.constants")
 
@@ -826,16 +825,15 @@ builder := func() {
 				assetCache: assetCache
 			}
 
-			serviceExecInputs := {}
-			if feats.workdirLimits || feats.computeLimits || limits.useBatch(queue) {
-				if (is_int(ramRequest)) {
-					ramRequest = string(ramRequest) + "b"
-				}
-				serviceExecInputs.quota = {
+			if (is_int(ramRequest)) {
+				ramRequest = string(ramRequest) + "b"
+			}
+			metaExecInputs := {
+				quota: smart.createJsonResource({
 					queue: queue,
 					cpu: cpuRequest,
 					ram: ramRequest
-				}
+				})
 			}
 
 
@@ -861,7 +859,7 @@ builder := func() {
 				}
 			}
 
-			tpl := render.create(assets.importTemplate("@platforma-sdk/workflow-tengo:exec.exec"), pureExecInputs, serviceExecInputs)
+			tpl := render.create(assets.importTemplate("@platforma-sdk/workflow-tengo:exec.exec"), pureExecInputs, metaExecInputs)
 
 			self := undefined
 			self = ll.toStrict(oop.inherit(tpl, {

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

@@ -24,6 +24,10 @@ _INPUT_PACKAGE_NAME := "packageName"
 _INPUT_REGISTRY := "registry"
 _OUTPUT_ARCHIVE := "archive"
 
+DEFAULT_ALLOCATION_QUEUE := "light"
+DEFAULT_ALLOCATION_RAM := "1GiB"
+DEFAULT_ALLOCATION_CPU := 1
+
 get := func(registryName, pkgName) {
 	res := smart.structBuilder(_RTYPE_PACKAGE_GET)
 
@@ -163,7 +167,11 @@ pkgFileLoader := func(pkg) {
 		},
 
 		load: func() {
-			wd := workdir.create()
+			wd := workdir.builder().
+				inQueue(DEFAULT_ALLOCATION_QUEUE).
+				cpu(DEFAULT_ALLOCATION_CPU).
+				mem(DEFAULT_ALLOCATION_RAM).
+				build()
 
 			allPaths := sets.fromSlice(filePaths)
 			allPaths = sets.add(allPaths, fileContentPaths...)
@@ -261,6 +269,10 @@ export ll.toStrict({
 
 	META_KEY_DESCRIPTOR                : META_KEY_DESCRIPTOR,
 
+	DEFAULT_ALLOCATION_QUEUE           : DEFAULT_ALLOCATION_QUEUE,
+	DEFAULT_ALLOCATION_RAM             : DEFAULT_ALLOCATION_RAM,
+	DEFAULT_ALLOCATION_CPU             : DEFAULT_ALLOCATION_CPU,
+
 	get                                : get,
 	install                            : install,
 	use                                : use,

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

@@ -617,11 +617,8 @@ builder := func(workdir, ...initialState) {
 
 				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_BATCH_V2)
 
-			} else if feats.computeLimits {
-				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_EXEC_V2)
-
 			} else {
-				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_V1)
+				runRes = smart.ephemeralBuilder(_RTYPE_RUN_COMMAND_EXEC_V2)
 			}
 
 			runRes.getField(_FIELD_WORKDIR_IN).set(workdir)

package/dist/tengo/lib/validation.lib.tengo

@@ -364,6 +364,8 @@ assert := func(condition, msg, ...args) {
 
 
 
+
+
 assertType := func(value, schema, ...failMsg) {
 	r := _validateJson(value, schema, "")
 

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

@@ -5,8 +5,9 @@
 json := import("json")
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
-feats := import("@platforma-sdk/workflow-tengo:feats")
 validation := import("@platforma-sdk/workflow-tengo:validation")
+limits := import("@platforma-sdk/workflow-tengo:exec.limits")
+execConstants := import("@platforma-sdk/workflow-tengo:exec.constants")
 
 assets := import("@platforma-sdk/workflow-tengo:assets")
 constants := import("@platforma-sdk/workflow-tengo:constants")
@@ -29,23 +30,12 @@ _WD_FILL_FIELD_WORKDIR_OUT  := "workdirOut"
 
 
 
-create := func() {
-
-	wdCreate := smart.ephemeralBuilder(constants.RTYPE_WORKDIR_CREATE).lockAndBuild()
-	return wdCreate.getField(_WD_CREATE_FIELD_WORKDIR)
-}
-
-
-
 
 
 
-
-
-
-createV2 := func(allocation) {
+createV2 := func(allocationRef) {
 	wdCreate := smart.ephemeralBuilder(constants.RTYPE_WORKDIR_CREATE_2).lockAndBuild()
-	wdCreate.getField(_WD_CREATE_FIELD_ALLOCATION).set(allocation)
+	wdCreate.getField(_WD_CREATE_FIELD_ALLOCATION).set(allocationRef)
 
 	return wdCreate.getField(_WD_CREATE_FIELD_WORKDIR)
 }
@@ -121,13 +111,17 @@ _fill := func() {
 	wd := smart.ephemeralBuilder(constants.RTYPE_WORKDIR_FILL)
 
 	
-	_allocation := undefined
+	_allocationRef := undefined
 	blobs := {}
 	files := {}
 	zipExtractions := {}
 	values := {}
 	dirs := {}
 
+	queue := undefined
+	cpu := undefined
+	ram := undefined
+
 	self := undefined
 	self = ll.toStrict(oop.inherit(wd, {
 		_getAllDirs: func(fileName) {
@@ -145,9 +139,49 @@ _fill := func() {
 
 
 
-		allocation: func(allocation) {
-			validation.assertType(allocation, validation.reference, "workdir.builder: allocation should be a valid reference")
-			_allocation = allocation
+		allocation: func(ref) {
+			validation.assertType(ref, validation.reference, "workdir.builder: allocation should be a valid reference")
+			_allocationRef = ref
+			return self
+		},
+
+
+
+
+
+
+		inQueue: func(queueName) {
+			queue = queueName
+			return self
+		},
+
+
+
+
+
+
+		mem: func(value) {
+			if is_undefined(value) {
+				return self
+			}
+			validation.assertType(value, ["or", "number", "string"], "workdir.builder.mem: RAM amount should be a number or string")
+			ll.assert(is_string(value) || value > 0, "workdir.builder.mem: amount in bytes should be greater than 0")
+			ram = value
+			return self
+		},
+
+
+
+
+
+
+		cpu: func(value) {
+			if is_undefined(value) {
+				return self
+			}
+			validation.assertType(value, "number", "workdir.builder.cpu: value must be a number")
+			cpu = value
+			return self
 		},
 
 
@@ -269,13 +303,41 @@ _fill := func() {
 
 
 		build: func() {
-			emptyWorkdir := undefined
-			if feats.workdirLimits && smart.isReference(_allocation) {
-				emptyWorkdir = createV2(_allocation)
-			} else {
-				emptyWorkdir = create()
+			ll.assert(!is_undefined(_allocationRef) || !is_undefined(queue),
+				"workdir.builder: either allocation or queue must be provided")
+			ll.assert(is_undefined(_allocationRef) || is_undefined(queue),
+				"workdir.builder: allocation and queue must not be set at the same time")
+
+			if !is_undefined(_allocationRef) {
+				ll.assert(is_undefined(cpu) && is_undefined(ram),
+					"workdir.builder: cpu and ram cannot be set when allocation is provided")
+			}
+
+			allocationRef := _allocationRef
+			if is_undefined(allocationRef) {
+				quotaBuilder := limits.quotaBuilder()
+				if !is_undefined(cpu) {
+					quotaBuilder.cpu(cpu)
+				}
+				if !is_undefined(ram) {
+					quotaBuilder.ram(ram)
+				}
+
+				if limits.useBatch(queue) {
+					quotaBuilder.queue(execConstants.BATCH_QUEUE)
+				} else {
+					quotaBuilder.queue(queue)
+				}
+
+				storageSpaceRef := limits.storageSpaceRequestBuilder().
+					quota(quotaBuilder.build()).
+					build()
+
+				allocationRef = storageSpaceRef.allocation
 			}
 
+			emptyWorkdir := createV2(allocationRef)
+
 			wd.getField(_WD_FILL_FIELD_WORKDIR_IN).set(emptyWorkdir)
 
 			rules := []
@@ -422,7 +484,6 @@ save := func(workdir) {
 
 export ll.toStrict({
 	builder: builder,
-	create: create,
 	createV2: createV2,
 	save: save
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "4.9.1",
+  "version": "4.9.3",
   "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.11"
+    "@platforma-sdk/tengo-builder": "^2.1.12"
   },
   "scripts": {
     "type-check": "pl-tengo check",