@platforma-sdk/workflow-tengo 4.4.0 → 4.4.2

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

@@ -23,14 +23,23 @@ 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_PYTHON_VENV    := "python" // abs path to python virtual environment. WARNING: not change the name, it's used in other part of code
+_ARG_VAR_PYTHON_RUN_ENV := "python_run_env" // abs path to python run environment used to create venv
+_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,21 +128,20 @@ _loadPythonRunEnvironment := func(operationMode, descriptor, softName, softPkg)
 
 	venv := venvBuilder.
 		cacheDays(7).
-		build().
-		venv()
-
-	venvRoot := path.join(_expr(_ARG_VAR_PYTHON), "venv")
-	venvRefKey := softName + "/venv"
+		build()
 
-	pythonRefVar := _newRefVar(_ARG_VAR_PYTHON, venvRefKey, venv)
+	pythonRefVar := _newRefVar(_ARG_VAR_PYTHON_RUN_ENV, softName+"/python", venv.python())
+	pythonVenvRefVar := _newRefVar(_ARG_VAR_PYTHON_VENV, softName + "/venv", 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, pythonVenvRefVar, venvBinDirRefVar ],
+		customPaths: [ _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_VENV), "venv", _expr(_ARG_VAR_VENV_BIN_DIR))) ],
 		envs: {
-			"VIRTUAL_ENV": _newArg(false, venvRoot)
+			"VIRTUAL_ENV": _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_VENV), "venv")),
+			"PYTHONPATH": _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_RUN_ENV), descriptor.runEnv.binDir, "python_stdlib"))
 		}
 	})
 }

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,22 @@ pythonVenvBuilder := func() {
 
 
 
+				python: func() {
+					return pythonPkg
+				},
+
+
+
+
+
+				binDir: func() {
+					return tpl.output(_OUTPUT_BIN_DIR, cache)
+				},
+
+
+
+
+
 
 				venv: func() {
 					return tpl.output(_OUTPUT_RUN_ENV, cache)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",