The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
[Metabot] AI Usage Analytics v1 (#71864)
Noah Mossc8cf44d61d18
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 703f8e74065..6c8d6886932 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -1094,8 +1094,8 @@lib-be ;; BE-specific extension of lib; tight coupling is acceptable.query-processor ;; Necessarily manipulates MBQL; better to pull most logic into a new module.source-swap ;; Manipulates MBQL queries; tight coupling with lib is expected.- enterprise/sandbox ;; Really part of the QP, though its lives in the enterprise/ tree.- }}+ enterprise/sandbox}} ;; Really part of the QP, though its lives in the enterprise/ tree.+lib-be{:team "Querying Platform"@@ -1220,6 +1220,7 @@metabase.metabot.settings}:friends #{agent-apienterprise/metabot+ enterprise/metabot-analyticsslackbot}:uses #{activity-feedagent-lib@@ -1261,7 +1262,11 @@transforms-baseutilwarehouses}- :model-exports #{:model/AiUsageLog :model/Metabot :model/MetabotMessage}+ :model-exports #{:model/AiUsageLog+ :model/Metabot+ :model/MetabotConversation+ :model/MetabotFeedback+ :model/MetabotMessage}:model-imports #{:model/Card:model/Collection:model/Dashboard@@ -2198,13 +2203,19 @@configliblib-be+ permissionspremium-featuressearchutil}:model-imports #{:model/AiUsageLog:model/Card:model/Dashboard- :model/SecurityAdvisory}}+ :model/MetabotConversation+ :model/MetabotMessage+ :model/PermissionsGroup+ :model/PermissionsGroupMembership+ :model/SecurityAdvisory+ :model/User}}tiles{:team "UX West"@@ -2861,6 +2872,7 @@collectionsconfigmetabot+ modelspremium-featuressettingsstartup@@ -3077,6 +3089,20 @@:model/PermissionsGroupMembership:model/Transform}}+ enterprise/metabot-analytics+ {:team "Metabot"+ :api #{metabase-enterprise.metabot-analytics.api}+ :uses #{api+ driver+ metabot+ permissions+ query-processor+ request+ slackbot+ sql-tools+ util}+ :model-imports #{:model/MetabotConversation :model/MetabotFeedback :model/MetabotMessage}}+enterprise/permission-debug{:team "UX West":api #{metabase-enterprise.permission-debug.api}diff --git a/docs/ai/customization.md b/docs/ai/customization.mdindex 965194c50e5..53617039c83 100644--- a/docs/ai/customization.md+++ b/docs/ai/customization.md@@ -9,14 +9,14 @@ summary: "Change how Metabot appears in Metabase for a branded look."_Admin > AI > Customization_-Admins can change how Metabot displays itself in Metabase.+Admins can change how Metabot displays itself in Metabase.To navigate to the AI customization settings:1. Click the **grid** icon in the upper right.2. Click **Admin**.3. Go to the **AI** tab.-4. Click on the **Customization* tab.+4. Click on the **Customization** tab.These customizations are just surface-level. If you want to change the AI's behavior, check out [System prompts](./system-prompts.md).@@ -40,4 +40,3 @@ Once you've uploaded a custom icon, this toggle appears and controls whether the- [AI usage controls](./usage-controls.md)- [AI system prompts](./system-prompts.md)- [Metabot](./metabot.md)-diff --git a/docs/ai/system-prompts.md b/docs/ai/system-prompts.mdindex 37b486d51a7..610fbbf1ca9 100644--- a/docs/ai/system-prompts.md+++ b/docs/ai/system-prompts.md@@ -39,4 +39,3 @@ System prompts can only influence Metabot's behavior, not its access. A prompt c- [AI controls](./usage-controls.md)- [AI customization](./customization.md)- [Metabot](./metabot.md)-diff --git a/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts b/e2e/test/scenarios/metabot/usage-auditing.cy.spec.tsnew file mode 100644index 00000000000..084bed142c6--- /dev/null+++ b/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts@@ -0,0 +1,1059 @@+const { H } = cy;++import {+ ADMINISTRATORS_GROUP_ID,+ ADMIN_USER_ID,+ NORMAL_USER_ID,+} from "e2e/support/cypress_sample_instance_data";++type UsageStatsMetric = "conversations" | "messages" | "tokens";+type ChartLabelKey = "source" | "profile" | "user" | "ip";+type ChartLabels = Partial<Record<ChartLabelKey, string[]>>;+type CompleteChartLabels = Record<ChartLabelKey, string[]>;+type CartesianChartLabelKey = Extract<ChartLabelKey, "source" | "profile">;+type SeedUsageAuditingResponse = {+ inserted: number;+ date: string;+};+type SeedUsageAuditingRequest = {+ user_id: number;+ second_user_id: number;+ tenant_id?: number;+ second_tenant_id?: number;+};+type UsageAuditingTenant = {+ id: number;+ name: string;+ slug: string;+};+type UsageAuditingTenants = {+ bobbyTenant: UsageAuditingTenant;+ robertTenant: UsageAuditingTenant;+};++const USAGE_STATS_METRICS: UsageStatsMetric[] = [+ "conversations",+ "messages",+ "tokens",+];++const METRIC_TAB_NAMES: Record<UsageStatsMetric, string> = {+ conversations: "Conversations",+ messages: "Messages",+ tokens: "Tokens",+};++const BOBBY_TENANT = {+ name: "Bobby Analytics",+ slug: "bobby-analytics",+};+const ROBERT_TENANT = {+ name: "Robert Analytics",+ slug: "robert-analytics",+};+const TENANT_CONVERSATIONS_CHART_TITLE = "Tenants with most conversations";++const METRIC_PRIMARY_SERIES_COLORS: Record<UsageStatsMetric, string> = {+ conversations: "#509EE3",+ messages: "#F9D45C",+ tokens: "#A989C5",+};++const METRIC_CHART_TITLES: Record<UsageStatsMetric, string[]> = {+ conversations: [+ "Conversations by day",+ "Conversations by source",+ "Conversations by profile",+ "Groups with most conversations",+ "Users with most conversations",+ "IP addresses with most conversations",+ ],+ messages: [+ "Messages by day",+ "Messages by source",+ "Messages by profile",+ "Groups with most messages",+ "Users with most messages",+ "IP addresses with most messages",+ ],+ tokens: [+ "Tokens by day",+ "Tokens by source",+ "Tokens by profile",+ "Groups with most tokens",+ "Users with most tokens",+ "IP addresses with most tokens",+ ],+};++const BOBBY_CHART_LABELS: CompleteChartLabels = {+ source: ["Slackbot", "Metabot"],+ profile: ["Internal", "NLQ"],+ user: ["Bobby Tables"],+ ip: ["10.0.0.1", "10.0.0.2"],+};++const ROBERT_CHART_LABELS: CompleteChartLabels = {+ source: ["SQL", "Documents"],+ profile: ["SQL", "Documents", "Embedding"],+ user: ["Robert Tableton"],+ ip: ["10.0.0.3", "10.0.0.4", "10.0.0.5"],+};++const DATE_FILTER_SHORTCUTS = [+ "Today",+ "Yesterday",+ "Previous week",+ "Previous 7 days",+ "Previous 30 days",+ "Previous month",+ "Previous 3 months",+ "Previous 12 months",+] as const;++type DateFilterLabel = (typeof DATE_FILTER_SHORTCUTS)[number];++const DATE_FILTER_BUTTON_LABEL = new RegExp(DATE_FILTER_SHORTCUTS.join("|"));++const TODAY_CHART_LABELS: CompleteChartLabels = {+ source: ["Slackbot", "Metabot"],+ profile: ["NLQ", "Slackbot", "Transforms codegen"],+ user: ["Bobby Tables"],+ ip: ["10.0.0.1", "10.0.0.6", "10.0.0.7"],+};++const YESTERDAY_CHART_LABELS: CompleteChartLabels = {+ source: ["SQL", "Documents"],+ profile: ["SQL", "Documents"],+ user: ["Robert Tableton"],+ ip: ["10.0.0.3", "10.0.0.4"],+};++const PREVIOUS_WEEK_CHART_LABELS: CompleteChartLabels = {+ source: ["Metabot"],+ profile: ["NLQ"],+ user: ["Bobby Tables"],+ ip: ["10.0.0.1"],+};++const RECENT_CHART_LABELS: CompleteChartLabels = {+ source: ["Slackbot", "Metabot", "SQL", "Documents"],+ profile: ["Internal", "NLQ", "SQL", "Documents"],+ user: ["Bobby Tables", "Robert Tableton"],+ ip: ["10.0.0.1", "10.0.0.2", "10.0.0.3", "10.0.0.4", "10.0.0.5"],+};++const PREVIOUS_MONTH_CHART_LABELS: CompleteChartLabels = {+ source: ["SQL"],+ profile: ["SQL"],+ user: ["Robert Tableton"],+ ip: ["10.0.0.8"],+};++const OUT_OF_BOUNDS_CHART_LABELS: ChartLabels = {+ ip: ["10.0.0.99"],+};++const DATE_FILTER_CASES: Array<{+ label: DateFilterLabel;+ chartLabels: ChartLabels;+}> = [+ { label: "Today", chartLabels: TODAY_CHART_LABELS },+ { label: "Yesterday", chartLabels: YESTERDAY_CHART_LABELS },+ { label: "Previous week", chartLabels: PREVIOUS_WEEK_CHART_LABELS },+ { label: "Previous 7 days", chartLabels: RECENT_CHART_LABELS },+ { label: "Previous 30 days", chartLabels: RECENT_CHART_LABELS },+ { label: "Previous month", chartLabels: PREVIOUS_MONTH_CHART_LABELS },+ { label: "Previous 3 months", chartLabels: PREVIOUS_MONTH_CHART_LABELS },+ { label: "Previous 12 months", chartLabels: PREVIOUS_MONTH_CHART_LABELS },+];++const MAIN_PROFILE_LABELS: string[] = [+ "Internal",+ "Slackbot",+ "SQL",+ "NLQ",+ "Embedding",+ "Transforms codegen",+];++function visitUsageStatsPage(path = "/admin/metabot/usage-auditing"): void {+ cy.intercept("GET", "/api/database/13371337/metadata*").as("auditMetadata");+ cy.intercept("POST", "/api/dataset").as("dataset");++ cy.visit(path);+ cy.wait("@auditMetadata");+}++function interceptConversationsApi(): void {+ cy.intercept("GET", "/api/ee/metabot-analytics/conversations?*").as(+ "conversations",+ );+ cy.intercept("GET", "/api/ee/metabot-analytics/conversations/*").as(+ "conversationDetail",+ );+}++function waitForConversations(): void {+ cy.wait("@conversations").its("response.statusCode").should("eq", 200);+}++function seedUsageAuditingData(+ request: SeedUsageAuditingRequest = {+ user_id: ADMIN_USER_ID,+ second_user_id: NORMAL_USER_ID,+ },+): Cypress.Chainable<Cypress.Response<SeedUsageAuditingResponse>> {+ return cy+ .request<SeedUsageAuditingResponse>(+ "POST",+ "/api/testing/metabot/seed-usage-auditing",+ request,+ )+ .as("usageAuditingSeed");+}++function getUsageAuditingSeed(): Cypress.Chainable<+ Cypress.Response<SeedUsageAuditingResponse>+> {+ return cy.get<Cypress.Response<SeedUsageAuditingResponse>>(+ "@usageAuditingSeed",+ );+}++function createUsageAuditingTenant({+ name,+ slug,+}: Omit<UsageAuditingTenant, "id">): Cypress.Chainable<UsageAuditingTenant> {+ return cy+ .request<UsageAuditingTenant>("POST", "/api/ee/tenant", { name, slug })+ .its("body");+}++function setupUsageAuditingTenants(): Cypress.Chainable<UsageAuditingTenants> {+ H.updateSetting("use-tenants", true);++ return createUsageAuditingTenant(BOBBY_TENANT).then((bobbyTenant) => {+ return createUsageAuditingTenant(ROBERT_TENANT).then((robertTenant) => {+ return seedUsageAuditingData({+ user_id: ADMIN_USER_ID,+ second_user_id: NORMAL_USER_ID,+ tenant_id: bobbyTenant.id,+ second_tenant_id: robertTenant.id,+ }).then(() => ({ bobbyTenant, robertTenant }));+ });+ });+}++function visitConversationsPage(+ path = "/admin/metabot/usage-auditing/conversations",+): void {+ interceptConversationsApi();+ cy.visit(path);+ waitForConversations();+}++function getChartCard(title: string): Cypress.Chainable<JQuery<HTMLElement>> {+ return H.main()+ .findByText(title)+ .scrollIntoView()+ .should("be.visible")+ .parent();+}++function assertChartRendered(title: string): void {+ getChartCard(title).within(() => {+ cy.findByTestId(/^(chart|row-chart)-container$/)+ .should("be.visible")+ .find("svg")+ .should("exist");+ });+}++function assertChartContains(title: string, labels: readonly string[]): void {+ getChartCard(title).within(() => {+ labels.forEach((label) => {+ cy.findAllByText(label)+ .filter(":visible")+ .should("have.length.greaterThan", 0);+ });+ });+}++function getUniqueCartesianChartBarPaths(+ title: string,+ metric: UsageStatsMetric,+): Cypress.Chainable<SVGPathElement[]> {+ return getChartCard(title)+ .findByTestId("chart-container")+ .find<SVGPathElement>(+ `path[fill="${METRIC_PRIMARY_SERIES_COLORS[metric]}"]`,+ )+ .should("have.length.greaterThan", 0)+ .then(($paths) => {+ const seen = new Set<string>();+ const barPaths = $paths.toArray().filter((path) => {+ const { left, top, width, height } = path.getBoundingClientRect();++ if (width < 8 || height < 8) {+ return false;+ }++ const key = [+ Math.round(left),+ Math.round(top),+ Math.round(width),+ Math.round(height),+ ].join(":");++ if (seen.has(key)) {+ return false;+ }++ seen.add(key);+ return true;+ });++ expect(barPaths, `${title} bar paths`).to.have.length.greaterThan(0);++ return barPaths;+ });+}++function getCartesianChartTooltipText(+ title: string,+ metric: UsageStatsMetric,+): Cypress.Chainable<string> {+ let tooltipText = "";+ let previousTooltipText: string | undefined;++ return getUniqueCartesianChartBarPaths(title, metric)+ .each(($path) => {+ const path = $path[0];+ const { left, top, width, height } = path.getBoundingClientRect();+ const eventOptions = {+ clientX: left + width / 2,+ clientY: top + height / 2,+ force: true,+ };++ cy.wrap(path)+ .trigger("mouseover", eventOptions)+ .trigger("mousemove", eventOptions);++ return H.echartsTooltip()+ .should(($tooltip) => {+ if (previousTooltipText) {+ expect($tooltip.text(), `${title} tooltip text`).not.to.eq(+ previousTooltipText,+ );+ }+ })+ .then(($tooltip) => {+ previousTooltipText = $tooltip.text();+ tooltipText += `\n${previousTooltipText}`;+ });+ })+ .then(() => tooltipText);+}++function assertCartesianChartContains(+ title: string,+ metric: UsageStatsMetric,+ labels: readonly string[],+): void {+ getCartesianChartTooltipText(title, metric).then((tooltipText) => {+ labels.forEach((label) => {+ expect(tooltipText, `${title} tooltip text`).to.include(label);+ });+ });+}++function assertCartesianChartDoesNotContain(+ title: string,+ metric: UsageStatsMetric,+ labels: readonly string[],+): void {+ getCartesianChartTooltipText(title, metric).then((tooltipText) => {+ labels.forEach((label) => {+ expect(tooltipText, `${title} tooltip text`).not.to.include(label);+ });+ });+}++function assertChartDoesNotContain(+ title: string,+ labels: readonly string[],+): void {+ getChartCard(title).within(() => {+ labels.forEach((label) => {+ cy.contains(label).should("not.exist");+ });+ });+}++function assertMetricChartsRendered(metric: UsageStatsMetric): void {+ METRIC_CHART_TITLES[metric].forEach(assertChartRendered);+}++function selectMetricTab(+ metric: Exclude<UsageStatsMetric, "conversations">,+): void {+ H.main().findByRole("tab", { name: METRIC_TAB_NAMES[metric] }).realClick();+ cy.url().should("include", `metric=${metric}`);+ cy.wait("@dataset");+}++function getMetricTimeseriesTitle(+ metric: UsageStatsMetric,+ dateLabel: DateFilterLabel,+): string {+ const timeseriesUnit =+ dateLabel === "Today" || dateLabel === "Yesterday" ? "hour" : "day";++ return `${METRIC_TAB_NAMES[metric]} by ${timeseriesUnit}`;+}++function getMetricBreakoutTitle(+ metric: UsageStatsMetric,+ labelKey: ChartLabelKey,+): string {+ switch (labelKey) {+ case "source":+ return `${METRIC_TAB_NAMES[metric]} by source`;+ case "profile":+ return `${METRIC_TAB_NAMES[metric]} by profile`;+ case "user":+ return `Users with most ${metric}`;+ case "ip":+ return `IP addresses with most ${metric}`;+ }+}++function isCartesianChartLabelKey(+ labelKey: ChartLabelKey,+): labelKey is CartesianChartLabelKey {+ return labelKey === "source" || labelKey === "profile";+}++function assertMetricChartsRenderedForDate(+ metric: UsageStatsMetric,+ dateLabel: DateFilterLabel,+): void {+ assertChartRendered(getMetricTimeseriesTitle(metric, dateLabel));+ METRIC_CHART_TITLES[metric].slice(1).forEach((title) => {+ assertChartRendered(title);+ });+}++function assertMetricChartLabels(+ metric: UsageStatsMetric,+ chartLabels: ChartLabels,+): void {+ Object.entries(chartLabels).forEach(([labelKey, labels]) => {+ if (labels?.length) {+ const chartLabelKey = labelKey as ChartLabelKey;+ const title = getMetricBreakoutTitle(metric, chartLabelKey);++ if (isCartesianChartLabelKey(chartLabelKey) && labels.length > 1) {+ assertCartesianChartContains(title, metric, labels);+ } else {+ assertChartContains(title, labels);+ }+ }+ });+}++function assertMetricChartLabelsAbsent(+ metric: UsageStatsMetric,+ chartLabels: ChartLabels,+): void {+ Object.entries(chartLabels).forEach(([labelKey, labels]) => {+ if (labels?.length) {+ const chartLabelKey = labelKey as ChartLabelKey;+ const title = getMetricBreakoutTitle(metric, chartLabelKey);++ if (isCartesianChartLabelKey(chartLabelKey) && labels.length > 1) {+ assertCartesianChartDoesNotContain(title, metric, labels);+ } else {+ assertChartDoesNotContain(title, labels);+ }+ }+ });+}++function assertConversationChartLabels(chartLabels: ChartLabels): void {+ assertMetricChartLabels("conversations", chartLabels);+}++function assertBobbyOnlyChartLabels(): void {+ assertChartContains("Conversations by source", BOBBY_CHART_LABELS.source);+ assertChartDoesNotContain(+ "Conversations by source",+ ROBERT_CHART_LABELS.source,+ );+ assertChartContains("Conversations by profile", BOBBY_CHART_LABELS.profile);+ assertChartDoesNotContain(+ "Conversations by profile",+ ROBERT_CHART_LABELS.profile,+ );+ assertChartContains("Users with most conversations", BOBBY_CHART_LABELS.user);+ assertChartDoesNotContain(+ "Users with most conversations",+ ROBERT_CHART_LABELS.user,+ );+ assertChartContains(+ "IP addresses with most conversations",+ BOBBY_CHART_LABELS.ip,+ );+ assertChartDoesNotContain(+ "IP addresses with most conversations",+ ROBERT_CHART_LABELS.ip,+ );+}++function assertRobertOnlyChartLabels(): void {+ assertChartContains("Conversations by source", ROBERT_CHART_LABELS.source);+ assertChartDoesNotContain(+ "Conversations by source",+ BOBBY_CHART_LABELS.source,+ );+ assertChartContains("Conversations by profile", ROBERT_CHART_LABELS.profile);+ assertChartDoesNotContain(+ "Conversations by profile",+ BOBBY_CHART_LABELS.profile,+ );+ assertChartContains(+ "Users with most conversations",+ ROBERT_CHART_LABELS.user,+ );+ assertChartDoesNotContain(+ "Users with most conversations",+ BOBBY_CHART_LABELS.user,+ );+ assertChartContains(+ "IP addresses with most conversations",+ ROBERT_CHART_LABELS.ip,+ );+ assertChartDoesNotContain(+ "IP addresses with most conversations",+ BOBBY_CHART_LABELS.ip,+ );+}++function selectGroupFilter(groupName: string): void {+ H.main().findByTestId("conversation-filters-group-select").realClick();+ H.selectDropdown().findByText(groupName).realClick();+ cy.url().should("include", "group=");+ cy.wait("@dataset");+}++function selectUserFilter(userName: string, waitAlias = "@dataset"): void {+ H.main().findByTestId("conversation-filters-user-select").realClick();+ H.selectDropdown().findByText(userName).realClick();+ cy.url().should("include", "user=");+ cy.wait(waitAlias);+}++function selectTenantFilter(tenantName: string, waitAlias = "@dataset"): void {+ H.main().findByTestId("conversation-filters-tenant-select").realClick();+ H.selectDropdown().findByText(tenantName).realClick();+ cy.url().should("include", "tenant=");+ cy.wait(waitAlias);+}++function selectDateFilter(+ dateLabel: DateFilterLabel,+ waitAlias = "@dataset",+): void {+ H.main().findByRole("button", { name: DATE_FILTER_BUTTON_LABEL }).realClick();+ H.popover().findByRole("button", { name: dateLabel }).realClick();+ H.main().findByRole("button", { name: dateLabel }).should("be.visible");+ cy.wait(waitAlias);+}++function assertConversationTableContains(labels: readonly string[]): void {+ H.main()+ .findByRole("table")+ .within(() => {+ labels.forEach((label) => {+ cy.findAllByText(label)+ .filter(":visible")+ .should("have.length.greaterThan", 0);+ });+ });+}++function assertConversationTableDoesNotContain(+ labels: readonly string[],+): void {+ H.main()+ .findByRole("table")+ .within(() => {+ labels.forEach((label) => {+ cy.contains(label).should("not.exist");+ });+ });+}++function assertTodayConversationTable(): void {+ assertConversationTableContains([+ "Bobby Tables",+ "NLQ",+ "Slackbot",+ "Transforms codegen",+ "10.0.0.1",+ "10.0.0.6",+ "10.0.0.7",+ ]);+ assertConversationTableDoesNotContain([+ "Robert Tableton",+ "Internal",+ "10.0.0.2",+ "10.0.0.3",+ "10.0.0.99",+ ]);+}++function assertLatestHourConversationTable(): void {+ assertConversationTableContains([+ "Bobby Tables",+ "Transforms codegen",+ "10.0.0.7",+ ]);+ assertConversationTableDoesNotContain([+ "Robert Tableton",+ "NLQ",+ "10.0.0.1",+ "10.0.0.2",+ "10.0.0.3",+ "10.0.0.99",+ ]);+}++function assertHourDateFilterInUrl(): void {+ cy.location("search").then((search) => {+ const date = new URLSearchParams(search).get("date");++ expect(date).to.match(+ /^\d{4}-\d{2}-\d{2}T\d{2}:00:00~\d{4}-\d{2}-\d{2}T\d{2}:00:00$/,+ );+ });+}++function clickLastTimeseriesChartDot(title: string): void {+ getChartCard(title).within(() => {+ // eslint-disable-next-line metabase/no-unsafe-element-filtering+ H.cartesianChartCircle()+ .should("have.length.greaterThan", 0)+ .last()+ .realClick();+ });+}++function clickRowChartBarForLabel(title: string, label: string): void {+ getChartCard(title)+ .findByText(label)+ .then(($label) => {+ const rect = $label[0].getBoundingClientRect();+ // Row-chart labels are not the click target; click the bar next to the visible label.+ const target = $label[0].ownerDocument.elementFromPoint(+ rect.right + 30,+ rect.top + rect.height / 2,+ );++ expect(target).to.exist;+ cy.wrap(target).realClick({ force: true });+ });+}++function openConversationFromProfile(profileLabel: string): void {+ cy.get("tbody")+ .contains("tr", profileLabel)+ .scrollIntoView()+ .should("be.visible")+ .realClick();+ cy.wait("@conversationDetail").its("response.statusCode").should("eq", 200);+}++function assertConversationDetailProfile(profileLabel: string): void {+ H.main().within(() => {+ cy.findByRole("heading", { name: /Conversation with/ }).should(+ "be.visible",+ );+ cy.findByText(profileLabel).should("be.visible");+ cy.findByText("Total tokens").should("be.visible");+ });+}++describe("scenarios > metabot > usage auditing", () => {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();+ H.activateToken("pro-self-hosted");+ seedUsageAuditingData();+ });++ it("shows conversation usage stats charts", () => {+ visitUsageStatsPage();++ H.main().within(() => {+ cy.findByRole("heading", { name: "Usage stats" }).should("be.visible");+ cy.findByRole("tab", { name: "Conversations" }).should(+ "have.attr",+ "aria-selected",+ "true",+ );+ });+ assertMetricChartsRendered("conversations");+ assertConversationChartLabels(RECENT_CHART_LABELS);+ });++ it("renders usage stats charts for every date shortcut on every metric tab", () => {+ visitUsageStatsPage();++ USAGE_STATS_METRICS.forEach((metric) => {+ if (metric !== "conversations") {+ selectMetricTab(metric);+ }++ DATE_FILTER_CASES.forEach(({ label, chartLabels }) => {+ cy.log(`${METRIC_TAB_NAMES[metric]} date filter: ${label}`);+ selectDateFilter(label);++ assertMetricChartsRenderedForDate(metric, label);+ assertMetricChartLabels(metric, chartLabels);+ assertMetricChartLabelsAbsent(metric, OUT_OF_BOUNDS_CHART_LABELS);+ });+ });+ });++ it("filters conversation charts by group", () => {+ visitUsageStatsPage();+ selectGroupFilter("Administrators");++ assertMetricChartsRendered("conversations");+ assertBobbyOnlyChartLabels();++ selectGroupFilter("data");++ assertMetricChartsRendered("conversations");+ assertRobertOnlyChartLabels();+ });++ it("filters conversation charts by user", () => {+ visitUsageStatsPage();+ selectUserFilter("Robert Tableton");++ assertMetricChartsRendered("conversations");+ assertRobertOnlyChartLabels();++ selectUserFilter("Bobby Tables");++ assertMetricChartsRendered("conversations");+ assertBobbyOnlyChartLabels();+ });++ it("shows tenant filters and tenant charts when tenants are enabled", () => {+ setupUsageAuditingTenants().then(({ bobbyTenant, robertTenant }) => {+ visitUsageStatsPage();++ H.main().findByDisplayValue("All tenants").should("be.visible");+ assertChartRendered(TENANT_CONVERSATIONS_CHART_TITLE);+ assertChartContains(TENANT_CONVERSATIONS_CHART_TITLE, [+ bobbyTenant.name,+ robertTenant.name,+ ]);+ assertChartContains("Groups with most conversations", ["All Users"]);+ });+ });++ it("filters conversation charts by tenant", () => {+ setupUsageAuditingTenants().then(({ bobbyTenant, robertTenant }) => {+ visitUsageStatsPage();++ selectTenantFilter(bobbyTenant.name);+ assertMetricChartsRendered("conversations");+ assertChartContains(TENANT_CONVERSATIONS_CHART_TITLE, [bobbyTenant.name]);+ assertChartDoesNotContain(TENANT_CONVERSATIONS_CHART_TITLE, [+ robertTenant.name,+ ]);+ assertBobbyOnlyChartLabels();++ selectTenantFilter(robertTenant.name);+ assertChartContains(TENANT_CONVERSATIONS_CHART_TITLE, [+ robertTenant.name,+ ]);+ assertChartDoesNotContain(TENANT_CONVERSATIONS_CHART_TITLE, [+ bobbyTenant.name,+ ]);+ assertRobertOnlyChartLabels();+ });+ });++ it("filters the conversations list by tenant", () => {+ setupUsageAuditingTenants().then(({ bobbyTenant, robertTenant }) => {+ visitConversationsPage(+ "/admin/metabot/usage-auditing/conversations?date=past7days~",+ );++ H.main().findByDisplayValue("All tenants").should("be.visible");+ selectTenantFilter(bobbyTenant.name, "@conversations");+ cy.location("search").should("include", `tenant=${bobbyTenant.id}`);+ assertConversationTableContains([+ "Bobby Tables",+ "Internal",+ "NLQ",+ "Slackbot",+ "Transforms codegen",+ "10.0.0.1",+ "10.0.0.2",+ "10.0.0.6",+ "10.0.0.7",+ ]);+ assertConversationTableDoesNotContain([+ "Robert Tableton",+ "10.0.0.3",+ "10.0.0.4",+ "10.0.0.5",+ ]);++ selectTenantFilter(robertTenant.name, "@conversations");+ cy.location("search").should("include", `tenant=${robertTenant.id}`);+ assertConversationTableContains([+ "Robert Tableton",+ "SQL",+ "Documents",+ "Embedding",+ "10.0.0.3",+ "10.0.0.4",+ "10.0.0.5",+ ]);+ assertConversationTableDoesNotContain([+ "Bobby Tables",+ "10.0.0.1",+ "10.0.0.2",+ "10.0.0.6",+ "10.0.0.7",+ ]);+ });+ });++ it("drills through from the tenants chart to the conversations list", () => {+ setupUsageAuditingTenants().then(({ bobbyTenant, robertTenant }) => {+ visitUsageStatsPage("/admin/metabot/usage-auditing?date=past7days~");+ interceptConversationsApi();++ clickRowChartBarForLabel(+ TENANT_CONVERSATIONS_CHART_TITLE,+ bobbyTenant.name,+ );++ waitForConversations();+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ cy.location("search").should("include", `tenant=${bobbyTenant.id}`);+ H.main().findByDisplayValue(bobbyTenant.name).should("be.visible");+ assertConversationTableContains([+ "Bobby Tables",+ "Internal",+ "NLQ",+ "Slackbot",+ "Transforms codegen",+ "10.0.0.1",+ "10.0.0.2",+ "10.0.0.6",+ "10.0.0.7",+ ]);+ assertConversationTableDoesNotContain([+ robertTenant.name,+ "Robert Tableton",+ "10.0.0.3",+ "10.0.0.4",+ "10.0.0.5",+ ]);+ });+ });++ it("drills through from the groups chart to the conversations list", () => {+ visitUsageStatsPage("/admin/metabot/usage-auditing?date=past7days~");+ interceptConversationsApi();++ clickRowChartBarForLabel(+ "Groups with most conversations",+ "Administrators",+ );++ waitForConversations();+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ cy.location("search").should("include", `group=${ADMINISTRATORS_GROUP_ID}`);+ H.main().findByDisplayValue("Administrators").should("be.visible");+ assertConversationTableContains([+ "Bobby Tables",+ "Internal",+ "NLQ",+ "10.0.0.1",+ "10.0.0.2",+ ]);+ assertConversationTableDoesNotContain([+ "Robert Tableton",+ "10.0.0.3",+ "10.0.0.4",+ "10.0.0.5",+ "10.0.0.99",+ ]);+ });++ it("drills through from conversation charts to the conversations list and updates list filters", () => {+ visitUsageStatsPage();+ interceptConversationsApi();++ clickRowChartBarForLabel("Users with most conversations", "Bobby Tables");++ waitForConversations();+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ cy.location("search").should("include", `user=${ADMIN_USER_ID}`);+ H.main().findByDisplayValue("Bobby Tables").should("be.visible");+ assertConversationTableContains([+ "Bobby Tables",+ "Internal",+ "NLQ",+ "10.0.0.1",+ "10.0.0.2",+ ]);+ assertConversationTableDoesNotContain([+ "Robert Tableton",+ "10.0.0.3",+ "10.0.0.99",+ ]);++ selectUserFilter("Robert Tableton", "@conversations");+ assertConversationTableContains([+ "Robert Tableton",+ "SQL",+ "Documents",+ "Embedding",+ "10.0.0.3",+ "10.0.0.4",+ "10.0.0.5",+ ]);+ assertConversationTableDoesNotContain(["Bobby Tables", "10.0.0.1"]);++ selectDateFilter("Yesterday", "@conversations");+ assertConversationTableContains([+ "Robert Tableton",+ "SQL",+ "Documents",+ "10.0.0.3",+ "10.0.0.4",+ ]);+ assertConversationTableDoesNotContain([+ "Embedding",+ "10.0.0.5",+ "Bobby Tables",+ ]);+ });++ it("drills through from the conversations by day chart to the conversations list", () => {+ getUsageAuditingSeed().then(({ body }) => {+ visitUsageStatsPage("/admin/metabot/usage-auditing?date=past7days~");+ interceptConversationsApi();++ clickLastTimeseriesChartDot("Conversations by day");++ waitForConversations();+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ cy.location("search").should("include", `date=${body.date}`);+ assertTodayConversationTable();+ });+ });++ it("drills through from the conversations by hour chart to the conversations list", () => {+ getUsageAuditingSeed().then(({ body }) => {+ visitUsageStatsPage(`/admin/metabot/usage-auditing?date=${body.date}`);+ interceptConversationsApi();++ clickLastTimeseriesChartDot("Conversations by hour");++ waitForConversations();+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ assertHourDateFilterInUrl();+ assertLatestHourConversationTable();+ });+ });++ it("opens conversation details from the list for each main profile", () => {+ visitConversationsPage(+ "/admin/metabot/usage-auditing/conversations?date=past7days~",+ );++ MAIN_PROFILE_LABELS.forEach((profileLabel, index) => {+ cy.log(`Profile: ${profileLabel}`);+ H.main()+ .findByRole("heading", { name: "Conversations" })+ .should("be.visible");++ openConversationFromProfile(profileLabel);+ assertConversationDetailProfile(profileLabel);++ if (index < MAIN_PROFILE_LABELS.length - 1) {+ cy.go("back");+ cy.location("pathname").should(+ "eq",+ "/admin/metabot/usage-auditing/conversations",+ );+ }+ });+ });++ it("shows message usage stats charts", () => {+ visitUsageStatsPage();+ H.main().findByRole("tab", { name: "Messages" }).realClick();++ cy.url().should("include", "metric=messages");+ H.main()+ .findByRole("tab", { name: "Messages" })+ .should("have.attr", "aria-selected", "true");+ assertMetricChartsRendered("messages");+ });++ it("shows token usage stats charts", () => {+ visitUsageStatsPage();+ H.main().findByRole("tab", { name: "Tokens" }).realClick();++ cy.url().should("include", "metric=tokens");+ H.main()+ .findByRole("tab", { name: "Tokens" })+ .should("have.attr", "aria-selected", "true");+ assertMetricChartsRendered("tokens");+ });++ it("uses hourly stats for a single-day date filter", () => {+ getUsageAuditingSeed().then(({ body }) => {+ visitUsageStatsPage(`/admin/metabot/usage-auditing?date=${body.date}`);++ H.main().within(() => {+ cy.findByRole("heading", { name: "Usage stats" }).should("be.visible");+ cy.findByText("Conversations by day").should("not.exist");+ });+ assertChartRendered("Conversations by hour");+ METRIC_CHART_TITLES.conversations.slice(1).forEach((title) => {+ assertChartRendered(title);+ });+ });+ });+});diff --git a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj b/enterprise/backend/src/metabase_enterprise/api_routes/routes.cljindex 28bca0d05fd..fe79e689497 100644--- a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj+++ b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj@@ -24,6 +24,7 @@[metabase-enterprise.embedding-hub.api][metabase-enterprise.gsheets.api :as gsheets.api][metabase-enterprise.library.api]+ [metabase-enterprise.metabot-analytics.api][metabase-enterprise.metabot.api][metabase-enterprise.metabot.api.routes][metabase-enterprise.permission-debug.api]@@ -120,6 +121,7 @@"/library" (premium-handler metabase-enterprise.library.api/routes :library)"/logs" (premium-handler 'metabase-enterprise.advanced-config.api.logs :audit-app)"/metabot" (premium-handler 'metabase-enterprise.metabot.api :metabot-v3)+ "/metabot-analytics" (premium-handler metabase-enterprise.metabot-analytics.api/routes :audit-app)"/permission_debug" (premium-handler metabase-enterprise.permission-debug.api/routes :advanced-permissions);; TODO (Ngoc 2026-03-25) -- use :transforms-advanced feature flag once it exists"/transforms" (premium-handler metabase-enterprise.transforms.api/routes :transforms-python)diff --git a/enterprise/backend/src/metabase_enterprise/audit_app/audit.clj b/enterprise/backend/src/metabase_enterprise/audit_app/audit.cljindex ee290c9acce..0f0b4949453 100644--- a/enterprise/backend/src/metabase_enterprise/audit_app/audit.clj+++ b/enterprise/backend/src/metabase_enterprise/audit_app/audit.clj@@ -18,7 +18,7 @@[metabase.util.log :as log][toucan2.core :as t2])(:import- (java.nio.file Path)+ (java.nio.file FileVisitOption Files LinkOption Path)(java.util.jar JarEntry JarFile)))(set! *warn-on-reflection* true)@@ -221,15 +221,31 @@(defn- should-skip-checksum? [last-checksum](= skip-checksum-flag last-checksum))+(defn directory-content-checksum+ "Stable hash of the relative paths and contents of files under `root` (recursively) whose filenames+ end with `suffix` (e.g. `.sql`). Detects renames (paths are included) and content swaps between+ files (single hash over sorted pairs)."+ ([root] (directory-content-checksum root ""))+ ([^Path root suffix]+ (with-open [stream (Files/walk root (u/varargs FileVisitOption))]+ (->> (iterator-seq (.iterator stream))+ (filter (fn [^Path p]+ (and (Files/isRegularFile p (u/varargs LinkOption))+ (str/ends-with? (str (.getFileName p)) suffix))))+ (mapv (fn [^Path path]+ [(str (.relativize root path))+ (Files/readString path)]))+ (sort-by first)+ hash))))+(defn analytics-checksum- "Hashes the contents of all non-dir files in the `analytics-dir-resource`."+ "Checksum of the serialized analytics content (collections, dashboards, cards) on the classpath.+ Stored in the `last-analytics-checksum` setting; when it changes, `ensure-audit-db-installed!`+ re-runs `serialization.cmd/v2-load-internal!` on boot."[]- (->> ^Path (instance-analytics-plugin-dir (plugins/plugins-dir))- (.toFile)- file-seq- (remove fs/directory?)- (pmap #(hash (slurp %)))- (reduce +)))+ (-> (plugins/plugins-dir)+ instance-analytics-plugin-dir+ directory-content-checksum))(defn- should-load-audit?"Should we load audit data?"@@ -248,26 +264,36 @@[last-checksum (analytics-checksum)])))(defn- maybe-load-analytics-content!+ "Loads serialized audit content from the classpath if its checksum has changed.++ Returns true iff loading required swapping the audit DB engine type to match the host+ (i.e. the host is not postgres and we just rewrote the engine row from postgres back to+ h2/mysql). The boolean tells `maybe-sync-audit-db!` whether field metadata needs to be+ re-scanned for the new dialect — this transient swap isn't visible from outside the+ function, which is why it has to be returned explicitly."[audit-db]- (when analytics-dir-resource- (ia-content->plugins (plugins/plugins-dir))- (let [[last-checksum current-checksum] (get-last-and-current-checksum)]- (when (should-load-audit? (audit-app.settings/load-analytics-content) last-checksum current-checksum)- (adjust-audit-db-to-source! audit-db)- (log/info (str "Loading Analytics Content from: " (instance-analytics-plugin-dir (plugins/plugins-dir))))- ;; The EE token might not have :serialization enabled, but audit features should still be able to use it.- (let [report (log/with-no-logs- (serialization.cmd/v2-load-internal! (str (instance-analytics-plugin-dir (plugins/plugins-dir)))- {:backfill? false}- :token-check? false- :require-initialized-db? false))]- (if (not-empty (:errors report))- (log/info (str "Error Loading Analytics Content: " (pr-str report)))- (do- (log/info (str "Loading Analytics Content Complete (" (count (:seen report)) ") entities loaded."))- (audit/last-analytics-checksum! current-checksum))))- (when-let [audit-db (t2/select-one :model/Database :is_audit true)]- (adjust-audit-db-to-host! audit-db))))))+ (boolean+ (when analytics-dir-resource+ (ia-content->plugins (plugins/plugins-dir))+ (let [[last-checksum current-checksum] (get-last-and-current-checksum)]+ (when (should-load-audit? (audit-app.settings/load-analytics-content) last-checksum current-checksum)+ (adjust-audit-db-to-source! audit-db)+ (log/info (str "Loading Analytics Content from: " (instance-analytics-plugin-dir (plugins/plugins-dir))))+ ;; The EE token might not have :serialization enabled, but audit features should still be able to use it.+ (let [report (log/with-no-logs+ (serialization.cmd/v2-load-internal! (str (instance-analytics-plugin-dir (plugins/plugins-dir)))+ {:backfill? false}+ :token-check? false+ :require-initialized-db? false))]+ (if (not-empty (:errors report))+ (log/info (str "Error Loading Analytics Content: " (pr-str report)))+ (do+ (log/info (str "Loading Analytics Content Complete (" (count (:seen report)) ") entities loaded."))+ (audit/last-analytics-checksum! current-checksum))))+ (when-let [{:keys [engine] :as audit-db} (t2/select-one :model/Database :is_audit true)]+ (let [original-engine engine]+ (adjust-audit-db-to-host! audit-db)+ (not= original-engine (mdb/db-type)))))))))(defn- maybe-install-audit-db![]@@ -295,6 +321,41 @@(log/with-no-logs (sync/sync-database! db {:scan :schema}))))result))+(defn- views-checksum+ "Checksum of the `instance_analytics_views` SQL files. Stored in the `last-analytics-views-checksum`+ setting; when it changes, `ensure-audit-db-installed!` triggers a one-shot audit DB schema sync+ so that newly added or renamed views become discoverable without waiting for the next scheduled sync."+ []+ (when (io/resource "migrations/instance_analytics_views")+ (u.files/with-open-path-to-resource [views-dir "migrations/instance_analytics_views"]+ (directory-content-checksum views-dir ".sql"))))++(defn- maybe-sync-audit-db!+ "One-shot `:scan :schema` sync of the audit DB. Fires when either trigger is true:+ - `engine-changed?` — `maybe-load-analytics-content!` swapped the audit DB engine and+ field metadata needs to be refreshed for the new dialect.+ - the `instance_analytics_views` SQL files have changed since the last successful sync,+ meaning a migration may have added a new view that isn't yet in `metabase_table`.+ The two triggers share one sync because they both want the same operation; doing them+ sequentially would race two parallel syncs against the same DB on a cold boot."+ [audit-db engine-changed?]+ (let [current (views-checksum)+ views-stale? (and current (not= current (audit-app.settings/last-analytics-views-checksum)))]+ (when (or engine-changed? views-stale?)+ (log/infof "Syncing Audit DB schema (engine-changed? %s, views-stale? %s)"+ engine-changed? views-stale?)+ (let [sync-future (future+ (try+ (log/with-no-logs (sync/sync-database! audit-db {:scan :schema}))+ (when current+ (audit-app.settings/last-analytics-views-checksum! current))+ (log/info "Audit DB sync complete.")+ (catch Exception e+ (log/error e "Audit DB sync failed."))))]+ (when config/is-test?+ ;; Tests need the sync to complete before they run+ @sync-future)))))+(defenterprise ensure-audit-db-installed!"EE implementation of `ensure-db-installed!`. Installs audit db if it does not already exist, and loads auditcontent if it is available."@@ -306,4 +367,4 @@((sync-util/with-duplicate-ops-prevented:sync-database audit-db(fn []- (maybe-load-analytics-content! audit-db)))))))+ (maybe-sync-audit-db! audit-db (maybe-load-analytics-content! audit-db))))))))diff --git a/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj b/enterprise/backend/src/metabase_enterprise/audit_app/permissions.cljindex 8163a1dc736..044dae31e57 100644--- a/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj+++ b/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj@@ -29,7 +29,10 @@"v_tenants""v_tasks""v_task_runs"- "v_view_log"})+ "v_view_log"+ "v_metabot_conversations"+ "v_metabot_messages"+ "v_ai_usage_log"})(defenterprise check-audit-db-permissions"Performs a number of permission checks to ensure that a query on the Audit database can be run.diff --git a/enterprise/backend/src/metabase_enterprise/audit_app/settings.clj b/enterprise/backend/src/metabase_enterprise/audit_app/settings.cljindex 7948a3643c0..5b2309d3bd4 100644--- a/enterprise/backend/src/metabase_enterprise/audit_app/settings.clj+++ b/enterprise/backend/src/metabase_enterprise/audit_app/settings.clj@@ -25,3 +25,12 @@:audit :never:doc (str "Setting this environment variable to false can also come in handy when migrating environments, as"" it can simplify the migration process."))++(defsetting last-analytics-views-checksum+ "Checksum of the instance_analytics_views SQL files. When this changes, the audit DB schema+ is re-synced to pick up new or modified views from migrations."+ :type :integer+ :visibility :internal+ :audit :never+ :doc false+ :export? false)diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/api.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/api.cljindex a2044207419..139152f9d6d 100644--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/api.clj+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/api.clj@@ -3,10 +3,16 @@(:require[metabase-enterprise.data-complexity-score.complexity :as complexity][metabase-enterprise.data-complexity-score.metabot-scope :as metabot-scope]+ [metabase-enterprise.data-complexity-score.models.data-complexity-score :as data-complexity-score]+ [metabase-enterprise.data-complexity-score.settings :as settings][metabase-enterprise.data-complexity-score.synonym-source :as synonym-source]+ [metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score][metabase.api.common :as api][metabase.api.macros :as api.macros]- [metabase.api.routes.common :refer [+auth]]))+ [metabase.api.routes.common :refer [+auth]]+ [metabase.util :as m.util]+ [metabase.util.i18n :refer [tru]]+ [metabase.util.malli.schema :as ms]))(set! *warn-on-reflection* true)@@ -28,11 +34,11 @@[:total [:maybe nat-int?]][:components[:map- [:entity-count SubScore]- [:name-collisions SubScore]- [:synonym-pairs SubScore]- [:field-count SubScore]- [:repeated-measures SubScore]]]])+ [:entity_count SubScore]+ [:name_collisions SubScore]+ [:synonym_pairs SubScore]+ [:field_count SubScore]+ [:repeated_measures SubScore]]]])(def ^:private EmbeddingModelMeta"Identifies the embedding model backing the synonym calculations, so benchmark consumers can pin to it.@@ -40,7 +46,7 @@[:maybe[:map[:provider string?]- [:model-name string?]]])+ [:model_name string?]]])(def ^:private ComplexityScoresResponse"Full response body for `GET /api/ee/data-complexity-score/complexity`."@@ -50,9 +56,10 @@[:metabot Catalog][:meta[:map- [:formula-version pos-int?]- [:synonym-threshold number?]- [:embedding-model {:optional true} EmbeddingModelMeta]]]])+ [:formula_version pos-int?]+ [:synonym_threshold number?]+ [:calculated_at {:optional true} some?]+ [:embedding_model {:optional true} EmbeddingModelMeta]]]]);; Per-JVM single-flight guard for the /complexity endpoint. Each scoring run walks the entire;; app-db catalog and emits Snowplow events, so concurrent superuser requests on the same node@@ -65,23 +72,46 @@(defonce ^:private ^java.util.concurrent.atomic.AtomicBoolean api-scoring-running?(java.util.concurrent.atomic.AtomicBoolean. false))-(api.macros/defendpoint :get "/complexity" :- ComplexityScoresResponse- "Return the current Data Complexity Score for this instance.- Superuser-only, expensive, and emits Snowplow events for benchmark consumers. Concurrent- requests on the same JVM fast-fail with HTTP 409 — a scoring pass walks the full app-db- catalog and one in-flight run per node is enough. The guard is per-JVM, so in a clustered+(defn- force-recalculate-score!+ "Run the Data Complexity Score job now, persist the fresh snapshot, and return it.+ This is expensive and emits Snowplow events for benchmark consumers. Concurrent requests+ on the same JVM fast-fail with HTTP 409 — a scoring pass walks the full app-db catalog+ and one in-flight run per node is enough. The guard is per-JVM, so in a clustereddeployment each node can still run one pass concurrently."- [_route _query _body]- (api/check-superuser)+ [](when-not (.compareAndSet api-scoring-running? false true)(throw (ex-info "Data Complexity Score calculation already in progress" {:status-code 409})))(try- (complexity/complexity-scores- (assoc (synonym-source/complexity-scores-opts)- :metabot-scope (metabot-scope/internal-metabot-scope)))+ (let [fingerprint (task.complexity-score/current-fingerprint)+ result (complexity/complexity-scores+ (assoc (synonym-source/complexity-scores-opts)+ :metabot-scope (metabot-scope/internal-metabot-scope)))+ stored (data-complexity-score/record-score! fingerprint result)]+ ;; Advance the last-published fingerprint iff Snowplow actually accepted the event — mirrors+ ;; the scheduled path's gate in `task.complexity-score/run-scoring!`. Without this, a+ ;; superuser-triggered recalculation leaves the setting stale and the next boot would+ ;; redundantly re-score even though a valid snapshot was just persisted.+ (when (::complexity/snowplow-published? (meta result))+ (settings/data-complexity-scoring-last-fingerprint! fingerprint))+ (m.util/deep-snake-keys (or stored result)))(finally(.set api-scoring-running? false))))+(api.macros/defendpoint :get "/complexity" :- ComplexityScoresResponse+ "Return the most recently stored Data Complexity Score for this instance.+ Pass `force-recalculation=true` to recompute, persist, and return a fresh score.+ Superuser-only."+ [_route+ {force-recalculation? :force-recalculation} :- [:map+ [:force-recalculation {:default false} ms/BooleanValue]]+ _body]+ (api/check-superuser)+ (if force-recalculation?+ (force-recalculate-score!)+ (api/check-404 (some-> (data-complexity-score/latest-score (task.complexity-score/current-fingerprint))+ m.util/deep-snake-keys)+ (tru "Data Complexity Score has not been computed yet. Recompute it to create the first snapshot."))))+(def ^{:arglists '([request respond raise])} routes"`/api/ee/data-complexity-score` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/init.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/init.cljindex 2c07d18763c..448b9544d00 100644--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/init.clj+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/init.clj@@ -4,6 +4,7 @@(:require[metabase-enterprise.data-complexity-score.settings][metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score]+ [metabase-enterprise.data-complexity-score.task.complexity-score-trimmer][metabase.startup.core :as startup][metabase.util.quick-task :as quick-task]))diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/models/data_complexity_score.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/models/data_complexity_score.cljnew file mode 100644index 00000000000..ae0cf9e2e84--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/models/data_complexity_score.clj@@ -0,0 +1,40 @@+(ns metabase-enterprise.data-complexity-score.models.data-complexity-score+ "Persistence for cached Data Complexity Score snapshots."+ (:require+ [metabase.models.interface :as mi]+ [methodical.core :as methodical]+ [toucan2.core :as t2]))++(methodical/defmethod t2/table-name :model/DataComplexityScore [_model] :data_complexity_score)++(doto :model/DataComplexityScore+ (derive :metabase/model))++(t2/deftransforms :model/DataComplexityScore+ {:score_data mi/transform-json})++(defn- score-with-calculated-at+ [{:keys [score_data created_at]}]+ (when score_data+ (assoc-in score_data [:meta :calculated-at] created_at)))++(defn latest-entry+ "Return the most recently persisted Data Complexity Score row for `fingerprint`, or nil if none exist."+ [fingerprint]+ (t2/select-one :model/DataComplexityScore :fingerprint fingerprint {:order-by [[:id :desc]]}))++(defn latest-score+ "Return the latest persisted Data Complexity Score payload for `fingerprint`, or nil if none exist."+ [fingerprint]+ (some-> (latest-entry fingerprint)+ score-with-calculated-at))++(defn record-score!+ "Persist one append-only Data Complexity Score snapshot."+ [fingerprint score]+ (let [id (t2/insert-returning-pk! :model/DataComplexityScore+ {:fingerprint fingerprint+ :score_data score})]+ (if id+ (score-with-calculated-at (t2/select-one :model/DataComplexityScore :id id))+ (latest-score fingerprint))))diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score.cljindex f2122b6864c..d8d7ebcf434 100644--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score.clj+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score.clj@@ -7,6 +7,7 @@[clojurewerkz.quartzite.triggers :as triggers][metabase-enterprise.data-complexity-score.complexity :as complexity][metabase-enterprise.data-complexity-score.metabot-scope :as metabot-scope]+ [metabase-enterprise.data-complexity-score.models.data-complexity-score :as data-complexity-score][metabase-enterprise.data-complexity-score.settings :as settings][metabase-enterprise.data-complexity-score.synonym-source :as synonym-source][metabase.app-db.cluster-lock :as cluster-lock]@@ -21,7 +22,7 @@(def ^:private job-key (jobs/key "metabase.task.data-complexity-score.job"))(def ^:private trigger-key (triggers/key "metabase.task.data-complexity-score.trigger"))-(defn- current-fingerprint+(defn current-fingerprint"String capturing everything that changes the meaning of an emitted score.Mirrors the Snowplow `formula_version` + `parameters` fields. `weights` is included so re-tuning@@ -57,12 +58,17 @@(let [result (complexity/complexity-scores(assoc (synonym-source/complexity-scores-opts):metabot-scope (metabot-scope/internal-metabot-scope)))]- (if (::complexity/snowplow-published? (meta result))- (settings/data-complexity-scoring-last-fingerprint! claim-fingerprint)- (log/warn "Data Complexity Score: Snowplow publish failed; leaving fingerprint unchanged so the next boot or cron retries"))+ (try+ (data-complexity-score/record-score! claim-fingerprint result)+ (if (::complexity/snowplow-published? (meta result))+ (settings/data-complexity-scoring-last-fingerprint! claim-fingerprint)+ (log/warn "Data Complexity Score: Snowplow publish failed; leaving fingerprint unchanged so the next boot or cron retries"))+ (catch Throwable t+ (log/warn t "Data Complexity Score: failed to persist score snapshot; leaving fingerprint unchanged so the next boot or cron retries")))result)(catch Throwable t- (log/warn t "Data Complexity Score run failed")))+ (log/warn t "Data Complexity Score run failed")+ nil))(log/debug "Data Complexity Score run skipped — data-complexity-scoring-enabled is off")));; Long enough that any realistic scoring run finishes well inside it, short enough that a crasheddiff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer.cljnew file mode 100644index 00000000000..3f9f506ef48--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer.clj@@ -0,0 +1,57 @@+(ns metabase-enterprise.data-complexity-score.task.complexity-score-trimmer+ "Scheduled task to delete old Data Complexity Score snapshots."+ (:require+ [clojurewerkz.quartzite.jobs :as jobs]+ [clojurewerkz.quartzite.schedule.cron :as cron]+ [clojurewerkz.quartzite.triggers :as triggers]+ [java-time.api :as t]+ [metabase.task.core :as task]+ [metabase.util.log :as log]+ [toucan2.core :as t2])+ (:import+ (java.sql Timestamp)+ (org.quartz DisallowConcurrentExecution)))++(set! *warn-on-reflection* true)++(def ^:private job-key+ (jobs/key "metabase.task.data-complexity-score-trimmer.trim.job"))++(def ^:private trigger-key+ (triggers/key "metabase.task.data-complexity-score-trimmer.trim.trigger"))++(def ^:private retention-months 3)++(defn- retention-cutoff-timestamp+ [months]+ (Timestamp/valueOf ^java.time.LocalDateTime+ (t/minus (t/local-date-time) (t/months months))))++(defn- trim-old-complexity-score-data!+ []+ (log/info "Trimming old Data Complexity Score snapshots.")+ (let [cutoff (retention-cutoff-timestamp retention-months)+ deleted (t2/delete! :model/DataComplexityScore {:where [:< :created_at cutoff]})]+ (log/infof "Data Complexity Score cleanup complete. Deleted %d rows." (or deleted 0))))++(task/defjob ^{DisallowConcurrentExecution true+ :doc "Delete old Data Complexity Score snapshots"}+ DataComplexityScoreTrimmer [_ctx]+ (trim-old-complexity-score-data!))++(defmethod task/init! ::DataComplexityScoreTrimmer [_]+ (let [job (jobs/build+ (jobs/of-type DataComplexityScoreTrimmer)+ (jobs/store-durably)+ (jobs/with-identity job-key)+ (jobs/with-description "Data Complexity Score cleanup"))+ ;; 03:43 UTC — separate from the scoring run, still off-hour.+ trigger (triggers/build+ (triggers/with-identity trigger-key)+ (triggers/for-job job-key)+ (triggers/with-schedule+ (cron/schedule+ (cron/cron-schedule "0 43 3 * * ? *")+ (cron/in-time-zone (java.util.TimeZone/getTimeZone "UTC"))+ (cron/with-misfire-handling-instruction-fire-and-proceed))))]+ (task/schedule-task! job trigger)))diff --git a/enterprise/backend/src/metabase_enterprise/metabot/usage.clj b/enterprise/backend/src/metabase_enterprise/metabot/usage.cljindex 607416fca1a..caf6c14d154 100644--- a/enterprise/backend/src/metabase_enterprise/metabot/usage.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot/usage.clj@@ -15,11 +15,42 @@(set! *warn-on-reflection* true)+;; Keep these in sync with the CASE branches in:+;; resources/migrations/instance_analytics_views/ai_usage_log/v1/{h2,mysql,postgres}-ai_usage_log.sql+;; resources/migrations/instance_analytics_views/metabot_conversations/v1/{h2,mysql,postgres}-metabot_conversations.sql+;; When adding a value here, add it to those six SQL files too so users see a nicer name in ai analytics.+(def ^:private known-sources+ #{"metabot_agent"+ "document_generate_content"+ "example_question_generation_batch"+ "slack"+ "slackbot"+ "oss-sql-gen"+ "sql-gen"+ "unknown"+ "user-intent-classification"})++(def ^:private known-profile-ids+ #{"internal"+ "embedding_next"+ "nlq"+ "sql"+ "slackbot"+ "transforms_codegen"+ "document-generate-content"})+(defenterprise log-ai-usage!"Record an LLM API call in the ai_usage_log table.":feature :none[{:keys [source model prompt-tokens completion-tokensuser-id tenant-id conversation-id profile-id request-id ai-proxied]}]+ (when-not (contains? known-sources source)+ (throw (ex-info (str "Unknown ai_usage_log source " (pr-str source))+ {:source source})))+ (when-let [pid (some-> profile-id name)]+ (when-not (contains? known-profile-ids pid)+ (throw (ex-info (str "Unknown ai_usage_log profile-id " (pr-str pid))+ {:profile-id pid}))))(when-not (= "user-intent-classification" source)(try(let [total-tokens (+ prompt-tokens completion-tokens)]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.cljnew file mode 100644index 00000000000..f8320f13d6b--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/api.clj@@ -0,0 +1,153 @@+(ns metabase-enterprise.metabot-analytics.api+ "`/api/ee/metabot-analytics/` endpoints for AI/Metabot usage analytics.+ These only work if you have a premium token with the `:audit-app` feature.++ Handlers stay thin: auth + param coercion + delegation. The HoneySQL and+ response assembly live in `metabase-enterprise.metabot-analytics.conversations`."+ (:require+ [metabase-enterprise.metabot-analytics.conversations :as analytics.conversations]+ [metabase.api.common :as api]+ [metabase.api.macros :as api.macros]+ [metabase.api.routes.common :refer [+auth]]+ [metabase.metabot.tools :as metabot.tools]+ [metabase.request.core :as request]+ [metabase.util.malli.schema :as ms]))++(set! *warn-on-reflection* true)++;;; -------------------------------------------------- Schemas --------------------------------------------------++(def ^:private UserInfo+ "Trimmed user shape surfaced on analytics responses — no PII beyond what the+ admin UI already renders."+ [:map+ [:id ms/PositiveInt]+ [:email :string]+ [:first_name [:maybe :string]]+ [:last_name [:maybe :string]]])++(def ^:private ConversationSummary+ "Schema for a conversation summary in list responses."+ [:map+ [:conversation_id ms/UUIDString]+ [:created_at ms/TemporalInstant]+ [:summary [:maybe :string]]+ [:message_count ms/IntGreaterThanOrEqualToZero]+ [:user_message_count ms/IntGreaterThanOrEqualToZero]+ [:assistant_message_count ms/IntGreaterThanOrEqualToZero]+ [:total_tokens ms/IntGreaterThanOrEqualToZero]+ [:last_message_at [:maybe ms/TemporalInstant]]+ [:profile_id [:maybe :string]]+ [:search_count ms/IntGreaterThanOrEqualToZero]+ [:query_count ms/IntGreaterThanOrEqualToZero]+ [:ip_address [:maybe :string]]+ [:user [:maybe UserInfo]]])++(def ^:private SortColumn+ "Allow-list of columns the list endpoint can sort by."+ [:enum "created_at" "message_count" "total_tokens"])++(def ^:private SortDirection+ [:enum "asc" "desc"])++(def ^:private ListConversationsQueryParams+ "Query-param schema for `GET /conversations`."+ [:map+ [:sort_by {:optional true} [:maybe SortColumn]]+ [:sort_dir {:optional true} [:maybe SortDirection]]+ [:user_id {:optional true} [:maybe ms/PositiveInt]]+ [:group_id {:optional true} [:maybe ms/PositiveInt]]+ [:tenant_id {:optional true} [:maybe ms/PositiveInt]]+ [:date {:optional true} [:maybe :string]]])++(def ^:private GeneratedQuery+ "Schema for a single query generated by the bot during a conversation.+ One row per successful query-construction tool call. Errored calls are+ filtered out at the extractor."+ [:map+ [:tool (into [:enum] (sort metabot.tools/query-generation-tool-names))]+ [:call_id [:maybe :string]]+ [:message_id ms/PositiveInt]+ [:query_id [:maybe :string]]+ [:query_type [:enum "sql" "notebook"]]+ [:sql [:maybe :string]]+ [:mbql [:maybe :map]]+ [:display [:maybe :string]]+ [:database_id [:maybe ms/PositiveInt]]+ [:tables [:sequential :string]]])++(def ^:private ConversationFeedback+ "Schema for one user-submitted feedback row attached to a conversation. Rows+ are keyed per-`(message_id, user_id)` — a shared Slack thread can yield+ multiple submissions on the same assistant message — so `:user_id` is+ carried explicitly and `:user` is hydrated for display."+ [:map+ [:id ms/PositiveInt]+ [:message_id ms/PositiveInt]+ [:user_id ms/PositiveInt]+ [:user {:optional true} [:maybe UserInfo]]+ [:external_id [:maybe :string]]+ [:positive :boolean]+ [:issue_type [:maybe :string]]+ [:freeform_feedback [:maybe :string]]+ [:created_at ms/TemporalInstant]+ [:updated_at ms/TemporalInstant]])++(def ^:private ConversationDetail+ "Schema for full conversation detail response."+ [:map+ [:conversation_id ms/UUIDString]+ [:created_at ms/TemporalInstant]+ [:summary [:maybe :string]]+ [:user [:maybe UserInfo]]+ [:message_count ms/IntGreaterThanOrEqualToZero]+ [:total_tokens ms/IntGreaterThanOrEqualToZero]+ [:profile_id [:maybe :string]]+ [:slack_permalink [:maybe :string]]+ [:chat_messages [:sequential :map]]+ [:queries [:sequential GeneratedQuery]]+ [:search_count ms/IntGreaterThanOrEqualToZero]+ [:query_count ms/IntGreaterThanOrEqualToZero]+ [:ip_address [:maybe :string]]+ [:feedback [:sequential ConversationFeedback]]])++(def ^:private ListConversationsResponse+ "Response schema for `GET /conversations`."+ [:map+ [:data [:sequential ConversationSummary]]+ [:total ms/IntGreaterThanOrEqualToZero]+ [:limit ms/IntGreaterThanOrEqualToZero]+ [:offset ms/IntGreaterThanOrEqualToZero]])++(def ^:private ConversationIdParams+ "Route-param schema for endpoints addressing a single conversation by id."+ [:map [:id ms/UUIDString]])++;;; -------------------------------------------------- Endpoints --------------------------------------------------++(api.macros/defendpoint :get "/conversations" :- ListConversationsResponse+ "Return paginated list of AI conversations with summary statistics."+ [_route-params+ {:keys [sort_by sort_dir user_id group_id tenant_id date]} :- ListConversationsQueryParams]+ (api/check-superuser)+ (analytics.conversations/list-conversations+ {:limit (request/limit)+ :offset (request/offset)+ :sort-by sort_by+ :sort-dir sort_dir+ :user-id user_id+ :group-id group_id+ :tenant-id tenant_id+ :date date}))++(api.macros/defendpoint :get "/conversations/:id" :- ConversationDetail+ "Return full details for a specific conversation including all messages."+ [{:keys [id]} :- ConversationIdParams]+ (api/check-superuser)+ (analytics.conversations/fetch-conversation-detail id))++;;; -------------------------------------------------- Routes --------------------------------------------------++(def ^{:arglists '([request respond raise])} routes+ "Routes for `/api/ee/metabot-analytics/`."+ (+auth (api.macros/ns-handler *ns*)))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.cljnew file mode 100644index 00000000000..28d8dbc772f--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/conversations.clj@@ -0,0 +1,232 @@+(ns metabase-enterprise.metabot-analytics.conversations+ "Data-access layer for the metabot analytics API. Builds and runs the+ HoneySQL queries that back the `/api/ee/metabot-analytics/conversations`+ endpoints, and assembles the response shapes the handlers return.++ Handlers in `metabase-enterprise.metabot-analytics.api` should stay thin —+ auth, param coercion, and delegation to the functions here."+ (:require+ [metabase-enterprise.metabot-analytics.queries :as analytics.queries]+ [metabase.api.common :as api]+ [metabase.metabot.persistence :as metabot-persistence]+ [metabase.permissions.core :as perms]+ [metabase.query-processor.parameters.dates :as qp.parameters.dates]+ [metabase.slackbot.api :as slackbot.api]+ [metabase.util.date-2 :as u.date]+ [metabase.util.i18n :refer [tru]]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(def ^:private default-limit 50)+(def ^:private default-offset 0)++(defn- date-string->constraints+ "Parse a serialized date-param string into half-open HoneySQL predicates on `col`.+ Throws 400 on a malformed string. Returns nil when no bound is produced."+ [col date-string]+ (let [{:keys [start end]}+ (try+ (qp.parameters.dates/date-string->range date-string {:inclusive-end? false})+ (catch Exception e+ (throw (ex-info (tru "Failed to parse datetime value: {0}" date-string)+ {:status-code 400}+ e))))+ start (some-> start u.date/parse)+ end (some-> end u.date/parse)+ parts (cond-> []+ start (conj [:>= col start])+ end (conj [:< col end]))]+ (when (seq parts)+ (into [:and] parts))))++(defn- list-where-clause+ "Compose a conjunctive WHERE from optional filters. Returns `nil` when no+ filter applies so the caller can `cond->` cleanly."+ [{:keys [user-id group-id tenant-id date]}]+ (let [clauses (cond-> []+ user-id (conj [:= :c.user_id user-id])+ (seq date) (conj (date-string->constraints :c.created_at date))+ (and group-id (not= group-id (:id (perms/all-users-group))))+ (conj [:exists {:select [1]+ :from [[:permissions_group_membership :pgm]]+ :where [:and+ [:= :pgm.user_id :c.user_id]+ [:= :pgm.group_id group-id]]}])+ tenant-id+ (conj [:exists {:select [1]+ :from [[:core_user :u]]+ :where [:and+ [:= :u.id :c.user_id]+ [:= :u.tenant_id tenant-id]]}]))+ clauses (remove nil? clauses)]+ (when (seq clauses)+ (into [:and] clauses))))++(defn- trim-user+ "Trim a hydrated core_user down to the minimal shape the frontend uses+ (`MetabotUserInfo`)."+ [user]+ (some-> user (select-keys [:id :email :first_name :last_name :tenant_id])))++(def ^:private sort-columns+ "Allow-list of API sort keys → HoneySQL column refs, to keep user input out+ of the `:order-by` clause."+ {"created_at" :c.created_at+ "message_count" :message_count+ "total_tokens" :total_tokens})++(def ^:private list-query+ "HoneySQL query that selects one row per conversation with the aggregate+ message stats the frontend needs. Filters, sorting, and paging are applied+ by [[list-conversations]]."+ {:select [:c.*+ [[:count :m.id] :message_count]+ [[:count [:case [:= :m.role "user"] 1]] :user_message_count]+ [[:count [:case [:= :m.role "assistant"] 1]] :assistant_message_count]+ [[:coalesce [:sum :m.total_tokens] 0] :total_tokens]+ [[:max :m.created_at] :last_message_at]+ ;; First assistant message's profile_id, matching the+ ;; `v_metabot_conversations` analytics view. User messages carry+ ;; a placeholder `profile_id` and are excluded.+ [{:select [:mm.profile_id]+ :from [[:metabot_message :mm]]+ :where [:and+ [:= :mm.conversation_id :c.id]+ [:= :mm.role "assistant"]+ [:= :mm.deleted_at nil]]+ :order-by [[:mm.created_at :asc]]+ :limit 1}+ :profile_id]]+ :from [[:metabot_conversation :c]]+ :left-join [[:metabot_message :m] [:and+ [:= :m.conversation_id :c.id]+ [:= :m.deleted_at nil]]]+ :group-by [:c.id]})++(defn- row->summary+ "Reshape a raw list-query row into the response shape the frontend expects:+ renames the conversation's `:id` to `:conversation_id`, trims the hydrated+ user, and keeps only the aggregate fields the summary payload needs."+ [row]+ {:conversation_id (:id row)+ :created_at (:created_at row)+ :summary (:summary row)+ :message_count (:message_count row)+ :user_message_count (:user_message_count row)+ :assistant_message_count (:assistant_message_count row)+ :total_tokens (long (:total_tokens row 0))+ :last_message_at (:last_message_at row)+ :profile_id (:profile_id row)+ :search_count (:search_count row 0)+ :query_count (:query_count row 0)+ :ip_address (:ip_address row)+ :user (trim-user (:user row))})++(defn- hydrate-tool-counts+ "Batch-load `metabot_message` data for a page of conversations and attach+ `:search_count` and `:query_count` to each row. One query per page+ regardless of row count — messages are grouped in-memory by+ `:conversation_id` and both counts are computed from the same fetch."+ [rows]+ (let [conversation-ids (map :id rows)+ messages-by-conv (when (seq conversation-ids)+ (->> (t2/select [:model/MetabotMessage :conversation_id :data]+ :conversation_id [:in conversation-ids]+ {:where [:= :deleted_at nil]})+ (group-by :conversation_id)))]+ (map (fn [row]+ (let [msgs (get messages-by-conv (:id row) [])]+ (assoc row+ :search_count (analytics.queries/count-tool-invocations msgs "search")+ :query_count (analytics.queries/count-tool-invocations+ msgs analytics.queries/new-query-tool-names))))+ rows)))++(defn list-conversations+ "Return a paginated `{:data :total :limit :offset}` map of conversation+ summaries. Supports optional filtering by `user-id`, `group-id`, `tenant-id`,+ and a serialized `date` parameter string, plus sorting by an allow-listed+ `sort-by` column in either direction (defaults to newest-first)."+ [{:keys [limit offset user-id group-id tenant-id date sort-by sort-dir]}]+ (let [limit (or limit default-limit)+ offset (or offset default-offset)+ where (list-where-clause {:user-id user-id+ :group-id group-id+ :tenant-id tenant-id+ :date date})+ sort-col (get sort-columns sort-by :c.created_at)+ direction (if (= sort-dir "asc") :asc :desc)+ total (:count (t2/query-one (cond-> {:select [[[:count :*] :count]]+ :from [[:metabot_conversation :c]]}+ where (assoc :where where))))+ rows (t2/select :model/MetabotConversation+ (cond-> (assoc list-query+ :order-by [[sort-col direction] [:c.id :asc]]+ :limit limit+ :offset offset)+ where (assoc :where where)))]+ {:data (->> (t2/hydrate rows :user)+ hydrate-tool-counts+ (map row->summary))+ :total total+ :limit limit+ :offset offset}))++(defn- slack-permalink+ "Best-effort Slack permalink for a Slack-originated conversation."+ [{:keys [slack_channel_id slack_thread_ts]}]+ (slackbot.api/conversation-permalink slack_channel_id slack_thread_ts))++(defn- fetch-conversation-feedback+ "Return all `metabot_feedback` rows for messages in `conversation-id`, ordered+ by submission time. Rows are keyed per-`(message, submitter)` — a shared+ thread can yield multiple rows for the same message — so the submitter is+ hydrated as `:user` for display."+ [conversation-id]+ (let [rows (t2/select :model/MetabotFeedback+ {:select [:metabot_feedback.id+ :metabot_feedback.message_id+ :metabot_feedback.user_id+ [:mm.external_id :external_id]+ :metabot_feedback.positive+ :metabot_feedback.issue_type+ :metabot_feedback.freeform_feedback+ :metabot_feedback.created_at+ :metabot_feedback.updated_at]+ :from [:metabot_feedback]+ :join [[:metabot_message :mm]+ [:= :mm.id :metabot_feedback.message_id]]+ :where [:= :mm.conversation_id conversation-id]+ :order-by [[:metabot_feedback.created_at :asc]+ [:metabot_feedback.message_id :asc]+ [:metabot_feedback.user_id :asc]]})]+ (t2/hydrate rows :user)))++(defn fetch-conversation-detail+ "Fetch a conversation with its user info, the frontend-ready flattened+ chat messages, the queries the bot generated, and any user-submitted feedback.+ 404s via `api/check-404` if no conversation matches `conversation-id`."+ [conversation-id]+ (let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)]+ (api/check-404 conversation)+ (let [messages (t2/select :model/MetabotMessage+ :conversation_id conversation-id+ {:where [:= :deleted_at nil]+ :order-by [[:created_at :asc]]})+ hydrated (t2/hydrate conversation :user)]+ {:conversation_id (:id conversation)+ :created_at (:created_at conversation)+ :summary (:summary conversation)+ :user (trim-user (:user hydrated))+ :message_count (count messages)+ :total_tokens (transduce (keep :total_tokens) + 0 messages)+ :profile_id (some #(when (= :assistant (:role %)) (:profile_id %)) messages)+ :slack_permalink (slack-permalink conversation)+ :chat_messages (metabot-persistence/messages->chat-messages messages)+ :queries (analytics.queries/messages->generated-queries messages)+ :search_count (analytics.queries/count-tool-invocations messages "search")+ :query_count (analytics.queries/count-tool-invocations+ messages analytics.queries/new-query-tool-names)+ :ip_address (:ip_address conversation)+ :feedback (fetch-conversation-feedback conversation-id)})))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_analytics/queries.clj b/enterprise/backend/src/metabase_enterprise/metabot_analytics/queries.cljnew file mode 100644index 00000000000..0a5c238d9c3--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot_analytics/queries.clj@@ -0,0 +1,153 @@+(ns metabase-enterprise.metabot-analytics.queries+ "Extracts the queries metabot generated during a conversation, for the+ conversation detail endpoint. One row per successful query-construction+ tool call."+ (:require+ [metabase.driver.util :as driver.u]+ [metabase.metabot.tools :as metabot.tools]+ [metabase.sql-tools.core :as sql-tools]+ [metabase.util.log :as log]))++(set! *warn-on-reflection* true)++(defn- tool-output->structured+ "Pull `:structured-output` (or its snake-case alias) out of a persisted+ `tool-output` block's `:result`. Returns nil if the result lacks structured+ data — that signals a tool that errored out before validating."+ [result]+ (when (map? result)+ (or (:structured-output result) (:structured_output result))))++(defn- referenced-table-names+ "Use Macaw to extract distinct referenced table names from a SQL string.+ Returns `[]` on parse failure or when the database id can't be resolved+ to a driver — we degrade gracefully so the SQL still renders without a+ Tables line."+ [database-id sql]+ (if (and database-id (seq sql))+ (try+ (let [driver (driver.u/database->driver database-id)+ refs (sql-tools/referenced-tables-raw driver sql)]+ (->> refs (map :table) (remove nil?) distinct vec))+ (catch Throwable e+ (log/warn e "Failed to extract referenced tables from generated SQL")+ []))+ []))++(defn- query-generation-tool?+ "True when `tool-name` is one of the metabot tools that emits a query."+ [tool-name]+ (contains? metabot.tools/query-generation-tool-names tool-name))++(defn- notebook-tool?+ "True when `tool-name` is the notebook-query construction tool."+ [tool-name]+ (= tool-name "construct_notebook_query"))++(defn- successful-tool-output?+ "True when `output-block` exists, is not marked errored, and carries+ structured output."+ [output-block]+ (and output-block+ (not (:error output-block))+ (tool-output->structured (:result output-block))))++(defn- sql-for-tool-call+ "Best-effort SQL text for a successful SQL tool call. Prefer the structured+ output's final query text; for create/replace we can fall back to input args.+ Edit tool only persists diffs in input, so no fallback there."+ [tool-name arguments structured]+ (or (:query-content structured)+ (case tool-name+ "create_sql_query" (:sql_query arguments)+ "replace_sql_query" (:new_query arguments)+ nil)))++(defn- sql-query-row+ [{:keys [message-id]} tool-name input-block structured database-id]+ (let [sql (sql-for-tool-call tool-name (:arguments input-block) structured)]+ {:tool tool-name+ :call_id (:id input-block)+ :message_id message-id+ :query_id (:query-id structured)+ :query_type "sql"+ :sql sql+ :mbql nil+ :display nil+ :database_id database-id+ :tables (referenced-table-names database-id sql)}))++(defn- notebook-query-row+ [{:keys [message-id]} tool-name input-block structured query database-id]+ (let [chart-type (:chart-type structured)]+ {:tool tool-name+ :call_id (:id input-block)+ :message_id message-id+ :query_id (:query-id structured)+ :query_type "notebook"+ :sql nil+ :mbql query+ :display (some-> chart-type name)+ :database_id database-id+ :tables []}))++(defn- query-block-pair->row+ "Build a generated-query row from an in-app metabot tool-input/tool-output+ pair. Returns nil for tools we don't track or for failed/missing outputs+ (errored rows are filtered out at the source — v1 doesn't render them)."+ [{:keys [message-id]} input-block output-block]+ (let [tool-name (:function input-block)]+ (when (and (query-generation-tool? tool-name)+ (successful-tool-output? output-block))+ (let [structured (tool-output->structured (:result output-block))+ query (:query structured)+ database-id (or (:database structured) (:database query))]+ (if (notebook-tool? tool-name)+ (notebook-query-row {:message-id message-id} tool-name input-block structured query database-id)+ (sql-query-row {:message-id message-id} tool-name input-block structured database-id))))))++(defn- message->generated-queries+ "Extract generated-query rows from a single `MetabotMessage`. Pairs each+ `tool-input` block with its matching `tool-output` block by `:id`."+ [message]+ (let [blocks (:data message)+ outputs-by-id (->> blocks+ (filter #(= "tool-output" (:type %)))+ (into {} (map (juxt :id identity))))+ ctx {:message-id (:id message)}]+ (into []+ (comp (filter #(= "tool-input" (:type %)))+ (keep #(query-block-pair->row ctx % (get outputs-by-id (:id %)))))+ blocks)))++(defn messages->generated-queries+ "Walk a seq of `MetabotMessage` instances and return a flat vector of+ generated-query rows in chronological/insertion order, one per+ query-construction tool call. Failed and slackbot-shape blocks are+ filtered out."+ [messages]+ (into [] (mapcat message->generated-queries) messages))++(def new-query-tool-names+ "Tools that construct a fresh query. Excludes `edit_sql_query` and+ `replace_sql_query`, which refine an existing query rather than create+ a new one."+ #{"create_sql_query" "construct_notebook_query"})++(defn- tool-input-block? [block tool-names]+ (and (= "tool-input" (:type block))+ (if (set? tool-names)+ (contains? tool-names (:function block))+ (= tool-names (:function block)))))++(defn count-tool-invocations+ "Count `tool-input` blocks across a seq of `MetabotMessage` instances.+ `tool-names` may be a single tool-name string or a set of tool-name+ strings — a block counts if its `:function` matches."+ [messages tool-names]+ (transduce+ (comp (mapcat :data)+ (filter #(tool-input-block? % tool-names)))+ (completing (fn [acc _] (inc acc)))+ 0+ messages))diff --git a/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj b/enterprise/backend/src/metabase_enterprise/serialization/v2/models.cljindex 5814d3b2e81..9a14705bb16 100644--- a/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj+++ b/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj@@ -77,6 +77,7 @@"ConnectionImpersonation""ContentTranslation""DashboardBookmark"+ "DataComplexityScore""DataPermissions""DatabaseRouter""Dependency"@@ -86,6 +87,7 @@"ImplicitAction""LoginHistory""MetabotConversation"+ "MetabotFeedback""MetabotGroupLimit""MetabotInstanceLimit""MetabotMessage"diff --git a/enterprise/backend/test/metabase_enterprise/api/session_test.clj b/enterprise/backend/test/metabase_enterprise/api/session_test.cljindex 2faaf8c8ebc..127f6deef39 100644--- a/enterprise/backend/test/metabase_enterprise/api/session_test.clj+++ b/enterprise/backend/test/metabase_enterprise/api/session_test.clj@@ -25,6 +25,7 @@:config-text-file:content-translation:content-verification+ :data-complexity-score:dashboard-subscription-filters:disable-password-login:database-auth-providers@@ -75,6 +76,7 @@:config_text_file true:content_translation true:content_verification true+ :data-complexity-score true:dashboard_subscription_filters true:disable_password_login true:database_auth_providers truediff --git a/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.cljindex cde7c33105b..6a67228c235 100644--- a/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj+++ b/enterprise/backend/test/metabase_enterprise/audit_app/audit_test.clj@@ -14,12 +14,19 @@[metabase.permissions-rest.data-permissions.graph :as data-perms.graph][metabase.permissions.models.permissions-group :as perms-group][metabase.plugins.core :as plugins]+ [metabase.sync.sync :as sync][metabase.sync.task.sync-databases :as task.sync-databases][metabase.task.core :as task][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.util :as u]- [toucan2.core :as t2]))+ [toucan2.core :as t2])+ (:import+ (java.nio.charset StandardCharsets)+ (java.nio.file Files OpenOption)+ (java.util.jar JarEntry JarOutputStream)))++(set! *warn-on-reflection* true)(use-fixtures :once (fixtures/initialize :db :plugins))@@ -183,6 +190,66 @@(testing "load-analytics-content is false + checksums do not match => do not load"(is (not (#'ee-audit/should-load-audit? false 1 3)))))+(deftest views-checksum-works-for-jar-resources-test+ (let [jar-path (Files/createTempFile "instance-analytics-views" ".jar" (make-array java.nio.file.attribute.FileAttribute 0))+ resource "migrations/instance_analytics_views"+ entries [["users/v1/postgres-users.sql" "select 1;"]+ ["dashboards/v1/postgres-dashboards.sql" "select 2;"]]+ jar-url (java.net.URL. (format "jar:%s!/%s" (.toUri jar-path) resource))+ expected (hash (sort-by first (mapv (fn [[rel sql]] [rel sql]) entries)))]+ (try+ (with-open [out (-> jar-path+ (Files/newOutputStream (into-array OpenOption []))+ io/output-stream+ JarOutputStream.)]+ (doseq [[rel sql] entries]+ (.putNextEntry out (JarEntry. (str resource "/" rel)))+ (.write out (.getBytes ^String sql StandardCharsets/UTF_8))+ (.closeEntry out)))+ (with-redefs [io/resource (fn [path]+ (when (= path resource)+ jar-url))]+ (is (= expected (#'ee-audit/views-checksum))))+ (finally+ (Files/deleteIfExists jar-path)))))++(deftest views-checksum-detects-rename-test+ (testing "renaming a file changes the checksum (path is part of the hash)"+ (let [make-jar (fn [entries]+ (let [jar-path (Files/createTempFile "instance-analytics-views" ".jar"+ (make-array java.nio.file.attribute.FileAttribute 0))+ resource "migrations/instance_analytics_views"]+ (with-open [out (-> jar-path+ (Files/newOutputStream (into-array OpenOption []))+ io/output-stream+ JarOutputStream.)]+ (doseq [[rel sql] entries]+ (.putNextEntry out (JarEntry. (str resource "/" rel)))+ (.write out (.getBytes ^String sql StandardCharsets/UTF_8))+ (.closeEntry out)))+ [jar-path (java.net.URL. (format "jar:%s!/%s" (.toUri jar-path) resource))]))+ [jar-a url-a] (make-jar [["a.sql" "select 1;"]])+ [jar-b url-b] (make-jar [["b.sql" "select 1;"]])]+ (try+ (let [checksum-a (with-redefs [io/resource (constantly url-a)]+ (#'ee-audit/views-checksum))+ checksum-b (with-redefs [io/resource (constantly url-b)]+ (#'ee-audit/views-checksum))]+ (is (not= checksum-a checksum-b)))+ (finally+ (Files/deleteIfExists jar-a)+ (Files/deleteIfExists jar-b))))))++(deftest views-checksum-not-recorded-when-sync-fails-test+ (mt/with-temp [:model/Database audit-db {:engine "h2" :is_audit true}]+ (let [checksum 12345]+ (ee.audit.settings/last-analytics-views-checksum! 0)+ (with-redefs [ee-audit/views-checksum (constantly checksum)+ sync/sync-database! (fn [& _]+ (throw (Exception. "sync failed")))]+ (is (nil? (#'ee-audit/maybe-sync-audit-db! audit-db false)))+ (is (= 0 (ee.audit.settings/last-analytics-views-checksum)))))))+(deftest adjust-audit-db-to-source-test(testing "adjust-audit-db-to-source! correctly handles tables and fields with mixed case"(mt/with-temp [:model/Database {audit-db-id :id} {:engine "h2"}diff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.cljindex e5ee00eb020..ed8596f1946 100644--- a/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj@@ -5,9 +5,13 @@[metabase-enterprise.data-complexity-score.complexity :as complexity][metabase-enterprise.data-complexity-score.complexity-embedders :as embedders][metabase-enterprise.data-complexity-score.metabot-scope :as metabot-scope]+ [metabase-enterprise.data-complexity-score.models.data-complexity-score :as data-complexity-score]+ [metabase-enterprise.data-complexity-score.settings :as data-complexity-score.settings][metabase-enterprise.data-complexity-score.synonym-source :as synonym-source]+ [metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score][metabase.metabot.config :as metabot.config][metabase.test :as mt]+ [metabase.util :as m.util][toucan2.core :as t2])(:import(java.util.concurrent CountDownLatch TimeUnit)))@@ -46,7 +50,114 @@(is (= "You don't have permissions to do that."(mt/user-http-request :rasta :get 403 endpoint)))))-(deftest complexity-endpoint-superuser-gets-consistent-totals-test+(deftest complexity-endpoint-force-recalculation-requires-superuser-test+ (testing "non-superusers cannot trigger a forced recomputation"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 endpoint :force-recalculation true)))))++(def ^:private sample-score+ {:library {:total 18+ :components {:entity-count {:measurement 1.0 :score 10}+ :name-collisions {:measurement 0.0 :score 0}+ :synonym-pairs {:measurement 0.0 :score 0}+ :field-count {:measurement 8.0 :score 8}+ :repeated-measures {:measurement 0.0 :score 0}}}+ :universe {:total 54+ :components {:entity-count {:measurement 2.0 :score 20}+ :name-collisions {:measurement 0.0 :score 0}+ :synonym-pairs {:measurement 0.0 :score 0}+ :field-count {:measurement 24.0 :score 24}+ :repeated-measures {:measurement 5.0 :score 10}}}+ :metabot {:total 30+ :components {:entity-count {:measurement 1.0 :score 10}+ :name-collisions {:measurement 0.0 :score 0}+ :synonym-pairs {:measurement 0.0 :score 0}+ :field-count {:measurement 20.0 :score 20}+ :repeated-measures {:measurement 0.0 :score 0}}}+ :meta {:formula-version 3+ :synonym-threshold 0.9}})++(def ^:private sample-calculated-at "2026-04-23T12:00:00Z")++(defn- with-sample-calculated-at+ [score]+ (assoc-in score [:meta :calculated-at] sample-calculated-at))++(deftest complexity-endpoint-returns-latest-stored-score-test+ (testing "superusers read the latest persisted score snapshot instead of recomputing it on demand"+ (let [captured-fingerprint (atom nil)]+ (mt/with-dynamic-fn-redefs [task.complexity-score/current-fingerprint (constantly "api-test-fp")+ data-complexity-score/latest-score+ (fn [fingerprint]+ (reset! captured-fingerprint fingerprint)+ (with-sample-calculated-at sample-score))]+ (let [resp (mt/user-http-request :crowberto :get 200 endpoint)]+ (is (= "api-test-fp" @captured-fingerprint))+ (is (= (m.util/deep-snake-keys (with-sample-calculated-at sample-score)) resp))+ (is (contains? (:meta resp) :formula_version))+ (is (= sample-calculated-at (get-in resp [:meta :calculated_at])))+ (is (not (contains? (:meta resp) :formula-version)))+ (is (contains? (get-in resp [:library :components]) :entity_count))+ (is (not (contains? (get-in resp [:library :components]) :entity-count))))))))++(deftest complexity-endpoint-404s-when-no-score-has-been-persisted-yet-test+ (testing "the endpoint 404s until the background scorer has produced its first snapshot"+ (mt/with-dynamic-fn-redefs [data-complexity-score/latest-score (constantly nil)]+ (is (= "Data Complexity Score has not been computed yet. Recompute it to create the first snapshot."+ (mt/user-http-request :crowberto :get 404 endpoint))))))++(deftest complexity-endpoint-force-recalculation-returns-fresh-score-test+ (testing "superusers can trigger the expensive recompute path on demand"+ (let [persisted? (atom nil)]+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "api-test-fp")+ complexity/complexity-scores (fn [& _] sample-score)+ data-complexity-score/record-score! (fn [fingerprint stored-score]+ (reset! persisted? [fingerprint stored-score])+ (with-sample-calculated-at stored-score))]+ (is (= (m.util/deep-snake-keys (with-sample-calculated-at sample-score))+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)))+ (is (= ["api-test-fp" sample-score] @persisted?))))))++(deftest ^:sequential complexity-endpoint-force-recalculation-advances-last-fingerprint-on-snowplow-publish-test+ (testing "force recalculation mirrors the scheduled path's fingerprint gate — advance only when Snowplow accepted the event"+ (mt/with-temporary-setting-values [data-complexity-scoring-last-fingerprint "stale"]+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "refresh-fp")+ data-complexity-score/record-score! (fn [& _] nil)+ complexity/complexity-scores+ (fn [& _]+ (with-meta sample-score+ {::complexity/snowplow-published? true}))]+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)+ (is (= "refresh-fp" (data-complexity-score.settings/data-complexity-scoring-last-fingerprint))+ "successful Snowplow publish must advance the last-fingerprint so the next boot doesn't redundantly re-score")))))++(deftest ^:sequential complexity-endpoint-force-recalculation-keeps-fingerprint-stale-when-snowplow-publish-fails-test+ (testing "force recalculation leaves the fingerprint stale when Snowplow didn't accept the event, so the next scheduled run retries"+ (mt/with-temporary-setting-values [data-complexity-scoring-last-fingerprint "stale"]+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "refresh-fp")+ data-complexity-score/record-score! (fn [& _] nil)+ complexity/complexity-scores+ (fn [& _]+ (with-meta sample-score+ {::complexity/snowplow-published? false}))]+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)+ (is (= "stale" (data-complexity-score.settings/data-complexity-scoring-last-fingerprint))+ "failed publish must preserve the stale fingerprint — same semantics as the scheduled path")))))++(deftest complexity-endpoint-force-recalculation-runs-when-scheduled-scoring-disabled-test+ (testing "manual force recalculation does not reuse the scheduled scorer's enabled gate"+ (mt/with-temporary-setting-values [data-complexity-scoring-enabled false]+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "api-test-fp")+ complexity/complexity-scores (fn [& _] sample-score)+ data-complexity-score/record-score! (fn [& _] nil)]+ (is (= (m.util/deep-snake-keys sample-score)+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)))))))++(deftest ^:sequential complexity-endpoint-force-recalculation-superuser-gets-consistent-totals-test(testing "check invariants not covered by schema";; Stub the synonym-source's opts to a deterministic hash-seeded random vector lookup. Returning;; {} would zero out the synonym axis and trivialize the invariants below; calling the real@@ -54,43 +165,43 @@;; same vector across catalogs preserves the library ⊆ universe pair invariant.(mt/with-dynamic-fn-redefs [synonym-source/complexity-scores-opts(constantly {:embedder random-synonym-embedder})]- (let [resp (mt/user-http-request :crowberto :get 200 endpoint)- measurement (fn [cat k] (get-in resp [cat :components k :measurement]))- component-score (fn [cat k] (get-in resp [cat :components k :score]))- ;; NOTE: `:synonym-pairs` is intentionally included here even though it's *theoretically*- ;; non-monotonic — `score-synonym-pairs` dedupes by normalized name and keeps whichever- ;; embedding the provider returns for that name, so adding universe-only entities that- ;; collide on normalized name with a library entity could in principle flip which vector- ;; wins and drop the pair count below library's. Reviewers (human or AI) sometimes want- ;; to carve it out on that basis — don't. In every realistic configuration (prod, dev,- ;; the fixture that backs this endpoint's hermetic path in complexity_test.clj) the- ;; invariant holds, and asserting it keeps us honest about regressions in the common- ;; case. If the edge case ever actually trips this, *that* is the surprising thing we- ;; want to see and we'll deal with it then.- component-keys [:entity-count :name-collisions :synonym-pairs- :field-count :repeated-measures]]- (testing ":total equals the sum of its component :score values"- (doseq [catalog [:library :universe :metabot]- :let [{:keys [total components]} (get resp catalog)- scores (map :score (vals components))]]- (is (= total (reduce + scores))- (format "%s :total should equal sum of component :score values" catalog))))- (testing "universe is a superset of library: every measurement and score ≥ library's"- (doseq [k component-keys- getter [measurement component-score]- :let [lib (getter :library k)- uni (getter :universe k)]]- (is (>= uni lib)- (format "universe %s (%s) should be ≥ library's (%s)" k uni lib))))- (testing ":synonym-pairs can't exceed the number of distinct-name pairs possible"- (doseq [catalog [:library :universe :metabot]- :let [n-entities (measurement catalog :entity-count)- syn-pairs (measurement catalog :synonym-pairs)- max-pairs (/ (* n-entities (dec n-entities)) 2)]]- (is (<= syn-pairs max-pairs)- (format "%s :synonym-pairs (%s) can't exceed n*(n-1)/2 for n=%s" catalog syn-pairs n-entities))))))))--(deftest complexity-endpoint-metabot-catalog-test+ (with-redefs [data-complexity-score/record-score! (fn [& _] nil)]+ (let [resp (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)+ measurement (fn [cat k] (get-in resp [cat :components k :measurement]))+ component-score (fn [cat k] (get-in resp [cat :components k :score]))+ ;; NOTE: `:synonym_pairs` is intentionally included here even though it's *theoretically*+ ;; non-monotonic — `score-synonym-pairs` dedupes by normalized name and keeps whichever+ ;; embedding the provider returns for that name, so adding universe-only entities that+ ;; collide on normalized name with a library entity could in principle flip which vector+ ;; wins and drop the pair count below library's. Reviewers (human or AI) sometimes want+ ;; to carve it out on that basis — don't. In every realistic configuration (prod, dev,+ ;; the fixture that backs this endpoint's hermetic path in complexity_test.clj) the+ ;; invariant holds, and asserting it keeps us honest about regressions in the common+ ;; case. If the edge case ever actually trips this, *that* is the surprising thing we+ ;; want to see and we'll deal with it then.+ component-keys [:entity_count :name_collisions :synonym_pairs+ :field_count :repeated_measures]]+ (testing ":total equals the sum of its component :score values"+ (doseq [catalog [:library :universe :metabot]+ :let [{:keys [total components]} (get resp catalog)]]+ (is (= total (reduce + (map :score (vals components))))+ (format "%s :total should equal sum of component :score values" catalog))))+ (testing "universe is a superset of library: every measurement and score >= library's"+ (doseq [k component-keys+ getter [measurement component-score]+ :let [lib (getter :library k)+ uni (getter :universe k)]]+ (is (>= uni lib)+ (format "universe %s (%s) should be >= library's (%s)" k uni lib))))+ (testing ":synonym_pairs can't exceed the number of distinct-name pairs possible"+ (doseq [catalog [:library :universe :metabot]+ :let [n-entities (measurement catalog :entity_count)+ syn-pairs (measurement catalog :synonym_pairs)+ max-pairs (/ (* n-entities (dec n-entities)) 2)]]+ (is (<= syn-pairs max-pairs)+ (format "%s :synonym_pairs (%s) can't exceed n*(n-1)/2 for n=%s" catalog syn-pairs n-entities)))))))))++(deftest ^:sequential complexity-endpoint-force-recalculation-metabot-catalog-test(testing ":metabot mirrors :universe when neither content-verification nor use_verified_content is active";; Pin both gates explicitly instead of relying on test-env defaults — the reused-verbatim path;; is only exercised when the scope is empty, and we want this assertion to keep passing even@@ -98,8 +209,9 @@(mt/with-premium-features #{}(mt/with-temp-vals-in-db :model/Metabot (internal-metabot-id){:use_verified_content false :collection_id nil}- (let [resp (mt/user-http-request :crowberto :get 200 endpoint)]- (is (= (:universe resp) (:metabot resp)))))))+ (with-redefs [data-complexity-score/record-score! (fn [& _] nil)]+ (let [resp (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)]+ (is (= (:universe resp) (:metabot resp))))))))(testing ":metabot is scored separately when :content-verification + use_verified_content are both active";; Positive path: verified-only filtering restricts Cards to those with an active verified;; moderation review. We inject a fresh unverified Card so the assertion doesn't depend on@@ -112,12 +224,13 @@:archived false}](mt/with-temp-vals-in-db :model/Metabot (internal-metabot-id){:use_verified_content true :collection_id nil}- (let [resp (mt/user-http-request :crowberto :get 200 endpoint)]- (is (< (get-in resp [:metabot :components :entity-count :measurement])- (get-in resp [:universe :components :entity-count :measurement]))- ":metabot entity-count must be strictly < :universe when verified-only filters out the injected Card")))))))+ (with-redefs [data-complexity-score/record-score! (fn [& _] nil)]+ (let [resp (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)]+ (is (< (get-in resp [:metabot :components :entity_count :measurement])+ (get-in resp [:universe :components :entity_count :measurement]))+ ":metabot entity-count must be strictly < :universe when verified-only filters out the injected Card"))))))))-(deftest complexity-endpoint-metabot-collection-scope-test+(deftest ^:sequential complexity-endpoint-force-recalculation-metabot-collection-scope-test(testing ":metabot is scoped to the internal Metabot's collection_id subtree (root + descendants)";; Fixture shape — exercises both halves of `metabot-collection-scope-ids`:;; parent ← Metabot's collection_id; holds a Card directly (catches root-omitted regressions)@@ -158,9 +271,10 @@(mt/with-temp-vals-in-db :model/Metabot (internal-metabot-id){:use_verified_content false:collection_id cid}- (let [resp (mt/user-http-request :crowberto :get 200 endpoint)]- {:metabot (get-in resp [:metabot :components :entity-count :measurement])- :universe (get-in resp [:universe :components :entity-count :measurement])})))+ (with-redefs [data-complexity-score/record-score! (fn [& _] nil)]+ (let [resp (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)]+ {:metabot (get-in resp [:metabot :components :entity_count :measurement])+ :universe (get-in resp [:universe :components :entity_count :measurement])}))))empty-counts (counts-with-scope empty-id)parent-counts (counts-with-scope parent-id)sibling-counts (counts-with-scope sibling-id)@@ -199,7 +313,27 @@{:library empty-catalog :universe empty-catalog :metabot empty-catalog:meta {:formula-version 1 :synonym-threshold 0.0}})-(deftest ^:sequential complexity-endpoint-rejects-concurrent-requests-test+(deftest ^:sequential complexity-endpoint-force-recalculation-allows-active-scheduled-claim-test+ (testing "manual API recalculation does not share the cron/boot scoring claim"+ (let [active-claim (pr-str {:fingerprint "older-fingerprint"+ :claimed-at (System/currentTimeMillis)+ :owner "scheduled-owner"})+ scoring-ran? (atom false)]+ (mt/with-temporary-setting-values [data-complexity-scoring-claim active-claim]+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "api-test-fp")+ data-complexity-score/record-score! (fn [& _] nil)+ complexity/complexity-scores+ (fn [& _]+ (reset! scoring-ran? true)+ stub-scores)]+ (is (= (m.util/deep-snake-keys stub-scores)+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)))+ (is (true? @scoring-ran?)+ "force recalculation should compute independently of scheduled claims")+ (is (= active-claim (data-complexity-score.settings/data-complexity-scoring-claim))))))))++(deftest ^:sequential complexity-endpoint-force-recalculation-rejects-concurrent-requests-test(testing "a second concurrent request fast-fails with 409 instead of running a duplicate scoring pass";; Block the stubbed scoring call on a latch so the second request is guaranteed to land;; while the guard is held. Plain `with-redefs` (not `with-dynamic-fn-redefs`) because@@ -207,19 +341,22 @@(let [release-scoring (CountDownLatch. 1)scoring-started (CountDownLatch. 1)call-count (atom 0)]- (with-redefs [complexity/complexity-scores+ (with-redefs [metabot-scope/internal-metabot-scope (constantly {})+ task.complexity-score/current-fingerprint (constantly "api-test-fp")+ data-complexity-score/record-score! (fn [& _] nil)+ complexity/complexity-scores(fn [& _](swap! call-count inc)(.countDown scoring-started)(.await release-scoring 10 TimeUnit/SECONDS)stub-scores)]- (let [first-request (future (mt/user-http-request :crowberto :get 200 endpoint))]+ (let [first-request (future (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true))](try(is (.await scoring-started 10 TimeUnit/SECONDS)"first request must reach the guarded section before we fire the second")(testing "concurrent superuser request is rejected with 409"(is (= "Data Complexity Score calculation already in progress"- (mt/user-http-request :crowberto :get 409 endpoint))))+ (mt/user-http-request :crowberto :get 409 endpoint :force-recalculation true))))(finally(.countDown release-scoring);; Drain the in-flight request so the guard is released before the next test@@ -228,7 +365,7 @@(testing "only the first request actually ran scoring; the second short-circuited"(is (= 1 @call-count)))(testing "guard is released after the in-flight request finishes — a follow-up request succeeds"- (mt/user-http-request :crowberto :get 200 endpoint)+ (mt/user-http-request :crowberto :get 200 endpoint :force-recalculation true)(is (= 2 @call-count)))))))(deftest internal-metabot-scope-testdiff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.cljindex 9bfde979ced..e58a91123fe 100644--- a/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj@@ -8,6 +8,7 @@;; `scoring-task-registered-test` verifies init.clj's actual wiring path.[metabase-enterprise.data-complexity-score.init][metabase-enterprise.data-complexity-score.metabot-scope :as metabot-scope]+ [metabase-enterprise.data-complexity-score.models.data-complexity-score :as data-complexity-score][metabase-enterprise.data-complexity-score.settings :as settings][metabase-enterprise.data-complexity-score.synonym-source :as synonym-source][metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score]@@ -927,6 +928,38 @@:metabot {:total 0 :components {}} :meta {}}{:metabase-enterprise.data-complexity-score.complexity/snowplow-published? published?}))+(deftest ^:sequential latest-score-filters-by-fingerprint-test+ (testing "the overview cache only returns scores matching the current scoring fingerprint"+ (mt/initialize-if-needed! :db)+ (let [other-fingerprint "latest-score-test/other"+ fingerprint "latest-score-test/current"]+ (try+ (t2/delete! :model/DataComplexityScore :fingerprint [:in [other-fingerprint fingerprint]])+ (data-complexity-score/record-score! other-fingerprint {:meta {:label "other"}})+ (data-complexity-score/record-score! fingerprint {:meta {:label "older"}})+ (data-complexity-score/record-score! fingerprint {:meta {:label "newer"}})+ (let [score (data-complexity-score/latest-score fingerprint)]+ (is (= "newer" (get-in score [:meta :label])))+ (is (some? (get-in score [:meta :calculated-at]))))+ (finally+ (t2/delete! :model/DataComplexityScore :fingerprint [:in [other-fingerprint fingerprint]]))))))++(deftest ^:sequential run-scoring-persists-latest-score-snapshot-test+ (testing "every successful computation persists a fresh snapshot for the overview endpoint"+ (mt/initialize-if-needed! :db)+ (mt/with-dynamic-fn-redefs [metabot-scope/internal-metabot-scope (constantly {})]+ (let [before-id (some-> (data-complexity-score/latest-entry "persist-test-fp") :id)+ result (stub-result false)]+ (mt/with-temporary-setting-values [data-complexity-scoring-enabled true]+ (mt/with-dynamic-fn-redefs [complexity/complexity-scores (fn [& _] result)]+ (#'task.complexity-score/run-scoring! "persist-test-fp")+ (let [{:keys [id fingerprint score_data]} (data-complexity-score/latest-entry "persist-test-fp")]+ (is (= result score_data))+ (is (= "persist-test-fp" fingerprint))+ (when before-id+ (is (> id before-id)+ "a new append-only snapshot should be written for each run")))))))))+(deftest ^:sequential run-scoring-persists-fingerprint-only-on-successful-publish-test(testing "fingerprint advances only when Snowplow accepted the event — failed publish must leavethe stale fingerprint in place so the next boot / cron retries"@@ -946,6 +979,18 @@(is (= "stale" (settings/data-complexity-scoring-last-fingerprint))"fingerprint preserved — next boot / cron will retry the emission")))))))+(deftest ^:sequential run-scoring-keeps-fingerprint-stale-when-persistence-fails-test+ (testing "persistence is part of a successful run now — if the cache write fails we must retry"+ (mt/with-dynamic-fn-redefs [metabot-scope/internal-metabot-scope (constantly {})]+ (mt/with-temporary-setting-values [data-complexity-scoring-enabled true+ data-complexity-scoring-last-fingerprint "stale"]+ (mt/with-dynamic-fn-redefs [complexity/complexity-scores (fn [& _] (stub-result true))+ data-complexity-score/record-score! (fn [& _]+ (throw (RuntimeException. "db boom")))]+ (#'task.complexity-score/run-scoring! "fresh-fp")+ (is (= "stale" (settings/data-complexity-scoring-last-fingerprint))+ "fingerprint preserved so the next boot / cron retries the failed cache write"))))))+(deftest ^:sequential maybe-emit-boot-score-only-advances-fingerprint-on-successful-publish-test(testing "boot-time emission never advances the last-successful fingerprint on failure — thesuccess fingerprint is separate from the in-progress scoring claim, so a scoring/publishdiff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer_test.cljnew file mode 100644index 00000000000..6a1b9c127be--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/task/complexity_score_trimmer_test.clj@@ -0,0 +1,56 @@+(ns metabase-enterprise.data-complexity-score.task.complexity-score-trimmer-test+ (:require+ [clojure.test :refer :all]+ [java-time.api :as t]+ [metabase-enterprise.data-complexity-score.task.complexity-score-trimmer :as complexity-score-trimmer]+ [metabase.test :as mt]+ [metabase.test.fixtures :as fixtures]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(use-fixtures :once (fixtures/initialize :db))++(def ^:private fingerprint-prefix "complexity-score-trimmer-test/")++(defn- cleanup-tables+ [f]+ (t2/delete! :model/DataComplexityScore+ {:where [:like :fingerprint (str fingerprint-prefix "%")]})+ (f)+ (t2/delete! :model/DataComplexityScore+ {:where [:like :fingerprint (str fingerprint-prefix "%")]}))++(use-fixtures :each cleanup-tables)++(defn- insert-score!+ [label created-at]+ (t2/insert! :model/DataComplexityScore+ {:fingerprint (str fingerprint-prefix label)+ :score_data {:label label}+ :created_at created-at}))++(deftest trim-old-complexity-score-data-deletes-expired-snapshots-test+ (mt/with-clock #t "2026-04-23T12:00:00Z[UTC]"+ (let [now (t/local-date-time)+ recent-score-label "score-recent"+ boundary-score-label "score-boundary"+ old-score-label "score-old"]+ (insert-score! recent-score-label (t/minus now (t/months 2)))+ (insert-score! boundary-score-label (t/minus now (t/months 3)))+ (insert-score! old-score-label (t/minus now (t/months 4)))++ (is (= 3 (t2/count :model/DataComplexityScore+ {:where [:like :fingerprint (str fingerprint-prefix "%")]})))++ (#'complexity-score-trimmer/trim-old-complexity-score-data!)++ (is (some? (t2/select-one :model/DataComplexityScore+ :fingerprint (str fingerprint-prefix recent-score-label))))+ (is (some? (t2/select-one :model/DataComplexityScore+ :fingerprint (str fingerprint-prefix boundary-score-label))))+ (is (nil? (t2/select-one :model/DataComplexityScore+ :fingerprint (str fingerprint-prefix old-score-label))))++ (is (= 2 (t2/count :model/DataComplexityScore+ {:where [:like :fingerprint (str fingerprint-prefix "%")]}))))))diff --git a/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj b/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.cljindex 4ab3f0cf603..7cf817149e6 100644--- a/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj+++ b/enterprise/backend/test/metabase_enterprise/internal_stats/metabot_test.clj@@ -193,6 +193,81 @@(finally(cleanup! conv-id)))))))+(deftest metabot-stats-falls-back-to-conversation-user-for-legacy-rows-test+ (let [clock (t/mock-clock (t/instant "2026-04-01T12:00:00Z") "UTC")+ yesterday (t/offset-date-time 2026 3 31 10 0 0 0 (t/zone-offset "+00"))+ rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)+ ;; `:user_id` on the messages is intentionally omitted — this is the legacy+ ;; scenario from before messages stamped their author.+ legacy-msg #(hash-map :conversation_id % :created_at yesterday :role "user"+ :profile_id "legacy" :total_tokens 100 :ai_proxied true)+ usage-log (fn [conv-id user-id]+ {:conversation_id conv-id :user_id user-id :created_at yesterday+ :source "legacy-test" :total_tokens 100 :prompt_tokens 100+ :ai_proxied true})]+ (t/with-clock clock+ (mt/with-temp [:model/MetabotConversation {conv-1 :id} {:user_id rasta-id}+ :model/MetabotConversation {conv-2 :id} {:user_id lucky-id}+ :model/MetabotMessage _ (legacy-msg conv-1)+ :model/MetabotMessage _ (legacy-msg conv-2)+ :model/AiUsageLog _ (usage-log conv-1 rasta-id)+ :model/AiUsageLog _ (usage-log conv-2 lucky-id)]+ (is (= 2 (:metabot-users (sut/metabot-stats))))))))++(deftest metabot-stats-mixed-user-id-stamping-dedups-test+ (testing "stamped + unstamped messages from the same user must collapse to one distinct user"+ (let [clock (t/mock-clock (t/instant "2026-04-01T12:00:00Z") "UTC")+ yesterday (t/offset-date-time 2026 3 31 10 0 0 0 (t/zone-offset "+00"))+ rasta-id (mt/user->id :rasta)+ mixed-msg (fn [conv-id stamp-user?]+ (cond-> {:conversation_id conv-id+ :created_at yesterday+ :role "user"+ :profile_id "mixed"+ :total_tokens 100+ :ai_proxied true}+ stamp-user? (assoc :user_id rasta-id)))+ usage-log {:user_id rasta-id+ :created_at yesterday+ :source "mixed-test"+ :total_tokens 100+ :prompt_tokens 100+ :ai_proxied true}]+ (t/with-clock clock+ (mt/with-temp [:model/MetabotConversation {conv-id :id} {:user_id rasta-id}+ :model/MetabotMessage _ (mixed-msg conv-id true)+ :model/MetabotMessage _ (mixed-msg conv-id false)+ :model/AiUsageLog _ (assoc usage-log :conversation_id conv-id)]+ (is (= 1 (:metabot-users (sut/metabot-stats)))))))))++(deftest metabot-stats-counts-distinct-participants-in-shared-conversation-test+ (testing "two participants in a single conversation are both counted in :metabot-users"+ (let [clock (t/mock-clock (t/instant "2026-04-01T12:00:00Z") "UTC")+ yesterday (t/offset-date-time 2026 3 31 10 0 0 0 (t/zone-offset "+00"))+ rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)+ msg (fn [conv-id user-id]+ {:conversation_id conv-id+ :user_id user-id+ :created_at yesterday+ :role "user"+ :profile_id "shared"+ :total_tokens 100+ :ai_proxied true})+ log {:created_at yesterday+ :source "shared-test"+ :total_tokens 100+ :prompt_tokens 100+ :ai_proxied true}]+ (t/with-clock clock+ (mt/with-temp [:model/MetabotConversation {conv-id :id} {:user_id rasta-id}+ :model/MetabotMessage _ (msg conv-id rasta-id)+ :model/MetabotMessage _ (msg conv-id lucky-id)+ :model/AiUsageLog _ (assoc log :conversation_id conv-id :user_id rasta-id)+ :model/AiUsageLog _ (assoc log :conversation_id conv-id :user_id lucky-id)]+ (is (= 2 (:metabot-users (sut/metabot-stats)))))))))+(deftest metabot-usage-anthropic-provider-test(search.tu/with-index-disabled(let [clock (t/mock-clock (t/instant "2026-04-01T12:00:00Z") "UTC")@@ -380,7 +455,7 @@;; Example question generation (no conversation)(generate-example-questions! tables model 300 100)(t2/update! :model/AiUsageLog {:id [:> baseline]- :source "example-question-generation"}+ :source "example_question_generation_batch"}{:created_at yesterday}))(testing "metabot-stats includes both chat and example question generation"diff --git a/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/api_test.cljindex 0c295e48c83..5e137bebd25 100644--- a/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj@@ -4,46 +4,92 @@[clojure.test :refer :all][metabase.premium-features.core :as premium-features][metabase.test :as mt]- [metabase.util.json :as json]))+ [metabase.util.json :as json]+ [toucan2.core :as t2]))(set! *warn-on-reflection* true)+(defn- with-owned-message!+ "Create a conversation + assistant message owned by `user-id` and call `f` with+ the message's external_id, cleaning up afterwards."+ [user-id f]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id user-id})+ (t2/insert-returning-pks!+ :model/MetabotMessage+ {:conversation_id conversation-id+ :role "assistant"+ :profile_id "gpt-x"+ :external_id external-id+ :total_tokens 5+ :data [{:type "text" :text "hi"}]})+ (f external-id)+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))+(deftest feedback-endpoint-test(let [store-url "http://hm.example"fake-token "test-fake-token-for-feedback"]- (testing "Submits feedback to Harbormaster with token and base URL"+ (testing "Persists feedback locally and proxies a Harbormaster payload built from DB state"(mt/with-temporary-setting-values [store-api-url store-url]- (let [captured (atom nil)- feedback {:metabot_id 1- :feedback {:positive true- :message_id "m-1"- :freeform_feedback "ok"}- :conversation_data {}- :version "v0.0.0"- :submission_time "2025-01-01T00:00:00Z"- :is_admin false}- expected-url (str store-url "/api/v2/metabot/feedback/" fake-token)]- (mt/with-dynamic-fn-redefs- [premium-features/premium-embedding-token (constantly fake-token)- http/post (fn [url opts]- (reset! captured {:url url- :body (json/decode+kw (:body opts))}))]- (let [_resp (mt/user-http-request :rasta :post 204 "metabot/feedback" feedback)]- (is (= {:url expected-url :body feedback}- @captured)))))))+ (with-owned-message!+ (mt/user->id :rasta)+ (fn [external-id]+ (let [captured (atom nil)+ body {:metabot_id 1+ :message_id external-id+ :positive true+ :freeform_feedback "ok"}+ expected-url (str store-url "/api/v2/metabot/feedback/" fake-token)]+ (mt/with-dynamic-fn-redefs+ [premium-features/premium-embedding-token (constantly fake-token)+ http/post (fn [url opts]+ (reset! captured {:url url+ :body (json/decode+kw (:body opts))}))]+ (mt/user-http-request :rasta :post 204 "metabot/feedback" body)+ (is (= expected-url (:url @captured)))+ (let [sent (:body @captured)]+ (is (= 1 (:metabot_id sent)))+ (is (= {:message_id external-id+ :positive true+ :issue_type nil+ :freeform_feedback "ok"}+ (:feedback sent)))+ (is (map? (:conversation_data sent)))+ (is (contains? sent :version))+ (is (contains? sent :submission_time))+ (is (false? (:is_admin sent))))))))))- (testing "Returns 500 when http post fails"- (mt/with-temporary-setting-values [store-api-url store-url]- (mt/with-dynamic-fn-redefs- [premium-features/premium-embedding-token (constantly fake-token)- http/post (fn [_url _opts]- (throw (ex-info "boom" {:status 404})))]- (mt/user-http-request :rasta :post 500 "metabot/feedback" {:any "payload"}))))+ (testing "404s when the message_id does not resolve to a message the caller owns"+ (mt/user-http-request :rasta :post 404 "metabot/feedback"+ {:metabot_id 1+ :message_id (str (random-uuid))+ :positive true}))- (testing "Throws when premium token is missing"- (mt/with-dynamic-fn-redefs- [premium-features/premium-embedding-token (constantly nil)]- (mt/user-http-request :rasta :post 400 "metabot/feedback" {:foo "bar"})))))+ (testing "Persists locally and returns 204 when the premium token is missing (Harbormaster errors are swallowed)"+ (mt/with-temporary-setting-values [store-api-url store-url]+ (with-owned-message!+ (mt/user->id :rasta)+ (fn [external-id]+ (let [posted? (atom false)+ message-row-id (t2/select-one-fn :id :model/MetabotMessage :external_id external-id)]+ (mt/with-dynamic-fn-redefs+ [premium-features/premium-embedding-token (constantly nil)+ http/post (fn [& _] (reset! posted? true))]+ (mt/user-http-request :rasta :post 204 "metabot/feedback"+ {:metabot_id 1+ :message_id external-id+ :positive true+ :freeform_feedback "ok"})+ (is (false? @posted?)+ "Harbormaster must not be contacted when the premium token is missing")+ (is (= {:positive true :freeform_feedback "ok"}+ (t2/select-one [:model/MetabotFeedback :positive :freeform_feedback]+ :message_id message-row-id))+ "Local feedback row should still be persisted")))))))))(deftest usage-get-returns-token-status-usage-test(mt/with-premium-features #{:metabot-v3}diff --git a/enterprise/backend/test/metabase_enterprise/metabot/usage_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/usage_test.cljindex 03608159537..5b039f64981 100644--- a/enterprise/backend/test/metabase_enterprise/metabot/usage_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/usage_test.clj@@ -31,17 +31,17 @@(testing "log-ai-usage! inserts a row into ai_usage_log"(let [user-id (mt/user->id :rasta)](mt/with-test-user :rasta- (let [before-count (t2/count :model/AiUsageLog :user_id user-id :source "log-test")]+ (let [before-count (t2/count :model/AiUsageLog :user_id user-id :source "metabot_agent")](usage/log-ai-usage!- {:source "log-test"+ {:source "metabot_agent":model "anthropic/claude-test":prompt-tokens 100:completion-tokens 50:ai-proxied true})(try(is (= (inc before-count)- (t2/count :model/AiUsageLog :user_id user-id :source "log-test")))- (let [row (t2/select-one :model/AiUsageLog :user_id user-id :source "log-test"+ (t2/count :model/AiUsageLog :user_id user-id :source "metabot_agent")))+ (let [row (t2/select-one :model/AiUsageLog :user_id user-id :source "metabot_agent"{:order-by [[:id :desc]]})](is (= "anthropic/claude-test" (:model row)))(is (= 100 (:prompt_tokens row)))@@ -50,7 +50,7 @@(is (= user-id (:user_id row)))(is (true? (:ai_proxied row))))(finally- (t2/delete! :model/AiUsageLog :user_id user-id :source "log-test")))))))))+ (t2/delete! :model/AiUsageLog :user_id user-id :source "metabot_agent")))))))))(deftest log-ai-usage!-skips-intent-classification-test(mt/with-premium-features #{:ai-controls}@@ -74,33 +74,33 @@(let [user-id (mt/user->id :rasta)](mt/with-test-user :rasta(usage/log-ai-usage!- {:source "binding-test"+ {:source "document_generate_content":model "test/model":prompt-tokens 1:completion-tokens 1})(try- (let [row (t2/select-one :model/AiUsageLog :source "binding-test"+ (let [row (t2/select-one :model/AiUsageLog :source "document_generate_content"{:order-by [[:id :desc]]})](is (= user-id (:user_id row))))(finally- (t2/delete! :model/AiUsageLog :source "binding-test"))))))))+ (t2/delete! :model/AiUsageLog :source "document_generate_content"))))))))(deftest log-ai-usage!-converts-profile-id-keyword-test(mt/with-premium-features #{:ai-controls}(testing "log-ai-usage! converts keyword profile-id to string"(mt/with-test-user :rasta(usage/log-ai-usage!- {:source "profile-test"+ {:source "example_question_generation_batch":model "test/model":prompt-tokens 1:completion-tokens 1:profile-id :internal})(try- (let [row (t2/select-one :model/AiUsageLog :source "profile-test"+ (let [row (t2/select-one :model/AiUsageLog :source "example_question_generation_batch"{:order-by [[:id :desc]]})](is (= "internal" (:profile_id row))))(finally- (t2/delete! :model/AiUsageLog :source "profile-test")))))))+ (t2/delete! :model/AiUsageLog :source "example_question_generation_batch")))))))(deftest log-ai-usage!-explicit-user-id-test(mt/with-premium-features #{:ai-controls}@@ -108,33 +108,60 @@(let [crowberto-id (mt/user->id :crowberto)](mt/with-test-user :rasta(usage/log-ai-usage!- {:source "explicit-user-test"+ {:source "slack":model "test/model":prompt-tokens 1:completion-tokens 1:user-id crowberto-id})(try- (let [row (t2/select-one :model/AiUsageLog :source "explicit-user-test"+ (let [row (t2/select-one :model/AiUsageLog :source "slack"{:order-by [[:id :desc]]})](is (= crowberto-id (:user_id row))))(finally- (t2/delete! :model/AiUsageLog :source "explicit-user-test"))))))))+ (t2/delete! :model/AiUsageLog :source "slack"))))))))(deftest log-ai-usage!-ai-proxied-defaults-to-nil-test(mt/with-premium-features #{:ai-controls}(testing "log-ai-usage! stores nil for ai_proxied when not provided"(mt/with-test-user :rasta(usage/log-ai-usage!- {:source "proxied-default-test"+ {:source "oss-sql-gen":model "test/model":prompt-tokens 1:completion-tokens 1})(try- (let [row (t2/select-one :model/AiUsageLog :source "proxied-default-test"+ (let [row (t2/select-one :model/AiUsageLog :source "oss-sql-gen"{:order-by [[:id :desc]]})](is (nil? (:ai_proxied row))))(finally- (t2/delete! :model/AiUsageLog :source "proxied-default-test")))))))+ (t2/delete! :model/AiUsageLog :source "oss-sql-gen")))))))++(deftest log-ai-usage!-throws-on-unknown-source-test+ (mt/with-premium-features #{:ai-controls}+ (testing "log-ai-usage! throws when source is not in the known set"+ (mt/with-test-user :rasta+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Unknown ai_usage_log source"+ (usage/log-ai-usage!+ {:source "made-up-source"+ :model "test/model"+ :prompt-tokens 1+ :completion-tokens 1})))))))++(deftest log-ai-usage!-throws-on-unknown-profile-id-test+ (mt/with-premium-features #{:ai-controls}+ (testing "log-ai-usage! throws when profile-id is not in the known set"+ (mt/with-test-user :rasta+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Unknown ai_usage_log profile-id"+ (usage/log-ai-usage!+ {:source "metabot_agent"+ :model "test/model"+ :prompt-tokens 1+ :completion-tokens 1+ :profile-id :made-up-profile})))))));;; ------------------------------------------ check-usage-limits! ------------------------------------------diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.cljnew file mode 100644index 00000000000..21db5688a67--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/api_test.clj@@ -0,0 +1,809 @@+(ns metabase-enterprise.metabot-analytics.api-test+ (:require+ [clojure.set :as set]+ [clojure.test :refer [deftest is testing]]+ [metabase.slackbot.api :as slackbot.api]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(defn- insert-conversation!+ [{:keys [conversation-id user-id created-at summary state slack-team-id slack-channel-id slack-thread-ts ip-address]}]+ (t2/insert! :model/MetabotConversation+ (cond-> {:id conversation-id+ :user_id user-id}+ created-at (assoc :created_at created-at)+ summary (assoc :summary summary)+ state (assoc :state state)+ slack-team-id (assoc :slack_team_id slack-team-id)+ slack-channel-id (assoc :slack_channel_id slack-channel-id)+ slack-thread-ts (assoc :slack_thread_ts slack-thread-ts)+ ip-address (assoc :ip_address ip-address))))++(defn- insert-message!+ [{:keys [conversation-id created-at role profile-id total-tokens data deleted-at]}]+ (first (t2/insert-returning-pks!+ :model/MetabotMessage+ (cond-> {:conversation_id conversation-id+ :role role+ :profile_id profile-id+ :total_tokens total-tokens+ :data data+ :external_id (str (random-uuid))}+ created-at (assoc :created_at created-at)+ deleted-at (assoc :deleted_at deleted-at)))))++(defn- delete-conversations!+ [conversation-ids]+ (let [conversation-ids (vec conversation-ids)]+ (t2/delete! :model/MetabotMessage {:where [:in :conversation_id conversation-ids]})+ (t2/delete! :model/MetabotConversation {:where [:in :id conversation-ids]})))++(defn- insert-feedback!+ [{:keys [message-id user-id positive issue-type freeform created-at updated-at]}]+ (t2/insert! :model/MetabotFeedback+ (cond-> {:message_id message-id+ :user_id user-id+ :positive positive+ :issue_type issue-type+ :freeform_feedback freeform}+ created-at (assoc :created_at created-at)+ updated-at (assoc :updated_at updated-at))))++(defn- offset-date-time+ [s]+ (java.time.OffsetDateTime/parse s))++(defn- find-conversation+ [conversations conversation-id]+ (some #(when (= (:conversation_id %) conversation-id) %) conversations))++(defn- with-list-conversations-fixture!+ [thunk]+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User {test-user-id :id} {:email "[email protected]"+ :first_name "Metabot"+ :last_name "Analytics"}]+ (let [response-path (format "ee/metabot-analytics/conversations?user_id=%s" test-user-id)+ convo-1 (str (random-uuid))+ convo-2 (str (random-uuid))+ convo-3 (str (random-uuid))+ jan-1 (offset-date-time "2026-01-01T00:00:00Z")+ jan-2 (offset-date-time "2026-01-02T00:00:00Z")+ jan-3 (offset-date-time "2026-01-03T00:00:00Z")+ jan-4 (offset-date-time "2026-01-04T00:00:00Z")+ jan-5 (offset-date-time "2026-01-05T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id convo-1+ :user-id test-user-id+ :created-at jan-1+ :summary "First conversation"+ :state {:step "one"}})+ (insert-conversation! {:conversation-id convo-2+ :user-id test-user-id+ :created-at jan-2+ :summary "Second conversation"})+ (insert-conversation! {:conversation-id convo-3+ :user-id test-user-id+ :created-at jan-3+ :summary "Third conversation"})+ (insert-message! {:conversation-id convo-1+ :created-at jan-2+ :role "user"+ :profile-id "ignored-user-model"+ :total-tokens 3+ :data [{:role "user" :content "hello"}]})+ (insert-message! {:conversation-id convo-1+ :created-at jan-3+ :role "assistant"+ :profile-id "nlq"+ :total-tokens 7+ :data [{:role "assistant" :content "hi"}]})+ (insert-message! {:conversation-id convo-2+ :created-at jan-4+ :role "user"+ :profile-id "ignored-user-model"+ :total-tokens 2+ :data [{:role "user" :content "question"}]})+ (insert-message! {:conversation-id convo-2+ :created-at jan-5+ :role "assistant"+ :profile-id "internal"+ :total-tokens 11+ :data [{:role "assistant" :content "answer"}]})+ (insert-message! {:conversation-id convo-2+ :created-at jan-5+ :role "assistant"+ :profile-id "internal"+ :total-tokens 13+ :data [{:role "assistant" :content "follow-up"}]})+ (insert-message! {:conversation-id convo-3+ :created-at jan-4+ :role "assistant"+ :profile-id "deleted-model"+ :total-tokens 99+ :data [{:role "assistant" :content "deleted"}]+ :deleted-at jan-5})+ (thunk {:test-user-id test-user-id+ :response-path response-path+ :convo-1 convo-1+ :convo-2 convo-2+ :convo-3 convo-3})+ (finally+ (delete-conversations! [convo-1 convo-2 convo-3])))))))++(deftest list-conversations-requires-superuser-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations requires superuser"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 "ee/metabot-analytics/conversations"))))))++(deftest list-conversations-aggregates-data-test+ (with-list-conversations-fixture!+ (fn [{:keys [test-user-id response-path convo-1 convo-2 convo-3]}]+ (let [response (mt/user-http-request :crowberto :get 200 response-path)+ conversation-ids (map :conversation_id (:data response))+ convo-1-response (find-conversation (:data response) convo-1)+ convo-2-response (find-conversation (:data response) convo-2)+ convo-3-response (find-conversation (:data response) convo-3)]+ (is (= 3 (:total response)))+ (is (= 50 (:limit response)))+ (is (= 0 (:offset response)))+ (is (= [convo-3 convo-2 convo-1] conversation-ids))+ (is (nil? (:profile_id convo-3-response)))+ (is (= 0 (:message_count convo-3-response)))+ (is (= 0 (:assistant_message_count convo-3-response)))+ (is (= 0 (:total_tokens convo-3-response)))+ (is (= {:conversation_id convo-1+ :summary "First conversation"+ :message_count 2+ :user_message_count 1+ :assistant_message_count 1+ :total_tokens 10+ :profile_id "nlq"+ :user {:id test-user-id+ :email "[email protected]"+ :first_name "Metabot"+ :last_name "Analytics"}}+ (-> (select-keys convo-1-response [:conversation_id :summary :message_count+ :user_message_count :assistant_message_count :total_tokens+ :profile_id :user])+ (update :user select-keys [:id :email :first_name :last_name]))))+ (is (= {:conversation_id convo-2+ :message_count 3+ :user_message_count 1+ :assistant_message_count 2+ :total_tokens 26+ :profile_id "internal"}+ (select-keys convo-2-response [:conversation_id :message_count :user_message_count+ :assistant_message_count :total_tokens :profile_id])))))))++(deftest list-conversations-pagination-test+ (with-list-conversations-fixture!+ (fn [{:keys [response-path convo-2]}]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "%s&limit=1&offset=1" response-path))]+ (is (= 3 (:total response)))+ (is (= 1 (:limit response)))+ (is (= 1 (:offset response)))+ (is (= [convo-2] (map :conversation_id (:data response)))))+ (testing "total still reflects the full count when paging past the end"+ (let [response (mt/user-http-request :crowberto :get 200+ (format "%s&limit=10&offset=999" response-path))]+ (is (= 3 (:total response)))+ (is (= [] (:data response))))))))++(deftest list-conversations-sorting-test+ (with-list-conversations-fixture!+ (fn [{:keys [response-path convo-1 convo-2 convo-3]}]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "%s&sort_by=message_count&sort_dir=asc" response-path))]+ (is (= [convo-3 convo-1 convo-2] (map :conversation_id (:data response))))))))++(deftest list-conversations-sorting-desc-test+ (testing "sort-dir=desc reverses the sort order — same fixture as the asc test"+ (with-list-conversations-fixture!+ (fn [{:keys [response-path convo-1 convo-2 convo-3]}]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "%s&sort_by=message_count&sort_dir=desc" response-path))]+ (is (= [convo-2 convo-1 convo-3]+ (map :conversation_id (:data response)))))))))++(deftest list-conversations-invalid-sort-test+ (with-list-conversations-fixture!+ (fn [{:keys [response-path]}]+ (is (some? (:errors (mt/user-http-request :crowberto :get 400+ (format "%s&sort_by=drop_table" response-path))))))))++(deftest list-conversations-invalid-sort-dir-test+ (testing "sort-dir is constrained to the {asc, desc} enum"+ (with-list-conversations-fixture!+ (fn [{:keys [response-path]}]+ (is (some? (:errors (mt/user-http-request :crowberto :get 400+ (format "%s&sort_dir=sideways" response-path)))))))))++(deftest list-conversations-user-with-no-conversations-test+ (testing "filtering by a user-id that has no conversations returns an empty data set, not an error"+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User {empty-user-id :id} {:email "[email protected]"}]+ (is (=? {:total 0+ :data []}+ (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s"+ empty-user-id))))))))++(deftest list-conversations-requires-audit-app-feature-test+ (testing "GET /api/ee/metabot-analytics/conversations is gated by :audit-app and 402s without it"+ (mt/with-premium-features #{}+ (mt/user-http-request :crowberto :get 402 "ee/metabot-analytics/conversations"))))++(defn- with-filters-fixture!+ [thunk]+ (mt/with-premium-features #{:audit-app :tenants}+ (mt/with-temp [:model/Tenant {tenant-a :id} {}+ :model/Tenant {tenant-b :id} {}+ :model/User {user-a :id} {:email "[email protected]"+ :tenant_id tenant-a}+ :model/User {user-b :id} {:email "[email protected]"+ :tenant_id tenant-b}+ :model/PermissionsGroup {group-id :id} {:name "Metabot analytics filters"}+ :model/PermissionsGroupMembership _ {:user_id user-a :group_id group-id}]+ (let [convo-1 (str (random-uuid))+ convo-2 (str (random-uuid))+ convo-3 (str (random-uuid))]+ (try+ (insert-conversation! {:conversation-id convo-1 :user-id user-a+ :created-at (offset-date-time "2026-01-01T00:00:00Z")})+ (insert-conversation! {:conversation-id convo-2 :user-id user-a+ :created-at (offset-date-time "2026-01-02T00:00:00Z")})+ (insert-conversation! {:conversation-id convo-3 :user-id user-b+ :created-at (offset-date-time "2026-01-03T00:00:00Z")})+ (thunk {:base-path "ee/metabot-analytics/conversations"+ :group-id group-id+ :tenant-a-id tenant-a+ :user-a-id user-a+ :convo-1 convo-1+ :convo-2 convo-2+ :convo-3 convo-3})+ (finally+ (delete-conversations! [convo-1 convo-2 convo-3])))))))++(deftest list-conversations-filter-test+ (with-filters-fixture!+ (fn [{:keys [base-path group-id tenant-a-id user-a-id convo-1 convo-2 convo-3]}]+ (let [seeded #{convo-1 convo-2 convo-3}+ request-ids (fn [query-string]+ (->> (str base-path "?" query-string)+ (mt/user-http-request :crowberto :get 200)+ :data+ (into #{} (map :conversation_id))+ (set/intersection seeded)))]+ (testing "date narrows to the half-open [start, end) window"+ (is (= #{convo-1 convo-2} (request-ids "date=2026-01-01~2026-01-02"))))+ (testing "group-id narrows to conversations owned by group members"+ (is (= #{convo-1 convo-2} (request-ids (str "group_id=" group-id)))))+ (testing "group_id=1 (All Users) is treated as no-filter"+ (is (= #{convo-1 convo-2 convo-3} (request-ids "group_id=1"))))+ (testing "tenant-id narrows to conversations owned by users in that tenant"+ (is (= #{convo-1 convo-2} (request-ids (str "tenant_id=" tenant-a-id)))))+ (testing "filters compose: group-id + user-id + date narrow cumulatively"+ (is (= #{convo-1} (request-ids (format "group_id=%d&user_id=%d&date=2026-01-01~2026-01-01"+ group-id user-a-id)))))+ (testing "malformed date returns 400"+ (mt/user-http-request :crowberto :get 400 (str base-path "?date=not-a-real-range")))))))++(deftest get-conversation-detail-requires-audit-app-feature-test+ (testing "GET /api/ee/metabot-analytics/conversations/:id is gated by :audit-app and 402s without it"+ (mt/with-premium-features #{}+ (mt/user-http-request :crowberto :get 402+ (format "ee/metabot-analytics/conversations/%s" (random-uuid))))))++(deftest get-conversation-detail-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id"+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :crowberto)+ jan-1 (offset-date-time "2026-01-01T00:00:00Z")+ jan-2 (offset-date-time "2026-01-02T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id user-id+ :created-at jan-1+ :summary "Conversation detail"+ :state {:foo "bar"}})+ (insert-message! {:conversation-id conversation-id+ :created-at jan-1+ :role "user"+ :profile-id "ignored-user-profile"+ :total-tokens 4+ :data [{:role "user" :content "hello"}]})+ (insert-message! {:conversation-id conversation-id+ :created-at jan-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 8+ :data [{:type "text" :text "hi there"}]})++ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" conversation-id))]+ (is (= conversation-id (:conversation_id response)))+ (is (= "Conversation detail" (:summary response)))+ (is (= {:id user-id+ :email "[email protected]"+ :first_name "Crowberto"+ :last_name "Corv"}+ (select-keys (:user response) [:id :email :first_name :last_name])))+ (is (nil? (:slack_permalink response)))+ (is (= "internal" (:profile_id response))+ "profile_id comes from the first assistant message, ignoring user-message placeholders")+ (is (= 2 (count (:chat_messages response))))+ (is (= [] (:feedback response)))+ (let [{:keys [role type externalId]} (last (:chat_messages response))]+ (is (= ["agent" "text"] [role type]))+ (is (string? externalId))))+ (finally+ (delete-conversations! [conversation-id])))))))++(deftest get-conversation-detail-queries-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id returns generated queries"+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :crowberto)+ jan-1 (offset-date-time "2026-01-01T00:00:00Z")+ jan-2 (offset-date-time "2026-01-02T00:00:00Z")+ jan-3 (offset-date-time "2026-01-03T00:00:00Z")+ sql "SELECT * FROM orders"]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id user-id+ :created-at jan-1+ :summary "Conversation with queries"})+ ;; user prompt+ (insert-message! {:conversation-id conversation-id+ :created-at jan-1+ :role "user"+ :profile-id "ignored-user-model"+ :total-tokens 3+ :data [{:role "user" :content "show me orders"}]})+ ;; successful create_sql_query — should appear in :queries+ (insert-message! {:conversation-id conversation-id+ :created-at jan-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 20+ :data [{:type "text" :text "Sure, here it is."}+ {:type "tool-input"+ :id "call-success"+ :function "create_sql_query"+ :arguments {:database_id (mt/id) :sql_query sql}}+ {:type "tool-output"+ :id "call-success"+ :result {:output "<result>...</result>"+ :structured-output {:query-id "qid-success"+ :query-content sql+ :query {:database (mt/id)+ :type :native+ :native {:query sql}}+ :database (mt/id)}}}]})+ ;; failed create_sql_query (only :output, no :structured-output) — should NOT appear in :queries+ (insert-message! {:conversation-id conversation-id+ :created-at jan-3+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :data [{:type "tool-input"+ :id "call-failed"+ :function "create_sql_query"+ :arguments {:database_id (mt/id) :sql_query "SELEKT bad"}}+ {:type "tool-output"+ :id "call-failed"+ :result {:output "<result>SQL query construction failed.</result>"}}]})++ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" conversation-id))+ queries (:queries response)]+ (is (= 1 (count queries))+ "errored tool call should be filtered out")+ (let [q (first queries)]+ (is (= "create_sql_query" (:tool q)))+ (is (= "sql" (:query_type q)))+ (is (= "qid-success" (:query_id q)))+ (is (= sql (:sql q)))+ (is (nil? (:mbql q)))+ (is (= (mt/id) (:database_id q)))+ ;; Tables extraction goes through the real Macaw path — sample data has an "orders" table.+ (is (contains? (set (:tables q)) "orders"))))+ (finally+ (delete-conversations! [conversation-id])))))))++(defn- search-input-block+ [call-id]+ {:type "tool-input" :id call-id :function "search" :arguments {:q "foo"}})++(defn- search-output-block+ [call-id]+ {:type "tool-output" :id call-id :result {:output "<result>...</result>"}})++(defn- with-search-count-fixture!+ "Seed conversations with varying numbers of search tool-input blocks so we+ can assert both list and detail `:search_count` behavior without perturbing+ the existing list fixture."+ [thunk]+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User {test-user-id :id} {:email "[email protected]"+ :first_name "Search"+ :last_name "Counter"}]+ (let [convo-none (str (random-uuid))+ convo-two (str (random-uuid))+ convo-errored (str (random-uuid))+ jan-1 (offset-date-time "2026-02-01T00:00:00Z")+ jan-2 (offset-date-time "2026-02-02T00:00:00Z")+ jan-3 (offset-date-time "2026-02-03T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id convo-none+ :user-id test-user-id+ :created-at jan-1+ :summary "no searches"})+ (insert-conversation! {:conversation-id convo-two+ :user-id test-user-id+ :created-at jan-2+ :summary "two searches across two messages"})+ (insert-conversation! {:conversation-id convo-errored+ :user-id test-user-id+ :created-at jan-3+ :summary "one errored search still counts"})+ ;; convo-none: only text, no search calls.+ (insert-message! {:conversation-id convo-none+ :created-at jan-1+ :role "assistant"+ :profile-id "internal"+ :total-tokens 5+ :data [{:type "text" :text "no tools here"}]})+ ;; convo-two: one search in msg 1, one search in msg 2 (plus an unrelated tool).+ (insert-message! {:conversation-id convo-two+ :created-at jan-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :data [(search-input-block "call-a")+ (search-output-block "call-a")]})+ (insert-message! {:conversation-id convo-two+ :created-at jan-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :data [{:type "tool-input" :id "call-x" :function "analyze_chart" :arguments {}}+ (search-input-block "call-b")+ (search-output-block "call-b")]})+ ;; convo-errored: a single search whose tool-output is marked errored — should still count.+ (insert-message! {:conversation-id convo-errored+ :created-at jan-3+ :role "assistant"+ :profile-id "internal"+ :total-tokens 4+ :data [(search-input-block "call-err")+ {:type "tool-output" :id "call-err" :error "boom"}]})+ (thunk {:test-user-id test-user-id+ :convo-none convo-none+ :convo-two convo-two+ :convo-errored convo-errored})+ (finally+ (delete-conversations! [convo-none convo-two convo-errored])))))))++(deftest search-count-test+ (with-search-count-fixture!+ (fn [{:keys [test-user-id convo-none convo-two convo-errored]}]+ (testing "list endpoint surfaces per-conversation search counts (errored calls still count)"+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s" test-user-id))+ by-id (into {} (map (juxt :conversation_id identity)) (:data response))]+ (is (= {convo-none 0, convo-two 2, convo-errored 1}+ (update-vals by-id :search_count)))))+ (testing "pagination scopes the hydration batch to the page"+ ;; Default sort is created_at desc: [convo-errored convo-two convo-none].+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s&limit=1&offset=1"+ test-user-id))]+ (is (= [convo-two] (map :conversation_id (:data response))))+ (is (= 2 (:search_count (first (:data response)))))))+ (testing "detail endpoint surfaces the same counts"+ (doseq [[convo expected] [[convo-none 0] [convo-two 2] [convo-errored 1]]]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" convo))]+ (is (= expected (:search_count response))+ (format "expected search_count=%d for %s" expected convo))))))))++(defn- query-tool-input-block+ [call-id tool-name]+ {:type "tool-input" :id call-id :function tool-name :arguments {}})++(defn- query-tool-output-block+ [call-id]+ {:type "tool-output" :id call-id :result {:output "ok"}})++(defn- with-query-count-fixture!+ "Seed conversations that exercise `:query_count` (create_sql_query and+ construct_notebook_query). Edit/replace tools and unrelated tools are+ included to verify they are excluded from the count."+ [thunk]+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User {test-user-id :id} {:email "[email protected]"+ :first_name "Query"+ :last_name "Counter"}]+ (let [convo-none (str (random-uuid))+ convo-mixed (str (random-uuid))+ convo-edits (str (random-uuid))+ mar-1 (offset-date-time "2026-03-10T00:00:00Z")+ mar-2 (offset-date-time "2026-03-11T00:00:00Z")+ mar-3 (offset-date-time "2026-03-12T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id convo-none+ :user-id test-user-id+ :created-at mar-1+ :summary "no query tools"})+ (insert-conversation! {:conversation-id convo-mixed+ :user-id test-user-id+ :created-at mar-2+ :summary "one create + one notebook across messages"})+ (insert-conversation! {:conversation-id convo-edits+ :user-id test-user-id+ :created-at mar-3+ :summary "only edit/replace — should not count"})+ ;; convo-none: only a search, no new-query tools.+ (insert-message! {:conversation-id convo-none+ :created-at mar-1+ :role "assistant"+ :profile-id "internal"+ :total-tokens 5+ :data [(search-input-block "call-s")+ (search-output-block "call-s")]})+ ;; convo-mixed: one create_sql_query in msg 1, one construct_notebook_query+ ;; in msg 2 alongside an excluded edit_sql_query.+ (insert-message! {:conversation-id convo-mixed+ :created-at mar-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :data [(query-tool-input-block "call-a" "create_sql_query")+ (query-tool-output-block "call-a")]})+ (insert-message! {:conversation-id convo-mixed+ :created-at mar-2+ :role "assistant"+ :profile-id "internal"+ :total-tokens 10+ :data [(query-tool-input-block "call-b" "edit_sql_query")+ (query-tool-output-block "call-b")+ (query-tool-input-block "call-c" "construct_notebook_query")+ (query-tool-output-block "call-c")]})+ ;; convo-edits: only edit + replace — both excluded from :query_count.+ (insert-message! {:conversation-id convo-edits+ :created-at mar-3+ :role "assistant"+ :profile-id "internal"+ :total-tokens 4+ :data [(query-tool-input-block "call-e" "edit_sql_query")+ (query-tool-output-block "call-e")+ (query-tool-input-block "call-r" "replace_sql_query")+ (query-tool-output-block "call-r")]})+ (thunk {:test-user-id test-user-id+ :convo-none convo-none+ :convo-mixed convo-mixed+ :convo-edits convo-edits})+ (finally+ (delete-conversations! [convo-none convo-mixed convo-edits])))))))++(deftest query-count-test+ (with-query-count-fixture!+ (fn [{:keys [test-user-id convo-none convo-mixed convo-edits]}]+ (testing "list endpoint: counts create_sql_query + construct_notebook_query, excludes edit/replace"+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s" test-user-id))+ by-id (into {} (map (juxt :conversation_id identity)) (:data response))]+ (is (= {convo-none 0, convo-mixed 2, convo-edits 0}+ (update-vals by-id :query_count)))))+ (testing "detail endpoint surfaces the same counts"+ (doseq [[convo expected] [[convo-none 0] [convo-mixed 2] [convo-edits 0]]]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" convo))]+ (is (= expected (:query_count response))+ (format "expected query_count=%d for %s" expected convo))))))))++(deftest get-conversation-detail-slack-permalink-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id returns a Slack permalink when metadata is present"+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :crowberto)+ permalink "https://example.slack.com/archives/C123/p1712785577123456"]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id user-id+ :summary "Slack conversation"+ :slack-team-id "T123"+ :slack-channel-id "C123"+ :slack-thread-ts "1712785577.123456"})+ (with-redefs [slackbot.api/conversation-permalink (fn [channel ts]+ (is (= "C123" channel))+ (is (= "1712785577.123456" ts))+ permalink)]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" conversation-id))]+ (is (= permalink (:slack_permalink response)))))+ (finally+ (delete-conversations! [conversation-id])))))))++(defn- with-ip-address-fixture!+ "Seed conversations with varying IP-address state so we can assert both list+ and detail `:ip_address` behavior without perturbing the list fixture."+ [thunk]+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User {test-user-id :id} {:email "[email protected]"+ :first_name "IP"+ :last_name "Tester"}]+ (let [convo-web (str (random-uuid))+ convo-slack (str (random-uuid))+ convo-null (str (random-uuid))+ jan-1 (offset-date-time "2026-03-01T00:00:00Z")+ jan-2 (offset-date-time "2026-03-02T00:00:00Z")+ jan-3 (offset-date-time "2026-03-03T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id convo-web+ :user-id test-user-id+ :created-at jan-1+ :summary "web conversation"+ :ip-address "1.2.3.4"})+ (insert-conversation! {:conversation-id convo-slack+ :user-id test-user-id+ :created-at jan-2+ :summary "slack conversation"+ :slack-team-id "T123"+ :slack-channel-id "C123"+ :slack-thread-ts "1712785577.123456"})+ (insert-conversation! {:conversation-id convo-null+ :user-id test-user-id+ :created-at jan-3+ :summary "legacy conversation with no ip"})+ (thunk {:test-user-id test-user-id+ :convo-web convo-web+ :convo-slack convo-slack+ :convo-null convo-null})+ (finally+ (delete-conversations! [convo-web convo-slack convo-null])))))))++(deftest ^:parallel get-conversation-detail-requires-superuser-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id requires superuser"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403+ (format "ee/metabot-analytics/conversations/%s"+ (str (random-uuid)))))))))++(deftest ^:parallel get-conversation-detail-404-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id 404s for unknown conversations"+ (mt/user-http-request :crowberto :get 404+ (format "ee/metabot-analytics/conversations/%s"+ (str (random-uuid)))))))++(deftest get-conversation-detail-feedback-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id surfaces user-submitted feedback on the :feedback key, ordered by submission time"+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :crowberto)+ jan-1 (offset-date-time "2026-04-01T00:00:00Z")+ jan-2 (offset-date-time "2026-04-02T00:00:00Z")+ jan-3 (offset-date-time "2026-04-03T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id user-id+ :created-at jan-1+ :summary "feedback conversation"})+ (let [msg-1 (insert-message! {:conversation-id conversation-id :created-at jan-2+ :role "assistant" :profile-id "gpt-5" :total-tokens 5+ :data [{:type "text" :text "first answer"}]})+ msg-2 (insert-message! {:conversation-id conversation-id :created-at jan-3+ :role "assistant" :profile-id "gpt-5" :total-tokens 7+ :data [{:type "text" :text "second answer"}]})]+ (run! insert-feedback!+ [{:message-id msg-1 :user-id user-id :positive true :freeform "great" :created-at jan-2}+ {:message-id msg-2 :user-id user-id :positive false :issue-type "not-factual"+ :freeform "wrong" :created-at jan-3}])+ (let [feedback (:feedback (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s"+ conversation-id)))]+ (is (= 2 (count feedback)))+ (is (= [true false] (map :positive feedback)))+ (is (= [msg-1 msg-2] (map :message_id feedback)))+ (is (= "not-factual" (:issue_type (second feedback))))+ (is (every? (comp string? :external_id) feedback)+ "each feedback row carries the parent metabot_message.external_id so the admin UI can link to it")+ (is (every? (comp pos-int? :id) feedback)+ "each feedback row has a surrogate id after the multi-user migration")+ (is (= [user-id user-id] (map :user_id feedback))+ "each feedback row carries the submitter's user_id")+ (is (= [{:id user-id+ :email "[email protected]"+ :first_name "Crowberto"+ :last_name "Corv"}+ {:id user-id+ :email "[email protected]"+ :first_name "Crowberto"+ :last_name "Corv"}]+ (map #(select-keys (:user %) [:id :email :first_name :last_name]) feedback))+ "submitter is hydrated on each feedback row")))+ (finally+ (delete-conversations! [conversation-id])))))))++(deftest get-conversation-detail-feedback-multi-user-test+ (mt/with-premium-features #{:audit-app}+ (testing "GET /api/ee/metabot-analytics/conversations/:id returns one feedback row per submitter when multiple users rate the same assistant message"+ (mt/with-temp [:model/User {participant-id :id} {:email "[email protected]"+ :first_name "Feedback"+ :last_name "Participant"}]+ (let [conversation-id (str (random-uuid))+ owner-id (mt/user->id :crowberto)+ apr-1 (offset-date-time "2026-04-10T00:00:00Z")+ apr-2 (offset-date-time "2026-04-11T00:00:00Z")+ apr-3 (offset-date-time "2026-04-12T00:00:00Z")]+ (try+ (insert-conversation! {:conversation-id conversation-id+ :user-id owner-id+ :created-at apr-1+ :summary "shared thread feedback"})+ (let [assistant-msg (insert-message! {:conversation-id conversation-id :created-at apr-2+ :role "assistant" :profile-id "slackbot" :total-tokens 9+ :data [{:type "text" :text "shared answer"}]})]+ (run! insert-feedback!+ [{:message-id assistant-msg :user-id owner-id :positive true+ :freeform "looks good" :created-at apr-2}+ {:message-id assistant-msg :user-id participant-id :positive false+ :issue-type "not-factual" :freeform "disagree" :created-at apr-3}])+ (let [feedback (:feedback (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s"+ conversation-id)))+ by-user (into {} (map (juxt :user_id identity)) feedback)]+ (is (= 2 (count feedback)))+ (is (= #{owner-id participant-id} (set (map :user_id feedback)))+ "both submitters appear as distinct rows on the same message")+ (is (= #{assistant-msg} (set (map :message_id feedback)))+ "both rows point to the same assistant message")+ (is (apply distinct? (map :id feedback))+ "surrogate ids disambiguate the rows")+ (is (= {:id owner-id+ :email "[email protected]"+ :first_name "Crowberto"+ :last_name "Corv"}+ (select-keys (:user (get by-user owner-id)) [:id :email :first_name :last_name])))+ (is (= {:id participant-id+ :email "[email protected]"+ :first_name "Feedback"+ :last_name "Participant"}+ (select-keys (:user (get by-user participant-id)) [:id :email :first_name :last_name])))+ (is (true? (:positive (get by-user owner-id))))+ (is (false? (:positive (get by-user participant-id))))+ (is (= "not-factual" (:issue_type (get by-user participant-id))))))+ (finally+ (delete-conversations! [conversation-id]))))))))++(deftest ip-address-test+ (with-ip-address-fixture!+ (fn [{:keys [test-user-id convo-web convo-slack convo-null]}]+ (testing "list endpoint surfaces IP for web conversations, nil for Slack/legacy"+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s" test-user-id))+ by-id (into {} (map (juxt :conversation_id identity)) (:data response))]+ (is (= {convo-web "1.2.3.4", convo-slack nil, convo-null nil}+ (update-vals by-id :ip_address)))))+ (testing "pagination preserves ip_address for rows on page 2"+ ;; Default sort is created_at desc: [convo-null convo-slack convo-web].+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations?user_id=%s&limit=1&offset=1"+ test-user-id))]+ (is (= [convo-slack] (map :conversation_id (:data response))))+ (is (nil? (:ip_address (first (:data response)))))))+ (testing "detail endpoint surfaces the same values"+ (doseq [[convo expected] [[convo-web "1.2.3.4"] [convo-slack nil] [convo-null nil]]]+ (let [response (mt/user-http-request :crowberto :get 200+ (format "ee/metabot-analytics/conversations/%s" convo))]+ (is (= expected (:ip_address response))+ (format "expected ip_address=%s for %s" (pr-str expected) convo))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/queries_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/queries_test.cljnew file mode 100644index 00000000000..a2d70d2ef5e--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/queries_test.clj@@ -0,0 +1,341 @@+(ns metabase-enterprise.metabot-analytics.queries-test+ (:require+ [clojure.test :refer [are deftest is testing]]+ [metabase-enterprise.metabot-analytics.queries :as analytics.queries]))++(set! *warn-on-reflection* true)++;; Most cases stub `referenced-table-names` so unit tests don't depend on a+;; real database/driver. The Macaw integration is exercised end-to-end in+;; the API integration test.++(defn- with-stubbed-tables! [tables thunk]+ (with-redefs [analytics.queries/referenced-table-names (fn [_db _sql] tables)]+ (thunk)))++;;; ------------------------- happy paths -------------------------++(deftest create-sql-query-row-test+ (with-stubbed-tables! ["orders" "products"]+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 7+ :data [{:type "tool-input"+ :id "call-1"+ :function "create_sql_query"+ :arguments {:database_id 1+ :sql_query "SELECT * FROM orders JOIN products ON ..."}}+ {:type "tool-output"+ :id "call-1"+ :result {:output "<result>...</result>"+ :structured-output {:query-id "qid-1"+ :query-content "SELECT * FROM orders JOIN products ON ..."+ :query {:database 1+ :type :native+ :native {:query "SELECT * FROM orders JOIN products ON ..."}}+ :database 1}}}]}])]+ (is (= 1 (count rows)))+ (let [row (first rows)]+ (is (= "create_sql_query" (:tool row)))+ (is (= "sql" (:query_type row)))+ (is (= "qid-1" (:query_id row)))+ (is (= "call-1" (:call_id row)))+ (is (= 7 (:message_id row)))+ (is (= 1 (:database_id row)))+ (is (= ["orders" "products"] (:tables row)))+ (is (= "SELECT * FROM orders JOIN products ON ..." (:sql row)))+ (is (nil? (:mbql row))))))))++(deftest edit-sql-query-row-test+ (with-stubbed-tables! ["orders"]+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 8+ :data [{:type "tool-input"+ :id "call-2"+ :function "edit_sql_query"+ :arguments {:query_id "qid-1"+ :checklist "..."+ :edits [{:old_string "1" :new_string "2"}]}}+ {:type "tool-output"+ :id "call-2"+ :result {:structured-output {:query-id "qid-1"+ :query-content "SELECT 2 FROM orders"+ :query {:database 1+ :type :native+ :native {:query "SELECT 2 FROM orders"}}+ :database 1}}}]}])+ row (first rows)]+ (is (= "edit_sql_query" (:tool row)))+ (is (= "SELECT 2 FROM orders" (:sql row)))+ (is (= "sql" (:query_type row)))))))++(deftest replace-sql-query-row-test+ (with-stubbed-tables! []+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 9+ :data [{:type "tool-input"+ :id "call-3"+ :function "replace_sql_query"+ :arguments {:query_id "qid-1"+ :checklist "..."+ :new_query "SELECT 3"}}+ {:type "tool-output"+ :id "call-3"+ :result {:structured-output {:query-id "qid-1"+ :query-content "SELECT 3"+ :query {:database 1+ :type :native+ :native {:query "SELECT 3"}}+ :database 1}}}]}])+ row (first rows)]+ (is (= "replace_sql_query" (:tool row)))+ (is (= "SELECT 3" (:sql row)))))))++(deftest construct-notebook-query-legacy-test+ (with-stubbed-tables! []+ (fn []+ (let [legacy-query {:database 7 :type :query :query {:source-table 5}}+ rows (analytics.queries/messages->generated-queries+ ;; Notebook tool persists structured-output WITHOUT a top-level+ ;; :database key — the db id lives inside :query.+ [{:id 10+ :data [{:type "tool-input"+ :id "call-4"+ :function "construct_notebook_query"+ :arguments {:reasoning "show me orders"+ :query {:query_type "raw"+ :source {:table_id 5}}}}+ {:type "tool-output"+ :id "call-4"+ :result {:structured-output {:query-id "qid-2"+ :query legacy-query}}}]}])+ row (first rows)]+ (is (= "construct_notebook_query" (:tool row)))+ (is (= "notebook" (:query_type row)))+ (is (nil? (:sql row)))+ (is (= legacy-query (:mbql row)))+ (is (= 7 (:database_id row))+ "database_id should fall back to :query.database for notebook tools")+ (is (= [] (:tables row)))))))++(deftest construct-notebook-query-pmbql-test+ (testing "pMBQL is passed through to the frontend as-is, without conversion to legacy MBQL"+ (with-stubbed-tables! []+ (fn []+ (let [pmbql {:lib/type "mbql/query"+ :lib/metadata nil+ :database 1+ :stages [{:lib/type "mbql.stage/mbql"+ :source-table 5}]}+ rows (analytics.queries/messages->generated-queries+ [{:id 11+ :data [{:type "tool-input"+ :id "call-5"+ :function "construct_notebook_query"+ :arguments {:reasoning "test"+ :query {:query_type "raw" :source {:table_id 5}}}}+ {:type "tool-output"+ :id "call-5"+ :result {:structured-output {:query-id "qid-3"+ :query pmbql}}}]}])+ row (first rows)]+ (is (= "notebook" (:query_type row)))+ (is (= pmbql (:mbql row)))+ (is (= 1 (:database_id row))))))))++;;; ------------------------- filtered-out cases -------------------------++(deftest tool-input-without-output-is-filtered-test+ (with-stubbed-tables! []+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 12+ :data [{:type "tool-input"+ :id "orphan"+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELECT 1"}}]}])]+ (is (= [] rows))))))++(deftest tool-output-with-error-is-filtered-test+ (with-stubbed-tables! []+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 13+ :data [{:type "tool-input"+ :id "call-err"+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELECT 1"}}+ {:type "tool-output"+ :id "call-err"+ :error "exploded"}]}])]+ (is (= [] rows))))))++(deftest tool-output-without-structured-is-filtered-test+ (testing "tools that hit a validation error return :output but no :structured-output"+ (with-stubbed-tables! []+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 14+ :data [{:type "tool-input"+ :id "call-bad"+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELEKT bad"}}+ {:type "tool-output"+ :id "call-bad"+ :result {:output "<result>SQL query construction failed.</result>"}}]}])]+ (is (= [] rows)))))))++(deftest non-query-tool-calls-are-skipped-test+ (with-stubbed-tables! ["orders"]+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 15+ :data [{:type "tool-input"+ :id "call-search"+ :function "search"+ :arguments {:q "foo"}}+ {:type "tool-output"+ :id "call-search"+ :result {:rows [1 2 3]}}+ {:type "tool-input"+ :id "call-sql"+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELECT 1 FROM orders"}}+ {:type "tool-output"+ :id "call-sql"+ :result {:structured-output {:query-id "qid-x"+ :query-content "SELECT 1 FROM orders"+ :query {:database 1 :type :native :native {:query "SELECT 1 FROM orders"}}+ :database 1}}}]}])]+ (is (= 1 (count rows)))+ (is (= "create_sql_query" (-> rows first :tool)))))))++(deftest slackbot-shape-blocks-are-filtered-test+ (testing "legacy slackbot rows wrote :_type 'TOOL_CALL' blocks with no recoverable structured-output;+ the :type filter excludes them and the extractor yields nothing for those historical rows"+ (with-stubbed-tables! []+ (fn []+ (let [rows (analytics.queries/messages->generated-queries+ [{:id 16+ :data [{:role "assistant"+ :_type "TOOL_CALL"+ :tool_calls [{:id "slack-call-1"+ :name "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELECT 1"}}]}+ {:role "tool"+ :_type "TOOL_RESULT"+ :tool_call_id "slack-call-1"+ :content "<result>...</result>"}]}])]+ (is (= [] rows)))))))++(deftest slackbot-native-shape-blocks-are-extracted-test+ (testing "going-forward slackbot rows are persisted via store-native-parts!, so they carry+ the same :type 'tool-input'/'tool-output' block shape as in-app rows and the+ analytics extractor handles them identically"+ (with-stubbed-tables! ["orders"]+ (fn []+ (let [data [{:type "tool-input"+ :id "call-search"+ :function "search"+ :arguments {:query "orders"}}+ {:type "tool-output"+ :id "call-search"+ :result {:output "<result>orders</result>"}}+ {:type "tool-input"+ :id "call-sql"+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query "SELECT 1 FROM orders"}}+ {:type "tool-output"+ :id "call-sql"+ :result {:output "<result>sql</result>"+ :structured-output {:query-id "qid-slack"+ :query-content "SELECT 1 FROM orders"+ :query {:database 1+ :type :native+ :native {:query "SELECT 1 FROM orders"}}+ :database 1}}}]+ message {:id 200 :data data}]+ (testing "count-tool-invocations reaches tool names directly by :function"+ (is (= 1 (analytics.queries/count-tool-invocations [message] "search")))+ (is (= 1 (analytics.queries/count-tool-invocations+ [message] analytics.queries/new-query-tool-names))))+ (testing "messages->generated-queries surfaces the SQL tool call"+ (let [rows (analytics.queries/messages->generated-queries [message])]+ (is (= 1 (count rows)))+ (is (= "create_sql_query" (-> rows first :tool)))+ (is (= "qid-slack" (-> rows first :query_id)))+ (is (= "SELECT 1 FROM orders" (-> rows first :sql))))))))))++;;; ------------------------- aggregation -------------------------++(deftest flattens-across-messages-preserving-order-test+ (with-stubbed-tables! ["t"]+ (fn []+ (let [base-output (fn [qid sql]+ {:type "tool-output"+ :id (str "call-" qid)+ :result {:structured-output {:query-id qid+ :query-content sql+ :query {:database 1+ :type :native+ :native {:query sql}}+ :database 1}}})+ base-input (fn [qid sql]+ {:type "tool-input"+ :id (str "call-" qid)+ :function "create_sql_query"+ :arguments {:database_id 1 :sql_query sql}})+ rows (analytics.queries/messages->generated-queries+ [{:id 100+ :data [(base-input "a" "SELECT 1")+ (base-output "a" "SELECT 1")]}+ {:id 101+ :data [(base-input "b" "SELECT 2")+ (base-output "b" "SELECT 2")+ (base-input "c" "SELECT 3")+ (base-output "c" "SELECT 3")]}])]+ (is (= ["a" "b" "c"] (map :query_id rows)))+ (is (= [100 101 101] (map :message_id rows)))))))++(deftest empty-and-nil-data-test+ (is (= [] (analytics.queries/messages->generated-queries [])))+ (is (= [] (analytics.queries/messages->generated-queries [{:id 1 :data nil}])))+ (is (= [] (analytics.queries/messages->generated-queries [{:id 1 :data []}]))))++;;; ------------------------- count-tool-invocations -------------------------++(deftest count-tool-invocations-test+ (testing "sums matching tool-input blocks across messages, including errored calls"+ ;; Mix within-message and across-messages, plus an errored and an unrelated tool.+ (is (= 4 (analytics.queries/count-tool-invocations+ [{:id 1 :data [{:type "tool-input" :function "search" :id "a"}+ {:type "tool-output" :id "a" :error "boom"} ; errored still counts+ {:type "tool-input" :function "search" :id "b"}]}+ {:id 2 :data [{:type "tool-input" :function "create_sql_query" :id "c"} ; ignored tool+ {:type "tool-input" :function "search" :id "d"}+ {:type "tool-input" :function "search" :id "e"}]}]+ "search"))))+ (testing "returns 0 for inputs that contain no matching tool-input blocks"+ (are [messages] (zero? (analytics.queries/count-tool-invocations messages "search"))+ []+ [{:id 1 :data nil}]+ [{:id 1 :data []}]+ [{:id 1 :data [{:type "text" :text "hi"}]}]+ [{:id 1 :data [{:type "tool-input" :function "create_sql_query" :id "x"}]}]+ ;; Slackbot-shaped blocks lack `:type` and are intentionally skipped.+ [{:id 1 :data [{:role "assistant"+ :_type "TOOL_CALL"+ :tool_calls [{:id "slack-1" :name "search"}]}]}]))+ (testing "accepts a set of tool names; a block counts if its :function is in the set"+ ;; new-query-tool-names matches create_sql_query and construct_notebook_query,+ ;; but not edit_sql_query / replace_sql_query.+ (is (= 3 (analytics.queries/count-tool-invocations+ [{:id 1 :data [{:type "tool-input" :function "create_sql_query" :id "a"}+ {:type "tool-input" :function "edit_sql_query" :id "b"} ; excluded+ {:type "tool-input" :function "construct_notebook_query" :id "c"}]}+ {:id 2 :data [{:type "tool-input" :function "replace_sql_query" :id "d"} ; excluded+ {:type "tool-input" :function "create_sql_query" :id "e"}+ {:type "tool-input" :function "search" :id "f"}]}] ; excluded+ analytics.queries/new-query-tool-names)))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_ai_usage_log_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_ai_usage_log_test.cljnew file mode 100644index 00000000000..81d93160e9c--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_ai_usage_log_test.clj@@ -0,0 +1,172 @@+(ns metabase-enterprise.metabot-analytics.v-ai-usage-log-test+ "Tests for the `v_ai_usage_log` SQL view."+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(def ^:private default-model "anthropic/claude-sonnet-4-6")++(defn- query-view+ "Query v_ai_usage_log for rows by usage_log_id."+ [usage-log-ids]+ (t2/query {:select [:*]+ :from [:v_ai_usage_log]+ :where [:in :usage_log_id usage-log-ids]}))++(defn- find-row [rows usage-log-id]+ (some #(when (= (:usage_log_id %) usage-log-id) %) rows))++(deftest one-row-per-usage-log-test+ (testing "view emits exactly one row per ai_usage_log row, columns passed through"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/AiUsageLog {log-id-1 :id} {:source "agent"+ :model default-model+ :profile_id "nlq"+ :conversation_id convo-id+ :user_id user-id+ :prompt_tokens 100+ :completion_tokens 40+ :total_tokens 140+ :request_id "req-1"}+ :model/AiUsageLog {log-id-2 :id} {:source "slackbot"+ :model default-model+ :profile_id "slackbot"+ :conversation_id convo-id+ :user_id user-id+ :prompt_tokens 50+ :completion_tokens 25+ :total_tokens 75+ :request_id "req-2"}]+ (let [rows (query-view [log-id-1 log-id-2])+ r1 (find-row rows log-id-1)+ r2 (find-row rows log-id-2)]+ (is (= 2 (count rows)))+ (is (=? {:source "agent"+ :model default-model+ :profile_id "nlq"+ :conversation_id convo-id+ :user_id user-id+ :prompt_tokens 100+ :completion_tokens 40+ :total_tokens 140+ :request_id "req-1"}+ r1))+ (is (=? {:source "slackbot"+ :request_id "req-2"+ :total_tokens 75}+ r2)))))))++(deftest user-display-name-test+ (testing "user_display_name shows 'first last' when populated, falls back to email when null"+ (mt/with-temp [:model/User {named-id :id} {:first_name "Alice" :last_name "Smith"+ :email "[email protected]"}+ :model/User {unnamed-id :id} {:first_name nil :last_name nil+ :email "[email protected]"}+ :model/AiUsageLog {named-log :id} {:source "agent"+ :model default-model+ :user_id named-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}+ :model/AiUsageLog {unnamed-log :id} {:source "agent"+ :model default-model+ :user_id unnamed-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (let [rows (query-view [named-log unnamed-log])]+ (is (= "Alice Smith" (:user_display_name (find-row rows named-log))))+ (is (= "[email protected]" (:user_display_name (find-row rows unnamed-log))))))))++(deftest user-display-name-null-when-user-missing-test+ (testing "user_display_name is null when there is no user_id (LEFT JOIN miss)"+ (mt/with-temp [:model/AiUsageLog {log-id :id} {:source "example-question-generation"+ :model default-model+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (is (nil? (:user_display_name (find-row (query-view [log-id]) log-id)))))))++(deftest group-name-skips-all-users-and-picks-alphabetical-first-test+ (testing "group_name returns the alphabetically first non-'All Users' group; null if none"+ (mt/with-temp [:model/User {user-id :id} {}+ :model/PermissionsGroup {z-id :id} {:name "Zebra Team"}+ :model/PermissionsGroup {a-id :id} {:name "Analytics Team"}+ :model/PermissionsGroupMembership _ {:group_id z-id :user_id user-id}+ :model/PermissionsGroupMembership _ {:group_id a-id :user_id user-id}+ :model/AiUsageLog {log-id :id} {:source "agent"+ :model default-model+ :user_id user-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (is (= "Analytics Team"+ (:group_name (find-row (query-view [log-id]) log-id))))))+ (testing "group_name is null when the user only belongs to All Users (group id = 1)"+ (mt/with-temp [:model/User {user-id :id} {}+ :model/AiUsageLog {log-id :id} {:source "agent"+ :model default-model+ :user_id user-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (is (nil? (:group_name (find-row (query-view [log-id]) log-id)))))))++(deftest ip-address-from-conversation-test+ (testing "ip_address is surfaced from the joined metabot_conversation row"+ (let [convo-with-ip (str (random-uuid))+ convo-no-ip (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-with-ip :user_id user-id :ip_address "10.0.0.42"}+ :model/MetabotConversation _ {:id convo-no-ip :user_id user-id}+ :model/AiUsageLog {with-ip-log :id} {:source "agent"+ :model default-model+ :conversation_id convo-with-ip+ :user_id user-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}+ :model/AiUsageLog {no-ip-log :id} {:source "agent"+ :model default-model+ :conversation_id convo-no-ip+ :user_id user-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (let [rows (query-view [with-ip-log no-ip-log])]+ (is (= "10.0.0.42" (:ip_address (find-row rows with-ip-log))))+ (is (nil? (:ip_address (find-row rows no-ip-log)))))))))++(deftest ip-address-null-when-no-conversation-test+ (testing "ip_address is null when the usage log row is not tied to a conversation (LEFT JOIN miss)"+ (mt/with-temp [:model/AiUsageLog {log-id :id} {:source "example-question-generation"+ :model default-model+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (let [row (find-row (query-view [log-id]) log-id)]+ (is (nil? (:conversation_id row)))+ (is (nil? (:ip_address row)))))))++(deftest tenant-id-passthrough-test+ (testing "tenant_id passes through from ai_usage_log; null when not set"+ (mt/with-temp [:model/Tenant {tenant-id :id} {:name "Acme Corp" :slug "acme-corp"}+ :model/AiUsageLog {tenant-log :id} {:source "agent"+ :model default-model+ :tenant_id tenant-id+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}+ :model/AiUsageLog {no-tenant-log :id} {:source "agent"+ :model default-model+ :prompt_tokens 1+ :completion_tokens 1+ :total_tokens 2}]+ (let [rows (query-view [tenant-log no-tenant-log])]+ (is (= tenant-id (:tenant_id (find-row rows tenant-log))))+ (is (nil? (:tenant_id (find-row rows no-tenant-log))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.cljnew file mode 100644index 00000000000..ad139776660--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_conversations_test.clj@@ -0,0 +1,391 @@+(ns metabase-enterprise.metabot-analytics.v-metabot-conversations-test+ "Tests for the `v_metabot_conversations` SQL view."+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(def ^:private default-model "anthropic/claude-sonnet-4-6")++(defn- query-view+ "Query v_metabot_conversations, returning only rows for the given conversation IDs."+ [conversation-ids]+ (map (fn [row]+ (-> row+ (update :total_tokens long)+ (update :prompt_tokens long)+ (update :completion_tokens long)))+ (t2/query {:select [:*]+ :from [:v_metabot_conversations]+ :where [:in :conversation_id conversation-ids]})))++(defn- find-row [rows conversation-id]+ (some #(when (= (:conversation_id %) conversation-id) %) rows))++(deftest message-counts-and-tokens-test+ (testing "view correctly counts messages by role and sums tokens from ai_usage_log"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id :summary "token counting"}+ :model/MetabotMessage _ {:conversation_id convo-id :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 100+ :completion_tokens 50+ :total_tokens 150}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 80+ :completion_tokens 30+ :total_tokens 110}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 120+ :completion_tokens 50+ :total_tokens 170}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 200+ :completion_tokens 80+ :total_tokens 280}]+ (is (=? {:message_count 3+ :user_message_count 1+ :assistant_message_count 2+ :prompt_tokens 500+ :completion_tokens 210+ :total_tokens 710}+ (first (query-view [convo-id]))))))))++(deftest multi-conversation-aggregation-test+ (testing "tokens aggregate correctly across conversations with varying message and usage-log counts"+ ;; convo-1: 1 user + 2 assistant messages, 4 usage-log entries (multi-turn, multiple LLM calls per message)+ ;; convo-2: 2 user + 1 assistant messages, 3 usage-log entries+ ;; convo-3: 3 user + 3 assistant messages, 5 usage-log entries+ (let [convo-1 (str (random-uuid))+ convo-2 (str (random-uuid))+ convo-3 (str (random-uuid))]+ (mt/with-temp [:model/User {user-a :id} {}+ :model/User {user-b :id} {}+ :model/MetabotConversation _ {:id convo-1 :user_id user-a :summary "multi-turn chat"}+ :model/MetabotConversation _ {:id convo-2 :user_id user-b :summary "quick question"}+ :model/MetabotConversation _ {:id convo-3 :user_id user-a :summary "long conversation"}+ ;; convo-1: 3 messages+ :model/MetabotMessage _ {:conversation_id convo-1 :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-1 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-1 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ ;; convo-1: 4 usage-log entries (e.g. tool calls generating extra LLM round-trips)+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 100+ :completion_tokens 40+ :total_tokens 140}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 120+ :completion_tokens 60+ :total_tokens 180}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 150+ :completion_tokens 50+ :total_tokens 200}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 200+ :completion_tokens 80+ :total_tokens 280}+ ;; convo-2: 3 messages, 3 usage-log entries+ :model/MetabotMessage _ {:conversation_id convo-2 :role "user" :profile_id "internal" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "user" :profile_id "internal" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "assistant" :profile_id "internal" :total_tokens 0 :data []}+ :model/AiUsageLog _ {:source "slackbot"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 50+ :completion_tokens 30+ :total_tokens 80}+ :model/AiUsageLog _ {:source "slackbot"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 40+ :completion_tokens 20+ :total_tokens 60}+ :model/AiUsageLog _ {:source "slackbot"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 60+ :completion_tokens 25+ :total_tokens 85}+ ;; convo-3: 6 messages, 5 usage-log entries+ :model/MetabotMessage _ {:conversation_id convo-3 :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-3 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-3 :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-3 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-3 :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-3 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-3+ :prompt_tokens 300+ :completion_tokens 100+ :total_tokens 400}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-3+ :prompt_tokens 350+ :completion_tokens 120+ :total_tokens 470}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-3+ :prompt_tokens 400+ :completion_tokens 150+ :total_tokens 550}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-3+ :prompt_tokens 450+ :completion_tokens 130+ :total_tokens 580}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-3+ :prompt_tokens 500+ :completion_tokens 200+ :total_tokens 700}]+ (let [rows (query-view [convo-1 convo-2 convo-3])+ r1 (find-row rows convo-1)+ r2 (find-row rows convo-2)+ r3 (find-row rows convo-3)]+ (is (=? {:message_count 3+ :user_message_count 1+ :assistant_message_count 2+ :prompt_tokens 570+ :completion_tokens 230+ :total_tokens 800+ :profile_id "nlq"}+ r1))+ (is (=? {:message_count 3+ :user_message_count 2+ :assistant_message_count 1+ :prompt_tokens 150+ :completion_tokens 75+ :total_tokens 225+ :profile_id "internal"}+ r2))+ (is (=? {:message_count 6+ :user_message_count 3+ :assistant_message_count 3+ :prompt_tokens 2000+ :completion_tokens 700+ :total_tokens 2700+ :profile_id "nlq"}+ r3)))))))++(deftest deleted-messages-excluded-test+ (testing "soft-deleted messages are excluded from counts"+ (let [convo-id (str (random-uuid))+ now (java.time.OffsetDateTime/now)+ earlier (.minusHours now 1)]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/MetabotMessage _ {:conversation_id convo-id :role "user" :profile_id "nlq" :total_tokens 0 :data [] :created_at earlier}+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at now}+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :deleted_at now}]+ (is (=? {:message_count 2+ :user_message_count 1+ :assistant_message_count 1}+ (first (query-view [convo-id]))))))))++(deftest user-display-name-test+ (testing "user_display_name shows 'first last' when available, falls back to email"+ (let [convo-named (str (random-uuid))+ convo-unnamed (str (random-uuid))]+ (mt/with-temp [:model/User {named-id :id} {:first_name "Alice" :last_name "Smith" :email "[email protected]"}+ :model/User {unnamed-id :id} {:first_name nil :last_name nil :email "[email protected]"}+ :model/MetabotConversation _ {:id convo-named :user_id named-id}+ :model/MetabotConversation _ {:id convo-unnamed :user_id unnamed-id}]+ (let [rows (query-view [convo-named convo-unnamed])+ named (find-row rows convo-named)+ unnamed (find-row rows convo-unnamed)]+ (is (=? {:user_display_name "Alice Smith"} named))+ ;; when first_name/last_name are nil, COALESCE falls back to email+ (is (=? {:user_display_name "[email protected]"} unnamed)))))))++(deftest source-from-usage-log-test+ (testing "source is returned from ai_usage_log"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/AiUsageLog _ {:source "slackbot"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 10+ :completion_tokens 5+ :total_tokens 15}]+ (is (=? {:source "slackbot"} (first (query-view [convo-id]))))))))++(deftest model-from-usage-log-test+ (testing "model is returned from ai_usage_log"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/AiUsageLog _ {:source "agent"+ :model "anthropic/claude-haiku-4-5-20251001"+ :conversation_id convo-id+ :prompt_tokens 10+ :completion_tokens 5+ :total_tokens 15}]+ (is (=? {:model "anthropic/claude-haiku-4-5-20251001"} (first (query-view [convo-id]))))))))++(deftest ip-address-test+ (testing "ip_address is surfaced from the conversation row"+ (let [convo-with-ip (str (random-uuid))+ convo-no-ip (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-with-ip :user_id user-id :ip_address "10.0.0.1"}+ :model/MetabotConversation _ {:id convo-no-ip :user_id user-id}]+ (let [rows (query-view [convo-with-ip convo-no-ip])+ w-ip (find-row rows convo-with-ip)+ no-ip (find-row rows convo-no-ip)]+ (is (=? {:ip_address "10.0.0.1"} w-ip))+ (is (nil? (:ip_address no-ip))))))))++(deftest tenant-id-and-name-test+ (testing "tenant_id and tenant_name come from ai_usage_log joined with tenant table"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/Tenant {tenant-id :id} {:name "Acme Corp" :slug "acme-corp"}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-id+ :prompt_tokens 10+ :completion_tokens 5+ :total_tokens 15+ :tenant_id tenant-id}]+ (is (=? {:tenant_id tenant-id+ :tenant_name "Acme Corp"}+ (first (query-view [convo-id]))))))))++(deftest no-tenant-returns-nil-test+ (testing "tenant_id and tenant_name are nil when no ai_usage_log rows exist"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}]+ (let [row (first (query-view [convo-id]))]+ (is (nil? (:tenant_id row)))+ (is (nil? (:tenant_name row))))))))++(deftest group-name-test+ (testing "group_name comes from user's first non-'All Users' permissions group (alphabetical)"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/PermissionsGroup {group-id :id} {:name "Analytics Team"}+ :model/PermissionsGroupMembership _ {:group_id group-id :user_id user-id}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}]+ (is (=? {:group_name "Analytics Team"} (first (query-view [convo-id]))))))))++(deftest conversation-with-no-messages-test+ (testing "conversation with no messages returns zero counts and nil profile_id"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id :summary "empty conversation"}]+ (is (=? {:summary "empty conversation"+ :message_count 0+ :user_message_count 0+ :assistant_message_count 0+ :total_tokens 0+ :prompt_tokens 0+ :completion_tokens 0}+ (first (query-view [convo-id]))))+ (let [row (first (query-view [convo-id]))]+ (is (nil? (:profile_id row)))+ (is (nil? (:last_message_at row))))))))++(deftest last-message-at-test+ (testing "last_message_at reflects the most recent non-deleted message"+ (let [convo-id (str (random-uuid))+ t1 (java.time.OffsetDateTime/parse "2026-01-01T12:00:00Z")+ t2-ts (java.time.OffsetDateTime/parse "2026-01-02T12:00:00Z")+ t3 (java.time.OffsetDateTime/parse "2026-01-03T12:00:00Z")]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/MetabotMessage _ {:conversation_id convo-id :role "user" :profile_id "nlq" :total_tokens 0 :data [] :created_at t1}+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at t2-ts}+ ;; newest message is deleted — should not count+ :model/MetabotMessage _ {:conversation_id convo-id :role "assistant" :profile_id "nlq" :total_tokens 0 :data [] :created_at t3 :deleted_at t3}]+ (let [row (first (query-view [convo-id]))]+ ;; Compare instants to avoid DB-specific timestamp type differences+ (is (= (.toInstant t2-ts) (.toInstant (:last_message_at row)))))))))++(deftest multiple-conversations-independent-test+ (testing "multiple conversations aggregate independently"+ (let [convo-1 (str (random-uuid))+ convo-2 (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-1 :user_id user-id :summary "conversation one"}+ :model/MetabotConversation _ {:id convo-2 :user_id user-id :summary "conversation two"}+ :model/MetabotMessage _ {:conversation_id convo-1 :role "user" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-1 :role "assistant" :profile_id "nlq" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "user" :profile_id "internal" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "user" :profile_id "internal" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "assistant" :profile_id "internal" :total_tokens 0 :data []}+ :model/MetabotMessage _ {:conversation_id convo-2 :role "assistant" :profile_id "internal" :total_tokens 0 :data []}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 10+ :completion_tokens 5+ :total_tokens 15}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-1+ :prompt_tokens 20+ :completion_tokens 10+ :total_tokens 30}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 50+ :completion_tokens 25+ :total_tokens 75}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 30+ :completion_tokens 15+ :total_tokens 45}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 40+ :completion_tokens 20+ :total_tokens 60}+ :model/AiUsageLog _ {:source "agent"+ :model default-model+ :conversation_id convo-2+ :prompt_tokens 20+ :completion_tokens 10+ :total_tokens 30}]+ (let [rows (query-view [convo-1 convo-2])]+ (is (=? {:message_count 2+ :total_tokens 45+ :profile_id "nlq"}+ (find-row rows convo-1)))+ (is (=? {:message_count 4+ :total_tokens 210+ :profile_id "internal"}+ (find-row rows convo-2))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.cljnew file mode 100644index 00000000000..4a6a41aab33--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot_analytics/v_metabot_messages_test.clj@@ -0,0 +1,132 @@+(ns metabase-enterprise.metabot-analytics.v-metabot-messages-test+ "Tests for the `v_metabot_messages` SQL view."+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(defn- query-view+ "Query v_metabot_messages, returning only rows for the given conversation IDs."+ [conversation-ids]+ (t2/query {:select [:*]+ :from [:v_metabot_messages]+ :where [:in :conversation_id conversation-ids]+ :order-by [[:created_at :asc] [:message_id :asc]]}))++(defn- find-row [rows message-id]+ (some #(when (= (:message_id %) message-id) %) rows))++(deftest columns-and-passthrough-test+ (testing "view exposes the expected columns and passes through profile_id, role, total_tokens, slack metadata"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/MetabotMessage {msg-id :id} {:conversation_id convo-id+ :role "assistant"+ :profile_id "nlq"+ :total_tokens 42+ :slack_msg_id "1700000000.000099"+ :channel_id "C-VIEW"+ :data []}]+ (let [row (find-row (query-view [convo-id]) msg-id)]+ (is (=? {:message_id msg-id+ :conversation_id convo-id+ :role "assistant"+ :profile_id "nlq"+ :total_tokens 42+ :user_id user-id+ :slack_msg_id "1700000000.000099"+ :channel_id "C-VIEW"}+ row))+ (is (some? (:created_at row))))))))++(deftest deleted-messages-excluded-test+ (testing "soft-deleted messages (deleted_at IS NOT NULL) are filtered out of the view"+ (let [convo-id (str (random-uuid))+ now (java.time.OffsetDateTime/now)]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/MetabotMessage {kept-id :id} {:conversation_id convo-id+ :role "user"+ :profile_id "nlq"+ :total_tokens 0+ :data []}+ :model/MetabotMessage {deleted-id :id} {:conversation_id convo-id+ :role "assistant"+ :profile_id "nlq"+ :total_tokens 0+ :data []+ :deleted_at now}]+ (let [rows (query-view [convo-id])]+ (is (= 1 (count rows)))+ (is (some? (find-row rows kept-id)))+ (is (nil? (find-row rows deleted-id))))))))++(deftest user-id-coalesces-to-conversation-owner-test+ (testing "user_id falls back to metabot_conversation.user_id when metabot_message.user_id is null"+ (let [convo-id (str (random-uuid))]+ (mt/with-temp [:model/User {originator-id :id} {}+ :model/User {participant-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id originator-id}+ ;; legacy row — message has no :user_id stamped+ :model/MetabotMessage {legacy-id :id} {:conversation_id convo-id+ :role "user"+ :profile_id "nlq"+ :total_tokens 0+ :data []}+ ;; new-style row — message author is stamped+ :model/MetabotMessage {stamped-id :id} {:conversation_id convo-id+ :role "user"+ :user_id participant-id+ :profile_id "nlq"+ :total_tokens 0+ :data []}]+ (let [rows (query-view [convo-id])]+ (testing "legacy row: user_id falls back to conversation originator"+ (is (= originator-id (:user_id (find-row rows legacy-id)))))+ (testing "stamped row: user_id is the message author, not the originator"+ (is (= participant-id (:user_id (find-row rows stamped-id))))))))))++(deftest excludes-rows-from-other-conversations-test+ (testing "the JOIN to metabot_conversation does not duplicate rows or leak across conversations"+ (let [convo-1 (str (random-uuid))+ convo-2 (str (random-uuid))]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-1 :user_id user-id}+ :model/MetabotConversation _ {:id convo-2 :user_id user-id}+ :model/MetabotMessage {m1 :id} {:conversation_id convo-1+ :role "user"+ :profile_id "nlq"+ :total_tokens 0+ :data []}+ :model/MetabotMessage {m2 :id} {:conversation_id convo-1+ :role "assistant"+ :profile_id "nlq"+ :total_tokens 0+ :data []}+ :model/MetabotMessage {m3 :id} {:conversation_id convo-2+ :role "user"+ :profile_id "internal"+ :total_tokens 0+ :data []}]+ (let [rows-1 (query-view [convo-1])+ rows-2 (query-view [convo-2])]+ (is (= #{m1 m2} (into #{} (map :message_id) rows-1)))+ (is (= #{m3} (into #{} (map :message_id) rows-2))))))))++(deftest passes-through-conversation-not-message-created-at-test+ (testing "created_at is the message's own timestamp, not the conversation's"+ (let [convo-id (str (random-uuid))+ msg-time (java.time.OffsetDateTime/parse "2026-02-15T10:30:00Z")]+ (mt/with-temp [:model/User {user-id :id} {}+ :model/MetabotConversation _ {:id convo-id :user_id user-id}+ :model/MetabotMessage {msg-id :id} {:conversation_id convo-id+ :role "user"+ :profile_id "nlq"+ :total_tokens 0+ :data []+ :created_at msg-time}]+ (let [row (find-row (query-view [convo-id]) msg-id)]+ (is (= (.toInstant msg-time) (.toInstant ^java.time.OffsetDateTime (:created_at row)))))))))diff --git a/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.cljindex f94c8eb75b4..1197f4ba2b2 100644--- a/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj+++ b/enterprise/backend/test/metabase_enterprise/serialization/models/entity_id_test.clj@@ -49,6 +49,7 @@:model/CollectionBookmark:model/ContentTranslation:model/DashboardBookmark+ :model/DataComplexityScore:model/DataPermissions:model/DatabaseRouter:model/Dependency@@ -59,6 +60,7 @@:model/LoginHistory:model/FieldValues:model/MetabotConversation+ :model/MetabotFeedback:model/MetabotGroupLimit:model/MetabotInstanceLimit:model/MetabotMessagediff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsxindex 636126b5d0d..6eb9c6852ce 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx@@ -1,4 +1,4 @@-import { useEffect, useMemo, useRef } from "react";+import { useEffect, useRef } from "react";import { Messages } from "metabase/metabot/components/MetabotChat/MetabotChatMessage";import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";@@ -14,11 +14,6 @@ export function MetabotChatHistory() {const { setNavigateToPath } = useMetabotReactions();const scrollContainerRef = useRef<HTMLDivElement>(null);- const visibleMessages = useMemo(- () => messages.filter((message) => message.type !== "chart"),- [messages],- );-const hasMessages = messages.length > 0 || errorMessages.length > 0;// Auto-scroll to bottom when new messages are received@@ -40,10 +35,11 @@ export function MetabotChatHistory() {>{hasMessages ? (<Messages- messages={visibleMessages}+ messages={messages}errorMessages={errorMessages}onRetryMessage={metabot.retryMessage}isDoingScience={metabot.isDoingScience}+ debug={metabot.debugMode}onInternalLinkClick={setNavigateToPath}/>) : null}diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.unit.spec.tsxindex d69735ee655..a55c2d47b56 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.unit.spec.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.unit.spec.tsx@@ -19,15 +19,15 @@ const makeVisibleState = (messages: MetabotChatMessage[]) =>);describe("MetabotChatHistory", () => {- it("should not render chart messages in the message list", () => {+ it("should not render navigate_to data_part messages in the message list", () => {setup({ui: <MetabotChatHistory />,metabotInitialState: makeVisibleState([{id: "1",role: "agent",- type: "chart",- navigateTo: "/question#abc",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#abc" },},]),});diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.tsxindex 11d81584c24..7bf6c3f9259 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.tsx@@ -14,7 +14,9 @@ import type {import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";import { useMetabotAgent } from "metabase/metabot/hooks";import { useMetabotReactions } from "metabase/metabot/hooks/use-metabot-reactions";+import { getFinalNavigateToMessageIdsPerTurn } from "metabase/metabot/state";import type { MetabotChatMessage } from "metabase/metabot/state/types";+import { useSelector } from "metabase/redux";/*** Public-facing hook for interacting with Metabot in the SDK.@@ -76,14 +78,18 @@ export const useMetabot = (): UseMetabotResult => {agentResetConversation();}, [agentResetConversation]);+ // keep only the last navigate_to per turn — agent may emit several mid-stream+ const finalNavigateToIds = useSelector((state) =>+ getFinalNavigateToMessageIdsPerTurn(state, "omnibot"),+ );const messages = useMemo<MetabotMessage[]>(() =>agent.messages- .filter(isPublicMessage)+ .filter((message) => isPublicMessage(message, finalNavigateToIds)).map((message) =>mapMessage(message, chartComponentsCache.current, authConfig),),- [agent.messages, authConfig],+ [agent.messages, finalNavigateToIds, authConfig],);return {@@ -138,18 +144,20 @@ function getCachedChartComponent(// These internal variants are intentionally not surfaced in the public SDK —// see the comment on `MetabotMessage` in `embedding-sdk-bundle/types/metabot.ts`// for the full rationale.-type PublicChatMessage = Exclude<- MetabotChatMessage,- { type: "tool_call" | "edit_suggestion" | "action" | "todo_list" }->;+type PublicChatMessage =+ | Extract<MetabotChatMessage, { type: "text" }>+ | (Extract<MetabotChatMessage, { type: "data_part" }> & {+ part: { type: "navigate_to" };+ });const isPublicMessage = (message: MetabotChatMessage,+ finalNavigateToIds: Set<string>,): message is PublicChatMessage =>- message.type !== "tool_call" &&- message.type !== "edit_suggestion" &&- message.type !== "action" &&- message.type !== "todo_list";+ message.type === "text" ||+ (message.type === "data_part" &&+ message.part.type === "navigate_to" &&+ finalNavigateToIds.has(message.id));const mapMessage = (message: PublicChatMessage,@@ -167,18 +175,22 @@ const mapMessage = (({ id, message }) =>({ id, role: "agent", type: "text", message }) as const,)- .with({ role: "agent", type: "chart" }, ({ id, navigateTo }) => {- const Chart = authConfig- ? getCachedChartComponent(navigateTo, cache, authConfig)- : FallbackChartComponent;- return {- id,- role: "agent",- type: "chart",- questionPath: navigateTo,- Chart,- } as const;- })+ .with(+ { role: "agent", type: "data_part", part: { type: "navigate_to" } },+ ({ id, part }) => {+ const questionPath = part.value;+ const Chart = authConfig+ ? getCachedChartComponent(questionPath, cache, authConfig)+ : FallbackChartComponent;+ return {+ id,+ role: "agent",+ type: "chart",+ questionPath,+ Chart,+ } as const;+ },+ ).exhaustive();// Rendered only when `useMetabot` is called outside a `MetabaseProvider`diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsxindex e782cc4b9fe..66d958b731a 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx@@ -242,15 +242,19 @@ describe("useMetabot", () => {});});- it("renames `navigateTo` to `questionPath` on agent.chart", async () => {+ it("projects a navigate_to data_part into a chart message with questionPath", async () => {const { store } = setup({ ui: <TestMessages /> });act(() => {store.dispatch(metabotActions.addAgentMessage({agentId: "omnibot",- type: "chart",- navigateTo: "/question#base64",+ type: "data_part",+ part: {+ type: "navigate_to",+ version: 1,+ value: "/question#base64",+ },} as any),);});@@ -340,6 +344,56 @@ describe("useMetabot", () => {message: "ok",});});++ it("keeps only the last navigate_to per turn, across multiple turns", async () => {+ const { store } = setup({ ui: <TestMessages /> });++ act(() => {+ store.dispatch(+ metabotActions.addUserMessage({+ agentId: "omnibot",+ id: "u1",+ type: "text",+ message: "first",+ }),+ );+ store.dispatch(+ metabotActions.addAgentMessage({+ agentId: "omnibot",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#1a" },+ } as any),+ );+ store.dispatch(+ metabotActions.addAgentMessage({+ agentId: "omnibot",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#1b" },+ } as any),+ );+ store.dispatch(+ metabotActions.addUserMessage({+ agentId: "omnibot",+ id: "u2",+ type: "text",+ message: "second",+ }),+ );+ store.dispatch(+ metabotActions.addAgentMessage({+ agentId: "omnibot",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#2" },+ } as any),+ );+ });++ const messages = await readMessages();+ const charts = messages.filter((m) => m.type === "chart");+ expect(charts).toHaveLength(2);+ expect(charts[0].questionPath).toBe("/question#1b");+ expect(charts[1].questionPath).toBe("/question#2");+ });});describe("submitMessage", () => {@@ -431,8 +485,12 @@ describe("useMetabot", () => {store.dispatch(metabotActions.addAgentMessage({agentId: "omnibot",- type: "chart",- navigateTo: "/question#base64",+ type: "data_part",+ part: {+ type: "navigate_to",+ version: 1,+ value: "/question#base64",+ },} as any),);});@@ -447,8 +505,12 @@ describe("useMetabot", () => {store.dispatch(metabotActions.addAgentMessage({agentId: "omnibot",- type: "chart",- navigateTo: "/question#base64",+ type: "data_part",+ part: {+ type: "navigate_to",+ version: 1,+ value: "/question#base64",+ },} as any),);});@@ -475,11 +537,19 @@ describe("useMetabot", () => {const { store } = setup({ ui: <TestCapture /> });act(() => {+ store.dispatch(+ metabotActions.addUserMessage({+ agentId: "omnibot",+ id: "u1",+ type: "text",+ message: "first",+ }),+ );store.dispatch(metabotActions.addAgentMessage({agentId: "omnibot",- type: "chart",- navigateTo: "/question#abc",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#abc" },} as any),);});@@ -490,12 +560,21 @@ describe("useMetabot", () => {const capturedChart = firstChart;expect(capturedChart).not.toBeNull();+ // Open a second turn so both navigate_tos survive the per-turn filter.act(() => {+ store.dispatch(+ metabotActions.addUserMessage({+ agentId: "omnibot",+ id: "u2",+ type: "text",+ message: "second",+ }),+ );store.dispatch(metabotActions.addAgentMessage({agentId: "omnibot",- type: "chart",- navigateTo: "/question#xyz",+ type: "data_part",+ part: { type: "navigate_to", version: 1, value: "/question#xyz" },} as any),);});diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/index.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/index.tsxindex 493ad1ad334..82202bc5df4 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/index.tsx@@ -1,13 +1,13 @@import { PLUGIN_AI_CONTROLS } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { AiControlsNavItems } from "./nav";+import { getAiControlsNavItems } from "./nav";import { getAiControlsRoutes } from "./routes";export function initializePlugin() {if (hasPremiumFeature("ai_controls")) {PLUGIN_AI_CONTROLS.isEnabled = true;PLUGIN_AI_CONTROLS.getAiControlsRoutes = getAiControlsRoutes;- PLUGIN_AI_CONTROLS.AiControlsNavItems = AiControlsNavItems;+ PLUGIN_AI_CONTROLS.getAiControlsNavItems = getAiControlsNavItems;}}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsxindex 710eac5bc33..4c467356c2a 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/nav.tsx@@ -4,7 +4,11 @@ import { AdminNavItem } from "metabase/admin/components/AdminNav";import { useSetting } from "metabase/common/hooks";import { FIXED_METABOT_IDS } from "metabase/metabot/constants";-export function AiControlsNavItems() {+export function getAiControlsNavItems() {+ return <AiControlsNavItems />;+}++function AiControlsNavItems() {const isConfigured = useSetting("llm-metabot-configured?");const areAiFeaturesEnabled = useSetting("ai-features-enabled?");diff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.tsindex 60f9da0f069..18051567055 100644--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts@@ -48,6 +48,7 @@ export const ENTERPRISE_TAG_TYPES = ["ai-controls-usage-instance-limit","ai-controls-usage-group-limits","ai-controls-usage-tenant-limits",+ "data-complexity-scores",] as const;export type EnterpriseTagType = TagType | (typeof ENTERPRISE_TAG_TYPES)[number];diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js b/enterprise/frontend/src/metabase-enterprise/audit_app/index.jsindex 9bfa7f79df3..7387b2c08cf 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js@@ -12,6 +12,9 @@ import { hasPremiumFeature } from "metabase-enterprise/settings";import { InsightsLink } from "./components/InsightsLink";import { InsightsMenuItem } from "./components/InsightsMenuItem";+import { getMetabotAnalyticsNavItems } from "./metabot-analytics/nav";+import { getAiAnalyticsRoutes } from "./metabot-analytics/routes";+import { handleMetabotSlashCommand } from "./metabot-analytics/slash-commands";import { getUserMenuRotes } from "./routes";import { isAuditDb } from "./utils";@@ -41,5 +44,8 @@ export function initializePlugin() {PLUGIN_AUDIT.isAuditDb = isAuditDb;PLUGIN_AUDIT.InsightsLink = InsightsLink;PLUGIN_AUDIT.InsightsMenuItem = InsightsMenuItem;+ PLUGIN_AUDIT.getMetabotAnalyticsNavItems = getMetabotAnalyticsNavItems;+ PLUGIN_AUDIT.getAiAnalyticsRoutes = getAiAnalyticsRoutes;+ PLUGIN_AUDIT.handleMetabotSlashCommand = handleMetabotSlashCommand;}}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.tsnew file mode 100644index 00000000000..4d9f0c158da--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/api.ts@@ -0,0 +1,56 @@+import { EnterpriseApi } from "metabase-enterprise/api/api";+import { invalidateTags, tag } from "metabase-enterprise/api/tags";++import type {+ ConversationDetail,+ ConversationsRequest,+ ConversationsResponse,+ DataComplexityScoresResponse,+} from "./types";++export const metabotAnalyticsApi = EnterpriseApi.injectEndpoints({+ endpoints: (builder) => ({+ listMetabotConversations: builder.query<+ ConversationsResponse,+ ConversationsRequest+ >({+ query: (params) => ({+ method: "GET",+ url: "/api/ee/metabot-analytics/conversations",+ params,+ }),+ }),+ getMetabotConversation: builder.query<ConversationDetail, string>({+ query: (id) => ({+ method: "GET",+ url: `/api/ee/metabot-analytics/conversations/${id}`,+ }),+ }),+ getDataComplexityScores: builder.query<DataComplexityScoresResponse, void>({+ query: () => ({+ method: "GET",+ url: "/api/ee/data-complexity-score/complexity",+ }),+ providesTags: () => [tag("data-complexity-scores")],+ }),+ refreshDataComplexityScores: builder.mutation<+ DataComplexityScoresResponse,+ void+ >({+ query: () => ({+ method: "GET",+ url: "/api/ee/data-complexity-score/complexity",+ params: { "force-recalculation": true },+ }),+ invalidatesTags: (_, error) =>+ invalidateTags(error, [tag("data-complexity-scores")]),+ }),+ }),+});++export const {+ useListMetabotConversationsQuery,+ useGetMetabotConversationQuery,+ useGetDataComplexityScoresQuery,+ useRefreshDataComplexityScoresMutation,+} = metabotAnalyticsApi;diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.cssnew file mode 100644index 00000000000..d9588d83968--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.module.css@@ -0,0 +1,6 @@+.groupsTarget,+.groupsTarget:hover,+.groupsTarget:active,+.groupsTarget:focus {+ text-decoration: none;+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsxnew file mode 100644index 00000000000..3894c3eade4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx@@ -0,0 +1,401 @@+import { useMemo } from "react";+import type { WithRouterProps } from "react-router";+import { t } from "ttag";++import { skipToken, useGetAdhocQueryMetadataQuery } from "metabase/api";+import { CodeEditor } from "metabase/common/components/CodeEditor";+import { ExternalLink } from "metabase/common/components/ExternalLink";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";+import {+ AgentMessage,+ Messages,+} from "metabase/metabot/components/MetabotChat/MetabotChatMessage";+import { getIssueTypeLabel } from "metabase/metabot/components/MetabotChat/feedback-issue-types";+import type {+ MetabotAgentTextChatMessage,+ MetabotChatMessage,+} from "metabase/metabot/state/types";+import { Notebook } from "metabase/querying/notebook/components/Notebook";+import { useSelector } from "metabase/redux";+import { getMetadata } from "metabase/selectors/metadata";+import { getSetting } from "metabase/selectors/settings";+import {+ Badge,+ Box,+ Button,+ Card,+ Flex,+ Icon,+ Loader,+ SimpleGrid,+ Stack,+ Text,+ Title,+} from "metabase/ui";+import { formatNumber } from "metabase/utils/formatting";+import { getUserName } from "metabase/utils/user";+import Question from "metabase-lib/v1/Question";+import { getUrl as ML_getUrl } from "metabase-lib/v1/urls";+import type { DatasetQuery, VisualizationDisplay } from "metabase-types/api";++import { useGetMetabotConversationQuery } from "../../api";+import type { ConversationFeedback, GeneratedQuery } from "../../types";++import { ConversationHeader } from "./ConversationHeader";+import { convertSlackChatMessage } from "./slack-mrkdwn";++export function ConversationDetailPage({ params }: WithRouterProps) {+ const convoId = params.convoId;++ const {+ data: conversation,+ isLoading,+ error,+ } = useGetMetabotConversationQuery(convoId, {+ refetchOnMountOrArgChange: true,+ });++ const chatMessages = useMemo(() => {+ const isSlackbot =+ conversation?.profile_id === "slackbot" ||+ conversation?.profile_id === "slack";+ const msgs = conversation?.chat_messages ?? [];+ return isSlackbot ? msgs.map(convertSlackChatMessage) : msgs;+ }, [conversation]);++ if (isLoading || error) {+ return (+ <MetabotAdminLayout>+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </MetabotAdminLayout>+ );+ }++ if (!conversation) {+ return null;+ }++ const {+ total_tokens,+ message_count,+ search_count,+ query_count,+ queries,+ feedback,+ } = conversation;++ return (+ <MetabotAdminLayout>+ <Stack gap="2.5rem">+ <ConversationHeader conversation={conversation} />++ <SimpleGrid cols={4}>+ <StatCard label={t`Messages`} value={formatNumber(message_count)} />+ <StatCard+ label={t`Total tokens`}+ value={formatNumber(total_tokens)}+ />+ <StatCard label={t`Queries run`} value={formatNumber(query_count)} />+ <StatCard label={t`Searches`} value={formatNumber(search_count)} />+ </SimpleGrid>++ {feedback.length > 0 && (+ <Stack gap="md">+ <Title order={3}>{t`Feedback`}</Title>+ <Stack gap="sm">+ {feedback.map((item) => (+ <FeedbackCard+ key={item.id}+ feedback={item}+ chatMessages={chatMessages}+ />+ ))}+ </Stack>+ </Stack>+ )}++ <Stack gap="md">+ <Flex align="baseline" justify="space-between">+ <Title order={3}>{t`Conversation`}</Title>+ {conversation.slack_permalink && (+ <ExternalLink href={conversation.slack_permalink}>+ {t`Open in Slack`}+ </ExternalLink>+ )}+ </Flex>+ <Card withBorder shadow="none" p="xl">+ <Messages+ messages={chatMessages}+ errorMessages={[]}+ isDoingScience={false}+ debug+ readonly+ />+ </Card>+ </Stack>++ {queries.length > 0 && (+ <Stack gap="md">+ <Title order={3}>{t`Queries generated`}</Title>+ {queries.map((query) => (+ <GeneratedQueryCard+ key={query.call_id ?? `${query.message_id}-${query.query_id}`}+ query={query}+ />+ ))}+ </Stack>+ )}+ </Stack>+ </MetabotAdminLayout>+ );+}++function StatCard({ label, value }: { label: string; value: string }) {+ return (+ <Card withBorder shadow="none" p="md">+ <Text size="sm" c="text-secondary">+ {label}+ </Text>+ <Title order={2} mt="xs">+ {value}+ </Title>+ </Card>+ );+}++function FeedbackCard({+ feedback,+ chatMessages,+}: {+ feedback: ConversationFeedback;+ chatMessages: MetabotChatMessage[];+}) {+ const agentResponse = useMemo(+ () =>+ feedback.external_id+ ? chatMessages.find(+ (m): m is MetabotAgentTextChatMessage =>+ m.role === "agent" &&+ m.type === "text" &&+ m.externalId === feedback.external_id,+ )+ : undefined,+ [feedback.external_id, chatMessages],+ );++ const submitterName = feedback.user+ ? getUserName(feedback.user) || null+ : null;++ return (+ <Card withBorder shadow="none" p="md">+ <Stack gap="sm">+ <Flex gap="xs" align="center">+ <Icon+ name={feedback.positive ? "thumbs_up" : "thumbs_down"}+ size={20}+ c="text-secondary"+ />+ <Text fw={700}>{feedback.positive ? t`Positive` : t`Negative`}</Text>+ {!feedback.positive && feedback.issue_type && (+ <Badge variant="light" bg="background-error" c="error" ml="xs">+ {getIssueTypeLabel(feedback.issue_type)}+ </Badge>+ )}+ </Flex>+ {submitterName && (+ <Text size="sm" c="text-secondary">+ {t`Submitted by ${submitterName}`}+ </Text>+ )}+ {agentResponse && (+ <AgentMessage+ message={agentResponse}+ debug+ readonly+ hideActions+ onCopy={noopCopy}+ showFeedbackButtons={false}+ submittedFeedback={undefined}+ bg="background-secondary"+ p="md"+ pb="0"+ bd="1px solid var(--mb-color-border)"+ bdrs="1rem"+ />+ )}+ {feedback.freeform_feedback && (+ <Text>{feedback.freeform_feedback}</Text>+ )}+ </Stack>+ </Card>+ );+}++function GeneratedQueryCard({ query }: { query: GeneratedQuery }) {+ if (query.query_type === "notebook" && query.mbql) {+ return (+ <NotebookGeneratedQueryCard mbql={query.mbql} display={query.display} />+ );+ }+ return <SqlGeneratedQueryCard query={query} />;+}++function SqlGeneratedQueryCard({ query }: { query: GeneratedQuery }) {+ const metadata = useSelector(getMetadata);++ const runUrl = useMemo(() => {+ if (query.database_id == null || !query.sql) {+ return null;+ }+ const datasetQuery: DatasetQuery = {+ type: "native",+ database: query.database_id,+ native: { query: query.sql, "template-tags": {} },+ };+ const question = new Question(+ {+ name: null,+ display: "table",+ visualization_settings: {},+ dataset_query: datasetQuery,+ },+ metadata,+ ).setType("question");+ return ML_getUrl(question);+ }, [metadata, query.database_id, query.sql]);++ return (+ <Card withBorder shadow="none" p="md">+ <Stack gap="sm">+ <Flex justify="space-between" align="center" gap="sm">+ <Text size="lg" fw={700}>{t`SQL query`}</Text>+ {runUrl && (+ <Button+ component="a"+ href={runUrl}+ target="_blank"+ rel="noreferrer"+ variant="filled"+ leftSection={<Icon name="play_outlined" aria-hidden />}+ >+ {t`Run`}+ </Button>+ )}+ </Flex>+ <CodeEditor value={query.sql ?? ""} language="sql" readOnly />+ {query.tables.length > 0 && (+ <Text size="sm" c="text-secondary">+ <Text span fw={700}>{t`Tables: `}</Text>+ {query.tables.join(", ")}+ </Text>+ )}+ </Stack>+ </Card>+ );+}++// Gate the Notebook mount on metadata loading: DataStep's local `isOpened`+// state is initialized once at mount from `!table`, so if we render before the+// source table resolves the data picker pops open and never closes itself+// (see frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx).+function NotebookGeneratedQueryCard({+ mbql,+ display,+}: {+ mbql: DatasetQuery;+ display: VisualizationDisplay | null;+}) {+ const { isLoading, isError } = useGetAdhocQueryMetadataQuery(+ mbql.database != null ? mbql : skipToken,+ );+ const metadata = useSelector(getMetadata);+ const reportTimezone = useSelector((state) =>+ getSetting(state, "report-timezone-long"),+ );++ const question = useMemo(() => {+ const q = new Question(+ {+ name: null,+ display: display ?? "table",+ visualization_settings: {},+ dataset_query: mbql,+ },+ metadata,+ ).setType("question");+ return display ? q.lockDisplay() : q;+ }, [mbql, metadata, display]);++ if (isLoading) {+ return (+ <Card withBorder shadow="none" p="md">+ <Flex justify="center" align="center" mih={120}>+ <Loader />+ </Flex>+ </Card>+ );+ }++ if (isError || mbql.database == null) {+ return (+ <Card withBorder shadow="none" p="md">+ <CodeEditor+ value={JSON.stringify(mbql, null, 2)}+ language="json"+ readOnly+ />+ </Card>+ );+ }++ const title = question.generateQueryDescription() || t`Notebook query`;+ const runUrl = ML_getUrl(question);++ return (+ <Card+ withBorder+ shadow="none"+ p={{ base: "md", sm: "xl" }}+ pb="sm"+ style={{ overflowX: "auto" }}+ >+ <Stack gap="md">+ <Flex justify="space-between" align="center" gap="sm">+ <Text size="lg" fw={700}>+ {title}+ </Text>+ <Button+ component="a"+ href={runUrl}+ target="_blank"+ rel="noreferrer"+ variant="filled"+ leftSection={<Icon name="play_outlined" aria-hidden />}+ >+ {t`Run`}+ </Button>+ </Flex>+ <Box mx={{ base: "-md", sm: "-xl" }} my={{ base: "-md", sm: "-xl" }}>+ <Notebook+ question={question}+ isDirty={false}+ isRunnable={false}+ isResultDirty={false}+ reportTimezone={reportTimezone}+ hasVisualizeButton={false}+ updateQuestion={noopUpdateQuestion}+ readOnly+ />+ </Box>+ </Stack>+ </Card>+ );+}++function noopUpdateQuestion(): Promise<void> {+ return Promise.resolve();+}++function noopCopy() {}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxnew file mode 100644index 00000000000..b603be9c74e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx@@ -0,0 +1,223 @@+import { useMemo } from "react";+import { msgid, ngettext, t } from "ttag";++import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";+import {+ skipToken,+ useListPermissionsGroupsQuery,+ useListUserMembershipsQuery,+} from "metabase/api";+import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";+import { DateTime } from "metabase/common/components/DateTime";+import { ForwardRefLink } from "metabase/common/components/Link";+import { renderMetabotProfileLabel } from "metabase/metabot/constants";+import { PLUGIN_TENANTS } from "metabase/plugins";+import {+ ActionIcon,+ Anchor,+ Flex,+ Icon,+ Menu,+ Stack,+ Text,+ Title,+} from "metabase/ui";+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";+import * as Urls from "metabase/utils/urls";+import { getUserName } from "metabase/utils/user";+import { useGetTenantQuery } from "metabase-enterprise/api";+import * as EnterpriseUrls from "metabase-enterprise/urls";++import type { ConversationDetail } from "../../types";++import S from "./ConversationDetailPage.module.css";++export function ConversationHeader({+ conversation,+}: {+ conversation: ConversationDetail;+}) {+ const userGroupsInfo = useUserGroupsInfo(conversation.user?.id);+ const tenantId = conversation.user?.tenant_id ?? null;+ const { data: tenant } = useGetTenantQuery(+ PLUGIN_TENANTS.isEnabled && tenantId != null ? tenantId : skipToken,+ );++ const userName = conversation.user+ ? getUserName(conversation.user) || t`Unknown`+ : t`Unknown`;+ const firstName = conversation.user?.first_name?.trim() || userName;+ const firstProfile = conversation.profile_id ?? undefined;++ return (+ <>+ <Breadcrumbs+ crumbs={[+ [t`Conversations`, "/admin/metabot/usage-auditing/conversations"],+ <>+ {userName}, <DateTime value={conversation.created_at} />+ </>,+ ]}+ />++ <Flex justify="space-between" align="flex-start" gap="md">+ <Stack gap="sm">+ <Flex align="baseline">+ <Title order={2}>{t`Conversation with ${userName}`}</Title>+ {conversation.user && (+ <Menu shadow="md" position="bottom-start" withinPortal>+ <Menu.Target>+ <ActionIcon+ variant="subtle"+ color="text-secondary"+ aria-label={t`User actions`}+ >+ <Icon name="ellipsis" size={16} />+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown>+ <Menu.Item+ component={ForwardRefLink}+ to={`/admin/metabot/usage-auditing/conversations?user=${conversation.user.id}`}+ >+ {t`See all of ${firstName}'s conversations`}+ </Menu.Item>+ <Menu.Item+ component={ForwardRefLink}+ to={Urls.editUser(conversation.user)}+ >+ {t`View ${firstName}'s details`}+ </Menu.Item>+ </Menu.Dropdown>+ </Menu>+ )}+ </Flex>+ <Flex gap="lg" align="center" wrap="wrap">+ <Flex gap="xs" align="center">+ <Icon name="calendar" size={16} c="text-tertiary" />+ <Text size="md" c="text-secondary">+ <DateTime value={conversation.created_at} unit="day" />+ </Text>+ </Flex>+ {firstProfile && (+ <Flex gap="xs" align="center">+ <Icon name="metabot" size={16} c="text-tertiary" />+ <Text size="md" c="text-secondary">+ {renderMetabotProfileLabel(firstProfile)}+ </Text>+ </Flex>+ )}+ {(userGroupsInfo.userGroups.length > 0 ||+ userGroupsInfo.isAdmin) && (+ <Flex gap="xs" align="center">+ <Icon name="group" size={16} c="text-tertiary" />+ <UserGroupsMenu {...userGroupsInfo} />+ </Flex>+ )}+ {tenant && (+ <Flex gap="xs" align="center">+ <Icon name="company" size={16} c="text-tertiary" />+ <Anchor+ component={ForwardRefLink}+ to={EnterpriseUrls.editTenant(tenant.id)}+ c="text-secondary"+ size="md"+ underline="hover"+ >+ {tenant.name}+ </Anchor>+ </Flex>+ )}+ </Flex>+ </Stack>+ </Flex>+ </>+ );+}++function useUserGroupsInfo(userId: number | undefined) {+ const { data: membershipsByUser } = useListUserMembershipsQuery();+ const { data: groups } = useListPermissionsGroupsQuery({});++ return useMemo(() => {+ if (userId == null || !membershipsByUser || !groups) {+ return { userGroups: [], isAdmin: false };+ }+ const memberships = membershipsByUser[userId] ?? [];+ const selectedGroupIds = memberships.map((m) => m.group_id);+ const isAdmin = groups.some(+ (g) => selectedGroupIds.includes(g.id) && isAdminGroup(g),+ );+ const userGroups = groups.filter(+ (g) =>+ selectedGroupIds.includes(g.id) &&+ !isDefaultGroup(g) &&+ !isAdminGroup(g),+ );+ return { userGroups, isAdmin };+ }, [userId, membershipsByUser, groups]);+}++function UserGroupsMenu({+ userGroups,+ isAdmin,+}: ReturnType<typeof useUserGroupsInfo>) {+ if (userGroups.length === 0 && !isAdmin) {+ return null;+ }++ const n = userGroups.length;+ const otherGroupsLabel =+ n === 1+ ? userGroups[0].name+ : ngettext(msgid`${n} other group`, `${n} other groups`, n);+ const summaryText = isAdmin+ ? n === 0+ ? t`Admin`+ : t`Admin and ${otherGroupsLabel}`+ : n === 1+ ? userGroups[0].name+ : ngettext(msgid`${n} group`, `${n} groups`, n);++ if (userGroups.length === 0) {+ return (+ <Text size="md" c="text-secondary">+ {summaryText}+ </Text>+ );+ }++ return (+ <Menu shadow="md" position="bottom-start" withinPortal>+ <Menu.Target>+ <Anchor+ component="button"+ type="button"+ underline="never"+ c="text-secondary"+ size="md"+ fw="normal"+ className={S.groupsTarget}+ >+ <Flex component="span" align="center" gap={4}>+ <span>{summaryText}</span>+ <Icon name="chevrondown" size={10} c="text-tertiary" />+ </Flex>+ </Anchor>+ </Menu.Target>+ <Menu.Dropdown miw="14rem">+ <Menu.Label>{t`View a group's permissions`}</Menu.Label>+ {userGroups.map((group) => (+ <Menu.Item+ key={group.id}+ component={ForwardRefLink}+ to={getGroupFocusPermissionsUrl(group.id)}+ leftSection={<Icon name="group" size={14} />}+ >+ {group.name}+ </Menu.Item>+ ))}+ </Menu.Dropdown>+ </Menu>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/index.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/index.tsnew file mode 100644index 00000000000..71c52b40fb6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/index.ts@@ -0,0 +1 @@+export { ConversationDetailPage } from "./ConversationDetailPage";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.tsnew file mode 100644index 00000000000..edebfe31f5d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.ts@@ -0,0 +1,44 @@+import { match } from "ts-pattern";++import type { MetabotChatMessage } from "metabase/metabot/state/types";++const URL_WITH_LABEL = /<((?:https?|mailto|tel):[^|>\s]+)\|([^>]+)>/g;+const BARE_URL = /<((?:https?|mailto|tel):[^|>\s]+)>/g;+const USER_MENTION = /<@([UW][A-Z0-9]+)>/g;+const CHANNEL_MENTION_WITH_NAME = /<#[CG][A-Z0-9]+\|([^>]+)>/g;+const CHANNEL_MENTION = /<#([CG][A-Z0-9]+)>/g;+const SUBTEAM_MENTION_WITH_NAME = /<!subteam\^[A-Z0-9]+\|([^>]+)>/g;+const SPECIAL_MENTION = /<!(here|channel|everyone)>/g;++export function slackMrkdwnToMarkdown(text: string): string {+ return text+ .replace(URL_WITH_LABEL, (_, url, label) => `[${label}](${url})`)+ .replace(BARE_URL, (_, url) => `<${url}>`)+ .replace(USER_MENTION, "@$1")+ .replace(CHANNEL_MENTION_WITH_NAME, "#$1")+ .replace(CHANNEL_MENTION, "#$1")+ .replace(SUBTEAM_MENTION_WITH_NAME, "@$1")+ .replace(SPECIAL_MENTION, "@$1");+}++export function convertSlackChatMessage(+ message: MetabotChatMessage,+): MetabotChatMessage {+ return match(message)+ .with({ role: "user", type: "text" }, (m) => ({+ ...m,+ message: slackMrkdwnToMarkdown(m.message),+ }))+ .with({ role: "user", type: "action" }, (m) => ({+ ...m,+ message: slackMrkdwnToMarkdown(m.message),+ userMessage: slackMrkdwnToMarkdown(m.userMessage),+ }))+ .with({ role: "agent", type: "text" }, (m) => ({+ ...m,+ message: slackMrkdwnToMarkdown(m.message),+ }))+ .with({ role: "agent", type: "data_part" }, (m) => m)+ .with({ role: "agent", type: "tool_call" }, (m) => m)+ .exhaustive();+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.unit.spec.tsnew file mode 100644index 00000000000..bd667640bf9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/slack-mrkdwn.unit.spec.ts@@ -0,0 +1,59 @@+import { slackMrkdwnToMarkdown } from "./slack-mrkdwn";++describe("slackMrkdwnToMarkdown", () => {+ it("converts <url|label> to [label](url)", () => {+ expect(+ slackMrkdwnToMarkdown(+ "see <https://stats.metabase.com/question/4369|Survey Scores> now",+ ),+ ).toBe("see [Survey Scores](https://stats.metabase.com/question/4369) now");+ });++ it("preserves bare <url> as autolinks", () => {+ expect(slackMrkdwnToMarkdown("visit <https://example.com>")).toBe(+ "visit <https://example.com>",+ );+ });++ it("converts mailto labels to markdown links", () => {+ expect(slackMrkdwnToMarkdown("<mailto:[email protected]|email foo>")).toBe(+ "[email foo](mailto:[email protected])",+ );+ });++ it("strips Slack user mention syntax", () => {+ expect(slackMrkdwnToMarkdown("hi <@U0A1860HEAG> there")).toBe(+ "hi @U0A1860HEAG there",+ );+ });++ it("renders channel mention with name", () => {+ expect(slackMrkdwnToMarkdown("come to <#C123ABC|general>")).toBe(+ "come to #general",+ );+ });++ it("renders bare channel mention", () => {+ expect(slackMrkdwnToMarkdown("come to <#C123ABC>")).toBe(+ "come to #C123ABC",+ );+ });++ it("renders subteam mentions with names", () => {+ expect(slackMrkdwnToMarkdown("ping <!subteam^S123|frontend>")).toBe(+ "ping @frontend",+ );+ });++ it("renders special mentions like channel/here/everyone", () => {+ expect(slackMrkdwnToMarkdown("<!here> hi <!channel>")).toBe(+ "@here hi @channel",+ );+ });++ it("leaves plain text unchanged", () => {+ expect(slackMrkdwnToMarkdown("just normal text *with stars*")).toBe(+ "just normal text *with stars*",+ );+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsxnew file mode 100644index 00000000000..65be1fad8a3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx@@ -0,0 +1,102 @@+import { useState } from "react";+import { t } from "ttag";++import type { DatePickerOperator } from "metabase/querying/common/types";+import { DateAllOptionsWidget } from "metabase/querying/parameters/components/DateAllOptionsWidget";+import { Button, Flex, Popover, Select } from "metabase/ui";++import { getDateLabel } from "../ConversationStatsPage/utils";++const DATE_OPERATORS: DatePickerOperator[] = ["=", ">", "<", "between"];++type ConversationFiltersProps = {+ date: string | null;+ onDateChange: (val: string) => void;+ user: string | null;+ onUserChange: (val: string | null) => void;+ group: string | null;+ onGroupChange: (val: string | null) => void;+ groupNoFilterValue: string;+ tenant: string | null;+ onTenantChange: (val: string | null) => void;+ userOptions: { value: string; label: string }[];+ groupOptions: { value: string; label: string }[];+ tenantOptions: { value: string; label: string }[];+ hasTenants: boolean;+};++export function ConversationFilters({+ date,+ onDateChange,+ user,+ onUserChange,+ group,+ onGroupChange,+ groupNoFilterValue,+ tenant,+ onTenantChange,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+}: ConversationFiltersProps) {+ const [dateOpened, setDateOpened] = useState(false);++ return (+ <Flex gap="sm" wrap="wrap" align="center">+ <Popover+ opened={dateOpened}+ onChange={setDateOpened}+ position="bottom-start"+ >+ <Popover.Target>+ <Button variant="default" onClick={() => setDateOpened((o) => !o)}>+ {getDateLabel(date)}+ </Button>+ </Popover.Target>+ <Popover.Dropdown>+ <DateAllOptionsWidget+ value={null}+ availableOperators={DATE_OPERATORS}+ onChange={(val) => {+ onDateChange(val);+ setDateOpened(false);+ }}+ />+ </Popover.Dropdown>+ </Popover>+ {hasTenants && (+ <Select+ data={[{ value: "", label: t`All tenants` }, ...tenantOptions]}+ value={tenant ?? ""}+ onChange={(val) => onTenantChange(val === "" ? null : val)}+ searchable+ w={180}+ bdrs="sm"+ data-testid="conversation-filters-tenant-select"+ />+ )}+ <Select+ placeholder={t`Group`}+ data={groupOptions}+ value={group ?? groupNoFilterValue}+ onChange={(val) =>+ onGroupChange(val === groupNoFilterValue ? null : val)+ }+ searchable+ w={180}+ bdrs="sm"+ data-testid="conversation-filters-group-select"+ />+ <Select+ data={[{ value: "", label: t`All users` }, ...userOptions]}+ value={user ?? ""}+ onChange={(val) => onUserChange(val === "" ? null : val)}+ searchable+ w={180}+ bdrs="sm"+ data-testid="conversation-filters-user-select"+ />+ </Flex>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/index.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/index.tsnew file mode 100644index 00000000000..2b7e1f3e5f7--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/index.ts@@ -0,0 +1,14 @@+export { ConversationFilters } from "./ConversationFilters";+export {+ DEFAULT_DATE,+ DEFAULT_DATE_FILTER,+ DEFAULT_GROUP,+ parseDateFilter,+ parseId,+ useFilterOptions,+} from "./useFilterOptions";+export {+ type FilterUrlState,+ filterUrlStateConfig,+ mergeUrlStateConfig,+} from "./url-state";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/url-state.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/url-state.tsnew file mode 100644index 00000000000..20e79143e23--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/url-state.ts@@ -0,0 +1,53 @@+import {+ type QueryParam,+ type UrlStateConfig,+ getFirstParamValue,+} from "metabase/common/hooks/use-url-state";++import { DEFAULT_DATE } from "./useFilterOptions";++export type FilterUrlState = {+ date: string | null;+ user: string | null;+ group: string | null;+ tenant: string | null;+};++function parseString(param: QueryParam): string | null {+ const value = getFirstParamValue(param);+ return value && value.trim().length > 0 ? value.trim() : null;+}++export const filterUrlStateConfig: UrlStateConfig<FilterUrlState> = {+ parse: (query) => ({+ date: parseString(query.date) ?? DEFAULT_DATE,+ user: parseString(query.user),+ group: parseString(query.group),+ tenant: parseString(query.tenant),+ }),+ serialize: ({ date, user, group, tenant }) => ({+ date: date === DEFAULT_DATE ? undefined : (date ?? undefined),+ user: user ?? undefined,+ group: group ?? undefined,+ tenant: tenant ?? undefined,+ }),+};++export function mergeUrlStateConfig<+ F extends Record<string, unknown>,+ P extends Record<string, unknown>,+>(+ filterCfg: UrlStateConfig<F>,+ pageCfg: UrlStateConfig<P>,+): UrlStateConfig<F & P> {+ return {+ parse: (query) => ({+ ...filterCfg.parse(query),+ ...pageCfg.parse(query),+ }),+ serialize: (state) => ({+ ...filterCfg.serialize(state),+ ...pageCfg.serialize(state),+ }),+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.tsnew file mode 100644index 00000000000..5be841f1498--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts@@ -0,0 +1,132 @@+import { useMemo } from "react";+import { t } from "ttag";++import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";+import type { DateFilterValue } from "metabase/querying/common/types";+import { deserializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";+import { getUserName } from "metabase/utils/user";+import { useListTenantsQuery } from "metabase-enterprise/api";+import { hasPremiumFeature } from "metabase-enterprise/settings";+import type { GroupListQuery } from "metabase-types/api";++import type { FilterUrlState } from "./url-state";++export const DEFAULT_DATE = "past30days";+export const DEFAULT_GROUP = "1"; // All Users group+export const ALL_USERS_SYNTHETIC = "all";++export const DEFAULT_DATE_FILTER: DateFilterValue = {+ type: "relative",+ value: -30,+ unit: "day",+ options: { includeCurrent: true },+};++export function parseId(value: string | null): number | undefined {+ if (!value) {+ return undefined;+ }+ const parsed = parseInt(value, 10);+ return Number.isFinite(parsed) ? parsed : undefined;+}++export function parseDateFilter(date: string | null): DateFilterValue {+ return (+ (date ? deserializeDateParameterValue(date) : null) ?? DEFAULT_DATE_FILTER+ );+}++function sortGroupsTenantsEnabled(+ groups: readonly GroupListQuery[],+): GroupListQuery[] {+ const internal = groups.filter(+ (g) => g.magic_group_type === "all-internal-users",+ );+ const external = groups.filter(+ (g) => g.magic_group_type === "all-external-users",+ );+ const rest = groups.filter(+ (g) =>+ g.magic_group_type !== "all-internal-users" &&+ g.magic_group_type !== "all-external-users",+ );+ return [...internal, ...external, ...rest];+}++function sortGroupsTenantsDisabled(+ groups: readonly GroupListQuery[],+): GroupListQuery[] {+ const defaultGroup = groups.filter((g) => String(g.id) === DEFAULT_GROUP);+ const rest = groups.filter((g) => String(g.id) !== DEFAULT_GROUP);+ return [...defaultGroup, ...rest];+}++export function useFilterOptions({+ date,+ user,+ group,+ tenant,+}: FilterUrlState) {+ const tenantsFeatureEnabled = !!hasPremiumFeature("tenants");+ const { data: usersData, isLoading: isLoadingUsers } = useListUsersQuery({});+ const { data: groupsData, isLoading: isLoadingGroups } =+ useListPermissionsGroupsQuery(undefined);+ const { data: tenantsData, isLoading: isLoadingTenants } =+ useListTenantsQuery({ status: "active" }, { skip: !tenantsFeatureEnabled });++ const userOptions = useMemo(+ () =>+ (usersData?.data ?? []).map((u) => ({+ value: String(u.id),+ label: getUserName(u) || t`Unknown`,+ })),+ [usersData],+ );++ const groupOptions = useMemo(() => {+ const rawGroups = groupsData ?? [];+ const ordered = tenantsFeatureEnabled+ ? sortGroupsTenantsEnabled(rawGroups)+ : sortGroupsTenantsDisabled(rawGroups);+ const options = ordered.map((g) => ({+ value: String(g.id),+ label: g.name,+ }));+ return tenantsFeatureEnabled+ ? [{ value: ALL_USERS_SYNTHETIC, label: t`All users` }, ...options]+ : options;+ }, [groupsData, tenantsFeatureEnabled]);++ const tenantOptions = useMemo(+ () =>+ (tenantsData?.data ?? []).map((tenant) => ({+ value: String(tenant.id),+ label: tenant.name,+ })),+ [tenantsData],+ );++ const hasTenants = tenantsFeatureEnabled && tenantOptions.length > 0;++ const dateFilter = useMemo(() => parseDateFilter(date), [date]);+ const userId = parseId(user);+ const groupNoFilterValue = tenantsFeatureEnabled+ ? ALL_USERS_SYNTHETIC+ : DEFAULT_GROUP;+ const groupId =+ group == null || group === groupNoFilterValue ? undefined : parseId(group);+ const tenantId = hasTenants ? parseId(tenant) : undefined;++ return {+ dateFilter,+ userId,+ groupId,+ groupNoFilterValue,+ tenantId,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ isLoading: isLoadingUsers || isLoadingGroups || isLoadingTenants,+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsxnew file mode 100644index 00000000000..99f3736e376--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChart.tsx@@ -0,0 +1,132 @@+import { useMemo } from "react";+import { t } from "ttag";++import { Skeleton, useMantineTheme } from "metabase/ui";+import type { Query } from "metabase-lib";++import { useAdhocBreakoutQuery } from "../../hooks/useAdhocBreakoutQuery";++import { BreakoutChartCard } from "./BreakoutChartCard";+import {+ mapBreakoutDimension,+ toBreakoutRawSeries,+} from "./breakout-raw-series";+import type { StatsFilters, UsageStatsMetric } from "./query-utils";+import {+ type ChartDataSources,+ type ChartInnerProps,+ type ChartProps,+ DEFAULT_CHART_HEIGHT,+} from "./types";++type BuildQueryFn = (opts: StatsFilters & ChartDataSources) => Query;++type Props = ChartProps & {+ titles: Record<UsageStatsMetric, string>;+ display: "row" | "bar";+ buildQuery: BuildQueryFn;+ labelMapper?: (value: unknown) => unknown;+ maxCategories?: number;+};++type InnerProps = ChartInnerProps & {+ titles: Record<UsageStatsMetric, string>;+ display: "row" | "bar";+ buildQuery: BuildQueryFn;+ labelMapper?: (value: unknown) => unknown;+ maxCategories: number;+};++export function BreakoutChart({+ provider,+ table,+ groupMembersTable,+ h = DEFAULT_CHART_HEIGHT,+ maxCategories = 8,+ ...rest+}: Props) {+ if (!provider || !table || !groupMembersTable) {+ return <Skeleton h={h} />;+ }+ return (+ <BreakoutChartInner+ provider={provider}+ table={table}+ groupMembersTable={groupMembersTable}+ h={h}+ maxCategories={maxCategories}+ {...rest}+ />+ );+}++function BreakoutChartInner({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ onDimensionClick,+ h,+ titles,+ display,+ buildQuery,+ labelMapper,+ maxCategories,+}: InnerProps) {+ const query = useMemo(+ () =>+ buildQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ }),+ [+ buildQuery,+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ ],+ );++ const { data, jsQuery, isFetching } = useAdhocBreakoutQuery(query);+ const { themeColor } = useMantineTheme().fn;++ const rawSeries = useMemo(() => {+ const labeled = labelMapper+ ? mapBreakoutDimension(data, labelMapper)+ : data;+ return toBreakoutRawSeries(labeled, jsQuery, {+ metric,+ display,+ maxCategories,+ otherLabel: t`Other`,+ getColor: themeColor,+ });+ }, [data, jsQuery, labelMapper, metric, display, maxCategories, themeColor]);++ return (+ <BreakoutChartCard+ title={titles[metric]}+ rawSeries={rawSeries}+ isFetching={isFetching}+ display={display}+ h={h}+ otherLabel={t`Other`}+ onDimensionClick={onDimensionClick}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsxnew file mode 100644index 00000000000..086f4d7ba4d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/BreakoutChartCard.tsx@@ -0,0 +1,68 @@+import cx from "classnames";++import { Card, Skeleton, Text } from "metabase/ui";+import Visualization from "metabase/visualizations/components/Visualization";+import type { ClickActionsMode } from "metabase/visualizations/types";+import type { VisualizationDisplay } from "metabase-types/api";++import S from "./ChartCard.module.css";+import type { DimensionClickHandler } from "./types";++// needed for visualizationIsClickable to return true when a custom handler is+// attached; handleVisualizationClick short-circuits before this action runs+const CLICKABLE_MODE: ClickActionsMode = {+ actionsForClick: () => [{ name: "custom-click" } as any],+};++type Props = {+ title: string;+ rawSeries: any[] | null;+ isFetching: boolean;+ display: VisualizationDisplay;+ h: number;+ otherLabel: string;+ onDimensionClick?: DimensionClickHandler;+};++export function BreakoutChartCard({+ title,+ rawSeries,+ isFetching,+ display,+ h,+ otherLabel,+ onDimensionClick,+}: Props) {+ if (isFetching || !rawSeries) {+ return <Skeleton h={h} />;+ }++ return (+ <Card+ className={cx(S.visualization, {+ [S.nonClickable]: !onDimensionClick,+ })}+ withBorder+ shadow="none"+ px="lg"+ pt="md"+ pb={display === "row" ? "md" : "0"}+ h={h}+ >+ <Text fw="bold" mb="md">+ {title}+ </Text>+ <Visualization+ rawSeries={rawSeries}+ isDashboard+ mode={onDimensionClick ? CLICKABLE_MODE : undefined}+ handleVisualizationClick={(clicked: any) => {+ const value = clicked?.dimensions?.[0]?.value;+ if (value != null && value !== otherLabel && onDimensionClick) {+ onDimensionClick(String(value));+ }+ }}+ />+ </Card>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ChartCard.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ChartCard.module.cssnew file mode 100644index 00000000000..109ccba509f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ChartCard.module.css@@ -0,0 +1,10 @@+.visualization {+ & :global(.CardVisualization) {+ padding: 0;+ }+}++.nonClickable,+.nonClickable * {+ cursor: default !important;+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.cssnew file mode 100644index 00000000000..65bf3dc87a3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.module.css@@ -0,0 +1,17 @@+.metricTabs {+ gap: 1rem;+}++.metricTab {+ color: var(--mb-color-text-secondary);+ border-radius: 99px;++ &[data-orientation="horizontal"] {+ padding-inline: 0.75rem;+ }++ &[data-active="true"] {+ color: var(--mb-color-brand);+ background-color: var(--mb-color-background-brand);+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsxnew file mode 100644index 00000000000..d7cf0e86f4f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx@@ -0,0 +1,421 @@+import dayjs from "dayjs";+import { useCallback, useMemo } from "react";+import type { WithRouterProps } from "react-router";+import { push } from "react-router-redux";+import { t } from "ttag";++import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";+import { getErrorMessage } from "metabase/api/utils";+import { useToast } from "metabase/common/hooks";+import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";+import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";+import { useDispatch } from "metabase/redux";+import { Button, Flex, SimpleGrid, Tabs, Title } from "metabase/ui";+import { hasPremiumFeature } from "metabase-enterprise/settings";++import { useRefreshDataComplexityScoresMutation } from "../../api";+import {+ VIEW_CONVERSATIONS,+ VIEW_GROUP_MEMBERS,+ VIEW_USAGE_LOG,+} from "../../constants";+import { useAuditTable } from "../../hooks/useAuditTable";+import { ConversationFilters, useFilterOptions } from "../ConversationFilters";+import {+ type UrlState as ConversationsUrlState,+ urlStateConfig as conversationsUrlStateConfig,+} from "../ConversationsPage/utils";++import { BreakoutChart } from "./BreakoutChart";+import S from "./ConversationStatsPage.module.css";+import {+ ConversationsByDayChart,+ isSingleDayFilter,+} from "./ConversationsByDayChart";+import { DataComplexityCards } from "./DataComplexityCards";+import {+ type StatsFilters,+ type UsageStatsMetric,+ buildGroupBreakoutQuery,+ buildSourceBreakoutQuery,+ buildTenantBreakoutQuery,+ tableForMetric,+} from "./query-utils";+import type { ChartDataSources, ChartProps } from "./types";+import { statsUrlStateConfig } from "./utils";++const sourceTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`Conversations by source`;+ },+ get messages() {+ return t`Messages by source`;+ },+ get tokens() {+ return t`Tokens by source`;+ },+};++const profileTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`Conversations by profile`;+ },+ get messages() {+ return t`Messages by profile`;+ },+ get tokens() {+ return t`Tokens by profile`;+ },+};++const userTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`Users with most conversations`;+ },+ get messages() {+ return t`Users with most messages`;+ },+ get tokens() {+ return t`Users with most tokens`;+ },+};++const groupTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`Groups with most conversations`;+ },+ get messages() {+ return t`Groups with most messages`;+ },+ get tokens() {+ return t`Groups with most tokens`;+ },+};++const ipAddressTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`IP addresses with most conversations`;+ },+ get messages() {+ return t`IP addresses with most messages`;+ },+ get tokens() {+ return t`IP addresses with most tokens`;+ },+};++const tenantTitles: Record<UsageStatsMetric, string> = {+ get conversations() {+ return t`Tenants with most conversations`;+ },+ get messages() {+ return t`Tenants with most messages`;+ },+ get tokens() {+ return t`Tenants with most tokens`;+ },+};++const buildSourceQuery = (opts: StatsFilters & ChartDataSources) =>+ buildSourceBreakoutQuery({ ...opts, breakoutColumn: "source_name" });++const buildProfileQuery = (opts: StatsFilters & ChartDataSources) =>+ buildSourceBreakoutQuery({ ...opts, breakoutColumn: "profile_name" });++const buildUserQuery = (opts: StatsFilters & ChartDataSources) =>+ buildSourceBreakoutQuery({ ...opts, breakoutColumn: "user_display_name" });++const buildIpAddressQuery = (opts: StatsFilters & ChartDataSources) =>+ buildSourceBreakoutQuery({ ...opts, breakoutColumn: "ip_address" });++const labelUnknownIpAddress = (value: unknown) =>+ value == null ? t`Unknown` : value;++export function ConversationStatsPage({ location }: WithRouterProps) {+ const dispatch = useDispatch();+ const [{ date, user, group, tenant, metric }, { patchUrlState }] =+ useUrlState(location, statsUrlStateConfig);++ const {+ dateFilter,+ userId,+ groupId,+ groupNoFilterValue,+ tenantId,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ } = useFilterOptions({ date, user, group, tenant });++ const conversationsAudit = useAuditTable(VIEW_CONVERSATIONS);+ const usageLogAudit = useAuditTable(VIEW_USAGE_LOG);+ const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);++ const sharedChartProps: ChartProps = {+ provider: conversationsAudit.provider,+ table: tableForMetric(+ metric,+ conversationsAudit.table,+ usageLogAudit.table,+ ),+ groupMembersTable: groupMembersAudit.table,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ };++ const tenantNameById = useMemo(() => {+ const map = new Map<string, string>();+ for (const opt of tenantOptions) {+ map.set(opt.value, opt.label);+ }+ return map;+ }, [tenantOptions]);++ const labelTenantName = useCallback(+ (value: unknown) =>+ value == null+ ? value+ : (tenantNameById.get(String(value)) ?? String(value)),+ [tenantNameById],+ );++ const navigateToConversations = useCallback(+ (filterOverrides: Partial<ConversationsUrlState>) => {+ dispatch(+ push({+ pathname: "/admin/metabot/usage-auditing/conversations",+ query: conversationsUrlStateConfig.serialize({+ page: 0,+ sort_column: "created_at",+ sort_direction: "desc",+ date,+ user,+ group,+ tenant,+ ...filterOverrides,+ }),+ }),+ );+ },+ [dispatch, date, user, group, tenant],+ );++ const handleDayClick = useCallback(+ (value: string) => {+ const bucketStart = dayjs(value);+ const dateStr = isSingleDayFilter(dateFilter)+ ? serializeDateParameterValue({+ type: "specific",+ operator: "between",+ values: [bucketStart.toDate(), bucketStart.add(1, "hour").toDate()],+ hasTime: true,+ })+ : bucketStart.format("YYYY-MM-DD");++ navigateToConversations({ date: dateStr });+ },+ [dateFilter, navigateToConversations],+ );++ const handleUserClick = useCallback(+ (displayName: string) => {+ const match = userOptions.find((opt) => opt.label === displayName);+ if (match) {+ navigateToConversations({ user: match.value });+ }+ },+ [navigateToConversations, userOptions],+ );++ const handleGroupClick = useCallback(+ (groupName: string) => {+ const match = groupOptions.find((opt) => opt.label === groupName);+ if (match) {+ navigateToConversations({ group: match.value });+ }+ },+ [groupOptions, navigateToConversations],+ );++ const handleTenantClick = useCallback(+ (tenantName: string) => {+ const match = tenantOptions.find((opt) => opt.label === tenantName);+ if (match) {+ navigateToConversations({ tenant: match.value });+ }+ },+ [navigateToConversations, tenantOptions],+ );++ return (+ <MetabotAdminLayout fullWidth>+ <SettingsPageWrapper mt="sm" title={t`Usage stats`}>+ <DataComplexitySection />+ <Flex align="center" justify="space-between">+ <Title order={3} display="flex" style={{ alignItems: "center" }}>+ {t`Usage metrics`}+ </Title>++ <ConversationFilters+ date={date}+ onDateChange={(val) => patchUrlState({ date: val })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val })}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val })}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val })}+ userOptions={userOptions}+ groupOptions={groupOptions}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />+ </Flex>++ <Tabs+ variant="pills"+ value={metric}+ onChange={(val) => patchUrlState({ metric: val as UsageStatsMetric })}+ >+ <Tabs.List className={S.metricTabs}>+ <Tabs.Tab+ className={S.metricTab}+ value="conversations"+ >{t`Conversations`}</Tabs.Tab>+ <Tabs.Tab+ className={S.metricTab}+ value="tokens"+ >{t`Tokens`}</Tabs.Tab>+ <Tabs.Tab+ className={S.metricTab}+ value="messages"+ >{t`Messages`}</Tabs.Tab>+ </Tabs.List>+ </Tabs>++ <ConversationsByDayChart+ {...sharedChartProps}+ onDimensionClick={handleDayClick}+ />++ <SimpleGrid cols={2} spacing="lg">+ <BreakoutChart+ {...sharedChartProps}+ titles={sourceTitles}+ display="bar"+ buildQuery={buildSourceQuery}+ />+ <BreakoutChart+ {...sharedChartProps}+ titles={profileTitles}+ display="bar"+ buildQuery={buildProfileQuery}+ />+ </SimpleGrid>++ <SimpleGrid cols={hasTenants ? 2 : 3} spacing="lg">+ {hasTenants && (+ <BreakoutChart+ {...sharedChartProps}+ titles={tenantTitles}+ display="row"+ buildQuery={buildTenantBreakoutQuery}+ labelMapper={labelTenantName}+ onDimensionClick={handleTenantClick}+ h={500}+ />+ )}+ <BreakoutChart+ {...sharedChartProps}+ titles={groupTitles}+ display="row"+ buildQuery={(opts) =>+ buildGroupBreakoutQuery({ ...opts, excludeAllUsers: !hasTenants })+ }+ onDimensionClick={handleGroupClick}+ h={500}+ />+ <BreakoutChart+ {...sharedChartProps}+ titles={userTitles}+ display="row"+ buildQuery={buildUserQuery}+ onDimensionClick={handleUserClick}+ h={500}+ />+ <BreakoutChart+ {...sharedChartProps}+ titles={ipAddressTitles}+ display="row"+ buildQuery={buildIpAddressQuery}+ labelMapper={labelUnknownIpAddress}+ h={500}+ />+ </SimpleGrid>+ </SettingsPageWrapper>+ </MetabotAdminLayout>+ );+}++export function DataComplexitySection() {+ const hasDataComplexityFeature = hasPremiumFeature("data-complexity-score");++ if (!hasDataComplexityFeature) {+ return null;+ }++ return (+ <>+ <DataComplexityHeader />+ <DataComplexityCards />+ </>+ );+}++export function DataComplexityHeader() {+ const [+ refreshDataComplexityScores,+ { isLoading: refreshDataComplexityScoresLoading },+ ] = useRefreshDataComplexityScoresMutation();+ const [sendToast] = useToast();++ const handleRecompute = useCallback(async () => {+ try {+ await refreshDataComplexityScores().unwrap();+ } catch (error) {+ sendToast({+ icon: "warning",+ toastColor: "error",+ message: getErrorMessage(+ error,+ t`Could not recompute data complexity.`,+ ),+ });+ }+ }, [refreshDataComplexityScores, sendToast]);++ return (+ <Flex align="center" justify="space-between">+ <Title order={3} display="flex" style={{ alignItems: "center" }}>+ {t`Data complexity`}+ </Title>++ <Flex gap="sm" wrap="wrap" align="center">+ <Button+ variant="default"+ onClick={handleRecompute}+ loading={refreshDataComplexityScoresLoading}+ disabled={refreshDataComplexityScoresLoading}+ >+ {t`Recompute`}+ </Button>+ </Flex>+ </Flex>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsxnew file mode 100644index 00000000000..4bc4c385dba--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx@@ -0,0 +1,230 @@+import dayjs from "dayjs";+import { useMemo } from "react";+import { t } from "ttag";++import type { DateFilterValue } from "metabase/querying/common/types";+import { Skeleton, useMantineTheme } from "metabase/ui";+import type { Query } from "metabase-lib";+import * as Lib from "metabase-lib";++import { useAdhocBreakoutQuery } from "../../hooks/useAdhocBreakoutQuery";++import { BreakoutChartCard } from "./BreakoutChartCard";+import {+ type GetColor,+ type StatsFilters,+ type UsageStatsMetric,+ applyDateFilter,+ applyIdFilter,+ applyUsageStatsAggregation,+ findColumn,+ getMetricSeriesSettings,+ joinGroupMembers,+} from "./query-utils";+import {+ type ChartDataSources,+ type ChartInnerProps,+ type ChartProps,+ DEFAULT_CHART_HEIGHT,+} from "./types";++type BucketName = "day" | "hour";++export function isSingleDayFilter(dateFilter: DateFilterValue): boolean {+ if (dateFilter.type === "relative") {+ return dateFilter.unit === "day" && Math.abs(dateFilter.value) <= 1;+ }+ if (dateFilter.type === "specific" && !dateFilter.hasTime) {+ const { operator, values } = dateFilter;+ if (operator === "=") {+ return true;+ }+ if (operator === "between") {+ return dayjs(values[0]).isSame(values[1], "day");+ }+ }+ return false;+}++const TITLES: Record<BucketName, Record<UsageStatsMetric, string>> = {+ day: {+ get conversations() {+ return t`Conversations by day`;+ },+ get messages() {+ return t`Messages by day`;+ },+ get tokens() {+ return t`Tokens by day`;+ },+ },+ hour: {+ get conversations() {+ return t`Conversations by hour`;+ },+ get messages() {+ return t`Messages by hour`;+ },+ get tokens() {+ return t`Tokens by hour`;+ },+ },+};++export function ConversationsByDayChart({+ provider,+ table,+ groupMembersTable,+ h = DEFAULT_CHART_HEIGHT,+ ...rest+}: ChartProps) {+ if (!provider || !table || !groupMembersTable) {+ return <Skeleton h={h} />;+ }+ return (+ <ConversationsByDayChartInner+ provider={provider}+ table={table}+ groupMembersTable={groupMembersTable}+ h={h}+ {...rest}+ />+ );+}++function ConversationsByDayChartInner({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ onDimensionClick,+ h,+}: ChartInnerProps) {+ const bucketName: BucketName = isSingleDayFilter(dateFilter) ? "hour" : "day";++ const query = useMemo(+ () =>+ buildTimeseriesBreakoutQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ bucketName,+ }),+ [+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ bucketName,+ ],+ );++ const { data, jsQuery, isFetching } = useAdhocBreakoutQuery(query);+ const { themeColor } = useMantineTheme().fn;++ const rawSeries = useMemo(+ () => toTimeseriesRawSeries(data, jsQuery, metric, themeColor),+ [data, jsQuery, metric, themeColor],+ );++ return (+ <BreakoutChartCard+ title={TITLES[bucketName][metric]}+ rawSeries={rawSeries}+ isFetching={isFetching}+ display="area"+ h={h}+ otherLabel={t`Other`}+ onDimensionClick={onDimensionClick}+ />+ );+}++type BuildQueryOpts = StatsFilters &+ ChartDataSources & { bucketName: BucketName };++export function buildTimeseriesBreakoutQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ bucketName,+}: BuildQueryOpts): Query {+ let q = Lib.queryFromTableOrCardMetadata(provider, table);+ q = applyDateFilter(q, dateFilter);+ q = applyIdFilter(q, "user_id", userId);+ q = applyIdFilter(q, "tenant_id", tenantId);+ q = groupId != null ? joinGroupMembers(q, groupMembersTable) : q;+ q = groupId != null ? applyIdFilter(q, "group_id", groupId) : q;+ q = applyUsageStatsAggregation(q, metric);+ q = breakoutByCreatedAtBucket(q, bucketName);+ return q;+}++function breakoutByCreatedAtBucket(+ query: Query,+ bucketName: BucketName,+): Query {+ const col = findColumn(query, "created_at", Lib.breakoutableColumns);+ if (!col) {+ return query;+ }+ const bucket = Lib.availableTemporalBuckets(query, 0, col).find((b) => {+ return Lib.displayInfo(query, 0, b).shortName === bucketName;+ });+ const bucketed = bucket ? Lib.withTemporalBucket(col, bucket) : col;+ return Lib.breakout(query, 0, bucketed);+}++function toTimeseriesRawSeries(+ data: ReturnType<typeof useAdhocBreakoutQuery>["data"],+ jsQuery: ReturnType<typeof useAdhocBreakoutQuery>["jsQuery"],+ metric: UsageStatsMetric,+ getColor: GetColor,+) {+ if (!data?.data || !jsQuery) {+ return null;+ }++ const aggregationColumnNames = data.data.cols+ .filter((c) => c.source === "aggregation")+ .map((c) => c.name);+ const isMultiSeriesTokens =+ metric === "tokens" && aggregationColumnNames.length === 2;++ return [+ {+ data: data.data,+ card: {+ dataset_query: jsQuery,+ display: isMultiSeriesTokens ? "line" : "area",+ visualization_settings: {+ "graph.x_axis.scale": "timeseries",+ "graph.x_axis.title_text": "",+ "graph.y_axis.title_text": "",+ "line.interpolate": "cardinal",+ ...getMetricSeriesSettings(metric, getColor, aggregationColumnNames, {+ dualAxis: true,+ }),+ },+ },+ },+ ];+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsxnew file mode 100644index 00000000000..4f74161cddf--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.tsx@@ -0,0 +1,350 @@+import { useDisclosure } from "@mantine/hooks";+import { P, match } from "ts-pattern";+import { msgid, ngettext, t } from "ttag";++import { getErrorMessage } from "metabase/api/utils";+import {+ Alert,+ Box,+ Button,+ Card,+ Flex,+ Group,+ Icon,+ Modal,+ SimpleGrid,+ Skeleton,+ Stack,+ Text,+ UnstyledButton,+} from "metabase/ui";+import { formatNumber } from "metabase/utils/formatting";+import { hasPremiumFeature } from "metabase-enterprise/settings";++import { useGetDataComplexityScoresQuery } from "../../api";+import type {+ DataComplexityCatalog,+ DataComplexityCatalogId,+ DataComplexityComponentId,+} from "../../types";++const CATALOG_IDS: DataComplexityCatalogId[] = [+ "library",+ "universe",+ "metabot",+];++type DataComplexityComponentGroupId = "size" | "ambiguity";++const COMPONENT_GROUPS: {+ groupId: DataComplexityComponentGroupId;+ componentIds: DataComplexityComponentId[];+}[] = [+ {+ groupId: "size",+ componentIds: ["entity_count", "field_count"],+ },+ {+ groupId: "ambiguity",+ componentIds: ["name_collisions", "synonym_pairs", "repeated_measures"],+ },+];++function DataComplexityCardSkeleton() {+ return (+ <Card withBorder shadow="none" p="md">+ <Box my={5} w="70%">+ <Skeleton h={14} />+ </Box>+ <Box my={5} w="40%">+ <Skeleton h={14} />+ </Box>+ <Stack align="center" gap={0} my="sm">+ <Skeleton h="4rem" w="30%" />+ </Stack>+ </Card>+ );+}++function DataComplexityCard({+ catalogId,+ catalog,+}: {+ catalogId: DataComplexityCatalogId;+ catalog: DataComplexityCatalog;+}) {+ const [isModalOpen, { close, open }] = useDisclosure();+ const { title, subtitle } = match(catalogId)+ .with("library", () => ({+ title: t`Curated semantic layer`,+ subtitle: t`Models and metrics from the curated Library subset.`,+ }))+ .with("universe", () => ({+ title: t`Full semantic layer`,+ subtitle: t`Library entities plus every active physical table.`,+ }))+ .with("metabot", () => ({+ title: t`Metabot-visible layer`,+ subtitle: t`The subset the internal Metabot can surface with its current scope.`,+ }))+ .exhaustive();++ return (+ <Card withBorder shadow="none" p="md">+ <UnstyledButton onClick={open}>+ <Flex align="center" justify="space-between" gap="sm">+ <Text fw={700}>{title}</Text>+ <Icon name="chevronright" size={12} c="text-tertiary" />+ </Flex>+ <Text c="text-secondary">{subtitle}</Text>+ {match(catalog.total)+ .with(P.number, (total) => (+ <Stack align="center" gap="sm" my="sm">+ <Text size="4rem" fw={700}>+ {formatNumber(total, { maximumFractionDigits: 0 })}+ </Text>+ <Text c="text-secondary">{t`Lower is better`}</Text>+ </Stack>+ ))+ .otherwise(() => (+ <Stack gap={4} my="sm">+ <Text c="error" fw={700}>{t`Score unavailable`}</Text>+ <Text c="text-secondary">{t`Open for component details.`}</Text>+ </Stack>+ ))}+ </UnstyledButton>++ <Modal opened={isModalOpen} onClose={close} title={title} size="lg">+ <Stack gap="lg">+ <Text size="sm" c="text-secondary">+ {subtitle}+ </Text>+ <DataComplexityBreakdown catalog={catalog} />+ <Group justify="flex-end">+ <Button variant="default" onClick={close}>{t`Close`}</Button>+ </Group>+ </Stack>+ </Modal>+ </Card>+ );+}++function DataComplexityBreakdown({+ catalog,+}: {+ catalog: DataComplexityCatalog;+}) {+ const hasError = catalog.total == null;++ return (+ <Stack gap="lg">+ {hasError && (+ <Alert color="warning" icon={<Icon name="warning" />}>+ {t`Some component scores could not be computed.`}+ </Alert>+ )}++ {COMPONENT_GROUPS.map(({ groupId, componentIds }) => {+ const { title, description } = match(groupId)+ .with("size", () => ({+ title: t`Size`,+ description: t`How much surface area this layer exposes.`,+ }))+ .with("ambiguity", () => ({+ title: t`Ambiguity`,+ description: t`Signals that similar or repeated names could make answers harder to trust.`,+ }))+ .exhaustive();++ return (+ <Box key={groupId}>+ <Text fw={700}>{title}</Text>+ <Text size="sm" c="text-secondary">+ {description}+ </Text>++ <Stack gap="sm" mt="md">+ {componentIds.map((componentId) => (+ <DataComplexityComponentItem+ key={componentId}+ componentId={componentId}+ catalog={catalog}+ />+ ))}+ </Stack>+ </Box>+ );+ })}+ </Stack>+ );+}++function DataComplexityComponentItem({+ componentId,+ catalog,+}: {+ componentId: DataComplexityComponentId;+ catalog: DataComplexityCatalog;+}) {+ const component = catalog.components[componentId];+ const measurement = component.measurement;++ const { title, description, count } = match(componentId)+ .with("entity_count", () => ({+ title: t`Entity count`,+ description: t`How many tables, models, and metrics are included in this layer.`,+ count:+ measurement !== null &&+ ngettext(+ msgid`${measurement} entity`,+ `${measurement} entities`,+ measurement,+ ),+ }))+ .with("name_collisions", () => ({+ title: t`Name collisions`,+ description: t`Exact duplicate names after normalization, which can make entities harder to distinguish.`,+ count:+ measurement !== null &&+ ngettext(+ msgid`${measurement} collision`,+ `${measurement} collisions`,+ measurement,+ ),+ }))+ .with("synonym_pairs", () => ({+ title: t`Synonym pairs`,+ description: t`Pairs of entity names that are semantically similar enough to be treated as possible synonyms.`,+ count:+ measurement !== null &&+ ngettext(+ msgid`${measurement} similar pair`,+ `${measurement} similar pairs`,+ measurement,+ ),+ }))+ .with("field_count", () => ({+ title: t`Field count`,+ description: t`Active physical-table fields exposed through this layer.`,+ count:+ measurement !== null &&+ ngettext(+ msgid`${measurement} field`,+ `${measurement} fields`,+ measurement,+ ),+ }))+ .with("repeated_measures", () => ({+ title: t`Repeated measures`,+ description: t`Duplicate measure names across included tables.`,+ count:+ measurement !== null &&+ ngettext(+ msgid`${measurement} repeated name`,+ `${measurement} repeated names`,+ measurement,+ ),+ }))+ .exhaustive();++ return (+ <Box+ p="md"+ bdrs="md"+ bg="background-secondary"+ style={{+ border: "1px solid var(--mb-color-border)",+ }}+ >+ <Flex gap="md" justify="space-between" align="flex-start">+ <Group gap="sm" align="flex-start" wrap="nowrap" flex={1}>+ <Box>+ <Text fw={700}>{title}</Text>+ <Text size="sm" c="text-secondary">+ {description}+ </Text>+ {component.score === null && (+ <Text mt="sm" size="sm" c="error" role="alert">+ {component.error}+ </Text>+ )}+ </Box>+ </Group>++ {count !== false && (+ <Box+ px="sm"+ py={4}+ bdrs="sm"+ bg="background-primary"+ style={{+ border: "1px solid var(--mb-color-border)",+ flexShrink: 0,+ }}+ >+ <Text+ size="sm"+ fw={700}+ c="text-secondary"+ style={{ whiteSpace: "nowrap" }}+ >+ {count}+ </Text>+ </Box>+ )}+ </Flex>+ </Box>+ );+}++export function DataComplexityCards() {+ const hasDataComplexityFeature = hasPremiumFeature("data-complexity-score");+ const {+ data,+ isLoading,+ error: queryError,+ } = useGetDataComplexityScoresQuery(undefined, {+ skip: !hasDataComplexityFeature,+ });++ if (!hasDataComplexityFeature) {+ return null;+ }++ return (+ <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">+ {match({ isLoading, queryError, data })+ .with({ isLoading: true }, () =>+ CATALOG_IDS.map((catalogId) => (+ <DataComplexityCardSkeleton key={catalogId} />+ )),+ )+ .with(+ { queryError: P.nonNullable },+ { data: P.nullish },+ ({ queryError }) => (+ <Card+ withBorder+ shadow="none"+ p="md"+ style={{ gridColumn: "1 / -1" }}+ >+ <Text fw={700}>{t`Data complexity scores`}</Text>+ <Text mt="xs" size="sm" c="text-secondary">+ {getErrorMessage(+ queryError,+ t`Data complexity scores are unavailable right now.`,+ )}+ </Text>+ </Card>+ ),+ )+ .with({ data: P.nonNullable }, ({ data }) =>+ CATALOG_IDS.map((key) => (+ <DataComplexityCard key={key} catalogId={key} catalog={data[key]} />+ )),+ )+ .exhaustive()}+ </SimpleGrid>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsxnew file mode 100644index 00000000000..a2dd4ac5f74--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityCards.unit.spec.tsx@@ -0,0 +1,157 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";++import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen, within } from "__support__/ui";+import type { TokenFeatures } from "metabase-types/api";+import { createMockTokenFeatures } from "metabase-types/api/mocks";++import type { DataComplexityScoresResponse } from "../../types";++import { DataComplexityCards } from "./DataComplexityCards";++/* eslint-disable testing-library/no-node-access -- Snapshot cleanup is applied to a cloned DOM tree. */+const cleanForSnapshot = (element: Element) => {+ const clone = element.cloneNode(true) as Element;+ clone.querySelectorAll("style").forEach((style) => style.remove());+ [clone, ...Array.from(clone.querySelectorAll("*"))].forEach((node) => {+ node.removeAttribute("class");+ node.removeAttribute("style");+ node.removeAttribute("id");+ node.removeAttribute("aria-describedby");+ node.removeAttribute("aria-labelledby");+ });++ return clone;+};+/* eslint-enable testing-library/no-node-access */++const mockScores: DataComplexityScoresResponse = {+ library: {+ total: 18,+ components: {+ entity_count: { measurement: 1, score: 10 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 8, score: 8 },+ repeated_measures: { measurement: 0, score: 0 },+ },+ },+ universe: {+ total: 54,+ components: {+ entity_count: { measurement: 2, score: 20 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 24, score: 24 },+ repeated_measures: { measurement: 5, score: 10 },+ },+ },+ metabot: {+ total: 30,+ components: {+ entity_count: { measurement: 1, score: 10 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 20, score: 20 },+ repeated_measures: { measurement: 0, score: 0 },+ },+ },+ meta: {+ formula_version: 3,+ synonym_threshold: 0.9,+ },+};++const mockScoresWithError: DataComplexityScoresResponse = {+ ...mockScores,+ metabot: {+ total: null,+ components: {+ ...mockScores.metabot.components,+ synonym_pairs: {+ measurement: null,+ score: null,+ error: "Embedding service timed out",+ },+ },+ },+};++function renderDataComplexityCards(+ tokenFeatures: Partial<TokenFeatures> = { "data-complexity-score": true },+) {+ return renderWithProviders(<DataComplexityCards />, {+ storeInitialState: {+ settings: mockSettings({+ "token-features": createMockTokenFeatures(tokenFeatures),+ }),+ },+ });+}++describe("DataComplexityCards", () => {+ it("does not fetch scores without a Data Complexity Score entitlement", () => {+ renderDataComplexityCards({});++ expect(+ screen.queryByText("Curated semantic layer"),+ ).not.toBeInTheDocument();+ expect(+ fetchMock.callHistory.called(+ "path:/api/ee/data-complexity-score/complexity",+ ),+ ).toBe(false);+ });++ it("renders the data complexity cards", async () => {+ fetchMock.get("path:/api/ee/data-complexity-score/complexity", mockScores);++ const { container } = renderDataComplexityCards();++ expect(+ await screen.findByText("Curated semantic layer"),+ ).toBeInTheDocument();+ expect(cleanForSnapshot(container)).toMatchSnapshot();++ await userEvent.click(screen.getByText("Curated semantic layer"));+ const modal = await screen.findByRole("dialog");++ expect(cleanForSnapshot(modal)).toMatchSnapshot();+ });++ it("shows a fallback message when the complexity endpoint fails", async () => {+ fetchMock.get("path:/api/ee/data-complexity-score/complexity", 500);++ renderDataComplexityCards();++ expect(+ await screen.findByText("Data complexity scores"),+ ).toBeInTheDocument();+ expect(+ screen.getByText("Data complexity scores are unavailable right now."),+ ).toBeInTheDocument();+ });++ it("shows component errors inside the modal", async () => {+ fetchMock.get(+ "path:/api/ee/data-complexity-score/complexity",+ mockScoresWithError,+ );++ renderDataComplexityCards();++ expect(+ await screen.findByText("Metabot-visible layer"),+ ).toBeInTheDocument();+ expect(screen.getByText("Score unavailable")).toBeInTheDocument();++ await userEvent.click(screen.getByText("Metabot-visible layer"));+ const modal = within(await screen.findByRole("dialog"));++ expect(+ await modal.findByText("Some component scores could not be computed."),+ ).toBeInTheDocument();+ expect(modal.getByText("Embedding service timed out")).toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsxnew file mode 100644index 00000000000..f7366273806--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexityHeader.unit.spec.tsx@@ -0,0 +1,77 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";++import { act, renderWithProviders, screen, waitFor } from "__support__/ui";+import { UndoListing } from "metabase/common/components/UndoListing";++import { DataComplexityHeader } from "./ConversationStatsPage";++describe("DataComplexityHeader", () => {+ it("recomputes data complexity scores when the recompute button is clicked", async () => {+ fetchMock.get("path:/api/ee/data-complexity-score/complexity", {});++ renderWithProviders(<DataComplexityHeader />);++ await userEvent.click(screen.getByRole("button", { name: "Recompute" }));++ await waitFor(() => {+ expect(+ fetchMock.callHistory.called(+ "path:/api/ee/data-complexity-score/complexity",+ {+ method: "GET",+ query: { "force-recalculation": "true" },+ },+ ),+ ).toBe(true);+ });+ });++ it("disables the recompute button while recomputation is running", async () => {+ let resolveRequest!: (value: unknown) => void;+ const pendingResponse = new Promise((resolve) => {+ resolveRequest = resolve;+ });++ fetchMock.get(+ "path:/api/ee/data-complexity-score/complexity",+ pendingResponse,+ );++ renderWithProviders(<DataComplexityHeader />);++ const button = screen.getByRole("button", { name: "Recompute" });+ await userEvent.click(button);++ await waitFor(() => {+ expect(button).toBeDisabled();+ });++ await act(async () => {+ resolveRequest({});+ });++ await waitFor(() => {+ expect(button).toBeEnabled();+ });+ });++ it("shows a toast when recomputation fails", async () => {+ fetchMock.get("path:/api/ee/data-complexity-score/complexity", 500);++ renderWithProviders(+ <>+ <DataComplexityHeader />+ <UndoListing />+ </>,+ );++ await userEvent.click(screen.getByRole("button", { name: "Recompute" }));++ await waitFor(() => {+ expect(+ screen.getByText("Could not recompute data complexity."),+ ).toBeInTheDocument();+ });+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsxnew file mode 100644index 00000000000..20858c1b809--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/DataComplexitySection.unit.spec.tsx@@ -0,0 +1,81 @@+import fetchMock from "fetch-mock";++import { mockSettings } from "__support__/settings";+import { renderWithProviders, screen } from "__support__/ui";+import type { TokenFeatures } from "metabase-types/api";+import { createMockTokenFeatures } from "metabase-types/api/mocks";++import type { DataComplexityScoresResponse } from "../../types";++import { DataComplexitySection } from "./ConversationStatsPage";++const mockScores: DataComplexityScoresResponse = {+ library: {+ total: 18,+ components: {+ entity_count: { measurement: 1, score: 10 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 8, score: 8 },+ repeated_measures: { measurement: 0, score: 0 },+ },+ },+ universe: {+ total: 54,+ components: {+ entity_count: { measurement: 2, score: 20 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 24, score: 24 },+ repeated_measures: { measurement: 5, score: 10 },+ },+ },+ metabot: {+ total: 30,+ components: {+ entity_count: { measurement: 1, score: 10 },+ name_collisions: { measurement: 0, score: 0 },+ synonym_pairs: { measurement: 0, score: 0 },+ field_count: { measurement: 20, score: 20 },+ repeated_measures: { measurement: 0, score: 0 },+ },+ },+ meta: {+ formula_version: 3,+ synonym_threshold: 0.9,+ },+};++function renderDataComplexitySection(tokenFeatures: Partial<TokenFeatures>) {+ return renderWithProviders(<DataComplexitySection />, {+ storeInitialState: {+ settings: mockSettings({+ "token-features": createMockTokenFeatures(tokenFeatures),+ }),+ },+ });+}++describe("DataComplexitySection", () => {+ it("does not render data complexity or fetch scores without a Data Complexity Score entitlement", () => {+ renderDataComplexitySection({});++ expect(screen.queryByText("Data complexity")).not.toBeInTheDocument();+ expect(+ fetchMock.callHistory.called(+ "path:/api/ee/data-complexity-score/complexity",+ ),+ ).toBe(false);+ });++ it("renders data complexity with the Data Complexity Score entitlement", async () => {+ fetchMock.get("path:/api/ee/data-complexity-score/complexity", mockScores);++ renderDataComplexitySection({ "data-complexity-score": true });++ expect(screen.getByText("Data complexity")).toBeInTheDocument();+ expect(+ await screen.findByText("Curated semantic layer"),+ ).toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snapnew file mode 100644index 00000000000..dc73ee92aff--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap@@ -0,0 +1,361 @@+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing++exports[`DataComplexityCards renders the data complexity cards 1`] = `+<div>+ <div>+ <div+ data-with-border="true"+ >+ <button+ type="button"+ >+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Curated semantic layer+ </div>+ <svg+ aria-label="chevronright icon"+ height="12"+ role="img"+ width="12"+ />+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ Models and metrics from the curated Library subset.+ </div>+ <div>+ <div+ color="text-primary"+ >+ 18+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ Lower is better+ </div>+ </div>+ </button>+ </div>+ <div+ data-with-border="true"+ >+ <button+ type="button"+ >+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Full semantic layer+ </div>+ <svg+ aria-label="chevronright icon"+ height="12"+ role="img"+ width="12"+ />+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ Library entities plus every active physical table.+ </div>+ <div>+ <div+ color="text-primary"+ >+ 54+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ Lower is better+ </div>+ </div>+ </button>+ </div>+ <div+ data-with-border="true"+ >+ <button+ type="button"+ >+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Metabot-visible layer+ </div>+ <svg+ aria-label="chevronright icon"+ height="12"+ role="img"+ width="12"+ />+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ The subset the internal Metabot can surface with its current scope.+ </div>+ <div>+ <div+ color="text-primary"+ >+ 30+ </div>+ <div+ color="text-primary"+ data-size="md"+ >+ Lower is better+ </div>+ </div>+ </button>+ </div>+ </div>+</div>+`;++exports[`DataComplexityCards renders the data complexity cards 2`] = `+<section+ aria-modal="true"+ data-modal-content="true"+ role="dialog"+ tabindex="-1"+>+ <header>+ <h2>+ Curated semantic layer+ </h2>+ <button+ aria-label="Close"+ data-variant="subtle"+ type="button"+ >+ <svg+ fill="none"+ viewBox="0 0 15 15"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ clip-rule="evenodd"+ d="M11.7816 4.03157C12.0062 3.80702 12.0062 3.44295 11.7816 3.2184C11.5571 2.99385 11.193 2.99385 10.9685 3.2184L7.50005 6.68682L4.03164 3.2184C3.80708 2.99385 3.44301 2.99385 3.21846 3.2184C2.99391 3.44295 2.99391 3.80702 3.21846 4.03157L6.68688 7.49999L3.21846 10.9684C2.99391 11.193 2.99391 11.557 3.21846 11.7816C3.44301 12.0061 3.80708 12.0061 4.03164 11.7816L7.50005 8.31316L10.9685 11.7816C11.193 12.0061 11.5571 12.0061 11.7816 11.7816C12.0062 11.557 12.0062 11.193 11.7816 10.9684L8.31322 7.49999L11.7816 4.03157Z"+ fill="currentColor"+ fill-rule="evenodd"+ />+ </svg>+ </button>+ </header>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Models and metrics from the curated Library subset.+ </div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Size+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ How much surface area this layer exposes.+ </div>+ <div>+ <div>+ <div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Entity count+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ How many tables, models, and metrics are included in this layer.+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ 1 entity+ </div>+ </div>+ </div>+ </div>+ <div>+ <div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Field count+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Active physical-table fields exposed through this layer.+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ 8 fields+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Ambiguity+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Signals that similar or repeated names could make answers harder to trust.+ </div>+ <div>+ <div>+ <div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Name collisions+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Exact duplicate names after normalization, which can make entities harder to distinguish.+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ 0 collisions+ </div>+ </div>+ </div>+ </div>+ <div>+ <div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Synonym pairs+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Pairs of entity names that are semantically similar enough to be treated as possible synonyms.+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ 0 similar pairs+ </div>+ </div>+ </div>+ </div>+ <div>+ <div>+ <div>+ <div>+ <div+ color="text-primary"+ data-size="md"+ >+ Repeated measures+ </div>+ <div+ color="text-primary"+ data-size="sm"+ >+ Duplicate measure names across included tables.+ </div>+ </div>+ </div>+ <div>+ <div+ color="text-primary"+ data-size="sm"+ >+ 0 repeated names+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ <div>+ <button+ data-size="md"+ data-variant="default"+ type="button"+ >+ <span>+ <span>+ Close+ </span>+ </span>+ </button>+ </div>+ </div>+ </div>+</section>+`;diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snap b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snapnew file mode 100644index 00000000000..33c012d9c39--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/__snapshots__/query-snapshots.unit.spec.ts.snap@@ -0,0 +1,174 @@+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing++exports[`buildGroupBreakoutQuery all filters 1`] = `+"filters: ["created_at is in the previous 30 days or today", "user_id is 42", "tenant_id is 7", "group_id is not 1", "group_id is 5"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["group_name"]"+`;++exports[`buildGroupBreakoutQuery by metric conversations 1`] = `+"filters: ["created_at is in the previous 30 days or today", "group_id is not 1"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["count()"]+breakouts: ["group_name"]+orderBys: ["count desc"]"+`;++exports[`buildGroupBreakoutQuery by metric messages 1`] = `+"filters: ["created_at is in the previous 30 days or today", "group_id is not 1"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(message_count)"]+breakouts: ["group_name"]+orderBys: ["sum desc"]"+`;++exports[`buildGroupBreakoutQuery by metric tokens 1`] = `+"filters: ["created_at is in the previous 30 days or today", "group_id is not 1"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["group_name"]"+`;++exports[`buildGroupBreakoutQuery excludeAllUsers=false 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["count()"]+breakouts: ["group_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery all filters 1`] = `+"filters: ["created_at is in the previous 30 days or today", "user_id is 42", "tenant_id is 7", "group_id is 5"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["source_name"]"+`;++exports[`buildSourceBreakoutQuery by breakoutColumn ip_address 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["count()"]+breakouts: ["ip_address"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery by breakoutColumn profile_name 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["count()"]+breakouts: ["profile_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery by breakoutColumn user_display_name 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["count()"]+breakouts: ["user_display_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery by metric conversations 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["count()"]+breakouts: ["source_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery by metric messages 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["sum(message_count)"]+breakouts: ["source_name"]+orderBys: ["sum desc"]"+`;++exports[`buildSourceBreakoutQuery by metric tokens 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["source_name"]"+`;++exports[`buildSourceBreakoutQuery single filter dateFilter specific 1`] = `+"filters: ["created_at is on Apr 17, 2026"]+aggregations: ["count()"]+breakouts: ["source_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery single filter groupId 1`] = `+"filters: ["created_at is in the previous 30 days or today", "group_id is 5"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["count()"]+breakouts: ["source_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery single filter tenantId 1`] = `+"filters: ["created_at is in the previous 30 days or today", "tenant_id is 7"]+aggregations: ["count()"]+breakouts: ["source_name"]+orderBys: ["count desc"]"+`;++exports[`buildSourceBreakoutQuery single filter userId 1`] = `+"filters: ["created_at is in the previous 30 days or today", "user_id is 42"]+aggregations: ["count()"]+breakouts: ["source_name"]+orderBys: ["count desc"]"+`;++exports[`buildTenantBreakoutQuery all filters 1`] = `+"filters: ["created_at is in the previous 30 days or today", "user_id is 42", "tenant_id is 7", "tenant_id is not empty", "group_id is 5"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["tenant_id"]"+`;++exports[`buildTenantBreakoutQuery by metric conversations 1`] = `+"filters: ["created_at is in the previous 30 days or today", "tenant_id is not empty"]+aggregations: ["count()"]+breakouts: ["tenant_id"]+orderBys: ["count desc"]"+`;++exports[`buildTenantBreakoutQuery by metric messages 1`] = `+"filters: ["created_at is in the previous 30 days or today", "tenant_id is not empty"]+aggregations: ["sum(message_count)"]+breakouts: ["tenant_id"]+orderBys: ["sum desc"]"+`;++exports[`buildTenantBreakoutQuery by metric tokens 1`] = `+"filters: ["created_at is in the previous 30 days or today", "tenant_id is not empty"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["tenant_id"]"+`;++exports[`buildTimeseriesBreakoutQuery all filters 1`] = `+"filters: ["created_at is in the previous 30 days or today", "user_id is 42", "tenant_id is 7", "group_id is 5"]+joins: ["inner-join v_group_members on user_id = v_group_members.user_id"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["created_at: Day (bucket: day)"]"+`;++exports[`buildTimeseriesBreakoutQuery bucket by hour 1`] = `+"filters: ["created_at is on Apr 17, 2026"]+aggregations: ["count()"]+breakouts: ["created_at: Hour (bucket: hour)"]"+`;++exports[`buildTimeseriesBreakoutQuery by metric conversations 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["count()"]+breakouts: ["created_at: Day (bucket: day)"]"+`;++exports[`buildTimeseriesBreakoutQuery by metric messages 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["sum(message_count)"]+breakouts: ["created_at: Day (bucket: day)"]"+`;++exports[`buildTimeseriesBreakoutQuery by metric tokens 1`] = `+"filters: ["created_at is in the previous 30 days or today"]+aggregations: ["sum(prompt_tokens)", "sum(completion_tokens)"]+breakouts: ["created_at: Day (bucket: day)"]"+`;diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.tsnew file mode 100644index 00000000000..e47a6371e84--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/audit-views-fixture.ts@@ -0,0 +1,118 @@+import { createMockMetadata } from "__support__/metadata";+import * as Lib from "metabase-lib";+import type { Field, Table } from "metabase-types/api";+import {+ createMockDatabase,+ createMockField,+ createMockTable,+} from "metabase-types/api/mocks";++const AUDIT_DB_ID = 13371337;+const CONVERSATIONS_TABLE_ID = 1001;+const USAGE_LOG_TABLE_ID = 1002;+const GROUP_MEMBERS_TABLE_ID = 1003;++const BASE_TYPE_BY_FIELD_TYPE = {+ text: "type/Text",+ integer: "type/Integer",+ bigInteger: "type/BigInteger",+ dateTime: "type/DateTimeWithLocalTZ",+} as const;++const buildTable = (+ id: number,+ name: string,+ display_name: string,+ fields: Array<+ [+ type: keyof typeof BASE_TYPE_BY_FIELD_TYPE,+ name: string,+ semantic_type: Field["semantic_type"],+ ]+ >,+): Table =>+ createMockTable({+ id,+ db_id: AUDIT_DB_ID,+ schema: "public",+ name,+ display_name,+ fields: fields.map(([type, fieldName, semantic_type], i) =>+ createMockField({+ id: id * 100 + i,+ table_id: id,+ name: fieldName,+ display_name: fieldName,+ fingerprint: null,+ base_type: BASE_TYPE_BY_FIELD_TYPE[type],+ effective_type: BASE_TYPE_BY_FIELD_TYPE[type],+ semantic_type,+ }),+ ),+ });++const conversationsTable = buildTable(+ CONVERSATIONS_TABLE_ID,+ "v_metabot_conversations",+ "Conversations",+ [+ ["text", "conversation_id", "type/PK"],+ ["dateTime", "created_at", "type/CreationTimestamp"],+ ["integer", "user_id", "type/FK"],+ ["integer", "tenant_id", "type/FK"],+ ["text", "user_display_name", "type/Name"],+ ["text", "source_name", "type/Category"],+ ["text", "profile_name", "type/Category"],+ ["text", "ip_address", null],+ ["bigInteger", "message_count", "type/Quantity"],+ ["bigInteger", "prompt_tokens", "type/Quantity"],+ ["bigInteger", "completion_tokens", "type/Quantity"],+ ],+);++const usageLogTable = buildTable(+ USAGE_LOG_TABLE_ID,+ "v_ai_usage_log",+ "Usage Log",+ [+ ["bigInteger", "usage_log_id", "type/PK"],+ ["dateTime", "created_at", "type/CreationTimestamp"],+ ["integer", "user_id", "type/FK"],+ ["integer", "tenant_id", "type/FK"],+ ["text", "user_display_name", "type/Name"],+ ["text", "source_name", "type/Category"],+ ["text", "profile_name", "type/Category"],+ ["text", "ip_address", null],+ ["integer", "prompt_tokens", "type/Quantity"],+ ["integer", "completion_tokens", "type/Quantity"],+ ],+);++const groupMembersTable = buildTable(+ GROUP_MEMBERS_TABLE_ID,+ "v_group_members",+ "Group Members",+ [+ ["integer", "user_id", "type/Description"],+ ["integer", "group_id", "type/PK"],+ ["text", "group_name", "type/Name"],+ ],+);++export function buildAuditViewsFixture() {+ const database = createMockDatabase({+ id: AUDIT_DB_ID,+ // eslint-disable-next-line metabase/no-literal-metabase-strings -- test fixture+ name: "Internal Metabase Database",+ tables: [conversationsTable, usageLogTable, groupMembersTable],+ });+ const metadata = createMockMetadata({ databases: [database] });+ const provider = Lib.metadataProvider(AUDIT_DB_ID, metadata);++ return {+ provider,+ conversations: Lib.tableOrCardMetadata(provider, CONVERSATIONS_TABLE_ID)!,+ usageLog: Lib.tableOrCardMetadata(provider, USAGE_LOG_TABLE_ID)!,+ groupMembers: Lib.tableOrCardMetadata(provider, GROUP_MEMBERS_TABLE_ID)!,+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.tsnew file mode 100644index 00000000000..5219114dbf3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.ts@@ -0,0 +1,135 @@+import type { DatasetQuery, VisualizationDisplay } from "metabase-types/api";++import {+ type GetColor,+ type UsageStatsMetric,+ getMetricSeriesSettings,+} from "./query-utils";++type RawDataCol = { source?: string; name?: string };+type RawData = { cols: RawDataCol[]; rows: unknown[][] };+type AdhocResponse = { data?: RawData } | undefined;++type Opts = {+ metric: UsageStatsMetric;+ display: VisualizationDisplay;+ maxCategories?: number;+ otherLabel: string;+ getColor: GetColor;+};++export function mapBreakoutDimension(+ response: AdhocResponse,+ fn: (value: unknown) => unknown,+): AdhocResponse {+ if (!response?.data) {+ return response;+ }+ const dimensionIndex = response.data.cols.findIndex(+ (c) => c.source === "breakout",+ );+ if (dimensionIndex < 0) {+ return response;+ }+ const rows = response.data.rows.map((row) => {+ const next = fn(row[dimensionIndex]);+ if (next === row[dimensionIndex]) {+ return row;+ }+ const copy = [...row];+ copy[dimensionIndex] = next;+ return copy;+ });+ return { ...response, data: { ...response.data, rows } };+}++function sumMetricColumns(row: unknown[], metricIndices: number[]): number {+ return metricIndices.reduce((s, i) => s + (Number(row[i]) || 0), 0);+}++function sortRowsByCombinedMetric(+ rows: unknown[][],+ metricIndices: number[],+): unknown[][] {+ return [...rows]+ .map((row) => ({ row, total: sumMetricColumns(row, metricIndices) }))+ .sort((a, b) => b.total - a.total)+ .map(({ row }) => row);+}++function collapseToTopN(+ rows: unknown[][],+ dimensionIndex: number,+ metricIndices: number[],+ max: number | undefined,+ otherLabel: string,+ colCount: number,+): unknown[][] {+ const shouldCollapse =+ max != null &&+ dimensionIndex >= 0 &&+ metricIndices.length > 0 &&+ rows.length > max;+ if (!shouldCollapse) {+ return rows;+ }+ const keep = rows.slice(0, max - 1);+ const overflow = rows.slice(max - 1);+ const otherRow: unknown[] = new Array(colCount).fill(null);+ otherRow[dimensionIndex] = otherLabel;+ for (const i of metricIndices) {+ otherRow[i] = overflow.reduce((sum, row) => sum + (Number(row[i]) || 0), 0);+ }+ return [...keep, otherRow];+}++export function toBreakoutRawSeries(+ response: AdhocResponse,+ jsQuery: DatasetQuery | null,+ opts: Opts,+) {+ if (!response?.data || !jsQuery) {+ return null;+ }++ const { metric, display, maxCategories, otherLabel, getColor } = opts;+ const cols = response.data.cols;+ const dimensionIndex = cols.findIndex((c) => c.source === "breakout");+ const metricIndices = cols+ .map((c, i) => (c.source === "aggregation" ? i : -1))+ .filter((i) => i >= 0);+ const aggregationColumnNames = metricIndices.map((i) => cols[i].name ?? "");++ const needsCombinedMetricSort = metricIndices.length > 1;+ const rows = needsCombinedMetricSort+ ? sortRowsByCombinedMetric(response.data.rows, metricIndices)+ : response.data.rows;++ return [+ {+ card: {+ display,+ dataset_query: jsQuery,+ visualization_settings: {+ "graph.x_axis.title_text": "",+ "graph.y_axis.title_text": "",+ ...(display === "bar" && {+ "graph.x_axis.axis_enabled": "compact",+ }),+ ...getMetricSeriesSettings(metric, getColor, aggregationColumnNames),+ },+ },+ data: {+ ...response.data,+ rows: collapseToTopN(+ rows,+ dimensionIndex,+ metricIndices,+ maxCategories,+ otherLabel,+ cols.length,+ ),+ },+ },+ ];+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.tsnew file mode 100644index 00000000000..7b56f21bc32--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/breakout-raw-series.unit.spec.ts@@ -0,0 +1,66 @@+import type { DatasetQuery } from "metabase-types/api";++import {+ mapBreakoutDimension,+ toBreakoutRawSeries,+} from "./breakout-raw-series";++const jsQuery = { database: 1, type: "query", query: {} } as DatasetQuery;++const response = (rows: unknown[][]) => ({+ data: {+ cols: [+ { source: "breakout", name: "group_name" },+ { source: "aggregation", name: "count" },+ ],+ rows,+ },+});++const baseOpts = {+ metric: "conversations" as const,+ display: "row" as const,+ otherLabel: "Other",+ getColor: (name: string) => `#${name}`,+};++describe("toBreakoutRawSeries", () => {+ it("returns null when response or jsQuery is missing", () => {+ expect(toBreakoutRawSeries(undefined, jsQuery, baseOpts)).toBeNull();+ expect(+ toBreakoutRawSeries(response([["A", 1]]), null, baseOpts),+ ).toBeNull();+ });++ it("collapses rows past maxCategories into an Other bucket that sums the overflow", () => {+ const out = toBreakoutRawSeries(+ response([+ ["A", 5],+ ["B", 4],+ ["C", 3],+ ["D", 2],+ ["E", 1],+ ]),+ jsQuery,+ { ...baseOpts, maxCategories: 3 },+ );+ expect(out?.[0].data.rows).toEqual([+ ["A", 5],+ ["B", 4],+ ["Other", 3 + 2 + 1],+ ]);+ });+});++describe("mapBreakoutDimension", () => {+ it("rewrites the breakout cell using the supplied function", () => {+ const out = mapBreakoutDimension(response([[null, 3]]), (v) =>+ v == null ? "Unknown" : v,+ );+ expect(out?.data?.rows).toEqual([["Unknown", 3]]);+ });++ it("returns the response unchanged when there is no data", () => {+ expect(mapBreakoutDimension(undefined, (v) => v)).toBeUndefined();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/index.tsnew file mode 100644index 00000000000..0244cb807a6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/index.ts@@ -0,0 +1 @@+export { ConversationStatsPage } from "./ConversationStatsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.tsnew file mode 100644index 00000000000..fc6eb5aead2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-snapshots.unit.spec.ts@@ -0,0 +1,204 @@+/* eslint-disable jest/expect-expect -- snapshotQuery() asserts via toMatchSnapshot */+import type { DateFilterValue } from "metabase/querying/common/types";+import type { Query } from "metabase-lib";++import { buildTimeseriesBreakoutQuery } from "./ConversationsByDayChart";+import { buildAuditViewsFixture } from "./audit-views-fixture";+import { summarize } from "./query-summary";+import {+ type StatsFilters,+ buildGroupBreakoutQuery,+ buildSourceBreakoutQuery,+ buildTenantBreakoutQuery,+ tableForMetric,+} from "./query-utils";++const RELATIVE_LAST_30_DAYS: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: -30,+ options: { includeCurrent: true },+};++const SPECIFIC_SINGLE_DAY: DateFilterValue = {+ type: "specific",+ operator: "=",+ values: [new Date(2026, 3, 17)],+ hasTime: false,+};++const USER_ID = 42;+const TENANT_ID = 7;+const GROUP_ID = 5;++const METRICS = ["conversations", "messages", "tokens"] as const;++const ALL_FILTERS: Partial<StatsFilters> = {+ dateFilter: RELATIVE_LAST_30_DAYS,+ userId: USER_ID,+ tenantId: TENANT_ID,+ groupId: GROUP_ID,+};++const fx = buildAuditViewsFixture();++const dataSources = (metric: StatsFilters["metric"]) => ({+ provider: fx.provider,+ table: tableForMetric(metric, fx.conversations, fx.usageLog),+ groupMembersTable: fx.groupMembers,+});++const filtersFor = (+ metric: StatsFilters["metric"],+ overrides: Partial<StatsFilters> = {},+): StatsFilters => ({+ metric,+ dateFilter: RELATIVE_LAST_30_DAYS,+ ...overrides,+});++const snapshotQuery = (q: Query) => {+ expect(summarize(q)).toMatchSnapshot();+};++describe("buildSourceBreakoutQuery", () => {+ describe("by metric", () => {+ it.each(METRICS)("%s", (metric) =>+ snapshotQuery(+ buildSourceBreakoutQuery({+ ...filtersFor(metric),+ ...dataSources(metric),+ breakoutColumn: "source_name",+ }),+ ),+ );+ });++ describe("single filter", () => {+ it.each([+ {+ name: "dateFilter specific",+ overrides: { dateFilter: SPECIFIC_SINGLE_DAY },+ },+ { name: "userId", overrides: { userId: USER_ID } },+ { name: "tenantId", overrides: { tenantId: TENANT_ID } },+ { name: "groupId", overrides: { groupId: GROUP_ID } },+ ])("$name", ({ overrides }) =>+ snapshotQuery(+ buildSourceBreakoutQuery({+ ...filtersFor("conversations", overrides),+ ...dataSources("conversations"),+ breakoutColumn: "source_name",+ }),+ ),+ );+ });++ describe("by breakoutColumn", () => {+ it.each(["profile_name", "user_display_name", "ip_address"] as const)(+ "%s",+ (breakoutColumn) =>+ snapshotQuery(+ buildSourceBreakoutQuery({+ ...filtersFor("conversations"),+ ...dataSources("conversations"),+ breakoutColumn,+ }),+ ),+ );+ });++ it("all filters", () =>+ snapshotQuery(+ buildSourceBreakoutQuery({+ ...filtersFor("tokens", ALL_FILTERS),+ ...dataSources("tokens"),+ breakoutColumn: "source_name",+ }),+ ));+});++describe("buildGroupBreakoutQuery", () => {+ describe("by metric", () => {+ it.each(METRICS)("%s", (metric) =>+ snapshotQuery(+ buildGroupBreakoutQuery({+ ...filtersFor(metric),+ ...dataSources(metric),+ excludeAllUsers: true,+ }),+ ),+ );+ });++ it("excludeAllUsers=false", () =>+ snapshotQuery(+ buildGroupBreakoutQuery({+ ...filtersFor("conversations"),+ ...dataSources("conversations"),+ excludeAllUsers: false,+ }),+ ));++ it("all filters", () =>+ snapshotQuery(+ buildGroupBreakoutQuery({+ ...filtersFor("tokens", ALL_FILTERS),+ ...dataSources("tokens"),+ excludeAllUsers: true,+ }),+ ));+});++describe("buildTenantBreakoutQuery", () => {+ describe("by metric", () => {+ it.each(METRICS)("%s", (metric) =>+ snapshotQuery(+ buildTenantBreakoutQuery({+ ...filtersFor(metric),+ ...dataSources(metric),+ }),+ ),+ );+ });++ it("all filters", () =>+ snapshotQuery(+ buildTenantBreakoutQuery({+ ...filtersFor("tokens", ALL_FILTERS),+ ...dataSources("tokens"),+ }),+ ));+});++describe("buildTimeseriesBreakoutQuery", () => {+ describe("by metric", () => {+ it.each(METRICS)("%s", (metric) =>+ snapshotQuery(+ buildTimeseriesBreakoutQuery({+ ...filtersFor(metric),+ ...dataSources(metric),+ bucketName: "day",+ }),+ ),+ );+ });++ it("bucket by hour", () =>+ snapshotQuery(+ buildTimeseriesBreakoutQuery({+ ...filtersFor("conversations", { dateFilter: SPECIFIC_SINGLE_DAY }),+ ...dataSources("conversations"),+ bucketName: "hour",+ }),+ ));++ it("all filters", () =>+ snapshotQuery(+ buildTimeseriesBreakoutQuery({+ ...filtersFor("tokens", ALL_FILTERS),+ ...dataSources("tokens"),+ bucketName: "day",+ }),+ ));+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-summary.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-summary.tsnew file mode 100644index 00000000000..da9c57a7ec1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-summary.ts@@ -0,0 +1,62 @@+import type { Query } from "metabase-lib";+import * as Lib from "metabase-lib";++type ExprArg = Lib.ExpressionArg | Lib.ExpressionParts;++const fmtExpr = (q: Query, e: ExprArg): string => {+ if (Lib.isExpressionParts(e)) {+ return `${e.operator}(${e.args.map((a) => fmtExpr(q, a)).join(", ")})`;+ }+ if (Lib.isColumnMetadata(e)) {+ return Lib.displayInfo(q, 0, e).displayName;+ }+ return String(e);+};++const fmtFilter = (q: Query, f: Lib.FilterClause): string =>+ Lib.displayInfo(q, 0, f).displayName;++const fmtJoin = (q: Query, j: Lib.Join): string => {+ const tableName = Lib.displayInfo(q, 0, Lib.joinedThing(q, j)).name;+ const strategy = Lib.displayInfo(q, 0, Lib.joinStrategy(j)).shortName;+ const conditions = Lib.joinConditions(j).map((c) => {+ const { operator, lhsExpression, rhsExpression } =+ Lib.joinConditionParts(c);+ const lhs = Lib.displayInfo(q, 0, lhsExpression).displayName;+ const rhs = Lib.displayInfo(q, 0, rhsExpression).displayName;+ return `${lhs} ${operator} ${tableName}.${rhs}`;+ });+ return `${strategy} ${tableName} on ${conditions.join(", ")}`;+};++const fmtAggregation = (q: Query, a: Lib.AggregationClause): string => {+ const { operator, args } = Lib.expressionParts(q, 0, a);+ return `${operator}(${args.map((arg) => fmtExpr(q, arg)).join(", ")})`;+};++const fmtBreakout = (q: Query, b: Lib.BreakoutClause): string => {+ const { displayName } = Lib.displayInfo(q, 0, b);+ const bucket = Lib.temporalBucket(b);+ const bucketName = bucket ? Lib.displayInfo(q, 0, bucket).shortName : null;+ return bucketName ? `${displayName} (bucket: ${bucketName})` : displayName;+};++const fmtOrderBy = (q: Query, o: Lib.OrderByClause): string => {+ const { name, direction } = Lib.displayInfo(q, 0, o);+ return `${name} ${direction}`;+};++export const summarize = (q: Query): string => {+ return (+ [+ ["filters", Lib.filters(q, 0).map((f) => fmtFilter(q, f))],+ ["joins", Lib.joins(q, 0).map((j) => fmtJoin(q, j))],+ ["aggregations", Lib.aggregations(q, 0).map((a) => fmtAggregation(q, a))],+ ["breakouts", Lib.breakouts(q, 0).map((b) => fmtBreakout(q, b))],+ ["orderBys", Lib.orderBys(q, 0).map((o) => fmtOrderBy(q, o))],+ ] as const+ )+ .filter(([, items]) => items.length > 0)+ .map(([l, i]) => `${l}: [${i.map((s) => JSON.stringify(s)).join(", ")}]`)+ .join("\n");+};diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.tsnew file mode 100644index 00000000000..c557fd0df4a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.ts@@ -0,0 +1,369 @@+import { P, match } from "ts-pattern";+import { t } from "ttag";++import type { DateFilterValue } from "metabase/querying/common/types";+import { getDateFilterClause } from "metabase/querying/filters/utils/dates";+import type { ColorName } from "metabase/ui/colors/types";+import type {+ CardMetadata,+ ColumnMetadata,+ MetadataProvider,+ Query,+ TableMetadata,+} from "metabase-lib";+import * as Lib from "metabase-lib";+import type { VisualizationSettings } from "metabase-types/api";++export type GetColor = (name: ColorName) => string;++export type UsageStatsMetric = "conversations" | "messages" | "tokens";++export type StatsFilters = {+ dateFilter: DateFilterValue;+ userId?: number;+ groupId?: number;+ tenantId?: number;+ metric: UsageStatsMetric;+};++export const tableForMetric = <T extends TableMetadata | CardMetadata | null>(+ metric: UsageStatsMetric,+ conversationsTable: T,+ usageLogTable: T,+): T => (metric === "tokens" ? usageLogTable : conversationsTable);++const METRIC_ACCENT: Record<UsageStatsMetric, ColorName> = {+ conversations: "accent0",+ tokens: "accent2",+ messages: "accent4",+};++const METRIC_COLUMN_NAME: Record<UsageStatsMetric, string> = {+ conversations: "count",+ tokens: "sum",+ messages: "sum",+};++type TokenSeriesSettings = Pick<+ VisualizationSettings,+ "series_settings" | "graph.metrics"+>;++export function getMetricSeriesSettings(+ metric: UsageStatsMetric,+ getColor: GetColor,+ aggregationColumnNames?: string[],+ options?: { dualAxis?: boolean },+): TokenSeriesSettings {+ return match({ metric, cols: aggregationColumnNames })+ .with(+ { metric: "tokens", cols: [P.string, P.string] as const },+ ({ cols: [inputCol, outputCol] }) => ({+ series_settings: {+ [inputCol]: {+ color: getColor("accent2"),+ title: t`Input tokens`,+ ...(options?.dualAxis && { axis: "left" }),+ },+ [outputCol]: {+ color: getColor("accent3"),+ title: t`Output tokens`,+ ...(options?.dualAxis && { axis: "right" }),+ },+ },+ "graph.metrics": [inputCol, outputCol],+ }),+ )+ .otherwise(({ cols }) => {+ const colName = cols?.[0] ?? METRIC_COLUMN_NAME[metric];+ return {+ series_settings: {+ [colName]: { color: getColor(METRIC_ACCENT[metric]) },+ },+ };+ });+}++export function findColumn(+ query: Query,+ name: string,+ columnsFn: (q: Query, stageIndex: number) => ColumnMetadata[],+): ColumnMetadata | undefined {+ const columns = columnsFn(query, 0);+ const lowerName = name.toLowerCase();+ return columns.find((col) => {+ const info = Lib.displayInfo(query, 0, col);+ return info.name?.toLowerCase() === lowerName;+ });+}++export function applyDateFilter(+ query: Query,+ dateFilter: DateFilterValue,+ columnName = "created_at",+): Query {+ const dateCol = findColumn(query, columnName, Lib.filterableColumns);+ if (!dateCol) {+ return query;+ }++ const clause = getDateFilterClause(dateCol, dateFilter);+ return Lib.filter(query, 0, clause);+}++export function applyIdFilter(+ query: Query,+ columnName: string,+ id: number | undefined,+): Query {+ if (id == null) {+ return query;+ }+ const column = findColumn(query, columnName, Lib.filterableColumns);+ if (!column) {+ return query;+ }+ return Lib.filter(+ query,+ 0,+ Lib.numberFilterClause({ operator: "=", column, values: [id] }),+ );+}++function findJoinableColumn(+ columns: ColumnMetadata[],+ query: Query,+ name: string,+): ColumnMetadata | undefined {+ const lower = name.toLowerCase();+ return columns.find((col) => {+ const info = Lib.displayInfo(query, 0, col);+ return info.name?.toLowerCase() === lower;+ });+}++export function joinGroupMembers(+ query: Query,+ groupMembersTable: TableMetadata | CardMetadata,+ sourceUserIdColumn = "user_id",+): Query {+ const lhsColumns = Lib.joinConditionLHSColumns(query, 0, groupMembersTable);+ const lhsUserId = findJoinableColumn(lhsColumns, query, sourceUserIdColumn);+ const rhsColumns = Lib.joinConditionRHSColumns(query, 0, groupMembersTable);+ const rhsUserId = findJoinableColumn(rhsColumns, query, "user_id");+ if (!lhsUserId || !rhsUserId) {+ return query;+ }++ const innerJoin = Lib.availableJoinStrategies(query, 0).find((strategy) => {+ const info = Lib.displayInfo(query, 0, strategy);+ return info.shortName === "inner-join";+ });+ if (!innerJoin) {+ return query;+ }++ return Lib.join(+ query,+ 0,+ Lib.joinClause(+ groupMembersTable,+ [Lib.joinConditionClause("=", lhsUserId, rhsUserId)],+ innerJoin,+ ),+ );+}++export function addSumAggregation(query: Query, columnName: string): Query {+ const operators = Lib.availableAggregationOperators(query, 0);+ const sumOp = operators.find((op) => {+ const info = Lib.displayInfo(query, 0, op);+ return info.shortName === "sum";+ });+ if (!sumOp) {+ return query;+ }++ const columns = Lib.aggregationOperatorColumns(sumOp);+ const lowerName = columnName.toLowerCase();+ const col = columns.find((c) => {+ const info = Lib.displayInfo(query, 0, c);+ return info.name?.toLowerCase() === lowerName;+ });+ if (!col) {+ return query;+ }++ const clause = Lib.aggregationClause(sumOp, col);+ return Lib.aggregate(query, 0, clause);+}++export function applyUsageStatsAggregation(+ query: Query,+ metric: UsageStatsMetric,+): Query {+ return match(metric)+ .with("conversations", () => Lib.aggregateByCount(query, 0))+ .with("messages", () => addSumAggregation(query, "message_count"))+ .with("tokens", () =>+ addSumAggregation(+ addSumAggregation(query, "prompt_tokens"),+ "completion_tokens",+ ),+ )+ .exhaustive();+}++function getOrderColumnName(metric: UsageStatsMetric): string | null {+ return match(metric)+ .with("conversations", () => "count")+ .with("messages", () => "sum")+ .with("tokens", () => null)+ .exhaustive();+}++export function applyMetricOrderBy(+ query: Query,+ metric: UsageStatsMetric,+): Query {+ const orderColumnName = getOrderColumnName(metric);+ if (!orderColumnName) {+ return query;+ }+ const orderCol = findColumn(query, orderColumnName, Lib.orderableColumns);+ if (!orderCol) {+ return query;+ }+ return Lib.orderBy(query, 0, orderCol, "desc");+}++type SourceBreakoutQueryOpts = StatsFilters & {+ provider: MetadataProvider;+ table: TableMetadata | CardMetadata;+ groupMembersTable: TableMetadata | CardMetadata;+ breakoutColumn: string;+};++export function buildSourceBreakoutQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ breakoutColumn,+}: SourceBreakoutQueryOpts): Query {+ let q = Lib.queryFromTableOrCardMetadata(provider, table);+ q = applyDateFilter(q, dateFilter);+ q = applyIdFilter(q, "user_id", userId);+ q = applyIdFilter(q, "tenant_id", tenantId);+ q = groupId != null ? joinGroupMembers(q, groupMembersTable) : q;+ q = groupId != null ? applyIdFilter(q, "group_id", groupId) : q;+ q = applyUsageStatsAggregation(q, metric);+ q = breakoutByColumn(q, breakoutColumn);+ q = applyMetricOrderBy(q, metric);+ return q;+}++export function breakoutByColumn(query: Query, columnName: string): Query {+ const col = findColumn(query, columnName, Lib.breakoutableColumns);+ return col ? Lib.breakout(query, 0, col) : query;+}++type BreakoutQueryOpts = StatsFilters & {+ provider: MetadataProvider;+ table: TableMetadata | CardMetadata;+ groupMembersTable: TableMetadata | CardMetadata;+};++type GroupBreakoutQueryOpts = BreakoutQueryOpts & {+ excludeAllUsers: boolean;+};++export function excludeAllUsersGroup(query: Query): Query {+ const col = findColumn(query, "group_id", Lib.filterableColumns);+ if (!col) {+ return query;+ }+ return Lib.filter(+ query,+ 0,+ Lib.numberFilterClause({ operator: "!=", column: col, values: [1] }),+ );+}++function normalizeBreakoutName(name?: string): string {+ return name?.toLowerCase().replace(/[\s_-]/g, "") ?? "";+}++function breakoutByJoinedGroupName(query: Query): Query {+ const col = Lib.breakoutableColumns(query, 0).find((col) => {+ const info = Lib.displayInfo(query, 0, col);+ const names = [info.name, info.displayName, info.longDisplayName].map(+ normalizeBreakoutName,+ );++ return (+ info.isFromJoin &&+ names.some((name) => name === "groupname" || name.endsWith("groupname"))+ );+ });+ return col ? Lib.breakout(query, 0, col) : query;+}++export function buildGroupBreakoutQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+ excludeAllUsers,+}: GroupBreakoutQueryOpts): Query {+ let q = Lib.queryFromTableOrCardMetadata(provider, table);+ q = applyDateFilter(q, dateFilter);+ q = applyIdFilter(q, "user_id", userId);+ q = applyIdFilter(q, "tenant_id", tenantId);+ q = joinGroupMembers(q, groupMembersTable);+ q = excludeAllUsers ? excludeAllUsersGroup(q) : q;+ q = applyIdFilter(q, "group_id", groupId);+ q = breakoutByJoinedGroupName(q);+ q = applyUsageStatsAggregation(q, metric);+ q = applyMetricOrderBy(q, metric);+ return q;+}++function applyTenantNotNullFilter(query: Query): Query {+ const col = findColumn(query, "tenant_id", Lib.filterableColumns);+ if (!col) {+ return query;+ }+ return Lib.filter(query, 0, Lib.expressionClause("not-null", [col], null));+}++export function buildTenantBreakoutQuery({+ provider,+ table,+ groupMembersTable,+ dateFilter,+ userId,+ groupId,+ tenantId,+ metric,+}: BreakoutQueryOpts): Query {+ let q = Lib.queryFromTableOrCardMetadata(provider, table);+ q = applyDateFilter(q, dateFilter);+ q = applyIdFilter(q, "user_id", userId);+ q = applyIdFilter(q, "tenant_id", tenantId);+ q = applyTenantNotNullFilter(q);+ q = groupId != null ? joinGroupMembers(q, groupMembersTable) : q;+ q = groupId != null ? applyIdFilter(q, "group_id", groupId) : q;+ q = applyUsageStatsAggregation(q, metric);+ q = breakoutByColumn(q, "tenant_id");+ q = applyMetricOrderBy(q, metric);+ return q;+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.tsnew file mode 100644index 00000000000..0aa7c44d2fb--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/query-utils.unit.spec.ts@@ -0,0 +1,218 @@+import type { DateFilterValue } from "metabase/querying/common/types";+import * as Lib from "metabase-lib";+import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";++import { isSingleDayFilter } from "./ConversationsByDayChart";+import {+ applyIdFilter,+ excludeAllUsersGroup,+ getMetricSeriesSettings,+} from "./query-utils";++describe("getMetricSeriesSettings", () => {+ const getColor = (name: string) => `#${name}`;++ it("returns two-series config for tokens with both aggregation columns, no stacking, dual axis on opt-in", () => {+ const grouped = getMetricSeriesSettings("tokens", getColor, [+ "sum",+ "sum_2",+ ]);+ expect(grouped["graph.metrics"]).toEqual(["sum", "sum_2"]);+ expect(grouped.series_settings?.sum?.title).toMatch(/input/i);+ expect(grouped.series_settings?.sum_2?.title).toMatch(/output/i);+ expect(grouped.series_settings?.sum?.axis).toBeUndefined();+ expect(grouped.series_settings?.sum_2?.axis).toBeUndefined();++ const dual = getMetricSeriesSettings("tokens", getColor, ["sum", "sum_2"], {+ dualAxis: true,+ });+ expect(dual.series_settings?.sum?.axis).toBe("left");+ expect(dual.series_settings?.sum_2?.axis).toBe("right");+ });++ it("falls back to single-series settings otherwise", () => {+ const settings = getMetricSeriesSettings("conversations", getColor);+ expect(settings["graph.metrics"]).toBeUndefined();+ expect(settings.series_settings).toHaveProperty("count");+ });+});++describe("isSingleDayFilter", () => {+ const DAY = new Date(2026, 3, 17);+ const SAME_DAY_LATER = new Date(2026, 3, 17, 23, 59);+ const NEXT_DAY = new Date(2026, 3, 18);++ it("returns true for specific = with a single date and no time", () => {+ const value: DateFilterValue = {+ type: "specific",+ operator: "=",+ values: [DAY],+ hasTime: false,+ };+ expect(isSingleDayFilter(value)).toBe(true);+ });++ it("returns false for specific = when hasTime is on", () => {+ const value: DateFilterValue = {+ type: "specific",+ operator: "=",+ values: [DAY],+ hasTime: true,+ };+ expect(isSingleDayFilter(value)).toBe(false);+ });++ it("returns true for a between range whose endpoints fall on the same calendar day", () => {+ const value: DateFilterValue = {+ type: "specific",+ operator: "between",+ values: [DAY, SAME_DAY_LATER],+ hasTime: false,+ };+ expect(isSingleDayFilter(value)).toBe(true);+ });++ it("returns false for a between range spanning two calendar days", () => {+ const value: DateFilterValue = {+ type: "specific",+ operator: "between",+ values: [DAY, NEXT_DAY],+ hasTime: false,+ };+ expect(isSingleDayFilter(value)).toBe(false);+ });++ it("returns false for >, <, or other operators", () => {+ const gt: DateFilterValue = {+ type: "specific",+ operator: ">",+ values: [DAY],+ hasTime: false,+ };+ expect(isSingleDayFilter(gt)).toBe(false);+ });++ it("returns true for relative day filters covering a single day (today, yesterday, tomorrow)", () => {+ const today: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: 0,+ };+ const yesterday: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: -1,+ };+ const tomorrow: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: 1,+ };+ expect(isSingleDayFilter(today)).toBe(true);+ expect(isSingleDayFilter(yesterday)).toBe(true);+ expect(isSingleDayFilter(tomorrow)).toBe(true);+ });++ it("returns false for relative day filters of other magnitudes", () => {+ const last30: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: -30,+ options: { includeCurrent: true },+ };+ expect(isSingleDayFilter(last30)).toBe(false);+ });++ it("returns false for relative filters with non-day units", () => {+ const lastWeek: DateFilterValue = {+ type: "relative",+ unit: "week",+ value: -1,+ };+ expect(isSingleDayFilter(lastWeek)).toBe(false);+ });++ it("ignores the offset — a 1-day window 7 days ago is still a single day", () => {+ const value: DateFilterValue = {+ type: "relative",+ unit: "day",+ value: -1,+ offsetUnit: "day",+ offsetValue: -7,+ };+ expect(isSingleDayFilter(value)).toBe(true);+ });++ it("returns false for month and quarter filters", () => {+ const month: DateFilterValue = { type: "month", year: 2026, month: 4 };+ const quarter: DateFilterValue = {+ type: "quarter",+ year: 2026,+ quarter: 2,+ };+ expect(isSingleDayFilter(month)).toBe(false);+ expect(isSingleDayFilter(quarter)).toBe(false);+ });++ it("returns false for exclude filters", () => {+ const value: DateFilterValue = {+ type: "exclude",+ operator: "!=",+ unit: "day-of-week",+ values: [1],+ };+ expect(isSingleDayFilter(value)).toBe(false);+ });+});++describe("applyIdFilter", () => {+ const baseQuery = () =>+ Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);++ it("is a no-op when id is undefined", () => {+ const q = baseQuery();+ const result = applyIdFilter(q, "user_id", undefined);+ expect(Lib.filters(result, 0)).toHaveLength(0);+ });++ it("adds an equality filter on the named column when present (Orders.USER_ID matches case-insensitively)", () => {+ const q = baseQuery();+ const result = applyIdFilter(q, "user_id", 42);+ const [clause, ...rest] = Lib.filters(result, 0);+ expect(rest).toHaveLength(0);+ const parts = Lib.numberFilterParts(result, 0, clause);+ expect(parts?.operator).toBe("=");+ expect(parts?.values).toEqual([42]);+ });++ it("is a no-op when the column cannot be found on the query", () => {+ const q = baseQuery();+ const result = applyIdFilter(q, "column_that_does_not_exist", 42);+ expect(Lib.filters(result, 0)).toHaveLength(0);+ });+});++describe("excludeAllUsersGroup", () => {+ const baseQuery = () =>+ Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);++ it("is a no-op when the group_id column isn't on the query (no join yet)", () => {+ const result = excludeAllUsersGroup(baseQuery());+ expect(Lib.filters(result, 0)).toHaveLength(0);+ });++ it("adds a != 1 filter on group_id when the column is present", () => {+ const queryWithGroupId = Lib.expression(+ baseQuery(),+ 0,+ "group_id",+ Lib.expressionClause(1),+ );+ const result = excludeAllUsersGroup(queryWithGroupId);+ const [clause, ...rest] = Lib.filters(result, 0);+ expect(rest).toHaveLength(0);+ const parts = Lib.numberFilterParts(result, 0, clause);+ expect(parts?.operator).toBe("!=");+ expect(parts?.values).toEqual([1]);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/types.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/types.tsnew file mode 100644index 00000000000..ef85bedb332--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/types.ts@@ -0,0 +1,33 @@+import type {+ CardMetadata,+ MetadataProvider,+ TableMetadata,+} from "metabase-lib";++import type { StatsFilters } from "./query-utils";++export const DEFAULT_CHART_HEIGHT = 350;++export type DimensionClickHandler = (value: string) => void;++export type ChartDataSources = {+ provider: MetadataProvider;+ table: TableMetadata | CardMetadata;+ groupMembersTable: TableMetadata | CardMetadata;+};++export type NullableChartDataSources = {+ [K in keyof ChartDataSources]: ChartDataSources[K] | null;+};++export type ChartProps = StatsFilters &+ NullableChartDataSources & {+ onDimensionClick?: DimensionClickHandler;+ h?: number;+ };++export type ChartInnerProps = StatsFilters &+ ChartDataSources & {+ onDimensionClick?: DimensionClickHandler;+ h: number;+ };diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.tsnew file mode 100644index 00000000000..fb1ae7d9002--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts@@ -0,0 +1,60 @@+import { t } from "ttag";++import {+ type QueryParam,+ type UrlStateConfig,+ getFirstParamValue,+} from "metabase/common/hooks/use-url-state";+import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";+import { deserializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";++import {+ type FilterUrlState,+ filterUrlStateConfig,+ mergeUrlStateConfig,+} from "../ConversationFilters/url-state";++import type { UsageStatsMetric } from "./query-utils";++export function getDateLabel(value: string | null): string {+ const parsed = value ? deserializeDateParameterValue(value) : undefined;+ return parsed+ ? getDateFilterDisplayName(parsed, { withPrefix: false })+ : t`Date`;+}++export function getFilterDays(dateValue: string): number {+ const parsed = deserializeDateParameterValue(dateValue);+ if (parsed?.type === "relative" && parsed.value < 0) {+ return Math.abs(parsed.value);+ }+ return 30;+}++type StatsPageUrlState = {+ metric: UsageStatsMetric;+};++export type StatsUrlState = FilterUrlState & StatsPageUrlState;++const DEFAULT_METRIC: UsageStatsMetric = "conversations";++function parseMetric(param: QueryParam): UsageStatsMetric {+ const value = getFirstParamValue(param);+ if (value === "messages" || value === "tokens") {+ return value;+ }+ return DEFAULT_METRIC;+}++const statsPageUrlStateConfig: UrlStateConfig<StatsPageUrlState> = {+ parse: (query) => ({+ metric: parseMetric(query.metric),+ }),+ serialize: ({ metric }) => ({+ metric: metric === DEFAULT_METRIC ? undefined : metric,+ }),+};++export const statsUrlStateConfig: UrlStateConfig<StatsUrlState> =+ mergeUrlStateConfig(filterUrlStateConfig, statsPageUrlStateConfig);diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsxnew file mode 100644index 00000000000..d20ab1865e5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsPage.tsx@@ -0,0 +1,108 @@+import { useMemo } from "react";+import type { WithRouterProps } from "react-router";+import { t } from "ttag";++import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";+import { PaginationControls } from "metabase/common/components/PaginationControls";+import { useUrlState } from "metabase/common/hooks/use-url-state";+import { MetabotAdminLayout } from "metabase/metabot/components/MetabotAdmin/MetabotAdminLayout";+import { Card, Flex, Title } from "metabase/ui";++import { useListMetabotConversationsQuery } from "../../api";+import { ConversationFilters, useFilterOptions } from "../ConversationFilters";++import { ConversationsTable } from "./ConversationsTable";+import { PAGE_SIZE, urlStateConfig } from "./utils";++export function ConversationsPage({ location }: WithRouterProps) {+ const [+ { page, sort_column, sort_direction, date, user, group, tenant },+ { patchUrlState },+ ] = useUrlState(location, urlStateConfig);++ const {+ userId,+ groupId,+ groupNoFilterValue,+ tenantId,+ userOptions,+ groupOptions,+ tenantOptions,+ hasTenants,+ } = useFilterOptions({ date, user, group, tenant });++ const {+ data: conversationsData,+ isLoading,+ error,+ } = useListMetabotConversationsQuery(+ {+ limit: PAGE_SIZE,+ offset: page * PAGE_SIZE,+ sort_by: sort_column,+ sort_dir: sort_direction,+ user_id: userId,+ group_id: groupId,+ tenant_id: tenantId,+ date: date ?? undefined,+ },+ { refetchOnMountOrArgChange: true },+ );++ const conversations = useMemo(+ () => conversationsData?.data ?? [],+ [conversationsData],+ );+ const total = conversationsData?.total ?? 0;++ return (+ <MetabotAdminLayout fullWidth>+ <SettingsPageWrapper mt="sm">+ <Flex align="center" justify="space-between">+ <Title order={2} display="flex" style={{ alignItems: "center" }}>+ {t`Conversations`}+ </Title>++ <ConversationFilters+ date={date}+ onDateChange={(val) => patchUrlState({ date: val, page: 0 })}+ user={user}+ onUserChange={(val) => patchUrlState({ user: val, page: 0 })}+ group={group}+ onGroupChange={(val) => patchUrlState({ group: val, page: 0 })}+ groupNoFilterValue={groupNoFilterValue}+ tenant={tenant}+ onTenantChange={(val) => patchUrlState({ tenant: val, page: 0 })}+ userOptions={userOptions}+ groupOptions={groupOptions}+ tenantOptions={tenantOptions}+ hasTenants={hasTenants}+ />+ </Flex>++ <Card withBorder shadow="none" p={0}>+ <ConversationsTable+ conversations={conversations}+ isLoading={isLoading}+ error={error}+ sortingOptions={{ sort_column, sort_direction }}+ onSortingOptionsChange={(newSortingOptions) =>+ patchUrlState({ ...newSortingOptions, page: 0 })+ }+ />+ </Card>++ <Flex justify="flex-end">+ <PaginationControls+ onPreviousPage={() => patchUrlState({ page: page - 1 })}+ onNextPage={() => patchUrlState({ page: page + 1 })}+ page={page}+ pageSize={PAGE_SIZE}+ itemsLength={conversations.length}+ total={total}+ />+ </Flex>+ </SettingsPageWrapper>+ </MetabotAdminLayout>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.module.cssnew file mode 100644index 00000000000..c38ffe9e6b8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.module.css@@ -0,0 +1,17 @@+.table thead th,+.table thead th * {+ color: var(--mb-color-brand);+}++.table td,+.table th {+ padding-block: 0.75em;+}++.table td:first-child {+ font-weight: normal;+}++.table tbody tr:not(:last-child) {+ border-bottom: 1px solid var(--mb-color-border);+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsxnew file mode 100644index 00000000000..59522ed2bd9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/ConversationsTable.tsx@@ -0,0 +1,128 @@+import cx from "classnames";+import { push } from "react-router-redux";+import { t } from "ttag";++import { DateTime } from "metabase/common/components/DateTime";+import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import AdminS from "metabase/css/admin.module.css";+import CS from "metabase/css/core/index.css";+import { renderMetabotProfileLabel } from "metabase/metabot/constants";+import { useDispatch } from "metabase/redux";+import { Badge, Ellipsified, Flex } from "metabase/ui";+import { formatNumber } from "metabase/utils/formatting";+import { getUserName } from "metabase/utils/user";+import type { SortingOptions } from "metabase-types/api";++import type { ConversationSortColumn, ConversationSummary } from "../../types";++import S from "./ConversationsTable.module.css";++type Props = {+ conversations: ConversationSummary[];+ isLoading: boolean;+ error: unknown;+ sortingOptions: SortingOptions<ConversationSortColumn>;+ onSortingOptionsChange: (+ options: SortingOptions<ConversationSortColumn>,+ ) => void;+};++export function ConversationsTable({+ conversations,+ isLoading,+ error,+ sortingOptions,+ onSortingOptionsChange,+}: Props) {+ const dispatch = useDispatch();+ const showLoadingAndError = isLoading || error != null;++ const handleRowClick = (convo: ConversationSummary) => {+ dispatch(+ push(+ `/admin/metabot/usage-auditing/conversations/${convo.conversation_id}`,+ ),+ );+ };++ return (+ <table className={cx(AdminS.ContentTable, S.table)}>+ <thead>+ <tr>+ <th>{t`User`}</th>+ <th>{t`Profile`}</th>+ <SortableColumnHeader+ name="created_at"+ sortingOptions={sortingOptions}+ onSortingOptionsChange={onSortingOptionsChange}+ >{t`Date`}</SortableColumnHeader>+ <SortableColumnHeader+ name="message_count"+ sortingOptions={sortingOptions}+ onSortingOptionsChange={onSortingOptionsChange}+ columnHeaderProps={{ style: { width: "5rem" } }}+ >{t`Messages`}</SortableColumnHeader>+ <SortableColumnHeader+ name="total_tokens"+ sortingOptions={sortingOptions}+ onSortingOptionsChange={onSortingOptionsChange}+ >{t`Tokens`}</SortableColumnHeader>+ <th>{t`Queries`}</th>+ <th>{t`Searches`}</th>+ <th>{t`IP`}</th>+ </tr>+ </thead>+ <tbody>+ {showLoadingAndError && (+ <tr>+ <td colSpan={8}>+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </td>+ </tr>+ )}++ {!showLoadingAndError && (+ <>+ {conversations.length === 0 && (+ <tr>+ <td colSpan={8}>+ <Flex c="text-tertiary" justify="center">+ {t`No conversations found`}+ </Flex>+ </td>+ </tr>+ )}++ {conversations.map((convo) => (+ <tr+ key={convo.conversation_id}+ className={CS.cursorPointer}+ onClick={() => handleRowClick(convo)}+ >+ <td>{convo.user ? getUserName(convo.user) : t`Unknown`}</td>+ <td>+ {convo.profile_id && (+ <Badge size="sm" variant="light">+ {renderMetabotProfileLabel(convo.profile_id)}+ </Badge>+ )}+ </td>+ <td>+ <Ellipsified style={{ maxWidth: 180 }}>+ <DateTime value={convo.created_at} unit="day" />+ </Ellipsified>+ </td>+ <td>{formatNumber(convo.message_count)}</td>+ <td>{formatNumber(convo.total_tokens)}</td>+ <td>{formatNumber(convo.query_count)}</td>+ <td>{formatNumber(convo.search_count)}</td>+ <td>{convo.ip_address ?? "—"}</td>+ </tr>+ ))}+ </>+ )}+ </tbody>+ </table>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/index.tsnew file mode 100644index 00000000000..9638555c918--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/index.ts@@ -0,0 +1 @@+export { ConversationsPage } from "./ConversationsPage";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/utils.tsnew file mode 100644index 00000000000..1a348c80cd8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationsPage/utils.ts@@ -0,0 +1,65 @@+import {+ type QueryParam,+ type UrlStateConfig,+ getFirstParamValue,+} from "metabase/common/hooks/use-url-state";+import type { SortDirection } from "metabase-types/api";++import type { ConversationSortColumn } from "../../types";+import {+ type FilterUrlState,+ filterUrlStateConfig,+ mergeUrlStateConfig,+} from "../ConversationFilters/url-state";++export const PAGE_SIZE = 25;++const DEFAULT_SORT_COLUMN: ConversationSortColumn = "created_at";+const DEFAULT_SORT_DIRECTION: SortDirection = "desc";++type PageUrlState = {+ page: number;+ sort_column: ConversationSortColumn;+ sort_direction: SortDirection;+};++export type UrlState = FilterUrlState & PageUrlState;++const pageUrlStateConfig: UrlStateConfig<PageUrlState> = {+ parse: (query) => ({+ page: parsePage(query.page),+ sort_column: parseSortColumn(query.sort_column),+ sort_direction: parseSortDirection(query.sort_direction),+ }),+ serialize: ({ page, sort_column, sort_direction }) => ({+ page: page === 0 ? undefined : String(page),+ sort_column: sort_column === DEFAULT_SORT_COLUMN ? undefined : sort_column,+ sort_direction:+ sort_direction === DEFAULT_SORT_DIRECTION ? undefined : sort_direction,+ }),+};++export const urlStateConfig: UrlStateConfig<UrlState> = mergeUrlStateConfig(+ filterUrlStateConfig,+ pageUrlStateConfig,+);++function parsePage(param: QueryParam): number {+ const value = getFirstParamValue(param);+ const parsed = parseInt(value || "0", 10);+ return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;+}++function parseSortColumn(param: QueryParam): ConversationSortColumn {+ const value = getFirstParamValue(param);+ return value && isSortColumn(value) ? value : DEFAULT_SORT_COLUMN;+}++function isSortColumn(value: string): value is ConversationSortColumn {+ return ["created_at", "message_count", "total_tokens"].includes(value);+}++function parseSortDirection(param: QueryParam): SortDirection {+ const value = getFirstParamValue(param);+ return value === "asc" ? "asc" : DEFAULT_SORT_DIRECTION;+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/constants.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/constants.tsnew file mode 100644index 00000000000..a6bd8fdaf32--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/constants.ts@@ -0,0 +1,8 @@+// The internal/audit database has a fixed ID across all Metabase instances.+export const AUDIT_DB_ID = 13371337;++// View names in the audit database for metabot analytics.+export const VIEW_CONVERSATIONS = "v_metabot_conversations";+export const VIEW_MESSAGES = "v_metabot_messages";+export const VIEW_USAGE_LOG = "v_ai_usage_log";+export const VIEW_GROUP_MEMBERS = "v_group_members";diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.tsnew file mode 100644index 00000000000..7d98b07407a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAdhocBreakoutQuery.ts@@ -0,0 +1,26 @@+import { useMemo } from "react";++import { useGetAdhocQueryQuery } from "metabase/api";+import type { Query } from "metabase-lib";+import * as Lib from "metabase-lib";+import type { Dataset, DatasetQuery } from "metabase-types/api";++type AdhocQueryResult = {+ data: Dataset | undefined;+ jsQuery: DatasetQuery | null;+ isFetching: boolean;+};++export function useAdhocBreakoutQuery(query: Query | null): AdhocQueryResult {+ const jsQuery = useMemo(+ () => (query ? (Lib.toJsQuery(query) as DatasetQuery) : null),+ [query],+ );++ const { data, isFetching } = useGetAdhocQueryQuery(+ jsQuery ?? ({} as DatasetQuery),+ { skip: !jsQuery },+ );++ return { data, jsQuery, isFetching };+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.tsnew file mode 100644index 00000000000..312b5f5ed3a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/hooks/useAuditTable.ts@@ -0,0 +1,52 @@+import { useMemo } from "react";++import { useGetDatabaseMetadataQuery } from "metabase/api";+import { useSelector } from "metabase/redux";+import { getMetadataUnfiltered } from "metabase/selectors/metadata";+import type {+ CardMetadata,+ MetadataProvider,+ TableMetadata,+} from "metabase-lib";+import * as Lib from "metabase-lib";++import { AUDIT_DB_ID } from "../constants";++type UseAuditTableResult = {+ provider: MetadataProvider | null;+ table: TableMetadata | CardMetadata | null;+ isLoading: boolean;+};++/**+ * Discover an audit database view by name and return its metabase-lib+ * metadata provider + table metadata, ready for query construction.+ *+ * Table IDs in the audit DB vary across instances, so we look up by name+ * (case-insensitive to handle H2 uppercasing).+ */+export function useAuditTable(viewName: string): UseAuditTableResult {+ const { isLoading } = useGetDatabaseMetadataQuery({ id: AUDIT_DB_ID });+ const metadata = useSelector(getMetadataUnfiltered);++ return useMemo(() => {+ if (isLoading) {+ return { provider: null, table: null, isLoading: true };+ }++ const lowerName = viewName.toLowerCase();+ const tableId = Object.keys(metadata.tables).find((key) => {+ const t = metadata.tables[key];+ return t.db_id === AUDIT_DB_ID && t.name?.toLowerCase() === lowerName;+ });++ if (!tableId) {+ return { provider: null, table: null, isLoading: false };+ }++ const provider = Lib.metadataProvider(AUDIT_DB_ID, metadata);+ const table = Lib.tableOrCardMetadata(provider, Number(tableId));++ return { provider, table, isLoading: false };+ }, [isLoading, metadata, viewName]);+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsxnew file mode 100644index 00000000000..216dd22e9cf--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/nav.tsx@@ -0,0 +1,37 @@+import { t } from "ttag";++import { AdminNavItem } from "metabase/admin/components/AdminNav";+import { useSetting } from "metabase/common/hooks";++export function getMetabotAnalyticsNavItems() {+ return <MetabotAnalyticsNavItems />;+}++function MetabotAnalyticsNavItems() {+ const isConfigured = useSetting("llm-metabot-configured?");+ const areAiFeaturesEnabled = useSetting("ai-features-enabled?");++ if (!areAiFeaturesEnabled) {+ return null;+ }++ return (+ <AdminNavItem+ icon="audit"+ label={t`Usage auditing`}+ folderPattern="usage-auditing"+ disabled={!isConfigured}+ >+ <AdminNavItem+ label={t`Stats`}+ path="/admin/metabot/usage-auditing"+ disabled={!isConfigured}+ />+ <AdminNavItem+ label={t`Conversations`}+ path="/admin/metabot/usage-auditing/conversations"+ disabled={!isConfigured}+ />+ </AdminNavItem>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsxnew file mode 100644index 00000000000..4268a1c71c6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/routes.tsx@@ -0,0 +1,15 @@+import { IndexRoute, Route } from "react-router";++import { ConversationDetailPage } from "./components/ConversationDetailPage";+import { ConversationStatsPage } from "./components/ConversationStatsPage";+import { ConversationsPage } from "./components/ConversationsPage";++export function getAiAnalyticsRoutes() {+ return (+ <Route key="usage-auditing" path="usage-auditing">+ <IndexRoute component={ConversationStatsPage} />+ <Route path="conversations" component={ConversationsPage} />+ <Route path="conversations/:convoId" component={ConversationDetailPage} />+ </Route>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.tsnew file mode 100644index 00000000000..c0ca797401d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/slash-commands.ts@@ -0,0 +1,38 @@+import type { UnknownAction } from "@reduxjs/toolkit";+import { push } from "react-router-redux";++import { getMetabotConversation } from "metabase/metabot/state";+import type { MetabotSlashCommandHandler } from "metabase/plugins/oss/audit";+import { addUndo } from "metabase/redux/undo";+import { getUserIsAdmin } from "metabase/selectors/user";++import * as EnterpriseUrls from "../../urls";++export const handleMetabotSlashCommand: MetabotSlashCommandHandler = ({+ command,+ agentId,+ dispatch,+ getState,+}) => {+ if (command.cmd !== "inspect") {+ return false;+ }+ if (!getUserIsAdmin(getState())) {+ dispatch(addUndo({ message: "Unknown command" }));+ return true;+ }+ const { conversationId, messages } = getMetabotConversation(+ getState(),+ agentId,+ );+ if (messages.length === 0) {+ dispatch(addUndo({ message: "No message history to inspect" }));+ return true;+ }+ dispatch(+ push(+ EnterpriseUrls.adminMetabotUsageAuditingConversation(conversationId),+ ) as UnknownAction,+ );+ return true;+};diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.tsnew file mode 100644index 00000000000..0f2bef58008--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/types.ts@@ -0,0 +1,132 @@+import type { MetabotProfileId } from "metabase/metabot/constants";+import type { MetabotChatMessage } from "metabase/metabot/state";+import type {+ DatasetQuery,+ MetabotFeedback,+ VisualizationDisplay,+} from "metabase-types/api";++export type MetabotUserInfo = {+ id: number;+ email?: string;+ first_name?: string | null;+ last_name?: string | null;+ tenant_id: number | null;+};++export type ConversationSummary = {+ conversation_id: string;+ created_at: string;+ user_id: number;+ summary: string | null;+ message_count: number;+ user_message_count: number;+ assistant_message_count: number;+ total_tokens: number;+ last_message_at: string | null;+ profile_id: MetabotProfileId | null;+ search_count: number;+ query_count: number;+ ip_address: string | null;+ user: MetabotUserInfo | null;+};++export type ConversationSortColumn =+ | "created_at"+ | "message_count"+ | "total_tokens";++export type ConversationsRequest = {+ limit?: number;+ offset?: number;+ user_id?: number;+ group_id?: number;+ tenant_id?: number;+ date?: string;+ sort_by?: ConversationSortColumn;+ sort_dir?: "asc" | "desc";+};++export type ConversationsResponse = {+ data: ConversationSummary[];+ total: number;+ limit: number;+ offset: number;+};++export type GeneratedQuery = {+ tool: string;+ call_id: string | null;+ message_id: number;+ query_id: string | null;+ query_type: "sql" | "notebook";+ sql: string | null;+ mbql: DatasetQuery | null;+ display: VisualizationDisplay | null;+ database_id: number | null;+ tables: string[];+};++export type ConversationFeedback = MetabotFeedback & {+ id: number;+ user_id: number;+ user?: MetabotUserInfo | null;+ external_id: string | null;+};++export type ConversationDetail = {+ conversation_id: string;+ created_at: string;+ summary: string | null;+ user: MetabotUserInfo | null;+ message_count: number;+ total_tokens: number;+ profile_id: MetabotProfileId | null;+ slack_permalink: string | null;+ chat_messages: MetabotChatMessage[];+ queries: GeneratedQuery[];+ search_count: number;+ query_count: number;+ ip_address: string | null;+ feedback: ConversationFeedback[];+};++export type DataComplexityCatalogId = "library" | "universe" | "metabot";+export type DataComplexityComponentId =+ | "entity_count"+ | "name_collisions"+ | "synonym_pairs"+ | "field_count"+ | "repeated_measures";++export type DataComplexitySubScore =+ | {+ measurement: null;+ score: null;+ error: string;+ }+ | {+ measurement: number;+ score: number;+ };++export type DataComplexityCatalog = {+ total: number | null;+ components: {+ [K in DataComplexityComponentId]: DataComplexitySubScore;+ };+};++export type DataComplexityScoresResponse = {+ meta: {+ formula_version: number;+ synonym_threshold: number;+ calculated_at?: string;+ embedding_model?: {+ provider: string;+ model_name: string;+ } | null;+ };+} & {+ [K in DataComplexityCatalogId]: DataComplexityCatalog;+};diff --git a/enterprise/frontend/src/metabase-enterprise/urls.ts b/enterprise/frontend/src/metabase-enterprise/urls.tsindex f1f66b97f47..f9cb9c43c7d 100644--- a/enterprise/frontend/src/metabase-enterprise/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/urls.ts@@ -43,3 +43,7 @@ export function reactivateTenant(tenantId: Tenant["id"]) {export function editUserStrategy(page: "people" | "tenants") {return `/admin/people${page === "tenants" ? "/tenants" : ""}/user-strategy`;}++export function adminMetabotUsageAuditingConversation(conversationId: string) {+ return `/admin/metabot/usage-auditing/conversations/${conversationId}`;+}diff --git a/frontend/src/metabase-types/api/metabot.ts b/frontend/src/metabase-types/api/metabot.tsindex 861bad2d22c..9fb6bc1c208 100644--- a/frontend/src/metabase-types/api/metabot.ts+++ b/frontend/src/metabase-types/api/metabot.ts@@ -10,7 +10,6 @@ import type {SuggestedTransform,Transform,UnsavedCard,- Version,} from ".";export type MetabotFeedbackType =@@ -247,19 +246,23 @@ export type DeleteSuggestedMetabotPromptRequest = {prompt_id: SuggestedMetabotPrompt["id"];};-export interface MetabotFeedback {+export const METABOT_ISSUE_TYPE_VALUES = [+ "ui-bug",+ "took-incorrect-actions",+ "overall-refusal",+ "did-not-follow-request",+ "not-factual",+ "incomplete-response",+ "other",+] as const;++export type MetabotIssueType = (typeof METABOT_ISSUE_TYPE_VALUES)[number];++export type MetabotFeedback = {metabot_id: MetabotId;- feedback: {- positive: boolean;- message_id: string;- issue_type?: string | undefined;- freeform_feedback: string;- };- conversation_data: any;- version: Version;- submission_time: string;- is_admin: boolean;-}+ message_id: string;+ freeform_feedback?: string;+} & ({ positive: true } | { positive: false; issue_type?: MetabotIssueType });/* Metabot v3 - Entity Types */diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.tsindex ec2822bad16..459fe0022df 100644--- a/frontend/src/metabase-types/api/mocks/settings.ts+++ b/frontend/src/metabase-types/api/mocks/settings.ts@@ -106,6 +106,7 @@ export const createMockTokenFeatures = (cloud_custom_smtp: false,content_translation: false,content_verification: false,+ "data-complexity-score": false,embedding: false,embedding_sdk: false,embedding_simple: false,diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 6710706e67b..d5b38fb92f2 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -255,6 +255,7 @@ const tokenStatusFeatures = ["content-management","content-translation","content-verification",+ "data-complexity-score","dashboard-subscription-filters","database-auth-providers","disable-password-login",@@ -326,6 +327,7 @@ export const tokenFeatures = ["cloud_custom_smtp","content_translation","content_verification",+ "data-complexity-score","disable_password_login","embedding","embedding_sdk",diff --git a/frontend/src/metabase/api/ai-streaming/process-stream.ts b/frontend/src/metabase/api/ai-streaming/process-stream.tsindex 7d501a99a48..99fa3c6024c 100644--- a/frontend/src/metabase/api/ai-streaming/process-stream.ts+++ b/frontend/src/metabase/api/ai-streaming/process-stream.ts@@ -8,6 +8,7 @@ import {dataPartSchema,finishPartSchema,knownDataPartTypes,+ startPartSchema,toolCallPartSchema,toolResultPartSchema,} from "./schemas";@@ -17,6 +18,7 @@ const StreamingPartTypeRegistry = {DATA: "2",ERROR: "3",FINISH_MESSAGE: "d",+ START_MESSAGE: "f",TOOL_CALL: "9",TOOL_RESULT: "a",} as const;@@ -88,6 +90,11 @@ function parseDataStreamPart(line: string) {name: "finish_message" as const,value: finishPartSchema.validateSync(jsonValue, { strict: true }),}))+ .with(StreamingPartTypeRegistry.START_MESSAGE, (code) => ({+ code,+ name: "start_message" as const,+ value: startPartSchema.validateSync(jsonValue, { strict: true }),+ })).exhaustive();}@@ -188,6 +195,7 @@ type StreamPartValue<name extends ParsedStreamPartName> = Extract<>["value"];export type AIStreamingConfig = {+ onStartMessagePart?: (part: StreamPartValue<"start_message">) => void;onTextPart?: (part: StreamPartValue<"text">) => void;// callback is only called if this version of the client is aware of the received data part typeonDataPart?: (part: KnownDataPart) => void;@@ -247,6 +255,9 @@ export async function processChatResponse(for (const streamPart of streamParts) {parsedStreamParts.push(streamPart);+ if (streamPart.name === "start_message") {+ config.onStartMessagePart?.(streamPart.value);+ }if (streamPart.name === "text") {config.onTextPart?.(streamPart.value);}diff --git a/frontend/src/metabase/api/ai-streaming/schemas.ts b/frontend/src/metabase/api/ai-streaming/schemas.tsindex 768a89ccde4..7f381b678b4 100644--- a/frontend/src/metabase/api/ai-streaming/schemas.ts+++ b/frontend/src/metabase/api/ai-streaming/schemas.ts@@ -18,14 +18,29 @@ export const knownDataPartTypes = ["todo_list","code_edit","transform_suggestion",+ "adhoc_viz",+ "static_viz",];+export type AdhocVizValue = {+ query: unknown;+ link: string;+ title?: string;+ display?: string;+};++export type StaticVizValue = {+ entity_id: number;+};+export type KnownDataPart =| { type: "navigate_to"; version: 1; value: string }| { type: "state"; version: 1; value: Record<string, any> }| { type: "todo_list"; version: 1; value: MetabotTodoItem[] }| { type: "transform_suggestion"; version: 1; value: SuggestedTransform }- | { type: "code_edit"; version: 1; value: MetabotCodeEdit };+ | { type: "code_edit"; version: 1; value: MetabotCodeEdit }+ | { type: "adhoc_viz"; version: 1; value: AdhocVizValue }+ | { type: "static_viz"; version: 1; value: StaticVizValue };export const toolCallPartSchema = Yup.object({toolCallId: Yup.string().required(),@@ -51,3 +66,7 @@ export const finishPartSchema = Yup.object({]).required(),});++export const startPartSchema = Yup.object({+ messageId: Yup.string().required(),+});diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsxindex 9aef486cc79..c1d36bf01e5 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminLayout.tsx@@ -1,14 +1,25 @@import ErrorBoundary from "metabase/ErrorBoundary";import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";+import { Box } from "metabase/ui";import { MetabotNavPane } from "./MetabotNavPane";export const MetabotAdminLayout = ({children,+ fullWidth,}: {children: React.ReactNode;+ fullWidth?: boolean;}) => (- <AdminSettingsLayout sidebar={<MetabotNavPane />}>- <ErrorBoundary>{children}</ErrorBoundary>+ <AdminSettingsLayout sidebar={<MetabotNavPane />} fullWidth={fullWidth}>+ <ErrorBoundary>+ {fullWidth ? (+ <Box py="lg" px="xl" maw="100rem" mx="auto">+ {children}+ </Box>+ ) : (+ children+ )}+ </ErrorBoundary></AdminSettingsLayout>);diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsxindex 3d14f008ec6..391e70250fe 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx@@ -1,17 +1,17 @@-import { Fragment } from "react";import { t } from "ttag";import {AdminNavItem,AdminNavWrapper,} from "metabase/admin/components/AdminNav";-import { PLUGIN_AI_CONTROLS } from "metabase/plugins";+import { PLUGIN_AI_CONTROLS, PLUGIN_AUDIT } from "metabase/plugins";import { Flex } from "metabase/ui";export function MetabotNavPane() {- const AiControlsNavItems = PLUGIN_AI_CONTROLS.AiControlsNavItems;+ const AiControlsNavItems = PLUGIN_AI_CONTROLS.getAiControlsNavItems();+ const AiAnalyticsNavItems = PLUGIN_AUDIT.getMetabotAnalyticsNavItems();- if (!AiControlsNavItems) {+ if (!AiControlsNavItems && !AiAnalyticsNavItems) {return null;}@@ -23,9 +23,8 @@ export function MetabotNavPane() {label={t`AI Settings`}path="/admin/metabot/"/>- <Fragment key="ai-controls">- <AiControlsNavItems />- </Fragment>+ {AiControlsNavItems}+ {AiAnalyticsNavItems}</AdminNavWrapper></Flex>);diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsxindex cabd96b2d38..bea59df64b8 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/routes.tsx@@ -1,12 +1,13 @@import { IndexRoute, Route } from "react-router";-import { PLUGIN_AI_CONTROLS } from "metabase/plugins";+import { PLUGIN_AI_CONTROLS, PLUGIN_AUDIT } from "metabase/plugins";import { AISettingsPage } from "./AISettingsPage";import { MetabotAdminLayout } from "./MetabotAdminLayout";export function getMetabotAdminRoutes() {return [+ PLUGIN_AUDIT.getAiAnalyticsRoutes(),<Route key="layout" component={MetabotAdminLayout}><IndexRoute key="index" component={AISettingsPage} /><Route key="metabot" path=":metabotId" component={AISettingsPage} />diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsxnew file mode 100644index 00000000000..5a4e18424d0--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx@@ -0,0 +1,186 @@+import { useClipboard } from "@mantine/hooks";+import { useMemo } from "react";+import { match } from "ts-pattern";+import { t } from "ttag";++import { CodeEditor } from "metabase/common/components/CodeEditor";+import { ForwardRefLink } from "metabase/common/components/Link";+import type { MetabotAgentDataPartMessage } from "metabase/metabot/state";+import { ActionIcon, Badge, Box, Button, Flex, Icon, Text } from "metabase/ui";+import type { MetabotCodeEdit } from "metabase-types/api";++import { AgentSuggestionMessage } from "./MetabotAgentSuggestionMessage";+import { AgentTodoListMessage } from "./MetabotAgentTodoMessage";++type AgentDataPartMessageProps = {+ message: MetabotAgentDataPartMessage;+ readonly: boolean;+ debug: boolean;+};++export const AgentDataPartMessage = ({+ message,+ readonly,+ debug,+}: AgentDataPartMessageProps) =>+ match(message)+ .with({ part: { type: "todo_list" } }, ({ part }) => (+ <AgentTodoListMessage todos={part.value} />+ ))+ .with({ part: { type: "transform_suggestion" } }, (msg) => (+ <AgentSuggestionMessage message={msg} readonly={readonly} />+ ))+ .with({ part: { type: "navigate_to" } }, ({ part }) =>+ debug ? <NavigateToDataPart type={part.type} path={part.value} /> : null,+ )+ .with({ part: { type: "code_edit" } }, ({ part }) =>+ debug ? <CodeEditDataPart type={part.type} value={part.value} /> : null,+ )+ .with({ part: { type: "adhoc_viz" } }, ({ part }) =>+ debug ? <DataPartJsonCard type={part.type} value={part.value} /> : null,+ )+ .with({ part: { type: "static_viz" } }, ({ part }) =>+ debug ? <DataPartJsonCard type={part.type} value={part.value} /> : null,+ )+ .exhaustive((msg: unknown) => {+ console.warn("AgentDataPartMessage received an unexpected value:", msg);+ return null;+ });++const DataPartJsonCard = ({+ type,+ value,+}: {+ type: string;+ value: unknown;+}) => {+ const clipboard = useClipboard();+ const formatted = useMemo(() => {+ try {+ return JSON.stringify(value, null, 2);+ } catch {+ return String(value);+ }+ }, [value]);++ return (+ <Box+ bg="background-secondary"+ bd="1px solid var(--mb-color-border)"+ bdrs="sm"+ >+ <Flex+ py="sm"+ px="md"+ direction="row"+ align="center"+ justify="space-between"+ >+ <Flex align="center">+ <Icon name="document" c="text-secondary" mr="sm" />+ <Text fw="bold">{type}</Text>+ </Flex>+ <ActionIcon h="sm" onClick={() => clipboard.copy(formatted)}>+ <Icon name="copy" size="1rem" />+ </ActionIcon>+ </Flex>+ <Box+ p="sm"+ bg="background-primary"+ style={{+ borderTop: "1px solid var(--mb-color-border)",+ borderBottomLeftRadius: "var(--mantine-radius-sm)",+ borderBottomRightRadius: "var(--mantine-radius-sm)",+ }}+ >+ <Box+ component="pre"+ m={0}+ style={{+ fontFamily: "var(--mb-default-monospace-font-family)",+ fontSize: "0.75rem",+ whiteSpace: "pre-wrap",+ wordBreak: "break-word",+ overflowX: "auto",+ }}+ >+ {formatted}+ </Box>+ </Box>+ </Box>+ );+};++const NavigateToDataPart = ({ type, path }: { type: string; path: string }) => (+ <Flex+ py="sm"+ px="md"+ bg="background-secondary"+ bd="1px solid var(--mb-color-border)"+ bdrs="sm"+ direction="row"+ align="center"+ justify="space-between"+ >+ <Flex align="center">+ <Icon name="document" c="text-secondary" mr="sm" />+ <Text fw="bold">{type}</Text>+ </Flex>+ <Button+ component={ForwardRefLink}+ to={path}+ target="_blank"+ variant="light"+ size="compact-xs"+ >{t`Visit`}</Button>+ </Flex>+);++const CodeEditDataPart = ({+ type,+ value,+}: {+ type: string;+ value: MetabotCodeEdit;+}) => {+ const clipboard = useClipboard();++ return (+ <Box+ bg="background-secondary"+ bd="1px solid var(--mb-color-border)"+ bdrs="sm"+ >+ <Flex+ py="sm"+ px="md"+ direction="row"+ align="center"+ justify="space-between"+ >+ <Flex align="center" gap="sm">+ <Icon name="document" c="text-secondary" />+ <Text fw="bold">{type}</Text>+ <Text c="text-secondary">{t`Buffer ID: ${value.buffer_id}`}</Text>+ <Badge variant="light" size="sm">+ {value.mode}+ </Badge>+ </Flex>+ <ActionIcon h="sm" onClick={() => clipboard.copy(value.value)}>+ <Icon name="copy" size="1rem" />+ </ActionIcon>+ </Flex>+ <Box+ bg="background-primary"+ style={{+ borderTop: "1px solid var(--mb-color-border)",+ borderBottomLeftRadius: "var(--mantine-radius-sm)",+ borderBottomRightRadius: "var(--mantine-radius-sm)",+ overflow: "hidden",+ }}+ >+ <CodeEditor value={value.value} language="sql" readOnly />+ </Box>+ </Box>+ );+};diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex f07c9c42fc4..7182d180616 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -13,7 +13,8 @@ import { useLazyGetTransformQuery } from "metabase/api";import { CodeMirror } from "metabase/common/components/CodeMirror";import { MetabotContext } from "metabase/metabot/context";import {- type MetabotAgentEditSuggestionChatMessage,+ type MetabotAgentDataPartMessage,+ type MetabotDataPart,activateSuggestedTransform,getIsSuggestedTransformActive,} from "metabase/metabot/state";@@ -30,17 +31,23 @@ import {Loader,Paper,Text,+ Tooltip,} from "metabase/ui";import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {+ MetabotSuggestedTransform,MetabotTransformInfo,SuggestedTransform,} from "metabase-types/api";import S from "./MetabotAgentSuggestionMessage.module.css";+export type SuggestionMessage = Omit<MetabotAgentDataPartMessage, "part"> & {+ part: Extract<MetabotDataPart, { type: "transform_suggestion" }>;+};+const PreviewContent = ({oldSource,newSource,@@ -82,7 +89,10 @@ const PreviewContent = ({const useGetOldTransform = ({editorTransform,suggestedTransform,-}: MetabotAgentEditSuggestionChatMessage["payload"]) => {+}: {+ editorTransform: MetabotTransformInfo | undefined;+ suggestedTransform: MetabotSuggestedTransform;+}) => {const [trigger, result] = useLazyGetTransformQuery();useMount(() => {if (!editorTransform && suggestedTransform.id) {@@ -103,8 +113,10 @@ const useGetOldTransform = ({export const AgentSuggestionMessage = ({message,+ readonly,}: {- message: MetabotAgentEditSuggestionChatMessage;+ message: SuggestionMessage;+ readonly?: boolean;}) => {const dispatch = useDispatch();const metadata = useSelector(getMetadata);@@ -113,7 +125,12 @@ export const AgentSuggestionMessage = ({const [isApplying, setIsApplying] = useState(false);const [hasAppliedInContext, setHasAppliedInContext] = useState(false);- const { suggestedTransform, editorTransform } = message.payload;+ const suggestedTransform: MetabotSuggestedTransform = {+ ...message.part.value,+ active: true,+ suggestionId: message.metadata?.suggestionId ?? message.id,+ };+ const editorTransform = message.metadata?.editorTransform;const existingTransformId =typeof suggestedTransform.id === "number"? suggestedTransform.id@@ -131,13 +148,21 @@ export const AgentSuggestionMessage = ({const canApply = suggestionActions? !hasAppliedInContext && !isApplying: !isViewing || !isActive;+const isNew = !isViewing && !editorTransform && existingTransformId == null;+ const applyBtnText = match({ isApplying, isNew, canApply })+ .with({ isApplying: true }, () => t`Applying...`)+ .with({ canApply: false }, () => t`Applied`)+ .with({ isNew: true }, () => t`Create`)+ .with({ canApply: true }, () => t`Apply`)+ .exhaustive();+const {data: originalTransform,isLoading,error,- } = useGetOldTransform(message.payload);+ } = useGetOldTransform({ editorTransform, suggestedTransform });const oldSource = originalTransform? getSourceCode(originalTransform, metadata)@@ -150,7 +175,10 @@ export const AgentSuggestionMessage = ({if (suggestionActions) {setIsApplying(true);try {- const result = await suggestionActions.applySuggestion(message.payload);+ const result = await suggestionActions.applySuggestion({+ editorTransform,+ suggestedTransform,+ });if (result.status === "applied") {setHasAppliedInContext(true);} else {@@ -244,23 +272,19 @@ export const AgentSuggestionMessage = ({h="1.375rem"gap="sm">- <Button- size="compact-xs"- variant="subtle"- fw="normal"- fz="sm"- c={canApply ? "success" : "text-tertiary"}- disabled={!canApply}- onClick={handleApply}- >- {isApplying- ? t`Applying...`- : match({ isNew, canApply })- .with({ canApply: false }, () => t`Applied`)- .with({ isNew: true }, () => t`Create`)- .with({ canApply: true }, () => t`Apply`)- .exhaustive()}- </Button>+ <Tooltip label={t`Read only`} disabled={!readonly}>+ <Button+ size="compact-xs"+ variant="subtle"+ fw="normal"+ fz="sm"+ c={canApply && !readonly ? "success" : "text-tertiary"}+ disabled={!canApply || readonly}+ onClick={handleApply}+ >+ {applyBtnText}+ </Button>+ </Tooltip></Flex></Group></Collapse>diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsxindex e263257920f..2b12c8a486d 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx@@ -8,6 +8,7 @@ import { createMockState } from "metabase/redux/store/mocks";import type {MetabotSuggestedTransform,MetabotTransformInfo,+ SuggestedTransform,} from "metabase-types/api";import {createMockNativeDatasetQuery,@@ -18,9 +19,10 @@ import {createMockTransform,} from "metabase-types/api/mocks/transform";-import type { MetabotAgentEditSuggestionChatMessage } from "../../state/types";--import { AgentSuggestionMessage } from "./MetabotAgentSuggestionMessage";+import {+ AgentSuggestionMessage,+ type SuggestionMessage,+} from "./MetabotAgentSuggestionMessage";const createMockSuggestedTransform = (overrides: Partial<MetabotSuggestedTransform>,@@ -39,28 +41,44 @@ const createMockTransformInfo = (...overrides,});-const createMockTransformSuggestionMessage = (- overrides: Partial<MetabotAgentEditSuggestionChatMessage>,-): MetabotAgentEditSuggestionChatMessage => ({- id: "msg-123",- role: "agent",- type: "edit_suggestion",- model: "transform",+const createMockTransformSuggestionMessage = (overrides: {payload: {- editorTransform: undefined,- suggestedTransform: createMockSuggestedTransform({}),- },- ...overrides,-});+ editorTransform: MetabotTransformInfo | undefined;+ suggestedTransform: MetabotSuggestedTransform;+ };+}): SuggestionMessage => {+ const {+ active: _active,+ suggestionId,+ ...value+ } = overrides.payload.suggestedTransform;+ return {+ id: "msg-123",+ role: "agent",+ type: "data_part",+ part: {+ type: "transform_suggestion",+ version: 1,+ value: value as SuggestedTransform,+ },+ metadata: {+ editorTransform: overrides.payload.editorTransform,+ suggestionId,+ },+ };+};-const setup = (message: MetabotAgentEditSuggestionChatMessage) => {+const setup = (message: SuggestionMessage, readonly = false) => {setupEnterprisePlugins();- return renderWithProviders(<AgentSuggestionMessage message={message} />, {- storeInitialState: createMockState({- settings: mockSettings(),- currentUser: createMockUser(),- }),- });+ return renderWithProviders(+ <AgentSuggestionMessage message={message} readonly={readonly} />,+ {+ storeInitialState: createMockState({+ settings: mockSettings(),+ currentUser: createMockUser(),+ }),+ },+ );};describe("AgentSuggestionMessage", () => {@@ -117,6 +135,30 @@ describe("AgentSuggestionMessage", () => {).toBeInTheDocument();});+ it("should disable the action button and show a read-only tooltip when readonly", async () => {+ setup(+ createMockTransformSuggestionMessage({+ payload: {+ editorTransform: undefined,+ suggestedTransform: createMockSuggestedTransform({+ id: undefined,+ source: {+ type: "query",+ query: createMockNativeDatasetQuery(),+ },+ }),+ },+ }),+ true,+ );++ const button = await screen.findByRole("button", { name: /Create/ });+ expect(button).toBeDisabled();++ await userEvent.hover(button);+ expect(await screen.findByRole("tooltip")).toHaveTextContent("Read only");+ });+it("should be collapsible", async () => {setup(createMockTransformSuggestionMessage({diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxindex e7012b1d142..6b54bf7319f 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx@@ -38,6 +38,17 @@ const ToolCallDetailsModal = ({}}, [message.args]);+ const parsedResult = useMemo(() => {+ if (!message.result) {+ return "";+ }+ try {+ return JSON.stringify(JSON.parse(message.result), null, 2);+ } catch {+ return message.result;+ }+ }, [message.result]);+return (<Modalopened@@ -79,12 +90,12 @@ const ToolCallDetailsModal = ({</Badge>)}</Flex>- <ActionIcon h="sm" onClick={() => copy(message.result)}>+ <ActionIcon h="sm" onClick={() => copy(parsedResult)}><Icon name="copy" size="1rem" /></ActionIcon></Flex><Box mx="-1.5rem">- <CodeEditor value={message.result} readOnly />+ <CodeEditor value={parsedResult} language="json" readOnly /></Box></Stack>)}@@ -114,8 +125,8 @@ export const AgentToolCallMessage = ({align="center"justify="space-between">- <Flex>- <Text mr="sm">🔧</Text>+ <Flex align="center">+ <Icon name="gear" c="text-secondary" mr="sm" /><Text fw="bold">{message.name}</Text></Flex><Flex align="center" gap="xs">diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsxindex 762ae67cf44..62295157aeb 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx@@ -168,6 +168,7 @@ export const MetabotChat = ({config.preventRetryMessage ? undefined : metabot.retryMessage}isDoingScience={metabot.isDoingScience}+ debug={metabot.debugMode}showFeedbackButtons={isHosted}/>{/* loading */}diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsxindex db587c63a7e..80087cb72ea 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx@@ -1,6 +1,6 @@import { useClipboard } from "@mantine/hooks";import cx from "classnames";-import { forwardRef, useCallback, useState } from "react";+import { forwardRef, useCallback, useMemo, useState } from "react";import { match } from "ts-pattern";import { t } from "ttag";@@ -11,6 +11,7 @@ import type {MetabotAgentChatMessage,MetabotAgentTextChatMessage,MetabotChatMessage,+ MetabotDataPart,MetabotErrorMessage,MetabotUserChatMessage,} from "metabase/metabot/state";@@ -27,12 +28,29 @@ import type { MetabotFeedback } from "metabase-types/api";import { AIMarkdown } from "../AIMarkdown/AIMarkdown";-import { AgentSuggestionMessage } from "./MetabotAgentSuggestionMessage";-import { AgentTodoListMessage } from "./MetabotAgentTodoMessage";+import { AgentDataPartMessage } from "./MetabotAgentDataPartMessage";import { AgentToolCallMessage } from "./MetabotAgentToolCallMessage";import Styles from "./MetabotChat.module.css";import { MetabotFeedbackModal } from "./MetabotFeedbackModal";+const isUserVisibleDataPart = (part: MetabotDataPart): boolean =>+ match(part)+ .with({ type: "todo_list" }, () => true)+ .with({ type: "transform_suggestion" }, () => true)+ .with({ type: "navigate_to" }, () => false)+ .with({ type: "code_edit" }, () => false)+ .with({ type: "adhoc_viz" }, () => false)+ .with({ type: "static_viz" }, () => false)+ .exhaustive();++const isUserVisibleMessage = (message: MetabotChatMessage): boolean =>+ match(message)+ .with({ type: "text" }, () => true)+ .with({ type: "action" }, () => true)+ .with({ type: "data_part" }, ({ part }) => isUserVisibleDataPart(part))+ .with({ type: "tool_call" }, () => false)+ .exhaustive();+interface BaseMessageProps extends Omit<FlexProps, "onCopy"> {message: MetabotChatMessage;hideActions: boolean;@@ -137,6 +155,8 @@ const FeedbackButton = forwardRef<HTMLButtonElement, FeedbackButtonProps>(interface AgentMessageProps extends Omit<BaseMessageProps, "message"> {message: MetabotAgentChatMessage;+ debug: boolean;+ readonly: boolean;onRetry?: (messageId: string) => void;onCopy: (messageId: string) => void;showFeedbackButtons: boolean;@@ -148,6 +168,8 @@ interface AgentMessageProps extends Omit<BaseMessageProps, "message"> {export const AgentMessage = ({message,className,+ debug,+ readonly,onCopy,onRetry,showFeedbackButtons,@@ -157,6 +179,13 @@ export const AgentMessage = ({hideActions,...props}: AgentMessageProps) => {+ const messageId = message.type === "text" ? (message.externalId ?? "") : "";+ const canGiveFeedback = !!(+ showFeedbackButtons &&+ setFeedbackMessage &&+ messageId+ );+return (<MessageContainer chatRole={message.role} {...props}>{message.type === "text" && (@@ -167,11 +196,12 @@ export const AgentMessage = ({{message.message}</AIMarkdown>)}- {message.type === "edit_suggestion" && (- <AgentSuggestionMessage message={message} />- )}- {message.type === "todo_list" && (- <AgentTodoListMessage todos={message.payload} />+ {message.type === "data_part" && (+ <AgentDataPartMessage+ message={message}+ debug={debug}+ readonly={readonly}+ />)}{message.type === "tool_call" && (<AgentToolCallMessage message={message} />@@ -188,7 +218,7 @@ export const AgentMessage = ({<Icon name="copy" size="1rem" /></ActionIcon></Tooltip>- {showFeedbackButtons && setFeedbackMessage && (+ {canGiveFeedback && (<><Tooltip label={t`Give positive feedback`}><FeedbackButton@@ -197,10 +227,7 @@ export const AgentMessage = ({hasBeenClicked={submittedFeedback === "positive"}disabled={!!submittedFeedback}onClick={() =>- setFeedbackMessage({- messageId: message.id,- positive: true,- })+ setFeedbackMessage({ messageId, positive: true })}/></Tooltip>@@ -211,10 +238,7 @@ export const AgentMessage = ({hasBeenClicked={submittedFeedback === "negative"}disabled={!!submittedFeedback}onClick={() =>- setFeedbackMessage({- messageId: message.id,- positive: false,- })+ setFeedbackMessage({ messageId, positive: false })}/></Tooltip>@@ -312,6 +336,8 @@ export const Messages = ({errorMessages,onRetryMessage,isDoingScience,+ debug,+ readonly = false,showFeedbackButtons = false,onInternalLinkClick,}: {@@ -319,9 +345,15 @@ export const Messages = ({errorMessages: MetabotErrorMessage[];onRetryMessage?: (messageId: string) => void;isDoingScience: boolean;+ debug: boolean;+ readonly?: boolean;showFeedbackButtons?: boolean;onInternalLinkClick?: (navigateToPath: string) => void;}) => {+ const visibleMessages = useMemo(+ () => (debug ? messages : messages.filter(isUserVisibleMessage)),+ [debug, messages],+ );const clipboard = useClipboard();const [sendToast] = useToast();@@ -336,7 +368,7 @@ export const Messages = ({const [submitMetabotFeedback] = useSubmitMetabotFeedbackMutation();const submitFeedback = async (metabotFeedback: MetabotFeedback) => {- const { message_id, positive } = metabotFeedback.feedback;+ const { message_id, positive } = metabotFeedback;try {await submitMetabotFeedback(metabotFeedback).unwrap();@@ -379,19 +411,25 @@ export const Messages = ({return (<>- {messages.map((message, index) =>+ {visibleMessages.map((message, index) =>message.role === "agent" ? (<AgentMessagekey={"msg-" + message.id}data-testid="metabot-chat-message"message={message}+ debug={debug}+ readonly={readonly}onRetry={onRetryMessage}onCopy={onAgentMessageCopy}showFeedbackButtons={showFeedbackButtons}setFeedbackMessage={setFeedbackModal}- submittedFeedback={feedbackState.submitted[message.id]}+ submittedFeedback={+ message.type === "text" && message.externalId+ ? feedbackState.submitted[message.externalId]+ : undefined+ }hideActions={- isDoingScience || messages[index + 1]?.role === "agent"+ isDoingScience || visibleMessages[index + 1]?.role === "agent"}onInternalLinkClick={onInternalLinkClick}/>@@ -400,7 +438,7 @@ export const Messages = ({key={"msg-" + message.id}data-testid="metabot-chat-message"message={message}- hideActions={isDoingScience && messages.length === index + 1}+ hideActions={isDoingScience && visibleMessages.length === index + 1}onCopy={() => {const copyText =message.type === "action"diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsxindex b4477f839a3..6503ddb7f8e 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx@@ -2,18 +2,18 @@ import { useFormikContext } from "formik";import { c, t } from "ttag";import * as Yup from "yup";-import { useSetting } from "metabase/common/hooks";import { Form, FormProvider } from "metabase/forms";import { FormSelect } from "metabase/forms/components/FormSelect";import { FormTextarea } from "metabase/forms/components/FormTextarea";import { useMetabotName } from "metabase/metabot/hooks";-import { getMetabotId, getMetabotState } from "metabase/metabot/state";+import { getMetabotId } from "metabase/metabot/state";import { useSelector } from "metabase/redux";-import { getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Button, Group, Modal, Stack, Text } from "metabase/ui";import * as Errors from "metabase/utils/errors";-import type { MetabotFeedback } from "metabase-types/api";+import type { MetabotFeedback, MetabotIssueType } from "metabase-types/api";++import { issueTypeOptions } from "./feedback-issue-types";// Issue types that require free text feedbackconst ISSUE_TYPES_REQUIRING_FREEFORM = ["ui-bug", "other"] as const;@@ -63,31 +63,28 @@ export const MetabotFeedbackModal = ({positive,}: MetabotFeedbackModalProps) => {const applicationName = useSelector(getApplicationName);- const isAdmin = useSelector(getUserIsAdmin);- const version = useSetting("version");const metabotName = useMetabotName();-const metabotId = useSelector(getMetabotId);- const metabotState = useSelector(getMetabotState);- const handleSubmit = (- values: Pick<- MetabotFeedback["feedback"],- "issue_type" | "freeform_feedback"- >,- ) =>- onSubmit({- version,+ const handleSubmit = (values: {+ freeform_feedback: string;+ issue_type?: MetabotIssueType | "";+ }) => {+ const base = {metabot_id: metabotId,- feedback: {- message_id: messageId,- positive,- ...values,- },- conversation_data: metabotState,- is_admin: isAdmin,- submission_time: new Date().toISOString(),- });+ message_id: messageId,+ freeform_feedback: values.freeform_feedback,+ };+ onSubmit(+ positive+ ? { ...base, positive: true }+ : {+ ...base,+ positive: false,+ issue_type: values.issue_type || undefined,+ },+ );+ };return (<Modal@@ -113,24 +110,7 @@ export const MetabotFeedbackModal = ({<FormSelectname="issue_type"placeholder={t`Select issue type`}- data={[- { label: t`UI bug`, value: "ui-bug" },- {- label: t`Took incorrect actions`,- value: "took-incorrect-actions",- },- { label: t`Overall refusal`, value: "overall-refusal" },- {- label: t`Did not follow request`,- value: "did-not-follow-request",- },- { label: t`Not factually correct`, value: "not-factual" },- {- label: t`Incomplete response`,- value: "incomplete-response",- },- { label: t`Other`, value: "other" },- ]}+ data={issueTypeOptions}/></Stack>)}@@ -150,7 +130,7 @@ export const MetabotFeedbackModal = ({/></Stack>- <Text size="sm" color="text-secondary">+ <Text size="sm" c="text-secondary">{/* eslint-disable-next-line metabase/no-literal-metabase-strings -- this is a translation context string, not shown to users */}{c("{0} is the name of the application, usually 'Metabase'").t`Please submit this report to ${applicationName}. Note that it may contain sensitive data from your conversation.`}diff --git a/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts b/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.tsnew file mode 100644index 00000000000..cc7ce4e2a26--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts@@ -0,0 +1,23 @@+import { match } from "ts-pattern";+import { t } from "ttag";++import {+ METABOT_ISSUE_TYPE_VALUES,+ type MetabotIssueType,+} from "metabase-types/api";++export const getIssueTypeLabel = (value: MetabotIssueType): string =>+ match(value)+ .with("ui-bug", () => t`UI bug`)+ .with("took-incorrect-actions", () => t`Took incorrect actions`)+ .with("overall-refusal", () => t`Overall refusal`)+ .with("did-not-follow-request", () => t`Did not follow request`)+ .with("not-factual", () => t`Not factually correct`)+ .with("incomplete-response", () => t`Incomplete response`)+ .with("other", () => t`Other`)+ .exhaustive();++export const issueTypeOptions = METABOT_ISSUE_TYPE_VALUES.map((value) => ({+ value,+ label: getIssueTypeLabel(value),+}));diff --git a/frontend/src/metabase/metabot/constants.ts b/frontend/src/metabase/metabot/constants.tsindex 8422b9898b4..44f94528c67 100644--- a/frontend/src/metabase/metabot/constants.ts+++ b/frontend/src/metabase/metabot/constants.ts@@ -19,11 +19,69 @@ export const FIXED_METABOT_ENTITY_IDS = {SLACKBOT: "slackbotmetabotmetabo" as const,};+export const METABOT_PROFILES = {+ internal: {+ get label() {+ return t`Internal`;+ },+ },+ embedding_next: {+ get label() {+ return t`Embedding`;+ },+ },+ nlq: {+ get label() {+ return t`NLQ`;+ },+ },+ sql: {+ get label() {+ return t`SQL`;+ },+ },+ // deprecated+ slack: {+ get label() {+ return t`Slackbot`;+ },+ },+ slackbot: {+ get label() {+ return t`Slackbot`;+ },+ },+ transforms_codegen: {+ get label() {+ return t`Transforms codegen`;+ },+ },+ "document-generate-content": {+ get label() {+ return t`Documents`;+ },+ },+} as const;++export type MetabotProfileId = keyof typeof METABOT_PROFILES;++export function isMetabotProfileId(id: string): id is MetabotProfileId {+ return id in METABOT_PROFILES;+}++export function getMetabotProfileLabel(id: MetabotProfileId): string {+ return METABOT_PROFILES[id].label;+}++export function renderMetabotProfileLabel(id: string): string {+ return isMetabotProfileId(id) ? getMetabotProfileLabel(id) : id;+}+export const METABOT_PROFILE_OVERRIDES = {DEFAULT: undefined,SQL: "sql",TRANSFORMS_CODEGEN: "transforms_codegen",-};+} as const satisfies Record<string, MetabotProfileId | undefined>;export const METABOT_ERR_MSG = {get default() {diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agent.tsindex f3533560d61..78b605fd472 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts@@ -5,6 +5,7 @@ import { useMetabotContext } from "metabase/metabot";import { useDispatch, useSelector } from "metabase/redux";import { trackMetabotRequestSent } from "../analytics";+import type { MetabotProfileId } from "../constants";import {type MetabotAgentId,type MetabotPromptSubmissionResult,@@ -53,7 +54,7 @@ export const useMetabotAgent = (agentId: MetabotAgentId = "omnibot") => {);const setProfileOverride = useCallback(- (profile: string) => {+ (profile: MetabotProfileId | undefined) => {dispatch(setProfileOverrideAction({ agentId, profile }));},[dispatch, agentId],@@ -63,7 +64,7 @@ export const useMetabotAgent = (agentId: MetabotAgentId = "omnibot") => {async (prompt: string | Omit<MetabotUserChatMessage, "id" | "role">,options?: {- profile?: string | undefined;+ profile?: MetabotProfileId | undefined;preventOpenSidebar?: boolean;focusInput?: boolean;},diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex 681055f62ab..2940dd97de3 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -9,6 +9,7 @@ import {} from "metabase/api/ai-streaming";import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { PLUGIN_AUDIT } from "metabase/plugins";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";@@ -23,7 +24,7 @@ import type {MetabotTransformInfo,} from "metabase-types/api";-import { METABOT_ERR_MSG } from "../constants";+import { METABOT_ERR_MSG, type MetabotProfileId } from "../constants";import { metabot } from "./reducer";import {@@ -38,10 +39,8 @@ import {getUserPromptForMessageId,} from "./selectors";import type {- MetabotAgentChartMessage,- MetabotAgentEditSuggestionChatMessage,+ MetabotAgentDataPartMessage,MetabotAgentId,- MetabotAgentTodoListChatMessage,MetabotErrorMessage,MetabotUserChatMessage,SlashCommand,@@ -56,6 +55,7 @@ export const {addUserMessage,setIsProcessing,setNavigateToPath,+ setPendingMessageExternalId,setProfileOverride,toolCallStart,toolCallEnd,@@ -164,7 +164,13 @@ export const executeSlashCommand = createAsyncThunk<match(command).with({ cmd: "profile" }, ({ args }) => {if (args.length <= 1) {- dispatch(setProfileOverride({ agentId, profile: args[0] }));+ // cast allows custom overrides for development purposes; the backend validates+ dispatch(+ setProfileOverride({+ agentId,+ profile: args[0] as MetabotProfileId | undefined,+ }),+ );} else {dispatch(addUndo({ message: "/profile <name>" }));}@@ -189,7 +195,15 @@ export const executeSlashCommand = createAsyncThunk<);}).otherwise(() => {- dispatch(addUndo({ message: "Unknown command" }));+ const handled = PLUGIN_AUDIT.handleMetabotSlashCommand({+ command,+ agentId,+ dispatch,+ getState,+ });+ if (!handled) {+ dispatch(addUndo({ message: "Unknown command" }));+ }});},);@@ -222,7 +236,7 @@ export const submitInput = createAsyncThunk<context: MetabotChatContext;agentId: MetabotAgentId;metabot_id?: string;- profile?: string;+ profile?: MetabotProfileId;}>("metabase/metabot/submitInput",@@ -366,18 +380,6 @@ export const sendAgentRequest = createAsyncThunk<try {let state = {};let error: unknown = undefined;- /**- * Hold the chart message until the stream finishes so it renders after- * the agent's final text. `navigate_to` arrives mid-stream, before the- * last message, so inserting it eagerly would show the chart above later- * text.- *- * Last navigate_to wins, matching setNavigateToPath/CurrentChart semantics.- * In practice we don't expect more than one navigate_to in a single stream.- */- let pendingChartMessage:- | { type: "chart"; navigateTo: string }- | undefined = undefined;const response = await aiStreamingQuery({@@ -390,19 +392,15 @@ export const sendAgentRequest = createAsyncThunk<},{onDataPart: function handleDataPart(part) {+ const pushDataPart = (+ message: Omit<MetabotAgentDataPartMessage, "id" | "role">,+ ) => dispatch(addAgentMessage({ ...message, agentId }));+match(part)// only update the convo state if the request is successful.with({ type: "state" }, (part) => (state = part.value)).with({ type: "todo_list" }, (part) => {- const message: Omit<- MetabotAgentTodoListChatMessage,- "id" | "role"- > = {- type: "todo_list",- payload: part.value,- };-- dispatch(addAgentMessage({ ...message, agentId }));+ pushDataPart({ type: "data_part", part });}).with({ type: "code_edit" }, (part) => {dispatch(addSuggestedCodeEdit({ ...part.value, active: true }));@@ -410,56 +408,53 @@ export const sendAgentRequest = createAsyncThunk<if (part.value.buffer_id === "qb") {dispatch(setIsNativeEditorOpen(true));}+ pushDataPart({ type: "data_part", part });}).with({ type: "navigate_to" }, (part) => {dispatch(setNavigateToPath(part.value));- if (isEmbeddingSdk()) {- if (pendingChartMessage) {- console.warn("Overwriting pending navigate_to: ", {- previous: pendingChartMessage.navigateTo,- next: part.value,- });- }- pendingChartMessage = {- type: "chart",- navigateTo: part.value,- };- }-if (!isEmbeddingSdk()) {dispatch(push(part.value) as UnknownAction);}+ pushDataPart({ type: "data_part", part });})- .with({ type: "transform_suggestion" }, ({ value }) => {+ .with({ type: "transform_suggestion" }, (part) => {+ const suggestionId = nanoid();const suggestedTransform = {- ...value,- id: value.id || undefined,+ ...part.value,+ id: part.value.id || undefined,active: true,- suggestionId: nanoid(),+ suggestionId,};dispatch(addSuggestedTransform(suggestedTransform));- const transform = request.context.user_is_viewing+ const editorTransform = request.context.user_is_viewing.filter((t): t is MetabotTransformInfo => t.type === "transform",).find((t) => t.id === suggestedTransform.id);- const message: Omit<- MetabotAgentEditSuggestionChatMessage,- "id" | "role"- > = {- type: "edit_suggestion",- model: "transform",- payload: {- editorTransform: transform,- suggestedTransform,- },- };- dispatch(addAgentMessage({ ...message, agentId }));+ pushDataPart({+ type: "data_part",+ part,+ metadata: { editorTransform, suggestionId },+ });+ })+ .with({ type: "adhoc_viz" }, (part) => {+ pushDataPart({ type: "data_part", part });+ })+ .with({ type: "static_viz" }, (part) => {+ pushDataPart({ type: "data_part", part });}).exhaustive();},+ onStartMessagePart: function handleStartMessagePart(part) {+ dispatch(+ setPendingMessageExternalId({+ agentId,+ externalId: part.messageId,+ }),+ );+ },onTextPart: function handleTextPart(part) {dispatch(addAgentTextDelta({ agentId, text: String(part) }));},@@ -475,15 +470,6 @@ export const sendAgentRequest = createAsyncThunk<},);- // Preserve any chart the agent already committed via `navigate_to`,- // even if the stream errored or was cancelled before the closing text- // arrived.- if (pendingChartMessage != null) {- const chartMessage: Omit<MetabotAgentChartMessage, "id" | "role"> =- pendingChartMessage;- dispatch(addAgentMessage({ ...chartMessage, agentId }));- }-if (error) {throw error;}diff --git a/frontend/src/metabase/metabot/state/reducer-utils.ts b/frontend/src/metabase/metabot/state/reducer-utils.tsindex d39d58e5cde..baf14f2cae7 100644--- a/frontend/src/metabase/metabot/state/reducer-utils.ts+++ b/frontend/src/metabase/metabot/state/reducer-utils.ts@@ -3,6 +3,7 @@ import { merge } from "icepick";import type { WritableDraft } from "immer";import { match } from "ts-pattern";+import { METABOT_PROFILE_OVERRIDES } from "metabase/metabot/constants";import { uuid } from "metabase/utils/uuid";import type {@@ -43,7 +44,7 @@ const agentOverridesByAgentId: Partial<Record<MetabotAgentId, Partial<MetabotConverstationState>>> = {sql: {- profileOverride: "sql",+ profileOverride: METABOT_PROFILE_OVERRIDES.SQL,},};@@ -63,6 +64,7 @@ export const createConversation = (state: {},activeToolCalls: [],profileOverride: undefined,+ pendingMessageExternalId: undefined,...overrides,conversationId: overrides?.conversationId ?? uuid(),experimental: {diff --git a/frontend/src/metabase/metabot/state/reducer.ts b/frontend/src/metabase/metabot/state/reducer.tsindex ba8c415cfb4..e07ce453d7b 100644--- a/frontend/src/metabase/metabot/state/reducer.ts+++ b/frontend/src/metabase/metabot/state/reducer.ts@@ -11,7 +11,7 @@ import type {SuggestedTransform,} from "metabase-types/api";-import { TOOL_CALL_MESSAGES } from "../constants";+import { type MetabotProfileId, TOOL_CALL_MESSAGES } from "../constants";import { sendAgentRequest } from "./actions";import {@@ -85,9 +85,12 @@ export const metabot = createSlice({>,) => {convo.activeToolCalls = [];+ const externalId = convo.pendingMessageExternalId;+ convo.pendingMessageExternalId = undefined;convo.messages.push({id: createMessageId(),role: "agent",+ ...(externalId ? { externalId } : {}),...action.payload,// transforms in message is making this flakily produce possibly infinite// typescript errors. since unused ts-expect-error directives produces@@ -112,17 +115,25 @@ export const metabot = createSlice({if (canAppend) {lastMessage.message = lastMessage.message + action.payload.text;} else {+ const externalId = convo.pendingMessageExternalId;+ convo.pendingMessageExternalId = undefined;convo.messages.push({id: createMessageId(),role: "agent",type: "text",message: action.payload.text,+ ...(externalId ? { externalId } : {}),});}convo.activeToolCalls = hasToolCalls ? [] : convo.activeToolCalls;},),+ setPendingMessageExternalId: convoReducer(+ (convo, action: ConvoPayloadAction<{ externalId: string }>) => {+ convo.pendingMessageExternalId = action.payload.externalId;+ },+ ),toolCallStart: convoReducer((convo,@@ -206,7 +217,10 @@ export const metabot = createSlice({},),setProfileOverride: convoReducer(- (state, action: ConvoPayloadAction<{ profile: string | undefined }>) => {+ (+ state,+ action: ConvoPayloadAction<{ profile: MetabotProfileId | undefined }>,+ ) => {state.profileOverride = action.payload.profile;},),@@ -337,11 +351,13 @@ export const metabot = createSlice({convo.activeToolCalls = [];convo.isProcessing = false;convo.experimental.developerMessage = "";+ convo.pendingMessageExternalId = undefined;}}).addCase(sendAgentRequest.rejected, (state, action) => {const convo = getRequestConversation(state, action);if (convo) {+ convo.pendingMessageExternalId = undefined;// aborted requests needs special state adjustmentsif (action.payload?.type === "abort") {convo.state = { ...(action.payload?.state ?? {}) };diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.tsindex 6738216e47d..e1005ef4a6b 100644--- a/frontend/src/metabase/metabot/state/selectors.ts+++ b/frontend/src/metabase/metabot/state/selectors.ts@@ -12,9 +12,14 @@ import {FIXED_METABOT_IDS,LONG_CONVO_MSG_LENGTH_THRESHOLD,METABOT_REQUEST_IDS,+ type MetabotProfileId,} from "../constants";-import type { MetabotAgentId, MetabotUserChatMessage } from "./types";+import type {+ MetabotAgentId,+ MetabotChatMessage,+ MetabotUserChatMessage,+} from "./types";/** Top Level Selectors@@ -96,20 +101,11 @@ export const getMetabotVisible = createSelector((convo) => convo.visible,);-const getInternalMessages = createSelector(+export const getMessages = createSelector(getMetabotConversation,(convo) => convo.messages,);-export const getMessages = createSelector(- [getInternalMessages, getDebugMode],- (messages, debugMode) => {- return debugMode- ? messages- : messages.filter((msg) => msg.type !== "tool_call");- },-);-export const getDeveloperMessage = createSelector(getMetabotConversation,(convo) => convo.experimental.developerMessage,@@ -124,6 +120,29 @@ export const getLastMessage = createSelector(getMessages, (messages) =>_.last(messages),);+const splitByTurn = (messages: MetabotChatMessage[]): MetabotChatMessage[][] =>+ messages.reduce<MetabotChatMessage[][]>((turns, m) => {+ if (m.role === "user" || turns.length === 0) {+ turns.push([m]);+ } else {+ turns[turns.length - 1].push(m);+ }+ return turns;+ }, []);++export const getFinalNavigateToMessageIdsPerTurn = createSelector(+ getMessages,+ (messages) =>+ new Set(+ splitByTurn(messages).flatMap((turn) => {+ const lastNav = turn.findLast(+ (m) => m.type === "data_part" && m.part.type === "navigate_to",+ );+ return lastNav ? [lastNav.id] : [];+ }),+ ),+);+export const getAgentErrorMessages = createSelector(getMetabotConversation,(convo) => convo.errorMessages,@@ -196,9 +215,10 @@ export const getProfileOverride = createSelector(export const getProfile = createSelector([getProfileOverride, getDebugMode, getLocation],- (profileOverride, debugMode, location) => {+ (profileOverride, debugMode, location): MetabotProfileId | undefined => {const isTransformsPage = location.pathname.startsWith(Urls.transformList());return match({ debugMode, isTransformsPage })+ .returnType<MetabotProfileId | undefined>().with({ debugMode: false, isTransformsPage: true },() => "transforms_codegen",diff --git a/frontend/src/metabase/metabot/state/types.ts b/frontend/src/metabase/metabot/state/types.tsindex 5679692d9e7..84488373ab6 100644--- a/frontend/src/metabase/metabot/state/types.ts+++ b/frontend/src/metabase/metabot/state/types.ts@@ -1,11 +1,19 @@+import type { KnownDataPart } from "metabase/api/ai-streaming/schemas";+import type { MetabotProfileId } from "metabase/metabot/constants";import type {MetabotCodeEdit,MetabotHistory,MetabotSuggestedTransform,- MetabotTodoItem,MetabotTransformInfo,} from "metabase-types/api";+export type MetabotDataPart = Exclude<KnownDataPart, { type: "state" }>;++export type MetabotDataPartMetadata = {+ editorTransform?: MetabotTransformInfo;+ suggestionId?: string;+};+export type MetabotUserTextChatMessage = {id: string;role: "user";@@ -26,24 +34,15 @@ export type MetabotAgentTextChatMessage = {role: "agent";type: "text";message: string;+ externalId?: string;};-export type MetabotAgentTodoListChatMessage = {- id: string;- role: "agent";- type: "todo_list";- payload: MetabotTodoItem[];-};--export type MetabotAgentEditSuggestionChatMessage = {+export type MetabotAgentDataPartMessage = {id: string;role: "agent";- type: "edit_suggestion";- model: "transform";- payload: {- editorTransform: MetabotTransformInfo | undefined;- suggestedTransform: MetabotSuggestedTransform;- };+ type: "data_part";+ part: MetabotDataPart;+ metadata?: MetabotDataPartMetadata;};export type MetabotDebugToolCallMessage = {@@ -57,19 +56,10 @@ export type MetabotDebugToolCallMessage = {is_error?: boolean;};-export type MetabotAgentChartMessage = {- id: string;- role: "agent";- type: "chart";- navigateTo: string;-};-export type MetabotAgentChatMessage =| MetabotAgentTextChatMessage- | MetabotAgentTodoListChatMessage- | MetabotAgentEditSuggestionChatMessage- | MetabotDebugToolCallMessage- | MetabotAgentChartMessage;+ | MetabotAgentDataPartMessage+ | MetabotDebugToolCallMessage;export type MetabotUserChatMessage =| MetabotUserTextChatMessage@@ -116,7 +106,8 @@ export interface MetabotConverstationState {history: MetabotHistory;state: any;activeToolCalls: MetabotToolCall[];- profileOverride: string | undefined;+ profileOverride: MetabotProfileId | undefined;+ pendingMessageExternalId: string | undefined;experimental: {developerMessage: string;metabotReqIdOverride: string | undefined;diff --git a/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts b/frontend/src/metabase/metabot/tests/feedback.unit.spec.tsindex 35c68dc975b..febb3e31bc9 100644--- a/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts+++ b/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts@@ -84,6 +84,13 @@ describe("metabot > feedback", () => {await submitFeedback(modal);expect(feedbackEndpoint.calls()).toHaveLength(1);+ const body = await feedbackEndpoint.calls()[0].request?.json();+ expect(body).toEqual({+ metabot_id: expect.any(Number),+ message_id: "msg_test_favorite",+ positive: false,+ freeform_feedback: "",+ });expect(await thumbsUp(lastMessage)).toBeDisabled();expect(await thumbsDown(lastMessage)).toBeDisabled();@@ -127,4 +134,27 @@ describe("metabot > feedback", () => {expect(feedbackEndpoint.calls()).toHaveLength(1);});++ it("should submit positive feedback", async () => {+ setup({ isHosted: true });+ const feedbackEndpoint = mockFeedbackEndpoint();+ mockAgentEndpoint({ textChunks: whoIsYourFavoriteResponse });++ await enterChatMessage("Who is your favorite?");+ const lastMessage = (await lastChatMessage())!;++ await userEvent.click(await thumbsUp(lastMessage));+ const modal = await feedbackModal();+ await submitFeedback(modal);++ expect(feedbackEndpoint.calls()).toHaveLength(1);+ const body = await feedbackEndpoint.calls()[0].request?.json();+ expect(body).toEqual({+ metabot_id: expect.any(Number),+ message_id: "msg_test_favorite",+ positive: true,+ freeform_feedback: "",+ });+ expect(body).not.toHaveProperty("issue_type");+ });});diff --git a/frontend/src/metabase/metabot/tests/history.unit.spec.tsx b/frontend/src/metabase/metabot/tests/history.unit.spec.tsxindex 61320b9160a..9abc261deec 100644--- a/frontend/src/metabase/metabot/tests/history.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/history.unit.spec.tsx@@ -107,7 +107,9 @@ describe("metabot > history", () => {type: "text",message: "Who is your favorite?",});- expect(_.omit(beforeResetState.messages[1], ["id"])).toStrictEqual({+ expect(+ _.omit(beforeResetState.messages[1], ["id", "externalId"]),+ ).toStrictEqual({role: "agent",type: "text",message: "You, but don't tell anyone.",diff --git a/frontend/src/metabase/metabot/tests/utils.tsx b/frontend/src/metabase/metabot/tests/utils.tsxindex c0611dcd238..9070880a5b3 100644--- a/frontend/src/metabase/metabot/tests/utils.tsx+++ b/frontend/src/metabase/metabot/tests/utils.tsx@@ -134,6 +134,7 @@ export const lastReqBody = async (// Common mock response fixturesexport const whoIsYourFavoriteResponse = [+ `f:{"messageId":"msg_test_favorite"}`,`0:"You, but don't tell anyone."`,`2:{"type":"state","version":1,"value":{"queries":{}}}`,`d:{"finishReason":"stop","usage":{"promptTokens":4916,"completionTokens":8}}`,diff --git a/frontend/src/metabase/plugins/oss/ai-controls.ts b/frontend/src/metabase/plugins/oss/ai-controls.tsindex b47fd61dc74..b6009db7c43 100644--- a/frontend/src/metabase/plugins/oss/ai-controls.ts+++ b/frontend/src/metabase/plugins/oss/ai-controls.ts@@ -1,15 +1,15 @@-import type { ComponentType, ReactNode } from "react";+import type { ReactNode } from "react";export type AiControlsPlugin = {isEnabled: boolean;getAiControlsRoutes: () => ReactNode;- AiControlsNavItems: ComponentType | null;+ getAiControlsNavItems: () => ReactNode;};const getDefaultPluginAiControls = (): AiControlsPlugin => ({isEnabled: false,getAiControlsRoutes: () => null,- AiControlsNavItems: null,+ getAiControlsNavItems: () => null,});export const PLUGIN_AI_CONTROLS = getDefaultPluginAiControls();diff --git a/frontend/src/metabase/plugins/oss/audit.ts b/frontend/src/metabase/plugins/oss/audit.tsindex a1b750ec342..7e718463834 100644--- a/frontend/src/metabase/plugins/oss/audit.ts+++ b/frontend/src/metabase/plugins/oss/audit.ts@@ -1,7 +1,12 @@-import type { ComponentType } from "react";+import type { ComponentType, ReactNode } from "react";import type { LinkProps } from "metabase/common/components/Link";+import type {+ MetabotAgentId,+ SlashCommand,+} from "metabase/metabot/state/types";import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";+import type { Dispatch, GetState } from "metabase/redux/store";import type { IconName } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type {@@ -10,6 +15,13 @@ import type {Database as DatabaseType,} from "metabase-types/api";+export type MetabotSlashCommandHandler = (args: {+ command: SlashCommand;+ agentId: MetabotAgentId;+ dispatch: Dispatch;+ getState: GetState;+}) => boolean;+export type InsightsLinkProps = (| {question: Pick<Question, "id" | "collection">;@@ -33,6 +45,9 @@ const getDefaultPluginAudit = () => ({isAuditDb: (_db: DatabaseType) => false,InsightsLink: PluginPlaceholder as ComponentType<InsightsLinkProps>,InsightsMenuItem: PluginPlaceholder as ComponentType<InsightsMenuItemProps>,+ getMetabotAnalyticsNavItems: (): ReactNode => null,+ getAiAnalyticsRoutes: (): ReactNode => null,+ handleMetabotSlashCommand: ((_args) => false) as MetabotSlashCommandHandler,});export const PLUGIN_AUDIT = getDefaultPluginAudit();diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsxindex 91663d57ad7..8fb3c01f08e 100644--- a/frontend/src/metabase/route-guards.tsx+++ b/frontend/src/metabase/route-guards.tsx@@ -16,7 +16,7 @@ import { canAccessTransforms } from "./transforms/selectors";type Props = { children: React.ReactElement };/** Paths that are handled by the backend server, not the frontend SPA router. */-export const BACKEND_ONLY_PATH_PREFIXES = ["/oauth/"];+export const BACKEND_ONLY_PATH_PREFIXES = ["/oauth/", "/auth/sso/"];export const isBackendOnlyPath = (path: string): boolean =>BACKEND_ONLY_PATH_PREFIXES.some((prefix) => path.startsWith(prefix));diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsxindex 126b1a6fadb..4635bd2e339 100644--- a/frontend/src/metabase/route-guards.unit.spec.tsx+++ b/frontend/src/metabase/route-guards.unit.spec.tsx@@ -72,6 +72,12 @@ describe("route-guards", () => {expect(isBackendOnlyPath("/oauth/token")).toBe(true);});+ it("should return true for /auth/sso/ paths", () => {+ expect(isBackendOnlyPath("/auth/sso/slack-connect")).toBe(true);+ expect(isBackendOnlyPath("/auth/sso/slack-connect/callback")).toBe(true);+ expect(isBackendOnlyPath("/auth/sso/my-provider")).toBe(true);+ });+it("should return false for frontend paths", () => {expect(isBackendOnlyPath("/")).toBe(false);expect(isBackendOnlyPath("/auth/login")).toBe(false);diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/thumbs_down.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/thumbs_down.svgindex 20212b223fa..935b49b6756 100644--- a/frontend/src/metabase/ui/components/icons/Icon/icons/thumbs_down.svg+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/thumbs_down.svg@@ -1,3 +1,3 @@-<svg width="17" height="16" xmlns="http://www.w3.org/2000/svg" fill="none">+<svg width="17" height="16" viewBox="0 0 17 16" xmlns="http://www.w3.org/2000/svg" fill="none"><path transform="rotate(-180 8.54854 8)" fill="currentColor" d="m7.06606,2.19223c0.12111,-0.26914 0.38881,-0.44223 0.68394,-0.44223l0.5,0c1.24264,0 2.25,1.00736 2.25,2.25l0,2.25l2.8456,0c1.203,0 2.0473,1.18567 1.6538,2.32244l-1.5577,4.49996c-0.244,0.7049 -0.9079,1.1776 -1.6538,1.1776l-8.5379,0c-0.69036,0 -1.25,-0.5596 -1.25,-1.25l0,-5c0,-0.69036 0.55964,-1.25 1.25,-1.25l1.76506,0l2.051,-4.55777zm-2.31606,6.05777l-1.25,0l0,4.5l1.25,0l0,-4.5zm1.5,4.5l5.5379,0c0.1066,0 0.2014,-0.0675 0.2363,-0.1682l1.5577,-4.50002c0.0562,-0.1624 -0.0644,-0.33178 -0.2363,-0.33178l-3.5956,0c-0.41421,0 -0.75,-0.33579 -0.75,-0.75l0,-3c0,-0.41421 -0.33579,-0.75 -0.75,-0.75l-0.01506,0l-1.98494,4.41098l0,5.08902z" clip-rule="evenodd" fill-rule="evenodd"/></svg>diff --git a/frontend/src/metabase/utils/urls/admin.ts b/frontend/src/metabase/utils/urls/admin.tsindex c923eb50c2c..ada29653a5c 100644--- a/frontend/src/metabase/utils/urls/admin.ts+++ b/frontend/src/metabase/utils/urls/admin.ts@@ -7,7 +7,8 @@ import type {TableId,} from "metabase-types/api";-export const isInternalUser = (user: BaseUser) => user.tenant_id === null;+export const isInternalUser = (user: Pick<BaseUser, "tenant_id">) =>+ user.tenant_id == null;export function newUser() {return `/admin/people/new`;@@ -16,7 +17,7 @@ export function newTenantUser() {return "/admin/people/tenants/people/new";}-export function editUser(user: BaseUser) {+export function editUser(user: Pick<BaseUser, "id" | "tenant_id">) {return isInternalUser(user)? `/admin/people/${user.id}/edit`: `/admin/people/tenants/people/${user.id}/edit`;diff --git a/resources/instance_analytics/collections/main/usage_analytics/ai_usage_log.yaml b/resources/instance_analytics/collections/main/usage_analytics/ai_usage_log.yamlnew file mode 100644index 00000000000..b593734fb21--- /dev/null+++ b/resources/instance_analytics/collections/main/usage_analytics/ai_usage_log.yaml@@ -0,0 +1,282 @@+name: AI Usage Log+description: One row per LLM round-trip with per-call tokens, source, model, profile, and more.+entity_id: joMVMZY847nXW3WBi-zIn+created_at: '2026-04-24T20:05:45.950203Z'+creator_id: [email protected]+display: table+collection_id: vG58R8k-QddHWA7_47umn+collection_position: 23+query_type: query+database_id: Internal Metabase Database+table_id: [Internal Metabase Database, public, v_ai_usage_log]+parameters: []+parameter_mappings: []+dataset_query:+ database: Internal Metabase Database+ stages:+ - source-table: [Internal Metabase Database, public, v_ai_usage_log]+ lib/type: mbql.stage/mbql+ lib/type: mbql/query+result_metadata:+- base_type: type/BigInteger+ coercion_strategy: null+ description: Primary key from ai_usage_log.id.+ display_name: Usage Log ID+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, usage_log_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, usage_log_id]+ name: usage_log_id+ semantic_type: type/PK+ settings: null+ visibility_type: normal+- base_type: type/DateTimeWithLocalTZ+ coercion_strategy: null+ description: Timestamp of this LLM round-trip.+ display_name: Created At+ effective_type: type/DateTimeWithLocalTZ+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, created_at]+ - {temporal-unit: default}+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, created_at]+ name: created_at+ semantic_type: type/CreationTimestamp+ settings: null+ unit: default+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Originating surface for the call (e.g. metabot_agent, slackbot, document_generate_content, oss-sql-gen).+ display_name: Source+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, source]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, source]+ name: source+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display label for the originating surface (e.g. Metabot, Documents, Slackbot, SQL); humanized version of source.+ display_name: Source Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, source_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, source_name]+ name: source_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Provider/model identifier returned by the LLM (e.g. anthropic/claude-sonnet-4-20250514).+ display_name: Model+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, model]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, model]+ name: model+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Metabot profile that issued the call (e.g. internal, slackbot).+ display_name: Profile ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, profile_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, profile_id]+ name: profile_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Prompt tokens consumed for this call.+ display_name: Prompt Tokens+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, prompt_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, prompt_tokens]+ name: prompt_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Completion tokens generated for this call.+ display_name: Completion Tokens+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, completion_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, completion_tokens]+ name: completion_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Total tokens for this call (prompt + completion).+ display_name: Total Tokens+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, total_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, total_tokens]+ name: total_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: ID of the owning Metabot conversation, if any (null for non-conversational and most Slack-originated calls).+ display_name: Conversation ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, conversation_id]+ - null+ fk_target_field_id: [Internal Metabase Database, public, v_metabot_conversations, conversation_id]+ id: [Internal Metabase Database, public, v_ai_usage_log, conversation_id]+ name: conversation_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: ID of the user who triggered the call (null for system/Quartz calls).+ display_name: User ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, user_id]+ - null+ fk_target_field_id: [Internal Metabase Database, public, v_users, user_id]+ id: [Internal Metabase Database, public, v_ai_usage_log, user_id]+ name: user_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Synthetic 'user_<id>' string used as a stable bucket key in by-user breakouts.+ display_name: User Qualified ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, user_qualified_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, user_qualified_id]+ name: user_qualified_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display name of the user (full name when set, otherwise email).+ display_name: User Display Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, user_display_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, user_display_name]+ name: user_display_name+ semantic_type: type/Name+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Name of one permissions group the user belongs to (excluding All Users); used for cohort breakdowns.+ display_name: Group Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, group_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, group_name]+ name: group_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: IP address of the originating Metabot conversation, when one exists.+ display_name: IP Address+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, ip_address]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, ip_address]+ name: ip_address+ semantic_type: null+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Tenant ID associated with the call, if any.+ display_name: Tenant ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, tenant_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, tenant_id]+ name: tenant_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Stable identifier for a single user turn; multiple usage_log rows share a request_id across agent iterations.+ display_name: Request ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_ai_usage_log, request_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_ai_usage_log, request_id]+ name: request_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+visualization_settings:+ column_settings: null+card_schema: 23+serdes/meta:+- {id: joMVMZY847nXW3WBi-zIn, label: ai_usage_log, model: Card}+type: modeldiff --git a/resources/instance_analytics/collections/main/usage_analytics/metabot_conversations.yaml b/resources/instance_analytics/collections/main/usage_analytics/metabot_conversations.yamlnew file mode 100644index 00000000000..cca6ddc0ef3--- /dev/null+++ b/resources/instance_analytics/collections/main/usage_analytics/metabot_conversations.yaml@@ -0,0 +1,343 @@+name: Metabot Conversations+description: One row per Metabot conversation, with message counts, token totals, owning user/group, source, and tenant.+entity_id: tWs1LULVO8OZmog7zsif2+created_at: '2026-04-24T19:55:27.953147Z'+creator_id: [email protected]+display: table+collection_id: vG58R8k-QddHWA7_47umn+collection_position: 22+query_type: query+database_id: Internal Metabase Database+table_id: [Internal Metabase Database, public, v_metabot_conversations]+parameters: []+parameter_mappings: []+dataset_query:+ database: Internal Metabase Database+ stages:+ - source-table: [Internal Metabase Database, public, v_metabot_conversations]+ lib/type: mbql.stage/mbql+ lib/type: mbql/query+result_metadata:+- base_type: type/Text+ coercion_strategy: null+ description: UUID of the conversation.+ display_name: Conversation ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, conversation_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, conversation_id]+ name: conversation_id+ semantic_type: type/PK+ settings: null+ visibility_type: normal+- base_type: type/DateTimeWithLocalTZ+ coercion_strategy: null+ description: Timestamp the conversation was created.+ display_name: Created At+ effective_type: type/DateTimeWithLocalTZ+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, created_at]+ - {temporal-unit: default}+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, created_at]+ name: created_at+ semantic_type: type/CreationTimestamp+ settings: null+ unit: default+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: ID of the user who owns the conversation.+ display_name: User ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, user_id]+ - null+ fk_target_field_id: [Internal Metabase Database, public, v_users, user_id]+ id: [Internal Metabase Database, public, v_metabot_conversations, user_id]+ name: user_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: AI-generated summary of the conversation, when available.+ display_name: Summary+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, summary]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, summary]+ name: summary+ semantic_type: type/Description+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display name of the owning user (full name when set, otherwise email).+ display_name: User Display Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, user_display_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, user_display_name]+ name: user_display_name+ semantic_type: type/Name+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Total non-deleted messages in the conversation (user + assistant).+ display_name: Message Count+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, message_count]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, message_count]+ name: message_count+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Count of user-role messages in the conversation.+ display_name: User Message Count+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, user_message_count]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, user_message_count]+ name: user_message_count+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Count of assistant-role messages in the conversation.+ display_name: Assistant Message Count+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, assistant_message_count]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, assistant_message_count]+ name: assistant_message_count+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Total tokens consumed across the conversation (prompt + completion).+ display_name: Total Tokens+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, total_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, total_tokens]+ name: total_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Prompt tokens consumed across the conversation.+ display_name: Prompt Tokens+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, prompt_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, prompt_tokens]+ name: prompt_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/BigInteger+ coercion_strategy: null+ description: Completion tokens generated across the conversation.+ display_name: Completion Tokens+ effective_type: type/BigInteger+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, completion_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, completion_tokens]+ name: completion_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/DateTimeWithLocalTZ+ coercion_strategy: null+ description: Timestamp of the most recent non-deleted message in the conversation.+ display_name: Last Message At+ effective_type: type/DateTimeWithLocalTZ+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, last_message_at]+ - {temporal-unit: default}+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, last_message_at]+ name: last_message_at+ semantic_type: null+ settings: null+ unit: default+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Metabot profile (e.g. default, embedded) that handled this conversation; taken from the first assistant message.+ display_name: Profile ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, profile_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, profile_id]+ name: profile_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display label for the Metabot profile that handled this conversation (e.g. Internal, Embedding, Slackbot, SQL); humanized version of profile_id.+ display_name: Profile Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, profile_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, profile_name]+ name: profile_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Name of one permissions group the user belongs to (excluding All Users); used for cohort breakdowns.+ display_name: Group Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, group_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, group_name]+ name: group_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Surface that originated the conversation (e.g. web, slack, embed); taken from the first ai_usage_log entry.+ display_name: Source+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, source]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, source]+ name: source+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display label for the surface that originated the conversation (e.g. Metabot, Documents, Slackbot, SQL); humanized version of source.+ display_name: Source Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, source_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, source_name]+ name: source_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: IP address recorded on the metabot_conversation row, if any.+ display_name: IP Address+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, ip_address]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, ip_address]+ name: ip_address+ semantic_type: null+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Tenant ID associated with the conversation's AI usage, if any.+ display_name: Tenant ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, tenant_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, tenant_id]+ name: tenant_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Display name of the tenant associated with the conversation, if any.+ display_name: Tenant Name+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, tenant_name]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, tenant_name]+ name: tenant_name+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: LLM model used for the conversation; taken from the first ai_usage_log entry.+ display_name: Model+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_conversations, model]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_conversations, model]+ name: model+ semantic_type: type/Category+ settings: null+ visibility_type: normal+visualization_settings:+ column_settings: null+card_schema: 23+serdes/meta:+- {id: tWs1LULVO8OZmog7zsif2, label: metabot_conversations, model: Card}+type: modeldiff --git a/resources/instance_analytics/collections/main/usage_analytics/metabot_messages.yaml b/resources/instance_analytics/collections/main/usage_analytics/metabot_messages.yamlnew file mode 100644index 00000000000..befa41b3219--- /dev/null+++ b/resources/instance_analytics/collections/main/usage_analytics/metabot_messages.yaml@@ -0,0 +1,162 @@+name: Metabot Messages+description: One row per non-deleted Metabot message, with role, profile, tokens, user, and the owning conversation.+entity_id: H20MNO_ZroDFEmgYzMLcZ+created_at: '2026-04-22T05:29:01.750254Z'+creator_id: [email protected]+display: table+collection_id: vG58R8k-QddHWA7_47umn+collection_position: 21+query_type: query+database_id: Internal Metabase Database+table_id: [Internal Metabase Database, public, v_metabot_messages]+parameters: []+parameter_mappings: []+dataset_query:+ database: Internal Metabase Database+ stages:+ - source-table: [Internal Metabase Database, public, v_metabot_messages]+ lib/type: mbql.stage/mbql+ lib/type: mbql/query+result_metadata:+- base_type: type/Integer+ coercion_strategy: null+ description: Primary key from metabot_message.id.+ display_name: Message ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, message_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, message_id]+ name: message_id+ semantic_type: type/PK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: UUID of the owning conversation.+ display_name: Conversation ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, conversation_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, conversation_id]+ name: conversation_id+ semantic_type: null+ settings: null+ visibility_type: normal+- base_type: type/DateTimeWithLocalTZ+ coercion_strategy: null+ description: Timestamp when the message was stored.+ display_name: Created At+ effective_type: type/DateTimeWithLocalTZ+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, created_at]+ - {temporal-unit: default}+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, created_at]+ name: created_at+ semantic_type: type/CreationTimestamp+ settings: null+ unit: default+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Role of the message sender (e.g. user, assistant).+ display_name: Role+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, role]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, role]+ name: role+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Metabot profile (e.g. default, embedded) that produced the message.+ display_name: Profile ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, profile_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, profile_id]+ name: profile_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: Total tokens consumed for this message (prompt + completion).+ display_name: Total Tokens+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, total_tokens]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, total_tokens]+ name: total_tokens+ semantic_type: type/Quantity+ settings: null+ visibility_type: normal+- base_type: type/Integer+ coercion_strategy: null+ description: ID of the user who owns this conversation.+ display_name: User ID+ effective_type: type/Integer+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, user_id]+ - null+ fk_target_field_id: [Internal Metabase Database, public, v_users, user_id]+ id: [Internal Metabase Database, public, v_metabot_messages, user_id]+ name: user_id+ semantic_type: type/FK+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Slack message timestamp; null for web-originated messages.+ display_name: Slack Msg ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, slack_msg_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, slack_msg_id]+ name: slack_msg_id+ semantic_type: null+ settings: null+ visibility_type: normal+- base_type: type/Text+ coercion_strategy: null+ description: Slack channel ID; null for web-originated messages.+ display_name: Channel ID+ effective_type: type/Text+ field_ref:+ - field+ - [Internal Metabase Database, public, v_metabot_messages, channel_id]+ - null+ fk_target_field_id: null+ id: [Internal Metabase Database, public, v_metabot_messages, channel_id]+ name: channel_id+ semantic_type: type/Category+ settings: null+ visibility_type: normal+visualization_settings:+ column_settings: null+card_schema: 23+serdes/meta:+- {id: H20MNO_ZroDFEmgYzMLcZ, label: metabot_messages, model: Card}+type: modeldiff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/completion_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/completion_tokens.yamlnew file mode 100644index 00000000000..5e0d9113ea2--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/completion_tokens.yaml@@ -0,0 +1,23 @@+name: completion_tokens+display_name: Completion Tokens+description: Completion tokens generated for this call.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/Quantity+dimensions: []+position: 7+custom_position: 0+database_position: 7+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: completion_tokens, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/conversation_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/conversation_id.yamlnew file mode 100644index 00000000000..fa8427d61be--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/conversation_id.yaml@@ -0,0 +1,28 @@+name: conversation_id+display_name: Conversation ID+description: ID of the owning Metabot conversation, if any (null for non-conversational and most Slack-originated calls).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/FK+fk_target_field_id:+- Internal Metabase Database+- public+- v_metabot_conversations+- conversation_id+dimensions: []+position: 9+custom_position: 0+database_position: 9+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: conversation_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/created_at.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/created_at.yamlnew file mode 100644index 00000000000..1444b000956--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/created_at.yaml@@ -0,0 +1,29 @@+name: created_at+display_name: Created At+description: Timestamp of this LLM round-trip.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_ai_usage_log+database_type: timestamptz+base_type: type/DateTimeWithLocalTZ+effective_type: type/DateTimeWithLocalTZ+semantic_type: type/CreationTimestamp+dimensions: []+position: 1+custom_position: 0+database_position: 1+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_ai_usage_log+ model: Table+- id: created_at+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/group_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/group_name.yamlnew file mode 100644index 00000000000..62b5a16cb65--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/group_name.yaml@@ -0,0 +1,23 @@+name: group_name+display_name: Group Name+description: Name of one permissions group the user belongs to (excluding All Users); used for cohort breakdowns.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 13+custom_position: 0+database_position: 13+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: group_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/ip_address.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/ip_address.yamlnew file mode 100644index 00000000000..a3a7f6b81f8--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/ip_address.yaml@@ -0,0 +1,22 @@+name: ip_address+display_name: IP Address+description: IP address of the originating Metabot conversation, when one exists.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+dimensions: []+position: 14+custom_position: 0+database_position: 14+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: ip_address, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/model.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/model.yamlnew file mode 100644index 00000000000..dedee14ea46--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/model.yaml@@ -0,0 +1,23 @@+name: model+display_name: Model+description: Provider/model identifier returned by the LLM (e.g. anthropic/claude-sonnet-4-20250514).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 4+custom_position: 0+database_position: 4+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: model, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/profile_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/profile_id.yamlnew file mode 100644index 00000000000..811bfa11027--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/profile_id.yaml@@ -0,0 +1,23 @@+name: profile_id+display_name: Profile ID+description: Metabot profile that issued the call (e.g. internal, slackbot).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 5+custom_position: 0+database_position: 5+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: profile_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/prompt_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/prompt_tokens.yamlnew file mode 100644index 00000000000..0d382aefa28--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/prompt_tokens.yaml@@ -0,0 +1,23 @@+name: prompt_tokens+display_name: Prompt Tokens+description: Prompt tokens consumed for this call.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/Quantity+dimensions: []+position: 6+custom_position: 0+database_position: 6+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: prompt_tokens, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/request_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/request_id.yamlnew file mode 100644index 00000000000..b6160c3c7d8--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/request_id.yaml@@ -0,0 +1,23 @@+name: request_id+display_name: Request ID+description: Stable identifier for a single user turn; multiple usage_log rows share a request_id across agent iterations.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 16+custom_position: 0+database_position: 16+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: request_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source.yamlnew file mode 100644index 00000000000..4c325d87750--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source.yaml@@ -0,0 +1,30 @@+name: source+display_name: Source+description: Originating surface for the call (e.g. metabot_agent, slackbot, document_generate_content, oss-sql-gen).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_ai_usage_log+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 2+custom_position: 0+database_position: 2+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_ai_usage_log+ model: Table+- id: source+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source_name.yamlnew file mode 100644index 00000000000..ba508822e1d--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/source_name.yaml@@ -0,0 +1,23 @@+name: source_name+display_name: Source Name+description: Display label for the originating surface (e.g. Metabot, Documents, Slackbot, SQL); humanized version of source.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 3+custom_position: 0+database_position: 3+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: source_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/tenant_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/tenant_id.yamlnew file mode 100644index 00000000000..c0d8537eee7--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/tenant_id.yaml@@ -0,0 +1,23 @@+name: tenant_id+display_name: Tenant ID+description: Tenant ID associated with the call, if any.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/FK+dimensions: []+position: 15+custom_position: 0+database_position: 15+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: tenant_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/total_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/total_tokens.yamlnew file mode 100644index 00000000000..35748f68c7b--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/total_tokens.yaml@@ -0,0 +1,23 @@+name: total_tokens+display_name: Total Tokens+description: Total tokens for this call (prompt + completion).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/Quantity+dimensions: []+position: 8+custom_position: 0+database_position: 8+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: total_tokens, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/usage_log_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/usage_log_id.yamlnew file mode 100644index 00000000000..d76fb567695--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/usage_log_id.yaml@@ -0,0 +1,30 @@+name: usage_log_id+display_name: Usage Log ID+description: Primary key from ai_usage_log.id.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_ai_usage_log+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/PK+dimensions: []+position: 0+custom_position: 0+database_position: 0+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_ai_usage_log+ model: Table+- id: usage_log_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_display_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_display_name.yamlnew file mode 100644index 00000000000..a353b48e17d--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_display_name.yaml@@ -0,0 +1,23 @@+name: user_display_name+display_name: User Display Name+description: Display name of the user (full name when set, otherwise email).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Name+dimensions: []+position: 12+custom_position: 0+database_position: 12+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: user_display_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_id.yamlnew file mode 100644index 00000000000..84317578e4d--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_id.yaml@@ -0,0 +1,28 @@+name: user_id+display_name: User ID+description: ID of the user who triggered the call (null for system/Quartz calls).+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/FK+fk_target_field_id:+- Internal Metabase Database+- public+- v_users+- user_id+dimensions: []+position: 10+custom_position: 0+database_position: 10+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: user_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_qualified_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_qualified_id.yamlnew file mode 100644index 00000000000..e71989d28f1--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/fields/user_qualified_id.yaml@@ -0,0 +1,23 @@+name: user_qualified_id+display_name: User Qualified ID+description: Synthetic 'user_<id>' string used as a stable bucket key in by-user breakouts.+created_at: '2026-04-24T19:39:29.861736Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_ai_usage_log]+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 11+custom_position: 0+database_position: 11+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+- {id: user_qualified_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/v_ai_usage_log.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/v_ai_usage_log.yamlnew file mode 100644index 00000000000..1c3d04bea38--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_ai_usage_log/v_ai_usage_log.yaml@@ -0,0 +1,14 @@+name: v_ai_usage_log+display_name: V Ai Usage Log+created_at: '2026-04-24T19:39:27.514962Z'+db_id: Internal Metabase Database+schema: public+active: true+field_order: database+initial_sync_status: complete+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_ai_usage_log, model: Table}+data_authority: unconfigured+data_layer: internaldiff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/assistant_message_count.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/assistant_message_count.yamlnew file mode 100644index 00000000000..cba261c34f4--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/assistant_message_count.yaml@@ -0,0 +1,30 @@+name: assistant_message_count+display_name: Assistant Message Count+description: Count of assistant-role messages in the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 7+custom_position: 0+database_position: 7+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: assistant_message_count+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/completion_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/completion_tokens.yamlnew file mode 100644index 00000000000..9ccd97fcf97--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/completion_tokens.yaml@@ -0,0 +1,30 @@+name: completion_tokens+display_name: Completion Tokens+description: Completion tokens generated across the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 10+custom_position: 0+database_position: 10+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: completion_tokens+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/conversation_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/conversation_id.yamlnew file mode 100644index 00000000000..224f9241537--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/conversation_id.yaml@@ -0,0 +1,30 @@+name: conversation_id+display_name: Conversation ID+description: UUID of the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/PK+dimensions: []+position: 0+custom_position: 0+database_position: 0+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: conversation_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/created_at.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/created_at.yamlnew file mode 100644index 00000000000..a4e374093c2--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/created_at.yaml@@ -0,0 +1,29 @@+name: created_at+display_name: Created At+description: Timestamp the conversation was created.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: timestamptz+base_type: type/DateTimeWithLocalTZ+effective_type: type/DateTimeWithLocalTZ+semantic_type: type/CreationTimestamp+dimensions: []+position: 1+custom_position: 0+database_position: 1+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: created_at+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/group_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/group_name.yamlnew file mode 100644index 00000000000..fa202b6a9d2--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/group_name.yaml@@ -0,0 +1,23 @@+name: group_name+display_name: Group Name+description: Name of one permissions group the user belongs to (excluding All Users); used for cohort breakdowns.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 14+custom_position: 0+database_position: 14+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: group_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/ip_address.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/ip_address.yamlnew file mode 100644index 00000000000..0cf3a7408a0--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/ip_address.yaml@@ -0,0 +1,22 @@+name: ip_address+display_name: IP Address+description: IP address recorded on the metabot_conversation row, if any.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: varchar+base_type: type/Text+effective_type: type/Text+dimensions: []+position: 17+custom_position: 0+database_position: 17+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: ip_address, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/last_message_at.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/last_message_at.yamlnew file mode 100644index 00000000000..08bef4ece8a--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/last_message_at.yaml@@ -0,0 +1,28 @@+name: last_message_at+display_name: Last Message At+description: Timestamp of the most recent non-deleted message in the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: timestamptz+base_type: type/DateTimeWithLocalTZ+effective_type: type/DateTimeWithLocalTZ+dimensions: []+position: 11+custom_position: 0+database_position: 11+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: last_message_at+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/message_count.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/message_count.yamlnew file mode 100644index 00000000000..e7c286253cc--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/message_count.yaml@@ -0,0 +1,30 @@+name: message_count+display_name: Message Count+description: Total non-deleted messages in the conversation (user + assistant).+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 5+custom_position: 0+database_position: 5+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: message_count+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/model.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/model.yamlnew file mode 100644index 00000000000..7cb976fd5ca--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/model.yaml@@ -0,0 +1,23 @@+name: model+display_name: Model+description: LLM model used for the conversation; taken from the first ai_usage_log entry.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 20+custom_position: 0+database_position: 20+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: model, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_id.yamlnew file mode 100644index 00000000000..680bd9c75cc--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_id.yaml@@ -0,0 +1,30 @@+name: profile_id+display_name: Profile ID+description: Metabot profile (e.g. default, embedded) that handled this conversation; taken from the first assistant message.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 12+custom_position: 0+database_position: 12+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: profile_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_name.yamlnew file mode 100644index 00000000000..22fd64cc8d9--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/profile_name.yaml@@ -0,0 +1,23 @@+name: profile_name+display_name: Profile Name+description: Display label for the Metabot profile that handled this conversation (e.g. Internal, Embedding, Slackbot, SQL); humanized version of profile_id.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 13+custom_position: 0+database_position: 13+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: profile_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/prompt_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/prompt_tokens.yamlnew file mode 100644index 00000000000..797dfe3b614--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/prompt_tokens.yaml@@ -0,0 +1,30 @@+name: prompt_tokens+display_name: Prompt Tokens+description: Prompt tokens consumed across the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 9+custom_position: 0+database_position: 9+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: prompt_tokens+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source.yamlnew file mode 100644index 00000000000..99d1a0115fa--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source.yaml@@ -0,0 +1,23 @@+name: source+display_name: Source+description: Surface that originated the conversation (e.g. web, slack, embed); taken from the first ai_usage_log entry.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 15+custom_position: 0+database_position: 15+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: source, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source_name.yamlnew file mode 100644index 00000000000..7569f7e1250--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/source_name.yaml@@ -0,0 +1,23 @@+name: source_name+display_name: Source Name+description: Display label for the surface that originated the conversation (e.g. Metabot, Documents, Slackbot, SQL); humanized version of source.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 16+custom_position: 0+database_position: 16+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: source_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/summary.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/summary.yamlnew file mode 100644index 00000000000..7842a627b62--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/summary.yaml@@ -0,0 +1,30 @@+name: summary+display_name: Summary+description: AI-generated summary of the conversation, when available.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Description+dimensions: []+position: 3+custom_position: 0+database_position: 3+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: summary+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_id.yamlnew file mode 100644index 00000000000..891e17aaf4e--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_id.yaml@@ -0,0 +1,23 @@+name: tenant_id+display_name: Tenant ID+description: Tenant ID associated with the conversation's AI usage, if any.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/FK+dimensions: []+position: 18+custom_position: 0+database_position: 18+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: tenant_id, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_name.yamlnew file mode 100644index 00000000000..29fb59db1d8--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/tenant_name.yaml@@ -0,0 +1,23 @@+name: tenant_name+display_name: Tenant Name+description: Display name of the tenant associated with the conversation, if any.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id: [Internal Metabase Database, public, v_metabot_conversations]+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 19+custom_position: 0+database_position: 19+has_field_values: auto-list+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+- {id: tenant_name, model: Field}+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/total_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/total_tokens.yamlnew file mode 100644index 00000000000..ba03e20c3b2--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/total_tokens.yaml@@ -0,0 +1,30 @@+name: total_tokens+display_name: Total Tokens+description: Total tokens consumed across the conversation (prompt + completion).+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 8+custom_position: 0+database_position: 8+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: total_tokens+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_display_name.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_display_name.yamlnew file mode 100644index 00000000000..59709aa9f52--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_display_name.yaml@@ -0,0 +1,30 @@+name: user_display_name+display_name: User Display Name+description: Display name of the owning user (full name when set, otherwise email).+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Name+dimensions: []+position: 4+custom_position: 0+database_position: 4+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: user_display_name+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_id.yamlnew file mode 100644index 00000000000..7f5ce0ec70b--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_id.yaml@@ -0,0 +1,35 @@+name: user_id+display_name: User ID+description: ID of the user who owns the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/FK+fk_target_field_id:+- Internal Metabase Database+- public+- v_users+- user_id+dimensions: []+position: 2+custom_position: 0+database_position: 2+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: user_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_message_count.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_message_count.yamlnew file mode 100644index 00000000000..5f5ea6e8de4--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/fields/user_message_count.yaml@@ -0,0 +1,30 @@+name: user_message_count+display_name: User Message Count+description: Count of user-role messages in the conversation.+created_at: '2026-04-24T19:39:29.987038Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_conversations+database_type: int8+base_type: type/BigInteger+effective_type: type/BigInteger+semantic_type: type/Quantity+dimensions: []+position: 6+custom_position: 0+database_position: 6+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_conversations+ model: Table+- id: user_message_count+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/v_metabot_conversations.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/v_metabot_conversations.yamlnew file mode 100644index 00000000000..1c7a5e79a48--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_conversations/v_metabot_conversations.yaml@@ -0,0 +1,14 @@+name: v_metabot_conversations+display_name: V Metabot Conversations+created_at: '2026-04-24T19:39:27.35056Z'+db_id: Internal Metabase Database+schema: public+active: true+field_order: database+initial_sync_status: complete+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_conversations, model: Table}+data_authority: unconfigured+data_layer: internaldiff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/channel_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/channel_id.yamlnew file mode 100644index 00000000000..8dd6ac67f04--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/channel_id.yaml@@ -0,0 +1,30 @@+name: channel_id+display_name: Channel ID+description: Slack channel ID; null for web-originated messages.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 9+custom_position: 0+database_position: 9+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: channel_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/conversation_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/conversation_id.yamlnew file mode 100644index 00000000000..6ac2ef7aaf6--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/conversation_id.yaml@@ -0,0 +1,29 @@+name: conversation_id+display_name: Conversation ID+description: UUID of the owning conversation.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: varchar+base_type: type/Text+effective_type: type/Text+dimensions: []+position: 1+custom_position: 0+database_position: 1+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: conversation_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/created_at.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/created_at.yamlnew file mode 100644index 00000000000..ac58bfb7928--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/created_at.yaml@@ -0,0 +1,29 @@+name: created_at+display_name: Created At+description: Timestamp when the message was stored.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: timestamptz+base_type: type/DateTimeWithLocalTZ+effective_type: type/DateTimeWithLocalTZ+semantic_type: type/CreationTimestamp+dimensions: []+position: 2+custom_position: 0+database_position: 2+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: created_at+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/message_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/message_id.yamlnew file mode 100644index 00000000000..029101bcd70--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/message_id.yaml@@ -0,0 +1,30 @@+name: message_id+display_name: Message ID+description: Primary key from metabot_message.id.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/PK+dimensions: []+position: 0+custom_position: 0+database_position: 0+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: message_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/profile_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/profile_id.yamlnew file mode 100644index 00000000000..d13bd5ed9b5--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/profile_id.yaml@@ -0,0 +1,30 @@+name: profile_id+display_name: Profile ID+description: Metabot profile (e.g. default, embedded) that produced the message.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: text+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 4+custom_position: 0+database_position: 4+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: profile_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/role.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/role.yamlnew file mode 100644index 00000000000..f76e359172e--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/role.yaml@@ -0,0 +1,30 @@+name: role+display_name: Role+description: Role of the message sender (e.g. user, assistant).+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: varchar+base_type: type/Text+effective_type: type/Text+semantic_type: type/Category+dimensions: []+position: 3+custom_position: 0+database_position: 3+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: role+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/slack_msg_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/slack_msg_id.yamlnew file mode 100644index 00000000000..74163c20317--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/slack_msg_id.yaml@@ -0,0 +1,29 @@+name: slack_msg_id+display_name: Slack Msg ID+description: Slack message timestamp; null for web-originated messages.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: varchar+base_type: type/Text+effective_type: type/Text+dimensions: []+position: 8+custom_position: 0+database_position: 8+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: slack_msg_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/total_tokens.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/total_tokens.yamlnew file mode 100644index 00000000000..1576ac5e3a9--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/total_tokens.yaml@@ -0,0 +1,30 @@+name: total_tokens+display_name: Total Tokens+description: Total tokens consumed for this message (prompt + completion).+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/Quantity+dimensions: []+position: 5+custom_position: 0+database_position: 5+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: total_tokens+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/user_id.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/user_id.yamlnew file mode 100644index 00000000000..21828569adf--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/fields/user_id.yaml@@ -0,0 +1,35 @@+name: user_id+display_name: User ID+description: ID of the user who owns this conversation.+created_at: '2026-04-21T23:16:38.089896Z'+visibility_type: normal+table_id:+- Internal Metabase Database+- public+- v_metabot_messages+database_type: int4+base_type: type/Integer+effective_type: type/Integer+semantic_type: type/FK+fk_target_field_id:+- Internal Metabase Database+- public+- v_users+- user_id+dimensions: []+position: 6+custom_position: 0+database_position: 6+has_field_values: auto-list+serdes/meta:+- id: Internal Metabase Database+ model: Database+- id: public+ model: Schema+- id: v_metabot_messages+ model: Table+- id: user_id+ model: Field+database_is_generated: false+database_is_nullable: true+database_is_pk: falsediff --git a/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/v_metabot_messages.yaml b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/v_metabot_messages.yamlnew file mode 100644index 00000000000..e728c6df44b--- /dev/null+++ b/resources/instance_analytics/databases/internal_metabase_database/schemas/public/tables/v_metabot_messages/v_metabot_messages.yaml@@ -0,0 +1,14 @@+name: v_metabot_messages+display_name: V Metabot Messages+created_at: '2026-04-21T23:16:35.061268Z'+db_id: Internal Metabase Database+schema: public+active: true+field_order: database+initial_sync_status: complete+serdes/meta:+- {id: Internal Metabase Database, model: Database}+- {id: public, model: Schema}+- {id: v_metabot_messages, model: Table}+data_authority: unconfigured+data_layer: internaldiff --git a/resources/migrations/061/20260330_ai_usage_log.yaml b/resources/migrations/061/20260330_ai_usage_log.yamlindex 14807f55af0..285b35e93c7 100644--- a/resources/migrations/061/20260330_ai_usage_log.yaml+++ b/resources/migrations/061/20260330_ai_usage_log.yaml@@ -167,6 +167,7 @@ databaseChangeLog:remarks: 'UUID for correlating with Snowplow events'rollback: ""+- changeSet:id: v61.8g8eswauthor: nvoxlanddiff --git a/resources/migrations/061/20260331_metabot_conversation_ip_address.yaml b/resources/migrations/061/20260331_metabot_conversation_ip_address.yamlnew file mode 100644index 00000000000..33c2965a86b--- /dev/null+++ b/resources/migrations/061/20260331_metabot_conversation_ip_address.yaml@@ -0,0 +1,19 @@+## Client IP address for Metabot conversations (web-originated only).++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-01T09:00:00+ author: tyler+ comment: Add ip_address to metabot_conversation for web-originated conversations+ changes:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: ip_address+ type: varchar(45)+ remarks: Client IP captured at conversation creation; NULL for Slack-originated conversations.+ constraints:+ nullable: truediff --git a/resources/migrations/061/20260401_metabot_analytics_views.yaml b/resources/migrations/061/20260401_metabot_analytics_views.yamlnew file mode 100644index 00000000000..0766c3e9c79--- /dev/null+++ b/resources/migrations/061/20260401_metabot_analytics_views.yaml@@ -0,0 +1,69 @@+## Create analytics views for AI/Metabot usage tracking.+## These views expose conversation, message, and usage data in the+## Internal Metabase Database for admin analytics.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-01T10:00:00+ author: noahmoss+ runOnChange: true+ comment: Create v_metabot_conversations view for AI analytics+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_conversations/v1/postgres-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_conversations/v1/mysql-metabot_conversations.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_conversations/v1/h2-metabot_conversations.sql+ relativeToChangelogFile: true+ rollback:+ - sql: DROP VIEW IF EXISTS v_metabot_conversations++ - changeSet:+ id: v61.2026-04-01T10:00:01+ author: noahmoss+ runOnChange: true+ comment: Create v_metabot_messages view for AI analytics+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/metabot_messages/v1/postgres-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/metabot_messages/v1/mysql-metabot_messages.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/metabot_messages/v1/h2-metabot_messages.sql+ relativeToChangelogFile: true+ rollback:+ - sql: DROP VIEW IF EXISTS v_metabot_messages++ - changeSet:+ id: v61.2026-04-01T10:00:03+ author: tyler+ runOnChange: true+ comment: Create v_ai_usage_log view for AI analytics+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/ai_usage_log/v1/postgres-ai_usage_log.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/ai_usage_log/v1/mysql-ai_usage_log.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/ai_usage_log/v1/h2-ai_usage_log.sql+ relativeToChangelogFile: true+ rollback:+ - sql: DROP VIEW IF EXISTS v_ai_usage_logdiff --git a/resources/migrations/061/20260409_metabot_conversation_created_at_index.yaml b/resources/migrations/061/20260409_metabot_conversation_created_at_index.yamlnew file mode 100644index 00000000000..d482ec6a463--- /dev/null+++ b/resources/migrations/061/20260409_metabot_conversation_created_at_index.yaml@@ -0,0 +1,18 @@+## Index on metabot_conversation.created_at to support the metabot-analytics+## list endpoint, which paginates newest-first and would otherwise full-scan+## and sort on every request.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-09T12:00:00+ author: noahmoss+ comment: Index on metabot_conversation.created_at for paginated list endpoint+ changes:+ - createIndex:+ indexName: idx_metabot_conversation_created_at+ tableName: metabot_conversation+ columns:+ - column:+ name: created_atdiff --git a/resources/migrations/061/20260409_metabot_conversation_slack_metadata.yaml b/resources/migrations/061/20260409_metabot_conversation_slack_metadata.yamlnew file mode 100644index 00000000000..e1259e5645d--- /dev/null+++ b/resources/migrations/061/20260409_metabot_conversation_slack_metadata.yaml@@ -0,0 +1,49 @@+## Slack thread metadata for Metabot conversations.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-10T15:20:00+ author: noahmoss+ comment: Add slack_team_id to metabot_conversation for Slack-originated conversations+ changes:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: slack_team_id+ type: varchar(255)+ remarks: Slack workspace team ID for Slack-originated Metabot conversations+ constraints:+ nullable: true++ - changeSet:+ id: v61.2026-04-10T15:21:00+ author: noahmoss+ comment: Add slack_channel_id to metabot_conversation for Slack-originated conversations+ changes:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: slack_channel_id+ type: varchar(255)+ remarks: Slack channel ID for Slack-originated Metabot conversations+ constraints:+ nullable: true++ - changeSet:+ id: v61.2026-04-10T15:22:00+ author: noahmoss+ comment: Add slack_thread_ts to metabot_conversation for Slack-originated conversations+ changes:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: slack_thread_ts+ type: varchar(255)+ remarks: Slack root thread timestamp for Slack-originated Metabot conversations+ constraints:+ nullable: truediff --git a/resources/migrations/061/20260417_metabot_feedback.yaml b/resources/migrations/061/20260417_metabot_feedback.yamlnew file mode 100644index 00000000000..7bee261eaee--- /dev/null+++ b/resources/migrations/061/20260417_metabot_feedback.yaml@@ -0,0 +1,57 @@+## Persist Metabot message feedback++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-17T10:00:00+ author: sloansparger+ comment: metabot_feedback table+ changes:+ - createTable:+ tableName: metabot_feedback+ remarks: User feedback - positive/negative w/ optional reason + comment+ columns:+ - column:+ name: message_id+ type: int+ constraints:+ primaryKey: true+ nullable: false+ referencedTableName: metabot_message+ referencedColumnNames: id+ foreignKeyName: fk_metabot_feedback_message_id+ deleteCascade: true+ remarks: 'PK + FK to metabot_message.id — enforces 1:1'+ - column:+ name: positive+ type: ${boolean.type}+ constraints:+ nullable: false+ remarks: 'true = thumbs up, false = thumbs down'+ - column:+ name: issue_type+ type: varchar(64)+ constraints:+ nullable: true+ remarks: 'Optional structured issue category (e.g. "ui-bug", "not-factual")'+ - column:+ name: freeform_feedback+ type: ${text.type}+ constraints:+ nullable: true+ remarks: 'Optional freeform comment'+ - column:+ name: created_at+ type: ${timestamp_type}+ defaultValueComputed: current_timestamp+ constraints:+ nullable: false+ remarks: 'When the feedback was submitted'+ - column:+ name: updated_at+ type: ${timestamp_type}+ defaultValueComputed: current_timestamp+ constraints:+ nullable: false+ remarks: 'When the feedback was last updated'diff --git a/resources/migrations/061/20260420_metabot_conversation_embed_url.yaml b/resources/migrations/061/20260420_metabot_conversation_embed_url.yamlnew file mode 100644index 00000000000..29b4250f37f--- /dev/null+++ b/resources/migrations/061/20260420_metabot_conversation_embed_url.yaml@@ -0,0 +1,19 @@+## Embed URL (Referer) for Metabot conversations (web-originated only).++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-20T12:00:00+ author: tyler+ comment: Add embed_url to metabot_conversation for web-originated conversations+ changes:+ - addColumn:+ tableName: metabot_conversation+ columns:+ - column:+ name: embed_url+ type: varchar(2048)+ remarks: Referer URL captured at conversation creation (typically the parent page for SDK iframe embeds). NULL for Slack-originated conversations and when the browser strips the header.+ constraints:+ nullable: truediff --git a/resources/migrations/061/20260421_ai_usage_log_conversation_id_index.yaml b/resources/migrations/061/20260421_ai_usage_log_conversation_id_index.yamlnew file mode 100644index 00000000000..4f06c170acb--- /dev/null+++ b/resources/migrations/061/20260421_ai_usage_log_conversation_id_index.yaml@@ -0,0 +1,16 @@+## Index on ai_usage_log.conversation_id for analytics view joins.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-21T00:00:00+ author: mappleby+ comment: Index on ai_usage_log.conversation_id for analytics view joins+ changes:+ - createIndex:+ indexName: idx_ai_usage_log_conversation_id+ tableName: ai_usage_log+ columns:+ - column:+ name: conversation_iddiff --git a/resources/migrations/061/20260421_metabot_message_external_id.yaml b/resources/migrations/061/20260421_metabot_message_external_id.yamlnew file mode 100644index 00000000000..dd354cb1c7a--- /dev/null+++ b/resources/migrations/061/20260421_metabot_message_external_id.yaml@@ -0,0 +1,31 @@+databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-21T10:00:00+ author: sloansparger+ comment: Add nullable external_id column to metabot_message+ changes:+ - addColumn:+ tableName: metabot_message+ columns:+ - column:+ name: external_id+ type: varchar(36)+ remarks: Stable id shared with clients and used to resolve feedback submissions+ constraints:+ nullable: true++ - changeSet:+ id: v61.2026-04-21T10:00:01+ author: sloansparger+ comment: Unique constraint on metabot_message.external_id for feedback lookup+ changes:+ - addUniqueConstraint:+ tableName: metabot_message+ columnNames: external_id+ constraintName: uq_metabot_message_external_id+ rollback:+ - dropUniqueConstraint:+ tableName: metabot_message+ constraintName: uq_metabot_message_external_iddiff --git a/resources/migrations/061/20260421_metabot_message_user_conversation_index.yaml b/resources/migrations/061/20260421_metabot_message_user_conversation_index.yamlnew file mode 100644index 00000000000..293d294f13a--- /dev/null+++ b/resources/migrations/061/20260421_metabot_message_user_conversation_index.yaml@@ -0,0 +1,20 @@+databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-21T10:00:00+ author: noahmoss+ comment: Index on metabot_message(user_id, conversation_id) for participation-based read permissions+ changes:+ - createIndex:+ indexName: idx_metabot_message_user_id_conversation_id+ tableName: metabot_message+ columns:+ - column:+ name: user_id+ - column:+ name: conversation_id+ rollback:+ - dropIndex:+ tableName: metabot_message+ indexName: idx_metabot_message_user_id_conversation_iddiff --git a/resources/migrations/061/20260423_data_complexity_score.yaml b/resources/migrations/061/20260423_data_complexity_score.yamlnew file mode 100644index 00000000000..5340220e313--- /dev/null+++ b/resources/migrations/061/20260423_data_complexity_score.yaml@@ -0,0 +1,40 @@+## Persist computed Data Complexity Score snapshots for the overview UI.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-23T10:00:00+ author: undrfined+ comment: Create data_complexity_score table+ changes:+ - createTable:+ tableName: data_complexity_score+ remarks: Append-only snapshots of the computed Data Complexity Score shown in the Metabot overview UI+ columns:+ - column:+ name: id+ type: int+ autoIncrement: true+ constraints:+ primaryKey: true+ nullable: false+ - column:+ name: fingerprint+ type: varchar(512)+ constraints:+ nullable: false+ remarks: Fingerprint of the scoring inputs (formula version, synonym threshold, embedding model)+ - column:+ name: score_data+ type: ${text.type}+ constraints:+ nullable: false+ remarks: JSON-serialized complexity score response returned by the data-complexity-score endpoint+ - column:+ name: created_at+ type: ${timestamp_type}+ defaultValueComputed: current_timestamp+ constraints:+ nullable: false+ remarks: When this score snapshot was computed and storeddiff --git a/resources/migrations/061/20260424_metabot_feedback_multi_submitter.yaml b/resources/migrations/061/20260424_metabot_feedback_multi_submitter.yamlnew file mode 100644index 00000000000..06ef3a1e3f4--- /dev/null+++ b/resources/migrations/061/20260424_metabot_feedback_multi_submitter.yaml@@ -0,0 +1,165 @@+## Re-shape metabot_feedback to support multiple submitters per message.+##+## The original table (20260417_metabot_feedback.yaml) keyed feedback by+## `message_id` alone, enforcing 1:1 between a message and a feedback row.+## With shared Slack threads, multiple Metabase users can each submit+## independent feedback on the same assistant message, so we:+## - drop the `message_id` FK temporarily (MySQL refuses to drop a PK+## that is referenced by an FK on the same column)+## - drop the single-column primary key on `message_id`+## - add a surrogate `id` autoincrement PK+## - re-add the `message_id` → `metabot_message.id` FK+## - add a `user_id` column (backfilled from the message's author so any+## existing dev-env rows survive) and enforce NOT NULL+## - add a unique constraint on (`message_id`, `user_id`)++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-24T14:46:00+ author: noahmoss+ comment: Drop FK fk_metabot_feedback_message_id before dropping the PK (MySQL rejects dropping a PK that participates in an FK)+ changes:+ - dropForeignKeyConstraint:+ baseTableName: metabot_feedback+ constraintName: fk_metabot_feedback_message_id+ rollback:+ - addForeignKeyConstraint:+ baseTableName: metabot_feedback+ baseColumnNames: message_id+ constraintName: fk_metabot_feedback_message_id+ referencedTableName: metabot_message+ referencedColumnNames: id+ onDelete: CASCADE++ - changeSet:+ id: v61.2026-04-24T14:49:00+ author: noahmoss+ comment: Drop the single-column primary key on metabot_feedback.message_id+ changes:+ - dropPrimaryKey:+ tableName: metabot_feedback+ rollback:+ - addPrimaryKey:+ tableName: metabot_feedback+ columnNames: message_id+ constraintName: pk_metabot_feedback++ - changeSet:+ id: v61.2026-04-24T14:52:00+ author: noahmoss+ comment: Add surrogate id autoincrement PK to metabot_feedback+ changes:+ - addColumn:+ tableName: metabot_feedback+ columns:+ - column:+ name: id+ type: int+ autoIncrement: true+ constraints:+ primaryKey: true+ nullable: false+ remarks: Surrogate PK+ rollback:+ - dropColumn:+ tableName: metabot_feedback+ columnName: id++ - changeSet:+ id: v61.2026-04-24T14:55:00+ author: noahmoss+ comment: Re-add FK from metabot_feedback.message_id to metabot_message.id+ changes:+ - addForeignKeyConstraint:+ baseTableName: metabot_feedback+ baseColumnNames: message_id+ constraintName: fk_metabot_feedback_message_id+ referencedTableName: metabot_message+ referencedColumnNames: id+ onDelete: CASCADE+ rollback:+ - dropForeignKeyConstraint:+ baseTableName: metabot_feedback+ constraintName: fk_metabot_feedback_message_id++ - changeSet:+ id: v61.2026-04-24T14:58:00+ author: noahmoss+ comment: Add nullable user_id column to metabot_feedback (submitter)+ changes:+ - addColumn:+ tableName: metabot_feedback+ columns:+ - column:+ name: user_id+ type: int+ remarks: 'The Metabase user who submitted the feedback. Unconstrained int (matches metabot_message.user_id precedent) so audit rows survive user deletion.'+ rollback:+ - dropColumn:+ tableName: metabot_feedback+ columnName: user_id++ - changeSet:+ id: v61.2026-04-24T15:01:00+ author: noahmoss+ comment: Backfill metabot_feedback.user_id from the rated message's author so the pre-multi-user 1:1 rows are attributed to their implicit submitter+ changes:+ - sql:+ sql: UPDATE metabot_feedback SET user_id = (SELECT user_id FROM metabot_message WHERE metabot_message.id = metabot_feedback.message_id) WHERE user_id IS NULL+ rollback:+ - sql:+ sql: UPDATE metabot_feedback SET user_id = NULL++ - changeSet:+ id: v61.2026-04-24T15:03:00+ author: noahmoss+ comment: Drop any metabot_feedback rows whose rated message has no user_id (unattributable — feedback without a submitter is meaningless). No-op in prod where metabot_feedback has never shipped; cleans up orphans in dev/CI envs that ran the pre-multi-user schema.+ changes:+ - sql:+ sql: DELETE FROM metabot_feedback WHERE user_id IS NULL+ rollback:+ - empty: {}++ - changeSet:+ id: v61.2026-04-24T15:04:00+ author: noahmoss+ comment: Enforce NOT NULL on metabot_feedback.user_id now that it is backfilled+ changes:+ - addNotNullConstraint:+ tableName: metabot_feedback+ columnName: user_id+ columnDataType: int+ rollback:+ - dropNotNullConstraint:+ tableName: metabot_feedback+ columnName: user_id+ columnDataType: int++ - changeSet:+ id: v61.2026-04-24T15:07:00+ author: noahmoss+ comment: Unique constraint on metabot_feedback (message_id, user_id)+ changes:+ - addUniqueConstraint:+ tableName: metabot_feedback+ columnNames: message_id, user_id+ constraintName: uq_metabot_feedback_message_id_user_id+ rollback:+ # MySQL/MariaDB treats the unique index on (message_id, user_id) as the+ # backing index for fk_metabot_feedback_message_id, so the FK has to+ # come off before the unique constraint can be dropped.+ - dropForeignKeyConstraint:+ baseTableName: metabot_feedback+ constraintName: fk_metabot_feedback_message_id+ - dropUniqueConstraint:+ tableName: metabot_feedback+ constraintName: uq_metabot_feedback_message_id_user_id+ - addForeignKeyConstraint:+ baseTableName: metabot_feedback+ baseColumnNames: message_id+ constraintName: fk_metabot_feedback_message_id+ referencedTableName: metabot_message+ referencedColumnNames: id+ onDelete: CASCADEdiff --git a/resources/migrations/061/20260430_ai_usage_log_created_at_index.yaml b/resources/migrations/061/20260430_ai_usage_log_created_at_index.yamlnew file mode 100644index 00000000000..c7ba440e0dd--- /dev/null+++ b/resources/migrations/061/20260430_ai_usage_log_created_at_index.yaml@@ -0,0 +1,19 @@+## Index on ai_usage_log.created_at to support the Tokens-tab analytics charts,+## which filter by date range and break out / bucket by created_at on every+## render. Without the index, adhoc MBQL against v_ai_usage_log full-scans+## the ledger.++databaseChangeLog:+ - logicalFilePath: migrations/061_update_migrations.yaml++ - changeSet:+ id: v61.2026-04-30T12:00:00+ author: tyler+ comment: Index on ai_usage_log.created_at for analytics-view time filtering+ changes:+ - createIndex:+ indexName: idx_ai_usage_log_created_at+ tableName: ai_usage_log+ columns:+ - column:+ name: created_atdiff --git a/resources/migrations/instance_analytics_views/ai_usage_log/v1/h2-ai_usage_log.sql b/resources/migrations/instance_analytics_views/ai_usage_log/v1/h2-ai_usage_log.sqlnew file mode 100644index 00000000000..91daab9c6d5--- /dev/null+++ b/resources/migrations/instance_analytics_views/ai_usage_log/v1/h2-ai_usage_log.sql@@ -0,0 +1,43 @@+DROP VIEW IF EXISTS v_ai_usage_log;++CREATE OR REPLACE VIEW v_ai_usage_log AS+SELECT+ a.id AS usage_log_id,+ a.created_at,+ a.source,+ CASE a.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE a.source+ END AS source_name,+ a.model,+ a.profile_id,+ a.prompt_tokens,+ a.completion_tokens,+ a.total_tokens,+ a.conversation_id,+ a.user_id,+ 'user_' || a.user_id AS user_qualified_id,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = a.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ c.ip_address AS ip_address,+ a.tenant_id,+ a.request_id+FROM ai_usage_log a+LEFT JOIN core_user u+ ON u.id = a.user_id+LEFT JOIN metabot_conversation c+ ON c.id = a.conversation_id;diff --git a/resources/migrations/instance_analytics_views/ai_usage_log/v1/mysql-ai_usage_log.sql b/resources/migrations/instance_analytics_views/ai_usage_log/v1/mysql-ai_usage_log.sqlnew file mode 100644index 00000000000..b18ea1a739e--- /dev/null+++ b/resources/migrations/instance_analytics_views/ai_usage_log/v1/mysql-ai_usage_log.sql@@ -0,0 +1,43 @@+DROP VIEW IF EXISTS v_ai_usage_log;++CREATE OR REPLACE VIEW v_ai_usage_log AS+SELECT+ a.id AS usage_log_id,+ a.created_at,+ a.source,+ CASE a.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE a.source+ END AS source_name,+ a.model,+ a.profile_id,+ a.prompt_tokens,+ a.completion_tokens,+ a.total_tokens,+ a.conversation_id,+ a.user_id,+ CONCAT('user_', a.user_id) AS user_qualified_id,+ COALESCE(CONCAT(u.first_name, ' ', u.last_name), u.email) AS user_display_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = a.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ c.ip_address AS ip_address,+ a.tenant_id,+ a.request_id+FROM ai_usage_log a+LEFT JOIN core_user u+ ON u.id = a.user_id+LEFT JOIN metabot_conversation c+ ON c.id = a.conversation_id;diff --git a/resources/migrations/instance_analytics_views/ai_usage_log/v1/postgres-ai_usage_log.sql b/resources/migrations/instance_analytics_views/ai_usage_log/v1/postgres-ai_usage_log.sqlnew file mode 100644index 00000000000..91daab9c6d5--- /dev/null+++ b/resources/migrations/instance_analytics_views/ai_usage_log/v1/postgres-ai_usage_log.sql@@ -0,0 +1,43 @@+DROP VIEW IF EXISTS v_ai_usage_log;++CREATE OR REPLACE VIEW v_ai_usage_log AS+SELECT+ a.id AS usage_log_id,+ a.created_at,+ a.source,+ CASE a.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE a.source+ END AS source_name,+ a.model,+ a.profile_id,+ a.prompt_tokens,+ a.completion_tokens,+ a.total_tokens,+ a.conversation_id,+ a.user_id,+ 'user_' || a.user_id AS user_qualified_id,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = a.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ c.ip_address AS ip_address,+ a.tenant_id,+ a.request_id+FROM ai_usage_log a+LEFT JOIN core_user u+ ON u.id = a.user_id+LEFT JOIN metabot_conversation c+ ON c.id = a.conversation_id;diff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v1/h2-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v1/h2-metabot_conversations.sqlnew file mode 100644index 00000000000..ae37a823f0e--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v1/h2-metabot_conversations.sql@@ -0,0 +1,94 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+ AND m.deleted_at IS NULL+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v1/mysql-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v1/mysql-metabot_conversations.sqlnew file mode 100644index 00000000000..54442bfdd51--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v1/mysql-metabot_conversations.sql@@ -0,0 +1,94 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(CONCAT(u.first_name, ' ', u.last_name), u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+ AND m.deleted_at IS NULL+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_conversations/v1/postgres-metabot_conversations.sql b/resources/migrations/instance_analytics_views/metabot_conversations/v1/postgres-metabot_conversations.sqlnew file mode 100644index 00000000000..68d518b8a8f--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_conversations/v1/postgres-metabot_conversations.sql@@ -0,0 +1,94 @@+DROP VIEW IF EXISTS v_metabot_conversations;++CREATE OR REPLACE VIEW v_metabot_conversations AS+SELECT+ c.id AS conversation_id,+ c.created_at,+ c.user_id,+ c.summary,+ COALESCE(u.first_name || ' ' || u.last_name, u.email) AS user_display_name,+ COUNT(m.id) AS message_count,+ COUNT(CASE WHEN m.role = 'user' THEN 1 END) AS user_message_count,+ COUNT(CASE WHEN m.role = 'assistant' THEN 1 END) AS assistant_message_count,+ COALESCE(MAX(a.total_tokens), 0) AS total_tokens,+ COALESCE(MAX(a.prompt_tokens), 0) AS prompt_tokens,+ COALESCE(MAX(a.completion_tokens), 0) AS completion_tokens,+ MAX(m.created_at) AS last_message_at,+ (SELECT mm.profile_id+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_id,+ (SELECT CASE mm.profile_id+ WHEN 'internal' THEN 'Internal'+ WHEN 'embedding_next' THEN 'Embedding'+ WHEN 'nlq' THEN 'NLQ'+ WHEN 'sql' THEN 'SQL'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'transforms_codegen' THEN 'Transforms codegen'+ WHEN 'document-generate-content' THEN 'Documents'+ ELSE mm.profile_id+ END+ FROM metabot_message mm+ WHERE mm.conversation_id = c.id+ AND mm.role = 'assistant'+ AND mm.deleted_at IS NULL+ ORDER BY mm.created_at+ LIMIT 1) AS profile_name,+ (SELECT pg.name+ FROM permissions_group_membership pgm+ JOIN permissions_group pg ON pg.id = pgm.group_id+ WHERE pgm.user_id = c.user_id+ AND pg.id != 1+ ORDER BY pg.name+ LIMIT 1) AS group_name,+ (SELECT aul.source+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source,+ (SELECT CASE aul.source+ WHEN 'metabot_agent' THEN 'Metabot'+ WHEN 'agent' THEN 'Metabot'+ WHEN 'document_generate_content' THEN 'Documents'+ WHEN 'example_question_generation_batch' THEN 'Suggested Prompts'+ WHEN 'slack' THEN 'Slackbot'+ WHEN 'slackbot' THEN 'Slackbot'+ WHEN 'oss-sql-gen' THEN 'SQL'+ WHEN 'sql-gen' THEN 'SQL'+ WHEN 'unknown' THEN 'Unknown'+ ELSE aul.source+ END+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS source_name,+ c.ip_address AS ip_address,+ MAX(a.tenant_id) AS tenant_id,+ MAX(t.name) AS tenant_name,+ (SELECT aul.model+ FROM ai_usage_log aul+ WHERE aul.conversation_id = c.id+ ORDER BY aul.created_at+ LIMIT 1) AS model+FROM metabot_conversation c+LEFT JOIN core_user u+ ON u.id = c.user_id+LEFT JOIN metabot_message m+ ON m.conversation_id = c.id+ AND m.deleted_at IS NULL+LEFT JOIN (+ SELECT+ conversation_id,+ COALESCE(SUM(prompt_tokens), 0) AS prompt_tokens,+ COALESCE(SUM(completion_tokens), 0) AS completion_tokens,+ COALESCE(SUM(total_tokens), 0) AS total_tokens,+ MIN(tenant_id) AS tenant_id+ FROM ai_usage_log+ WHERE conversation_id IS NOT NULL+ GROUP BY conversation_id+) a ON a.conversation_id = c.id+LEFT JOIN tenant t ON t.id = a.tenant_id+GROUP BY c.id, c.created_at, c.user_id, c.summary, u.first_name, u.last_name, u.email;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v1/h2-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v1/h2-metabot_messages.sqlnew file mode 100644index 00000000000..bda23848882--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v1/h2-metabot_messages.sql@@ -0,0 +1,17 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id+WHERE m.deleted_at IS NULL;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v1/mysql-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v1/mysql-metabot_messages.sqlnew file mode 100644index 00000000000..bda23848882--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v1/mysql-metabot_messages.sql@@ -0,0 +1,17 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id+WHERE m.deleted_at IS NULL;diff --git a/resources/migrations/instance_analytics_views/metabot_messages/v1/postgres-metabot_messages.sql b/resources/migrations/instance_analytics_views/metabot_messages/v1/postgres-metabot_messages.sqlnew file mode 100644index 00000000000..bda23848882--- /dev/null+++ b/resources/migrations/instance_analytics_views/metabot_messages/v1/postgres-metabot_messages.sql@@ -0,0 +1,17 @@+DROP VIEW IF EXISTS v_metabot_messages;++CREATE OR REPLACE VIEW v_metabot_messages AS+SELECT+ m.id AS message_id,+ m.conversation_id,+ m.created_at,+ m.role,+ m.profile_id,+ m.total_tokens,+ COALESCE(m.user_id, c.user_id) AS user_id,+ m.slack_msg_id,+ m.channel_id+FROM metabot_message m+JOIN metabot_conversation c+ ON c.id = m.conversation_id+WHERE m.deleted_at IS NULL;diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.cljindex e2c70ef9079..6e07698fe3a 100644--- a/src/metabase/api/common.clj+++ b/src/metabase/api/common.clj@@ -266,8 +266,10 @@(defn check-404"Throw a `404` if `arg` is `false` or `nil`, otherwise return as-is."- [arg]- (check arg generic-404))+ ([arg]+ (check arg generic-404))+ ([arg msg]+ (check arg [404 msg])))(defmacro let-404"Bind a form as with `let`; throw a 404 if it is `nil` or `false`."diff --git a/src/metabase/cmd/copy.clj b/src/metabase/cmd/copy.cljindex 5f7ba8bd74a..ba08fe22873 100644--- a/src/metabase/cmd/copy.clj+++ b/src/metabase/cmd/copy.clj@@ -134,6 +134,7 @@:model/Metabot:model/MetabotConversation:model/MetabotMessage+ :model/MetabotFeedback:model/MetabotPrompt](when config/ee-available?[:model/MetabotPermissionsdiff --git a/src/metabase/internal_stats/metabot.clj b/src/metabase/internal_stats/metabot.cljindex 6d256bea5f3..4184df2e2a7 100644--- a/src/metabase/internal_stats/metabot.clj+++ b/src/metabase/internal_stats/metabot.clj@@ -27,6 +27,7 @@[](let [today-utc (t/offset-date-time (t/zone-offset "+00"))yesterday-utc (t/minus today-utc (t/days 1))+ user-id-expr [:coalesce :m.user_id :c.user_id]tokens (or (t2/select-one-fn :sum[:model/AiUsageLog [:%sum.total_tokens :sum]]{:where [:and@@ -45,7 +46,10 @@{:where [:and:ai_proxied[:= [:cast :created_at :date] [:cast yesterday-utc :date]]]})- :metabot-users (:cnt (t2/query-one {:select [[[:count [:distinct :c.user_id]] :cnt]]+ ;; New rows stamp `metabot_message.user_id`; legacy rows fall back+ ;; to `metabot_conversation.user_id` so historical usage doesn't+ ;; disappear until old messages are backfilled.+ :metabot-users (:cnt (t2/query-one {:select [[[:count [:distinct user-id-expr]] :cnt]]:from [[:metabot_message :m]]:join [[:metabot_conversation :c] [:= :c.id :m.conversation_id]]:where [:anddiff --git a/src/metabase/llm/api.clj b/src/metabase/llm/api.cljindex 2a04b948b44..f6cd76c661a 100644--- a/src/metabase/llm/api.clj+++ b/src/metabase/llm/api.clj@@ -240,10 +240,10 @@:source "oss_metabot":tag "oss-sqlgen"})(metabot/log-ai-usage!- {:source "oss-sql-gen"- :model (:model usage)- :prompt-tokens (:prompt usage)- :completion-tokens (:completion usage)})+ {:source "sql-gen"+ :model (:model usage)+ :prompt-tokens (:prompt usage)+ :completion-tokens (:completion usage)})(track-sqlgen-event!{:duration-ms (u/since-ms start-timer):result "success"diff --git a/src/metabase/metabot/agent/streaming.clj b/src/metabase/metabot/agent/streaming.cljindex 437ca87a41c..ee4d38b4bf7 100644--- a/src/metabase/metabot/agent/streaming.clj+++ b/src/metabase/metabot/agent/streaming.clj@@ -21,6 +21,16 @@(def adhoc-viz-type "AI-SDK data type for ad-hoc visualizations." "adhoc_viz")(def static-viz-type "AI-SDK data type for static visualizations." "static_viz")+(defn persistable-data-part?+ "True if `part` should be written to MetabotMessage.data. `state` parts are+ skipped because their value is salvaged separately into MetabotConversation.state;+ duplicating the blob in every message would bloat storage. Non-data parts are+ always persistable here; the caller is responsible for filtering stream-level+ metadata (`:start`, `:usage`, `:finish`) separately."+ [part]+ (not (and (= :data (:type part))+ (= state-type (:data-type part)))))+;;; Query URL Encoding(defn query->url-hashdiff --git a/src/metabase/metabot/api.clj b/src/metabase/metabot/api.cljindex 9fd3dfd5fb7..06075ba60f6 100644--- a/src/metabase/metabot/api.clj+++ b/src/metabase/metabot/api.clj@@ -4,7 +4,6 @@[clojure.core.async :as a][clojure.string :as str][medley.core :as m]- [metabase.analytics-interface.core :as analytics][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]]@@ -14,6 +13,7 @@[metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.metabot.agent.core :as agent]+ [metabase.metabot.api.conversations][metabase.metabot.api.document][metabase.metabot.api.metabot][metabase.metabot.api.permissions]@@ -21,18 +21,20 @@[metabase.metabot.context :as metabot.context][metabase.metabot.envelope :as metabot.envelope][metabase.metabot.feedback :as metabot.feedback]+ [metabase.metabot.persistence :as metabot.persistence][metabase.metabot.provider-util :as provider-util][metabase.metabot.schema :as metabot.schema][metabase.metabot.self :as metabot.self][metabase.metabot.self.core :as self.core][metabase.metabot.settings :as metabot.settings][metabase.metabot.usage :as metabot.usage]+ [metabase.models.interface :as mi][metabase.permissions.core :as perms]+ [metabase.request.core :as request][metabase.server.streaming-response :as sr][metabase.settings.core :as setting][metabase.slackbot.api][metabase.util :as u]- [metabase.util.json :as json][metabase.util.log :as log][metabase.util.malli :as mu][metabase.util.malli.schema :as ms]@@ -42,9 +44,19 @@(set! *warn-on-reflection* true)+(defn- check-conversation-access!+ "Throw a 403 if a `MetabotConversation` with `conversation-id` already exists and+ the current user is not a participant (has not sent at least one message in it).+ New conversations (no row yet) are allowed so the first store-messages! call+ can originate one. Permissions are participation-based — a conversation can+ have multiple participants (e.g. multiple users in a shared Slack thread)."+ [conversation-id]+ (when-let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)]+ (api/check-403 (mi/can-read? conversation))))+(defn- store-aiservice-messages!"Store messages that are going from ai-service"- [conversation-id profile-id messages]+ [conversation-id profile-id ip-address embed-url messages](let [finish (let [m (u/last messages)](when (= (:_type m) :FINISH_MESSAGE)m))@@ -55,15 +67,21 @@vec)ai-proxy? (provider-util/metabase-provider? (metabot.settings/llm-metabot-provider))](app-db/update-or-insert! :model/MetabotConversation {:id conversation-id}- (constantly (cond-> {:user_id api/*current-user-id*}- state (assoc :state state))))+ (fn [existing]+ (cond-> {}+ (nil? existing) (assoc :user_id api/*current-user-id*)+ state (assoc :state state)+ (nil? (:ip_address existing)) (assoc :ip_address ip-address)+ (nil? (:embed_url existing)) (assoc :embed_url embed-url))));; NOTE: this will need to be constrained at some point, see BOT-386(t2/insert! :model/MetabotMessage{:conversation_id conversation-id+ :user_id api/*current-user-id*:data messages:usage (:usage finish):role (:role (first messages)):profile_id profile-id+ :external_id (str (random-uuid)):total_tokens (->> (vals (:usage finish));; NOTE: this filter is supporting backward-compatible usage format, can be;; removed when ai-service does not give us `completionTokens` in `usage`@@ -72,70 +90,6 @@(apply +)):ai_proxied (boolean ai-proxy?)})))-(defn- extract-usage- "Extract usage from parts, taking the last `:usage` per model.-- The agent loop emits cumulative usage — each `:usage` part subsumes all prior- usage for that model — so we simply take the last one per model rather than- summing. Returns a map keyed by model name:- {\"model-name\" {:prompt X :completion Y}}"- [parts]- (transduce- (filter #(= :usage (:type %)))- (completing- (fn [acc {:keys [usage model]}]- (let [model (or model "unknown")]- (assoc acc model {:prompt (:promptTokens usage 0)- :completion (:completionTokens usage 0)}))))- {}- parts))--(defn- strip-tool-output-bloat- "For :tool-output parts, keep only :output in the result map.- Both LLM adapters only read (get-in part [:result :output]) when replaying history.- Everything else (:structured-output, :resources, :data-parts, :reactions, etc.)- is transient runtime data consumed during streaming and can be very large."- [{:keys [type] :as part}]- (cond-> part- (= :tool-output type) (update :result select-keys [:output])))--(defn- store-native-parts!- "Store assistant response parts directly to the database.-- Takes AI SDK parts (after aisdk-xf combining) and stores them in the native format,- avoiding the intermediate 'aisdk messages' format.-- Parts format: [{:type :text :text \"...\"} {:type :tool-input ...} ...]"- [conversation-id profile-id parts]- (let [state-part (u/seek #(and (= :data (:type %))- (= "state" (:data-type %)))- parts)- usage (extract-usage parts)- ai-proxy? (provider-util/metabase-provider? (metabot.settings/llm-metabot-provider))- ;; Filter out :start, :usage, :finish, :data - these are metadata, not message content- ;; :data is like `:navigate_to`- content (->> parts- (remove #(#{:start :usage :finish :data} (:type %)))- (mapv strip-tool-output-bloat))]- (analytics/observe! :metabase-metabot/message-persist-bytes- {:profile-id (or profile-id "unknown")}- (u/string-byte-count (json/encode content)))- (t2/with-transaction [_conn]- (when state-part- (app-db/update-or-insert! :model/MetabotConversation {:id conversation-id}- (constantly {:user_id api/*current-user-id*- :state (:data state-part)})))- (t2/insert! :model/MetabotMessage- {:conversation_id conversation-id- :data content- :usage usage- :role :assistant- :profile_id profile-id- :total_tokens (->> (vals usage)- (map #(+ (:prompt %) (:completion %)))- (reduce + 0))- :ai_proxied (boolean ai-proxy?)}))))-(defn- streaming-writer-rf"Creates a reducing function that writes AI SDK lines to an OutputStream.@@ -157,22 +111,6 @@(catch org.eclipse.jetty.io.EofException _(reduced acc)))))))-(defn- combine-text-parts-xf []- (fn [rf]- (let [pending (volatile! nil)]- (fn- ([] (rf))- ([result]- (let [p @pending]- (rf (if p (rf result p) result))))- ([result part]- (let [prev @pending]- (if (and prev (= :text (:type prev) (:type part)))- (do (vswap! pending update :text str (:text part))- result)- (do (vreset! pending part)- (if prev (rf result prev) result)))))))))-(defn- native-agent-streaming-request"Handle streaming request using native Clojure agent.@@ -185,15 +123,16 @@When `:debug?` is true, enables debug logging which emits a `debug_log` datapart at the end of the stream with full LLM request/response data per iteration."- [{:keys [metabot-id profile-id message context history conversation-id state debug?]}]+ [{:keys [metabot-id profile-id message context history conversation-id state debug? ip-address embed-url]}](let [enriched-context (metabot.context/create-context context)- messages (concat history [message])]+ messages (concat history [message])+ external-id (str (random-uuid))](sr/streaming-response {:content-type "text/event-stream"} [^OutputStream os canceled-chan](let [parts-atom (atom [])- ;; Compose: collect parts AND convert to lines for streaming.;; In dev mode, emit usage parts in the SSE stream for debugging/benchmarking.xf (comp (u/tee-xf parts-atom)- (self.core/aisdk-line-xf {:emit-usage? config/is-dev?}))]+ (self.core/aisdk-line-xf {:emit-usage? config/is-dev?+ :external-id external-id}))](try(transduce xf(streaming-writer-rf os canceled-chan)@@ -208,11 +147,21 @@(catch org.eclipse.jetty.io.EofException _(log/debug "Client disconnected during native agent streaming"))(finally- (store-native-parts! conversation-id profile-id (into [] (combine-text-parts-xf) @parts-atom))))))))+ (try+ (metabot.persistence/store-native-parts!+ conversation-id profile-id+ (into [] (metabot.persistence/combine-text-parts-xf) @parts-atom)+ :ip-address ip-address+ :embed-url embed-url+ :external-id external-id)+ (catch Exception e+ (log/error e "Failed to persist native agent parts"+ {:conversation-id conversation-id+ :external-id external-id})))))))))(defn streaming-request"Handles an incoming request, making all required tool invocation, LLM call loops, etc."- [{:keys [metabot_id profile_id message context history conversation_id state debug]}]+ [{:keys [metabot_id profile_id message context history conversation_id state debug]} ip-address embed-url](let [message (metabot.envelope/user-message message)metabot-id (metabot.config/resolve-dynamic-metabot-id metabot_id)_ (metabot.config/check-metabot-enabled! metabot-id)@@ -220,7 +169,8 @@profile-id (metabot.config/resolve-dynamic-profile-id profile_id metabot-id);; Only allow debug mode in dev — never in productiondebug? (and config/is-dev? (boolean debug))]- (store-aiservice-messages! conversation_id profile-id [message])+ (check-conversation-access! conversation_id)+ (store-aiservice-messages! conversation_id profile-id ip-address embed-url [message])(log/info "Using native Clojure agent" {:profile-id profile-id :debug? debug?})(native-agent-streaming-request@@ -231,7 +181,9 @@:history history:conversation-id conversation_id:state state- :debug? debug?})))+ :debug? debug?+ :ip-address ip-address+ :embed-url embed-url})))(defn- legacy->modern-query[query]@@ -274,28 +226,35 @@[:queries {:optional true} [:map-of :string :any]][:charts {:optional true} [:map-of :string :any]][:chart-configs {:optional true} [:map-of :string :any]]]]- [:debug {:optional true} [:maybe :boolean]]]]+ [:debug {:optional true} [:maybe :boolean]]]+ req](metabot.context/log body :llm.log/fe->be)(let [body* (m/update-existing body [:context :user_is_viewing] upgrade-viewing-queries)]- (streaming-request body*)))+ (streaming-request body* (request/ip-address req) (request/referer req))));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to;; use our API + we will need it when we make auto-TypeScript-signature generation happen;;#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}(api.macros/defendpoint :post "/feedback"- "Proxy Metabot feedback to Harbormaster, adding the premium embedding token."+ "Persist Metabot feedback locally and proxy it to Harbormaster."[_route-params_query-params- feedback :- :map]+ body :- [:map+ [:metabot_id ms/PositiveInt]+ [:message_id ms/NonBlankString]+ [:positive :boolean]+ [:issue_type {:optional true} [:maybe :string]]+ [:freeform_feedback {:optional true} [:maybe :string]]]](metabot.config/check-metabot-enabled!)- (try- (api/check-400 (metabot.feedback/submit-to-harbormaster! feedback)- "Cannot submit feedback. The license token and/or Store API URL are missing!")- api/generic-204-no-content- (catch Exception e- (log/error e "Failed to submit feedback to Harbormaster")- (throw e))))+ (let [message (metabot.feedback/persist-feedback! body)]+ (try+ (api/check-400 (metabot.feedback/submit-to-harbormaster!+ (metabot.feedback/harbormaster-payload body message))+ "Cannot submit feedback. The license token and/or Store API URL are missing!")+ (catch Exception e+ (log/error "Failed to submit feedback to Harbormaster: " (ex-message e)))))+ api/generic-204-no-content)(def ^:private metabot-provider-schema(into [:enum] metabot.settings/supported-metabot-providers))@@ -496,9 +455,10 @@"`/api/metabot` routes."(handlers/routes(handlers/route-map-handler- {"/metabot" metabase.metabot.api.metabot/routes- "/permissions" metabase.metabot.api.permissions/routes- "/document" metabase.metabot.api.document/routes+ {"/metabot" metabase.metabot.api.metabot/routes+ "/conversations" metabase.metabot.api.conversations/routes+ "/permissions" metabase.metabot.api.permissions/routes+ "/document" metabase.metabot.api.document/routes;; premium check happens in the route so we still ack events to prevent slack retrying- "/slack" metabase.slackbot.api/routes})+ "/slack" metabase.slackbot.api/routes})(api.macros/ns-handler *ns* +auth)))diff --git a/src/metabase/metabot/api/conversations.clj b/src/metabase/metabot/api/conversations.cljnew file mode 100644index 00000000000..fa2f9c2b902--- /dev/null+++ b/src/metabase/metabot/api/conversations.clj@@ -0,0 +1,125 @@+(ns metabase.metabot.api.conversations+ "`/api/metabot/conversations` routes.++ Generic conversation endpoints — not the EE analytics endpoints under+ `/api/ee/metabot-analytics/`. These are scoped to conversations the current+ user *participates in* (has at least one message authored by them), which+ covers both solo web-UI chats and shared Slack threads where multiple+ Metabase users @-mention Metabot in the same conversation."+ (:require+ [metabase.api.common :as api]+ [metabase.api.macros :as api.macros]+ [metabase.api.routes.common :refer [+auth]]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.request.core :as request]+ [metabase.util.malli.schema :as ms]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++;;; ---------------------------------------- Schemas ----------------------------------------++(def ^:private ConversationSummary+ [:map+ [:conversation_id ms/UUIDString]+ [:created_at ms/TemporalInstant]+ [:summary [:maybe :string]]+ ;; Wire compatibility: keep the field name `user_id`, but it now means the+ ;; conversation originator (first writer), not "the only allowed reader".+ [:user_id [:maybe ms/PositiveInt]]+ [:message_count ms/IntGreaterThanOrEqualToZero]+ [:last_message_at [:maybe ms/TemporalInstant]]])++(def ^:private ListConversationsResponse+ [:map+ [:data [:sequential ConversationSummary]]+ [:total ms/IntGreaterThanOrEqualToZero]+ [:limit ms/IntGreaterThanOrEqualToZero]+ [:offset ms/IntGreaterThanOrEqualToZero]])++(def ^:private ConversationDetail+ [:map+ [:conversation_id ms/UUIDString]+ [:created_at ms/TemporalInstant]+ [:summary [:maybe :string]]+ [:user_id [:maybe ms/PositiveInt]]+ [:chat_messages [:sequential :map]]])++(def ^:private ConversationIdParams+ [:map [:id ms/UUIDString]])++;;; ---------------------------------------- Queries ----------------------------------------++(def ^:private default-limit 50)+(def ^:private default-offset 0)++(defn- participation-clause+ "Match conversations visible in history for `user-id`.++ New rows participate via `metabot_message.user_id`; legacy rows created before+ message authors were stamped fall back to the conversation originator."+ [user-id]+ (let [participation-exists [:exists {:select [[[:inline 1]]]+ :from [:metabot_message]+ :where [:and+ [:= :conversation_id :metabot_conversation.id]+ [:= :user_id user-id]]}]]+ [:or+ [:= :user_id user-id]+ participation-exists]))++;;; ---------------------------------------- Endpoints ----------------------------------------++(api.macros/defendpoint :get "/" :- ListConversationsResponse+ "List conversations visible in the current user's history, most-recent first.++ New conversations are participation-based (the user authored at least one+ message); legacy conversations created before message authors were stamped+ fall back to the conversation originator."+ []+ (let [user-id (api/check-404 api/*current-user-id*)+ limit (or (request/limit) default-limit)+ offset (or (request/offset) default-offset)+ visible-to-user (participation-clause user-id)+ ;; Aggregates are per-row correlated subqueries so pagination stays on the+ ;; outer `metabot_conversation` scan and only runs the subquery 50× per page.+ ;; Participation is defined by message authorship, not deletion state, so+ ;; soft-deleted messages still count. Legacy rows fall back to+ ;; `metabot_conversation.user_id`.+ rows (t2/select :model/MetabotConversation+ {:select [:id :created_at :summary :user_id+ [{:select [[[:count :*]]]+ :from [:metabot_message]+ :where [:and+ [:= :conversation_id :metabot_conversation.id]+ [:= :deleted_at nil]]}+ :message_count]+ [{:select [[[:max :created_at]]]+ :from [:metabot_message]+ :where [:and+ [:= :conversation_id :metabot_conversation.id]+ [:= :deleted_at nil]]}+ :last_message_at]]+ :where visible-to-user+ :order-by [[:created_at :desc] [:id :asc]]+ :limit limit+ :offset offset})]+ {:data (mapv #(-> %+ (select-keys [:created_at :summary :user_id :message_count :last_message_at])+ (assoc :conversation_id (:id %)))+ rows)+ :total (t2/count :model/MetabotConversation {:where visible-to-user})+ :limit limit+ :offset offset}))++(api.macros/defendpoint :get "/:id" :- ConversationDetail+ "Return a single conversation with its flattened chat messages.++ Accessible to any participant in the conversation or to any superuser."+ [{:keys [id]} :- ConversationIdParams]+ (api/read-check :model/MetabotConversation id)+ (metabot.persistence/conversation-detail id))++(def ^{:arglists '([request respond raise])} routes+ "`/api/metabot/conversations` routes."+ (api.macros/ns-handler *ns* +auth))diff --git a/src/metabase/metabot/feedback.clj b/src/metabase/metabot/feedback.cljindex 15d7b55b37a..3dd0d0fb9c7 100644--- a/src/metabase/metabot/feedback.clj+++ b/src/metabase/metabot/feedback.clj@@ -1,11 +1,18 @@(ns metabase.metabot.feedback- "Shared feedback submission to Harbormaster via the Store API."+ "Local persistence of Metabot feedback, plus a Harbormaster submission path."(:require[clj-http.client :as http][clojure.string :as str]+ [metabase.api.common :as api]+ [metabase.config.core :as config]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.models.interface :as mi][metabase.premium-features.core :as premium-features][metabase.store-api.core :as store-api]- [metabase.util.json :as json]))+ [metabase.util.json :as json]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)(defn submit-to-harbormaster!"Submit metabot feedback to Harbormaster via the Store API.@@ -17,3 +24,67 @@(http/post (str base-url "/api/v2/metabot/feedback/" token){:content-type :json:body (json/encode feedback)}))))++(defn harbormaster-payload+ "Build the Harbormaster feedback payload from the request body, the resolved+ `metabot_message` row, and the submitter (defaults to the current user)."+ ([body message]+ (harbormaster-payload body message api/*current-user-id*))+ ([{:keys [metabot_id message_id positive issue_type freeform_feedback]}+ {:keys [conversation_id]}+ submitter-user-id]+ {:metabot_id metabot_id+ :feedback {:message_id message_id+ :positive positive+ :issue_type issue_type+ :freeform_feedback freeform_feedback}+ :conversation_data (metabot.persistence/conversation-detail conversation_id)+ :version config/mb-version-info+ :submission_time (str (java.time.OffsetDateTime/now))+ :submitter_user_id submitter-user-id+ :is_admin (boolean (t2/select-one-fn :is_superuser :model/User :id submitter-user-id))}))++(defn- resolve-rated-message+ "Return the `metabot_message` row (`:id` + `:conversation_id`) identified by+ `external-id`, plus the enclosing `:model/MetabotConversation` as `:conversation`.+ Throws 404 if the message is missing, the conversation is missing, or the+ current user cannot read the conversation (superuser / originator / participant)."+ [external-id]+ (let [message (t2/select-one [:model/MetabotMessage :id :conversation_id]+ :external_id external-id)+ _ (api/check-404 message)+ conversation (t2/select-one [:model/MetabotConversation :id :user_id]+ :id (:conversation_id message))+ _ (api/check-404 conversation)+ _ (api/check-404 (mi/can-read? conversation))]+ (assoc message :conversation conversation)))++(defn- upsert-feedback!+ "Insert or update the `metabot_feedback` row for `(message-row-id, submitter-user-id)`."+ [message-row-id submitter-user-id {:keys [positive issue_type freeform_feedback]}]+ (let [base-fields {:positive positive+ :issue_type issue_type+ :freeform_feedback freeform_feedback}]+ (t2/with-transaction [_conn]+ (if (t2/exists? :model/MetabotFeedback :message_id message-row-id :user_id submitter-user-id)+ (t2/update! :model/MetabotFeedback+ {:message_id message-row-id :user_id submitter-user-id}+ (assoc base-fields :updated_at (java.time.OffsetDateTime/now)))+ (t2/insert! :model/MetabotFeedback+ (assoc base-fields+ :message_id message-row-id+ :user_id submitter-user-id))))))++(defn persist-feedback!+ "Upsert a `metabot_feedback` row for the rated message and return the+ resolved `metabot_message` row (with its `:conversation`). Throws 404 when+ the external_id does not resolve to a message the current user can read.++ The submitter is always `api/*current-user-id*` — both the row's `user_id`+ and the `can-read?` authorization check key on the same identity. Callers+ that dispatch on behalf of another user (e.g. the Slack modal handler) must+ establish the binding via `request/with-current-user` before calling."+ [{:keys [message_id] :as body}]+ (let [message (resolve-rated-message message_id)]+ (upsert-feedback! (:id message) api/*current-user-id* body)+ message))diff --git a/src/metabase/metabot/models/metabot_conversation.clj b/src/metabase/metabot/models/metabot_conversation.cljindex dcb2427f98f..d12061f4098 100644--- a/src/metabase/metabot/models/metabot_conversation.clj+++ b/src/metabase/metabot/models/metabot_conversation.clj@@ -1,5 +1,6 @@(ns metabase.metabot.models.metabot-conversation(:require+ [metabase.api.common :as api][metabase.models.interface :as mi][methodical.core :as methodical][toucan2.core :as t2]))@@ -13,3 +14,34 @@(t2/deftransforms :model/MetabotConversation{:state mi/transform-json})++(defn participant?+ "True if `user-id` has sent at least one message in `conversation-id`."+ [conversation-id user-id]+ (when (and conversation-id user-id)+ (t2/exists? :model/MetabotMessage+ :conversation_id conversation-id+ :user_id user-id)))++(defmethod mi/can-read? :model/MetabotConversation+ ;; Access: superuser, or originator (first-writer, set on insert and never+ ;; overwritten), or participant. Originator covers the rare case of a row+ ;; existing without the originator's first message yet persisted.+ ([instance]+ (or api/*is-superuser?*+ (= (:user_id instance) api/*current-user-id*)+ (participant? (:id instance) api/*current-user-id*)))+ ([_model pk]+ (when-let [instance (t2/select-one [:model/MetabotConversation :id :user_id] :id pk)]+ (mi/can-read? instance))))++(methodical/defmethod t2/batched-hydrate [:model/MetabotConversation :user]+ "Batch-hydrate `:user` (id/email/name only) — semantically the *originator*.+ Name kept as `:user` for compatibility with existing EE analytics responses."+ [_model k conversations]+ (mi/instances-with-hydrated-data+ conversations k+ #(t2/select-pk->fn (fn [u] (select-keys u [:id :email :first_name :last_name]))+ [:model/User :id :email :first_name :last_name]+ :id (keep :user_id conversations))+ :user_id {:default nil}))diff --git a/src/metabase/metabot/models/metabot_feedback.clj b/src/metabase/metabot/models/metabot_feedback.cljnew file mode 100644index 00000000000..2e5afa9999d--- /dev/null+++ b/src/metabase/metabot/models/metabot_feedback.clj@@ -0,0 +1,21 @@+(ns metabase.metabot.models.metabot-feedback+ "Persist Metabot message feedback"+ (:require+ [metabase.models.interface :as mi]+ [methodical.core :as methodical]+ [toucan2.core :as t2]))++(methodical/defmethod t2/table-name :model/MetabotFeedback [_model] :metabot_feedback)++(doto :model/MetabotFeedback+ (derive :metabase/model))++(methodical/defmethod t2/batched-hydrate [:model/MetabotFeedback :user]+ "Batch-hydrate `:user` (id/email/name only) — the feedback submitter."+ [_model k feedbacks]+ (mi/instances-with-hydrated-data+ feedbacks k+ #(t2/select-pk->fn (fn [u] (select-keys u [:id :email :first_name :last_name]))+ [:model/User :id :email :first_name :last_name]+ :id (keep :user_id feedbacks))+ :user_id {:default nil}))diff --git a/src/metabase/metabot/persistence.clj b/src/metabase/metabot/persistence.cljindex f2c9e713c8f..10f168a0bd0 100644--- a/src/metabase/metabot/persistence.clj+++ b/src/metabase/metabot/persistence.clj@@ -1,14 +1,168 @@(ns metabase.metabot.persistence"Persistence for Metabot conversations and messages."(:require+ [metabase.analytics-interface.core :as analytics][metabase.api.common :as api][metabase.app-db.core :as app-db]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.provider-util :as provider-util]+ [metabase.metabot.settings :as metabot.settings][metabase.util :as u]+ [metabase.util.json :as json][toucan2.core :as t2]))+(def persisted-structured-output-keys+ "Subset of `:structured-output` that must survive persistence so+ `metabase-enterprise.metabot-analytics.queries` can surface generated+ queries on the admin detail page."+ [:query-id :query-content :query :database :chart-type])++(defn- trim-structured-output [structured]+ (when (map? structured)+ (not-empty (select-keys structured persisted-structured-output-keys))))++(defn strip-tool-output-bloat+ "For :tool-output parts, keep `:output` and a trimmed `:structured-output` in+ the result map. Both LLM adapters only read `(get-in part [:result :output])`+ when replaying history, so `:output` is all they need. The analytics extractor,+ however, reads a small subset of `:structured-output` off persisted messages+ (see `persisted-structured-output-keys`), so we keep those four keys and drop+ everything else (`:resources`, `:data-parts`, `:reactions`, …) — that's where+ the bulk of the bloat lives."+ [{:keys [type] :as part}]+ (if (= :tool-output type)+ (update part :result+ (fn [r]+ (cond-> (select-keys r [:output])+ (trim-structured-output (:structured-output r))+ (assoc :structured-output (trim-structured-output (:structured-output r)))+ (trim-structured-output (:structured_output r))+ (assoc :structured_output (trim-structured-output (:structured_output r))))))+ part))++(defn extract-usage+ "Extract usage from parts, taking the last `:usage` per model.++ The agent loop emits cumulative usage — each `:usage` part subsumes all prior+ usage for that model — so we simply take the last one per model rather than+ summing. Returns a map keyed by model name:+ {\"model-name\" {:prompt X :completion Y}}"+ [parts]+ (transduce+ (filter #(= :usage (:type %)))+ (completing+ (fn [acc {:keys [usage model]}]+ (let [model (or model "unknown")]+ (assoc acc model {:prompt (:promptTokens usage 0)+ :completion (:completionTokens usage 0)}))))+ {}+ parts))++(defn combine-text-parts-xf+ "Transducer that merges consecutive `:text` parts into a single `:text` part.+ Non-text parts pass through unchanged. Used before persistence so streaming+ text deltas consolidate into one stored block."+ []+ (fn [rf]+ (let [pending (volatile! nil)]+ (fn+ ([] (rf))+ ([result]+ (let [p @pending]+ (rf (if p (rf result p) result))))+ ([result part]+ (let [prev @pending]+ (if (and prev (= :text (:type prev) (:type part)))+ (do (vswap! pending update :text str (:text part))+ result)+ (do (vreset! pending part)+ (if prev (rf result prev) result)))))))))++(defn store-native-parts!+ "Persist assistant response parts directly in the native agent-loop format.++ Takes raw AISDK parts (ideally after `combine-text-parts-xf` merging) and stores+ them without the lossy AI-SDK-line round-trip that would strip `:structured-output`+ from tool-output results. Preserves the `persisted-structured-output-keys` subset+ that the analytics reader needs.++ Positional args: `conversation-id`, `profile-id`, `parts`.++ Keyword args:+ - `:ip-address`, `:embed-url` — recorded on the conversation row on first insert only.+ - `:slack-msg-id`, `:channel-id`, `:slack-team-id`, `:slack-thread-ts` — slack+ metadata. `:slack-team-id`/`:channel-id`/`:slack-thread-ts` land on the+ conversation row on first insert only; `:slack-msg-id`/`:channel-id` land on+ the message row.+ - `:user-id` — when set, recorded on the message row (slackbot uses this to+ record the invoking Metabase user).+ - `:external-id` — message external id used by feedback; generated if omitted.+ - `:ai-proxy?` — override; otherwise derived from `llm-metabot-provider`.++ Returns the inserted `MetabotMessage` primary key."+ [conversation-id profile-id parts+ & {:keys [ip-address embed-url external-id+ slack-msg-id channel-id slack-team-id slack-thread-ts+ user-id ai-proxy?]}]+ (let [state-part (u/seek #(and (= :data (:type %))+ (= "state" (:data-type %)))+ parts)+ usage (extract-usage parts)+ ai-proxy? (if (some? ai-proxy?)+ ai-proxy?+ (provider-util/metabase-provider? (metabot.settings/llm-metabot-provider)))+ external-id (or external-id (str (random-uuid)))+ ;; Filter out :start, :usage, :finish stream metadata. Data parts are+ ;; persisted (so the analytics view can surface them) except :state,+ ;; which is salvaged to MetabotConversation.state via `state-part` above.+ content (->> parts+ (remove #(#{:start :usage :finish} (:type %)))+ (filter streaming/persistable-data-part?)+ (mapv strip-tool-output-bloat))]+ (analytics/observe! :metabase-metabot/message-persist-bytes+ {:profile-id (or profile-id "unknown")}+ (u/string-byte-count (json/encode content)))+ (t2/with-transaction [_conn]+ ;; Always upsert the conversation row — the assistant message insert FKs+ ;; to it, and the caller may not have written a user-message row (e.g.+ ;; slackbot replies to follow-ups inside an existing thread). `:state` is+ ;; only updated when we actually have a fresh state part to record.+ (app-db/update-or-insert! :model/MetabotConversation {:id conversation-id}+ (fn [existing]+ ;; `:user_id` is the originator — set on insert, never overwritten.+ (cond-> {}+ (nil? existing)+ (assoc :user_id api/*current-user-id*)+ state-part+ (assoc :state (:data state-part))+ (and ip-address (nil? (:ip_address existing)))+ (assoc :ip_address ip-address)+ (and embed-url (nil? (:embed_url existing)))+ (assoc :embed_url embed-url)+ (and slack-team-id (nil? (:slack_team_id existing)))+ (assoc :slack_team_id slack-team-id)+ (and channel-id (nil? (:slack_channel_id existing)))+ (assoc :slack_channel_id channel-id)+ (and slack-thread-ts (nil? (:slack_thread_ts existing)))+ (assoc :slack_thread_ts slack-thread-ts))))+ (t2/insert-returning-pk! :model/MetabotMessage+ (cond-> {:conversation_id conversation-id+ :data content+ :usage usage+ :role :assistant+ :profile_id profile-id+ :external_id external-id+ :total_tokens (->> (vals usage)+ (map #(+ (:prompt %) (:completion %)))+ (reduce + 0))+ :ai_proxied (boolean ai-proxy?)}+ channel-id (assoc :channel_id channel-id)+ slack-msg-id (assoc :slack_msg_id slack-msg-id)+ user-id (assoc :user_id user-id))))))+(defn store-message!"Persist messages to MetabotConversation and MetabotMessage tables."- [conversation-id profile-id messages & {:keys [slack-msg-id channel-id user-id ai-proxy?]}]+ [conversation-id profile-id messages & {:keys [slack-msg-id channel-id slack-team-id slack-thread-ts user-id ai-proxy?]}](let [finish (let [m (u/last messages)](when (= (:_type m) :FINISH_MESSAGE)m))@@ -18,8 +172,20 @@messages (-> (remove #(or (= % state) (= % finish)) messages)vec)](app-db/update-or-insert! :model/MetabotConversation {:id conversation-id}- (constantly (cond-> {:user_id api/*current-user-id*}- state (assoc :state state))))+ (fn [existing]+ ;; `:user_id` and slack metadata identify the conversation —+ ;; set on insert, never overwritten.+ (cond-> {}+ (nil? existing)+ (assoc :user_id api/*current-user-id*)+ state+ (assoc :state state)+ (and slack-team-id (nil? (:slack_team_id existing)))+ (assoc :slack_team_id slack-team-id)+ (and channel-id (nil? (:slack_channel_id existing)))+ (assoc :slack_channel_id channel-id)+ (and slack-thread-ts (nil? (:slack_thread_ts existing)))+ (assoc :slack_thread_ts slack-thread-ts))));; NOTE: this will need to be constrained at some point, see BOT-386(t2/insert-returning-pk! :model/MetabotMessage(cond-> {:conversation_id conversation-id@@ -27,6 +193,7 @@:usage (:usage finish):role (:role (first messages)):profile_id profile-id+ :external_id (str (random-uuid)):total_tokens (->> (vals (:usage finish));; NOTE: this filter is supporting backward-compatible usage format, can be;; removed when ai-service does not give us `completionTokens` in `usage`@@ -43,3 +210,102 @@[msg-id slack-msg-id](when (and msg-id slack-msg-id)(t2/update! :model/MetabotMessage msg-id {:slack_msg_id slack-msg-id})))++;;; ---------------------------------------- Chat message conversion ----------------------------------------++(defn- convert-content-block+ "Convert a single raw content block from `:data` into a frontend `MetabotChatMessage` map.+ Returns nil for blocks that should be skipped (tool-output, unknown types).++ `external-id` (the parent row's `metabot_message.external_id`) is attached to+ agent-text chat messages as `:externalId` — the stable key for feedback; the+ per-block `:id` stays unique."+ [external-id block]+ (let [block-type (:type block)+ block-role (:role block)]+ (cond+ ;; User text: {:role "user" :content "..."}+ (= "user" block-role)+ {:id (str (random-uuid)) :role "user" :type "text" :message (:content block)}++ ;; Assistant text (standard): {:type "text" :text "..."}+ (= "text" block-type)+ (cond-> {:id (or (:id block) (str (random-uuid)))+ :role "agent"+ :type "text"+ :message (:text block)}+ external-id (assoc :externalId external-id))++ ;; Assistant text (slack format): {:role "assistant" :_type "TEXT" :content "..."}+ (and (= "assistant" block-role) (= "TEXT" (:_type block)))+ (cond-> {:id (str (random-uuid))+ :role "agent"+ :type "text"+ :message (:content block)}+ external-id (assoc :externalId external-id))++ ;; Tool input: {:type "tool-input" :id "..." :function "..." :arguments {...}}+ (= "tool-input" block-type)+ {:id (:id block)+ :role "agent"+ :type "tool_call"+ :name (:function block)+ :args (when-let [a (:arguments block)] (json/encode a))+ :status "ended"}++ ;; Data part: {:type "data" :data-type "navigate_to" :version 1 :data ...}+ (= "data" block-type)+ {:id (str (random-uuid))+ :role "agent"+ :type "data_part"+ :part {:type (:data-type block)+ :version (or (:version block) 1)+ :value (:data block)}}++ ;; Tool output — skip here, merged via merge-tool-results+ :else nil)))++(defn- merge-tool-results+ "Merge tool-output blocks into their matching tool_call chat messages."+ [chat-messages blocks]+ (let [result-map (->> blocks+ (filter #(= "tool-output" (:type %)))+ (into {} (map (fn [o]+ [(:id o)+ {:result (when-let [r (:result o)] (json/encode r))+ :is_error (boolean (:error o))}]))))]+ (mapv (fn [msg]+ (if-let [r (and (= "tool_call" (:type msg)) (get result-map (:id msg)))]+ (merge msg r)+ msg))+ chat-messages)))++(defn message->chat-messages+ "Convert a single `MetabotMessage` model instance into a seq of `MetabotChatMessage` maps.+ Each message's `:data` (vector of content blocks) is flattened into typed chat messages."+ [message]+ (let [blocks (or (:data message) [])+ external-id (:external_id message)+ chat-msgs (into [] (keep #(convert-content-block external-id %)) blocks)]+ (merge-tool-results chat-msgs blocks)))++(defn messages->chat-messages+ "Convert a seq of `MetabotMessage` model instances into a flat `MetabotChatMessage` vector."+ [messages]+ (into [] (mapcat message->chat-messages) messages))++(defn conversation-detail+ "Reconstruct a conversation-with-chat-messages snapshot from the DB. Returns nil if the+ conversation does not exist."+ [conversation-id]+ (when-let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)]+ (let [messages (t2/select :model/MetabotMessage+ {:where [:and+ [:= :conversation_id conversation-id]+ [:= :deleted_at nil]]+ :order-by [[:created_at :asc]]})]+ {:conversation_id (:id conversation)+ :created_at (:created_at conversation)+ :summary (:summary conversation)+ :user_id (:user_id conversation)+ :chat_messages (messages->chat-messages messages)})))diff --git a/src/metabase/metabot/repl.clj b/src/metabase/metabot/repl.cljindex 6c4bc2edc44..e1c5a381d0c 100644--- a/src/metabase/metabot/repl.clj+++ b/src/metabase/metabot/repl.clj@@ -63,7 +63,9 @@:context context:history history:conversation_id conversation-id- :state state})+ :state state}+ nil+ nil)consume-streaming-responsestr/split-lines(metabot.u/aisdk->messages "assistant"))]diff --git a/src/metabase/metabot/self.clj b/src/metabase/metabot/self.cljindex 5be17785ead..bdbb404bba9 100644--- a/src/metabase/metabot/self.clj+++ b/src/metabase/metabot/self.clj@@ -181,7 +181,7 @@:source source:tag tag})(usage/log-ai-usage!- {:source (or tag source "unknown")+ {:source (or source tag "unknown"):model model:prompt-tokens prompt:completion-tokens completiondiff --git a/src/metabase/metabot/self/core.clj b/src/metabase/metabot/self/core.cljindex f7ea0f91481..6c620ae4bc2 100644--- a/src/metabase/metabot/self/core.clj+++ b/src/metabase/metabot/self/core.clj@@ -295,6 +295,9 @@Options::emit-usage? - When true, emit `:usage` parts as data lines (2:) in the SSEstream. Useful for dev/benchmarking. Default false.+ :external-id - When set, force this id into the emitted `f:` (start) line+ so the client sees the same id we persist as+ `metabot_message.external_id`.Input types and their output::text -> 0:\"content\"@@ -306,7 +309,7 @@:finish -> d:{\"finishReason\":\"stop\",\"usage\":{...}}:usage -> 2:{\"type\":\"usage\",...} (when :emit-usage? true, else skipped)"([] (aisdk-line-xf nil))- ([{:keys [emit-usage?]}]+ ([{:keys [emit-usage? external-id]}](fn [rf](let [error? (volatile! false)usage (volatile! nil)]@@ -326,7 +329,9 @@(rf result (format-error-line part))):tool-input (rf result (format-tool-call-line part)):tool-output (rf result (format-tool-result-line part))- :start (rf result (format-start-line part))+ :start (rf result (format-start-line+ (cond-> part+ external-id (assoc :messageId external-id)))):finish result ;; Don't emit here, we emit in completion arity:usage (do(vreset! usage (:usage part))diff --git a/src/metabase/metabot/tools.clj b/src/metabase/metabot/tools.cljindex fe6f75194c7..429288987f5 100644--- a/src/metabase/metabot/tools.clj+++ b/src/metabase/metabot/tools.clj@@ -88,6 +88,15 @@[tools.create-dashboard-subscriptionslackbot-create-dashboard-subscription-tool])+(def query-generation-tool-names+ "Tool names that produce a runnable query (SQL or notebook). Both the in-app+ and slackbot variants of `construct_notebook_query` register under the same+ `:tool-name`, so a single string covers both."+ #{"create_sql_query"+ "edit_sql_query"+ "replace_sql_query"+ "construct_notebook_query"})+(def ^:private state-dependent-tools"Set of tool names that require access to agent state."#{"analyze_chart"diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.cljindex 9ccf106ba5c..fb866baf558 100644--- a/src/metabase/models/resolution.clj+++ b/src/metabase/models/resolution.clj@@ -58,8 +58,10 @@:model/Measure metabase.measures.models.measure:model/Metabot metabase.metabot.models.metabot:model/MetabotConversation metabase.metabot.models.metabot-conversation+ :model/MetabotFeedback metabase.metabot.models.metabot-feedback:model/MetabotMessage metabase.metabot.models.metabot-message:model/AiUsageLog metabase.metabot.models.ai-usage-log+ :model/DataComplexityScore metabase-enterprise.data-complexity-score.models.data-complexity-score:model/MetabotGroupLimit metabase-enterprise.metabot.models.metabot-group-limit:model/MetabotInstanceLimit metabase-enterprise.metabot.models.metabot-instance-limit:model/MetabotPermissions metabase-enterprise.metabot.models.metabot-permissionsdiff --git a/src/metabase/premium_features/core.clj b/src/metabase/premium_features/core.cljindex 435cc1cf906..a556af228e9 100644--- a/src/metabase/premium_features/core.clj+++ b/src/metabase/premium_features/core.clj@@ -55,6 +55,7 @@enable-config-text-file?enable-content-translation?enable-content-verification?+ enable-data-complexity-score?enable-dashboard-subscription-filters?enable-database-auth-providers?enable-database-routing?diff --git a/src/metabase/premium_features/settings.clj b/src/metabase/premium_features/settings.cljindex a81a23d539e..e9443861082 100644--- a/src/metabase/premium_features/settings.clj+++ b/src/metabase/premium_features/settings.clj@@ -321,6 +321,10 @@"Should we offer users the Metabase-managed AI provider?":offer-metabase-ai-managed)+(define-premium-feature enable-data-complexity-score?+ "Should we expose Data Complexity Score?"+ :data-complexity-score)+(define-premium-feature enable-writable-connection?"Should we allow admins to configure separate write connection credentials?":writable-connection)@@ -341,6 +345,7 @@:config_text_file (enable-config-text-file?):content_translation (enable-content-translation?):content_verification (enable-content-verification?)+ :data-complexity-score (enable-data-complexity-score?):dashboard_subscription_filters (enable-dashboard-subscription-filters?):database_auth_providers (enable-database-auth-providers?):database_routing (enable-database-routing?)diff --git a/src/metabase/request/core.clj b/src/metabase/request/core.cljindex 1faadd9ce02..a1dec666280 100644--- a/src/metabase/request/core.clj+++ b/src/metabase/request/core.clj@@ -60,7 +60,8 @@embedded?geocode-ip-addresseshttps?- public?])+ public?+ referer])(defn enabled-session-timeout-seconds"Return the session timeout in seconds if the session-timeout-config premium feature is enabled and a timeout isdiff --git a/src/metabase/request/util.clj b/src/metabase/request/util.cljindex 6424bb8ab07..bfa0e3bbb0e 100644--- a/src/metabase/request/util.clj+++ b/src/metabase/request/util.clj@@ -65,6 +65,12 @@[request](some-> request (get-in [:headers "x-metabase-embedded"]) Boolean/parseBoolean))+(defn referer+ "The `Referer` header from a Ring `request`, or nil. Best-effort — browsers may strip it under+ `Referrer-Policy: no-referrer` or cross-origin restrictions."+ [request]+ (get-in request [:headers "referer"]))+(def DeviceInfo"Schema for the device info returned by `device-info`."[:map {:closed true}diff --git a/src/metabase/slackbot/api.clj b/src/metabase/slackbot/api.cljindex f516f02055a..371b6b50b4f 100644--- a/src/metabase/slackbot/api.clj+++ b/src/metabase/slackbot/api.clj@@ -61,6 +61,23 @@:metabot-slack-signing-secret nil})nil)+(defn conversation-permalink+ "Best-effort Slack permalink for a message in a conversation thread."+ [channel ts]+ (when (and channel+ ts+ (channel.settings/slack-configured?))+ (try+ (let [client {:token (channel.settings/unobfuscated-slack-app-token)}+ {:keys [ok permalink]} (slackbot.client/get-permalink client+ {:channel channel+ :ts ts})]+ (when ok+ permalink))+ (catch Exception e+ (log/warn e "Unable to fetch Slack permalink for metabot conversation")+ nil))))+;; ------------------------- VALIDATION ----------------------------------(defn- assert-valid-slack-req@@ -533,24 +550,34 @@{:order-by [[:created_at :asc]]})))(defn- build-base-feedback- "Build the common feedback payload fields."- [user-id conversation-id positive]+ "Build the common feedback payload fields.+ `:feedback.message_id` is the rated assistant message's `external_id` — the+ same identifier the web feedback endpoint uses — so Harbormaster can+ correlate Slack and web submissions on a single stable key. `:is_admin` and+ `:submitter_user_id` describe the user who submitted the feedback, not the+ conversation originator."+ [user-id conversation-id message-external-id positive]{:metabot_id (metabot.config/normalize-metabot-id "slackbotmetabotmetabo"):feedback {:positive positive- :message_id conversation-id+ :message_id message-external-id:freeform_feedback ""}:conversation_data {:messages (get-conversation-messages conversation-id)}:version config/mb-version-info:submission_time (str (java.time.OffsetDateTime/now))+ :submitter_user_id user-id:is_admin (boolean (t2/select-one-fn :is_superuser :model/User :id user-id)):source "slack"})(defn- handle-feedback-action"Handle a metabot feedback button click from Slack.Opens the detail modal immediately (trigger_id expires in 3s). Feedback is- submitted to Harbormaster only when the user submits the modal."+ submitted to Harbormaster only when the user submits the modal.+ `:message_external_id` in the button payload is the hardened identifier for+ the rated assistant message; `:channel_id` / `:message_ts` are kept in+ private_metadata as a fallback for buttons emitted before that plumbing+ shipped."[{:keys [action trigger-id slack-user-id channel-id message-ts]}]- (let [{:keys [conversation_id positive]} (json/decode (:value action) true)+ (let [{:keys [conversation_id positive message_external_id]} (json/decode (:value action) true)client {:token (channel.settings/unobfuscated-slack-app-token)}user-id (slack-id->user-id slack-user-id)](when user-id@@ -558,11 +585,12 @@(slackbot.client/open-viewclient{:trigger_id trigger-id- :view (feedback-modal-view positive {:conversation_id conversation_id- :positive positive- :user_id user-id- :channel_id channel-id- :message_ts message-ts})})+ :view (feedback-modal-view positive {:conversation_id conversation_id+ :positive positive+ :user_id user-id+ :channel_id channel-id+ :message_ts message-ts+ :message_external_id message_external_id})})(catch Exception e(log/errorf e "[slackbot] Error opening feedback modal: %s" (ex-data e)))))))@@ -583,23 +611,53 @@(log-ignored-delete-request (assoc authorization :source "action")))))+(defn- resolve-message-external-id+ "Resolve the rated `metabot_message.external_id` from the modal's+ `private_metadata`. Prefers `:message_external_id` (present when the button+ was emitted with the hardened payload); falls back to a+ `(channel_id, slack_msg_id)` reverse lookup for buttons issued before that+ change shipped."+ [{:keys [message_external_id channel_id message_ts]}]+ (or message_external_id+ (when (and channel_id message_ts)+ (t2/select-one-fn :external_id :model/MetabotMessage+ :channel_id channel_id+ :slack_msg_id message_ts))))+(defn- handle-feedback-modal-submission- "Handle submission of the feedback details modal. Submits detailed feedback to Harbormaster."+ "Handle submission of the feedback details modal.+ Persists the feedback locally under the Slack submitter's user binding (so+ the `can-read?` participation check in `metabot.feedback/persist-feedback!`+ runs against the real submitter), then — only on success — forwards to+ Harbormaster. If the local write throws (authorization rejection, missing+ message, DB error), the Harbormaster submission is skipped so lurkers and+ stale payloads cannot bypass the local authorization gate."[payload](let [private-metadata (json/decode (get-in payload [:view :private_metadata]) true){:keys [conversation_id positive user_id]} private-metadatavalues (get-in payload [:view :state :values])issue-type (get-in values [:issue_type :issue_type_select :selected_option :value])- freeform (get-in values [:freeform_feedback :freeform_input :value])]- (submit-async- (fn []- (try- (metabot.feedback/submit-to-harbormaster!- (cond-> (build-base-feedback user_id conversation_id positive)- true (assoc-in [:feedback :freeform_feedback] (or freeform ""))- issue-type (assoc-in [:feedback :issue_type] issue-type)))- (catch Exception e- (log/error e "[slackbot] Error submitting feedback to Harbormaster")))))))+ freeform (get-in values [:freeform_feedback :freeform_input :value])+ external-id (resolve-message-external-id private-metadata)]+ (if (nil? external-id)+ (log/warnf "[slackbot] Dropping feedback submission: no external_id resolvable (conversation_id=%s user_id=%s)"+ conversation_id user_id)+ (submit-async+ (fn []+ (try+ (request/with-current-user user_id+ (metabot.feedback/persist-feedback!+ {:message_id external-id+ :positive positive+ :issue_type issue-type+ :freeform_feedback freeform}))+ (metabot.feedback/submit-to-harbormaster!+ (cond-> (build-base-feedback user_id conversation_id external-id positive)+ true (assoc-in [:feedback :freeform_feedback] (or freeform ""))+ issue-type (assoc-in [:feedback :issue_type] issue-type)))+ (catch Exception e+ (log/warnf e "[slackbot] Feedback submission failed (external_id=%s user_id=%s); skipping Harbormaster"+ external-id user_id))))))))#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}(api.macros/defendpoint :post "/interactive"diff --git a/src/metabase/slackbot/channel.clj b/src/metabase/slackbot/channel.cljindex 32694e4bb01..e27fbdc7fb6 100644--- a/src/metabase/slackbot/channel.clj+++ b/src/metabase/slackbot/channel.clj@@ -54,7 +54,7 @@(defn send-channel-response"Send a visible threaded reply for non-DM Slack conversations.Accumulates AI text during streaming and posts the final response as a single message."- [client event extra-history {:keys [channel-id message-ctx channel thread-ts thread bot-user-id prompt conversation-id]}+ [client event extra-history {:keys [channel-id message-ctx channel thread-ts auth-info thread bot-user-id prompt conversation-id]}{:keys [tool-name->friendlymake-streaming-ai-request collect-viz-blocks feedback-blocks post-viz-error!make-viz-prefetch-callback cancel-prefetched-viz!]}]@@ -67,42 +67,44 @@stored-msg-id (atom nil)](set-status! "Thinking...")(try- (make-streaming-ai-request- conversation-id- prompt- thread- bot-user-id- channel-id- extra-history- {:on-text on-text- :on-tool-start on-tool-start- :on-tool-end nil- :on-data on-data- :req-slack-msg-id (:ts event)- :get-res-slack-msg-id nil- :request-prompt (channel-request-prompt prompt)- :stored-msg-id stored-msg-id})- (when (seq @prefetched-viz)- (set-status! "Rendering results..."))- (let [{:keys [blocks errors]} (collect-viz-blocks @prefetched-viz)- answer-text (str/trim @current-text)- final-text (if (or (seq answer-text) (seq blocks))- answer-text- "I wasn't able to generate a response. Please try again.")- final-blocks (into (into (final-text-blocks final-text) blocks)- (feedback-blocks conversation-id))- res (slackbot.client/post-thread-reply client {:channel channel :thread_ts thread-ts}- final-text :blocks final-blocks)]- (when-let [res-ts (:ts res)]- (metabot.persistence/set-response-slack-msg-id! @stored-msg-id res-ts))- (when-not (:ok res)- (log/errorf "[slackbot] channel post-message failed: %s (block_count=%d block_types=%s response_messages=%s)"- (:error res)- (count (or final-blocks []))- (pr-str (when final-blocks (mapv :type final-blocks)))- (pr-str (get-in res [:response_metadata :messages]))))- (doseq [e errors]- (post-viz-error! client channel thread-ts e)))+ (let [message-external-id (make-streaming-ai-request+ conversation-id+ prompt+ thread+ bot-user-id+ channel-id+ extra-history+ {:on-text on-text+ :on-tool-start on-tool-start+ :on-tool-end nil+ :on-data on-data+ :team-id (:team_id auth-info)+ :thread-ts thread-ts+ :req-slack-msg-id (:ts event)+ :get-res-slack-msg-id nil+ :request-prompt (channel-request-prompt prompt)+ :stored-msg-id stored-msg-id})]+ (when (seq @prefetched-viz)+ (set-status! "Rendering results..."))+ (let [{:keys [blocks errors]} (collect-viz-blocks @prefetched-viz)+ answer-text (str/trim @current-text)+ final-text (if (or (seq answer-text) (seq blocks))+ answer-text+ "I wasn't able to generate a response. Please try again.")+ final-blocks (into (into (final-text-blocks final-text) blocks)+ (feedback-blocks conversation-id message-external-id))+ res (slackbot.client/post-thread-reply client {:channel channel :thread_ts thread-ts}+ final-text :blocks final-blocks)]+ (when-let [res-ts (:ts res)]+ (metabot.persistence/set-response-slack-msg-id! @stored-msg-id res-ts))+ (when-not (:ok res)+ (log/errorf "[slackbot] channel post-message failed: %s (block_count=%d block_types=%s response_messages=%s)"+ (:error res)+ (count (or final-blocks []))+ (pr-str (when final-blocks (mapv :type final-blocks)))+ (pr-str (get-in res [:response_metadata :messages]))))+ (doseq [e errors]+ (post-viz-error! client channel thread-ts e))))(catch Exception e(cancel-prefetched-viz! prefetched-viz)(log/error e "[slackbot] Error in channel response")diff --git a/src/metabase/slackbot/client.clj b/src/metabase/slackbot/client.cljindex e0a742f886c..af9b0aff501 100644--- a/src/metabase/slackbot/client.clj+++ b/src/metabase/slackbot/client.clj@@ -156,6 +156,13 @@:inclusive true}))](first messages)))+(defn get-permalink+ "Fetch a stable Slack permalink for a message."+ [client {:keys [channel ts]}]+ (:body (slack-get client "/chat.getPermalink"+ {:channel channel+ :message_ts ts})))+(defn delete-message"Remove a Slack message"[client message]diff --git a/src/metabase/slackbot/persistence.clj b/src/metabase/slackbot/persistence.cljindex 1514a80d5b7..050ed45b7a3 100644--- a/src/metabase/slackbot/persistence.clj+++ b/src/metabase/slackbot/persistence.clj@@ -5,22 +5,50 @@(set! *warn-on-reflection* true)-(def ^:private history-message-types- "Message types to include in history sent to ai-service."+(def ^:private legacy-history-block-types+ "Legacy AI-SDK-message `:_type` values that carry tool history."#{"TOOL_CALL" "TOOL_RESULT"})-(defn- normalize-history-message- "Keep only ai-service schema fields, keywordize role."- [msg]- (-> (select-keys msg [:role :content :tool_calls :tool_call_id])+(defn- legacy-block->history-message+ "Legacy AI-SDK-message block: keep history-relevant fields, keywordize role."+ [block]+ (-> (select-keys block [:role :content :tool_calls :tool_call_id])(update :role keyword)))+(defn- native-tool-input->history-message+ "Native `tool-input` block → AI-SDK-message with a single `:tool_calls` entry."+ [block]+ {:role :assistant+ :tool_calls [{:id (:id block)+ :name (:function block)+ :arguments (:arguments block)}]})++(defn- native-tool-output->history-message+ "Native `tool-output` block → AI-SDK `tool` message. Only the `:output`+ string is needed for history replay."+ [block]+ {:role :tool+ :tool_call_id (:id block)+ :content (get-in block [:result :output])})++(defn- block->history-message+ "Dispatch a single stored `:data` block to an AI-SDK-message map, or nil to+ skip. Handles both legacy slackbot blocks (`:_type \"TOOL_CALL\"` /+ `\"TOOL_RESULT\"`) and native agent-loop blocks (`:type \"tool-input\"` /+ `\"tool-output\"`). Text blocks are skipped — assistant text still comes+ from Slack's copy of the thread."+ [block]+ (cond+ (legacy-history-block-types (:_type block)) (legacy-block->history-message block)+ (= "tool-input" (:type block)) (native-tool-input->history-message block)+ (= "tool-output" (:type block)) (native-tool-output->history-message block)+ :else nil))+(defn- extract-history-messages- "Filter and normalize stored message data for history."+ "Walk `(:data message)` in insertion order and emit AI-SDK-message maps for+ history replay. Preserves adjacency of tool calls and their tool results."[message]- (->> (:data message)- (filter #(history-message-types (:_type %)))- (mapv normalize-history-message)))+ (into [] (keep block->history-message) (:data message)))(defn message-history"Tool call history for Slack messages. Returns {slack-msg-id -> [messages...]}."diff --git a/src/metabase/slackbot/streaming.clj b/src/metabase/slackbot/streaming.cljindex ae00a073e79..b4f85106835 100644--- a/src/metabase/slackbot/streaming.clj+++ b/src/metabase/slackbot/streaming.clj@@ -11,10 +11,8 @@[metabase.metabot.core :as metabot][metabase.metabot.envelope :as metabot.envelope][metabase.metabot.persistence :as metabot.persistence]- [metabase.metabot.self.core :as self.core][metabase.metabot.settings :as metabot.settings][metabase.metabot.usage :as metabot.usage]- [metabase.metabot.util :as metabot.u][metabase.permissions.core :as perms][metabase.slackbot.channel :as slackbot.channel][metabase.slackbot.client :as slackbot.client]@@ -168,11 +166,30 @@- on-tool-end: Called with {:id :result} when a tool completes- on-data: Called with (index, {:type data-type :value data}) for each data part- req-slack-msg-id: The Slack message ts for the user's incoming message- - get-res-slack-msg-id: Function that returns the Slack message ts for the bot's response"+ - get-res-slack-msg-id: Function that returns the Slack message ts for the bot's response++ Returns the `external-id` stamped on the assistant `metabot_message` row so+ callers can encode it into feedback button payloads for direct resolution+ without relying on a (channel, slack_msg_id) lookup."[conversation-id prompt thread bot-user-id channel-id extra-history- {:keys [on-text on-tool-start on-tool-end on-data req-slack-msg-id get-res-slack-msg-id request-prompt stored-msg-id]}]- (let [data-idx (volatile! -1)- message (metabot.envelope/user-message prompt)+ {:keys [on-text on-tool-start on-tool-end on-data req-slack-msg-id get-res-slack-msg-id+ request-prompt stored-msg-id team-id thread-ts]}]+ (let [message (metabot.envelope/user-message prompt)+ ai-proxy? (metabot/metabase-provider? (metabot.settings/llm-metabot-provider))+ ;; Generated up front so it can be baked into feedback button payloads+ ;; at the same time the assistant message is persisted.+ external-id (str (random-uuid))+ ;; Persist the user message before setup so failed conversations are captured.+ ;; `:user-id` stamps the author on the message row so participation-based+ ;; conversation read permissions work for multi-user Slack threads.+ _ (metabot.persistence/store-message! conversation-id "slackbot" [message]+ :channel-id channel-id+ :slack-team-id team-id+ :slack-thread-ts thread-ts+ :slack-msg-id req-slack-msg-id+ :user-id api/*current-user-id*+ :ai-proxy? ai-proxy?)+ data-idx (volatile! -1)request-message (metabot.envelope/user-message (or request-prompt prompt))capabilities (compute-capabilities)thread-history (thread->history thread bot-user-id conversation-id)@@ -182,10 +199,6 @@:capabilities capabilities:slack_channel_id channel-id})messages (conj (vec history) request-message)- _ (metabot.persistence/store-message! conversation-id "slackbot" [message]- :channel-id channel-id- :slack-msg-id req-slack-msg-id- :ai-proxy? (metabot/metabase-provider? (metabot.settings/llm-metabot-provider)))parts-atom (atom [])dispatch-xf (comp(u/tee-xf parts-atom)@@ -217,23 +230,34 @@nil)nil)))]- (transduce dispatch-xf (constantly nil) nil- (agent/run-agent-loop- {:messages messages- :state {}- :profile-id :slackbot- :context context}))- (let [parts @parts-atom- lines (into [] (self.core/aisdk-line-xf) parts)- pk (metabot.persistence/store-message!- conversation-id "slackbot"- (metabot.u/aisdk->messages :assistant lines)- :channel-id channel-id- :slack-msg-id (when get-res-slack-msg-id (get-res-slack-msg-id))- :user-id api/*current-user-id*- :ai-proxy? (metabot/metabase-provider? (metabot.settings/llm-metabot-provider)))]- (when stored-msg-id- (reset! stored-msg-id pk)))))+ (try+ (transduce dispatch-xf (constantly nil) nil+ (agent/run-agent-loop+ {:messages messages+ :state {}+ :profile-id :slackbot+ :context context+ :tracking-opts {:source "slackbot"+ :session-id conversation-id}}))+ (finally+ ;; Persist whatever parts we collected, even if the pipeline threw.+ ;; Stores raw native parts (not the lossy AI-SDK-message round-trip) so+ ;; tool-output :structured-output survives for analytics extraction.+ (let [parts @parts-atom]+ (when (seq parts)+ (let [pk (metabot.persistence/store-native-parts!+ conversation-id "slackbot"+ (into [] (metabot.persistence/combine-text-parts-xf) parts)+ :channel-id channel-id+ :slack-team-id team-id+ :slack-thread-ts thread-ts+ :slack-msg-id (when get-res-slack-msg-id (get-res-slack-msg-id))+ :user-id api/*current-user-id*+ :external-id external-id+ :ai-proxy? ai-proxy?)]+ (when stored-msg-id+ (reset! stored-msg-id pk)))))))+ external-id))(def ^:private viz-data-types"DATA part types that represent visualizations."@@ -469,15 +493,25 @@(str (java.util.UUID/nameUUIDFromBytes(.getBytes (str "slack:" team-id ":" channel ":" thread-ts)))))-(defn- feedback-blocks [conversation-id]+(defn- feedback-blocks+ "Build the feedback-button block appended to the final assistant reply.+ `message-external-id` lets the modal handler resolve the rated+ `metabot_message` row directly, without a `(channel, slack_msg_id)` reverse+ lookup. Nil is tolerated for safety (e.g. callers racing persistence) but+ the modal handler will then have to fall back to the slack_msg_id path."+ [conversation-id message-external-id][{:type "context_actions":block_id "metabot_feedback":elements [{:type "feedback_buttons":action_id "metabot_feedback":positive_button {:text {:type "plain_text" :text "Good"}- :value (json/encode {:conversation_id conversation-id :positive true})}+ :value (json/encode {:conversation_id conversation-id+ :message_external_id message-external-id+ :positive true})}:negative_button {:text {:type "plain_text" :text "Bad"}- :value (json/encode {:conversation_id conversation-id :positive false})}}]}])+ :value (json/encode {:conversation_id conversation-id+ :message_external_id message-external-id+ :positive false})}}]}])(defn- free-limit-error-message[e]@@ -522,19 +556,21 @@(try;; Start stream early so assistant persistence has :slack_msg_id.(request-flush! true)- (let [_data-parts (make-streaming-ai-request- conversation-id- prompt- thread- bot-user-id- channel-id- extra-history- {:on-text on-text- :on-tool-start on-tool-start- :on-tool-end on-tool-end- :on-data on-data- :req-slack-msg-id (:ts event)- :get-res-slack-msg-id (fn [] (:stream_ts @stream-state))})]+ (let [message-external-id (make-streaming-ai-request+ conversation-id+ prompt+ thread+ bot-user-id+ channel-id+ extra-history+ {:on-text on-text+ :on-tool-start on-tool-start+ :on-tool-end on-tool-end+ :on-data on-data+ :team-id (:team_id auth-info)+ :thread-ts thread-ts+ :req-slack-msg-id (:ts event)+ :get-res-slack-msg-id (fn [] (:stream_ts @stream-state))})](request-flush! true)(when-not (await-for slack-writer-await-timeout-ms slack-writer)(log/warn "[slackbot] Timed out waiting for slack-writer agent to flush"))@@ -542,7 +578,7 @@;; Hold stop-stream until all viz futures finish so text + viz + controls;; finalize as a single message.(let [{:keys [blocks errors]} (collect-viz-blocks @prefetched-viz)- final-blocks (into blocks (feedback-blocks conversation-id))+ final-blocks (into blocks (feedback-blocks conversation-id message-external-id))stop-result (slackbot.client/stop-stream client channel stream_ts final-blocks)](log/debugf "[slackbot] stop-stream finalize attempt channel=%s thread_ts=%s stream_ts=%s block_count=%d block_types=%s"channel thread-ts stream_ts (count final-blocks) (pr-str (mapv :type final-blocks)))diff --git a/src/metabase/testing_api/api.clj b/src/metabase/testing_api/api.cljindex c3cc41c7b96..86ddae83b48 100644--- a/src/metabase/testing_api/api.clj+++ b/src/metabase/testing_api/api.clj@@ -15,6 +15,7 @@[metabase.lib.schema :as lib.schema][metabase.lib.schema.id :as lib.schema.id][metabase.lib.schema.test-spec :as lib.schema.test-spec]+ [metabase.permissions.core :as perms][metabase.premium-features.core :refer [defenterprise]][metabase.search.core :as search][metabase.search.ingestion :as search.ingestion]@@ -303,6 +304,200 @@(def ^:private e2e-usage-source "e2e-test")+(def ^:private e2e-usage-auditing-group-name "E2E Usage Auditing")++(def ^:private e2e-usage-auditing-conversation-ids+ ["00000000-0000-0000-0000-000000000101"+ "00000000-0000-0000-0000-000000000102"+ "00000000-0000-0000-0000-000000000103"+ "00000000-0000-0000-0000-000000000104"+ "00000000-0000-0000-0000-000000000105"+ "00000000-0000-0000-0000-000000000106"+ "00000000-0000-0000-0000-000000000107"+ "00000000-0000-0000-0000-000000000108"+ "00000000-0000-0000-0000-000000000109"+ "00000000-0000-0000-0000-000000000110"+ "00000000-0000-0000-0000-000000000111"])++(defn- e2e-usage-auditing-group-id!+ []+ (or (t2/select-one-pk :model/PermissionsGroup :name e2e-usage-auditing-group-name)+ (t2/insert-returning-pk! :model/PermissionsGroup {:name e2e-usage-auditing-group-name})))++(defn- ensure-seeded-usage-auditing-group-membership!+ [user-id]+ (let [group-id (e2e-usage-auditing-group-id!)]+ (when-not (t2/exists? :model/PermissionsGroupMembership :user_id user-id :group_id group-id)+ (perms/add-user-to-group! user-id group-id))))++(defn- delete-seeded-usage-auditing-data!+ []+ (t2/delete! :model/AiUsageLog {:where [:in :conversation_id e2e-usage-auditing-conversation-ids]})+ (t2/delete! :model/MetabotMessage {:where [:in :conversation_id e2e-usage-auditing-conversation-ids]})+ (t2/delete! :model/MetabotConversation {:where [:in :id e2e-usage-auditing-conversation-ids]}))++(defn- insert-seeded-usage-auditing-conversation!+ [{:keys [id user-id created-at source profile-id prompt-tokens completion-tokens total-tokens roles ip-address tenant-id]}]+ (t2/insert! :model/MetabotConversation+ {:id id+ :user_id user-id+ :summary "E2E usage auditing conversation"+ :created_at created-at+ :ip_address ip-address})+ (doseq [role roles]+ (t2/insert! :model/MetabotMessage+ {:conversation_id id+ :user_id user-id+ :role role+ :profile_id profile-id+ :data []+ :total_tokens 0+ :created_at created-at}))+ (t2/insert! :model/AiUsageLog+ (cond-> {:source source+ :model "anthropic/claude-sonnet-4-6"+ :conversation_id id+ :user_id user-id+ :prompt_tokens prompt-tokens+ :completion_tokens completion-tokens+ :total_tokens total-tokens+ :created_at created-at}+ tenant-id (assoc :tenant_id tenant-id))))++(defn- seed-usage-auditing-data!+ ([user-id second-user-id]+ (seed-usage-auditing-data! user-id second-user-id nil nil))+ ([user-id second-user-id tenant-id second-tenant-id]+ (let [today (t/offset-date-time (t/zone-offset "+00"))+ yesterday (t/minus today (t/days 1))+ two-days (t/minus today (t/days 2))+ previous-week (t/minus today (t/days 8))+ previous-month (t/minus today (t/days 45))+ out-of-bounds (t/minus today (t/days 395))]+ (ensure-seeded-usage-auditing-group-membership! user-id)+ (ensure-seeded-usage-auditing-group-membership! second-user-id)+ (when tenant-id+ (t2/update! :model/User user-id {:tenant_id tenant-id}))+ (when second-tenant-id+ (t2/update! :model/User second-user-id {:tenant_id second-tenant-id}))+ (delete-seeded-usage-auditing-data!)+ (doseq [conversation [{:id (nth e2e-usage-auditing-conversation-ids 0)+ :user-id user-id+ :created-at (t/minus today (t/hours 2))+ :source "metabot_agent"+ :profile-id "nlq"+ :prompt-tokens 100+ :completion-tokens 50+ :total-tokens 150+ :roles ["user" "assistant"]+ :ip-address "10.0.0.1"}+ {:id (nth e2e-usage-auditing-conversation-ids 1)+ :user-id user-id+ :created-at (t/minus two-days (t/hours 1))+ :source "slackbot"+ :profile-id "internal"+ :prompt-tokens 200+ :completion-tokens 100+ :total-tokens 300+ :roles ["user" "user" "assistant"]+ :ip-address "10.0.0.2"}+ {:id (nth e2e-usage-auditing-conversation-ids 2)+ :user-id second-user-id+ :created-at yesterday+ :source "sql-gen"+ :profile-id "sql"+ :prompt-tokens 300+ :completion-tokens 150+ :total-tokens 450+ :roles ["user" "assistant"]+ :ip-address "10.0.0.3"}+ {:id (nth e2e-usage-auditing-conversation-ids 3)+ :user-id second-user-id+ :created-at (t/minus yesterday (t/hours 2))+ :source "document_generate_content"+ :profile-id "document-generate-content"+ :prompt-tokens 400+ :completion-tokens 200+ :total-tokens 600+ :roles ["user" "assistant" "assistant"]+ :ip-address "10.0.0.4"}+ {:id (nth e2e-usage-auditing-conversation-ids 4)+ :user-id user-id+ :created-at two-days+ :source "metabot_agent"+ :profile-id "nlq"+ :prompt-tokens 500+ :completion-tokens 250+ :total-tokens 750+ :roles ["user" "assistant"]+ :ip-address "10.0.0.1"}+ {:id (nth e2e-usage-auditing-conversation-ids 5)+ :user-id second-user-id+ :created-at (t/minus two-days (t/hours 3))+ :source "sql-gen"+ :profile-id "embedding_next"+ :prompt-tokens 600+ :completion-tokens 300+ :total-tokens 900+ :roles ["user" "assistant"]+ :ip-address "10.0.0.5"}+ {:id (nth e2e-usage-auditing-conversation-ids 6)+ :user-id user-id+ :created-at (t/minus today (t/minutes 30))+ :source "slackbot"+ :profile-id "slackbot"+ :prompt-tokens 700+ :completion-tokens 350+ :total-tokens 1050+ :roles ["user" "assistant"]+ :ip-address "10.0.0.6"}+ {:id (nth e2e-usage-auditing-conversation-ids 7)+ :user-id user-id+ :created-at (t/minus today (t/minutes 15))+ :source "metabot_agent"+ :profile-id "transforms_codegen"+ :prompt-tokens 800+ :completion-tokens 400+ :total-tokens 1200+ :roles ["user" "assistant"]+ :ip-address "10.0.0.7"}+ {:id (nth e2e-usage-auditing-conversation-ids 8)+ :user-id second-user-id+ :created-at previous-month+ :source "sql-gen"+ :profile-id "sql"+ :prompt-tokens 900+ :completion-tokens 450+ :total-tokens 1350+ :roles ["user" "assistant"]+ :ip-address "10.0.0.8"}+ {:id (nth e2e-usage-auditing-conversation-ids 9)+ :user-id user-id+ :created-at out-of-bounds+ :source "metabot_agent"+ :profile-id "internal"+ :prompt-tokens 1000+ :completion-tokens 500+ :total-tokens 1500+ :roles ["user" "assistant"]+ :ip-address "10.0.0.99"}+ {:id (nth e2e-usage-auditing-conversation-ids 10)+ :user-id user-id+ :created-at previous-week+ :source "metabot_agent"+ :profile-id "nlq"+ :prompt-tokens 110+ :completion-tokens 55+ :total-tokens 165+ :roles ["user" "assistant"]+ :ip-address "10.0.0.1"}]]+ (insert-seeded-usage-auditing-conversation!+ (cond-> conversation+ (= (:user-id conversation) user-id) (assoc :tenant-id tenant-id)+ (= (:user-id conversation) second-user-id) (assoc :tenant-id second-tenant-id))))+ {:inserted (count e2e-usage-auditing-conversation-ids)+ :date (str (t/local-date today))})))+(api.macros/defendpoint :post "/metabot/seed-ai-usage":- [:map [:inserted :int]]"Insert `count` rows into `ai_usage_log` for the given `user_id`, then clear the metabot limit@@ -334,3 +529,17 @@(let [deleted (t2/delete! :model/AiUsageLog :user_id user_id :source e2e-usage-source)](clear-metabot-limit-cache!){:deleted deleted}))++(api.macros/defendpoint :post "/metabot/seed-usage-auditing"+ :- [:map+ [:inserted :int]+ [:date ms/NonBlankString]]+ "Seed deterministic Metabot conversation, message, and token usage rows for the usage auditing E2E charts."+ [_route-params+ _query-params+ {:keys [user_id second_user_id tenant_id second_tenant_id]} :- [:map+ [:user_id ms/PositiveInt]+ [:second_user_id ms/PositiveInt]+ [:tenant_id {:optional true} [:maybe ms/PositiveInt]]+ [:second_tenant_id {:optional true} [:maybe ms/PositiveInt]]]]+ (seed-usage-auditing-data! user_id second_user_id tenant_id second_tenant_id))diff --git a/test/metabase/analytics/stats_test.clj b/test/metabase/analytics/stats_test.cljindex a135f5ca90d..861670b7099 100644--- a/test/metabase/analytics/stats_test.clj+++ b/test/metabase/analytics/stats_test.clj@@ -558,6 +558,7 @@or to this set, so that [[every-feature-is-accounted-for-test]] passes."#{:audit-app ;; tracked under :mb-analytics:collection-cleanup+ :data-complexity-score:development-mode:library:embeddingdiff --git a/test/metabase/api/common_test.clj b/test/metabase/api/common_test.cljindex 0267b6bf05e..934c4ada1ff 100644--- a/test/metabase/api/common_test.clj+++ b/test/metabase/api/common_test.clj@@ -9,6 +9,7 @@[metabase.server.middleware.misc :as mw.misc][metabase.server.middleware.security :as mw.security][metabase.test :as mt]+ [metabase.util.i18n :refer [tru]][methodical.core :as methodical])(:import (clojure.lang ExceptionInfo)))@@ -61,6 +62,13 @@(-> (my-mock-api-fn)(update-in [:headers "Last-Modified"] string?)))))+ (testing "check-404 can return a custom message"+ (is (= (assoc (four-oh-four) :body "Custom not found.")+ (-> (mock-api-fn+ (fn [_]+ (api/check-404 nil (tru "Custom not found."))))+ (update-in [:headers "Last-Modified"] string?)))))+(testing "let-404 should return nil if test fails"(is (= (four-oh-four)(-> (mock-api-fndiff --git a/test/metabase/cmd/copy_test.clj b/test/metabase/cmd/copy_test.cljindex ac5ab0bbd29..a5e0d2cba94 100644--- a/test/metabase/cmd/copy_test.clj+++ b/test/metabase/cmd/copy_test.clj@@ -34,11 +34,14 @@:model/CloudMigration:model/ContentTranslation:model/DashboardFavorite+ :model/DataComplexityScore:model/DatabaseRouter:model/Dependency:model/DependencyStatus+ :model/MetabotConversation:model/MetabotGroupLimit:model/MetabotInstanceLimit+ :model/MetabotMessage:model/MetabotPermissions:model/PythonLibrary:model/PremiumFeaturesCachediff --git a/test/metabase/metabot/agent/core_test.clj b/test/metabase/metabot/agent/core_test.cljindex 7e0a49018db..5448b90b513 100644--- a/test/metabase/metabot/agent/core_test.clj+++ b/test/metabase/metabot/agent/core_test.clj@@ -7,7 +7,7 @@[metabase.lib.test-metadata :as meta][metabase.metabot.agent.core :as agent][metabase.metabot.agent.memory :as memory]- [metabase.metabot.api :as api]+ [metabase.metabot.persistence :as metabot.persistence][metabase.metabot.self :as self][metabase.metabot.self.openrouter :as openrouter][metabase.metabot.test-util :as mut]@@ -333,7 +333,7 @@:data {:queries map?:charts map?}}](mt/with-log-level [metabase.metabot.agent.core :warn]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)(agent/run-agent-loop{:messages [{:role :user:content "Show me the first 10 orders"}]@@ -434,7 +434,7 @@(is (=? [{:type :text :text "Hello after retry"}{:type :data :data-type "state"}](mt/with-log-level [metabase.metabot.self :fatal]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)(agent/run-agent-loop{:messages [{:role :user :content "Hi"}]:state {}diff --git a/test/metabase/metabot/agent/streaming_test.clj b/test/metabase/metabot/agent/streaming_test.cljindex 93582caeb2f..5d7f0ade91e 100644--- a/test/metabase/metabot/agent/streaming_test.clj+++ b/test/metabase/metabot/agent/streaming_test.clj@@ -168,6 +168,13 @@(is (= "adhoc_viz" streaming/adhoc-viz-type))(is (= "static_viz" streaming/static-viz-type))))+(deftest persistable-data-part?-test+ (testing "state parts are not persisted (value lives on MetabotConversation.state)"+ (is (false? (streaming/persistable-data-part? (streaming/state-part {:queries {}})))))+ (testing "other parts are persisted"+ (is (true? (streaming/persistable-data-part? (streaming/navigate-to-part "/question/1"))))+ (is (true? (streaming/persistable-data-part? {:type :text :text "hi"})))))+;;; Transducer Tests(deftest expand-reactions-xf-testdiff --git a/test/metabase/metabot/api/conversations_test.clj b/test/metabase/metabot/api/conversations_test.cljnew file mode 100644index 00000000000..a6ad3bf6351--- /dev/null+++ b/test/metabase/metabot/api/conversations_test.clj@@ -0,0 +1,151 @@+(ns metabase.metabot.api.conversations-test+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.api.common :as api]+ [metabase.metabot.api :as metabot.api]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(deftest list-conversations-authentication-test+ (testing "GET /api/metabot/conversations requires auth"+ (is (= "Unauthenticated"+ (mt/client :get 401 "metabot/conversations")))))++(deftest list-conversations-returns-only-conversations-user-participated-in-test+ (testing "GET /api/metabot/conversations returns only conversations the caller participated in"+ (let [rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)]+ (mt/with-temp [:model/MetabotConversation {rasta-convo :id} {:user_id rasta-id :summary "rasta's"}+ :model/MetabotConversation {lucky-convo :id} {:user_id lucky-id :summary "lucky's"}+ :model/MetabotMessage _ {:conversation_id rasta-convo :user_id rasta-id}+ :model/MetabotMessage _ {:conversation_id lucky-convo :user_id lucky-id}]+ (let [response (mt/user-http-request :rasta :get 200 "metabot/conversations")+ ids (set (map :conversation_id (:data response)))]+ (is (contains? ids rasta-convo))+ (is (not (contains? ids lucky-convo))))))))++(deftest list-conversations-includes-legacy-originator-conversations-test+ (testing "GET /api/metabot/conversations keeps legacy originator conversations visible"+ (let [user-id (mt/user->id :rasta)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id user-id :summary "legacy"}+ ;; No :user_id on the message — simulates a legacy row from before user_id stamping.+ :model/MetabotMessage _ {:conversation_id convo-id+ :data [{:role "assistant" :content "hello from before user_id stamping"}]}]+ (let [ids (set (map :conversation_id+ (:data (mt/user-http-request :rasta :get 200 "metabot/conversations"))))]+ (is (contains? ids convo-id)))))))++(deftest list-conversations-includes-shared-multi-user-conversations-test+ (testing "GET /api/metabot/conversations includes conversations with multiple participants for each participant"+ (let [rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id rasta-id :summary "shared"}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id rasta-id}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id lucky-id}]+ (testing "originator sees it"+ (let [ids (set (map :conversation_id+ (:data (mt/user-http-request :rasta :get 200 "metabot/conversations"))))]+ (is (contains? ids convo-id))))+ (testing "non-originator participant sees it too"+ (let [ids (set (map :conversation_id+ (:data (mt/user-http-request :lucky :get 200 "metabot/conversations"))))]+ (is (contains? ids convo-id))))))))++(deftest list-conversations-includes-message-count-test+ (testing "GET /api/metabot/conversations returns message_count"+ (let [user-id (mt/user->id :rasta)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id user-id :summary "hi"}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id user-id :role "user"}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id user-id :role "assistant"}]+ (let [response (mt/user-http-request :rasta :get 200 "metabot/conversations")+ found (first (filter #(= convo-id (:conversation_id %)) (:data response)))]+ (is (some? found))+ (is (= 2 (:message_count found))))))))++(deftest get-conversation-participant-can-read-test+ (testing "GET /api/metabot/conversations/:id returns the conversation to any participant"+ (let [user-id (mt/user->id :rasta)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id user-id :summary "mine"}+ :model/MetabotMessage _ {:conversation_id convo-id+ :user_id user-id+ :role "user"+ :data [{:role "user" :content "hello"}]}]+ (let [response (mt/user-http-request :rasta :get 200+ (str "metabot/conversations/" convo-id))]+ (is (= convo-id (:conversation_id response)))+ (is (= "mine" (:summary response)))+ (is (= user-id (:user_id response)))+ (is (= 1 (count (:chat_messages response)))))))))++(deftest get-conversation-second-participant-can-read-test+ (testing "GET /api/metabot/conversations/:id is readable by any participant, not just the originator"+ (let [originator-id (mt/user->id :rasta)+ other-id (mt/user->id :lucky)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id originator-id :summary "shared"}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id originator-id}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id other-id}]+ (let [response (mt/user-http-request :lucky :get 200+ (str "metabot/conversations/" convo-id))]+ (is (= convo-id (:conversation_id response)))+ (is (= originator-id (:user_id response))))))))++(deftest get-conversation-superuser-can-read-test+ (testing "GET /api/metabot/conversations/:id is accessible to superusers even if they don't participate"+ (let [owner-id (mt/user->id :rasta)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id owner-id :summary "rasta's"}]+ (let [response (mt/user-http-request :crowberto :get 200+ (str "metabot/conversations/" convo-id))]+ (is (= convo-id (:conversation_id response)))+ (is (= owner-id (:user_id response))))))))++(deftest get-conversation-non-participant-forbidden-test+ (testing "GET /api/metabot/conversations/:id returns 403 for a non-participant non-admin"+ (let [owner-id (mt/user->id :rasta)]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id owner-id}+ :model/MetabotMessage _ {:conversation_id convo-id :user_id owner-id}]+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :lucky :get 403 (str "metabot/conversations/" convo-id))))))))++(deftest get-conversation-404-test+ (testing "GET /api/metabot/conversations/:id returns 404 when the conversation does not exist"+ (is (= "Not found."+ (mt/user-http-request :rasta :get 404+ (str "metabot/conversations/" (random-uuid)))))))++(deftest check-conversation-access-test+ (testing "check-conversation-access!"+ (let [owner-id (mt/user->id :rasta)+ other-id (mt/user->id :lucky)+ check! @#'metabot.api/check-conversation-access!]+ (mt/with-temp [:model/MetabotConversation {convo-id :id} {:user_id owner-id}]+ (testing "allows the originator to continue a legacy conversation with no stamped message authors"+ (binding [api/*current-user-id* owner-id]+ (is (some? (check! convo-id)))))+ (testing "throws 403 when a non-participant tries to continue the conversation"+ (binding [api/*current-user-id* other-id]+ (is (thrown-with-msg? Exception #"permissions"+ (check! convo-id)))))+ (testing "allows any user to start a brand-new conversation (no row yet)"+ (binding [api/*current-user-id* other-id]+ (is (nil? (check! (str (random-uuid)))))))))))++(deftest originator-not-overwritten-by-second-writer-test+ (testing "metabot_conversation.user_id is set once on insert and never overwritten"+ (let [owner-id (mt/user->id :rasta)+ other-id (mt/user->id :lucky)+ convo-id (str (random-uuid))+ msg {:role "user" :content "hello"}]+ (try+ (binding [api/*current-user-id* owner-id]+ (#'metabot.persistence/store-message! convo-id "slackbot" [msg] :user-id owner-id))+ (binding [api/*current-user-id* other-id]+ (#'metabot.persistence/store-message! convo-id "slackbot" [msg] :user-id other-id))+ (is (= owner-id+ (:user_id (t2/select-one :model/MetabotConversation :id convo-id)))+ "originator user_id must not be overwritten when a second user writes to the same conversation")+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id convo-id)+ (t2/delete! :model/MetabotConversation :id convo-id))))))diff --git a/test/metabase/metabot/api_test.clj b/test/metabase/metabot/api_test.cljindex 4a8227c4a29..e55d0e3f539 100644--- a/test/metabase/metabot/api_test.clj+++ b/test/metabase/metabot/api_test.clj@@ -15,6 +15,7 @@[metabase.metabot.api :as api][metabase.metabot.config :as metabot.config][metabase.metabot.context :as metabot.context]+ [metabase.metabot.persistence :as metabot.persistence][metabase.metabot.scope :as scope][metabase.metabot.self :as metabot.self][metabase.metabot.self.openrouter :as openrouter]@@ -160,7 +161,7 @@http/post (fn [url opts](real-http-post url (assoc opts :decompress-body false)))metabot.context/create-context identity- api/store-native-parts! (fn [_conv-id _prof-id parts]+ metabot.persistence/store-native-parts! (fn [_conv-id _prof-id parts & _kwargs](reset! stored-parts parts))sr/async-cancellation-poll-interval-ms 5](testing "Closing stream body will drop connection to LLM"@@ -553,7 +554,9 @@(testing "/feedback"(is (= "Unauthenticated"(mt/client :post 401 "metabot/feedback"- {:feedback {}}))))))+ {:metabot_id 1+ :message_id "x"+ :positive true}))))))(deftest metabot-enabled-setting-test(mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider]@@ -617,7 +620,7 @@(deftest extract-usage-test(testing "takes last cumulative usage per model"(is (= {"gpt-4" {:prompt 250 :completion 50}}- (#'api/extract-usage+ (metabot.persistence/extract-usage[{:type :text :text "hi"}{:type :usage :usage {:promptTokens 100 :completionTokens 20} :model "gpt-4"}{:type :tool-input :id "t1"}@@ -627,27 +630,27 @@(testing "handles multiple models independently"(is (= {"model-a" {:prompt 100 :completion 20}"model-b" {:prompt 200 :completion 40}}- (#'api/extract-usage+ (metabot.persistence/extract-usage[{:type :usage :usage {:promptTokens 100 :completionTokens 20} :model "model-a"}{:type :usage :usage {:promptTokens 200 :completionTokens 40} :model "model-b"}]))))(testing "returns empty map when no usage parts"- (is (= {} (#'api/extract-usage [{:type :text :text "hi"}]))))+ (is (= {} (metabot.persistence/extract-usage [{:type :text :text "hi"}]))))(testing "missing model defaults to unknown"(is (= {"unknown" {:prompt 50 :completion 10}}- (#'api/extract-usage+ (metabot.persistence/extract-usage[{:type :usage :usage {:promptTokens 50 :completionTokens 10}}])))))(deftest combine-text-parts-xf-test(testing "passes through non-text parts"(is (= [{:type :tool, :id 1} {:type :tool, :id 2}]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)[{:type :tool, :id 1} {:type :tool, :id 2}]))))(testing "combines consecutive text parts"(is (= [{:type :text, :text "hello world"}]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)[{:type :text, :text "hello "}{:type :text, :text "world"}]))))@@ -655,7 +658,7 @@(is (= [{:type :text, :text "ab"}{:type :tool, :id 1}{:type :text, :text "cd"}]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)[{:type :text, :text "a"}{:type :text, :text "b"}{:type :tool, :id 1}@@ -663,11 +666,11 @@{:type :text, :text "d"}]))))(testing "handles empty input"- (is (= [] (into [] (#'api/combine-text-parts-xf) []))))+ (is (= [] (into [] (metabot.persistence/combine-text-parts-xf) []))))(testing "handles single text part"(is (= [{:type :text, :text "solo"}]- (into [] (#'api/combine-text-parts-xf)+ (into [] (metabot.persistence/combine-text-parts-xf)[{:type :text, :text "solo"}])))))(defn- store-and-check!@@ -677,14 +680,15 @@(let [conv-id (str (random-uuid))](try(mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider provider]- (#'api/store-native-parts!+ (metabot.persistence/store-native-parts!conv-id "internal"[{:type :start :id "msg-1"}{:type :text :text "Hello"};; SSE usage parts carry bare model names (from provider API response){:type :usage :model "claude-sonnet-4-6" :usage {:promptTokens 100 :completionTokens 50}}{:type :data :data-type "state" :data {:step 1}}- {:type :finish}])+ {:type :finish}]+ :external-id (str (random-uuid)))(t2/select-one :model/MetabotMessage :conversation_id conv-id))(finally(t2/delete! :model/MetabotMessage :conversation_id conv-id)@@ -704,22 +708,90 @@(is (= {:claude-sonnet-4-6 {:prompt 100 :completion 50}}(:usage msg))))))+(deftest store-native-parts-data-part-filtering-test+ (testing "persistable data parts land in MetabotMessage.data; state is salvaged to conversation and excluded from data"+ (binding [mb.api/*current-user-id* (mt/user->id :crowberto)]+ (let [conv-id (str (random-uuid))]+ (try+ (mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider "anthropic/claude-sonnet-4-6"]+ (metabot.persistence/store-native-parts!+ conv-id "internal"+ [{:type :start :id "msg-1"}+ {:type :text :text "Hi"}+ {:type :data :data-type "navigate_to" :data "/question/1"}+ {:type :data :data-type "todo_list" :version 1 :data [{:id "1" :content "x" :status "pending" :priority "low"}]}+ {:type :data :data-type "code_edit" :version 1 :data {:buffer_id "b" :value "v"}}+ {:type :data :data-type "transform_suggestion" :version 1 :data {}}+ {:type :data :data-type "adhoc_viz" :version 1 :data {:query {} :link "/q"}}+ {:type :data :data-type "static_viz" :version 1 :data {:entity_id 1}}+ {:type :data :data-type "state" :data {:step 1}}+ {:type :usage :model "claude-sonnet-4-6" :usage {:promptTokens 1 :completionTokens 1}}+ {:type :finish}])+ (let [msg (t2/select-one :model/MetabotMessage :conversation_id conv-id)+ conv (t2/select-one :model/MetabotConversation :id conv-id)+ data-types (into #{} (keep :data-type) (:data msg))+ part-types (into #{} (map :type) (:data msg))]+ (is (= #{"navigate_to" "todo_list" "code_edit" "transform_suggestion" "adhoc_viz" "static_viz"}+ data-types)+ "all persistable data parts (not state) should be in :data")+ (is (contains? part-types "text")+ "text parts survive")+ (is (not-any? part-types #{"start" "usage" "finish"})+ "stream metadata is dropped")+ (is (= {:step 1} (:state conv))+ "state value is salvaged to MetabotConversation.state")))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conv-id)+ (t2/delete! :model/MetabotConversation :id conv-id)))))))+(deftest strip-tool-output-bloat-test- (testing "strips transient keys from tool-output results, keeping only :output"+ (testing "drops transient keys and structured-output fields outside the persisted subset"(is (= {:type :tool-output :id "call-1" :result {:output "<result>XML</result>"}}- (#'api/strip-tool-output-bloat+ (metabot.persistence/strip-tool-output-bloat{:type :tool-output:id "call-1":result {:output "<result>XML</result>":resources [{:id 1 :name "Orders" :columns [{:field_values [1 2 3]}]}]:structured-output {:result-type :search :data [{:id 1}]}:data-parts [{:type :data :data-type "navigate_to"}]}}))))+ (testing "keeps the query-related subset of :structured-output for analytics extraction"+ (let [query-map {:database 1 :type :native :native {:query "SELECT 1"}}]+ (is (= {:type :tool-output+ :id "call-sql"+ :result {:output "<result>...</result>"+ :structured-output {:query-id "qid-1"+ :query-content "SELECT 1"+ :query query-map+ :database 1}}}+ (metabot.persistence/strip-tool-output-bloat+ {:type :tool-output+ :id "call-sql"+ :result {:output "<result>...</result>"+ :structured-output {:query-id "qid-1"+ :query-content "SELECT 1"+ :query query-map+ :database 1+ :resources [{:field_values [1 2 3]}]+ :reactions [:noop]}+ :data-parts [{:type :data}]}})))))+ (testing "preserves the snake-case :structured_output alias when present"+ (is (= {:type :tool-output+ :id "call-snake"+ :result {:output "<result>...</result>"+ :structured_output {:query-id "qid-2" :query-content "SELECT 2"}}}+ (metabot.persistence/strip-tool-output-bloat+ {:type :tool-output+ :id "call-snake"+ :result {:output "<result>...</result>"+ :structured_output {:query-id "qid-2"+ :query-content "SELECT 2"+ :extra-bloat [1 2 3]}}}))))(testing "leaves non-tool-output parts untouched"(let [text-part {:type :text :text "hello"}]- (is (= text-part (#'api/strip-tool-output-bloat text-part)))))- (testing "handles result with no :output key"+ (is (= text-part (metabot.persistence/strip-tool-output-bloat text-part)))))+ (testing "handles result with no :output key and no query-related structured-output"(is (= {:type :tool-output :id "call-2" :result {}}- (#'api/strip-tool-output-bloat+ (metabot.persistence/strip-tool-output-bloat{:type :tool-output:id "call-2":result {:structured-output {:some "data"}}})))))@@ -813,13 +885,101 @@:history []:conversation_id (str (random-uuid)):state {}- :debug false})+ :debug false}+ nil+ nil)(testing "metabot-id is included in the arguments"(is (some? (:metabot-id @captured-args))"metabot-id should not be nil")(is (= test-metabot-id (:metabot-id @captured-args))"metabot-id should match the input metabot_id"))))))+(deftest streaming-request-ip-address-test+ (mt/with-model-cleanup [:model/MetabotMessage+ [:model/MetabotConversation :created_at]]+ (let [request-body (fn [conversation-id]+ {:metabot_id metabot.config/embedded-metabot-id+ :profile_id nil+ :message "hi"+ :context {}+ :history []+ :conversation_id conversation-id+ :state {}+ :debug false})+ ip-for (fn [conversation-id]+ (:ip_address (t2/select-one :model/MetabotConversation :id conversation-id)))]+ (with-redefs [metabot.config/check-metabot-enabled! (constantly nil)+ api/native-agent-streaming-request (constantly nil)]+ (mt/with-test-user :rasta+ (testing "first writer wins: initial call captures the IP, later calls do not overwrite it"+ (let [conversation-id (str (random-uuid))]+ (api/streaming-request (request-body conversation-id) "1.2.3.4" nil)+ (is (= "1.2.3.4" (ip-for conversation-id)))+ (api/streaming-request (request-body conversation-id) "5.6.7.8" nil)+ (is (= "1.2.3.4" (ip-for conversation-id)))))+ (testing "null IP on pre-feature rows is backfilled on next call"+ (let [conversation-id (str (random-uuid))]+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id (mt/user->id :rasta)})+ (api/streaming-request (request-body conversation-id) "9.9.9.9" nil)+ (is (= "9.9.9.9" (ip-for conversation-id))))))))))++(deftest streaming-request-embed-url-test+ (mt/with-model-cleanup [:model/MetabotMessage+ [:model/MetabotConversation :created_at]]+ (let [request-body (fn [conversation-id]+ {:metabot_id metabot.config/embedded-metabot-id+ :profile_id nil+ :message "hi"+ :context {}+ :history []+ :conversation_id conversation-id+ :state {}+ :debug false})+ embed-url-for (fn [conversation-id]+ (:embed_url (t2/select-one :model/MetabotConversation :id conversation-id)))]+ (with-redefs [metabot.config/check-metabot-enabled! (constantly nil)+ api/native-agent-streaming-request (constantly nil)]+ (mt/with-test-user :rasta+ (testing "first writer wins: initial call captures the Referer, later calls do not overwrite it"+ (let [conversation-id (str (random-uuid))]+ (api/streaming-request (request-body conversation-id) nil "https://host.example.com/page")+ (is (= "https://host.example.com/page" (embed-url-for conversation-id)))+ (api/streaming-request (request-body conversation-id) nil "https://other.example.com/other")+ (is (= "https://host.example.com/page" (embed-url-for conversation-id)))))+ (testing "null embed_url on pre-feature rows is backfilled on next call"+ (let [conversation-id (str (random-uuid))]+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id (mt/user->id :rasta)})+ (api/streaming-request (request-body conversation-id) nil "https://host.example.com/backfilled")+ (is (= "https://host.example.com/backfilled" (embed-url-for conversation-id)))))+ (testing "missing Referer leaves embed_url null"+ (let [conversation-id (str (random-uuid))]+ (api/streaming-request (request-body conversation-id) nil nil)+ (is (nil? (embed-url-for conversation-id))))))))))++(deftest agent-streaming-endpoint-captures-referer-test+ (testing "POST /metabot/agent-streaming captures the Referer header as embed_url"+ (mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider test-provider]+ (binding [scope/*current-user-metabot-permissions* scope/all-yes-permissions]+ (with-redefs [openrouter/openrouter (fn [_]+ (mut/mock-llm-response+ [{:type :start :id "msg-1"}+ {:type :text :text "hi"}+ {:type :usage :usage {:promptTokens 1 :completionTokens 1}+ :model "test-model" :id "msg-1"}]))]+ (mt/with-model-cleanup [:model/MetabotMessage+ [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))+ referer "https://customer.example.com/dashboard"]+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"+ {:request-options {:headers {"referer" referer}}}+ {:message "hello"+ :context {}+ :conversation_id conversation-id+ :history []+ :state {}})+ (is (= referer+ (:embed_url (t2/select-one :model/MetabotConversation :id conversation-id)))))))))))+(deftest agent-streaming-returns-free-trial-limit-error-when-managed-provider-is-locked-test(mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider"metabase/anthropic/claude-sonnet-4-6"]diff --git a/test/metabase/metabot/feedback_test.clj b/test/metabase/metabot/feedback_test.cljnew file mode 100644index 00000000000..72b400b6e13--- /dev/null+++ b/test/metabase/metabot/feedback_test.clj@@ -0,0 +1,196 @@+(ns metabase.metabot.feedback-test+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.metabot.feedback :as metabot.feedback]+ [metabase.test :as mt]+ [toucan2.core :as t2])+ (:import+ (clojure.lang ExceptionInfo)))++(set! *warn-on-reflection* true)++(defn- payload+ [{:keys [message-id positive issue-type freeform]+ :or {positive true+ freeform "looks good"+ issue-type nil}}]+ {:message_id message-id+ :positive positive+ :issue_type issue-type+ :freeform_feedback freeform})++(defn- insert-message!+ ([conversation-id external-id]+ (insert-message! conversation-id external-id "assistant" nil))+ ([conversation-id external-id role user-id]+ (first (t2/insert-returning-pks!+ :model/MetabotMessage+ (cond-> {:conversation_id conversation-id+ :role role+ :profile_id "gpt-x"+ :external_id external-id+ :total_tokens 5+ :data [{:type "text" :text "hi"}]}+ user-id (assoc :user_id user-id))))))++(deftest persist-feedback-resolves-by-external-id-test+ (testing "persist-feedback! looks up the rated message by metabot_message.external_id"+ (mt/with-temp [:model/User {user-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id user-id})+ (let [msg-id (insert-message! conversation-id external-id)]+ (mt/with-current-user user-id+ (let [returned (metabot.feedback/persist-feedback!+ (payload {:message-id external-id+ :positive false+ :issue-type "not-factual"+ :freeform "bad answer"}))+ row (t2/select-one :model/MetabotFeedback :message_id msg-id)]+ (is (= msg-id (:id returned)))+ (is (= conversation-id (:conversation_id returned)))+ (is (= msg-id (:message_id row)))+ (is (= user-id (:user_id row)))+ (is (false? (:positive row)))+ (is (= "not-factual" (:issue_type row)))+ (is (= "bad answer" (:freeform_feedback row))))))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))++(deftest persist-feedback-writes-one-row-per-message-test+ (testing "each message in a conversation gets its own feedback row, keyed by message id"+ (mt/with-temp [:model/User {user-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id-1 (str (random-uuid))+ external-id-2 (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id user-id})+ (let [msg-id-1 (insert-message! conversation-id external-id-1)+ msg-id-2 (insert-message! conversation-id external-id-2)]+ (mt/with-current-user user-id+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id-1 :positive true :freeform "first"}))+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id-2 :positive false :freeform "second"}))+ (let [row-1 (t2/select-one :model/MetabotFeedback :message_id msg-id-1)+ row-2 (t2/select-one :model/MetabotFeedback :message_id msg-id-2)]+ (is (true? (:positive row-1)))+ (is (= "first" (:freeform_feedback row-1)))+ (is (false? (:positive row-2)))+ (is (= "second" (:freeform_feedback row-2)))+ (is (= 2 (t2/count :model/MetabotFeedback :message_id [:in [msg-id-1 msg-id-2]]))))))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))++(deftest persist-feedback-updates-existing-row-test+ (testing "persist-feedback! updates the existing row for the same message and bumps updated_at"+ (mt/with-temp [:model/User {user-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id user-id})+ (let [msg-id (insert-message! conversation-id external-id)]+ (mt/with-current-user user-id+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id :positive true :freeform "good"}))+ (let [first-row (t2/select-one :model/MetabotFeedback :message_id msg-id)]+ ;; clock resolution: ensure the second write lands on a later instant+ (Thread/sleep 50)+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id+ :positive false+ :issue-type "ui-bug"+ :freeform "actually it's broken"}))+ (let [updated-row (t2/select-one :model/MetabotFeedback :message_id msg-id)]+ (is (= 1 (t2/count :model/MetabotFeedback :message_id msg-id))+ "still only one row per message")+ (is (false? (:positive updated-row)))+ (is (= "ui-bug" (:issue_type updated-row)))+ (is (= "actually it's broken" (:freeform_feedback updated-row)))+ (is (not= (:updated_at first-row) (:updated_at updated-row))+ "updated_at gets bumped on edit")))))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))++(deftest persist-feedback-unknown-external-id-404-test+ (testing "persist-feedback! throws 404 when external_id does not resolve to a message"+ (mt/with-temp [:model/User {user-id :id} {}]+ (mt/with-current-user user-id+ (is (thrown-with-msg? ExceptionInfo #"Not found"+ (metabot.feedback/persist-feedback!+ (payload {:message-id (str (random-uuid))}))))))))++(deftest persist-feedback-rejects-lurker-test+ (testing "persist-feedback! throws 404 and writes nothing when the current user is neither the originator nor a participant"+ (mt/with-temp [:model/User {owner-id :id} {}+ :model/User {stranger-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id owner-id})+ (let [msg-id (insert-message! conversation-id external-id)]+ (mt/with-current-user stranger-id+ (is (thrown-with-msg? ExceptionInfo #"Not found"+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id :positive true}))))+ (is (nil? (t2/select-one :model/MetabotFeedback :message_id msg-id))+ "no row written for a lurker submission")))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))++(deftest persist-feedback-allows-participant-non-originator-test+ (testing "persist-feedback! succeeds for a participant who is not the conversation originator, and the row carries the submitter's user_id"+ (mt/with-temp [:model/User {owner-id :id} {}+ :model/User {participant-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id owner-id})+ (insert-message! conversation-id (str (random-uuid)) "user" participant-id)+ (let [assistant-msg-id (insert-message! conversation-id external-id)]+ (mt/with-current-user participant-id+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id :positive true :freeform "helpful"}))+ (let [row (t2/select-one :model/MetabotFeedback+ :message_id assistant-msg-id+ :user_id participant-id)]+ (is (some? row) "row is written under the participant's user_id")+ (is (true? (:positive row)))+ (is (= "helpful" (:freeform_feedback row))))))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))++(deftest persist-feedback-two-users-one-message-test+ (testing "two users in the same conversation can each submit feedback on the same assistant message, producing two rows with distinct user_ids"+ (mt/with-temp [:model/User {owner-id :id} {}+ :model/User {participant-id :id} {}]+ (let [conversation-id (str (random-uuid))+ external-id (str (random-uuid))]+ (try+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id owner-id})+ (insert-message! conversation-id (str (random-uuid)) "user" participant-id)+ (let [assistant-msg-id (insert-message! conversation-id external-id)]+ (mt/with-current-user owner-id+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id :positive true :freeform "great"})))+ (mt/with-current-user participant-id+ (metabot.feedback/persist-feedback!+ (payload {:message-id external-id :positive false :issue-type "ui-bug" :freeform "not for me"})))+ (let [rows (t2/select :model/MetabotFeedback :message_id assistant-msg-id+ {:order-by [[:user_id :asc]]})+ by-user (into {} (map (juxt :user_id identity)) rows)]+ (is (= 2 (count rows)) "both submissions are persisted as distinct rows")+ (is (true? (:positive (get by-user owner-id))))+ (is (= "great" (:freeform_feedback (get by-user owner-id))))+ (is (false? (:positive (get by-user participant-id))))+ (is (= "ui-bug" (:issue_type (get by-user participant-id))))+ (is (= "not for me" (:freeform_feedback (get by-user participant-id))))))+ (finally+ (t2/delete! :model/MetabotMessage :conversation_id conversation-id)+ (t2/delete! :model/MetabotConversation :id conversation-id)))))))diff --git a/test/metabase/metabot/persistence_test.clj b/test/metabase/metabot/persistence_test.cljnew file mode 100644index 00000000000..d922a85b236--- /dev/null+++ b/test/metabase/metabot/persistence_test.clj@@ -0,0 +1,235 @@+(ns metabase.metabot.persistence-test+ (:require+ [clojure.test :refer [deftest is testing use-fixtures]]+ [metabase.metabot.persistence :as metabot-persistence]+ [metabase.test :as mt]+ [metabase.test.fixtures :as fixtures]+ [metabase.util.json :as json]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(use-fixtures :once (fixtures/initialize :test-users))++(deftest message->chat-messages-test+ (testing "user text block"+ (let [result (metabot-persistence/message->chat-messages+ {:role :user+ :data [{:role "user" :content "hello"}]})]+ (is (= 1 (count result)))+ (is (= {:role "user" :type "text" :message "hello"}+ (select-keys (first result) [:role :type :message])))+ (is (string? (:id (first result))))))++ (testing "assistant standard text block preserves block id"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "text" :text "hi there" :id "block-1"}]})]+ (is (= [{:id "block-1" :role "agent" :type "text" :message "hi there"}]+ result))))++ (testing "assistant standard text block without id gets a generated one"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "text" :text "no id"}]})]+ (is (= 1 (count result)))+ (is (string? (:id (first result))))+ (is (= "no id" (:message (first result))))))++ (testing "assistant slack-format text block"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:role "assistant" :_type "TEXT" :content "from slack"}]})]+ (is (= 1 (count result)))+ (is (= {:role "agent" :type "text" :message "from slack"}+ (select-keys (first result) [:role :type :message])))))++ (testing "tool-input merged with matching tool-output"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "tool-input" :id "call-1" :function "search"+ :arguments {:query "foo"}}+ {:type "tool-output" :id "call-1" :result {:rows [1 2 3]}}]})]+ (is (= 1 (count result)))+ (is (= {:id "call-1"+ :role "agent"+ :type "tool_call"+ :name "search"+ :status "ended"+ :is_error false}+ (select-keys (first result) [:id :role :type :name :status :is_error])))+ (is (= {:query "foo"} (json/decode+kw (:args (first result)))))+ (is (= {:rows [1 2 3]} (json/decode+kw (:result (first result)))))))++ (testing "tool-output flagged as error"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "tool-input" :id "call-2" :function "boom" :arguments {}}+ {:type "tool-output" :id "call-2" :error "exploded"}]})]+ (is (true? (:is_error (first result))))+ (is (nil? (:result (first result))))))++ (testing "tool-input without matching output is left as-is"+ (let [result (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "tool-input" :id "call-3" :function "search" :arguments {}}]})]+ (is (= 1 (count result)))+ (is (= "tool_call" (:type (first result))))+ (is (not (contains? (first result) :result)))+ (is (not (contains? (first result) :is_error)))))++ (testing "unknown block types are dropped"+ (is (= []+ (metabot-persistence/message->chat-messages+ {:role :assistant+ :data [{:type "data-foo" :payload {}}+ {:type "mystery"}]}))))++ (testing "data parts are converted to data_part chat messages"+ (let [blocks [{:type "data" :data-type "navigate_to" :data "/question/1"}+ {:type "data" :data-type "todo_list" :version 1 :data [{:id "t1"}]}+ {:type "data" :data-type "code_edit" :version 1 :data {:buffer_id "b" :value "v"}}]]+ (is (=? [{:role "agent" :type "data_part" :part {:type "navigate_to" :version 1 :value "/question/1"}}+ {:role "agent" :type "data_part" :part {:type "todo_list" :version 1 :value [{:id "t1"}]}}+ {:role "agent" :type "data_part" :part {:type "code_edit" :version 1 :value {:buffer_id "b" :value "v"}}}]+ (metabot-persistence/message->chat-messages {:role :assistant :data blocks})))))++ (testing "nil :data yields no messages"+ (is (= [] (metabot-persistence/message->chat-messages {:role :user :data nil})))))++(deftest messages->chat-messages-flattens-across-messages-test+ (let [result (metabot-persistence/messages->chat-messages+ [{:role :user :data [{:role "user" :content "hi"}]}+ {:role :assistant :data [{:type "text" :text "hello!" :id "b1"}+ {:type "tool-input" :id "t1" :function "f" :arguments {:x 1}}+ {:type "tool-output" :id "t1" :result {:ok true}}]}])]+ (is (= 3 (count result)))+ (is (= ["user" "agent" "agent"] (map :role result)))+ (is (= ["text" "text" "tool_call"] (map :type result)))+ (is (= "hi" (:message (nth result 0))))+ (is (= "hello!" (:message (nth result 1))))+ (is (= {:ok true} (json/decode+kw (:result (nth result 2)))))))++(deftest store-message-persists-slack-conversation-metadata-test+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))+ team-id "T123"+ channel-id "C123"+ thread-ts "1712785577.123456"]+ (mt/with-current-user (mt/user->id :rasta)+ (metabot-persistence/store-message!+ conversation-id+ "slackbot"+ [{:role "user" :content "hello"}]+ :slack-team-id team-id+ :channel-id channel-id+ :slack-thread-ts thread-ts+ :slack-msg-id "1712785577.123456"))+ (let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)]+ (is (= (mt/user->id :rasta) (:user_id conversation)))+ (is (= team-id (:slack_team_id conversation)))+ (is (= channel-id (:slack_channel_id conversation)))+ (is (= thread-ts (:slack_thread_ts conversation)))))))++(deftest combine-text-parts-xf-merges-consecutive-text-test+ (testing "consecutive :text parts coalesce; non-text parts split runs"+ (let [parts [{:type :text :text "Hello, "}+ {:type :text :text "world"}+ {:type :text :text "!"}+ {:type :tool-input :id "c1" :function "search"}+ {:type :text :text "After "}+ {:type :text :text "tool."}]+ out (into [] (metabot-persistence/combine-text-parts-xf) parts)]+ (is (= [{:type :text :text "Hello, world!"}+ {:type :tool-input :id "c1" :function "search"}+ {:type :text :text "After tool."}]+ out))))+ (testing "single text part flushes on completion"+ (is (= [{:type :text :text "lone"}]+ (into [] (metabot-persistence/combine-text-parts-xf) [{:type :text :text "lone"}]))))+ (testing "empty input"+ (is (= [] (into [] (metabot-persistence/combine-text-parts-xf) [])))))++(deftest store-native-parts-persists-slack-metadata-on-conversation-test+ (testing "store-native-parts! lands slack-team-id / channel-id / slack-thread-ts on the conversation row,+ and slack-msg-id / channel-id / user-id on the message row, on first insert"+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))+ team-id "T-NATIVE"+ channel-id "C-NATIVE"+ thread-ts "1700000000.000001"+ slack-msg-id "1700000000.000099"+ user-id (mt/user->id :rasta)]+ (mt/with-current-user user-id+ (metabot-persistence/store-native-parts!+ conversation-id+ "metabot-1"+ [{:type :text :text "hello from slack"}]+ :slack-team-id team-id+ :channel-id channel-id+ :slack-thread-ts thread-ts+ :slack-msg-id slack-msg-id+ :user-id user-id))+ (let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)+ message (t2/select-one :model/MetabotMessage :conversation_id conversation-id)]+ (is (= user-id (:user_id conversation)))+ (is (= team-id (:slack_team_id conversation)))+ (is (= channel-id (:slack_channel_id conversation)))+ (is (= thread-ts (:slack_thread_ts conversation)))+ (is (= channel-id (:channel_id message)))+ (is (= slack-msg-id (:slack_msg_id message)))+ (is (= user-id (:user_id message))))))))++(deftest store-native-parts-does-not-overwrite-slack-metadata-test+ (testing "slack metadata on the conversation row is set once and never overwritten by a later writer"+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))]+ (mt/with-current-user (mt/user->id :rasta)+ (metabot-persistence/store-native-parts!+ conversation-id "metabot-1" [{:type :text :text "first"}]+ :slack-team-id "T-FIRST"+ :channel-id "C-FIRST"+ :slack-thread-ts "1700000000.000001"))+ (mt/with-current-user (mt/user->id :lucky)+ (metabot-persistence/store-native-parts!+ conversation-id "metabot-1" [{:type :text :text "second"}]+ :slack-team-id "T-SECOND"+ :channel-id "C-SECOND"+ :slack-thread-ts "1700000000.999999"))+ (let [conversation (t2/select-one :model/MetabotConversation :id conversation-id)]+ (is (= "T-FIRST" (:slack_team_id conversation)))+ (is (= "C-FIRST" (:slack_channel_id conversation)))+ (is (= "1700000000.000001" (:slack_thread_ts conversation))))))))++(deftest conversation-detail-filters-soft-deleted-messages-and-orders-ascending-test+ (testing "conversation-detail returns only non-deleted messages, ordered by :created_at ascending"+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (let [conversation-id (str (random-uuid))+ user-id (mt/user->id :rasta)+ now (java.time.OffsetDateTime/now)+ insert! (fn [{:keys [text created-at deleted-at external-id role]+ :or {role "assistant"}}]+ (t2/insert-returning-pks!+ :model/MetabotMessage+ (cond-> {:conversation_id conversation-id+ :role role+ :profile_id "metabot-1"+ :external_id (or external-id (str (random-uuid)))+ :total_tokens 0+ :data [{:type "text" :text text :id (str (random-uuid))}]+ :created_at created-at}+ deleted-at (assoc :deleted_at deleted-at))))]+ (t2/insert! :model/MetabotConversation {:id conversation-id :user_id user-id})+ (insert! {:text "second" :created-at (.plusSeconds now 2)})+ (insert! {:text "first" :created-at (.plusSeconds now 1)})+ (insert! {:text "deleted-third"+ :created-at (.plusSeconds now 3)+ :deleted-at now})+ (let [detail (metabot-persistence/conversation-detail conversation-id)+ texts (mapv :message (:chat_messages detail))]+ (is (= conversation-id (:conversation_id detail)))+ (is (= ["first" "second"] texts)))))))++(deftest conversation-detail-returns-nil-for-missing-conversation-test+ (testing "conversation-detail returns nil when the conversation does not exist"+ (is (nil? (metabot-persistence/conversation-detail (str (random-uuid)))))))diff --git a/test/metabase/metabot/self_test.clj b/test/metabase/metabot/self_test.cljindex 2a6403c524e..3cdd4416e38 100644--- a/test/metabase/metabot/self_test.clj+++ b/test/metabase/metabot/self_test.clj@@ -511,7 +511,14 @@#"d:.*"]lines))(is (=? {:usage {:promptTokens 10 :completionTokens 5}}- (-> (last lines) (subs 2) (json/decode+kw)))))))+ (-> (last lines) (subs 2) (json/decode+kw))))))++ (testing ":external-id overrides the messageId on the start line"+ (let [parts [{:type :start :id "provider-id" :messageId "provider-msg-id"}+ {:type :text :text "hi"}]+ lines (into [] (self.core/aisdk-line-xf {:external-id "override-id"}) parts)]+ (is (= "override-id"+ (-> (first lines) (subs 2) (json/decode+kw) :messageId))))));;; ===================== Retry Logic Tests =====================@@ -599,10 +606,10 @@(deftest call-llm-prometheus-test(mt/with-prometheus-system! [_ system](with-redefs [self/retry-delay-ms (constantly 0)]- (let [labels {:model "openrouter/test-model" :source "agent"}]+ (let [labels {:model "openrouter/test-model" :source "metabot_agent"}](testing "increments llm-requests and observes duration on success"(with-redefs [openrouter/openrouter (constantly (test-util/mock-llm-response [{:type :start :id "m1"}]))]- (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "agent"})))+ (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "metabot_agent"})))(is (== 1 (mt/metric-value system :metabase-metabot/llm-requests labels)))(is (== 0 (mt/metric-value system :metabase-metabot/llm-retries labels)))(is (== 0 (mt/metric-value system :metabase-metabot/llm-errors@@ -623,7 +630,7 @@(if (< (swap! calls inc) 3)(throw (ex-info "rate limited" {:status 429}))(reduce rf init (test-util/mock-llm-response [{:type :start :id "m1"}]))))))]- (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "agent"}))))+ (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "metabot_agent"}))))(is (== 3 (mt/metric-value system :metabase-metabot/llm-requests labels)))(is (== 2 (mt/metric-value system :metabase-metabot/llm-retries labels)))(is (== 0 (mt/metric-value system :metabase-metabot/llm-errors@@ -640,7 +647,7 @@(reify clojure.lang.IReduceInit(reduce [_ _rf _init](throw (ex-info "unauthorized" {:status 401})))))]- (is (thrown? Exception (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "agent"})))))+ (is (thrown? Exception (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "metabot_agent"})))))(is (== 1 (mt/metric-value system :metabase-metabot/llm-requests labels)))(is (== 0 (mt/metric-value system :metabase-metabot/llm-retries labels)))(is (== 1 (mt/metric-value system :metabase-metabot/llm-errors@@ -654,7 +661,7 @@(testing "increments llm-errors with :error-type llm-sse-error on inline SSE errors"(with-redefs [openrouter/openrouter(constantly (test-util/mock-llm-response [{:type :error :errorText "content policy violation"}]))]- (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "agent"})))+ (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "metabot_agent"})))(is (== 1 (mt/metric-value system :metabase-metabot/llm-requests labels)))(is (== 1 (mt/metric-value system :metabase-metabot/llm-errors(assoc labels :error-type "llm-sse-error")))))@@ -667,7 +674,7 @@{:type :usage:usage {:promptTokens 100 :completionTokens 25}:model "test-model"}]))]- (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "agent"})))+ (run! identity (self/call-llm "openrouter/test-model" nil [] {} {:tag "metabot_agent"})))(is (== 100 (mt/metric-value system :metabase-metabot/llm-input-tokens labels)))(is (== 25 (mt/metric-value system :metabase-metabot/llm-output-tokens labels)))(is (== 125 (:sum (mt/metric-value system :metabase-metabot/llm-tokens-per-call labels)))))))))@@ -675,7 +682,7 @@(deftest call-llm-structured-prometheus-test(mt/with-prometheus-system! [_ system](with-redefs [self/retry-delay-ms (constantly 0)]- (let [labels {:model "openrouter/test-model" :source "agent"}+ (let [labels {:model "openrouter/test-model" :source "metabot_agent"}success-mock (test-util/mock-llm-response[{:type :start :id "m1"}{:type :tool-input :id "call-1" :function "json"@@ -684,7 +691,7 @@"openrouter/test-model"[{:role "user" :content "test"}]{:type "object" :properties {:answer {:type "string"}}}- 0.3 1024 {:tag "agent"})]+ 0.3 1024 {:tag "metabot_agent"})](testing "increments llm-requests and observes duration on success"(with-redefs [openrouter/openrouter (constantly success-mock)](call-structured!))@@ -757,7 +764,7 @@(def ^:private snowplow-tracking-opts{:request-id "00000000-0000-0000-0000-000000000001":session-id "00000000-0000-0000-0000-000000000002"- :source "test-source"+ :source "metabot_agent":tag "test-tag"})(deftest call-llm-snowplow-test@@ -783,13 +790,13 @@"completion_tokens" 20"estimated_costs_usd" 0.0"duration_ms" nat-int?- "source" "test-source"+ "source" "metabot_agent""tag" "test-tag""session_id" "00000000-0000-0000-0000-000000000002"}}]token-events))(is (=? [{:user-id (str rasta-id):data {"event" "agent_used_tool"- "source" "test-source"+ "source" "metabot_agent""result" "success""duration_ms" nat-int?"session_id" "00000000-0000-0000-0000-000000000002"@@ -823,7 +830,7 @@"completion_tokens" 10"estimated_costs_usd" 0.0"duration_ms" nat-int?- "source" "test-source"+ "source" "metabot_agent""tag" "test-tag""session_id" "00000000-0000-0000-0000-000000000002"}}]token-events)))))))))diff --git a/test/metabase/slackbot/api_test.clj b/test/metabase/slackbot/api_test.cljindex ddfaaa052b6..b9e286cde1d 100644--- a/test/metabase/slackbot/api_test.clj+++ b/test/metabase/slackbot/api_test.clj@@ -3,6 +3,7 @@[clojure.string :as str][clojure.test :refer :all][metabase.analytics.prometheus-test :as prometheus-test]+ [metabase.channel.settings :as channel.settings][metabase.metabot.agent.core :as agent][metabase.metabot.feedback :as metabot.feedback][metabase.server.settings :as server.settings]@@ -834,138 +835,383 @@(is (= 0 (count @harbormaster-calls)))(is (= 0 (count @open-view-calls)))))))))+(defn- setup-slackbot-feedback!+ "Insert a `metabot_conversation` with `user-id` as originator and one+ assistant message with a fresh `external_id`. Returns `{:conv-id+ :external-id :message-id}`. Caller must `tear-down-slackbot-feedback!`."+ [user-id]+ (let [conv-id (str (random-uuid))+ external-id (str (random-uuid))]+ (t2/insert! :model/MetabotConversation {:id conv-id :user_id user-id})+ (let [msg-id (first (t2/insert-returning-pks!+ :model/MetabotMessage+ {:conversation_id conv-id+ :role "assistant"+ :profile_id "slackbot"+ :external_id external-id+ :total_tokens 5+ :data [{:_type "TEXT" :role "assistant" :content "hi"}]}))]+ {:conv-id conv-id :external-id external-id :message-id msg-id})))++(defn- tear-down-slackbot-feedback!+ [conv-id]+ (t2/delete! :model/MetabotMessage :conversation_id conv-id)+ (t2/delete! :model/MetabotConversation :id conv-id))++(defn- modal-submission-payload+ "Build a Slack view_submission payload for the feedback modal. Includes+ `:message_external_id` only when `external-id` is non-nil; that mirrors the+ legacy-button code path in production."+ [{:keys [conv-id external-id user-id positive issue-type freeform+ channel-id message-ts]+ :or {channel-id "C123" message-ts "123.456"}}]+ {:type "view_submission"+ :view {:callback_id "metabot_feedback_modal"+ :private_metadata (json/encode (cond-> {:conversation_id conv-id+ :positive positive+ :user_id user-id+ :channel_id channel-id+ :message_ts message-ts}+ external-id (assoc :message_external_id external-id)))+ :state {:values (cond-> {:freeform_feedback {:freeform_input {:value freeform}}}+ issue-type+ (assoc :issue_type+ {:issue_type_select {:selected_option {:value issue-type}}}))}}})+(deftest handle-feedback-modal-submission-test- (testing "modal submission sends feedback to harbormaster"- (let [harbormaster-calls (atom [])]- (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]- (let [payload {:type "view_submission"- :view {:callback_id "metabot_feedback_modal"- :private_metadata (json/encode {:conversation_id "conv-123"- :positive false- :user_id (mt/user->id :rasta)- :channel_id "C123"- :message_ts "123.456"})- :state {:values {:issue_type {:issue_type_select {:selected_option {:value "not-factual"}}}- :freeform_feedback {:freeform_input {:value "The answer was wrong"}}}}}}- result (#'slackbot/handle-feedback-modal-submission payload)]- @result- (is (= 1 (count @harbormaster-calls)))- (is (=? {:feedback {:positive false- :message_id "conv-123"- :issue_type "not-factual"- :freeform_feedback "The answer was wrong"}- :source "slack"- :conversation_data {:messages []}}- (first @harbormaster-calls)))))))-- (testing "modal submission with only freeform text submits"- (let [harbormaster-calls (atom [])]- (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]- (let [payload {:type "view_submission"- :view {:callback_id "metabot_feedback_modal"- :private_metadata (json/encode {:conversation_id "conv-123"- :positive true- :user_id (mt/user->id :rasta)- :channel_id "C123"- :message_ts "123.456"})- :state {:values {:freeform_feedback {:freeform_input {:value "Great response!"}}}}}}- result (#'slackbot/handle-feedback-modal-submission payload)]- @result- (is (= 1 (count @harbormaster-calls)))- (is (=? {:feedback {:positive true- :freeform_feedback "Great response!"}- :source "slack"}- (first @harbormaster-calls)))))))-- (testing "modal submission with no details still submits basic feedback"- (let [harbormaster-calls (atom [])]- (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]- (let [payload {:type "view_submission"- :view {:callback_id "metabot_feedback_modal"- :private_metadata (json/encode {:conversation_id "conv-123"- :positive true- :user_id (mt/user->id :rasta)- :channel_id "C123"- :message_ts "123.456"})- :state {:values {:freeform_feedback {:freeform_input {:value nil}}}}}}- result (#'slackbot/handle-feedback-modal-submission payload)]- @result- (is (= 1 (count @harbormaster-calls)))- (is (=? {:feedback {:positive true- :freeform_feedback ""}- :source "slack"}- (first @harbormaster-calls)))))))-- (testing "modal submission with only issue type submits"- (let [harbormaster-calls (atom [])]- (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]- (let [payload {:type "view_submission"- :view {:callback_id "metabot_feedback_modal"- :private_metadata (json/encode {:conversation_id "conv-123"- :positive false- :user_id (mt/user->id :rasta)- :channel_id "C123"- :message_ts "123.456"})- :state {:values {:issue_type {:issue_type_select {:selected_option {:value "ui-bug"}}}- :freeform_feedback {:freeform_input {:value nil}}}}}}- result (#'slackbot/handle-feedback-modal-submission payload)]- @result- (is (= 1 (count @harbormaster-calls)))- (is (=? {:feedback {:positive false- :issue_type "ui-bug"}- :source "slack"}- (first @harbormaster-calls)))))))-- (testing "feedback includes conversation messages from the database"- (let [conv-id (str (random-uuid))+ (let [rasta-id (mt/user->id :rasta)]+ (testing "negative feedback with issue_type and freeform writes a row and forwards to harbormaster"+ (let [{:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)+ harbormaster-calls (atom [])]+ (try+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive false+ :issue-type "not-factual"+ :freeform "The answer was wrong"})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (testing "local metabot_feedback row is written under the submitter's user_id"+ (let [row (t2/select-one :model/MetabotFeedback :message_id message-id :user_id rasta-id)]+ (is (some? row))+ (is (false? (:positive row)))+ (is (= "not-factual" (:issue_type row)))+ (is (= "The answer was wrong" (:freeform_feedback row)))))+ (testing "harbormaster payload carries the resolved external_id and submitter"+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:positive false+ :message_id external-id+ :issue_type "not-factual"+ :freeform_feedback "The answer was wrong"}+ :source "slack"+ :submitter_user_id rasta-id}+ (first @harbormaster-calls))))))+ (finally (tear-down-slackbot-feedback! conv-id)))))++ (testing "positive feedback with only freeform text submits"+ (let [{:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)+ harbormaster-calls (atom [])]+ (try+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive true+ :freeform "Great response!"})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (is (some? (t2/select-one :model/MetabotFeedback :message_id message-id :user_id rasta-id)))+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:positive true+ :message_id external-id+ :freeform_feedback "Great response!"}+ :source "slack"+ :submitter_user_id rasta-id}+ (first @harbormaster-calls)))))+ (finally (tear-down-slackbot-feedback! conv-id)))))++ (testing "positive feedback with nil freeform is stored as-is locally and coerced to empty string for harbormaster"+ (let [{:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)+ harbormaster-calls (atom [])]+ (try+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive true+ :freeform nil})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (let [row (t2/select-one :model/MetabotFeedback :message_id message-id :user_id rasta-id)]+ (is (some? row))+ (is (nil? (:freeform_feedback row))))+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:positive true+ :freeform_feedback ""}+ :source "slack"}+ (first @harbormaster-calls)))))+ (finally (tear-down-slackbot-feedback! conv-id)))))++ (testing "negative feedback with only issue type submits"+ (let [{:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)+ harbormaster-calls (atom [])]+ (try+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive false+ :issue-type "ui-bug"+ :freeform nil})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (is (some? (t2/select-one :model/MetabotFeedback :message_id message-id :user_id rasta-id)))+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:positive false+ :issue_type "ui-bug"+ :freeform_feedback ""}+ :source "slack"}+ (first @harbormaster-calls)))))+ (finally (tear-down-slackbot-feedback! conv-id)))))++ (testing "harbormaster payload includes the conversation's messages"+ (let [conv-id (str (random-uuid))+ external-id (str (random-uuid))+ harbormaster-calls (atom [])]+ (try+ (t2/insert! :model/MetabotConversation {:id conv-id :user_id rasta-id})+ (t2/insert! :model/MetabotMessage+ {:conversation_id conv-id+ :role "user"+ :profile_id "slackbot"+ :total_tokens 0+ :data [{:_type "TEXT" :role "user" :content "What is revenue?"}]})+ (t2/insert! :model/MetabotMessage+ {:conversation_id conv-id+ :role "assistant"+ :profile_id "slackbot"+ :external_id external-id+ :total_tokens 10+ :data [{:_type "TEXT" :role "assistant" :content "Here are the results."}]})+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive true+ :freeform "Great!"})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:positive true+ :message_id external-id+ :freeform_feedback "Great!"}+ :source "slack"+ :conversation_data {:messages [{:role :user+ :data [{:_type "TEXT" :role "user" :content "What is revenue?"}]+ :profile_id "slackbot"}+ {:role :assistant+ :data [{:_type "TEXT" :role "assistant" :content "Here are the results."}]+ :profile_id "slackbot"}]}}+ (first @harbormaster-calls)))))+ (finally (tear-down-slackbot-feedback! conv-id)))))))++(deftest handle-feedback-modal-submission-multi-user-test+ (testing "two users in the same conversation can submit independent feedback on the same assistant message"+ (let [rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)+ {:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)harbormaster-calls (atom [])]- (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]- (t2/insert! :model/MetabotConversation {:id conv-id :user_id (mt/user->id :rasta)})+ (try+ ;; lucky becomes a participant by authoring a user-turn message in the thread(t2/insert! :model/MetabotMessage{:conversation_id conv-id:role "user":profile_id "slackbot"+ :user_id lucky-id:total_tokens 0- :data [{:_type "TEXT" :role "user" :content "What is revenue?"}]})- (t2/insert! :model/MetabotMessage- {:conversation_id conv-id- :role "assistant"- :profile_id "slackbot"- :total_tokens 10- :data [{:_type "TEXT" :role "assistant" :content "Here are the results."}]})+ :data [{:_type "TEXT" :role "user" :content "+1"}]})+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [rasta-result (#'slackbot/handle-feedback-modal-submission+ (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id rasta-id+ :positive true+ :freeform "nice"}))+ lucky-result (#'slackbot/handle-feedback-modal-submission+ (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id lucky-id+ :positive false+ :issue-type "ui-bug"+ :freeform "not for me"}))]+ @rasta-result+ @lucky-result)+ (let [rows (t2/select :model/MetabotFeedback :message_id message-id+ {:order-by [[:user_id :asc]]})+ by-user (into {} (map (juxt :user_id identity)) rows)]+ (is (= 2 (count rows)) "both submissions produce distinct rows")+ (is (true? (:positive (get by-user rasta-id))))+ (is (= "nice" (:freeform_feedback (get by-user rasta-id))))+ (is (false? (:positive (get by-user lucky-id))))+ (is (= "ui-bug" (:issue_type (get by-user lucky-id))))+ (is (= "not for me" (:freeform_feedback (get by-user lucky-id))))+ (is (= 2 (count @harbormaster-calls)) "harbormaster is called once per submitter")+ (is (= #{rasta-id lucky-id} (set (map :submitter_user_id @harbormaster-calls))))))+ (finally (tear-down-slackbot-feedback! conv-id))))))++(deftest handle-feedback-modal-submission-unresolvable-external-id-test+ (testing "modal submission drops cleanly (no local write, no harbormaster) when external_id cannot be resolved"+ (let [rasta-id (mt/user->id :rasta)+ harbormaster-calls (atom [])]+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [payload (modal-submission-payload {:conv-id (str (random-uuid))+ :external-id nil+ :user-id rasta-id+ :positive true+ :freeform "orphaned"+ :channel-id "C-missing"+ :message-ts "0.000"})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ (is (nil? result) "handler returns nil and does not schedule async work")+ (is (zero? (count @harbormaster-calls)) "harbormaster is not called for an unresolvable submission")+ (is (zero? (t2/count :model/MetabotFeedback :user_id rasta-id+ {:where [:in :message_id+ {:select [:id] :from [:metabot_message]+ :where [:= :external_id "nothing-to-match"]}]}))+ "no feedback row written for unresolvable submissions"))))))++(deftest handle-feedback-modal-submission-lurker-test+ (testing "modal submission from a non-participant is rejected locally and harbormaster is not called"+ (let [rasta-id (mt/user->id :rasta)+ lucky-id (mt/user->id :lucky)+ {:keys [conv-id external-id message-id]} (setup-slackbot-feedback! rasta-id)+ harbormaster-calls (atom [])]+ (try+ ;; lucky has authored no messages, so can-read? on the conversation rejects(with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback](swap! harbormaster-calls conj feedback)true)]- (let [payload {:type "view_submission"- :view {:callback_id "metabot_feedback_modal"- :private_metadata (json/encode {:conversation_id conv-id- :positive true- :user_id (mt/user->id :rasta)- :channel_id "C123"- :message_ts "123.456"})- :state {:values {:freeform_feedback {:freeform_input {:value "Great!"}}}}}}- result (#'slackbot/handle-feedback-modal-submission payload)]- @result- (is (= 1 (count @harbormaster-calls)))- (is (=? {:feedback {:positive true- :message_id conv-id- :freeform_feedback "Great!"}- :source "slack"- :conversation_data {:messages [{:role :user- :data [{:_type "TEXT" :role "user" :content "What is revenue?"}]- :profile_id "slackbot"}- {:role :assistant- :data [{:_type "TEXT" :role "assistant" :content "Here are the results."}]- :profile_id "slackbot"}]}}- (first @harbormaster-calls)))))))))+ (let [result (#'slackbot/handle-feedback-modal-submission+ (modal-submission-payload {:conv-id conv-id+ :external-id external-id+ :user-id lucky-id+ :positive true+ :freeform "lurking"}))]+ @result))+ (is (zero? (count @harbormaster-calls)) "harbormaster is skipped when the local write is rejected")+ (is (nil? (t2/select-one :model/MetabotFeedback :message_id message-id :user_id lucky-id))+ "no feedback row is written for a lurker")+ (finally (tear-down-slackbot-feedback! conv-id))))))++(deftest handle-feedback-modal-submission-resolves-via-channel-and-ts-fallback-test+ (testing "buttons predating :message_external_id still resolve via (channel_id, message_ts)"+ (let [rasta-id (mt/user->id :rasta)+ conv-id (str (random-uuid))+ external-id (str (random-uuid))+ channel-id "C-FALLBACK"+ message-ts "1700000000.123456"+ harbormaster-calls (atom [])]+ (try+ (t2/insert! :model/MetabotConversation {:id conv-id :user_id rasta-id})+ (let [message-id (first (t2/insert-returning-pks!+ :model/MetabotMessage+ {:conversation_id conv-id+ :role "assistant"+ :profile_id "slackbot"+ :external_id external-id+ :channel_id channel-id+ :slack_msg_id message-ts+ :total_tokens 5+ :data [{:_type "TEXT" :role "assistant" :content "hi"}]}))]+ (with-redefs [metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)]+ (let [;; external-id intentionally omitted from the button payload — only channel + ts are present+ payload (modal-submission-payload {:conv-id conv-id+ :external-id nil+ :user-id rasta-id+ :positive true+ :freeform "from a legacy button"+ :channel-id channel-id+ :message-ts message-ts})+ result (#'slackbot/handle-feedback-modal-submission payload)]+ @result+ (let [row (t2/select-one :model/MetabotFeedback :message_id message-id :user_id rasta-id)]+ (is (some? row) "fallback resolved the message and persisted feedback")+ (is (true? (:positive row)))+ (is (= "from a legacy button" (:freeform_feedback row))))+ (is (= 1 (count @harbormaster-calls)))+ (is (=? {:feedback {:message_id external-id :positive true}}+ (first @harbormaster-calls))+ "harbormaster receives the resolved external_id, not the channel/ts pair"))))+ (finally (tear-down-slackbot-feedback! conv-id))))))++;; -------------------------------- conversation-permalink ---------------------------------------++(deftest conversation-permalink-returns-nil-when-slack-not-configured-test+ (testing "conversation-permalink does not call Slack when slack-configured? is false"+ (let [client-calls (atom 0)]+ (with-redefs [channel.settings/slack-configured? (constantly false)+ slackbot.client/get-permalink (fn [& _]+ (swap! client-calls inc)+ {:ok true :permalink "should-not-be-returned"})]+ (is (nil? (slackbot/conversation-permalink "C123" "1.0")))+ (is (zero? @client-calls)+ "no slack client call when not configured")))))++(deftest conversation-permalink-returns-nil-when-channel-or-ts-missing-test+ (testing "conversation-permalink short-circuits to nil when channel or ts is missing — no client call"+ (let [client-calls (atom 0)]+ (with-redefs [channel.settings/slack-configured? (constantly true)+ channel.settings/unobfuscated-slack-app-token (constantly "xoxb-test")+ slackbot.client/get-permalink (fn [& _]+ (swap! client-calls inc)+ {:ok true})]+ (is (nil? (slackbot/conversation-permalink nil "1.0")))+ (is (nil? (slackbot/conversation-permalink "C123" nil)))+ (is (zero? @client-calls))))))++(deftest conversation-permalink-happy-path-test+ (testing "conversation-permalink returns the Slack permalink string when ok is true"+ (with-redefs [channel.settings/slack-configured? (constantly true)+ channel.settings/unobfuscated-slack-app-token (constantly "xoxb-test")+ slackbot.client/get-permalink (fn [_client {:keys [channel ts]}]+ {:ok true+ :permalink (format "https://slack.example/%s/%s" channel ts)})]+ (is (= "https://slack.example/C123/1.0"+ (slackbot/conversation-permalink "C123" "1.0"))))))++(deftest conversation-permalink-returns-nil-when-slack-says-not-ok-test+ (testing "conversation-permalink returns nil when Slack responds with {:ok false}"+ (with-redefs [channel.settings/slack-configured? (constantly true)+ channel.settings/unobfuscated-slack-app-token (constantly "xoxb-test")+ slackbot.client/get-permalink (fn [& _]+ {:ok false :error "channel_not_found"})]+ (is (nil? (slackbot/conversation-permalink "C123" "1.0"))))))++(deftest conversation-permalink-swallows-client-exception-test+ (testing "exceptions from the Slack client are caught — function returns nil rather than propagating"+ (with-redefs [channel.settings/slack-configured? (constantly true)+ channel.settings/unobfuscated-slack-app-token (constantly "xoxb-test")+ slackbot.client/get-permalink (fn [& _]+ (throw (ex-info "slack down" {})))]+ (is (nil? (slackbot/conversation-permalink "C123" "1.0"))))));; -------------------------------- Visualization Integration Tests --------------------------------diff --git a/test/metabase/slackbot/channel_test.clj b/test/metabase/slackbot/channel_test.cljnew file mode 100644index 00000000000..ae795e2cacd--- /dev/null+++ b/test/metabase/slackbot/channel_test.clj@@ -0,0 +1,39 @@+(ns metabase.slackbot.channel-test+ (:require+ [clojure.test :refer :all]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.slackbot.channel :as slackbot.channel]+ [metabase.slackbot.client :as slackbot.client]))++(deftest channel-response-passes-slack-metadata-for-deep-linking-test+ (let [request-opts (atom nil)]+ (with-redefs [slackbot.client/set-status (constantly {:ok true})+ slackbot.client/post-thread-reply (constantly {:ok true :ts "1700000000.000002"})+ metabot.persistence/set-response-slack-msg-id! (constantly nil)]+ (slackbot.channel/send-channel-response+ {}+ {:ts "1700000000.000001"}+ nil+ {:channel-id "C123"+ :message-ctx {:channel "C123" :thread_ts "1700000000.000001"}+ :channel "C123"+ :thread-ts "1700000000.000001"+ :auth-info {:team_id "T123"}+ :thread {:messages []}+ :bot-user-id "U999"+ :prompt "hello"+ :conversation-id "conversation-id"}+ {:tool-name->friendly {}+ :make-streaming-ai-request (fn [& args]+ (reset! request-opts (last args))+ "message-external-id")+ :collect-viz-blocks (constantly {:blocks [] :errors []})+ :feedback-blocks (constantly [])+ :post-viz-error! (constantly nil)+ :make-viz-prefetch-callback (constantly (fn [& _]))+ :cancel-prefetched-viz! (constantly nil)}))+ (is (= {:team-id "T123"+ :thread-ts "1700000000.000001"+ :req-slack-msg-id "1700000000.000001"}+ (select-keys @request-opts [:team-id :thread-ts :req-slack-msg-id])))+ (is (some? (:stored-msg-id @request-opts)))))diff --git a/test/metabase/slackbot/persistence_test.clj b/test/metabase/slackbot/persistence_test.cljindex c975f996efd..e72cf1b60d0 100644--- a/test/metabase/slackbot/persistence_test.clj+++ b/test/metabase/slackbot/persistence_test.clj@@ -61,6 +61,99 @@(is (= #{deleted-ts}(slackbot.persistence/deleted-message-ids conv-id #{deleted-ts}))))))))+(deftest message-history-native-shape-test+ (testing "assistant messages persisted in native-parts shape are translated to AI-SDK messages"+ (let [conv-id (str (random-uuid))+ slack-ts "1712000000.000001"+ search-id "call-search"+ query-id "call-query"]+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (t2/insert! :model/MetabotConversation {:id conv-id :user_id (mt/user->id :rasta)})+ (t2/insert! :model/MetabotMessage+ {:conversation_id conv-id+ :slack_msg_id slack-ts+ :role "assistant"+ :profile_id "slackbot"+ :total_tokens 10+ :data [{:type :text :text "Let me check."}+ {:type :tool-input+ :id search-id+ :function "search"+ :arguments {:query "orders"}}+ {:type :tool-output+ :id search-id+ :result {:output "<result>orders</result>"+ :structured-output {:query-id "qid-1"}}}+ {:type :tool-input+ :id query-id+ :function "construct_notebook_query"+ :arguments {:data_source_ids ["table-1"]}}+ {:type :tool-output+ :id query-id+ :result {:output "<result>query</result>"}}]})+ (let [result (slackbot.persistence/message-history conv-id #{slack-ts})+ msgs (get result slack-ts)]+ (testing "text blocks are skipped — only tool blocks surface"+ (is (= 4 (count msgs))))+ (testing "tool-input → assistant message with :tool_calls"+ (is (= {:role :assistant+ :tool_calls [{:id search-id+ :name "search"+ :arguments {:query "orders"}}]}+ (first msgs))))+ (testing "tool-output → tool message with :content and :tool_call_id"+ (is (= {:role :tool+ :tool_call_id search-id+ :content "<result>orders</result>"}+ (second msgs))))+ (testing "order is preserved — matching tool-call/tool-result pairs stay adjacent"+ (is (= [search-id search-id query-id query-id]+ (mapv #(or (:tool_call_id %)+ (-> % :tool_calls first :id))+ msgs)))+ (is (= ["search" "construct_notebook_query"]+ (->> msgs+ (filter #(= :assistant (:role %)))+ (map #(-> % :tool_calls first :name)))))))))))++(deftest message-history-mixed-shape-test+ (testing "a single message row with both legacy and native blocks round-trips both shapes in order"+ (let [conv-id (str (random-uuid))+ slack-ts "1712000000.000002"]+ (mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]+ (t2/insert! :model/MetabotConversation {:id conv-id :user_id (mt/user->id :rasta)})+ (t2/insert! :model/MetabotMessage+ {:conversation_id conv-id+ :slack_msg_id slack-ts+ :role "assistant"+ :profile_id "slackbot"+ :total_tokens 5+ :data [{:_type "TOOL_CALL"+ :role "assistant"+ :tool_calls [{:id "legacy-1" :name "search" :arguments "{}"}]}+ {:_type "TOOL_RESULT"+ :role "tool"+ :tool_call_id "legacy-1"+ :content "legacy output"}+ {:type :tool-input+ :id "native-1"+ :function "construct_notebook_query"+ :arguments {:data_source_ids ["t1"]}}+ {:type :tool-output+ :id "native-1"+ :result {:output "native output"}}]})+ (let [msgs (get (slackbot.persistence/message-history conv-id #{slack-ts}) slack-ts)]+ (is (= 4 (count msgs)))+ (testing "legacy blocks still normalize correctly"+ (is (= :assistant (:role (nth msgs 0))))+ (is (= "legacy-1" (-> (nth msgs 0) :tool_calls first :id)))+ (is (= {:role :tool :tool_call_id "legacy-1" :content "legacy output"}+ (nth msgs 1))))+ (testing "native blocks translate alongside legacy blocks"+ (is (= "native-1" (-> (nth msgs 2) :tool_calls first :id)))+ (is (= {:role :tool :tool_call_id "native-1" :content "native output"}+ (nth msgs 3)))))))))+(deftest soft-delete-response-test(testing "soft-delete-response! marks the assistant response as deleted"(mt/with-model-cleanup [:model/MetabotMessage [:model/MetabotConversation :created_at]]diff --git a/test/metabase/slackbot/streaming_test.clj b/test/metabase/slackbot/streaming_test.cljindex 0bba471dde4..985bd430e13 100644--- a/test/metabase/slackbot/streaming_test.clj+++ b/test/metabase/slackbot/streaming_test.clj@@ -115,8 +115,9 @@(deftest feedback-blocks-test(testing "feedback-blocks generates correct Slack context_actions block with feedback_buttons"- (let [conversation-id "test-conv-123"- blocks (#'slackbot.streaming/feedback-blocks conversation-id)]+ (let [conversation-id "test-conv-123"+ message-external-id "msg-ext-abc"+ blocks (#'slackbot.streaming/feedback-blocks conversation-id message-external-id)](is (= 1 (count blocks)))(let [{:keys [type block_id elements]} (first blocks)](is (= "context_actions" type))@@ -126,10 +127,14 @@(is (= "feedback_buttons" (:type fb)))(is (= "metabot_feedback" (:action_id fb)))(testing "positive button"- (is (= {:conversation_id conversation-id :positive true}+ (is (= {:conversation_id conversation-id+ :message_external_id message-external-id+ :positive true}(json/decode (get-in fb [:positive_button :value]) true))))(testing "negative button"- (is (= {:conversation_id conversation-id :positive false}+ (is (= {:conversation_id conversation-id+ :message_external_id message-external-id+ :positive false}(json/decode (get-in fb [:negative_button :value]) true)))))))))(deftest streaming-response-includes-feedback-blocks-test@@ -174,7 +179,7 @@@posted-message))))))(deftest slackbot-streaming-sets-ai-proxied-on-messages-test- (testing "store-message! receives ai-proxy? = true for metabase/ prefixed provider"+ (testing "user + assistant persists receive ai-proxy? = true for metabase/ prefixed provider"(tu/with-slackbot-setup(let [event-body tu/base-dm-eventstore-opts (atom [])]@@ -186,6 +191,10 @@(constantly nil)metabot.persistence/store-message!(fn [_conv-id _profile-id _messages & {:as opts}]+ (swap! store-opts conj opts)+ nil)+ metabot.persistence/store-native-parts!+ (fn [_conv-id _profile-id _parts & {:as opts}](swap! store-opts conj opts)nil)](mt/client :post 200 "metabot/slack/events"@@ -194,13 +203,36 @@(u/poll {:thunk #(>= (count @stop-stream-calls) 1):done? true?:timeout-ms 5000})))- (testing "user + assistant store-message! calls both received ai-proxy? = true"+ (testing "user (store-message!) + assistant (store-native-parts!) both received ai-proxy? = true"(is (=? [{:ai-proxy? true}{:ai-proxy? true}]@store-opts)))))))))+(deftest slackbot-streaming-persists-failed-conversations-test+ (testing "User message is persisted even if setup throws after it (BOT-1279)"+ (tu/with-slackbot-setup+ (let [event-body tu/base-dm-event+ stored (promise)]+ (tu/with-slackbot-mocks+ {:ai-text "Hello!"}+ (fn [_ctx]+ (with-redefs [metabot.persistence/store-message!+ (fn [_conv-id _profile-id _messages & {:as opts}]+ (deliver stored opts)+ nil)+ ;; Force setup to throw *after* the user message has been stored.+ slackbot.persistence/message-history+ (fn [& _] (throw (ex-info "boom" {})))]+ (mt/client :post 200 "metabot/slack/events"+ (tu/slack-request-options event-body)+ event-body)+ (let [opts (deref stored 5000 ::timeout)]+ (testing "user store-message! was called before the failure"+ (is (not= ::timeout opts))+ (is (some? (:slack-msg-id opts))))))))))))+(deftest slackbot-streaming-sets-ai-proxied-false-for-byok-test- (testing "store-message! receives ai-proxy? = false for direct BYOK provider"+ (testing "user + assistant persists receive ai-proxy? = false for direct BYOK provider"(tu/with-slackbot-setup(let [event-body tu/base-dm-eventstore-opts (atom [])]@@ -210,6 +242,10 @@(mt/with-temporary-setting-values [llm-metabot-provider "anthropic/claude-haiku-4-5"](with-redefs [metabot.persistence/store-message!(fn [_conv-id _profile-id _messages & {:as opts}]+ (swap! store-opts conj opts)+ nil)+ metabot.persistence/store-native-parts!+ (fn [_conv-id _profile-id _parts & {:as opts}](swap! store-opts conj opts)nil)](mt/client :post 200 "metabot/slack/events"@@ -218,7 +254,7 @@(u/poll {:thunk #(>= (count @stop-stream-calls) 1):done? true?:timeout-ms 5000})))- (testing "user + assistant store-message! calls both received ai-proxy? = false"+ (testing "user (store-message!) + assistant (store-native-parts!) both received ai-proxy? = false"(is (=? [{:ai-proxy? false}{:ai-proxy? false}]@store-opts)))))))))diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.cljindex 160913294c1..8d63163426f 100644--- a/test/metabase/test/util.clj+++ b/test/metabase/test/util.clj@@ -217,6 +217,24 @@:name "Mock Measure":table_id (data/id :checkins)}))+ :model/MetabotConversation+ (fn [_] {:id (str (random-uuid))+ :user_id (rasta-id)})++ :model/MetabotMessage+ ;; `:conversation_id` is required and has no sensible default — callers must provide one.+ (fn [_] {:role "assistant"+ :profile_id "gpt-5"+ :total_tokens 0+ :data []})++ :model/AiUsageLog+ (fn [_] {:source "test"+ :model "test/model"+ :prompt_tokens 0+ :completion_tokens 0+ :total_tokens 0})+:model/NativeQuerySnippet(fn [_] (default-timestamped{:creator_id (user-id :crowberto)