🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(dashboards): avoid duplicate ARRAY JOIN aliases for usage and cost type (#16750)
Niklas Semmler88bade50f226
diff --git a/packages/shared/src/features/query/server/queryBuilder.pairExpand.test.ts b/packages/shared/src/features/query/server/queryBuilder.pairExpand.test.tsnew file mode 100644index 0000000000..fce2dc40e1--- /dev/null+++ b/packages/shared/src/features/query/server/queryBuilder.pairExpand.test.ts@@ -0,0 +1,61 @@+import { describe, expect, it, vi } from "vitest";++import type { QueryType } from "../types";+import { QueryBuilder } from "./queryBuilder";++// QueryBuilder.build checks the OTEL FINAL optimization before compiling SQL.+// Mock it so these stay unit-level and do not need ClickHouse.+vi.mock("../../../server/queries/clickhouse-sql/query-options", () => ({+ shouldSkipObservationsFinal: vi.fn().mockResolvedValue(false),+}));++const usageByTypeTimeseries = {+ view: "observations",+ dimensions: [{ field: "usageType" }],+ metrics: [{ measure: "usageByType", aggregation: "sum" }],+ filters: [],+ timeDimension: { granularity: "day" },+ fromTimestamp: "2025-01-01T00:00:00.000Z",+ toTimestamp: "2025-01-08T00:00:00.000Z",+ orderBy: null,+} as QueryType;++const costByTypeQuery = {+ view: "observations",+ dimensions: [{ field: "costType" }],+ metrics: [{ measure: "costByType", aggregation: "sum" }],+ filters: [],+ timeDimension: null,+ fromTimestamp: "2025-01-01T00:00:00.000Z",+ toTimestamp: "2025-01-08T00:00:00.000Z",+ orderBy: null,+} as QueryType;++describe("queryBuilder pairExpand ARRAY JOIN aliases", () => {+ it("does not re-alias usageType in a single-level usageByType timeseries", async () => {+ // Dashboard ModelUsageChart (v2) compiles this shape. ClickHouse rejects+ // `usageType AS usageType` in the same SELECT as `ARRAY JOIN … AS usageType`.+ const { query } = await new QueryBuilder(undefined, "v2").build(+ usageByTypeTimeseries,+ "test-project",+ true,+ );++ expect(query).toContain("ARRAY JOIN");+ expect(query).toMatch(/mapKeys\([^)]*usage_details\) AS usageType/);+ expect(query).not.toMatch(/usageType\s+as\s+usageType/i);+ expect(query).toMatch(/sum\(usage_value\)\s+as\s+sum_usageByType/i);+ });++ it("does not re-alias costType in the two-level inner SELECT", async () => {+ const { query } = await new QueryBuilder(undefined, "v2").build(+ costByTypeQuery,+ "test-project",+ false,+ );++ expect(query).toContain("ARRAY JOIN");+ expect(query).toMatch(/mapKeys\([^)]*cost_details\) AS costType/);+ expect(query).not.toMatch(/costType\s+as\s+costType/i);+ });+});diff --git a/packages/shared/src/features/query/server/queryBuilder.ts b/packages/shared/src/features/query/server/queryBuilder.tsindex fc4b902424..de679788e6 100644--- a/packages/shared/src/features/query/server/queryBuilder.ts+++ b/packages/shared/src/features/query/server/queryBuilder.ts@@ -873,6 +873,15 @@ export class QueryBuilder {return `ARRAY JOIN\n ${d.sql} AS ${d.alias ?? d.sql},\n ${d.pairExpand!.valuesSql} AS ${d.pairExpand!.valueAlias}`;}+ /**+ * ARRAY JOIN already binds the pairExpand key (`mapKeys(...) AS costType`).+ * Selecting `costType AS costType` in the same query makes ClickHouse throw+ * "Duplicate alias in ARRAY JOIN".+ */+ private pairExpandKeyColumn(dimension: AppliedDimensionType): string {+ return dimension.alias ?? dimension.sql;+ }+private buildWhereClause(filterList: FilterList,parameters: Record<string, unknown>,@@ -1047,7 +1056,7 @@ export class QueryBuilder {// Note: the paired value column (e.g. cost_value) is NOT in GROUP BY and IS// wrapped in any() in buildInnerMetricsPart, so the outer query can re-aggregate it.if (dimension.pairExpand) {- return `${dimension.alias} as ${dimension.alias ?? dimension.sql}`;+ return this.pairExpandKeyColumn(dimension);}// Explode array dimensions using arrayJoinif (dimension.explodeArray) {@@ -1141,9 +1150,10 @@ export class QueryBuilder {// Add regular dimensionsif (appliedDimensions.length > 0) {dimensions += `${appliedDimensions- .map(- (dimension) =>- `${dimension.alias ?? dimension.sql} as ${dimension.alias || dimension.sql}`,+ .map((dimension) =>+ dimension.pairExpand+ ? this.pairExpandKeyColumn(dimension)+ : `${dimension.alias ?? dimension.sql} as ${dimension.alias || dimension.sql}`,).join(",\n")},`;}@@ -1338,8 +1348,7 @@ export class QueryBuilder {appliedDimensions.map((d) => {if (d.pairExpand) {- // Bare reference — already projected by the ARRAY JOIN clause- return `${d.alias} as ${d.alias ?? d.sql}`;+ return this.pairExpandKeyColumn(d);}if (d.explodeArray) {return `arrayJoin(${d.sql}) as ${d.alias ?? d.sql}`;diff --git a/web/src/__tests__/server/queryBuilder.servertest.ts b/web/src/__tests__/server/queryBuilder.servertest.tsindex c4d65c9640..4ce7a97f9c 100644--- a/web/src/__tests__/server/queryBuilder.servertest.ts+++ b/web/src/__tests__/server/queryBuilder.servertest.ts@@ -4074,6 +4074,9 @@ describe("queryBuilder", () => {expect(sql.indexOf("ARRAY JOIN")).toBeLessThan(sql.indexOf("WHERE"));// No inline arrayJoin() function call — must use clause formexpect(sql).not.toMatch(/arrayJoin\(mapKeys/);+ // ARRAY JOIN already aliases the key; re-emitting `costType AS costType`+ // makes ClickHouse throw "Duplicate alias in ARRAY JOIN".+ expect(sql).not.toMatch(/costType\s+as\s+costType/i);});maybeItWithEventsTable(