@lightdash/common 2.321.0 → 2.322.0

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.
@@ -1,4 +1,8 @@
1
1
  import { type QueryNodeId, type SourceQuery } from '../../types/querySources';
2
+ /** Per node: the queryUuid of its last run. */
3
+ export type ComposerNodeResults = Record<QueryNodeId, {
4
+ queryUuid: string;
5
+ }>;
2
6
  /**
3
7
  * A composer query (multi-source pipeline) stored as a chart artifact. The
4
8
  * pipeline is stored replayable from day one; v0 rendering reads only the
@@ -14,9 +18,22 @@ export type AiComposerChartArtifactConfig = {
14
18
  /** Snapshot of the terminal node's last run; rendering v0 reads only this. */
15
19
  lastQueryUuid: string;
16
20
  /** One entry per node in `queries`; optional only for rows written before this field existed. */
17
- nodeResults?: Record<QueryNodeId, {
18
- queryUuid: string;
19
- }>;
21
+ nodeResults?: ComposerNodeResults;
20
22
  };
21
23
  export declare const isAiComposerChartArtifactConfig: (config: unknown) => config is AiComposerChartArtifactConfig;
24
+ /**
25
+ * Builds the stored pipeline of a composer artifact: this run's nodes plus
26
+ * every reused node (and its transitive reads) copied from earlier versions.
27
+ */
28
+ export declare const buildComposerArtifactPipeline: ({ queries, submissions, earlierPipelines, }: {
29
+ queries: SourceQuery[];
30
+ submissions: {
31
+ nodeId: QueryNodeId;
32
+ queryUuid: string;
33
+ }[];
34
+ earlierPipelines: AiComposerChartArtifactConfig[];
35
+ }) => {
36
+ queries: SourceQuery[];
37
+ nodeResults: ComposerNodeResults;
38
+ };
22
39
  //# sourceMappingURL=composerArtifact.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"composerArtifact.d.ts","sourceRoot":"","sources":["../../../../src/ee/AiAgent/composerArtifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9E;;;;GAIG;AACH,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,EAAE,CAAC,CAAC;IACjB,0FAA0F;IAC1F,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,+CAA+C;IAC/C,cAAc,EAAE,WAAW,CAAC;IAC5B,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,WAAW,CAAC,EAAE,MAAM,CAAC,WAAW,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,+BAA+B,WAChC,OAAO,KAChB,MAAM,IAAI,6BAY+B,CAAC"}
1
+ {"version":3,"file":"composerArtifact.d.ts","sourceRoot":"","sources":["../../../../src/ee/AiAgent/composerArtifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,WAAW,EAChB,KAAK,WAAW,EACnB,MAAM,0BAA0B,CAAC;AAElC,+CAA+C;AAC/C,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE7E;;;;GAIG;AACH,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,EAAE,CAAC,CAAC;IACjB,0FAA0F;IAC1F,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,+CAA+C;IAC/C,cAAc,EAAE,WAAW,CAAC;IAC5B,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,+BAA+B,WAChC,OAAO,KAChB,MAAM,IAAI,6BAY+B,CAAC;AAmB7C;;;GAGG;AACH,eAAO,MAAM,6BAA6B,gDAIvC;IACC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,WAAW,EAAE;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1D,gBAAgB,EAAE,6BAA6B,EAAE,CAAC;CACrD,KAAG;IAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAAC,WAAW,EAAE,mBAAmB,CAAA;CAuG7D,CAAC"}
@@ -1,3 +1,4 @@
1
+ import { QuerySourceType, } from '../../types/querySources';
1
2
  export const isAiComposerChartArtifactConfig = (config) => typeof config === 'object' &&
2
3
  config !== null &&
3
4
  'source' in config &&
@@ -10,4 +11,101 @@ export const isAiComposerChartArtifactConfig = (config) => typeof config === 'ob
10
11
  typeof config.terminalNodeId === 'string' &&
11
12
  'lastQueryUuid' in config &&
12
13
  typeof config.lastQueryUuid === 'string';
14
+ const NODE_ID_MAX_LENGTH = 63;
15
+ // Suffix grows deterministically (8, 12, 16… hex chars) until the id is free.
16
+ const getCopiedNodeId = (nodeId, queryUuid, takenIds) => {
17
+ const hex = queryUuid.replace(/[^a-zA-Z0-9]/g, '');
18
+ if (nodeId.endsWith(`_${hex.slice(0, 8)}`))
19
+ return nodeId;
20
+ for (let length = 8;; length += 4) {
21
+ const suffix = `_${hex.slice(0, length)}`;
22
+ const candidate = `${nodeId.slice(0, NODE_ID_MAX_LENGTH - suffix.length)}${suffix}`;
23
+ if (!takenIds.has(candidate) || length >= hex.length)
24
+ return candidate;
25
+ }
26
+ };
27
+ /**
28
+ * Builds the stored pipeline of a composer artifact: this run's nodes plus
29
+ * every reused node (and its transitive reads) copied from earlier versions.
30
+ */
31
+ export const buildComposerArtifactPipeline = ({ queries, submissions, earlierPipelines, }) => {
32
+ const earlierNodesByQueryUuid = new Map();
33
+ earlierPipelines.forEach((pipeline) => {
34
+ const { nodeResults } = pipeline;
35
+ if (!nodeResults)
36
+ return;
37
+ pipeline.queries.forEach((node) => {
38
+ const result = node.nodeId ? nodeResults[node.nodeId] : undefined;
39
+ if (result && !earlierNodesByQueryUuid.has(result.queryUuid)) {
40
+ earlierNodesByQueryUuid.set(result.queryUuid, {
41
+ node,
42
+ pipeline,
43
+ });
44
+ }
45
+ });
46
+ });
47
+ const submittedNodeIds = new Set(submissions.map((submission) => submission.nodeId));
48
+ const takenIds = new Set(submittedNodeIds);
49
+ const copiedIdsByQueryUuid = new Map();
50
+ const copiedNodes = [];
51
+ const copiedNodeResults = {};
52
+ // Resolves a reference to a copied node id, or null when nothing earlier owns it.
53
+ const copyNode = (queryUuid) => {
54
+ const copiedId = copiedIdsByQueryUuid.get(queryUuid);
55
+ if (copiedId)
56
+ return copiedId;
57
+ const earlier = earlierNodesByQueryUuid.get(queryUuid);
58
+ if (!earlier?.node.nodeId)
59
+ return null;
60
+ const nodeId = getCopiedNodeId(earlier.node.nodeId, queryUuid, takenIds);
61
+ takenIds.add(nodeId);
62
+ copiedIdsByQueryUuid.set(queryUuid, nodeId);
63
+ let node = { ...earlier.node, nodeId };
64
+ if (node.sourceType === QuerySourceType.DUCKDB && node.references) {
65
+ const entries = Array.isArray(node.references)
66
+ ? node.references.map((reference) => [reference, reference])
67
+ : Object.entries(node.references);
68
+ node = {
69
+ ...node,
70
+ references: Object.fromEntries(entries.map(([tableName, reference]) => {
71
+ const localQueryUuid = earlier.pipeline.nodeResults?.[reference]
72
+ ?.queryUuid;
73
+ return [
74
+ tableName,
75
+ copyNode(localQueryUuid ?? reference) ?? reference,
76
+ ];
77
+ })),
78
+ };
79
+ }
80
+ copiedNodes.push(node);
81
+ copiedNodeResults[nodeId] = { queryUuid };
82
+ return nodeId;
83
+ };
84
+ const submittedQueries = queries.map((node) => {
85
+ if (node.sourceType !== QuerySourceType.DUCKDB ||
86
+ !node.references ||
87
+ Array.isArray(node.references)) {
88
+ return node;
89
+ }
90
+ return {
91
+ ...node,
92
+ references: Object.fromEntries(Object.entries(node.references).map(([tableName, reference]) => [
93
+ tableName,
94
+ submittedNodeIds.has(reference)
95
+ ? reference
96
+ : (copyNode(reference) ?? reference),
97
+ ])),
98
+ };
99
+ });
100
+ return {
101
+ queries: [...copiedNodes, ...submittedQueries],
102
+ nodeResults: {
103
+ ...copiedNodeResults,
104
+ ...Object.fromEntries(submissions.map((submission) => [
105
+ submission.nodeId,
106
+ { queryUuid: submission.queryUuid },
107
+ ])),
108
+ },
109
+ };
110
+ };
13
111
  //# sourceMappingURL=composerArtifact.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"composerArtifact.js","sourceRoot":"","sources":["../../../../src/ee/AiAgent/composerArtifact.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC3C,MAAe,EACwB,EAAE,CACzC,OAAO,MAAM,KAAK,QAAQ;IAC1B,MAAM,KAAK,IAAI;IACf,QAAQ,IAAI,MAAM;IAClB,MAAM,CAAC,MAAM,KAAK,UAAU;IAC5B,eAAe,IAAI,MAAM;IACzB,MAAM,CAAC,aAAa,KAAK,CAAC;IAC1B,SAAS,IAAI,MAAM;IACnB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,gBAAgB,IAAI,MAAM;IAC1B,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ;IACzC,eAAe,IAAI,MAAM;IACzB,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,CAAC"}
1
+ {"version":3,"file":"composerArtifact.js","sourceRoot":"","sources":["../../../../src/ee/AiAgent/composerArtifact.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lightdash/common",
3
- "version": "2.321.0",
3
+ "version": "2.322.0",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",