@platforma-sdk/workflow-tengo 5.5.17 → 5.6.1

package/dist/index.cjs

@@ -22,7 +22,6 @@ 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.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') },

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.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" | "annotations.compute" | "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.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" | "annotations.compute" | "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

@@ -23,7 +23,6 @@ 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.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') },

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

@@ -4,8 +4,11 @@ validation := import("@platforma-sdk/workflow-tengo:validation")
 path := import("@platforma-sdk/workflow-tengo:path")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 
-runcmd := import("@platforma-sdk/workflow-tengo:exec.runcmd")
+workdir := import("@platforma-sdk/workflow-tengo:workdir")
 desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
+pkg := import("@platforma-sdk/workflow-tengo:exec.package")
+runcmd := import("@platforma-sdk/workflow-tengo:exec.runcmd")
+runenv := import("@platforma-sdk/workflow-tengo:exec.runenv")
 
 rVenvInputSchema := {
 	operationMode: "string",
@@ -56,23 +59,35 @@ runRPlan := func(refsPrefix, rPkgRef, rRunEnvDescriptor, rVenvRef) {
 		envExpression("RENV_PATHS_ROOT", renvRootArg).
 		envExpression("RENV_PATHS_BINARY", path.join(renvRootArg, "binaries")).
 		envExpression("RENV_PATHS_SOURCE", path.join(renvRootArg, "sources")).
-		envExpression("RENV_PATHS_CACHE", path.join(renvRootArg, "cache"))
+		envExpression("RENV_PATHS_CACHE", path.join(renvRootArg, "cache")).
+		envExpression("RENV_PATHS_LOCKFILE", path.join(renvRootArg, "renv.lock"))
 
-	if (!is_undefined(rVenvRef)) {
-		plan.
-			refVar(ARG_VAR_R_VENV, rEnvRefKey, rVenvRef).
-			envExpression("RENV_PATHS_RENV", path.join(_expr(ARG_VAR_R_VENV), "r-venv")).
-			envExpression("RENV_PATHS_LOCKFILE", path.join(_expr(ARG_VAR_R_VENV), "renv.lock"))
+	if (is_undefined(rVenvRef)) {
+
+		rVenvRef = "."
 	}
+	plan.
+		refVar(ARG_VAR_R_VENV, rEnvRefKey, rVenvRef).
+		envExpression("RENV_PATHS_RENV", path.join(_expr(ARG_VAR_R_VENV), ".renv"))
 
 
 
 
-	plan.envExpression("RENV_CONFIG_REPOS_OVERRIDE", path.join("{R}", "packages"))
+	plan.envExpression("RENV_CONFIG_REPOS_OVERRIDE", path.join(_expr(ARG_VAR_R), "packages"))
 
 	return plan
 }
 
+
+
+
+
+
+
+
+
+
+
 activateRenvInWD := func(wd, queue, computeResources, plan) {
 	validation.assertType(wd, validation.reference, "exec.R.activateRenvInWD: <wd> must be a reference to workdir")
 	validation.assertType(queue, "string", "exec.R.activateRenvInWD: <queue> must be a string")
@@ -104,6 +119,71 @@ activateRenvInWD := func(wd, queue, computeResources, plan) {
 	return activateRenv.build().workdir
 }
 
+
+
+
+
+
+
+
+
+createDirForRenv := func(rPkgRef) {
+	validation.assertType(rPkgRef, validation.reference, "exec.R.createDirForRenv: <rPkgRef> must be reference to R run environment package")
+
+	deps := runenv.loadFilesFromPackage(rPkgRef, { "renv.lock": path.join(RENV_ROOT_DIR_NAME, "renv.lock") })
+
+	wdForRenv := workdir.builder().
+		inQueue(pkg.DEFAULT_ALLOCATION_QUEUE).
+		cpu(pkg.DEFAULT_ALLOCATION_CPU).
+		mem("1MiB").
+		addFile("renv.lock", deps["renv.lock"]).
+		build()
+
+	envDirCreator := runenv.saveBuilder(wdForRenv).
+		envType("R").
+		addPath("renv.lock").
+		addPackage("R", rPkgRef)
+
+	return envDirCreator.build().runEnv()
+}
+
+
+
+
+
+
+
+
+installDepsIntoRenv := func(workdir, queue, computeResources, plan) {
+	validation.assertType(workdir, validation.reference, "exec.R.installDepsIntoRenv: <workdir> must be a reference to workdir")
+	validation.assertType(queue, "string", "exec.R.installDepsIntoRenv: <queue> must be a string")
+	validation.assertType(computeResources,
+		["or",
+			validation.reference,
+			{ "cpu": "number", "ram": ["or", "number", "string"] }
+			],
+		"exec.R.activateRenvInWD: <computeResources> must be a reference to allocation, or a map with cpu and ram"
+	)
+	validation.assertType(plan, runcmd.RUN_CMD_PLAN_STATE_OR_OBJECT_SCHEMA, "exec.R.installDepsIntoRenv: <plan> must be a run command plan or state")
+
+	depsInstaller := runcmd.builder(workdir, plan).
+		inQueue(queue).
+		cmd("R").
+		arg("--no-echo").
+		arg("--no-restore").
+		arg("-e").arg("renv::restore( clean = TRUE )")
+
+	if (smart.isReference(computeResources)) {
+		depsInstaller.allocation(computeResources)
+	} else {
+		depsInstaller.
+			cpu(computeResources.cpu).
+			mem(computeResources.ram)
+	}
+
+	return depsInstaller.build().workdir
+}
+
 export ll.toStrict({
 
 	ARG_VAR_R                          : ARG_VAR_R,
@@ -115,5 +195,7 @@ export ll.toStrict({
 
 
 	runRPlan                           : runRPlan,
-	activateRenvInWD                   : activateRenvInWD
+	activateRenvInWD                   : activateRenvInWD,
+	createDirForRenv                   : createDirForRenv,
+	installDepsIntoRenv                : installDepsIntoRenv
 })

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

@@ -1,19 +1,12 @@
 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.R.internal")
 desc := import("@platforma-sdk/workflow-tengo:exec.descriptor")
 
-_OUTPUT_RUN_ENV       := "runEnv"
-
-createRenvTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:exec.R.create-renv")
-
 rVenvBuilder := func() {
 	self := undefined
 
@@ -139,31 +132,10 @@ rVenvBuilder := func() {
 
 		build: func() {
 			archiveRef := pkg.get(rRunEnvDescriptor.registry, rRunEnvDescriptor.package).archive()
-			rPkgRef := pkg.install(archiveRef).package()
-
-			rVenvInputs := {
-				operationMode: opMode,
-				toolset: toolset,
-				dependencies: dependencies,
-				software: softwareRef,
-				rRunEnvDescriptor: rRunEnvDescriptor,
-				R: rPkgRef
-			}
-
-			validation.assertType(rVenvInputs, internal.rVenvInputSchema, "incomplete R runenv configuration")
-			tpl := render.create(createRenvTpl, rVenvInputs)
+			rPkgRef := pkg.install(archiveRef).package().setCacheDays(1)
 
 			self := undefined
-			self = ll.toStrict(oop.inherit(tpl, {
-
-
-
-
-
-				venv: func() {
-					return tpl.output(_OUTPUT_RUN_ENV, cache)
-				},
-
+			self = ll.toStrict({
 
 
 
@@ -173,7 +145,7 @@ rVenvBuilder := func() {
 
 					return rPkgRef
 				}
-			}))
+			})
 
 			return self
 		}
@@ -186,5 +158,6 @@ rVenvBuilder := func() {
 export ll.toStrict({
 	rVenvBuilder                        : rVenvBuilder,
 	runRPlan                            : internal.runRPlan,
-	activateRenvInWD                    : internal.activateRenvInWD
+	activateRenvInWD                    : internal.activateRenvInWD,
+	installDepsIntoRenv                 : internal.installDepsIntoRenv
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "5.5.17",
+  "version": "5.6.1",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
     "@platforma-open/milaboratories.software-ptexter": "1.2.0"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "2.3.5"
+    "@platforma-sdk/tengo-builder": "2.3.9"
   },
   "scripts": {
     "type-check": "pl-tengo check",