@platforma-sdk/workflow-tengo 4.9.0 → 4.9.2

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")
 
@@ -144,6 +143,7 @@ builder := func() {
 
 
 
+
 		argWithVar: func(arg) {
 			ll.assert(is_string(arg), "exec.argWithVar(): argument with var must be a string, got: %v", arg)
 
@@ -180,6 +180,7 @@ builder := func() {
 
 
 
+
 		envWithVar: func(name, value) {
 			validation.assertType([name, value], ["string"])
 
@@ -340,6 +341,7 @@ builder := func() {
 
 
 
+
 		ram: func(amount) {
 			self.mem(amount)
 			return self
@@ -823,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
-				}
+				})
 			}
 
 
@@ -858,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/pframes.lib.tengo

@@ -36,6 +36,7 @@ exportColumnData := func(data) {
 
 
 
+
 pColumnResourceMapDataBuilder := func(keyLength) {
 	ll.panic("pframes.pColumnResourceMapDataBuilder is not supported any more; use pcolumn.resourceMapBuilder")
 }
@@ -182,6 +183,10 @@ __primitiveValueTypes := { "Int": true, "Long": true, "Float": true, "Double": t
 
 
 
+
+
+
+
 
 
 
@@ -261,6 +266,11 @@ processColumn := func(input, bodyTpl, outputs, ...opts) {
 		extra = {}
 	}
 
+	metaExtra := opts.metaExtra
+	if is_undefined(metaExtra) {
+		metaExtra = {}
+	}
+
 	iterationAxesSpec := input.spec.axesSpec
 
 
@@ -372,6 +382,10 @@ processColumn := func(input, bodyTpl, outputs, ...opts) {
 		renderInputs["__extra_" + k] = v
 	}
 
+	for k, v in metaExtra {
+		renderInputs["__meta_" + k] = v
+	}
+
 	renderResult := render.createEphemeral(llProcessTpl, renderInputs)
 
 	self := undefined

package/dist/tengo/lib/render.lib.tengo

@@ -29,7 +29,7 @@ _SUBSCRIPTION_FIELD := "subscription"
 
 
 createUniversal := func(tpl, isEph, inputs, ...opts) {
-	serviceInputs := opts[0]
+	metaInputs := opts[0]
 
 
 	rbuilder := undefined
@@ -54,10 +54,10 @@ createUniversal := func(tpl, isEph, inputs, ...opts) {
 			inputsMap.add(name, value)
 		}
 	}
-	for name, value in serviceInputs {
+	for name, value in metaInputs {
 		if !is_undefined(value) {
 			if feats.serviceFields {
-				inputsMap.addService(name, value)
+				inputsMap.addMeta(name, value)
 			} else {
 				inputsMap.add(name, value)
 			}

package/dist/tengo/lib/smart.lib.tengo

@@ -160,6 +160,7 @@ _getFutureField := func(from, name, fieldType, isEph) {
 
 
 
+
 _buildFutureField := func(resourceOrField, nameOrPath, ...eph) {
 	globalIsEph := undefined
 	if len(eph) > 0 && is_bool(eph[0]) {
@@ -517,19 +518,20 @@ resource = func(r) {
 		},
 
 
-		_serviceInputs: undefined,
+		_metaInputs: undefined,
 
 
 
-		serviceInputs: func() {
-			if self._serviceInputs == undefined {
+
+		metaInputs: func() {
+			if self._metaInputs == undefined {
 				info := self.info()
 
 				if !maps.containsKey(info, "ServiceFields") {
 
 
-					self._serviceInputs = {}
-					return self._serviceInputs
+					self._metaInputs = {}
+					return self._metaInputs
 				}
 
 				svcs := maps.mapValues(info.ServiceFields, field)
@@ -537,9 +539,17 @@ resource = func(r) {
 				if !info.InputsLocked {
 					return svcs
 				}
-				self._serviceInputs = svcs
+				self._metaInputs = svcs
 			}
-			return self._serviceInputs
+			return self._metaInputs
+		},
+
+
+
+
+
+		serviceInputs: func() {
+			return self.metaInputs()
 		},
 
 
@@ -1211,7 +1221,7 @@ resourceBuilder = func(r) {
 
 
 
-		createServiceField: func(name) {
+		createMetaField: func(name) {
 			assertNotBuilt()
 			return self.createField(name, constants.FTYPE_SERVICE)
 		},
@@ -1221,6 +1231,17 @@ resourceBuilder = func(r) {
 
 
 
+
+
+		createServiceField: func(name) {
+			return self.createMetaField(name)
+		},
+
+
+
+
+
+
 		createInputField: func(name) {
 			assertNotBuilt()
 			return self.createField(name, constants.FTYPE_INPUT)
@@ -1380,8 +1401,8 @@ _mapBuilder := func(isEph, ...resourceType) {
 
 
 
-		addService: func(key, value) {
-			builder.createServiceField(key).setRefOrJson(value)
+		addMeta: func(key, value) {
+			builder.createMetaField(key).setRefOrJson(value)
 			return self
 		},
 
@@ -1390,6 +1411,19 @@ _mapBuilder := func(isEph, ...resourceType) {
 
 
 
+
+
+
+
+		addService: func(key, value) {
+			return self.addMeta(key, value)
+		},
+
+
+
+
+
+
 		build: func() {
 			return builder.lockAndBuild()
 		}

package/dist/tengo/lib/tpl.base.lib.tengo

@@ -68,9 +68,9 @@ _unmarshal := func(resource, preprocessors) {
 			}
 		}
 
-		for field, value in resource.serviceInputs() {
+		for field, value in resource.metaInputs() {
 			if value.isErrorSet() {
-				ll.panic("service input %v field has error: %v", field, field.getError().getDataAsJson().message)
+				ll.panic("meta input %v field has error: %v", field, field.getError().getDataAsJson().message)
 			} else if value.isSet() {
 				result[field] = _unmarshal(value.getValue(), preprocessors)
 			} else {
@@ -183,8 +183,16 @@ tpl := func(ops) {
 
 
 
+
 		rawServiceInputs: func() {
-			return self.renderer().get(tplutil.INPUTS_MAP_FIELD).serviceInputs()
+			return self.rawMetaInputs()
+		},
+
+
+
+
+		rawMetaInputs: func() {
+			return self.renderer().get(tplutil.INPUTS_MAP_FIELD).metaInputs()
 		},
 
 
@@ -395,8 +403,8 @@ tpl := func(ops) {
 
 			inputs := self.inputs()
 
-			if len(self.rawServiceInputs()) > 0 {
-				ll.panic("prepare() statement is not available for templates with service inputs in this verson of workflow-tengo SDK")
+			if len(self.rawMetaInputs()) > 0 {
+				ll.panic("prepare() statement is not available for templates with meta inputs in this verson of workflow-tengo SDK")
 			}
 
 
@@ -648,6 +656,7 @@ tpl := func(ops) {
 				registerUnmarshaller    : self.registerUnmarshaller,
 				rawInputs               : self.rawInputs,
 				rawServiceInputs        : self.rawServiceInputs,
+				rawMetaInputs           : self.rawMetaInputs,
 				hasInput                : self.hasInput,
 				inputs                  : self.inputs,
 				defineOutputs           : self.defineOutputs,

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.0",
+  "version": "4.9.2",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",