@platforma-sdk/workflow-tengo 4.8.1 → 4.9.0

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.R.create-renv" | "exec.delayed_compute_allocation" | "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.python.create-venv" | "exec.monetization_to_json" | "exec.exec" | "exec.monetization_info" | "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" | "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,8 +7,8 @@ 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') },
-  'exec.R.create-renv': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.R.create-renv.plj.gz') },
-  'exec.delayed_compute_allocation': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.delayed_compute_allocation.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') },
   'exec.python.venv-bin-path': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.python.venv-bin-path.plj.gz') },
   'pframes.export-multiple-pcolumns': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.export-multiple-pcolumns.plj.gz') },
@@ -17,10 +17,12 @@ module.exports = { Templates: {
   'check_network.download_blob': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.download_blob.plj.gz') },
   'check_network.upload_blob': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.upload_blob.plj.gz') },
   'check_network.upload_template': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.upload_template.plj.gz') },
+  'exec.R.create-renv': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.R.create-renv.plj.gz') },
+  'exec.exec-impl': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.exec-impl.plj.gz') },
+  'exec.monetization_info': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_info.plj.gz') },
   'exec.python.create-venv': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.python.create-venv.plj.gz') },
-  'exec.monetization_to_json': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_to_json.plj.gz') },
+  'exec.load-software.impl': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.load-software.impl.plj.gz') },
   'exec.exec': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.exec.plj.gz') },
-  'exec.monetization_info': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_info.plj.gz') },
   'pframes.xsv-export-pframe': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-map.plj.gz') },

package/dist/index.mjs

@@ -8,8 +8,8 @@ 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') },
-  'exec.R.create-renv': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.R.create-renv.plj.gz') },
-  'exec.delayed_compute_allocation': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.delayed_compute_allocation.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') },
   'exec.python.venv-bin-path': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.python.venv-bin-path.plj.gz') },
   'pframes.export-multiple-pcolumns': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.export-multiple-pcolumns.plj.gz') },
@@ -18,10 +18,12 @@ export const Templates = {
   'check_network.download_blob': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.download_blob.plj.gz') },
   'check_network.upload_blob': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.upload_blob.plj.gz') },
   'check_network.upload_template': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.upload_template.plj.gz') },
+  'exec.R.create-renv': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.R.create-renv.plj.gz') },
+  'exec.exec-impl': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.exec-impl.plj.gz') },
+  'exec.monetization_info': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_info.plj.gz') },
   'exec.python.create-venv': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.python.create-venv.plj.gz') },
-  'exec.monetization_to_json': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_to_json.plj.gz') },
+  'exec.load-software.impl': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.load-software.impl.plj.gz') },
   'exec.exec': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.exec.plj.gz') },
-  'exec.monetization_info': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_info.plj.gz') },
   'pframes.xsv-export-pframe': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-map.plj.gz') },

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

@@ -22,9 +22,12 @@ runRBuilder := func(operationMode, wd, rPackage, rDescriptor) {
 	rule := feats.commandExpressions ? "R" : "{R}"
 
 	builder := runcmd.builder(wd).
+		inQueue("light").
+		cpu(1).
+		mem("1GiB").
 		ref("r-run-environment", rPackage).
 		substitutionRule(rule, "r-run-environment").
-		addToPath(t, path.join("{R}", rDescriptor.binDir)).
+		addPathTyped(t, path.join("{R}", rDescriptor.binDir)).
 		envTyped("RHOME", t, "{R}").
 		envTyped("R_HOME_DIR", t, "{R}").
 		envTyped("RENV_PATHS_ROOT", t, path.join("{R}", "renv-root")).

package/dist/tengo/lib/exec.delayed-compute-allocation.lib.tengo

@@ -0,0 +1,43 @@
+render := import("@platforma-sdk/workflow-tengo:render")
+smart := import("@platforma-sdk/workflow-tengo:smart")
+assets := import("@platforma-sdk/workflow-tengo:assets")
+validation := import("@platforma-sdk/workflow-tengo:validation")
+
+tpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.delayed-compute-allocation.impl")
+
+
+
+
+
+
+
+
+
+
+
+
+create := func(workdir, req) {
+	validation.assertType(req, {
+		"queue": "string",
+		"cpu,?": "number",
+		"ram,?": ["or", "number", "string"]
+	}, "request must be a valid request")
+
+	reqMap := { queue: req.queue }
+	if !is_undefined(req.cpu) {
+		reqMap.cpu = req.cpu
+	}
+	if !is_undefined(req.ram) {
+		reqMap.ram = req.ram
+	}
+
+	delayedComputeAllocation := render.createEphemeral(tpl, {
+		request: smart.createJsonResource(reqMap),
+		wd: workdir
+	})
+	return delayedComputeAllocation.output("allocation")
+}
+
+export {
+	create: create
+}

package/dist/tengo/lib/exec.load-software.lib.tengo

@@ -0,0 +1,32 @@
+
+
+
+
+render := import("@platforma-sdk/workflow-tengo:render")
+smart := import("@platforma-sdk/workflow-tengo:smart")
+assets := import("@platforma-sdk/workflow-tengo:assets")
+ll := import("@platforma-sdk/workflow-tengo:ll")
+
+times := import("times")
+
+loadSoftwareTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.load-software.impl")
+
+
+
+
+
+
+loadSoftware := func(software) {
+	loadSoftwareResult := render.create(loadSoftwareTpl, {
+		software: smart.createJsonResource({
+			name: software.name,
+			version: software.version,
+			descriptor: ll.fromStrict(software.descriptor)
+		})
+	})
+	return loadSoftwareResult.output("plan", 9 * times.hour * 24)
+}
+
+export {
+	loadSoftware: loadSoftware
+}

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

@@ -6,6 +6,9 @@ assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 validation := import("@platforma-sdk/workflow-tengo:validation")
+loadSoftware := import("@platforma-sdk/workflow-tengo:exec.load-software")
+
+mnzSw := assets.importSoftware("@platforma-open/milaboratories.software-small-binaries:mnz-client")
 
 mznInfoTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.monetization_info")
 
@@ -116,6 +119,8 @@ builder := func(productKey) {
 		build: func() {
 			ll.assert(!is_undefined(date), "monetization.builder().build: date must be set")
 
+			mnzPlan := loadSoftware.loadSoftware(mnzSw)
+
 
 
 
@@ -126,7 +131,8 @@ builder := func(productKey) {
 					date: date, // solely for deduplication
 					monetization: monetization.toJson(mnz),
 					filesToAdd: filesToAdd,
-					filesToWrite: filesToWrite
+					filesToWrite: filesToWrite,
+					mnzPlan: mnzPlan
 				}
 			)
 

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

@@ -4,17 +4,14 @@ base64 := import("base64")
 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")
-internal := import("@platforma-sdk/workflow-tengo:exec.internal")
 fmt := import("fmt")
 text := import("text")
 runcmd := import("@platforma-sdk/workflow-tengo:exec.runcmd")
 workdir := import("@platforma-sdk/workflow-tengo:workdir")
 render := import("@platforma-sdk/workflow-tengo:render")
-constants := import("@platforma-sdk/workflow-tengo:exec.constants")
 slices := import("@platforma-sdk/workflow-tengo:slices")
 sets := import("@platforma-sdk/workflow-tengo:sets")
 
@@ -212,28 +209,26 @@ setUrl := func(mnz, url) {
 
 
 
-run := func(mnz, wd, queue) {
-	_validateIsReady(mnz)
-
-	mnzSw := assets.importSoftware("@platforma-open/milaboratories.software-small-binaries:mnz-client")
-
-	exprType := feats.commandExpressions ? constants.ARG_TYPE_EXPRESSION : constants.ARG_TYPE_VAR
 
-	builder := runcmd.builder(wd)
-	builder.envTyped("MI_LICENSE", exprType, "{secrets.MI_LICENSE}")
 
-	opts := internal.swToRunCmdOptions(mnzSw.name, mnzSw.version, mnzSw.descriptor)
+run := func(mnz, wd, plan, queue, ...allocationOpt) {
+	_validateIsReady(mnz)
 
-	for _, varInfo in opts.variables {
-		builder.ref(varInfo.refName, varInfo.reference)
-		builder.substitutionRule(varInfo.varName, varInfo.refName)
+	allocation := undefined
+	if len(allocationOpt) > 0 {
+		allocation = allocationOpt[0]
 	}
 
-	builder.cmdTyped(exprType, opts.cmd.value)
-	for _, arg in opts.args {
+	builder := runcmd.builder(wd, plan).
+		inQueue(queue)
 
-		builder.argTyped(exprType, arg)
+	if is_undefined(allocation) {
+		builder.cpu(1).mem("512MiB")
+	} else {
+		builder.allocation(allocation)
 	}
+
+	builder.envExpression("MI_LICENSE", "{secrets.MI_LICENSE}")
 	if mnz.isDryRun {
 		builder.arg("-dry-run")
 	}
@@ -252,7 +247,6 @@ run := func(mnz, wd, queue) {
 		}
 	}
 
-	builder.inQueue(queue)
 	stdoutName := "mnz_stdout.txt"
 	builder.stdout(stdoutName)
 	run := builder.build()