@platforma-sdk/workflow-tengo 4.5.2 → 4.6.0

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" | "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 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" | "pframes.slice-data" | "check_network.create_workdir_from_storage" | "check_network.download_blob" | "check_network.upload_blob" | "check_network.upload_template" | "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" | "check_network.run_hello_world" | "check_network.run_hello_world_py" | "pframes.process-pcolumn-data" | "pframes.export-pframe" | "pframes.export-pframe-for-ui";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -11,6 +11,11 @@ module.exports = { Templates: {
   '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') },
+  'pframes.slice-data': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.slice-data.plj.gz') },
+  'check_network.create_workdir_from_storage': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.create_workdir_from_storage.plj.gz') },
+  '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.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') },
   'exec.exec': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.exec.plj.gz') },
@@ -18,14 +23,9 @@ module.exports = { Templates: {
   'pframes.xsv-export-pframe': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-map.plj.gz') },
-  'pframes.process-pcolumn-data': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.process-pcolumn-data.plj.gz') },
-  'pframes.slice-data': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.slice-data.plj.gz') },
-  'check_network.create_workdir_from_storage': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.create_workdir_from_storage.plj.gz') },
-  'check_network.download_blob': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.download_blob.plj.gz') },
   'check_network.run_hello_world': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.run_hello_world.plj.gz') },
   'check_network.run_hello_world_py': { type: 'from-file', path: require.resolve('./tengo/tpl/check_network.run_hello_world_py.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') },
+  'pframes.process-pcolumn-data': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.process-pcolumn-data.plj.gz') },
   'pframes.export-pframe': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.export-pframe.plj.gz') },
   'pframes.export-pframe-for-ui': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.export-pframe-for-ui.plj.gz') }
 }};

package/dist/index.mjs

@@ -12,6 +12,11 @@ export const Templates = {
   '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') },
+  'pframes.slice-data': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.slice-data.plj.gz') },
+  'check_network.create_workdir_from_storage': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.create_workdir_from_storage.plj.gz') },
+  '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.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') },
   'exec.exec': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.exec.plj.gz') },
@@ -19,14 +24,9 @@ export const Templates = {
   'pframes.xsv-export-pframe': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-map.plj.gz') },
-  'pframes.process-pcolumn-data': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.process-pcolumn-data.plj.gz') },
-  'pframes.slice-data': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.slice-data.plj.gz') },
-  'check_network.create_workdir_from_storage': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.create_workdir_from_storage.plj.gz') },
-  'check_network.download_blob': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.download_blob.plj.gz') },
   'check_network.run_hello_world': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.run_hello_world.plj.gz') },
   'check_network.run_hello_world_py': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/check_network.run_hello_world_py.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') },
+  'pframes.process-pcolumn-data': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.process-pcolumn-data.plj.gz') },
   'pframes.export-pframe': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.export-pframe.plj.gz') },
   'pframes.export-pframe-for-ui': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.export-pframe-for-ui.plj.gz') }
 };

package/dist/tengo/lib/pframes.bundle.lib.tengo

@@ -1,17 +1,13 @@
 smart := import("@platforma-sdk/workflow-tengo:smart")
 json := import("json")
-text := import("text")
 pConstants := import("@platforma-sdk/workflow-tengo:pframes.constants")
 bquery := import("@platforma-sdk/workflow-tengo:workflow.bquery")
 canonical := import("@platforma-sdk/workflow-tengo:canonical")
 pSpec := import("@platforma-sdk/workflow-tengo:pframes.spec")
-pBuilder := import("@platforma-sdk/workflow-tengo:pframes.builder")
 maps := import("@platforma-sdk/workflow-tengo:maps")
 ll := import("@platforma-sdk/workflow-tengo:ll")
-xsv := import("@platforma-sdk/workflow-tengo:pframes.xsv")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
-strings := import("@platforma-sdk/workflow-tengo:strings")
 
 
 
@@ -167,7 +163,6 @@ createBuilder := func(ctx) {
 				ll.panic("Invalid options type. Expected map got ", ops[1])
 			}
 			if !is_undefined(ops[1].overrides) {
-				
 
 				decodedQuery = maps.deepMerge(decodedQuery, ops[1].overrides)
 			}
@@ -175,7 +170,7 @@ createBuilder := func(ctx) {
 
 
 		decodedQuery.matchStrategy = "expectMultiple"
-		
+
 		keyToUse := undefined
 		if !is_undefined(queryKey) {
 			keyToUse = queryKey
@@ -379,18 +374,20 @@ pColumnBundleUnmarshaller := func() {
 				if is_array(result) {
 					arr := []
 					for i, r in result {
-						k := resultKey + string(i)
+						ll.assert(!is_undefined(r.ref), "Expected ref in result: %v", r)
+						k := resultKey + "." + canonical.encode(r.ref)
 						el := {
 							key: k,
 							spec: r.spec,
 							data: r.data
 						}
-						pool[k] = el 
+						pool[k] = el
 						arr = append(arr, el)
 					}
 					pool[resultKey] = arr
 				} else {
 					pool[resultKey] = {
+						key: resultKey,
 						spec: result.spec,
 						data: result.data
 					}
@@ -423,6 +420,7 @@ pColumnBundleUnmarshaller := func() {
 
 
 
+
 				getColumns: func(resultKey) {
 					result := get(resultKey)
 					if !is_array(result) {
@@ -436,12 +434,39 @@ pColumnBundleUnmarshaller := func() {
 
 
 
+
 				getColumn: func(resultKey) {
-					result := get(resultKey)
+					processedId := processColumnId(resultKey)
+					columnKeyForPool := processedId.columnKey // Key to fetch from the pool (source for filtered)
+					columnAxisFilters := processedId.axisFilters // Filters from FilteredPColumnId
+					outputKey := processedId.canonicalId // Key for the output, canonical of original input or filtered ID
+
+					result := pool[columnKeyForPool]
+					if is_undefined(result) {
+						ll.panic("Column not found: %v. Pool: %v", columnKeyForPool, maps.getKeys(pool))
+					}
+
 					if is_array(result) {
-						ll.panic("Cannot get a single column from a multi-column result: %v. Use getColumns() instead.", resultKey)
+						ll.panic("Cannot get a single column from a multi-column result: %v. Use getColumns() instead.", columnKeyForPool)
+					}
+
+					currentSpec := bundle.getSpec(resultKey) // getSpec already handles filtering for the spec
+					currentData := result.data
+
+
+					if !is_undefined(columnAxisFilters) && len(columnAxisFilters) > 0 {
+						sliceDataTemplate := assets.importTemplate("@platforma-sdk/workflow-tengo:pframes.slice-data")
+						currentData = render.createEphemeral(sliceDataTemplate, {
+							data: currentData,
+							slicingParams: smart.createJsonResource(columnAxisFilters)
+						}).output("result")
+					}
+
+					return {
+						key: outputKey,
+						spec: currentSpec,
+						data: currentData
 					}
-					return result
 				},
 
 
@@ -463,7 +488,7 @@ pColumnBundleUnmarshaller := func() {
 					if is_array(result) {
 						ll.panic("Cannot get a single column from a multi-column result: " + columnKey + ". Use get() instead.")
 					}
-					
+
 					baseSpec := result.spec
 
 
@@ -489,294 +514,6 @@ pColumnBundleUnmarshaller := func() {
 
 					axisHeaderOverrides = [[matcher, header]] + axisHeaderOverrides
 					return bundle
-				},
-
-
-
-
-				xsvTableBuilder: func() {
-					localAxisHeaderOverrides := copy(axisHeaderOverrides)
-
-					requests := []
-					addedColumns := {}
-
-					distiller := undefined
-
-					getSpecDistiller := func() {
-						if is_undefined(distiller) {
-							columnsToDistill := []
-							for request in requests {
-								col := pool[request.key]
-								columnsToDistill = append(columnsToDistill, col.spec)
-							}
-							distiller = pSpec.createSpecDistiller(columnsToDistill)
-						}
-						return distiller
-					}
-
-					findAxisHeaderOverride := func(spec) {
-						for _, override in localAxisHeaderOverrides {
-							matcher := override[0]
-
-							if matcher.name == spec.name {
-								specDistiller := getSpecDistiller()
-								discriminativeDomains := specDistiller.getDiscriminativeDomainsSet(spec.name)
-
-								domainsMatch := true
-
-								for domainKey, domainValue in matcher.domain {
-									if is_undefined(discriminativeDomains[domainKey]) {
-										continue
-									}
-
-									if is_undefined(spec.domain) ||
-									   is_undefined(spec.domain[domainKey]) ||
-									   spec.domain[domainKey] != domainValue {
-										domainsMatch = false
-										break
-									}
-								}
-
-								if domainsMatch {
-									return override[1]
-								}
-							}
-						}
-						return undefined
-					}
-
-					generateLabelForAxis := func(spec) {
-						name := spec.name
-						label := undefined
-
-						label = findAxisHeaderOverride(spec)
-
-						if is_undefined(label) {
-							specDistiller := getSpecDistiller()
-							discriminativeDomains := specDistiller.getDiscriminativeDomains(name)
-
-							if len(discriminativeDomains) == 0 {
-								label = strings.substituteSpecialCharacters(name)
-							} else {
-								ll.panic("Cannot deduce header for %s in axis. Discriminative domains: %s. Please provide a header override.",
-									name, discriminativeDomains)
-							}
-						}
-
-						if is_undefined(label) {
-							ll.panic("Cannot deduce header for %s in axis. Please provide a header override.",
-								name)
-						}
-
-						return label
-					}
-
-
-					findRequestByItem := func(item) {
-						serializedId := processColumnId(item).canonicalId
-						for _, request in requests {
-							if request.canonicalId == serializedId {
-								return request
-							}
-						}
-
-						ll.panic("Column not found in the table: %s. Make sure to call add() first.",
-							serializedId)
-					}
-
-					tableBuilder := undefined
-					tableBuilder = {
-
-
-
-
-
-
-
-						add: func(key, ...ops) {
-
-							distiller = undefined
-
-							processedId := processColumnId(key)
-							columnKey := processedId.columnKey
-							columnAxisFilters := processedId.axisFilters
-							serializedId := processedId.canonicalId
-
-							if is_undefined(pool[columnKey]) {
-								ll.panic("Column not found: " + columnKey)
-							}
-
-							request := {
-								key: columnKey,
-								canonicalId: serializedId
-							}
-
-							if !is_undefined(columnAxisFilters) {
-								request.axisFilters = columnAxisFilters
-							}
-
-							if len(ops) > 0 {
-								if !is_undefined(ops[0].header) {
-									request.headerOverride = ops[0].header
-								}
-
-								if !is_undefined(ops[0].axisFilters) {
-									if !is_undefined(request.axisFilters) {
-										ll.panic("Cannot provide axis filters in both FilteredPColumnId and options. Use either one, not both.")
-									} else {
-										request.axisFilters = ops[0].axisFilters
-
-										request.canonicalId = canonical.encode({
-											source: json.decode(columnKey),
-											axisFilters: ops[0].axisFilters
-										})
-									}
-								}
-							}
-
-							if !is_undefined(request.axisFilters) && len(request.axisFilters) > 0 {
-								colSpec := pool[columnKey].spec
-								prepared := pSpec.prepareAxisFilters(request.axisFilters, colSpec)
-
-								request.axisFilters = prepared.axisFilters
-								request.columnSpec = prepared.columnSpec
-							} else {
-								request.columnSpec = pool[columnKey].spec
-							}
-
-							if !is_undefined(addedColumns[request.canonicalId]) {
-								ll.panic("Duplicate column detected: %s. This column has already been added to the table.",
-									request.canonicalId)
-							}
-
-							addedColumns[request.canonicalId] = true
-
-							request.safeId = strings.substituteSpecialCharacters(request.canonicalId)
-
-							if !is_undefined(request.headerOverride) {
-								request.header = request.headerOverride
-							} else {
-
-								request.header = request.safeId
-							}
-
-							requests = append(requests, request)
-							return tableBuilder
-						},
-
-
-
-
-
-
-
-						setAxisHeader: func(matcher, header) {
-							if is_string(matcher) {
-								matcher = { name: matcher, domain: {} }
-							}
-
-							localAxisHeaderOverrides = [[matcher, header]] + localAxisHeaderOverrides
-							return tableBuilder
-						},
-
-
-
-
-
-
-
-
-
-
-						build: func(format, ...params) {
-							if format != "csv" && format != "tsv" {
-								ll.panic("Invalid format: '%s'. Expected 'csv' or 'tsv'.", format)
-							}
-
-							exportParams := {
-								naStr: "",
-								nullStr: ""
-							}
-							if len(params) > 0 {
-								exportParams = maps.deepMerge(exportParams, params[0])
-							}
-
-							sliceDataTemplate := assets.importTemplate("@platforma-sdk/workflow-tengo:pframes.slice-data")
-
-							columnDistiller := getSpecDistiller()
-
-							pFrame := pBuilder.pFrameBuilder()
-
-							idx := 0
-							for request in requests {
-								col := pool[request.key]
-								colData := col.data
-
-								if !is_undefined(request.axisFilters) {
-									colData = render.createEphemeral(sliceDataTemplate, {
-										data: colData,
-										slicingParams: smart.createJsonResource(request.axisFilters)
-									}).output("result")
-								}
-
-								preparedSpec := columnDistiller.distill(request.columnSpec)
-
-								preparedSpec = maps.deepMerge(preparedSpec, {
-									annotations: { "pl7.app/label": request.header }
-								})
-
-								for i, axis in preparedSpec.axesSpec {
-									preparedSpec.axesSpec[i] = maps.deepMerge(axis, {
-										annotations: { "pl7.app/label": generateLabelForAxis(axis) }
-									})
-								}
-
-
-
-
-
-
-
-								pFrame.add(string(idx), preparedSpec, colData)
-								idx += 1
-							}
-
-							return xsv.exportFrame(pFrame.build(), format, exportParams)
-						},
-
-
-
-
-
-
-
-
-						getHeader: func(item) {
-
-							if is_map(item) && !is_undefined(item.type) {
-								return generateLabelForAxis(item)
-							}
-
-
-							request := findRequestByItem(item)
-							return request.header
-						},
-
-
-
-
-
-
-
-
-						getSpec: func(item) {
-
-							request := findRequestByItem(item)
-							return request.columnSpec
-						}
-					}
-
-					return tableBuilder
 				}
 			})
 

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

@@ -13,6 +13,7 @@ pUtil := import("@platforma-sdk/workflow-tengo:pframes.util")
 pSpec := import("@platforma-sdk/workflow-tengo:pframes.spec")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 constants := import("@platforma-sdk/workflow-tengo:pframes.constants")
+xsvBuilder := import("@platforma-sdk/workflow-tengo:pframes.xsv-builder")
 
 llProcessTpl := assets.importTemplate("@platforma-sdk/workflow-tengo:pframes.process-pcolumn-data")
 
@@ -610,5 +611,7 @@ export ll.toStrict({
 	exportFrame: exportFrame,
 	pFrameBuilder: builder.pFrameBuilder,
 	exportColumnData: exportColumnData,
-	pColumnResourceMapDataBuilder: pColumnResourceMapDataBuilder
+	pColumnResourceMapDataBuilder: pColumnResourceMapDataBuilder,
+	tsvFileBuilder: func() { return xsvBuilder.xsvFileBuilder("tsv") },
+	csvFileBuilder: func() { return xsvBuilder.xsvFileBuilder("csv") }
 })

package/dist/tengo/lib/pframes.spec.lib.tengo

@@ -477,6 +477,25 @@ prepareAxisFilters := func(rules, spec) {
 	}
 }
 
+
+
+
+
+
+
+
+axisSpecToMatcher := func(axisSpec) {
+	validation.assertType(axisSpec, P_AXIS_SPEC_SCHEMA)
+	matcher := {
+		name: axisSpec.name,
+		type: axisSpec.type
+	}
+	if !is_undefined(axisSpec.domain) {
+		matcher.domain = maps.clone(axisSpec.domain) // Clone to avoid modifying original spec's domain
+	}
+	return matcher
+}
+
 export ll.toStrict({
 	P_AXIS_SPEC_SCHEMA: P_AXIS_SPEC_SCHEMA,
 	P_COLUMN_SPEC_SCHEMA: P_COLUMN_SPEC_SCHEMA,
@@ -500,6 +519,7 @@ export ll.toStrict({
 
 	createSpecDistiller: createSpecDistiller,
 
-	prepareAxisFilters: prepareAxisFilters
+	prepareAxisFilters: prepareAxisFilters,
+	axisSpecToMatcher: axisSpecToMatcher
 })