@platforma-sdk/workflow-tengo 5.3.9 → 5.4.0

package/dist/index.cjs

@@ -23,6 +23,7 @@ module.exports = { Templates: {
   '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.conda.create-env': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.conda.create-env.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') },

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-parquet-pcolumn-chunk" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "pt.import-dir" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "workflow.query-anchored" | "anonymize.deanonymize" | "anonymize.impl" | "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" | "pframes.parse-to-json" | "exec.load-software.impl" | "exec.exec" | "pt.workflow-run" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "pframes.process-pcolumn-data" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
+declare type TplName = "ll.get-field" | "pframes.export-parquet-pcolumn-chunk" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "pt.import-dir" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "workflow.query-anchored" | "anonymize.deanonymize" | "anonymize.impl" | "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.conda.create-env" | "exec.exec-impl" | "exec.monetization_info" | "exec.python.create-venv" | "pframes.parse-to-json" | "exec.load-software.impl" | "exec.exec" | "pt.workflow-run" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "pframes.process-pcolumn-data" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -24,6 +24,7 @@ export const Templates = {
   '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.conda.create-env': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.conda.create-env.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') },

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

@@ -0,0 +1,14 @@
+ll := import("@platforma-sdk/workflow-tengo:ll")
+validation := import("@platforma-sdk/workflow-tengo:validation")
+desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
+
+condaEnvInputSchema := {
+	"condaPackage": validation.reference,
+	"condaDescriptor": desc.condaScheme,
+
+	"forceRecreate,?": "number"
+}
+
+export ll.toStrict({
+	condaEnvInputSchema                     : condaEnvInputSchema
+})

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

@@ -0,0 +1,156 @@
+json := import("json")
+times := import("times")
+
+ll := import("@platforma-sdk/workflow-tengo:ll")
+oop := import("@platforma-sdk/workflow-tengo:oop")
+validation := import("@platforma-sdk/workflow-tengo:validation")
+assets := import("@platforma-sdk/workflow-tengo:assets")
+smart := import("@platforma-sdk/workflow-tengo:smart")
+render := import("@platforma-sdk/workflow-tengo:render")
+pkg := import("@platforma-sdk/workflow-tengo:exec.package")
+internal := import("@platforma-sdk/workflow-tengo:exec.conda.internal")
+desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
+
+_OUTPUT_RUN_ENV       := "runEnv"
+
+createEnvTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.conda.create-env")
+
+
+
+
+
+
+
+condaBuilder := func(descriptor) {
+	self := undefined
+
+	validation.assertType(descriptor, desc.condaScheme, "exec.conda.builder: <descriptor> must be conda software specification")
+	ll.assert(descriptor.type == "conda", "exec.conda.builder: <descriptor> must be conda software specification, not %q", descriptor.type)
+	condaDescriptor := ll.fromStrict(descriptor)
+	softwareRef := undefined
+
+	cache := 0
+
+	self = {
+
+
+
+
+
+		software: func(pkgRef) {
+			validation.assertType(pkgRef, validation.reference, "exec.conda.software: <pkgRef> must be a reference to software package")
+
+			softwareRef = pkgRef
+			return self
+		},
+
+
+
+
+
+
+		cacheMillis: func(millis) {
+			ll.assert(is_int(millis) && millis > 0, "exec.conda.cacheMillis: cache time must be a number of milliseconds")
+			cache = millis * times.millisecond
+			return self
+		},
+
+
+
+
+
+
+		cacheSeconds: func(seconds) {
+			ll.assert(is_int(seconds) && seconds > 0, "exec.conda.cacheSeconds: cache time must be a number of seconds")
+			cache = seconds * times.second
+			return self
+		},
+
+
+
+
+
+
+		cacheMinutes: func(minutes) {
+			ll.assert(is_int(minutes) && minutes > 0, "exec.conda.cacheMinutes: cache time must be a number of minutes")
+			cache = minutes * times.minute
+			return self
+		},
+
+
+
+
+
+
+		cacheHours: func(hours) {
+			ll.assert(is_int(hours) && hours > 0, "exec.conda.cacheHours: cache time must be a number of hours")
+			cache = hours * times.hour
+			return self
+		},
+
+
+
+
+
+
+		cacheDays: func(days) {
+			ll.assert(is_int(days) && days > 0, "exec.conda.cacheDays: cache time must be a number of days")
+			cache = days * times.hour * 24
+			return self
+		},
+
+
+
+
+
+
+
+		build: func() {
+			if (is_undefined(softwareRef)) {
+
+				archive := pkg.get(condaDescriptor.registry, condaDescriptor.package).archive()
+				softwareRef = pkg.install(archive).package()
+			}
+
+			envInputs := {
+				condaPackage: softwareRef,
+				condaDescriptor: condaDescriptor,
+
+				forceRecreate: 1 // increment to force venv re-creation in blocks
+			}
+
+			validation.assertType(envInputs, internal.condaEnvInputSchema, "invalid conda environment configuration")
+			tpl := render.create(createEnvTpl, envInputs)
+
+			self := undefined
+			self = ll.toStrict(oop.inherit(tpl, {
+
+
+
+
+
+				conda: func() {
+					return softwareRef
+				},
+
+
+
+
+
+
+
+				env: func() {
+					return tpl.output(_OUTPUT_RUN_ENV, cache)
+				}
+			}))
+
+			return self
+		}
+	}
+
+	return self
+}
+
+export ll.toStrict({
+	condaBuilder                        : condaBuilder
+})

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

@@ -1,3 +1,4 @@
+ll := import("@platforma-sdk/workflow-tengo:ll")
 render := import("@platforma-sdk/workflow-tengo:render")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 assets := import("@platforma-sdk/workflow-tengo:assets")
@@ -38,6 +39,6 @@ create := func(workdir, req) {
 	return delayedComputeAllocation.output("allocation")
 }
 
-export {
+export ll.toStrict({
 	create: create
-}
+})

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

@@ -2,6 +2,7 @@
 
 
 
+ll := import("@platforma-sdk/workflow-tengo:ll")
 
 runEnvScheme := {
 	registry: "string",
@@ -22,6 +23,17 @@ binaryScheme := {
 	"runEnv,?": runEnvScheme
 }
 
+condaScheme := {
+	registry: "string",
+	package: "string",
+	cmd: ["string"],
+	"envVars,?": ["string"],
+
+	"micromamba-version": "string",
+	"conda-root-dir": "string",
+	spec: "string"
+}
+
 assetScheme := {
 	registry: "string",
 	package: "string",
@@ -43,10 +55,11 @@ scheme := {
 	"local,?": localScheme
 }
 
-export {
+export ll.toStrict({
 	runEnvScheme: runEnvScheme,
 	binaryScheme: binaryScheme,
+	condaScheme: condaScheme,
 	assetScheme: assetScheme,
 	localScheme: localScheme,
 	scheme: scheme
-}
+})

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

@@ -2,10 +2,10 @@
 
 
 
+ll := import("@platforma-sdk/workflow-tengo:ll")
 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")
 
@@ -27,6 +27,6 @@ loadSoftware := func(software) {
 	return loadSoftwareResult.output("plan", 9 * times.hour * 24)
 }
 
-export {
+export ll.toStrict({
 	loadSoftware: loadSoftware
-}
+})

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

@@ -143,6 +143,6 @@ builder := func(productKey) {
 	return self
 }
 
-export {
+export ll.toStrict({
 	builder: builder
-}
+})

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

@@ -129,7 +129,7 @@ pythonVenvBuilder := func() {
 		},
 
 		build: func() {
-			depsMap := runenv.loadDependencyFiles(softwareRef, dependencies)
+			depsMap := runenv.loadFilesFromPackage(softwareRef, dependencies)
 
 			archive := pkg.get(pythonDescriptor.registry, pythonDescriptor.package).archive()
 			pythonPkg := pkg.install(archive).package()

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

@@ -2,6 +2,8 @@
 
 
 
+text := import("text")
+
 ll := import("@platforma-sdk/workflow-tengo:ll")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 feats := import("@platforma-sdk/workflow-tengo:feats")
@@ -385,6 +387,8 @@ _createAbstractRunCommandPlan := func(state, returnSelfFn) {
 
 
 		substitutionRule: func(varName, refKey) {
+			validation.assert(!text.contains(varName, "-"), "runcmd.plan.substitutionRule: varName must not contain '-' character: it is interpreted as 'minus' sign")
+
 			state.options.substRules[varName] = refKey
 			return returnSelfFn()
 		},

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

@@ -94,7 +94,17 @@ saveBuilder := func(wd) {
 	return self
 }
 
-loadDependencyFiles := func(packageRef, dependencies) {
+
+
+
+
+
+
+
+
+
+
+loadFilesFromPackage := func(packageRef, dependencies) {
 	if len(dependencies) == 0 {
 		return {}
 	}
@@ -115,6 +125,6 @@ loadDependencyFiles := func(packageRef, dependencies) {
 }
 
 export ll.toStrict({
-	saveBuilder                        : saveBuilder,
-	loadDependencyFiles                : loadDependencyFiles
+	saveBuilder                             : saveBuilder,
+	loadFilesFromPackage                    : loadFilesFromPackage
 })

package/dist/tengo/lib/ll.get-future-field-default.lib.tengo

@@ -132,6 +132,6 @@ getFutureFieldWithDefault := func(from, name, fieldType, isEph, ...options) {
 	return resultFieldId
 }
 
-export {
+export plapi.mapToStrict({
 	getFutureFieldWithDefault: getFutureFieldWithDefault
-}
+})

package/dist/tengo/lib/pframes.export-pframe.lib.tengo

@@ -129,6 +129,6 @@ exportPFrame := func(pfResource, skipHideDataFromUI) {
 	return result.build()
 }
 
-export {
+export ll.toStrict({
 	exportPFrame: exportPFrame
-}
+})

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

@@ -381,7 +381,12 @@ assert := func(condition, msg, ...args) {
 
 
 assertType := func(value, schema, ...failMsg) {
-	r := _validateJson(value, schema, "")
+	r := undefined
+	if (is_undefined(schema)) {
+		r = fail("", "no schema provided for value. To require value to be undefined, simply use is_undefined() check")
+	} else {
+		r = _validateJson(value, schema, "")
+	}
 
 	msg := "type schema validation error"
 	if len(failMsg) > 0 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "5.3.9",
+  "version": "5.4.0",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -18,8 +18,8 @@
   "dependencies": {
     "@milaboratories/software-pframes-conv": "2.2.9",
     "@platforma-open/milaboratories.software-small-binaries": "^1.15.23",
-    "@platforma-open/milaboratories.software-ptabler": "1.12.9",
-    "@platforma-open/milaboratories.software-ptexter": "1.1.1"
+    "@platforma-open/milaboratories.software-ptexter": "1.1.1",
+    "@platforma-open/milaboratories.software-ptabler": "1.12.10"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "2.3.2"