@platforma-sdk/workflow-tengo 4.3.2 → 4.4.1

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.python.install-deps" | "pframes.export-multiple-pcolumns" | "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" | "pframes.process-pcolumn-data" | "pframes.slice-data" | "check_network.create_workdir_from_storage" | "check_network.download_blob" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "check_network.upload_blob" | "check_network.upload_template" | "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.R.create-renv" | "exec.python.install-deps" | "exec.python.venv-bin-path" | "pframes.export-multiple-pcolumns" | "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" | "pframes.process-pcolumn-data" | "pframes.slice-data" | "check_network.create_workdir_from_storage" | "check_network.download_blob" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "check_network.upload_blob" | "check_network.upload_template" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -9,6 +9,7 @@ module.exports = { Templates: {
   '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.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') },
   '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') },

package/dist/index.mjs

@@ -10,6 +10,7 @@ export const Templates = {
   '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.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') },
   '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') },

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

@@ -23,14 +23,22 @@ desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 
 
+
+
 _ARG_VAR_PKG            := "pkg"  // abs path to software package
 _ARG_VAR_JAVA           := "java" // abs path to 'java' run environment
 _ARG_VAR_PYTHON         := "python" // abs path to 'python' run environment
+_ARG_VAR_VENV_BIN_DIR   := "venv_bin_dir" // name of bin dir in python venv depending on OS type (Scripts on Windows, bin on Unix)
 _ARG_VAR_R              := "R" // abs path to 'R' run environment runtime
 _ARG_VAR_R_VENV         := "rVenv" // abs path to 'R' portable virtual environment
 _ARG_VAR_MNZ            := "monetization" // monetization env value
 
 
+
+
+pythonBinDir := undefined
+
+
 _expr := func(varName) {
 	return "{" + varName + "}"
 }
@@ -119,19 +127,19 @@ _loadPythonRunEnvironment := func(operationMode, descriptor, softName, softPkg)
 
 	venv := venvBuilder.
 		cacheDays(7).
-		build().
-		venv()
+		build()
 
 	venvRoot := path.join(_expr(_ARG_VAR_PYTHON), "venv")
 	venvRefKey := softName + "/venv"
 
-	pythonRefVar := _newRefVar(_ARG_VAR_PYTHON, venvRefKey, venv)
+	pythonRefVar := _newRefVar(_ARG_VAR_PYTHON, venvRefKey, venv.venv())
+	venvBinDirRefVar := _newRefVar(_ARG_VAR_VENV_BIN_DIR, softName + "/binDir", venv.binDir() )
 
 	return ll.toStrict({
 		runEnvType: "python",
 
-		variables: [ pythonRefVar ],
-		customPaths: [ _newArg(false, path.join(venvRoot, "bin")) ],
+		variables: [ pythonRefVar, venvBinDirRefVar ],
+		customPaths: [ _newArg(false, path.join(venvRoot, _expr(_ARG_VAR_VENV_BIN_DIR))) ],
 		envs: {
 			"VIRTUAL_ENV": _newArg(false, venvRoot)
 		}

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

@@ -12,6 +12,7 @@ runenv := import("@platforma-sdk/workflow-tengo:exec.runenv")
 desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
 
 _OUTPUT_RUN_ENV       := "runEnv"
+_OUTPUT_BIN_DIR       := "binDir"
 
 createVenvTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.python.create-venv")
 
@@ -150,6 +151,14 @@ pythonVenvBuilder := func() {
 
 
 
+				binDir: func() {
+					return tpl.output(_OUTPUT_BIN_DIR, cache)
+				},
+
+
+
+
+
 
 				venv: func() {
 					return tpl.output(_OUTPUT_RUN_ENV, cache)

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

@@ -231,7 +231,7 @@ builder := func(workdir) {
 
 		ref: func(refKey, ref) {
 			ll.assert(smart.isReference(ref),
-				"runcmd.builder().ref() must be a reference (valid field or resource)")
+				"runcmd.builder().ref() must be a reference (valid field or resource) %s", refKey)
 
 			ll.assert(!maps.containsKey(refs, refKey),
 				"attempt to override existing reference %q", refKey)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "4.3.2",
+  "version": "4.4.1",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@milaboratories/software-pframes-conv": "2.2.2",
-    "@platforma-open/milaboratories.software-small-binaries": "^1.15.20"
+    "@platforma-open/milaboratories.software-small-binaries": "^1.15.21"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "^2.1.3"