@platforma-sdk/workflow-tengo 1.6.2 → 1.6.4

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

@@ -89,7 +89,7 @@ _loadPythonRunEnvironment := func(descriptor, softName, softPkg) {
 	}
 
 	venv := venvBuilder.
-		cache(7 * 24 * times.hour).
+		cacheDays(7).
 		build().
 		venv()
 

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

@@ -179,6 +179,7 @@ builder := func() {
 		},
 
 		/**
+		 * @deprecated, use cacheMillis, cacheSeconds, cacheMinutes, cacheHours and cacheDays instead.
 		 * Sets the cache time.
 		 *
 		 * @param time: duration - the cache time from 'times' library.
@@ -192,6 +193,61 @@ builder := func() {
 			return self
 		},
 
+		/**
+		 * Sets the cache time in milliseconds.
+		 *
+		 * @param millis: number
+		 */
+		cacheMillis: func(millis) {
+			ll.assert(is_int(millis) && millis > 0, "cache time must be a number of milliseconds")
+			cache = millis * times.millisecond
+			return self
+		},
+
+		/**
+		 * Sets the cache time in seconds.
+		 *
+		 * @param seconds: number
+		 */
+		cacheSeconds: func(seconds) {
+			ll.assert(is_int(seconds) && seconds > 0, "cache time must be a number of seconds")
+			cache = seconds * times.second
+			return self
+		},
+
+		/**
+		 * Sets the cache time in minutes.
+		 *
+		 * @param minutes: number
+		 */
+		cacheMinutes: func(minutes) {
+			ll.assert(is_int(minutes) && minutes > 0, "cache time must be a number of minutes")
+			cache = minutes * times.minute
+			return self
+		},
+
+		/**
+		 * Sets the cache time in hours.
+		 *
+		 * @param hours: number
+		 */
+		cacheHours: func(hours) {
+			ll.assert(is_int(hours) && hours > 0, "cache time must be a number of hours")
+			cache = hours * times.hour
+			return self
+		},
+
+		/**
+		 * Sets the cache time in days
+		 *
+		 * @param days: number
+		 */
+		cacheDays: func(days) {
+			ll.assert(is_int(days) && days > 0, "cache time must be a number of days")
+			cache = days * times.hour * 24
+			return self
+		},
+		
 		/**
 		 * Sets the number of error lines to be captured.
 		 *

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

@@ -10,6 +10,7 @@ validation := import("@platforma-sdk/workflow-tengo:validation")
 pkg := import("@platforma-sdk/workflow-tengo:exec.package")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
+times := import("times")
 
 _RTYPE_SAVE_RUN_ENV   := { Name: "SaveRunEnv/executor", Version: "1" }
 _INPUT_SETTINGS       := "settings"
@@ -167,6 +168,62 @@ pythonVenv := func() {
 		},
 
 		/**
+		 * Sets the cache time in milliseconds.
+		 *
+		 * @param millis: number
+		 */
+		cacheMillis: func(millis) {
+			ll.assert(is_int(millis) && millis > 0, "cache time must be a number of milliseconds")
+			cache = millis * times.millisecond
+			return self
+		},
+
+		/**
+		 * Sets the cache time in seconds.
+		 *
+		 * @param seconds: number
+		 */
+		cacheSeconds: func(seconds) {
+			ll.assert(is_int(seconds) && seconds > 0, "cache time must be a number of seconds")
+			cache = seconds * times.second
+			return self
+		},
+
+		/**
+		 * Sets the cache time in minutes.
+		 *
+		 * @param minutes: number
+		 */
+		cacheMinutes: func(minutes) {
+			ll.assert(is_int(minutes) && minutes > 0, "cache time must be a number of minutes")
+			cache = minutes * times.minute
+			return self
+		},
+
+		/**
+		 * Sets the cache time in hours.
+		 *
+		 * @param hours: number
+		 */
+		cacheHours: func(hours) {
+			ll.assert(is_int(hours) && hours > 0, "cache time must be a number of hours")
+			cache = hours * times.hour
+			return self
+		},
+
+		/**
+		 * Sets the cache time in days
+		 *
+		 * @param days: number
+		 */
+		cacheDays: func(days) {
+			ll.assert(is_int(days) && days > 0, "cache time must be a number of days")
+			cache = days * times.hour * 24
+			return self
+		},
+
+		/**
+		 * @deprecated, use cacheMillis, cacheSeconds, cacheMinutes, cacheHours and cacheDays instead.
 		 * Sets the cache time.
 		 *
 		 * @param time: duration - the cache time from 'times' library.

package/dist/tengo/lib/pframes.xsv.lib.tengo

@@ -64,8 +64,10 @@ getColumnSpec := func(axesSpec, col) {
  * @param ops: object - additional options
  *               {
  *                 dataOnly: boolean  - set to true to completely skip creation of specs
+ *                 splitDataAndSpec: boolean  - if true, resulting map will have nested structures,
+ *                                              with "spec" + "data" fields in nested maps
  *                 transpose: object - if specified, then the input table will be transposed
- *                            { 
+ *                            {
  *                              separator: string - (optional) use separator instead of inferring from the file extension
  *                              pAxisIdx: index - (optional) the index of the primary axis (column in the input xsv); default 0
  *                              pAxisName: string - (optional) the name of the primary axis (column name in the input xsv); default undefined
@@ -86,7 +88,7 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 
 	xsvFileName := "file." + xsvType
 
-	ops := renderOps({ dataOnly: false }, ops...)
+	ops := renderOps({ dataOnly: false, splitDataAndSpec: false }, ops...)
 
 	if ops.transpose != undefined {
 
@@ -99,7 +101,7 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 			software(transposeXsvSw).
 			printErrStreamToStdout().
 			inLightQueue()
-			
+
 		if (tops.separator != undefined) {
 			transposeXsv = transposeXsv.arg("-input-separator").arg(tops.separator)
 		}
@@ -119,15 +121,15 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 			transposeXsv = transposeXsv.arg("-metric-columns-search").arg(tops.sAxisSearch)
 		}
 		if (tops.sAxisName != undefined) {
-			transposeXsv = transposeXsv.arg("-metric-label").arg(tops.sAxisName)	
+			transposeXsv = transposeXsv.arg("-metric-label").arg(tops.sAxisName)
 		}
 		if (tops.valueName != undefined) {
-			transposeXsv = transposeXsv.arg("-value-label").arg(tops.valueName)	
+			transposeXsv = transposeXsv.arg("-value-label").arg(tops.valueName)
 		}
 		if (tops.separatorOverride != undefined) {
-			transposeXsv = transposeXsv.arg("-separator").arg(tops.separatorOverride)	
+			transposeXsv = transposeXsv.arg("-separator").arg(tops.separatorOverride)
 		}
-		
+
 		transposeXsv = transposeXsv.
 			arg(xsvFileName).
 			arg(transposedFileName).
@@ -170,8 +172,15 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 	for col in spec.columns {
 		id := util.xsvColumnId(col)
 
-		result[id + ".data"] = pf.getFutureInputField(id)
-		result[id + ".spec"] = getColumnSpec(axesSpec, col)
+		if ops.splitDataAndSpec {
+			result[id] = {
+				data: pf.getFutureInputField(id),
+				spec: getColumnSpec(axesSpec, col)
+			}
+		} else {
+			result[id + ".data"] = pf.getFutureInputField(id)
+			result[id + ".spec"] = getColumnSpec(axesSpec, col)
+		}
 	}
 
 	return result
@@ -192,7 +201,7 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
  *                 additionalAxesSpec: AxisSpec[]  - array of additional axes spec to prepend to
  *                                                   each column spec
  *                 transpose: object - if specified, then the input table will be transposed
- *                            { 
+ *                            {
  *                              separator: string - (optional) use separator instead of inferring from the file extension
  *                              pAxisIdx: index - (optional) the index of the primary axis (column in the input xsv); default 0
  *                              pAxisName: string - (optional) the name of the primary axis (column name in the input xsv); default undefined
@@ -249,7 +258,7 @@ importFileMap := func(xsvMap, xsvType, spec, ...ops) {
 			result[id + ".spec"] = columnsSpec[id]
 		}
 	}
-	
+
 	return result
 }
 

package/dist/tengo/lib/render.lib.tengo

@@ -10,6 +10,7 @@ constants := import("@platforma-sdk/workflow-tengo:constants")
 oop := import("@platforma-sdk/workflow-tengo:oop")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 tx := import("tx")
+times := import("times")
 
 
 _SUBSCRIPTION_FIELD := "subscription"
@@ -61,7 +62,7 @@ createUniversal := func(tpl, isEph, inputs) {
 			out := renderer.getFutureOutputField(tplutil.TEMPLATE_OUTPUT_PREFIX + name)
 			if len(cache) > 0 && cache[0] > 0 {
 				cache = cache[0]
-				tx.cacheSetToField(out.id, cache)
+				tx.cacheSetToField(out.id, cache * times.millisecond)
 			}
 
 			return out

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -16,8 +16,8 @@
     "./dist/**/*"
   ],
   "dependencies": {
-    "@milaboratories/software-pframes-conv": "^1.6.2",
-    "@platforma-open/milaboratories.software-small-binaries": "^1.13.2"
+    "@milaboratories/software-pframes-conv": "^1.6.4",
+    "@platforma-open/milaboratories.software-small-binaries": "^1.14.4"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "^1.15.0"