@platforma-sdk/workflow-tengo 4.4.1 → 4.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/dist/tengo/lib/exec.internal.lib.tengo +8 -8
  2. package/dist/tengo/lib/exec.python.lib.tengo +8 -0
  3. package/dist/tengo/tpl/check_network.create_workdir_from_storage.plj.gz +0 -0
  4. package/dist/tengo/tpl/check_network.download_blob.plj.gz +0 -0
  5. package/dist/tengo/tpl/check_network.run_hello_world.plj.gz +0 -0
  6. package/dist/tengo/tpl/check_network.run_hello_world_py.plj.gz +0 -0
  7. package/dist/tengo/tpl/check_network.upload_blob.plj.gz +0 -0
  8. package/dist/tengo/tpl/check_network.upload_template.plj.gz +0 -0
  9. package/dist/tengo/tpl/exec.R.create-renv.plj.gz +0 -0
  10. package/dist/tengo/tpl/exec.exec.plj.gz +0 -0
  11. package/dist/tengo/tpl/exec.monetization_info.plj.gz +0 -0
  12. package/dist/tengo/tpl/exec.monetization_to_json.plj.gz +0 -0
  13. package/dist/tengo/tpl/exec.python.create-venv.plj.gz +0 -0
  14. package/dist/tengo/tpl/exec.python.install-deps.plj.gz +0 -0
  15. package/dist/tengo/tpl/exec.python.venv-bin-path.plj.gz +0 -0
  16. package/dist/tengo/tpl/ll.get-field.plj.gz +0 -0
  17. package/dist/tengo/tpl/pframes.export-multiple-pcolumns.plj.gz +0 -0
  18. package/dist/tengo/tpl/pframes.export-pframe-for-ui.plj.gz +0 -0
  19. package/dist/tengo/tpl/pframes.export-pframe.plj.gz +0 -0
  20. package/dist/tengo/tpl/pframes.export-single-pcolumn.plj.gz +0 -0
  21. package/dist/tengo/tpl/pframes.import-dir.plj.gz +0 -0
  22. package/dist/tengo/tpl/pframes.process-pcolumn-data.plj.gz +0 -0
  23. package/dist/tengo/tpl/pframes.remove-nulls.plj.gz +0 -0
  24. package/dist/tengo/tpl/pframes.slice-data.plj.gz +0 -0
  25. package/dist/tengo/tpl/pframes.xsv-export-pframe.plj.gz +0 -0
  26. package/dist/tengo/tpl/pframes.xsv-import-if-not-null.plj.gz +0 -0
  27. package/dist/tengo/tpl/pframes.xsv-import-map.plj.gz +0 -0
  28. package/dist/tengo/tpl/waiter.waiter.plj.gz +0 -0
  29. package/dist/tengo/tpl/workdir.save.plj.gz +0 -0
  30. package/dist/tengo/tpl/workflow.build-ctx.plj.gz +0 -0
  31. package/dist/tengo/tpl/workflow.query-anchored.plj.gz +0 -0
  32. package/package.json +1 -1
@@ -27,7 +27,8 @@ validation := import("@platforma-sdk/workflow-tengo:validation")
27
27
 
28
28
  _ARG_VAR_PKG := "pkg" // abs path to software package
29
29
  _ARG_VAR_JAVA := "java" // abs path to 'java' run environment
30
- _ARG_VAR_PYTHON := "python" // abs path to 'python' run environment
30
+ _ARG_VAR_PYTHON_VENV := "python" // abs path to python virtual environment. WARNING: not change the name, it's used in other part of code
31
+ _ARG_VAR_PYTHON_RUN_ENV := "python_run_env" // abs path to python run environment used to create venv
31
32
  _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)
32
33
  _ARG_VAR_R := "R" // abs path to 'R' run environment runtime
33
34
  _ARG_VAR_R_VENV := "rVenv" // abs path to 'R' portable virtual environment
@@ -129,19 +130,18 @@ _loadPythonRunEnvironment := func(operationMode, descriptor, softName, softPkg)
129
130
  cacheDays(7).
130
131
  build()
131
132
 
132
- venvRoot := path.join(_expr(_ARG_VAR_PYTHON), "venv")
133
- venvRefKey := softName + "/venv"
134
-
135
- pythonRefVar := _newRefVar(_ARG_VAR_PYTHON, venvRefKey, venv.venv())
133
+ pythonRefVar := _newRefVar(_ARG_VAR_PYTHON_RUN_ENV, softName+"/python", venv.python())
134
+ pythonVenvRefVar := _newRefVar(_ARG_VAR_PYTHON_VENV, softName + "/venv", venv.venv())
136
135
  venvBinDirRefVar := _newRefVar(_ARG_VAR_VENV_BIN_DIR, softName + "/binDir", venv.binDir() )
137
136
 
138
137
  return ll.toStrict({
139
138
  runEnvType: "python",
140
139
 
141
- variables: [ pythonRefVar, venvBinDirRefVar ],
142
- customPaths: [ _newArg(false, path.join(venvRoot, _expr(_ARG_VAR_VENV_BIN_DIR))) ],
140
+ variables: [ pythonRefVar, pythonVenvRefVar, venvBinDirRefVar ],
141
+ customPaths: [ _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_VENV), "venv", _expr(_ARG_VAR_VENV_BIN_DIR))) ],
143
142
  envs: {
144
- "VIRTUAL_ENV": _newArg(false, venvRoot)
143
+ "VIRTUAL_ENV": _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_VENV), "venv")),
144
+ "PYTHONPATH": _newArg(false, path.join(_expr(_ARG_VAR_PYTHON_RUN_ENV), descriptor.runEnv.binDir, "python_stdlib"))
145
145
  }
146
146
  })
147
147
  }
@@ -151,6 +151,14 @@ pythonVenvBuilder := func() {
151
151
 
152
152
 
153
153
 
154
+ python: func() {
155
+ return pythonPkg
156
+ },
157
+
158
+
159
+
160
+
161
+
154
162
  binDir: func() {
155
163
  return tpl.output(_OUTPUT_BIN_DIR, cache)
156
164
  },
Binary file
Binary file
Binary file
Binary file
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platforma-sdk/workflow-tengo",
3
- "version": "4.4.1",
3
+ "version": "4.4.2",
4
4
  "description": "Tengo SDK library",
5
5
  "types": "./dist/index.d.ts",
6
6
  "main": "./dist/index.js",