diff --git a/.changeset/config.json b/.changeset/config.json index ad6f18a..5982517 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -2,7 +2,14 @@ "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json", "changelog": "@changesets/cli/changelog", "commit": false, - "fixed": [], + "fixed": [ + [ + "@platforma-open/milaboratories.sort-seq-analysis.block", + "@platforma-open/milaboratories.sort-seq-analysis.model", + "@platforma-open/milaboratories.sort-seq-analysis.ui", + "@platforma-open/milaboratories.sort-seq-analysis.workflow" + ] + ], "linked": [], "access": "restricted", "baseBranch": "main", diff --git a/.changeset/milab-7197-add-filter.md b/.changeset/milab-7197-add-filter.md new file mode 100644 index 0000000..6d7b6b5 --- /dev/null +++ b/.changeset/milab-7197-add-filter.md @@ -0,0 +1,8 @@ +--- +"@platforma-open/milaboratories.sort-seq-analysis.block": minor +"@platforma-open/milaboratories.sort-seq-analysis.model": minor +"@platforma-open/milaboratories.sort-seq-analysis.ui": minor +"@platforma-open/milaboratories.sort-seq-analysis.workflow": minor +--- + +Update the SDK and accept a subset filter (e.g. a Repertoire Labeling label) with the input dataset. The dataset list is built with buildDatasetOptions (requireEnrichments: false). The subset restricts the reads before the analysis, so gate frequencies, enrichments and mean bins are computed within the subset and differ from a full-data run; if the parent variant is outside the subset, Mean bin vs parent and the wild-type baseline are not produced. Outputs of a subset run carry pl7.app/inputSubset in their domain and a trace rooted in the subset, so their labels name it. Unfiltered runs are unchanged. diff --git a/model/src/index.ts b/model/src/index.ts index 7ca72ff..a392224 100644 --- a/model/src/index.ts +++ b/model/src/index.ts @@ -1,11 +1,15 @@ import { BlockModelV3, type BlockRenderCtx, + buildDatasetOptions, + createGlobalPObjectId, createPFrameForGraphs, createPlDataTableV3, DataColumn, + type DatasetOption, discoverTableColumnSnaphots, type InferOutputsType, + isPColumnSpec, type PColumn, type PColumnSpec, type PColumnValues, @@ -227,6 +231,13 @@ function buildScoresTable(ctx: BlockRenderCtx, alphabet: s }); } +// Key axes of the datasets this block filters: bulk and single-cell clonotypes, and variants. +const DATASET_KEY_AXES: ReadonlySet = new Set([ + "pl7.app/vdj/clonotypeKey", + "pl7.app/vdj/scClonotypeKey", + "pl7.app/variantKey", +]); + export const platforma = BlockModelV3.create({ dataModel: blockDataModel, kind }) .args((data) => { // Throwing disables Run but carries no reason to the user; `settingsIssues` names it. @@ -267,6 +278,11 @@ export const platforma = BlockModelV3.create({ dataModel: blockDataModel, kind } BASELINE_AVAILABLE && data.inputGate !== undefined && data.baseline === "sequence" ? data.baselineSequence : undefined, + // The subset's canonical column id, which the workflow stamps as the outputs' + // `pl7.app/inputSubset`. Absent without a filter, so unfiltered args are unchanged. + ...(data.filterRef !== undefined && { + inputFilter: createGlobalPObjectId(data.filterRef.blockId, data.filterRef.name), + }), }; }) @@ -274,8 +290,23 @@ export const platforma = BlockModelV3.create({ dataModel: blockDataModel, kind } // Option lists. Four pickers, two predicates. // --------------------------------------------------------------------------- - /** The anchor. Matched on axis count plus the two abundance annotations, never on a name. */ - .output("abundanceOptions", (ctx) => ctx.resultPool.getOptions(isAbundanceAnchor)) + /** + * The anchor. Matched on axis count plus the two abundance annotations, never on a name. + * Each carries its subset columns (e.g. Repertoire Labeling labels) as filters. + */ + .output( + "abundanceOptions", + (ctx): DatasetOption[] => + buildDatasetOptions(ctx, { + primary: isAbundanceAnchor, + // Only subsets keyed by the dataset's key axis alone + filter: (spec) => + isPColumnSpec(spec) && + spec.axesSpec.length === 1 && + DATASET_KEY_AXES.has(spec.axesSpec[0].name), + requireEnrichments: false, + }) ?? [], + ) /** Every per-sample metadata column in the anchor's context — one query, four consumers. */ .output("metadataColumns", (ctx) => { diff --git a/model/src/types.ts b/model/src/types.ts index 028d94f..3fcbcaf 100644 --- a/model/src/types.ts +++ b/model/src/types.ts @@ -50,12 +50,16 @@ export type BlockArgs = { baseline?: BaselineOption; /** 11. The variant key the `sequence` baseline names. Set only with that option. */ baselineSequence?: string; + /** The subset column's canonical id. Absent without a filter, so unfiltered args are unchanged. */ + inputFilter?: string; }; /** What the user edits. Projected to `BlockArgs` by the args lambda; view state never crosses. */ export type BlockData = { // --- The seven arguments, in argument order ------------------------------ abundanceRef?: PlRef; + /** Subset column picked with the dataset in PlDatasetSelector (e.g. a Repertoire Labeling label). */ + filterRef?: PlRef; conditionColumnRef?: SUniversalPColumnId; gateColumnRef?: SUniversalPColumnId; /** diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4a9b5ba..83d6785 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,23 +28,23 @@ catalogs: specifier: 1.1.0 version: 1.1.0 '@platforma-sdk/block-tools': - specifier: 2.16.6 - version: 2.16.6 + specifier: 2.16.14 + version: 2.16.14 '@platforma-sdk/model': - specifier: 1.84.3 - version: 1.84.3 + specifier: 1.85.0 + version: 1.85.0 '@platforma-sdk/tengo-builder': - specifier: 4.1.6 - version: 4.1.6 + specifier: 4.1.11 + version: 4.1.11 '@platforma-sdk/test': - specifier: 1.84.6 - version: 1.84.6 + specifier: 1.85.1 + version: 1.85.1 '@platforma-sdk/ui-vue': - specifier: 1.84.5 - version: 1.84.5 + specifier: 1.85.0 + version: 1.85.0 '@platforma-sdk/workflow-tengo': - specifier: 6.12.1 - version: 6.12.1 + specifier: 6.16.0 + version: 6.16.0 shx: specifier: ~0.4.0 version: 0.4.0 @@ -80,7 +80,7 @@ importers: version: 1.7.2(@microsoft/api-extractor@7.58.12(@types/node@26.1.2))(@types/node@26.1.2)(@volar/typescript@2.4.28)(@vue/language-core@3.3.10)(esbuild@0.28.1)(rollup@4.62.4)(vue@3.5.24(typescript@7.0.2))(yaml@2.9.0) '@platforma-sdk/block-tools': specifier: 'catalog:' - version: 2.16.6(@types/node@26.1.2) + version: 2.16.14(@types/node@26.1.2) shx: specifier: 'catalog:' version: 0.4.0 @@ -110,10 +110,10 @@ importers: version: link:../workflow '@platforma-sdk/block-tools': specifier: 'catalog:' - version: 2.16.6(@types/node@26.1.2) + version: 2.16.14(@types/node@26.1.2) '@platforma-sdk/model': specifier: 'catalog:' - version: 1.84.3 + version: 1.85.0 shx: specifier: 'catalog:' version: 0.4.0 @@ -128,7 +128,7 @@ importers: version: 1.1.0 '@platforma-sdk/model': specifier: 'catalog:' - version: 1.84.3 + version: 1.85.0 '@types/node': specifier: '*' version: 26.1.2 @@ -144,13 +144,13 @@ importers: version: 1.4.0 '@platforma-sdk/block-tools': specifier: 'catalog:' - version: 2.16.6(@types/node@26.1.2) + version: 2.16.14(@types/node@26.1.2) model: dependencies: '@milaboratories/graph-maker': specifier: 'catalog:' - version: 1.6.1(@milaboratories/pl-model-common@1.51.0)(@platforma-sdk/model@1.84.3)(@platforma-sdk/ui-vue@1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2) + version: 1.6.1(@milaboratories/pl-model-common@1.53.0)(@platforma-sdk/model@1.85.0)(@platforma-sdk/ui-vue@1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2) '@milaboratories/helpers': specifier: 'catalog:' version: 1.14.5 @@ -159,7 +159,7 @@ importers: version: link:../kind '@platforma-sdk/model': specifier: 'catalog:' - version: 1.84.3 + version: 1.85.0 '@types/node': specifier: '*' version: 26.1.2 @@ -175,7 +175,7 @@ importers: version: 1.4.0 '@platforma-sdk/block-tools': specifier: 'catalog:' - version: 2.16.6(@types/node@26.1.2) + version: 2.16.14(@types/node@26.1.2) software: devDependencies: @@ -184,7 +184,7 @@ importers: version: 1.8.2 '@platforma-sdk/block-tools': specifier: 'catalog:' - version: 2.16.6(@types/node@26.1.2) + version: 2.16.14(@types/node@26.1.2) test: dependencies: @@ -200,7 +200,7 @@ importers: version: 1.4.0 '@platforma-sdk/test': specifier: 'catalog:' - version: 1.84.6(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0)) + version: 1.85.1(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0)) vitest: specifier: 'catalog:' version: 4.0.18(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0) @@ -209,16 +209,16 @@ importers: dependencies: '@milaboratories/graph-maker': specifier: 'catalog:' - version: 1.6.1(@milaboratories/pl-model-common@1.51.0)(@platforma-sdk/model@1.84.3)(@platforma-sdk/ui-vue@1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2) + version: 1.6.1(@milaboratories/pl-model-common@1.53.0)(@platforma-sdk/model@1.85.0)(@platforma-sdk/ui-vue@1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2) '@platforma-open/milaboratories.sort-seq-analysis.model': specifier: workspace:* version: link:../model '@platforma-sdk/model': specifier: 'catalog:' - version: 1.84.3 + version: 1.85.0 '@platforma-sdk/ui-vue': specifier: 'catalog:' - version: 1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) + version: 1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) '@types/node': specifier: '*' version: 26.1.2 @@ -243,14 +243,14 @@ importers: version: link:../software '@platforma-sdk/workflow-tengo': specifier: 'catalog:' - version: 6.12.1 + version: 6.16.0 devDependencies: '@platforma-sdk/tengo-builder': specifier: 'catalog:' - version: 4.1.6 + version: 4.1.11 '@platforma-sdk/test': specifier: 'catalog:' - version: 1.84.6(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@8.2.1(@types/node@26.1.2)(esbuild@0.28.1)(yaml@2.9.0)) + version: 1.85.1(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@8.2.1(@types/node@26.1.2)(esbuild@0.28.1)(yaml@2.9.0)) shx: specifier: 'catalog:' version: 0.4.0 @@ -1040,8 +1040,8 @@ packages: '@microsoft/tsdoc@0.16.0': resolution: {integrity: sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==} - '@milaboratories/columns-collection-driver@0.2.7': - resolution: {integrity: sha512-yuDUB0TJ18P2RSR/v6i4yprH+vzaHcvm1rrV5yxhX/iyjS+51b+ZRV9ydsILInKRnBjPhwboOhL1O5J46d8fsw==} + '@milaboratories/columns-collection-driver@0.2.9': + resolution: {integrity: sha512-sHCtIaYEWkfvEa5pAkqJIaxrrLxN4+CMwqEehEhYh9ig99QNQpCIx4XJa7268t7RxlVnrqFVHOAPfeULM3xNeQ==} '@milaboratories/computable@2.9.8': resolution: {integrity: sha512-X0ZtxOnIJlAd9Y7CyBtWSKHgVuTKXbIryMwJaoYSEz0gY3JZVnsD0f59J/lwe3Key0/lSYh3EbL/pP5jACIzfQ==} @@ -1064,8 +1064,8 @@ packages: '@milaboratories/miplots4@1.4.0': resolution: {integrity: sha512-Fsopmq+q3nkYyCNRJbmLpyDBU7rXJqMoAaNA3hnfeCa3RquGA6uOOl/ONKmqCJ35j+s+L7ch7a3Vt4IG2qeLtg==} - '@milaboratories/pf-driver@1.9.6': - resolution: {integrity: sha512-D8rukCZpntMB8PMnCINxlgbLuGeuEs/0AGPxjOeGaFvIVT3NzYdHitoLL4rf/hBFDRpgsWVUIoRz4VPQlefcLg==} + '@milaboratories/pf-driver@1.9.8': + resolution: {integrity: sha512-lJx2xy3IFFHccp+S/czjJmS7mVBPYUrZ0rTb1TpncSNahH1QXCWDjopzNyG/Wdn6XGvLgSuPVsmNMXAo+8tJww==} engines: {node: '>=22.19.0'} '@milaboratories/pf-plots@1.5.0': @@ -1074,11 +1074,11 @@ packages: '@milaboratories/pl-model-common': 1.46.4 '@platforma-sdk/model': 1.79.27 - '@milaboratories/pf-spec-driver@1.5.6': - resolution: {integrity: sha512-LM0ShEu5mLH1fsp/5RLBGQG9ZSAJi21GAQkPCPwDglqYwE2qacbWNDNmRJPKeCFXAbOk7yKvlcd/8KJNyC8/oA==} + '@milaboratories/pf-spec-driver@1.5.8': + resolution: {integrity: sha512-FglGf04XIoPERgOGxT8tBdRU/NtoxIJ9YYY4HrTg5NQI/q74xstaydZIjOSJGagU/P4fxviuVMJ++2xfzsDgMw==} - '@milaboratories/pf-spec@1.0.6': - resolution: {integrity: sha512-T22qPvPJo85+iwacyT13B4TPGVv0QDKgZSHtob3qfG3Tx90XpZ9x/JfIMCAMLjZy61uczmBU6oH31SoDpcswSA==} + '@milaboratories/pf-spec@1.0.8': + resolution: {integrity: sha512-izUvntvM8R6mn3wUNi1mM8XgdH9KyGkZcDAp93OlGedz8rmMGkMqmocEczpPAPMjpvAnvBTDWm3yCdPwfcJl9g==} peerDependencies: '@bytecodealliance/preview2-shim': ^0.20.1 @@ -1092,29 +1092,29 @@ packages: '@milaboratories/pframes-rs-wasip2@1.1.61': resolution: {integrity: sha512-0/LwALWJxsWjRf7AyhznRCzOOR4MyzAq4OJ+FvaRuNUztSBJZeXWRBzatmDN9JjCoonap1F05cy33NXKX+hUyQ==} - '@milaboratories/pl-client@3.17.5': - resolution: {integrity: sha512-qDbogbh3dkd2ujRMUIimNN3wkrfhgQlFJuZaoJc7+ieu3sH6H2IdXEIQpO2PZByKfkAv8nZb6MqSl0/EjZ9azw==} + '@milaboratories/pl-client@3.18.2': + resolution: {integrity: sha512-pzbPgxEI1sDLUt5A9v78ubroolxoC6y95Ldq7ceibXqXg87O10eUMi9/LbCMWYJu2y/mxj2kR4vSEhdlHCU+aA==} engines: {node: '>=22.19.0'} '@milaboratories/pl-config@1.8.5': resolution: {integrity: sha512-XnfYXSSkRxeImQ21k6I8y5apisvagcSgMGfEeyRxNdSGwUVJbbI8TwJk+XBEDQ4lErW8oqtLxKjFQuHJMzRUoQ==} - '@milaboratories/pl-crash-recorder@0.3.3': - resolution: {integrity: sha512-5++ZwZAgZS9FVsl6VxU3ykehVWiX5uFLAuGeZbRsjmlIqI9ViMmvfh7bQJEM7DSU+hjdKeqXtc9Gm9qd29h4fQ==} + '@milaboratories/pl-crash-recorder@0.3.5': + resolution: {integrity: sha512-Gv1Zm72k14cGMqT5seupCSvL1mqDjGPfAbbBjt+uIkdbGbHhcNZnSBKhmz2vmjOrWIxVi372OoYzWkIgUjSm+g==} - '@milaboratories/pl-deployments@3.0.19': - resolution: {integrity: sha512-UkAamK9XCy+oPytHpkGUGAmyIBPPq1HNXTq+OCdgvUFPflz6cD4uMjS6NCumOwDN6tqq3T2SsclitzW+Vor1Uw==} + '@milaboratories/pl-deployments@3.0.21': + resolution: {integrity: sha512-FOmpJU5RJmYzfl/gv4l5Hu0p/wLzB2qnZEudixNs4yUPZVuYnvNJOqNwAkw/S72KExAF6Mgn0/s3dldbGFDs9A==} engines: {node: '>=22.19.0'} - '@milaboratories/pl-drivers@1.16.28': - resolution: {integrity: sha512-Rc07AsDM7v6b1JNh7M/DkqzvtZjK1LFndK3Rumm8TPgn7PHaY1LoVcVCrqzc8zVnClkTR7XrpwyJP+Ti2rel5g==} + '@milaboratories/pl-drivers@1.16.33': + resolution: {integrity: sha512-Ba/dA/qYQW9JH/3nEnAzV7ZwWrUbeEgBe5+B4r65QOp3NQk+OC1C1SnLRZYMIdzJlWF0apPAr2X9DebGGYl40A==} engines: {node: '>=22'} '@milaboratories/pl-error-like@1.12.10': resolution: {integrity: sha512-iHmnLG5lxJqcymUmEL8onCDGEADk1S/5RNACQ5yfTCNcCkUc+7hYrDHQpFmWXPPGC9sG+NTBxt4wr5m8UsLm2g==} - '@milaboratories/pl-errors@1.4.46': - resolution: {integrity: sha512-FRNSctBJafxtNCgkkJuHfp2dI3gUuKyJJL93nc8lgAkQJQpq2xPD4mrBoLFh+dnyLf/t4iMrMWRfeiksxOfcqQ==} + '@milaboratories/pl-errors@1.4.51': + resolution: {integrity: sha512-77+hOwWCf7JXiq7g0he1QmNrk3LEgiaMfgBj7nJXLRyrLA8QLmo1bt/fPNbw2/D0ZLbgEAL2KfAYh3s0/GWKhQ==} '@milaboratories/pl-healthcheck@1.0.5': resolution: {integrity: sha512-ZkQti4VU2FapJBFRtZGfR5NDPXEAEFgTf/NfemypgY0aA75fFPi4/c3BpXX5K7dht+JOgHqkMrBHxKIuE2T+fA==} @@ -1123,31 +1123,31 @@ packages: '@milaboratories/pl-http@1.2.4': resolution: {integrity: sha512-QKmhx+WEvJCV9dUy/SBdQk/ApaJ5ewBFgm/b+XPlS10SusAdqUUTGvK5+hq8YSuUMXlHb/dk++UtI5YlDuDl2Q==} - '@milaboratories/pl-middle-layer@1.73.2': - resolution: {integrity: sha512-e9jCC+RA2Pzc5K2PX8jh6qiBzNqQMK74nsuhNU5ZWpY9ScKTGH9Q9AmMh2ZhTp7Dd9V6p3rppYArJ5Zmjyq6PA==} + '@milaboratories/pl-middle-layer@1.74.5': + resolution: {integrity: sha512-D0B/UJavKKRZ88w0etas9kmtSevKXGIbojKC5X254ZML/RQ4DlJgLkanYqpjTDA35Non+Y2A2P5y5Biz0YHFnA==} engines: {node: '>=22.19.0'} - '@milaboratories/pl-model-backend@1.4.31': - resolution: {integrity: sha512-S8KjAmpQIS76+G62jkOmyYs4rJ928032Hmd0iXoiJ4p4H82/ivC+WGBYOcZPr7iV+Sm8J0odzdSHeSIYNUN8DQ==} + '@milaboratories/pl-model-backend@1.4.36': + resolution: {integrity: sha512-CMTkZPy4eG+bociJDKEX13vt/3JdThbOCIW4X/uD06R0M4W8ns16YukrEHX563peq6zN8qLKKuKdt7Kws4/g+Q==} '@milaboratories/pl-model-common@1.46.2': resolution: {integrity: sha512-VEeauisApYScvCS8lnK3zpFJ520xuTAodKJmjR8ulHcMrWMyWMfHEdGb7j5OMD0mM/OwTgmQrrJ5eB7Xd+xoOQ==} - '@milaboratories/pl-model-common@1.51.0': - resolution: {integrity: sha512-KowoSl3BTUo8N4yUYpFiIdi7JZmtGX2bm4roK9maeoGdB3Tb0SsfySsWgdDSGwWMvxHwQ6cp3DA2dkw1dFlmcg==} + '@milaboratories/pl-model-common@1.53.0': + resolution: {integrity: sha512-9YrKHA+fQPFicLf7+t3dhS4QsYO2ZpgiufjnRup2nwKJRqNqlMz1v3vFRVA7LiU8lbqJaVChPNAu2bFqrWOgdg==} '@milaboratories/pl-model-middle-layer@1.30.7': resolution: {integrity: sha512-rs9x3Ron4ujR/UOdEgB8WUB1SvZ8ZAScT1Av/e4or+iiQ/CzhmK9nqtYamHVwKV+JgwIFbXQwxGvIHDVz955dQ==} - '@milaboratories/pl-model-middle-layer@1.34.0': - resolution: {integrity: sha512-t3J7JqtJZDezMVRRx6tZb6DsIiDJJKi2OmuNKdWGEwuXTWEPyJN2FG8SH88+wuH0+ex3ZZwcD+MgI0RThvyXgg==} + '@milaboratories/pl-model-middle-layer@1.34.2': + resolution: {integrity: sha512-onccOI/HLRkUxmjEyrGVgKsERsID5GsPu6HiMHSaC8/tzVOPNDSfDVcXBrWQmUHCNXgia+iLuhqQKyFRx7ZKwA==} - '@milaboratories/pl-tree@1.15.6': - resolution: {integrity: sha512-SI1saX3aW04XoBVNCYToV47z/xfyaVM+vYdBGoIPd2RNj0ADgD8LCu1OPwWCSEKFvixWsTgncdwpPsWUTHolFw==} + '@milaboratories/pl-tree@1.16.3': + resolution: {integrity: sha512-x/JHrzMaTBl1zLo1F0fvKWPyq7JNM3kAFkgUvW2whZPkzEJtRZ2YzKLAK3gEl+9hzRIGtDmMDT22WXImEjtx8A==} engines: {node: '>=22.19.0'} - '@milaboratories/ptabler-expression-js@1.2.41': - resolution: {integrity: sha512-GnZAF1PT3XWrFb6SU7twKiWPpyTV7OVu76I3XWB/zpvkHb18O1K+kiXuN0k8JzTWQCUmq6tPlRP6R5CtmhK6Fw==} + '@milaboratories/ptabler-expression-js@1.2.43': + resolution: {integrity: sha512-9iudQFGUGYsARo3f4laJElDUGSEoFurJn4MmjEFArXhKE2yOTVVL9ZcgopSxhUZ55YALnP1WwShVhIAxIkBb5g==} '@milaboratories/resolve-helper@1.1.3': resolution: {integrity: sha512-38/dW/XRZQREOxAOOKtO0lzEWPCP/DH0qhB3q1kYcGoN++5V92/zbVwbYrMDeDcjTyo+D62iIep+sKXeWHa7Uw==} @@ -1171,8 +1171,8 @@ packages: resolution: {integrity: sha512-ef01tARUl+0Urt3x8HHAByrhYHg4Rnn7WiFyJ+joZFZl1T1pUKTgfB7Zxc8Cn06HIl4i6H7s5OSymjZePIGqfQ==} engines: {node: '>=22.19.0'} - '@milaboratories/uikit@2.15.35': - resolution: {integrity: sha512-rworZxiZqKweIUdAY9Ao8qVZZHGuiM7q6HVP3jUiCE3Gmi/433WTrlupYZXqLTqkapTQWusTZygk/WfIUzHksw==} + '@milaboratories/uikit@2.15.42': + resolution: {integrity: sha512-kktvC9wZJElfi+hW6NVERlfVyH4FjCykB5qi9NsaYxYEbBit2yeHjSO7CqY5WK1eM7Tny7rwLxh2dK9c4llPXQ==} '@napi-rs/lzma-linux-x64-gnu@1.5.1': resolution: {integrity: sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==} @@ -1727,8 +1727,8 @@ packages: '@platforma-open/milaboratories.runenv-python-3@1.8.2': resolution: {integrity: sha512-gsb33geN7RXIKhcYXPn18aU3sInJNcGVEO5/vlM+JxySBVMr2ICr86ABY90oX0fc60RiuEgVI3ltiOgtCs9Kbg==} - '@platforma-open/milaboratories.software-ptabler.schema@1.15.25': - resolution: {integrity: sha512-SZww/g+LCsVrsMzdfZv/HnzU29ASuejGTly33gOldmN7INV74ntgL0jgE3chcAAAZQjvnjmE6NUHKZ0HIZsujg==} + '@platforma-open/milaboratories.software-ptabler.schema@1.15.27': + resolution: {integrity: sha512-z703BUlCzWYAte/WPTlwFALhc2q3bO10Z1f0NyMyxN1ECTDk4YhOom6euA6lP43R6Prbmt78oif7b7a1hC3cWg==} '@platforma-open/milaboratories.software-ptabler@2.1.14': resolution: {integrity: sha512-gUh8h12v7FG5hj5+dPHETAk69hu4kqUPKumYKUbcAcMoEi0mhh/MEm/epHPxnCVNBNJEwwbscJ5HsrJQUTr1HQ==} @@ -1757,33 +1757,33 @@ packages: '@platforma-sdk/block-kind@1.1.0': resolution: {integrity: sha512-4uh+40o6BGfQcPPhkYGCjng8EXR9qn+6i5Fuc3RJ5QGfPYfcwbxT35G2V7ALUxmsqjLZ5SGL+JcW6Lm2v0cZHA==} - '@platforma-sdk/block-tools@2.16.6': - resolution: {integrity: sha512-sN43KjKJHh1t5RbqrDrnF+f77DwyxxtRSYZA4Hh1s2UDWPyIoIkz0aSlaHcHieVANCeTEWGMk1rxvDyY/cUm7Q==} + '@platforma-sdk/block-tools@2.16.14': + resolution: {integrity: sha512-qPbmvIYUawKrPdJkO8swtA+42p0YdLi9/YS6njzCvFX5L9Ax7SXqPVyUUQVxxOPrb0RZKMYSiTDxMe2b/Ngxcw==} hasBin: true '@platforma-sdk/blocks-deps-updater@2.2.0': resolution: {integrity: sha512-p9lBxhFXM9WoRsrJO7dfkiXSK+1m63yIn1sKhBO71eMbhrLMyVYHEOeNf3w5OCdbRF5QsNhXzWuiTmFK3zHFsA==} hasBin: true - '@platforma-sdk/model@1.84.3': - resolution: {integrity: sha512-GXtVYjmXgHXGXSiDpVWXAjeq3MyF5JoDtSwTqXOY5Tq51/vXHHLaxx5TtKcYhrCoWyhxabMHLB+4lf2q0fPeaw==} + '@platforma-sdk/model@1.85.0': + resolution: {integrity: sha512-N7vGMksAyZbE3zTdMPprvcCQ9G7BfE15mK5XkTov0BaFBe1uvXzITKV21XmTh+ifSUQbFwtLMsVgQgOqXfsZJg==} - '@platforma-sdk/package-builder-lib@1.4.0': - resolution: {integrity: sha512-ORcuPJ5SM1RiQAOUVM7alWDbOWQ/gUTgLDToP/yAs2uHXhKNvXphgDQTamCX6cseMZ0uKdWzTudJAQAJM1Kvwg==} + '@platforma-sdk/package-builder-lib@1.4.1': + resolution: {integrity: sha512-n85dVGndxqkbNodoNJLUHBPnPquOSo3jcjY4Beq892UpMW/1u7IxkOnMR4DygcOXrjXP9zDt/MbV6LB1f9kmtg==} - '@platforma-sdk/tengo-builder@4.1.6': - resolution: {integrity: sha512-kXSgMB67Sr1hjtj2kTpvV/PaqeVVvtTw7g9F8CsfInlQMSNqo03gDpM7Hvx1ASAAjcKFghU6HlJX8HaY2HRZfw==} + '@platforma-sdk/tengo-builder@4.1.11': + resolution: {integrity: sha512-iHdL9YCXZur/NXoHsIDS1OW/RaDm/5bxUU62wUx9orql7AFguSMFCv6BoKUAS8+iUiz7Ibcd5Sp/gACeFqGyZw==} engines: {node: '>=22'} hasBin: true - '@platforma-sdk/test@1.84.6': - resolution: {integrity: sha512-Q/zXHPmE+FWibi6LtfLpXAs4TE+fGNtXCzp2nxZ9v/P0VwSc/NcVwRAV2Sb+Zc/H/iaclbvnOUVuhOK0oWV0Vg==} + '@platforma-sdk/test@1.85.1': + resolution: {integrity: sha512-96+NlVI14qkREvD1nhT3C6YQ1mLRUWmy2ZRWu1QhxVAi1tqMbQwpTvmPLKEjLv8VMVwBsc5bYj6I9kDbiGCYvA==} - '@platforma-sdk/ui-vue@1.84.5': - resolution: {integrity: sha512-vizAiWGIhCJm26n8RRsC79/Ys26G0/GaRKiTqAKN3AnP2CMCDCTQeZD9UgJsD35jkbL3vi4XFTJbGLZiB4Naeg==} + '@platforma-sdk/ui-vue@1.85.0': + resolution: {integrity: sha512-qF0+W/1Byla5PQKmdzG+VCI7RZuqks51F/gcyfUHwVWQMV7IJgT0bKS660nxFM51SdceFN1OQPm8jnqkjjQA/w==} - '@platforma-sdk/workflow-tengo@6.12.1': - resolution: {integrity: sha512-Fk+OIYeqbzheLdtZVGc9GcwAOc8dEvzjgHnwJdGN3rJW8dE/eZ17nYEdYIDL4KGjjqd99CyCr3sWw1fHA6ngxQ==} + '@platforma-sdk/workflow-tengo@6.16.0': + resolution: {integrity: sha512-bzJ8cupyjBmVJ2WrrSjk9kYcIT1n5+Sr63jDA4sK/TlJj0JA5v8Sj+fCkTQkK61v5+338A/dSBwKXDuk4ZO5oA==} '@protobuf-ts/grpc-transport@2.11.1': resolution: {integrity: sha512-l6wrcFffY+tuNnuyrNCkRM8hDIsAZVLA8Mn7PKdVyYxITosYh60qW663p9kL6TWXYuDCL3oxH8ih3vLKTDyhtg==} @@ -7946,10 +7946,10 @@ snapshots: '@microsoft/tsdoc@0.16.0': optional: true - '@milaboratories/columns-collection-driver@0.2.7': + '@milaboratories/columns-collection-driver@0.2.9': dependencies: '@milaboratories/helpers': 1.14.5 - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 '@milaboratories/computable@2.9.8': dependencies: @@ -7958,14 +7958,14 @@ snapshots: '@types/node': 24.5.2 utility-types: 3.11.0 - '@milaboratories/graph-maker@1.6.1(@milaboratories/pl-model-common@1.51.0)(@platforma-sdk/model@1.84.3)(@platforma-sdk/ui-vue@1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2)': + '@milaboratories/graph-maker@1.6.1(@milaboratories/pl-model-common@1.53.0)(@platforma-sdk/model@1.85.0)(@platforma-sdk/ui-vue@1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2))(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0)(typescript@7.0.2)': dependencies: '@ag-grid-community/core': 32.3.9 '@milaboratories/helpers': 1.14.5 '@milaboratories/miplots4': 1.4.0(d3-dispatch@3.0.1)(d3-path@3.1.0)(d3-scale-chromatic@3.1.0) - '@milaboratories/pf-plots': 1.5.0(@milaboratories/pl-model-common@1.51.0)(@platforma-sdk/model@1.84.3) - '@platforma-sdk/model': 1.84.3 - '@platforma-sdk/ui-vue': 1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) + '@milaboratories/pf-plots': 1.5.0(@milaboratories/pl-model-common@1.53.0)(@platforma-sdk/model@1.85.0) + '@platforma-sdk/model': 1.85.0 + '@platforma-sdk/ui-vue': 1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) '@types/d3-hierarchy': 3.1.7 '@types/d3-scale': 4.0.9 '@vueuse/core': 13.9.0(vue@3.5.24(typescript@7.0.2)) @@ -8024,13 +8024,13 @@ snapshots: - d3-scale-chromatic - supports-color - '@milaboratories/pf-driver@1.9.6(@bytecodealliance/preview2-shim@0.17.9)': + '@milaboratories/pf-driver@1.9.8(@bytecodealliance/preview2-shim@0.17.9)': dependencies: '@milaboratories/helpers': 1.14.5 - '@milaboratories/pf-spec': 1.0.6(@bytecodealliance/preview2-shim@0.17.9) + '@milaboratories/pf-spec': 1.0.8(@bytecodealliance/preview2-shim@0.17.9) '@milaboratories/pframes-rs-node': 1.1.61 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-model-middle-layer': 1.34.0 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-model-middle-layer': 1.34.2 '@milaboratories/ts-helpers': 1.8.6 es-toolkit: 1.50.0 lru-cache: 11.5.2 @@ -8039,28 +8039,28 @@ snapshots: - encoding - supports-color - '@milaboratories/pf-plots@1.5.0(@milaboratories/pl-model-common@1.51.0)(@platforma-sdk/model@1.84.3)': + '@milaboratories/pf-plots@1.5.0(@milaboratories/pl-model-common@1.53.0)(@platforma-sdk/model@1.85.0)': dependencies: '@milaboratories/helpers': 1.14.5 - '@milaboratories/pl-model-common': 1.51.0 - '@platforma-sdk/model': 1.84.3 + '@milaboratories/pl-model-common': 1.53.0 + '@platforma-sdk/model': 1.85.0 canonicalize: 2.1.0 lodash: 4.18.1 - '@milaboratories/pf-spec-driver@1.5.6(@bytecodealliance/preview2-shim@0.17.9)': + '@milaboratories/pf-spec-driver@1.5.8(@bytecodealliance/preview2-shim@0.17.9)': dependencies: '@milaboratories/helpers': 1.14.5 - '@milaboratories/pf-spec': 1.0.6(@bytecodealliance/preview2-shim@0.17.9) - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pf-spec': 1.0.8(@bytecodealliance/preview2-shim@0.17.9) + '@milaboratories/pl-model-common': 1.53.0 '@noble/hashes': 2.3.0 transitivePeerDependencies: - '@bytecodealliance/preview2-shim' - '@milaboratories/pf-spec@1.0.6(@bytecodealliance/preview2-shim@0.17.9)': + '@milaboratories/pf-spec@1.0.8(@bytecodealliance/preview2-shim@0.17.9)': dependencies: '@bytecodealliance/preview2-shim': 0.17.9 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-model-middle-layer': 1.34.0 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-model-middle-layer': 1.34.2 '@milaboratories/pframes-rs-node@1.1.61': dependencies: @@ -8084,11 +8084,11 @@ snapshots: '@milaboratories/pframes-rs-wasip2@1.1.61': {} - '@milaboratories/pl-client@3.17.5': + '@milaboratories/pl-client@3.18.2': dependencies: '@grpc/grpc-js': 1.14.4 '@milaboratories/pl-http': 1.2.4 - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 '@milaboratories/ts-helpers': 1.8.6 '@protobuf-ts/grpc-transport': 2.11.1(@grpc/grpc-js@1.14.4) '@protobuf-ts/runtime': 2.11.1 @@ -8108,16 +8108,16 @@ snapshots: upath: 2.0.1 yaml: 2.9.0 - '@milaboratories/pl-crash-recorder@0.3.3': + '@milaboratories/pl-crash-recorder@0.3.5': dependencies: - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 - '@milaboratories/pl-deployments@3.0.19': + '@milaboratories/pl-deployments@3.0.21': dependencies: '@milaboratories/pl-config': 1.8.5 '@milaboratories/pl-healthcheck': 1.0.5 '@milaboratories/pl-http': 1.2.4 - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 '@milaboratories/ts-helpers': 1.8.6 decompress: 4.2.1 ssh2: 1.17.0 @@ -8127,14 +8127,14 @@ snapshots: yaml: 2.9.0 zod: 3.25.76 - '@milaboratories/pl-drivers@1.16.28': + '@milaboratories/pl-drivers@1.16.33': dependencies: '@grpc/grpc-js': 1.14.4 '@milaboratories/computable': 2.9.8 '@milaboratories/helpers': 1.14.5 - '@milaboratories/pl-client': 3.17.5 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-tree': 1.15.6 + '@milaboratories/pl-client': 3.18.2 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-tree': 1.16.3 '@milaboratories/ts-helpers': 1.8.6 '@protobuf-ts/grpc-transport': 2.11.1(@grpc/grpc-js@1.14.4) '@protobuf-ts/plugin': 2.11.1 @@ -8158,9 +8158,9 @@ snapshots: json-stringify-safe: 5.0.1 zod: 3.25.76 - '@milaboratories/pl-errors@1.4.46': + '@milaboratories/pl-errors@1.4.51': dependencies: - '@milaboratories/pl-client': 3.17.5 + '@milaboratories/pl-client': 3.18.2 '@milaboratories/ts-helpers': 1.8.6 zod: 3.25.76 @@ -8176,29 +8176,29 @@ snapshots: dependencies: undici: 7.16.0 - '@milaboratories/pl-middle-layer@1.73.2(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)': + '@milaboratories/pl-middle-layer@1.74.5(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)': dependencies: - '@milaboratories/columns-collection-driver': 0.2.7 + '@milaboratories/columns-collection-driver': 0.2.9 '@milaboratories/computable': 2.9.8 '@milaboratories/helpers': 1.14.5 - '@milaboratories/pf-driver': 1.9.6(@bytecodealliance/preview2-shim@0.17.9) - '@milaboratories/pf-spec-driver': 1.5.6(@bytecodealliance/preview2-shim@0.17.9) + '@milaboratories/pf-driver': 1.9.8(@bytecodealliance/preview2-shim@0.17.9) + '@milaboratories/pf-spec-driver': 1.5.8(@bytecodealliance/preview2-shim@0.17.9) '@milaboratories/pframes-rs-node': 1.1.61 - '@milaboratories/pl-client': 3.17.5 - '@milaboratories/pl-crash-recorder': 0.3.3 - '@milaboratories/pl-deployments': 3.0.19 - '@milaboratories/pl-drivers': 1.16.28 - '@milaboratories/pl-errors': 1.4.46 + '@milaboratories/pl-client': 3.18.2 + '@milaboratories/pl-crash-recorder': 0.3.5 + '@milaboratories/pl-deployments': 3.0.21 + '@milaboratories/pl-drivers': 1.16.33 + '@milaboratories/pl-errors': 1.4.51 '@milaboratories/pl-http': 1.2.4 - '@milaboratories/pl-model-backend': 1.4.31 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-model-middle-layer': 1.34.0 - '@milaboratories/pl-tree': 1.15.6 + '@milaboratories/pl-model-backend': 1.4.36 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-model-middle-layer': 1.34.2 + '@milaboratories/pl-tree': 1.16.3 '@milaboratories/resolve-helper': 1.1.3 '@milaboratories/ts-helpers': 1.8.6 - '@platforma-sdk/block-tools': 2.16.6(@types/node@26.1.2) - '@platforma-sdk/model': 1.84.3 - '@platforma-sdk/workflow-tengo': 6.12.1 + '@platforma-sdk/block-tools': 2.16.14(@types/node@26.1.2) + '@platforma-sdk/model': 1.85.0 + '@platforma-sdk/workflow-tengo': 6.16.0 canonicalize: 2.1.0 denque: 2.1.0 es-toolkit: 1.50.0 @@ -8219,9 +8219,9 @@ snapshots: - react-native-b4a - supports-color - '@milaboratories/pl-model-backend@1.4.31': + '@milaboratories/pl-model-backend@1.4.36': dependencies: - '@milaboratories/pl-client': 3.17.5 + '@milaboratories/pl-client': 3.18.2 canonicalize: 2.1.0 zod: 3.25.76 @@ -8232,7 +8232,7 @@ snapshots: canonicalize: 2.1.0 zod: 3.25.76 - '@milaboratories/pl-model-common@1.51.0': + '@milaboratories/pl-model-common@1.53.0': dependencies: '@milaboratories/helpers': 1.14.5 '@milaboratories/pl-error-like': 1.12.10 @@ -8248,27 +8248,27 @@ snapshots: utility-types: 3.11.0 zod: 3.25.76 - '@milaboratories/pl-model-middle-layer@1.34.0': + '@milaboratories/pl-model-middle-layer@1.34.2': dependencies: '@milaboratories/helpers': 1.14.5 - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 es-toolkit: 1.50.0 utility-types: 3.11.0 zod: 3.25.76 - '@milaboratories/pl-tree@1.15.6': + '@milaboratories/pl-tree@1.16.3': dependencies: '@milaboratories/computable': 2.9.8 - '@milaboratories/pl-client': 3.17.5 - '@milaboratories/pl-errors': 1.4.46 + '@milaboratories/pl-client': 3.18.2 + '@milaboratories/pl-errors': 1.4.51 '@milaboratories/ts-helpers': 1.8.6 denque: 2.1.0 utility-types: 3.11.0 zod: 3.25.76 - '@milaboratories/ptabler-expression-js@1.2.41': + '@milaboratories/ptabler-expression-js@1.2.43': dependencies: - '@platforma-open/milaboratories.software-ptabler.schema': 1.15.25 + '@platforma-open/milaboratories.software-ptabler.schema': 1.15.27 '@milaboratories/resolve-helper@1.1.3': {} @@ -8376,10 +8376,10 @@ snapshots: canonicalize: 2.1.0 denque: 2.1.0 - '@milaboratories/uikit@2.15.35(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2)': + '@milaboratories/uikit@2.15.42(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2)': dependencies: '@milaboratories/helpers': 1.14.5 - '@platforma-sdk/model': 1.84.3 + '@platforma-sdk/model': 1.85.0 '@types/d3-array': 3.2.2 '@types/d3-axis': 3.0.6 '@types/d3-scale': 4.0.9 @@ -8784,9 +8784,9 @@ snapshots: '@platforma-open/milaboratories.runenv-python-3.12.10-sccoda': 1.3.5 '@platforma-open/milaboratories.runenv-python-3.12.10-scientific-slim': 1.1.0 - '@platforma-open/milaboratories.software-ptabler.schema@1.15.25': + '@platforma-open/milaboratories.software-ptabler.schema@1.15.27': dependencies: - '@milaboratories/pl-model-common': 1.51.0 + '@milaboratories/pl-model-common': 1.53.0 '@platforma-open/milaboratories.software-ptabler@2.1.14': {} @@ -8812,19 +8812,19 @@ snapshots: '@platforma-sdk/block-kind@1.1.0': {} - '@platforma-sdk/block-tools@2.16.6(@types/node@26.1.2)': + '@platforma-sdk/block-tools@2.16.14(@types/node@26.1.2)': dependencies: '@aws-sdk/client-ecr-public': 3.859.0 '@aws-sdk/client-s3': 3.859.0 '@inquirer/prompts': 7.10.1(@types/node@26.1.2) '@milaboratories/pl-http': 1.2.4 - '@milaboratories/pl-model-backend': 1.4.31 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-model-middle-layer': 1.34.0 + '@milaboratories/pl-model-backend': 1.4.36 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-model-middle-layer': 1.34.2 '@milaboratories/resolve-helper': 1.1.3 '@milaboratories/ts-helpers': 1.8.6 '@platforma-sdk/blocks-deps-updater': 2.2.0 - '@platforma-sdk/package-builder-lib': 1.4.0 + '@platforma-sdk/package-builder-lib': 1.4.1 canonicalize: 2.1.0 commander: 15.0.0 lru-cache: 11.5.2 @@ -8844,13 +8844,13 @@ snapshots: dependencies: yaml: 2.9.0 - '@platforma-sdk/model@1.84.3': + '@platforma-sdk/model@1.85.0': dependencies: '@milaboratories/helpers': 1.14.5 '@milaboratories/pl-error-like': 1.12.10 - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/pl-model-middle-layer': 1.34.0 - '@milaboratories/ptabler-expression-js': 1.2.41 + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/pl-model-middle-layer': 1.34.2 + '@milaboratories/ptabler-expression-js': 1.2.43 canonicalize: 2.1.0 es-toolkit: 1.50.0 fast-json-patch: 3.1.1 @@ -8858,7 +8858,7 @@ snapshots: utility-types: 3.11.0 zod: 3.25.76 - '@platforma-sdk/package-builder-lib@1.4.0': + '@platforma-sdk/package-builder-lib@1.4.1': dependencies: '@aws-sdk/client-s3': 3.859.0 '@aws-sdk/lib-storage': 3.859.0(@aws-sdk/client-s3@3.859.0) @@ -8874,22 +8874,22 @@ snapshots: - bare-buffer - react-native-b4a - '@platforma-sdk/tengo-builder@4.1.6': + '@platforma-sdk/tengo-builder@4.1.11': dependencies: - '@milaboratories/pl-model-backend': 1.4.31 + '@milaboratories/pl-model-backend': 1.4.36 '@milaboratories/resolve-helper': 1.1.3 '@milaboratories/tengo-tester': 1.6.4 '@milaboratories/ts-helpers': 1.8.6 commander: 15.0.0 winston: 3.19.0 - '@platforma-sdk/test@1.84.6(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0))': + '@platforma-sdk/test@1.85.1(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0))': dependencies: '@milaboratories/computable': 2.9.8 - '@milaboratories/pl-client': 3.17.5 - '@milaboratories/pl-middle-layer': 1.73.2(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2) - '@milaboratories/pl-tree': 1.15.6 - '@platforma-sdk/model': 1.84.3 + '@milaboratories/pl-client': 3.18.2 + '@milaboratories/pl-middle-layer': 1.74.5(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2) + '@milaboratories/pl-tree': 1.16.3 + '@platforma-sdk/model': 1.85.0 '@vitest/coverage-istanbul': 4.1.10(vitest@4.0.18(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0)) vitest: 4.1.10(@types/node@26.1.2)(@vitest/coverage-istanbul@4.1.10)(vite@7.3.6(@types/node@26.1.2)(lightningcss@1.33.0)(yaml@2.9.0)) transitivePeerDependencies: @@ -8913,13 +8913,13 @@ snapshots: - supports-color - vite - '@platforma-sdk/test@1.84.6(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@8.2.1(@types/node@26.1.2)(esbuild@0.28.1)(yaml@2.9.0))': + '@platforma-sdk/test@1.85.1(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2)(vite@8.2.1(@types/node@26.1.2)(esbuild@0.28.1)(yaml@2.9.0))': dependencies: '@milaboratories/computable': 2.9.8 - '@milaboratories/pl-client': 3.17.5 - '@milaboratories/pl-middle-layer': 1.73.2(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2) - '@milaboratories/pl-tree': 1.15.6 - '@platforma-sdk/model': 1.84.3 + '@milaboratories/pl-client': 3.18.2 + '@milaboratories/pl-middle-layer': 1.74.5(@bytecodealliance/preview2-shim@0.17.9)(@types/node@26.1.2) + '@milaboratories/pl-tree': 1.16.3 + '@platforma-sdk/model': 1.85.0 '@vitest/coverage-istanbul': 4.1.10(vitest@4.1.10) vitest: 4.1.10(@types/node@26.1.2)(@vitest/coverage-istanbul@4.1.10)(vite@8.2.1(@types/node@26.1.2)(esbuild@0.28.1)(yaml@2.9.0)) transitivePeerDependencies: @@ -8943,13 +8943,13 @@ snapshots: - supports-color - vite - '@platforma-sdk/ui-vue@1.84.5(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2)': + '@platforma-sdk/ui-vue@1.85.0(@bytecodealliance/preview2-shim@0.17.9)(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2)': dependencies: - '@milaboratories/columns-collection-driver': 0.2.7 - '@milaboratories/pf-spec-driver': 1.5.6(@bytecodealliance/preview2-shim@0.17.9) - '@milaboratories/pl-model-common': 1.51.0 - '@milaboratories/uikit': 2.15.35(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) - '@platforma-sdk/model': 1.84.3 + '@milaboratories/columns-collection-driver': 0.2.9 + '@milaboratories/pf-spec-driver': 1.5.8(@bytecodealliance/preview2-shim@0.17.9) + '@milaboratories/pl-model-common': 1.53.0 + '@milaboratories/uikit': 2.15.42(@vue/compiler-dom@3.5.41)(@vue/server-renderer@3.5.24(vue@3.5.24(typescript@7.0.2)))(typescript@7.0.2) + '@platforma-sdk/model': 1.85.0 '@types/d3-format': 3.0.4 '@types/node': 24.5.2 '@types/semver': 7.8.0 @@ -8982,7 +8982,7 @@ snapshots: - typescript - universal-cookie - '@platforma-sdk/workflow-tengo@6.12.1': + '@platforma-sdk/workflow-tengo@6.16.0': dependencies: '@milaboratories/pframes-rs-wasip2': 1.1.61 '@milaboratories/software-pframes-conv': 2.2.9 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 2e2c348..5a975f8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,13 +7,13 @@ packages: - ui - workflow catalog: - "@platforma-sdk/model": 1.84.3 - "@platforma-sdk/ui-vue": 1.84.5 - "@platforma-sdk/workflow-tengo": 6.12.1 - "@platforma-sdk/test": 1.84.6 - "@platforma-sdk/block-tools": 2.16.6 - "@platforma-sdk/tengo-builder": 4.1.6 - "@platforma-sdk/package-builder": 3.16.0 + "@platforma-sdk/model": 1.85.0 + "@platforma-sdk/ui-vue": 1.85.0 + "@platforma-sdk/workflow-tengo": 6.16.0 + "@platforma-sdk/test": 1.85.1 + "@platforma-sdk/block-tools": 2.16.14 + "@platforma-sdk/tengo-builder": 4.1.11 + "@platforma-sdk/package-builder": 3.16.1 "@milaboratories/ts-builder": 1.7.2 "@milaboratories/ts-configs": 1.4.0 # `structure init` (block-tools 2.12.11) writes `"typescript": "catalog:"` into diff --git a/ui/src/components/SettingsDrawer.vue b/ui/src/components/SettingsDrawer.vue index 203600a..91e321a 100644 --- a/ui/src/components/SettingsDrawer.vue +++ b/ui/src/components/SettingsDrawer.vue @@ -7,8 +7,14 @@ * output writing to `data` is the hairpin, and two clients would race. */ import { BASELINE_AVAILABLE } from "@platforma-open/milaboratories.sort-seq-analysis.model"; -import type { SUniversalPColumnId } from "@platforma-sdk/model"; -import { getSingleColumnData, type PObjectId } from "@platforma-sdk/model"; +import type { DatasetSelection, SUniversalPColumnId } from "@platforma-sdk/model"; +import { + createDatasetSelection, + createPrimaryRef, + getSingleColumnData, + plRefsEqual, + type PObjectId, +} from "@platforma-sdk/model"; import { PlAccordion, PlAccordionSection, @@ -17,8 +23,8 @@ import { PlDropdown, PlCheckbox, PlElementList, + PlDatasetSelector, PlDropdownMulti, - PlDropdownRef, PlMaskIcon24, PlNumberField, PlSlideModal, @@ -138,6 +144,26 @@ const baselineAvailableHere = computed( () => isNucleotide.value !== false && app.model.data.inputGate !== undefined, ); +// The selector picks a dataset, or a dataset narrowed by one of its subset columns. A filter-only +// change keeps the dataset, so it must not reset the settings below. +const abundanceSelection = computed({ + get: () => { + const { abundanceRef, filterRef } = app.model.data; + if (abundanceRef === undefined) return undefined; + return createDatasetSelection(createPrimaryRef(abundanceRef, filterRef)); + }, + set: (selection) => { + const ref = selection?.primary.column; + const current = app.model.data.abundanceRef; + const sameDataset = + ref === undefined + ? current === undefined + : current !== undefined && plRefsEqual(ref, current, true); + if (!sameDataset) setAbundance(ref); + app.model.data.filterRef = selection?.primary.filter; + }, +}); + function setAbundance(ref: typeof app.model.data.abundanceRef) { // A stored anchored id is meaningless against a different anchor. app.model.data.abundanceRef = ref; @@ -183,18 +209,17 @@ function setGateColumn(ref: SUniversalPColumnId | undefined) { - - + the block that made the subset). + traceSpec := is_undefined(inputs.traceSpec) ? inputs.abundanceSpec : inputs.traceSpec // For the per-parent columns, which have no twin at the other level. - trace := pSpec.makeTrace(inputs.abundanceSpec, blockStep) - measuredTrace := pSpec.makeTrace(inputs.abundanceSpec, blockStep, levelStep(measuredAlphabet)) - proteinTrace := pSpec.makeTrace(inputs.abundanceSpec, blockStep, levelStep("aminoacid")) + trace := pSpec.makeTrace(traceSpec, blockStep) + measuredTrace := pSpec.makeTrace(traceSpec, blockStep, levelStep(measuredAlphabet)) + proteinTrace := pSpec.makeTrace(traceSpec, blockStep, levelStep("aminoacid")) // For the columns read against the baseline. Claimed ONLY when it resolved. The plain // enrichment is always against the input, so it says "input" whatever the baseline: naming @@ -138,8 +140,12 @@ self.body(func(inputs) { // order-guaranteed — an unsorted loop gives a CIDConflictError on re-render. for key in maps.getKeys(imported) { ll.assert(is_undefined(target[key]), "duplicate pframe entry key: %v", key) + spec := entryTrace.inject(imported[key].spec) + if !is_undefined(inputs.subset) { + spec.domain["pl7.app/inputSubset"] = inputs.subset + } target[key] = { - spec: entryTrace.inject(imported[key].spec), + spec: spec, data: imported[key].data } } diff --git a/workflow/src/main.tpl.tengo b/workflow/src/main.tpl.tengo index 1fcb8a7..2c61bc8 100644 --- a/workflow/src/main.tpl.tengo +++ b/workflow/src/main.tpl.tengo @@ -21,6 +21,7 @@ assets := import("@platforma-sdk/workflow-tengo:assets") pframes := import("@platforma-sdk/workflow-tengo:pframes") render := import("@platforma-sdk/workflow-tengo:render") canonical := import("@platforma-sdk/workflow-tengo:canonical") +json := import("json") scoreSw := assets.importSoftware("@platforma-open/milaboratories.sort-seq-analysis.software:main") buildColumnsTpl := assets.importTemplate(":build-columns") @@ -107,6 +108,11 @@ wf.prepare(func(args) { domain: { "pl7.app/alphabet": "aminoacid" } }, "parentResidue") + // Optional subset column picked alongside the dataset (PlDatasetSelector) + if !is_undefined(args.inputFilter) { + bb.addRef(json.decode(args.inputFilter)) + } + // Full await (spec and data) delays this block's spec emission, but the body exports these // columns' values as tables, so it genuinely consumes the data. return { columns: bb.build() } @@ -122,6 +128,14 @@ wf.body(func(args) { hasSortFraction := !is_undefined(args.sortFractionColumnRef) + // Optional subset: only its variants' reads enter the computation. The trace roots in the + // filter so downstream labels name it. + filterColumn := undefined + if !is_undefined(args.inputFilter) { + f := columns.getColumn(json.decode(args.inputFilter)) + filterColumn = { spec: f.spec, data: f.data } + } + // More than one match is no answer: no first-match, no ranking. A tie-break would be this // block's invention. mutationCountColumns := columns.getColumns("mutationCount") @@ -191,14 +205,31 @@ wf.body(func(args) { // Joined on shared axes: abundance ([sample][variant]) plus metadata ([sample]) gives one // row per (sample, variant). - readsBuilder := pframes.tsvFileBuilder() - readsBuilder.setAxisHeader(sampleAxisSpec.name, "sampleId") - readsBuilder.setAxisHeader(variantAxisSpec.name, "variantKey") - readsBuilder.add(columns.getColumn("main"), { header: "reads" }) - readsBuilder.add(columns.getColumn("condition"), { header: "condition" }) - readsBuilder.add(columns.getColumn("gate"), { header: "gate" }) + // With a subset, the abundance is the filtered primary. The per-variant tables below stay + // whole: they are lookups, and only variants with reads are scored. + readsBuilder := undefined + addReadsColumn := undefined + if is_undefined(filterColumn) { + readsBuilder = pframes.tsvFileBuilder() + readsBuilder.setAxisHeader(sampleAxisSpec.name, "sampleId") + readsBuilder.setAxisHeader(variantAxisSpec.name, "variantKey") + readsBuilder.add(columns.getColumn("main"), { header: "reads" }) + addReadsColumn = readsBuilder.add + } else { + readsBuilder = pframes.tableBuilder("tsv").setColumnJoin("left") + readsBuilder.setAxisHeader(sampleAxisSpec.name, "sampleId") + readsBuilder.setAxisHeader(variantAxisSpec.name, "variantKey") + readsBuilder.addPrimary("main", { + __isPrimaryRef: "v1", + column: columns.getColumn("main"), + filter: filterColumn + }, { header: "reads" }) + addReadsColumn = readsBuilder.addColumn + } + addReadsColumn(columns.getColumn("condition"), { header: "condition" }) + addReadsColumn(columns.getColumn("gate"), { header: "gate" }) if hasSortFraction { - readsBuilder.add(columns.getColumn("sortFraction"), { header: SORT_FRACTION_HEADER }) + addReadsColumn(columns.getColumn("sortFraction"), { header: SORT_FRACTION_HEADER }) } readsBuilder.mem("16GiB") readsBuilder.cpu(1) @@ -319,7 +350,7 @@ wf.body(func(args) { // Ephemeral because the child reads the manifest's VALUE, which needs `awaitState`. Only // this step opts out of dedup; everything expensive above it stays pure. - built := render.createEphemeral(buildColumnsTpl, { + buildColumnsInputs := { manifest: score.getFileContent(MANIFEST_FILE), scoreFiles: score.getFileSet("scoreFiles"), distributionFiles: score.getFileSet("distributionFiles"), @@ -334,7 +365,14 @@ wf.body(func(args) { baselineFiles: score.getFileSet("baselineFiles"), abundanceSpec: abundanceSpec, blockId: blockId - }) + } + // Only for a subset run, so a full-data run keeps exactly its previous inputs + if !is_undefined(filterColumn) { + // Only the trace annotation, so unrelated filter spec edits don't re-run the sub-template + buildColumnsInputs.traceSpec = { annotations: { "pl7.app/trace": filterColumn.spec.annotations["pl7.app/trace"] } } + buildColumnsInputs.subset = args.inputFilter + } + built := render.createEphemeral(buildColumnsTpl, buildColumnsInputs) return { outputs: {