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
move ee/llm into oss (#71068)
Oleksandr Solovyovc2ad36cccbd3
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.ednindex 6afacd0a397..95ff39763b2 100644--- a/.clj-kondo/config.edn+++ b/.clj-kondo/config.edn@@ -553,6 +553,7 @@metabase-enterprise.cache.config-test/with-temp-persist-models hooks.common/with-seven-bindingsmetabase-enterprise.dependencies.api-test/with-dependents-test! hooks.common/with-two-bindingsmetabase-enterprise.metabot-v3.tools.dependencies-test/with-dependent-transforms! hooks.common/with-two-bindings+ metabase-enterprise.metabot.tools.dependencies-test/with-dependent-transforms! hooks.common/with-two-bindingsmetabase-enterprise.semantic-search.db.connection/with-migrate-tx hooks.common/let-one-with-optional-valuemetabase-enterprise.serialization.api-test/with-serialization-test-data! hooks.common/with-three-bindingsmetabase-enterprise.serialization.test-util/with-temp-dpc hooks.toucan2.tools.with-temp/with-tempdiff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 95c01a7b100..59e181c83d4 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -141,6 +141,19 @@:model/QueryExecution:model/Table}}+ agent-api+ {:team "Metabot"+ :api #{metabase.agent-api.api}+ :friends #{enterprise/agent-api}+ :uses #{api+ auth-identity+ metabot+ query-processor+ request+ server+ util}+ :model-imports #{:model/User}}+analytics{:team "UX West":api #{metabase.analytics.api@@ -211,7 +224,6 @@metabase.api.macrosmetabase.api.macros.scopemetabase.api.open-api- metabase.api.responsemetabase.api.routes.commonmetabase.api.settingsmetabase.api.util@@ -402,7 +414,6 @@channel{:team "Gadget":api #{metabase.channel.api- metabase.channel.api.slackmetabase.channel.coremetabase.channel.emailmetabase.channel.email.messages@@ -432,6 +443,7 @@premium-featuresquery-processorsettings+ slackbotsystemtasktimeline@@ -1027,10 +1039,11 @@internal-stats{:team "UX West"- :api #{metabase.internal-stats.core}+ :api #{metabase.internal-stats.core+ metabase.internal-stats.metabot}:uses #{app-dbmodels}- :model-imports #{:model/Card :model/Dashboard :model/QueryExecution :model/User}}+ :model-imports #{:model/Card :model/Dashboard :model/MetabotMessage :model/QueryExecution :model/User}}legacy-mbql{:team "Querying"@@ -1119,7 +1132,8 @@llm{:team "Metabot":api #{metabase.llm.api- metabase.llm.init}+ metabase.llm.init+ metabase.llm.settings}:uses #{analyticsapidriver@@ -1175,6 +1189,70 @@:model-exports #{:model/Measure}:model-imports #{:model/Collection :model/Table :model/User}}+ metabot+ {:team "Metabot"+ :api #{metabase.metabot.api+ metabase.metabot.api.entity-analysis+ metabase.metabot.api.sql-fixer+ metabase.metabot.api.sql-generation+ metabase.metabot.init}+ :friends #{agent-api+ enterprise/metabot+ slackbot}+ :uses #{activity-feed+ analytics+ analyze+ api+ app-db+ audit-app+ channel+ collections+ config+ documents+ driver+ internal-stats+ legacy-mbql+ lib+ lib-be+ llm+ models+ native-query-snippets+ notification+ parameters+ permissions+ premium-features+ pulse+ query-processor+ request+ search+ server+ settings+ slackbot+ sql-tools+ store-api+ sync+ system+ task+ transforms+ transforms-base+ util+ warehouses}+ :model-exports #{:model/Metabot+ :model/MetabotConversation+ :model/MetabotMessage+ :model/MetabotPrompt}+ :model-imports #{:model/Card+ :model/Collection+ :model/Dashboard+ :model/Database+ :model/Field+ :model/Glossary+ :model/ModerationReview+ :model/QueryTable+ :model/Table+ :model/Transform+ :model/User}}+metrics{:team "UX West":api #{metabase.metrics.api@@ -1817,6 +1895,7 @@requestsessionsettings+ ssosystemtracingusers@@ -1892,6 +1971,34 @@util}:model-imports #{:model/AuthIdentity :model/User}}+ slackbot+ {:team "Metabot"+ :api #{metabase.slackbot.api+ metabase.slackbot.config+ metabase.slackbot.init}+ :friends #{metabot}+ :uses #{analytics+ api+ channel+ config+ formatter+ lib+ metabot+ permissions+ query-processor+ request+ server+ settings+ sso+ system+ upload+ util}+ :model-imports #{:model/AuthIdentity+ :model/Card+ :model/Database+ :model/MetabotMessage+ :model/User}}+source-swap{:team "Graphy":api #{metabase.source-swap.core@@ -1920,18 +2027,22 @@sso{:team "UX West"- :api #{metabase.sso.api- metabase.sso.core- metabase.sso.init}- :uses #{api- auth-identity- config- permissions- premium-features- settings- system- util}- :model-imports #{:model/PermissionsGroupMembership}}+ :api #{metabase.sso.api+ metabase.sso.api.slack-connect+ metabase.sso.core+ metabase.sso.init+ metabase.sso.settings}+ :friends #{enterprise/sso}+ :uses #{api+ auth-identity+ config+ permissions+ premium-features+ request+ settings+ system+ util}+ :model-imports #{:model/AuthIdentity :model/PermissionsGroupMembership}}startup{:team "DevEx"@@ -2497,49 +2608,17 @@enterprise/agent-api{:team "Metabot"- :api #{metabase-enterprise.agent-api.api}- :uses #{api- auth-identity- query-processor- request- server- util- enterprise/api- enterprise/metabot-v3- enterprise/workspaces}- :model-imports #{:model/User}}-- enterprise/ai-entity-analysis- {:team "Metabot"- :api #{metabase-enterprise.ai-entity-analysis.api}- :uses #{api- premium-features- enterprise/metabot-v3}}-- enterprise/ai-sql-fixer- {:team "Metabot"- :api #{metabase-enterprise.ai-sql-fixer.api}- :uses #{api- driver- lib- lib-be- query-processor- util- enterprise/metabot-v3}}-- enterprise/ai-sql-generation- {:team "Metabot"- :api #{metabase-enterprise.ai-sql-generation.api}+ :api #{metabase-enterprise.agent-api.workspace}:uses #{api- driverutil- enterprise/metabot-v3}}+ enterprise/workspaces}}enterprise/analytics{:team "UX West":api #{}:uses #{driverpremium-features+ ssoenterprise/advanced-configenterprise/scimenterprise/semantic-search@@ -2548,8 +2627,7 @@enterprise/api{:team "UX West"- :api #{metabase-enterprise.api.core- metabase-enterprise.api.routes.common}+ :api #{metabase-enterprise.api.core}:uses #{apipremium-featuresutil}}@@ -2849,82 +2927,21 @@premium-features}:model-imports #{:model/Card :model/Collection :model/Table}}- enterprise/llm- {:team "Metabot"- :api #{metabase-enterprise.llm.api- metabase-enterprise.llm.init- metabase-enterprise.llm.settings}- :uses #{analytics- analyze- api- parameters- query-processor- settings- util}- :model-imports #{:model/Dashboard}}-- enterprise/metabot-v3+ enterprise/metabot{:team "Metabot"- :api #{metabase-enterprise.metabot-v3.api- metabase-enterprise.metabot-v3.core- metabase-enterprise.metabot-v3.init- metabase-enterprise.metabot-v3.tools.api}+ :api #{}:friends #{enterprise/agent-api- enterprise/slackbot}- :uses #{activity-feed- analytics- api- app-db- audit-app- channel- collections- config- documents- driver- legacy-mbql- lib+ slackbot+ metabot}+ :uses #{apilib-be+ metabotmodels- native-query-snippets- notification- parameters- permissionspremium-features- pulse- query-processor- request- search- server- settings- sql-tools- store-api- sync- system- task- transforms- transforms-baseutil- warehouses- enterprise/apienterprise/dependencies- enterprise/llm- enterprise/slackbotenterprise/transforms-python}- :model-exports #{:model/Metabot- :model/MetabotConversation- :model/MetabotMessage- :model/MetabotPrompt}- :model-imports #{:model/Card- :model/Collection- :model/Dashboard- :model/Database- :model/Field- :model/Glossary- :model/ModerationReview- :model/QueryTable- :model/Table- :model/Transform- :model/User}}+ :model-imports #{:model/Card :model/Transform}}enterprise/permission-debug{:team "UX West"@@ -3069,6 +3086,7 @@app-dbconfigconnection-pool+ llmmodelspermissionspremium-features@@ -3076,8 +3094,7 @@settingstasktracing- util- enterprise/llm}+ util}:model-imports #{:model/Card :model/Collection :model/ModelIndex}}enterprise/serialization@@ -3103,32 +3120,6 @@util}:model-imports #{:model/Card :model/Collection :model/Dashboard :model/User}}- enterprise/slackbot- {:team "Metabot"- :api #{metabase-enterprise.slackbot.init}- :friends #{enterprise/metabot-v3}- :uses #{analytics- api- channel- config- formatter- lib- permissions- premium-features- query-processor- request- settings- system- upload- util- enterprise/metabot-v3- enterprise/sso}- :model-imports #{:model/AuthIdentity- :model/Card- :model/Database- :model/MetabotMessage- :model/User}}-enterprise/snippet-collections{:team "Querying":api #{}@@ -3157,7 +3148,7 @@systemutilenterprise/scim}- :model-imports #{:model/AuthIdentity :model/PermissionsGroup :model/Session}}+ :model-imports #{:model/PermissionsGroup :model/Session}}enterprise/stale{:team "UX West"diff --git a/e2e/support/helpers/e2e-metabot-helpers.ts b/e2e/support/helpers/e2e-metabot-helpers.tsindex 2a0850b9442..cd25837be7e 100644--- a/e2e/support/helpers/e2e-metabot-helpers.ts+++ b/e2e/support/helpers/e2e-metabot-helpers.ts@@ -79,7 +79,7 @@ export function lastChatMessage() {export const mockMetabotResponse = (response: StaticResponse) => {return cy- .intercept("POST", "/api/ee/metabot-v3/agent-streaming", (req) => {+ .intercept("POST", "/api/metabot/agent-streaming", (req) => {req.reply({status: 200,...response,diff --git a/e2e/test-component/scenarios/embedding-sdk/metabot-question.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/metabot-question.cy.spec.tsxindex f0ee539bfcb..4e1e4f01ba3 100644--- a/e2e/test-component/scenarios/embedding-sdk/metabot-question.cy.spec.tsx+++ b/e2e/test-component/scenarios/embedding-sdk/metabot-question.cy.spec.tsx@@ -337,7 +337,7 @@ describe("scenarios > embedding-sdk > metabot-question > enablement", () => {const mockSuggestedPrompts = () => {cy.intercept("GET",- "/api/ee/metabot-v3/metabot/2/prompt-suggestions?limit=3&sample=true",+ "/api/metabot/metabot/2/prompt-suggestions?limit=3&sample=true",{statusCode: 200,body: {diff --git a/e2e/test/scenarios/data-studio/workspaces-metabot.cy.spec.ts b/e2e/test/scenarios/data-studio/workspaces-metabot.cy.spec.tsindex 473d9823afc..14b9eaf1813 100644--- a/e2e/test/scenarios/data-studio/workspaces-metabot.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/workspaces-metabot.cy.spec.ts@@ -32,7 +32,7 @@ describe.skip("scenarios > data studio > workspaces > metabot", () => {});cy.intercept("POST", "/api/ee/workspace").as("createWorkspace");- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");});it("should be able to create a transform via metabot in workspace", () => {diff --git a/e2e/test/scenarios/metabot/metabot-query-builder.cy.spec.ts b/e2e/test/scenarios/metabot/metabot-query-builder.cy.spec.tsindex 6910bfae6b9..cd0730eb7d9 100644--- a/e2e/test/scenarios/metabot/metabot-query-builder.cy.spec.ts+++ b/e2e/test/scenarios/metabot/metabot-query-builder.cy.spec.ts@@ -42,7 +42,7 @@ describe("Metabot Query Builder", () => {H.restore();cy.signInAsAdmin();H.activateToken("bleeding-edge");- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");});it("should redirect to notebook when metabot-enabled? is false", () => {@@ -110,7 +110,7 @@ describe("Metabot Query Builder", () => {it("should support clicking suggested prompts", () => {// mock suggested prompts- cy.intercept("GET", "/api/ee/metabot-v3/metabot/*/prompt-suggestions*", {+ cy.intercept("GET", "/api/metabot/metabot/*/prompt-suggestions*", {prompts: [{ prompt: "Show me all orders" }],});@@ -170,7 +170,7 @@ describe("Metabot Query Builder", () => {});it("should not reuse the nlq profile after falling back to notebook chat", () => {- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming", (req) => {+ cy.intercept("POST", "/api/metabot/agent-streaming", (req) => {req.reply({statusCode: 200,body: mockTextOnlyResponse("ok"),diff --git a/e2e/test/scenarios/metabot/metabot.cy.spec.ts b/e2e/test/scenarios/metabot/metabot.cy.spec.tsindex 823f7727f9a..8acdc47c583 100644--- a/e2e/test/scenarios/metabot/metabot.cy.spec.ts+++ b/e2e/test/scenarios/metabot/metabot.cy.spec.ts@@ -9,7 +9,7 @@ describe("Metabot UI", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");cy.intercept("GET", "/api/automagic-dashboards/database/*/candidates").as("xrayCandidates",);diff --git a/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts b/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.tsindex a591726f827..4b89f8f58eb 100644--- a/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts+++ b/e2e/test/scenarios/metabot/native-sql-generation.cy.spec.ts@@ -163,9 +163,7 @@ describe("Native SQL generation", () => {H.restore();cy.signInAsAdmin();H.activateToken("bleeding-edge");- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as(- "agentReq",- );+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");});it("should be able to successfully generate sql", () => {@@ -258,9 +256,7 @@ describe("Native SQL generation", () => {H.restore("postgres-12");cy.signInAsAdmin();H.activateToken("bleeding-edge");- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as(- "agentReq",- );+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");});it("should manage conversation state correctly", () => {diff --git a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.tsindex d87f5e3ea42..23058abd3d4 100644--- a/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts+++ b/e2e/test/scenarios/metabot/transforms-codegen.cy.spec.ts@@ -86,7 +86,7 @@ describe(H.activateToken("bleeding-edge");H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: SOURCE_TABLE });- cy.intercept("POST", "/api/ee/metabot-v3/agent-streaming").as("agentReq");+ cy.intercept("POST", "/api/metabot/agent-streaming").as("agentReq");cy.intercept("POST", "/api/transform").as("createTransform");cy.intercept("PUT", "/api/transform/*").as("updateTransform");});diff --git a/e2e/test/scenarios/native/ai-sql-fixer.cy.spec.ts b/e2e/test/scenarios/native/ai-sql-fixer.cy.spec.tsindex 4e7201bb345..6cdf18656d5 100644--- a/e2e/test/scenarios/native/ai-sql-fixer.cy.spec.ts+++ b/e2e/test/scenarios/native/ai-sql-fixer.cy.spec.ts@@ -9,7 +9,6 @@ describe("scenarios > native > ai sql fixer", () => {cy.signInAsAdmin();H.enableTracking();H.activateToken("bleeding-edge");- cy.intercept("POST", "/api/ee/ai-sql-fixer/fix").as("fixSql");});afterEach(() => {diff --git a/enterprise/backend/src/metabase_enterprise/agent_api/workspace.clj b/enterprise/backend/src/metabase_enterprise/agent_api/workspace.cljindex eaea93cb942..8c830967861 100644--- a/enterprise/backend/src/metabase_enterprise/agent_api/workspace.clj+++ b/enterprise/backend/src/metabase_enterprise/agent_api/workspace.clj@@ -2,14 +2,12 @@"Workspace endpoints for the Agent API, mounted at `/api/agent/v1/workspace/...`.Provides workspace access with JWT-based agent authentication."(:require- [metabase-enterprise.api.core :as ee.api][metabase-enterprise.workspaces.api.common :as ws.api.common][metabase-enterprise.workspaces.types :as ws.t][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :as api.routes.common]- [metabase.api.util.handlers :as handlers]- [metabase.util.i18n :as i18n :refer [deferred-tru]]+ [metabase.util.i18n :as i18n][metabase.util.malli.schema :as ms]))(set! *warn-on-reflection* true)@@ -335,7 +333,4 @@"Returns the workspace routes for the agent API, keyed by version prefix.Currently only v1; new versions can be added here without changing api.clj."[+auth]- (handlers/route-map-handler- {"/v1" {"/workspace" (ee.api/+require-premium-feature- :workspaces (deferred-tru "Workspaces")- (api.macros/ns-handler 'metabase-enterprise.agent-api.workspace +authorize +auth))}}))+ (api.macros/ns-handler 'metabase-enterprise.agent-api.workspace +authorize +auth))diff --git a/enterprise/backend/src/metabase_enterprise/analytics/stats.clj b/enterprise/backend/src/metabase_enterprise/analytics/stats.cljindex 82af70e509d..42b4e3939d9 100644--- a/enterprise/backend/src/metabase_enterprise/analytics/stats.clj+++ b/enterprise/backend/src/metabase_enterprise/analytics/stats.clj@@ -3,9 +3,10 @@[metabase-enterprise.advanced-config.settings :as advanced-config.settings][metabase-enterprise.scim.core :as scim][metabase-enterprise.semantic-search.core :as semantic-search]- [metabase-enterprise.sso.settings :as sso-settings]+ [metabase-enterprise.sso.settings :as ee-sso-settings][metabase.driver :as driver][metabase.premium-features.core :as premium-features :refer [defenterprise]]+ [metabase.sso.settings :as sso-settings][toucan2.core :as t2]))(defenterprise ee-snowplow-features-data@@ -15,10 +16,10 @@[][{:name :sso-jwt:available (premium-features/enable-sso-jwt?)- :enabled (sso-settings/jwt-enabled)}+ :enabled (ee-sso-settings/jwt-enabled)}{:name :sso-saml:available (premium-features/enable-sso-saml?)- :enabled (sso-settings/saml-enabled)}+ :enabled (ee-sso-settings/saml-enabled)}{:name :sso-slack:available (premium-features/enable-sso-slack?):enabled (sso-settings/slack-connect-enabled)}diff --git a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj b/enterprise/backend/src/metabase_enterprise/api_routes/routes.cljindex ad874c0303e..8a56a36129d 100644--- a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj+++ b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj@@ -8,10 +8,7 @@[metabase-enterprise.action-v2.api][metabase-enterprise.advanced-config.api.logs][metabase-enterprise.advanced-permissions.api.routes]- [metabase-enterprise.agent-api.api]- [metabase-enterprise.ai-entity-analysis.api]- [metabase-enterprise.ai-sql-fixer.api]- [metabase-enterprise.ai-sql-generation.api]+ [metabase-enterprise.agent-api.workspace :as agent-api.workspace][metabase-enterprise.api.core :as ee.api][metabase-enterprise.audit-app.api.routes][metabase-enterprise.billing.api.routes]@@ -27,9 +24,6 @@[metabase-enterprise.embedding-hub.api][metabase-enterprise.gsheets.api :as gsheets.api][metabase-enterprise.library.api]- [metabase-enterprise.llm.api]- [metabase-enterprise.metabot-v3.api]- [metabase-enterprise.metabot-v3.tools.api][metabase-enterprise.permission-debug.api][metabase-enterprise.remote-sync.api][metabase-enterprise.replacement.api]@@ -44,20 +38,15 @@[metabase-enterprise.transforms.api][metabase-enterprise.upload-management.api][metabase-enterprise.workspaces.api]+ [metabase.agent-api.api :as agent-api][metabase.api.macros :as api.macros][metabase.api.util.handlers :as handlers][metabase.util.i18n :refer [deferred-tru]]))-(comment metabase-enterprise.advanced-config.api.logs/keep-me- metabase-enterprise.llm.api/keep-me- metabase-enterprise.agent-api.api/keep-me)+(comment metabase-enterprise.advanced-config.api.logs/keep-me)(def ^:private required-feature->message{:advanced-permissions (deferred-tru "Advanced Permissions")- :agent-api (deferred-tru "Agent API")- :ai-sql-fixer (deferred-tru "AI SQL Fixer")- :ai-sql-generation (deferred-tru "AI SQL Generation")- :ai-entity-analysis (deferred-tru "AI Entity Analysis"):attached-dwh (deferred-tru "Attached DWH"):audit-app (deferred-tru "Audit app"):collection-cleanup (deferred-tru "Collection Cleanup")@@ -68,7 +57,6 @@:remote-sync (deferred-tru "Remote Sync"):etl-connections (deferred-tru "ETL Connections"):etl-connections-pg (deferred-tru "ETL Connections PG replication")- :llm-autodescription (deferred-tru "LLM Auto-description"):metabot-v3 (deferred-tru "MetaBot"):scim (deferred-tru "SCIM configuration"):semantic-search (deferred-tru "Semantic Search")@@ -93,8 +81,7 @@`/ee/<feature>/`).TODO -- Please fix them! See #22687"- {"/agent" (premium-handler metabase-enterprise.agent-api.api/routes :agent-api)- "/moderation-review" metabase-enterprise.content-verification.api.routes/routes+ {"/moderation-review" metabase-enterprise.content-verification.api.routes/routes"/mt" metabase-enterprise.sandbox.api.routes/sandbox-routes"/table" metabase-enterprise.sandbox.api.routes/sandbox-table-routes})@@ -105,11 +92,7 @@;; Postponing a granular flag for :actions until it's used more widely.{"/action-v2" (premium-handler metabase-enterprise.action-v2.api/routes :table-data-editing)"/advanced-permissions" (premium-handler metabase-enterprise.advanced-permissions.api.routes/routes :advanced-permissions)- "/ai-entity-analysis" (premium-handler metabase-enterprise.ai-entity-analysis.api/routes :ai-entity-analysis)- "/ai-sql-fixer" (premium-handler metabase-enterprise.ai-sql-fixer.api/routes :ai-sql-fixer)- "/ai-sql-generation" (premium-handler metabase-enterprise.ai-sql-generation.api/routes :ai-sql-generation)"/audit-app" (premium-handler metabase-enterprise.audit-app.api.routes/routes :audit-app)- "/autodescribe" (premium-handler 'metabase-enterprise.llm.api :llm-autodescription)"/billing" metabase-enterprise.billing.api.routes/routes"/content-translation" (premium-handler metabase-enterprise.content-translation.routes/routes :content-translation)"/cloud-add-ons" metabase-enterprise.cloud-add-ons.api/routes@@ -130,8 +113,6 @@(premium-handler :etl-connections))"/library" (premium-handler metabase-enterprise.library.api/routes :library)"/logs" (premium-handler 'metabase-enterprise.advanced-config.api.logs :audit-app)- "/metabot-tools" metabase-enterprise.metabot-v3.tools.api/routes- "/metabot-v3" metabase-enterprise.metabot-v3.api/routes"/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)@@ -149,7 +130,8 @@(def ^:private routes-map(mergenaughty-routes-map- {"/ee" ee-routes-map}))+ {"/agent" {"/v1" {"/workspace" (premium-handler (agent-api.workspace/workspace-handler agent-api/+auth) :workspaces)}}+ "/ee" ee-routes-map}))(def ^{:arglists '([request respond raise])} routes"API routes only available when running Metabase® Enterprise Edition™.diff --git a/enterprise/backend/src/metabase_enterprise/core/init.clj b/enterprise/backend/src/metabase_enterprise/core/init.cljindex ba0022ba268..2ce755356df 100644--- a/enterprise/backend/src/metabase_enterprise/core/init.clj+++ b/enterprise/backend/src/metabase_enterprise/core/init.clj@@ -13,12 +13,9 @@[metabase-enterprise.database-replication.init][metabase-enterprise.dependencies.init][metabase-enterprise.gsheets.init]- [metabase-enterprise.llm.init]- [metabase-enterprise.metabot-v3.init][metabase-enterprise.remote-sync.init][metabase-enterprise.scim.init][metabase-enterprise.semantic-search.init]- [metabase-enterprise.slackbot.init][metabase-enterprise.sso.init][metabase-enterprise.stale.init][metabase-enterprise.support-access-grants.init]diff --git a/enterprise/backend/src/metabase_enterprise/llm/init.clj b/enterprise/backend/src/metabase_enterprise/llm/init.cljdeleted file mode 100644index f728ab5f908..00000000000--- a/enterprise/backend/src/metabase_enterprise/llm/init.clj+++ /dev/null@@ -1,3 +0,0 @@-(ns metabase-enterprise.llm.init- (:require- [metabase-enterprise.llm.settings]))diff --git a/enterprise/backend/src/metabase_enterprise/llm/settings.clj b/enterprise/backend/src/metabase_enterprise/llm/settings.cljdeleted file mode 100644index d70c5ba5639..00000000000--- a/enterprise/backend/src/metabase_enterprise/llm/settings.clj+++ /dev/null@@ -1,126 +0,0 @@-(ns metabase-enterprise.llm.settings- (:require- [clojure.string :as str]- [metabase.settings.core :as setting :refer [defsetting]]- [metabase.util.i18n :refer [deferred-tru tru]]))--(defsetting ee-openai-model- (deferred-tru "The OpenAI Model (e.g. ''gpt-4'', ''gpt-3.5-turbo'')")- :encryption :no- :visibility :settings-manager- :default "gpt-4.1-mini"- :export? false- :doc false)--(defsetting ee-openai-api-base-url- (deferred-tru "The OpenAI embeddings base URL used in Metabase Enterprise.")- :encryption :no- :visibility :settings-manager- :default "https://api.openai.com"- :export? false- :doc false)--(defsetting ee-openai-api-key- (deferred-tru "The OpenAI API Key used in Metabase Enterprise.")- :sensitive? true- :visibility :settings-manager- :export? false- :doc false)--(defsetting ee-anthropic-api-base-url- (deferred-tru "The Anthropic API base URL used in Metabase Enterprise.")- :encryption :no- :visibility :settings-manager- :default "https://api.anthropic.com"- :export? false- :doc false)--(defsetting ee-anthropic-api-key- (deferred-tru "The Anthropic API Key used in Metabase Enterprise.")- :sensitive? true- :visibility :settings-manager- :export? false- :doc false)--(defsetting ee-openrouter-api-base-url- (deferred-tru "The OpenRouter API base URL used for Chat Completions.")- :encryption :no- :visibility :settings-manager- :default "https://openrouter.ai/api"- :export? false- :doc false)--(defsetting ee-openrouter-api-key- (deferred-tru "The OpenRouter API Key used in Metabase Enterprise.")- :sensitive? true- :visibility :settings-manager- :export? false- :doc false)--(def ^:private supported-metabot-providers- "Set of supported LLM provider prefixes for the `ee-ai-metabot-provider` setting."- #{"anthropic" "openai" "openrouter"})--(defn- validate-metabot-provider!- "Validate that `value` has the format `provider/model` with a supported provider prefix.- Throws an exception with `:status-code 400` on invalid input."- [value]- (when-not (string? value)- (throw (ex-info (tru "Metabot provider must be a string, got: {0}" (pr-str value))- {:status-code 400})))- (let [[provider model] (str/split value #"/" 2)]- (when-not (contains? supported-metabot-providers provider)- (throw (ex-info (tru "Unknown provider {0}. Supported providers: {1}"- (pr-str provider) (str/join ", " (sort supported-metabot-providers)))- {:status-code 400- :provider provider- :supported supported-metabot-providers})))- (when (str/blank? model)- (throw (ex-info (tru "Model name is required. Expected format: provider/model, e.g. \"anthropic/claude-haiku-4-5\"")- {:status-code 400- :value value})))))--(defsetting ee-ai-metabot-provider- (deferred-tru "The AI provider and model for Metabot. Format: provider/model-name, e.g. `anthropic/claude-haiku-4-5`, `openai/gpt-4.1-mini`, `openrouter/anthropic/claude-haiku-4-5`.")- :type :string- :encryption :no- :default "openrouter/anthropic/claude-haiku-4-5"- :visibility :settings-manager- :export? false- :doc false- :setter (fn [new-value]- (when new-value- (validate-metabot-provider! new-value))- (setting/set-value-of-type! :string :ee-ai-metabot-provider new-value)))--(defsetting ee-ai-metabot-provider-lite- (deferred-tru "The AI provider and model for lightweight Metabot tasks (e.g. user intent classification).")- :type :string- :encryption :no- :default "openrouter/openai/gpt-oss-20b"- :visibility :settings-manager- :export? false- :doc false- :setter (fn [new-value]- (when new-value- (validate-metabot-provider! new-value))- (setting/set-value-of-type! :string :ee-ai-metabot-provider-lite new-value)))--(defsetting ee-ai-metabot-internal-tasks-enabled?- (deferred-tru "Controls whether Metabot performs internal tasks that might require background tasks or additional LLM calls (e.g. user intent classification).")- :type :boolean- :visibility :settings-manager- :default true- :export? false- :doc false)--(defsetting ee-ai-features-enabled- (deferred-tru "Enable AI features.")- :type :boolean- :visibility :public- :default false- :export? false- :setter (fn [new-value]- (when (some? (ee-openai-api-key))- (setting/set-value-of-type! :boolean :ee-ai-features-enabled new-value)))- :doc false)diff --git a/enterprise/backend/src/metabase_enterprise/metabot/agent/tools/transforms.clj b/enterprise/backend/src/metabase_enterprise/metabot/agent/tools/transforms.cljnew file mode 100644index 00000000000..3a2a7974d9a--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot/agent/tools/transforms.clj@@ -0,0 +1,79 @@+(ns metabase-enterprise.metabot.agent.tools.transforms+ "Enterprise implementations of Python transform tools."+ (:require+ [metabase-enterprise.metabot.tools.transforms-write :as transforms-write-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.agent.tools.transforms :as agent-transforms]+ [metabase.metabot.util :as metabot.u]+ [metabase.premium-features.core :refer [defenterprise-schema]]))++(set! *warn-on-reflection* true)++;;; ──────────────────────────────────────────────────────────────────+;;; Formatting helpers+;;; ──────────────────────────────────────────────────────────────────++(defn- format-python-library-output+ [{:keys [path] :as lib}]+ (metabot.u/xml+ [:python-library {:path path}+ (when-let [content (:content lib)] [:content content])]))++;;; ──────────────────────────────────────────────────────────────────+;;; Tool definitions+;;; ──────────────────────────────────────────────────────────────────++(defenterprise-schema get-transform-python-library-details-tool+ "Get information about a Python library by path."+ :feature :none+ [{:keys [path]} :- [:map {:closed true} [:path :string]]]+ (agent-transforms/add-output (transforms-write-tools/get-transform-python-library-details {:path path})+ format-python-library-output))++(defenterprise-schema write-transform-python-tool+ "Write new Python code or edit existing code for transforms.++ Supports two modes:+ - edit: Targeted string replacements with partial edits+ - replace: Replace entire code atomically++ For edit mode, provide edits as an array of {old_string, new_string, replace_all} objects.+ For replace mode, provide new_content with the complete Python code.++ Use `get_transform_python_library_details` before writing any Python code to inspect the shared library.+ Use the shared library in your code by adding `import common` at the top of the file.+ Keep `import common` at the top of the file even if it is currently unused."+ :feature :none+ [{:keys [transform_id edit_action thinking transform_name transform_description+ source_database source_tables]}+ :- [:map {:closed true}+ [:transform_id {:optional true} [:maybe :int]]+ [:edit_action [:map+ [:mode [:enum "edit" "replace"]]+ [:edits {:optional true} [:maybe [:sequential [:map+ [:old_string :string]+ [:new_string :string]+ [:replace_all {:optional true} [:maybe :boolean]]]]]]+ [:new_content {:optional true} [:maybe :string]]]]+ [:thinking {:optional true} [:maybe :string]]+ [:transform_name {:optional true} [:maybe :string]]+ [:transform_description {:optional true} [:maybe :string]]+ [:source_database {:optional true} [:maybe :int]]+ [:source_tables {:optional true} [:maybe :map]]]]+ (try+ (agent-transforms/add-output+ (transforms-write-tools/write-transform-python+ {:transform_id transform_id+ :edit_action edit_action+ :thinking thinking+ :transform_name transform_name+ :transform_description transform_description+ :source_database source_database+ :source_tables source_tables+ :memory-atom shared/*memory-atom*+ :context (shared/current-context)})+ agent-transforms/format-transform-write-output)+ (catch Exception e+ (if (:agent-error? (ex-data e))+ {:output (ex-message e)}+ {:output (str "Failed to write Python transform: " (or (ex-message e) "Unknown error"))}))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot/tools/api.clj b/enterprise/backend/src/metabase_enterprise/metabot/tools/api.cljnew file mode 100644index 00000000000..131e30b75d6--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot/tools/api.clj@@ -0,0 +1,126 @@+(ns metabase-enterprise.metabot.tools.api+ "EE-only metabot tool endpoints for transforms and dependencies."+ (:require+ [clojure.set :as set]+ [metabase-enterprise.metabot.tools.dependencies :as metabot.tools.dependencies]+ [metabase-enterprise.metabot.tools.transforms-write :as metabot.tools.transforms-write]+ [metabase.metabot.tools.deftool :refer [deftool]]+ [metabase.metabot.tools.transforms :as metabot.tools.transforms]+ [metabase.metabot.util :as metabot.u]+ [metabase.util.malli.registry :as mr]+ [metabase.util.malli.schema :as ms]))++;;; ------------------------------------------------ Transform Schemas ------------------------------------------------++(mr/def ::basic-transform+ [:map+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:id :int]+ [:name :string]+ [:type [:enum {:decode/tool-api-response name} "mbql" "native" "python"]]+ [:description {:optional true} [:maybe :string]]+ [:entity_id {:optional true} [:maybe :string]]+ ;; :source keys are not snake_cased to match what the FE expects / provides in user_is_viewing context+ [:source ::metabot.tools.transforms/transform-source]])++(mr/def ::full-transform+ [:merge+ ::basic-transform+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:created_at ms/TemporalString]+ [:updated_at ms/TemporalString]+ ;; :target keys are not snake_cased to match what the FE expects / provides in user_is_viewing context+ [:target ::metabot.tools.transforms/transform-target]]])++;;; ------------------------------------------------ Transform Tools --------------------------------------------------++(mr/def ::get-transforms-result+ [:or+ [:map+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:structured_output [:sequential ::basic-transform]]]+ [:map [:output :string]]])++(deftool "/get-transforms"+ "Get a list of all known transforms."+ {:result-schema ::get-transforms-result+ :handler metabot.tools.transforms/get-transforms})++(mr/def ::get-transform-details-arguments+ [:and+ [:map+ [:transform_id :int]]+ [:map {:encode/tool-api-request+ #(set/rename-keys % {:transform_id :transform-id})}]])++(mr/def ::get-transform-details-result+ [:or+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:structured_output [:sequential ::full-transform]]]+ [:map [:output :string]]])++(deftool "/get-transform-details"+ "Get information about a transform."+ {:args-schema ::get-transform-details-arguments+ :result-schema ::get-transform-details-result+ :handler metabot.tools.transforms/get-transform-details})++(mr/def ::get-transform-python-library-details-arguments+ [:and+ [:map+ [:path :string]]+ [:map {:encode/tool-api-request+ #(update-keys % metabot.u/safe->kebab-case-en)}]])++(mr/def ::get-transform-python-library-details-result+ [:or+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:structured_output [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:source :string]+ [:path :string]+ [:created_at ms/TemporalString]+ [:updated_at ms/TemporalString]]]]+ [:map [:output :string]]])++(deftool "/get-transform-python-library-details"+ "Get information about a Python library by path."+ {:args-schema ::get-transform-python-library-details-arguments+ :result-schema ::get-transform-python-library-details-result+ :handler metabot.tools.transforms-write/get-transform-python-library-details})++;;; --------------------------------------------- Dependency Tools ----------------------------------------------------++(mr/def ::check-transform-dependencies-arguments+ [:and+ [:map+ [:transform_id :int]+ [:source ::metabot.tools.transforms/transform-source]]+ [:map {:encode/tool-api-request+ #(set/rename-keys % {:transform_id :id})}]])++(mr/def ::broken-question+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:id :int]+ [:name :string]])++(mr/def ::broken-transform+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:id :int]+ [:name :string]])++(mr/def ::check-transform-dependencies-result+ [:or+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:structured_output [:map+ [:success :boolean]+ [:bad_transform_count :int]+ [:bad_transforms [:sequential ::broken-transform]]+ [:bad_question_count :int]+ [:bad_questions [:sequential ::broken-question]]]]]+ [:map [:output :string]]])++(deftool "/check-transform-dependencies"+ "Check a proposed edit to a transform and return details of cards or transforms that would be broken by the change."+ {:args-schema ::check-transform-dependencies-arguments+ :result-schema ::check-transform-dependencies-result+ :handler metabot.tools.dependencies/check-transform-dependencies})diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.clj b/enterprise/backend/src/metabase_enterprise/metabot/tools/dependencies.cljsimilarity index 93%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.cljrename to enterprise/backend/src/metabase_enterprise/metabot/tools/dependencies.cljindex aa109969b16..ab53a85c3b9 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot/tools/dependencies.clj@@ -1,10 +1,11 @@-(ns metabase-enterprise.metabot-v3.tools.dependencies+(ns metabase-enterprise.metabot.tools.dependencies(:require[metabase-enterprise.dependencies.core :as dependencies]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.lib-be.core :as lib-be]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.models.interface :as mi]+ [metabase.premium-features.core :refer [defenterprise]][toucan2.core :as t2]))(def ^:private ^:dynamic *max-reported-broken-transforms* 10)@@ -43,9 +44,10 @@{:question card :errors (get card-errors (:id card))})broken-cards))}))-(defn check-transform-dependencies+(defenterprise check-transform-dependencies"Check a proposed edit to a SQL transform, and return transforms that will break in a formatsuitable for Metabot. Takes a map with :id and :source keys."+ :feature :none[{:keys [id source]}](try(let [transform-to-check (api/check-404 (t2/select-one :model/Transform :id id))@@ -65,4 +67,4 @@{:success true :bad_transforms []})]{:structured_output result})(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms_write.clj b/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms_write.cljnew file mode 100644index 00000000000..64c6ebe4f96--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/metabot/tools/transforms_write.clj@@ -0,0 +1,100 @@+(ns metabase-enterprise.metabot.tools.transforms-write+ "Tools for writing/editing Python transform source code."+ (:require+ [metabase-enterprise.transforms-python.api :as transforms-python.api]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.tools.transforms-write :as transforms-write]+ [metabase.metabot.tools.util :as metabot.tools.u]+ [metabase.util.log :as log]))++(set! *warn-on-reflection* true)++;;; Write Transform Python Tool++(defn write-transform-python+ "Write or edit Python transform source code.++ Parameters:+ - transform-id: Optional ID of existing transform to edit+ - edit-action: Either {:mode \"edit\" :edits [...]} or {:mode \"replace\" :new-content \"...\"}+ - thinking: Explanation of what changes are being made+ - transform-name: Name for new transform (required if no transform-id)+ - transform-description: Description for new transform+ - source-database: Database ID for source tables+ - source-tables: Map of table aliases to table IDs+ - memory-atom: Atom containing agent memory (injected by wrapper)+ - context: Request context with current transform if editing++ Returns map with:+ - :structured-output - The suggested transform+ - :data-parts - Transform suggestion data part for streaming"+ [{:keys [transform_id edit_action thinking transform_name transform_description+ source_database source_tables memory-atom context]}]+ (log/info "Writing Python transform" {:transform-id transform_id+ :edit-mode (:mode edit_action)+ :has-context (some? context)})++ (let [;; Get current transform from context or memory, or create fresh one+ current-transform (cond+ ;; Try to get from context first+ (and transform_id context)+ (get-in context [:transforms (str transform_id)])++ ;; Then try memory+ (and transform_id memory-atom)+ (get-in @memory-atom [:state :transforms (str transform_id)])++ ;; Create fresh transform+ :else+ (transforms-write/create-fresh-transform :python transform_name transform_description+ source_database source_tables))++ _ (when (and transform_id (nil? current-transform))+ (throw (ex-info (str "Transform with ID " transform_id " not found. "+ "Use search to find available transforms.")+ {:agent-error? true+ :transform-id transform_id})))++ current-python (get-in current-transform [:source :query] "")++ ;; Apply edits based on mode+ new-python (case (:mode edit_action)+ "edit" (transforms-write/apply-edits current-python (:edits edit_action))+ "replace" (:new_content edit_action)+ ;; Default to replace if no mode specified but new_content provided+ (if (:new_content edit_action)+ (:new_content edit_action)+ (throw (ex-info "Invalid edit_action: must specify mode 'edit' with edits or mode 'replace' with new_content"+ {:agent-error? true+ :edit-action edit_action}))))++ ;; Build suggested transform+ suggested-transform (cond-> current-transform+ true (assoc-in [:source :query] new-python)+ true (assoc-in [:source :type] "python")+ transform_name (assoc :name transform_name)+ transform_description (assoc :description transform_description)+ source_database (assoc-in [:source :source-database] source_database)+ source_tables (assoc-in [:source :source-tables] source_tables))]++ ;; Store in memory if we have an ID+ (when (and transform_id memory-atom)+ (swap! memory-atom assoc-in [:state :transforms (str transform_id)] suggested-transform))++ (log/debug "Python transform written" {:transform-id transform_id+ :python-length (count new-python)})++ {:structured-output {:transform suggested-transform+ :thinking thinking+ :message "Transform Python code updated successfully."}+ :data-parts [(streaming/transform-suggestion-part suggested-transform)]+ :instructions "The transform suggestion has been created and displayed to the user. Do not repeat the Python content."}))++(defn get-transform-python-library-details+ "Get information about a Python library by path."+ [{:keys [path]}]+ (try+ {:structured_output+ (transforms-python.api/get-python-library-by-path path)}+ (catch Exception e+ (metabot.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools.cljdeleted file mode 100644index 6f1984dc1f0..00000000000--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools.clj+++ /dev/null@@ -1,123 +0,0 @@-(ns metabase-enterprise.metabot-v3.agent.tools- "Tool registry for the agent loop.- Provides a unified namespace for tool vars and state-aware wrapping."- (:require- [metabase-enterprise.metabot-v3.agent.tools.analyze-chart :as tools.analyze-chart]- [metabase-enterprise.metabot-v3.agent.tools.autogen-dashboard :as tools.autogen-dashboard]- [metabase-enterprise.metabot-v3.agent.tools.charts :as tools.charts]- [metabase-enterprise.metabot-v3.agent.tools.clarification :as tools.clarification]- [metabase-enterprise.metabot-v3.agent.tools.construct :as tools.construct]- [metabase-enterprise.metabot-v3.agent.tools.create-alert :as tools.create-alert]- [metabase-enterprise.metabot-v3.agent.tools.create-dashboard-subscription :as tools.create-dashboard-subscription]- [metabase-enterprise.metabot-v3.agent.tools.document :as tools.document]- [metabase-enterprise.metabot-v3.agent.tools.metadata :as tools.metadata]- [metabase-enterprise.metabot-v3.agent.tools.navigation :as tools.navigation]- [metabase-enterprise.metabot-v3.agent.tools.resources :as tools.resources]- [metabase-enterprise.metabot-v3.agent.tools.search :as tools.search]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.agent.tools.slackbot-query :as tools.slackbot-query]- [metabase-enterprise.metabot-v3.agent.tools.snippets :as tools.snippets]- [metabase-enterprise.metabot-v3.agent.tools.sql :as tools.sql]- [metabase-enterprise.metabot-v3.agent.tools.static-viz :as tools.static-viz]- [metabase-enterprise.metabot-v3.agent.tools.subscriptions :as tools.subscriptions]- [metabase-enterprise.metabot-v3.agent.tools.todo :as tools.todo]- [metabase-enterprise.metabot-v3.agent.tools.transforms :as tools.transforms]- [potemkin :as p]))--(set! *warn-on-reflection* true)--(p/import-vars- [tools.analyze-chart- analyze-chart-tool]- [tools.search search-tool- sql-search-tool- nlq-search-tool- transform-search-tool]- [tools.construct- construct-notebook-query-tool]- [tools.document- document-schema-collect-tool- document-construct-sql-chart-tool- document-construct-model-chart-tool]- [tools.metadata- list-available-data-sources-tool- list-available-fields-tool- get-field-values-tool]- [tools.transforms- get-transform-details-tool- get-transform-python-library-details-tool- write-transform-sql-tool- write-transform-python-tool]- [tools.sql- create-sql-query-tool- create-sql-query-code-edit-tool- edit-sql-query-tool- edit-sql-query-code-edit-tool- replace-sql-query-tool- replace-sql-query-code-edit-tool]- [tools.charts- create-chart-tool- edit-chart-tool]- [tools.resources- read-resource-tool]- [tools.todo- todo-write-tool- todo-read-tool]- [tools.navigation- navigate-user-tool]- [tools.snippets- list-snippets-tool- get-snippet-details-tool]- [tools.clarification- ask-for-sql-clarification-tool]- [tools.autogen-dashboard- create-autogenerated-dashboard-tool]- [tools.subscriptions- create-dashboard-subscription-tool]- [tools.slackbot-query- slackbot-construct-notebook-query-tool]- [tools.static-viz- static-viz-tool]- [tools.create-alert- create-alert-tool]- [tools.create-dashboard-subscription- slackbot-create-dashboard-subscription-tool])--(def ^:dynamic ^:private *memory-atom* nil)--(def ^:private state-dependent-tools- "Set of tool names that require access to agent state."- #{"analyze_chart"- "create_chart" "edit_chart" "todo_write" "todo_read" "navigate_user"- "write_transform_sql" "write_transform_python" "create_autogenerated_dashboard"- "create_sql_query" "edit_sql_query" "replace_sql_query"- "document_schema_collect" "document_construct_sql_chart" "document_construct_model_chart"- "create_alert" "create_dashboard_subscription" "static_viz"})--(defn wrap-tools-with-state- "Wrap state-dependent tools with access to the memory atom.- Tools in `state-dependent-tools` will have access to the memory atom- via the dynamic `*memory-atom*` binding.-- Returns a new tools map where state-dependent tools are wrapped.- Wrapped tools are returned as maps with :doc, :schema, :prompt, and :fn keys- to satisfy the Claude API schema validation. Tool-specific instructions are- loaded from `resources/metabot/prompts/tools/` by `extract-tool-instructions`- in `prompts.clj`, keyed by `:prompt` metadata or `<tool-name>.md` by default."- [tools memory-atom]- (reduce-kv- (fn [acc tool-name tool-var]- (if (contains? state-dependent-tools tool-name)- (let [{:keys [doc schema prompt decode]} (meta tool-var)- wrapped-fn (fn [args]- (binding [shared/*memory-atom* memory-atom- *memory-atom* memory-atom]- (tool-var args)))]- (assoc acc tool-name (cond-> {:doc doc- :schema schema- :prompt prompt- :fn wrapped-fn}- decode (assoc :decode decode))))- (assoc acc tool-name tool-var)))- {}- tools))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/search.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/search.cljdeleted file mode 100644index 9257e91b098..00000000000--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/search.clj+++ /dev/null@@ -1,126 +0,0 @@-(ns metabase-enterprise.metabot-v3.agent.tools.search- "Search tool wrappers for Metabot v3."- (:require- [metabase-enterprise.metabot-v3.tmpl :as te]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]- [metabase-enterprise.metabot-v3.tools.search :as search-tools]- [metabase.util.log :as log]- [metabase.util.malli :as mu]))--(set! *warn-on-reflection* true)--(defn- format-search-output- "Format search results as an LLM-ready string."- [results]- (let [results-xml (llm-rep/search-results->xml results)]- (te/lines- "<result>"- results-xml- ""- (str "Total results: " (count results))- "</result>"- "<instructions>"- instructions/search-result-instructions "</instructions>")))--(defn- invalid-entity-types- [entity-types allowed]- (when (seq entity-types)- (seq (remove allowed entity-types))))--(mu/defn ^{:tool-name "search"} search-tool- "Search for tables, models, metrics, dashboards, and saved questions."- [{:keys [semantic_queries keyword_queries entity_types]} :- [:map {:closed true}- [:semantic_queries {:feature :semantic-search} [:sequential :string]]- [:keyword_queries [:sequential :string]]- [:entity_types {:optional true}- [:maybe [:sequential [:enum "table" "model" "metric" "dashboard" "question"]]]]]]- (if-let [invalid (invalid-entity-types entity_types #{"table" "model" "metric" "dashboard" "question"})]- {:output (str "Invalid entity_types for search: " (pr-str (vec invalid))- ". Allowed types: table, model, metric, dashboard, question.")}- (try- (let [results (search-tools/search {:semantic-queries semantic_queries- :term-queries keyword_queries- :entity-types entity_types- :limit 10})]- {:output (format-search-output results)- :structured-output {:result-type :search- :data results- :total_count (count results)}})- (catch Exception e- (log/error e "Error in search")- {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))--(mu/defn ^{:tool-name "search" :prompt "sql_search.md"} sql-search-tool- "Search for SQL-queryable data sources (tables and models) within a database."- [{:keys [semantic_queries keyword_queries entity_types database_id]} :- [:map {:closed true}- [:semantic_queries {:feature :semantic-search} [:sequential :string]]- [:keyword_queries [:sequential :string]]- [:database_id :int]- [:entity_types {:optional true}- [:maybe [:sequential [:enum "table" "model"]]]]]]- (if-let [invalid (invalid-entity-types entity_types #{"table" "model"})]- {:output (str "Invalid entity_types for SQL search: " (pr-str (vec invalid))- ". Allowed types: table, model.")}- (try- (let [results (search-tools/search {:semantic-queries semantic_queries- :term-queries keyword_queries- :entity-types entity_types- :database-id database_id- :limit 10})]- {:output (format-search-output results)- :structured-output {:result-type :search- :data results- :total_count (count results)}})- (catch Exception e- (log/error e "Error in SQL search")- {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))--(mu/defn ^{:tool-name "search" :prompt "nql_search.md"} nlq-search-tool- "Search for NLQ-queryable data sources (models, metrics, tables)."- [{:keys [semantic_queries keyword_queries entity_types]} :- [:map {:closed true}- [:semantic_queries {:feature :semantic-search} [:sequential :string]]- [:keyword_queries [:sequential :string]]- [:entity_types {:optional true}- [:maybe [:sequential [:enum "model" "metric" "table"]]]]]]- (if-let [invalid (invalid-entity-types entity_types #{"model" "metric" "table"})]- {:output (str "Invalid entity_types for NLQ search: " (pr-str (vec invalid))- ". Allowed types: model, metric, table.")}- (try- (let [results (search-tools/search {:semantic-queries semantic_queries- :term-queries keyword_queries- :entity-types entity_types- :profile-id "nlq"- :limit 10})]- {:output (format-search-output results)- :structured-output {:result-type :search- :data results- :total_count (count results)}})- (catch Exception e- (log/error e "Error in NLQ search")- {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))--(mu/defn ^{:tool-name "search" :prompt "transform_search"} transform-search-tool- "Search for transforms, tables, and models."- [{:keys [semantic_queries keyword_queries entity_types search_native_query]} :- [:map {:closed true}- [:semantic_queries {:feature :semantic-search} [:sequential :string]]- [:keyword_queries [:sequential :string]]- [:search_native_query {:optional true} [:maybe :boolean]]- [:entity_types {:optional true}- [:maybe [:sequential [:enum "table" "model" "transform"]]]]]]- (if-let [invalid (invalid-entity-types entity_types #{"table" "model" "transform"})]- {:output (str "Invalid entity_types for transform search: " (pr-str (vec invalid))- ". Allowed types: table, model, transform.")}- (try- (let [results (search-tools/search {:semantic-queries semantic_queries- :term-queries keyword_queries- :entity-types entity_types- :search-native-query search_native_query- :limit 10})]- {:output (format-search-output results)- :structured-output {:result-type :search- :data results- :total_count (count results)}})- (catch Exception e- (log/error e "Error in transform search")- {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/init.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/init.cljdeleted file mode 100644index 18edc618ece..00000000000--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/init.clj+++ /dev/null@@ -1,4 +0,0 @@-(ns metabase-enterprise.metabot-v3.init- (:require- [metabase-enterprise.metabot-v3.settings]- [metabase-enterprise.metabot-v3.task.suggested-prompts-generator]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/settings.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/settings.cljdeleted file mode 100644index 6c89625c505..00000000000--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/settings.clj+++ /dev/null@@ -1,78 +0,0 @@-(ns metabase-enterprise.metabot-v3.settings- (:require- [metabase.settings.core :as setting :refer [defsetting]]- [metabase.util.i18n :refer [deferred-tru]]))--(defsetting ai-service-base-url- (deferred-tru "URL for the AI Service")- :type :string- :encryption :no- :default "http://localhost:8000"- :visibility :internal- :export? false- :doc false)--(defsetting site-uuid-for-metabot-tools- "UUID that we use for encrypting JWT tokens given to the AI service to make callbacks with."- :encryption :when-encryption-key-set- :visibility :internal- :sensitive? true- :feature :metabot-v3- :doc false- :export? false- :base setting/uuid-nonce-base)--(defsetting metabot-ai-service-token-ttl- (deferred-tru "The number of seconds the tokens passed to AI service should be valid.")- :type :integer- :visibility :settings-manager- :default 180- :feature :metabot-v3- :doc false- :export? true- :audit :never)--(defsetting metabot-id- (deferred-tru "Override Metabot ID for agent streaming requests.")- :type :string- :visibility :internal- :feature :metabot-v3- :encryption :no- :export? false- :doc false)--(defsetting ai-service-profile-id- (deferred-tru "Override Metabot profile ID for agent streaming requests.")- :type :string- :visibility :internal- :feature :metabot-v3- :encryption :no- :export? false- :doc false)--(defsetting metabot-enabled?- (deferred-tru "Whether Metabot is enabled for regular usage.")- :type :boolean- :visibility :public- :default true- :feature :metabot-v3- :export? true- :doc false)--(defsetting embedded-metabot-enabled?- (deferred-tru "Whether Metabot is enabled for embedding.")- :type :boolean- :visibility :public- :default true- :feature :metabot-v3- :export? true- :doc false)--(defsetting use-native-agent- (deferred-tru "Enable native Clojure agent instead of external Python AI Service.")- :type :boolean- :default false- :visibility :internal- :feature :metabot-v3- :export? false- :doc false)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/task/suggested_prompts_generator.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/task/suggested_prompts_generator.cljdeleted file mode 100644index dbd37a5459a..00000000000--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/task/suggested_prompts_generator.clj+++ /dev/null@@ -1,58 +0,0 @@-(ns metabase-enterprise.metabot-v3.task.suggested-prompts-generator- "Job to execute on start of an instance"- (:require- [clojurewerkz.quartzite.jobs :as jobs]- [clojurewerkz.quartzite.triggers :as triggers]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.suggested-prompts :as metabot-v3.suggested-prompts]- [metabase.premium-features.core :as premium-features]- [metabase.request.core :as request]- [metabase.task.core :as task]- [metabase.util.log :as log]- [toucan2.core :as t2])- (:import- (java.time Instant)- (java.util Date)- (org.quartz DisallowConcurrentExecution)))--(set! *warn-on-reflection* true)--(def ^:private generator-job-key (jobs/key "metabase.task.metabot-v3.suggested-prompts-generator.job"))-(def ^:private generator-trigger-key (triggers/key "metabase.task.metabot-v3.suggested-prompts-generator.trigger"))--(defn- maybe-generate-suggested-prompts! []- (try- (when (premium-features/has-feature? :metabot-v3)- ;; Run as admin since this is a system task generating prompts for all content in scope.- ;; Users will only see prompts for content they have access to (filtered at query time).- (request/as-admin- (let [metabot-eid (get-in metabot-v3.config/metabot-config- [metabot-v3.config/internal-metabot-id :entity-id])- metabot-id (t2/select-one-pk :model/Metabot :entity_id metabot-eid)- suggested-prompts-cnt (t2/count :model/MetabotPrompt :metabot_id metabot-id)]- (if (zero? suggested-prompts-cnt)- (do- (log/info "No suggested prompts found. Generating suggested prompts.")- (metabot-v3.suggested-prompts/generate-sample-prompts metabot-id)- (log/info "Suggested prompts generated successfully."))- (log/info "Suggested prompts are present. Not generating.")))))- (catch Exception e- (log/errorf "Suggested prompts generation failed: %s" (.getMessage e)))))--(task/defjob ^{DisallowConcurrentExecution true- :doc "Initial _suggested prompts_ generation for internal Metabot."}- SuggestedPromptsGenerator [_ctx]- (maybe-generate-suggested-prompts!))--(defmethod task/init! ::SuggestedPromptsGenerator- [_]- (when (premium-features/has-feature? :metabot-v3)- (let [job- (jobs/build- (jobs/of-type SuggestedPromptsGenerator)- (jobs/with-identity generator-job-key))- trigger (triggers/build- (triggers/with-identity generator-trigger-key)- ;; Start the job a moment after startup.- (triggers/start-at (Date/from (.plusSeconds (Instant/now) 10))))]- (task/schedule-task! job trigger))))diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj b/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.cljindex c5ef0a003de..9ce99b41fc8 100644--- a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj+++ b/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj@@ -279,7 +279,7 @@[](let [api-key (semantic-settings/openai-api-key)](when-not api-key- (throw (ex-info "OpenAI API key not configured" {:setting "ee-openai-api-key"})))+ (throw (ex-info "OpenAI API key not configured" {:setting "llm-openai-api-key"})))[(str (semantic-settings/openai-api-base-url) "/v1/embeddings") api-key]))(defmethod get-embedding "openai" [embedding-model text & {:as opts}]diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj b/enterprise/backend/src/metabase_enterprise/semantic_search/settings.cljindex 1068853c80e..62d0d6dc7c2 100644--- a/enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj+++ b/enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj@@ -1,6 +1,6 @@(ns metabase-enterprise.semantic-search.settings(:require- [metabase-enterprise.llm.settings :as llm-settings]+ [metabase.llm.settings :as llm-settings][metabase.premium-features.core :as premium-features][metabase.settings.core :as setting :refer [defsetting]][metabase.util.i18n :refer [deferred-tru]]))@@ -45,12 +45,12 @@(defn openai-api-base-url"Get the OpenAI API base url from the existing LLM settings."[]- (llm-settings/ee-openai-api-base-url))+ (llm-settings/llm-openai-api-base-url))(defn openai-api-key"Get the OpenAI API key from the existing LLM settings."[]- (llm-settings/ee-openai-api-key))+ (llm-settings/llm-openai-api-key))(defsetting ee-embedding-service-base-url(deferred-tru "URL of the OpenAI-compatible embedding service (e.g. a LiteLLM proxy).")diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/init.clj b/enterprise/backend/src/metabase_enterprise/slackbot/init.cljdeleted file mode 100644index f87fe26ee60..00000000000--- a/enterprise/backend/src/metabase_enterprise/slackbot/init.clj+++ /dev/null@@ -1,3 +0,0 @@-(ns metabase-enterprise.slackbot.init- (:require- [metabase-enterprise.slackbot.settings]))diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/settings.clj b/enterprise/backend/src/metabase_enterprise/slackbot/settings.cljdeleted file mode 100644index f35a4bf6236..00000000000--- a/enterprise/backend/src/metabase_enterprise/slackbot/settings.clj+++ /dev/null@@ -1,37 +0,0 @@-(ns metabase-enterprise.slackbot.settings- (:require- [metabase.premium-features.core :refer [defenterprise]]- [metabase.settings.core :as setting :refer [defsetting]]- [metabase.util.i18n :refer [deferred-tru]]- [metabase.util.string :as u.str]))--(defsetting metabot-slack-signing-secret- (deferred-tru "Signing secret for verifying requests from the Metabot Slack app")- :type :string- :visibility :admin- :encryption :when-encryption-key-set- :feature :metabot-v3- :export? false- :audit :no-value- :getter (fn []- (-> (setting/get-value-of-type :string :metabot-slack-signing-secret)- (u.str/mask 4))))--(defn unobfuscated-metabot-slack-signing-secret- "Get the unobfuscated value of [[metabot-slack-signing-secret]]."- []- (setting/get-value-of-type :string :metabot-slack-signing-secret))--(defsetting slackbot-event-handler-pool-size- (deferred-tru "Maximum number of concurrent Slack event handler threads.")- :visibility :internal- :type :integer- :default 64- :setter :none- :export? false)--(defenterprise metabot-slack-signing-secret-setting- "Returns the Slack signing secret for Metabot."- :feature :metabot-v3- []- (unobfuscated-metabot-slack-signing-secret))diff --git a/enterprise/backend/src/metabase_enterprise/sso/api/sso.clj b/enterprise/backend/src/metabase_enterprise/sso/api/sso.cljindex d7e41fac01d..4fd75703c35 100644--- a/enterprise/backend/src/metabase_enterprise/sso/api/sso.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/api/sso.clj@@ -8,11 +8,11 @@[metabase-enterprise.sso.integrations.jwt :as jwt][metabase-enterprise.sso.integrations.oidc :as oidc-integration][metabase-enterprise.sso.integrations.saml]- [metabase-enterprise.sso.integrations.slack-connect :as slack-connect-integration][metabase-enterprise.sso.settings :as sso-settings][metabase.api.macros :as api.macros][metabase.request.core :as request][metabase.session.core :as session]+ [metabase.sso.integrations.slack-connect :as slack-connect-integration][metabase.system.core :as system][metabase.util :as u][metabase.util.log :as log]diff --git a/enterprise/backend/src/metabase_enterprise/sso/init.clj b/enterprise/backend/src/metabase_enterprise/sso/init.cljindex 9033444f74a..5335e09801f 100644--- a/enterprise/backend/src/metabase_enterprise/sso/init.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/init.clj@@ -4,5 +4,5 @@[metabase-enterprise.sso.providers.jwt][metabase-enterprise.sso.providers.oidc][metabase-enterprise.sso.providers.saml]- [metabase-enterprise.sso.providers.slack-connect]- [metabase-enterprise.sso.settings]))+ [metabase-enterprise.sso.settings]+ [metabase.sso.providers.slack-connect]))diff --git a/enterprise/backend/src/metabase_enterprise/sso/integrations/sso_utils.clj b/enterprise/backend/src/metabase_enterprise/sso/integrations/sso_utils.cljindex 6879b712741..5ee47bfaecb 100644--- a/enterprise/backend/src/metabase_enterprise/sso/integrations/sso_utils.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/integrations/sso_utils.clj@@ -2,9 +2,10 @@"Functions shared by the various SSO implementations"(:require[clojure.string :as str]- [metabase-enterprise.sso.settings :as sso-settings]+ [metabase-enterprise.sso.settings :as ee-sso-settings][metabase.api.common :as api][metabase.appearance.core :as appearance]+ [metabase.sso.settings :as sso-settings][metabase.system.core :as system][metabase.util :as u][metabase.util.i18n :refer [trs tru]]@@ -28,15 +29,15 @@(defmethod check-user-provisioning :saml[_]- (maybe-throw-user-provisioning (sso-settings/saml-user-provisioning-enabled?)))+ (maybe-throw-user-provisioning (ee-sso-settings/saml-user-provisioning-enabled?)))(defmethod check-user-provisioning :ldap[_]- (maybe-throw-user-provisioning (sso-settings/ldap-user-provisioning-enabled?)))+ (maybe-throw-user-provisioning (ee-sso-settings/ldap-user-provisioning-enabled?)))(defmethod check-user-provisioning :jwt[_]- (maybe-throw-user-provisioning (sso-settings/jwt-user-provisioning-enabled?)))+ (maybe-throw-user-provisioning (ee-sso-settings/jwt-user-provisioning-enabled?)))(defmethod check-user-provisioning :slack-connect[_]@@ -44,7 +45,7 @@(defmethod check-user-provisioning :oidc[_]- (maybe-throw-user-provisioning (sso-settings/oidc-user-provisioning-enabled?)))+ (maybe-throw-user-provisioning (ee-sso-settings/oidc-user-provisioning-enabled?)))(defn relative-uri?"Checks that given `uri` is not an absolute (so no scheme and no host)."diff --git a/enterprise/backend/src/metabase_enterprise/sso/settings.clj b/enterprise/backend/src/metabase_enterprise/sso/settings.cljindex 4dd2efd224d..c029818e4ec 100644--- a/enterprise/backend/src/metabase_enterprise/sso/settings.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/settings.clj@@ -13,7 +13,6 @@[metabase.util.malli :as mu][metabase.util.malli.registry :as mr][metabase.util.malli.schema :as ms]- [metabase.util.string :as u.str][saml20-clj.core :as saml]))(set! *warn-on-reflection* true)@@ -349,96 +348,6 @@ using, this usually looks like `https://your-org-name.example.com` or `https://e:default "(member={dn})":audit :getter)-;;; ------------------------------------------------ Slack Connect --------------------------------------------------(defsetting slack-connect-client-id- (deferred-tru "Client ID for your Slack app. Get this from https://api.slack.com/apps")- :encryption :when-encryption-key-set- :export? false- :feature :sso-slack- :audit :getter)--(defsetting slack-connect-client-secret- (deferred-tru "Client Secret for your Slack app")- :encryption :when-encryption-key-set- :export? false- :feature :sso-slack- :audit :no-value- :getter (fn []- (-> (setting/get-value-of-type :string :slack-connect-client-secret)- (u.str/mask 4))))--(defn unobfuscated-slack-connect-client-secret- "Get the unobfuscated value of [[slack-connect-client-secret]]."- []- (setting/get-value-of-type :string :slack-connect-client-secret))--(def slack-connect-auth-mode-sso- "Authentication mode for full SSO login."- "sso")--(def slack-connect-auth-mode-link-only- "Authentication mode for account linking only (no session creation)."- "link-only")--(defsetting slack-connect-authentication-mode- (deferred-tru "Controls whether Slack can be used for SSO login or just account linking. Valid values: \"sso\" or \"link-only\" (default)")- :type :string- :export? false- :default slack-connect-auth-mode-link-only- :feature :sso-slack- :audit :getter- :encryption :no- :setter (fn [new-value]- (when (and new-value- (not (contains? #{slack-connect-auth-mode-sso slack-connect-auth-mode-link-only} new-value)))- (throw (ex-info (tru "Invalid authentication mode. Must be \"sso\" or \"link-only\"")- {:status-code 400})))- (setting/set-value-of-type! :string :slack-connect-authentication-mode new-value)))--(defsetting slack-connect-user-provisioning-enabled- (deferred-tru "When a user logs in via Slack Connect, create a Metabase account for them automatically if they don''t have one.")- :type :boolean- :export? false- :default true- :feature :sso-slack- :getter (fn []- (if (= (slack-connect-authentication-mode) slack-connect-auth-mode-link-only)- false- (setting/get-value-of-type :boolean :slack-connect-user-provisioning-enabled)))- :audit :getter)--(defsetting slack-connect-attribute-team-id- (deferred-tru "Slack OIDC claim for the team/workspace ID")- :default "https://slack.com/team_id"- :export? false- :feature :sso-slack- :encryption :when-encryption-key-set- :audit :getter)--(defsetting slack-connect-configured- (deferred-tru "Are the mandatory Slack Connect settings configured?")- :type :boolean- :export? false- :default false- :feature :sso-slack- :setter :none- :getter (fn [] (boolean- (and (slack-connect-client-id)- (slack-connect-client-secret)))))--(defsetting slack-connect-enabled- (deferred-tru "Is Slack Connect authentication configured and enabled?")- :type :boolean- :export? false- :default false- :feature :sso-slack- :audit :getter- :getter (fn []- (if (slack-connect-configured)- (setting/get-value-of-type :boolean :slack-connect-enabled)- false)))-;;; ------------------------------------------------ OIDC (Custom) ------------------------------------------------(defsetting oidc-providersdiff --git a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/setting_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/setting_test.cljindex 694d5d69e03..5de9d71c675 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/setting_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_permissions/api/setting_test.clj@@ -80,7 +80,8 @@(get-manifest [user status](testing (format "get slack manifest %s user" (mt/user-descriptor user))- (mt/user-http-request user :get status "slack/manifest")))]+ (mt/with-temporary-setting-values [site-url "http://localhost:3000"]+ (mt/user-http-request user :get status "slack/manifest"))))](testing "if `advanced-permissions` is disabled, require admins"(mt/with-premium-features #{}diff --git a/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj b/enterprise/backend/test/metabase_enterprise/agent_api/api_test.cljindex aa8a6ea9eba..dbbf7aea5d6 100644--- a/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj@@ -5,12 +5,12 @@[environ.core :as env][java-time.api :as t][medley.core :as m]- [metabase-enterprise.metabot-v3.settings] ; for setting definitions- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase-enterprise.sso.test-setup :as sso.test-setup][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.lib.normalize :as lib.normalize]+ [metabase.metabot.settings] ; for setting definitions+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.search.ingestion :as search.ingestion][metabase.search.test-util :as search.tu][metabase.session.models.session :as session.models]@@ -259,7 +259,7 @@[table-id field-display-name](let [mp (mt/metadata-provider)query (lib/query mp (lib.metadata/table mp table-id))- field-prefix (metabot-v3.tools.u/table-field-id-prefix table-id)+ field-prefix (metabot.tools.u/table-field-id-prefix table-id)visible-cols (lib/visible-columns query)](->> (keep-indexed (fn [i col](when (= (lib/display-name query col) field-display-name)diff --git a/enterprise/backend/test/metabase_enterprise/agent_api/workspace_test.clj b/enterprise/backend/test/metabase_enterprise/agent_api/workspace_test.cljindex cdac92edb07..35332717676 100644--- a/enterprise/backend/test/metabase_enterprise/agent_api/workspace_test.clj+++ b/enterprise/backend/test/metabase_enterprise/agent_api/workspace_test.clj@@ -247,12 +247,6 @@(deftest agent-workspace-feature-gating-test;; Feature gates fire before routing, so we don't need a real workspace - just a valid-looking URL.(sso.test-setup/with-jwt-default-setup!- (testing "Returns 402 when :agent-api feature is not enabled"- (mt/with-additional-premium-features #{:workspaces}- (is (= 402 (:status (client/client-full-response :get 402 "agent/v1/workspace/1"- {:request-options {:headers (auth-headers)}}))))))-(testing "Returns 402 when :workspaces feature is not enabled"- (mt/with-additional-premium-features #{:agent-api}- (is (= 402 (:status (client/client-full-response :get 402 "agent/v1/workspace/1"- {:request-options {:headers (auth-headers)}}))))))))+ (is (= 402 (:status (client/client-full-response :get 402 "agent/v1/workspace/1"+ {:request-options {:headers (auth-headers)}})))))))diff --git a/enterprise/backend/test/metabase_enterprise/ai_entity_analysis/api_test.clj b/enterprise/backend/test/metabase_enterprise/ai_entity_analysis/api_test.cljdeleted file mode 100644index b431111dd85..00000000000--- a/enterprise/backend/test/metabase_enterprise/ai_entity_analysis/api_test.clj+++ /dev/null@@ -1,27 +0,0 @@-(ns metabase-enterprise.ai-entity-analysis.api-test- (:require- [clojure.test :refer :all]- [metabase-enterprise.metabot-v3.client :as metabot-client]- [metabase.test :as mt]))--(deftest analyze-chart-test- (testing "POST /api/ee/ai-entity-analysis/analyze-chart"- (mt/with-premium-features #{:ai-entity-analysis}- (with-redefs [metabot-client/analyze-chart (constantly {:analysis "This chart shows a steady increase in sales over time, with a notable peak in Q4."})]- (let [response (mt/user-http-request :rasta :post 200 "ee/ai-entity-analysis/analyze-chart"- {:image_base64 "base64encodedimage"- :name "Sales Trend"- :description "Quarterly sales data"- :timeline_events [{:name "Product Launch"- :description "New product line introduced"- :timestamp "2023-04-15"}]})]- (is (= {:summary "This chart shows a steady increase in sales over time, with a notable peak in Q4."}- response)))))))--(deftest premium-feature-test- (testing "Endpoints require the :ai-entity-analysis premium feature"- (mt/with-premium-features #{}- (is (= {:status "error-premium-feature-not-available"}- (select-keys (mt/user-http-request :rasta :post 402 "ee/ai-entity-analysis/analyze-chart"- {:image_base64 "base64encodedimage"})- [:status]))))))diff --git a/enterprise/backend/test/metabase_enterprise/api/session_test.clj b/enterprise/backend/test/metabase_enterprise/api/session_test.cljindex fb04d07a49b..dcbe1a63125 100644--- a/enterprise/backend/test/metabase_enterprise/api/session_test.clj+++ b/enterprise/backend/test/metabase_enterprise/api/session_test.clj@@ -28,11 +28,7 @@:embedding-simple:embedding-hub:hosting- :llm-autodescription:metabot-v3- :ai-entity-analysis- :ai-sql-fixer- :ai-sql-generation:no-upsell:official-collections:query-reference-validation@@ -79,11 +75,7 @@:embedding_sdk true:embedding_simple true:hosting true- :llm_autodescription true:metabot_v3 true- :ai_entity_analysis true- :ai_sql_fixer true- :ai_sql_generation true:official_collections true:query_reference_validation true:remote_sync truediff --git a/enterprise/backend/test/metabase_enterprise/llm/api_test.clj b/enterprise/backend/test/metabase_enterprise/llm/api_test.cljdeleted file mode 100644index 19d0e0f7016..00000000000--- a/enterprise/backend/test/metabase_enterprise/llm/api_test.clj+++ /dev/null@@ -1,97 +0,0 @@-(ns metabase-enterprise.llm.api-test- (:require- [clojure.test :refer :all]- [metabase-enterprise.llm.client :as llm-client]- [metabase.test :as mt]- [metabase.util.json :as json]))--(deftest summarize-card-test- (testing "POST /api/ee/autodescribe/card/summarize"- (mt/dataset test-data- (mt/with-temp [:model/Card card {:name "Orders"- :dataset_query- {:database (mt/id)- :type :query- :query {:source-table (mt/id :orders)}}}]- (let [fake-response {:title "Title" :description "Description"}- json-response (json/encode fake-response)- expected {:summary fake-response}]- (testing "Card summarization works in the happy path"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content json-response}}]})]- (is (= expected- (mt/user-http-request :rasta :post 200 "ee/autodescribe/card/summarize" card))))))- (testing "We can handle json in markdown"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content- (format- "```json%s```"- json-response)}}]})]- (is (= expected- (mt/user-http-request :rasta :post 200 "ee/autodescribe/card/summarize" card))))))- (testing "We can't handle bad responses"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content- (format- "This is not a good json message -- %s"- json-response)}}]})]- (is (= 500- (get-in- (mt/user-http-request :rasta :post 500 "ee/autodescribe/card/summarize" card)- [:data :status-code]))))))- (testing "When the `:llm-autodescription` feature is disabled, you get a 402 with message"- (mt/with-premium-features #{}- (mt/assert-has-premium-feature-error "LLM Auto-description"- (mt/user-http-request :rasta :post 402 "ee/autodescribe/card/summarize" card)))))))))--(deftest summarize-dashboard-test- (testing "POST /api/ee/autodescribe/dashboard/summarize/:id"- (mt/dataset test-data- (mt/with-temp [:model/Card {card-id :id} {:name "Orders"- :dataset_query- {:database (mt/id)- :type :query- :query {:source-table (mt/id :orders)}}}- :model/Dashboard {dash-id :id} {:name "Dashboard"}- :model/DashboardCard {_ :id} {:dashboard_id dash-id- :card_id card-id}]- (let [url (format "ee/autodescribe/dashboard/summarize/%s" dash-id)- fake-response {:description "Description"- :keywords "awesome, amazing"- :questions "- What is this?"}- json-response (json/encode fake-response)- expected {:summary {:description "Keywords: awesome, amazing\n\nDescription: Description\n\nQuestions:\n- What is this?"}}]- (testing "Card summarization works in the happy path"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content json-response}}]})]- (is (= expected- (mt/user-http-request :rasta :post 200 url))))))- (testing "We can handle json in markdown"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content (format "```json%s```" json-response)}}]})]- (is (= expected- (mt/user-http-request :rasta :post 200 url))))))- (testing "We can't handle bad responses"- (mt/with-premium-features #{:llm-autodescription}- (with-redefs [llm-client/*create-chat-completion-endpoint*- (fn [_ _]- {:choices [{:message {:content- (format "This is not a good json message -- %s" json-response)}}]})]- (is (= 500- (get-in- (mt/user-http-request :rasta :post 500 url)- [:data :status-code]))))))- (testing "When the `:llm-autodescription` feature is disabled, you get a 402 with message"- (mt/with-premium-features #{}- (mt/assert-has-premium-feature-error "LLM Auto-description"- (mt/user-http-request :rasta :post 402 url)))))))))diff --git a/enterprise/backend/test/metabase_enterprise/llm/settings_test.clj b/enterprise/backend/test/metabase_enterprise/llm/settings_test.cljdeleted file mode 100644index 1aaa9b106de..00000000000--- a/enterprise/backend/test/metabase_enterprise/llm/settings_test.clj+++ /dev/null@@ -1,19 +0,0 @@-(ns metabase-enterprise.llm.settings-test- (:require- [clojure.test :refer :all]- [metabase-enterprise.llm.settings :as llm.settings]- [metabase.test :as mt]))--(deftest ai-features-enabled-test- (testing "LLM setting `ee-ai-features-enabled`"- (mt/with-premium-features #{:llm-autodescription}- (mt/with-temporary-setting-values [ee-openai-api-key nil- ee-ai-features-enabled false]- (testing "cannot be set and remains `false` when `ee-openai-api-key` is not set."- (llm.settings/ee-ai-features-enabled! true)- (is (= false- (llm.settings/ee-ai-features-enabled))))- (testing "can be set to `true` when `ee-openai-api-key` is set."- (llm.settings/ee-openai-api-key! "TOTALLY_REAL_KEY")- (llm.settings/ee-ai-features-enabled! true)- (is (true? (llm.settings/ee-ai-features-enabled))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/api_test.cljnew file mode 100644index 00000000000..1165b279c3d--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj@@ -0,0 +1,47 @@+(ns metabase-enterprise.metabot.api-test+ (:require+ [clj-http.client :as http]+ [clojure.test :refer :all]+ [metabase.premium-features.core :as premium-features]+ [metabase.test :as mt]+ [metabase.util.json :as json]))++(set! *warn-on-reflection* true)++(deftest feedback-endpoint-test+ (mt/with-premium-features #{:metabot-v3}+ (let [store-url "http://hm.example"+ fake-token "test-fake-token-for-feedback"]+ (testing "Submits feedback to Harbormaster with token and base URL"+ (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)))))))++ (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 "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"}))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/api_test.cljnew file mode 100644index 00000000000..d8ede0c0679--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/api_test.clj@@ -0,0 +1,124 @@+(ns metabase-enterprise.metabot.tools.api-test+ "Tests for EE-only metabot tool handlers (transforms and python libraries).+ These test the handler functions directly rather than via HTTP endpoints."+ (:require+ [clojure.test :refer :all]+ [metabase-enterprise.metabot.tools.transforms-write :as metabot.tools.transforms-write]+ [metabase.lib.core :as lib]+ [metabase.metabot.tools.transforms :as metabot.tools.transforms]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(deftest get-transforms-test+ (mt/with-premium-features #{:metabot-v3 :transforms-basic :transforms-python}+ (mt/with-temp [:model/Transform t1 {:name "People Transform"+ :description "Simple select on People table"+ :source {:type "query"+ :query (lib/native-query (mt/metadata-provider) "SELECT * FROM PEOPLE")}+ :target {:type "table"+ :name "t1_table"}}+ :model/Transform t2 {:name "MBQL Transform"+ :description "Simple MBQL query on Products table"+ :source {:type "query"+ :query (mt/mbql-query products)}+ :target {:type "table"+ :name "t2_table"}}+ :model/Transform t3 {:name "Python Transform"+ :description "Simple python transform"+ :source {:type "python"+ :source-database (mt/id)+ :body "print('hello world')"+ :source-tables []}+ :target {:type "table"+ :name "t3_table"}}]+ (testing "Non-superuser gets 403"+ (mt/with-current-user (mt/user->id :rasta)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"You don't have permissions to do that"+ (metabot.tools.transforms/get-transforms {})))))+ (testing "Superuser gets native and python transforms (not plain MBQL)"+ (mt/with-current-user (mt/user->id :crowberto)+ (let [result (metabot.tools.transforms/get-transforms {})+ test-ids #{(:id t1) (:id t2) (:id t3)}+ filtered (->> (:structured_output result)+ (filter #(test-ids (:id %)))+ (sort-by :id))]+ ;; t2 (non-native MBQL) should be excluded+ (is (= (map :id filtered) [(:id t1) (:id t3)]))+ (is (=? [{:id (:id t1)+ :name "People Transform"+ :description "Simple select on People table"}+ {:id (:id t3)+ :name "Python Transform"+ :description "Simple python transform"}]+ filtered))))))))++(deftest get-transform-details-test+ (mt/with-premium-features #{:metabot-v3 :transforms-basic :transforms-python}+ (mt/with-temp [:model/Transform t1 {:name "People Transform"+ :description "Simple select on People table"+ :source {:type "query"+ :query (mt/native-query {:query "SELECT * FROM PEOPLE"})}+ :target {:type "table"+ :name "t1_table"}}+ :model/Transform t2 {:name "Python Transform"+ :description "Simple Python transform"+ :source {:type "python"+ :body "print('hello world')"+ :source-database (mt/id)+ :source-tables []}+ :target {:type "table"+ :name "t2_table"+ :database (mt/id)}}]+ (testing "Non-superuser gets 403"+ (mt/with-current-user (mt/user->id :rasta)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"You don't have permissions to do that"+ (metabot.tools.transforms/get-transform-details {:transform-id (:id t1)})))))+ (testing "Non-existent transform returns 404"+ (mt/with-current-user (mt/user->id :crowberto)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"Not found"+ (metabot.tools.transforms/get-transform-details {:transform-id (+ 10000 (:id t2))})))))+ (testing "Superuser can get transform details"+ (mt/with-current-user (mt/user->id :crowberto)+ (doseq [transform [t1 t2]]+ (testing (:name transform)+ (is (=? {:structured_output {:id (:id transform)+ :name (:name transform)+ :description (:description transform)+ :entity_id (:entity_id transform)+ :target {:name (:name (:target transform))}}}+ (metabot.tools.transforms/get-transform-details {:transform-id (:id transform)}))))))))))++(deftest get-transform-python-library-details-test+ (mt/with-premium-features #{:metabot-v3 :python-transforms :transforms-basic}+ (let [saved-python-library (t2/select-one :model/PythonLibrary :path "common.py")]+ (when (seq saved-python-library)+ (t2/delete! :model/PythonLibrary))+ (try+ (testing "With no Python library present, throws 404"+ (mt/with-current-user (mt/user->id :crowberto)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"Not found"+ (metabot.tools.transforms-write/get-transform-python-library-details {:path "common.py"})))))+ (mt/with-temp [:model/PythonLibrary lib1 {:path "common.py"+ :source "def hello():\n return 'world'"}]+ (testing "Non-superuser gets 403"+ (mt/with-current-user (mt/user->id :rasta)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"You don't have permissions to do that"+ (metabot.tools.transforms-write/get-transform-python-library-details {:path (:path lib1)})))))+ (testing "Non-existent library path throws 400"+ (mt/with-current-user (mt/user->id :crowberto)+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo #"Invalid library path"+ (metabot.tools.transforms-write/get-transform-python-library-details {:path "nonexistent.py"})))))+ (testing "Superuser can get library details"+ (mt/with-current-user (mt/user->id :crowberto)+ (is (=? {:structured_output {:source (:source lib1)+ :path (:path lib1)}}+ (metabot.tools.transforms-write/get-transform-python-library-details {:path (:path lib1)}))))))+ (finally+ (when (seq saved-python-library)+ (t2/insert! :model/PythonLibrary saved-python-library)))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.cljrename to enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.cljindex 40993e5cfe6..8f332464419 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/dependencies_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/dependencies_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.tools.dependencies-test+(ns metabase-enterprise.metabot.tools.dependencies-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.dependencies :as metabot.dependencies]+ [metabase-enterprise.metabot.tools.dependencies :as metabot.dependencies][metabase.lib.core :as lib][metabase.models.interface :as mi][metabase.permissions.models.permissions :as perms]diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.cljnew file mode 100644index 00000000000..0084f87c2a8--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/entity_details_test.clj@@ -0,0 +1,26 @@+(ns metabase-enterprise.metabot.tools.entity-details-test+ (:require+ [clojure.test :refer :all]+ [metabase-enterprise.test :as met]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.entity-details :as entity-details]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(defn- sandboxed-query []+ (let [mp (mt/metadata-provider)+ table (lib.metadata/table mp (mt/id :categories))+ id-field (lib.metadata/field mp (mt/id :categories :id))]+ (lib/filter (lib/query mp table) (lib/< id-field 3))))++(deftest sandboxed-field-values-test+ (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}+ (let [field-id (mt/id :categories :name)]+ (try+ (let [result (entity-details/get-table-details {:table-id (mt/id :categories)})+ name-field (some #(when (= "NAME" (:name %)) %) (get-in result [:structured-output :fields]))]+ (testing "returns sandboxed field values"+ (is (= ["African" "American"] (:field_values name-field)))))+ (finally+ (t2/delete! :model/FieldValues :field_id field-id :type :advanced))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/field_stats_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/field_stats_test.cljnew file mode 100644index 00000000000..b707da54030--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/field_stats_test.clj@@ -0,0 +1,69 @@+(ns metabase-enterprise.metabot.tools.field-stats-test+ (:require+ [clojure.test :refer :all]+ [metabase-enterprise.test :as met]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.field-stats :as metabot.tools.field-stats]+ [metabase.metabot.tools.util :as metabot.tools.u]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(defn- table-query+ [metadata-provider table-id]+ (lib/query metadata-provider (lib.metadata/table metadata-provider table-id)))++(defn- visible-field-id [query field-id-prefix field-display-name]+ (->> (keep-indexed (fn [i col]+ (when (= (lib/display-name query col) field-display-name)+ i))+ (lib/visible-columns query))+ first+ (str field-id-prefix)))++(defn- sandboxed-query []+ (let [mp (mt/metadata-provider)+ table (lib.metadata/table mp (mt/id :categories))+ id-field (lib.metadata/field mp (mt/id :categories :id))]+ (lib/filter (lib/query mp table) (lib/< id-field 3))))++(deftest sandboxed-field-values-test+ (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}+ (let [field-id (mt/id :categories :name)+ table-id (mt/id :categories)+ mp (mt/metadata-provider)+ tq (table-query mp table-id)+ agent-field-id (visible-field-id tq (metabot.tools.u/table-field-id-prefix table-id) "Name")]+ (try+ (let [result (metabot.tools.field-stats/field-values+ {:entity-type "table", :entity-id table-id, :field-id agent-field-id, :limit 10})]+ (testing "returns sandboxed field values"+ (is (= ["African" "American"] (get-in result [:structured-output :value_metadata :field_values])))))+ (finally+ (t2/delete! :model/FieldValues :field_id field-id :type :advanced))))))++(deftest refingerprint-bypasses-sandboxing-test+ (testing "When Metabot triggers re-fingerprinting for a missing fingerprint, the fingerprint reflects the full+ (unsandboxed) data, not the sandboxed view of the current user."+ (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}+ (let [field-id (mt/id :categories :name)+ table-id (mt/id :categories)+ original-fp (t2/select-one-fn :fingerprint :model/Field :id field-id)+ full-distinct-count (get-in original-fp [:global :distinct-count])]+ (testing "precondition: the field has a fingerprint with a distinct count greater than 0"+ (is (> full-distinct-count 0)))+ (try+ ;; Clear the fingerprint to force re-fingerprinting via get-or-create-fingerprint!+ (t2/update! :model/Field field-id {:fingerprint nil :fingerprint_version 0})+ (let [mp (mt/metadata-provider)+ tq (table-query mp table-id)+ agent-field-id (visible-field-id tq (metabot.tools.u/table-field-id-prefix table-id) "Name")]+ (metabot.tools.field-stats/field-values+ {:entity-type "table", :entity-id table-id, :field-id agent-field-id})+ (let [new-fp (t2/select-one-fn :fingerprint :model/Field :id field-id)]+ (testing "fingerprint was saved"+ (is (some? new-fp)))+ (testing "fingerprint reflects full table data, not the sandboxed subset"+ (is (= full-distinct-count (get-in new-fp [:global :distinct-count]))))))+ (finally+ (t2/update! :model/Field field-id {:fingerprint original-fp})))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/semantic_search_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/semantic_search_test.cljrename to enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.cljindex 887e7de4904..19bf6397bab 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/semantic_search_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.semantic-search-test+(ns metabase-enterprise.metabot.tools.semantic-search-test"Semantic search tests specific to the Metabot search tool integration."(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.search :as search][metabase-enterprise.semantic-search.test-util :as semantic.tu][metabase.api.common :as api]+ [metabase.metabot.tools.search :as search][metabase.permissions.core :as perms][metabase.search.core :as search-core][metabase.search.engine :as search.engine]diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/transforms_write_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/transforms_write_test.cljnew file mode 100644index 00000000000..75fe31458aa--- /dev/null+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/transforms_write_test.clj@@ -0,0 +1,23 @@+(ns metabase-enterprise.metabot.tools.transforms-write-test+ (:require+ [clojure.test :refer :all]+ [metabase-enterprise.metabot.tools.transforms-write :as transforms-write]+ [metabase.metabot.tools.transforms-write :as oss-transforms-write]))++(deftest create-fresh-python-template-test+ (testing "fresh Python transforms include common import"+ (let [result (oss-transforms-write/create-fresh-transform+ :python "Python Transform" nil nil nil)]+ (is (= "import common\nimport pandas as pd\n\ndef transform():\n # Your transformation logic here\n return pd.DataFrame([{\"message\": \"Hello from Python transform!\"}])\n"+ (get-in result [:source :query]))))))++(deftest create-fresh-python-transform-test+ (testing "creates fresh Python transform"+ (let [memory-atom (atom {:state {}})+ result (transforms-write/write-transform-python+ {:edit_action {:mode "replace"+ :new_content "def transform():\n return pd.DataFrame()"}+ :transform_name "Python Transform"+ :memory-atom memory-atom})]+ (is (= "Python Transform" (get-in result [:structured-output :transform :name])))+ (is (= "python" (get-in result [:structured-output :transform :source :type]))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/config_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/config_test.cljdeleted file mode 100644index aa93f7e23ed..00000000000--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/config_test.clj+++ /dev/null@@ -1,78 +0,0 @@-(ns metabase-enterprise.metabot-v3.config-test- (:require- [clojure.test :refer :all]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings]- [metabase.test :as mt]))--(deftest resolve-dynamic-metabot-id-test- (testing "metabot ID resolution precedence"- (mt/with-premium-features #{:metabot-v3}- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id nil]- (testing "explicit metabot-id takes precedence"- (is (= "explicit-id"- (metabot-v3.config/resolve-dynamic-metabot-id "explicit-id"))))-- (testing "falls back to environment variable"- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id "env-metabot-id"]- (is (= "env-metabot-id"- (metabot-v3.config/resolve-dynamic-metabot-id nil)))))-- (testing "falls back to internal default when no explicit or env value"- (is (= metabot-v3.config/internal-metabot-id- (metabot-v3.config/resolve-dynamic-metabot-id nil))))))))--(deftest resolve-dynamic-profile-id-test- (testing "profile ID resolution precedence"- (mt/with-premium-features #{:metabot-v3}- (mt/with-temporary-setting-values [metabot-v3.settings/ai-service-profile-id nil]- (testing "explicit profile-id takes highest precedence"- (is (= "explicit-profile"- (metabot-v3.config/resolve-dynamic-profile-id "explicit-profile" "any-metabot-id"))))-- (testing "environment variable takes second precedence"- (mt/with-temporary-setting-values [metabot-v3.settings/ai-service-profile-id "env-profile"]- (is (= "env-profile"- (metabot-v3.config/resolve-dynamic-profile-id nil "any-metabot-id")))))-- (testing "metabot-id mapping takes third precedence"- (is (= "internal"- (metabot-v3.config/resolve-dynamic-profile-id nil metabot-v3.config/internal-metabot-id)))- (is (= "embedding_next"- (metabot-v3.config/resolve-dynamic-profile-id nil metabot-v3.config/embedded-metabot-id))))-- (testing "falls back to default when no matches"- (is (= "embedding_next"- (metabot-v3.config/resolve-dynamic-profile-id nil "unknown-metabot-id"))))-- (testing "single arity version uses dynamic metabot resolution"- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id metabot-v3.config/embedded-metabot-id]- (is (= "embedding_next"- (metabot-v3.config/resolve-dynamic-profile-id nil)))))))))--(deftest integrated-resolution-test- (testing "combination of metabot-id and profile-id precedence resolution"- (mt/with-premium-features #{:metabot-v3}- (testing "explicit params override everything"- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id nil- metabot-v3.settings/ai-service-profile-id nil]- (let [metabot-id (metabot-v3.config/resolve-dynamic-metabot-id "custom-metabot")- profile-id (metabot-v3.config/resolve-dynamic-profile-id "custom-profile" metabot-id)]- (is (= "custom-metabot" metabot-id))- (is (= "custom-profile" profile-id)))))-- (testing "environment variables work together"- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id "env-metabot"- metabot-v3.settings/ai-service-profile-id "env-profile"]- (let [metabot-id (metabot-v3.config/resolve-dynamic-metabot-id nil)- profile-id (metabot-v3.config/resolve-dynamic-profile-id nil metabot-id)]- (is (= "env-metabot" metabot-id))- (is (= "env-profile" profile-id)))))-- (testing "defaults work together"- (mt/with-temporary-setting-values [metabot-v3.settings/metabot-id nil- metabot-v3.settings/ai-service-profile-id nil]- (let [metabot-id (metabot-v3.config/resolve-dynamic-metabot-id nil)- profile-id (metabot-v3.config/resolve-dynamic-profile-id nil metabot-id)]- (is (= metabot-v3.config/internal-metabot-id metabot-id))- (is (= "internal" profile-id))))))))diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj b/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.cljindex 411bd9d1cf9..563cae8f882 100644--- a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj+++ b/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj@@ -63,7 +63,7 @@(let [embedding-model {:provider "openai":model-name "text-embedding-3-small":vector-dimensions 1536}]- (mt/with-temporary-setting-values [ee-openai-api-key nil]+ (mt/with-temporary-setting-values [llm-openai-api-key nil](is (thrown-with-msg?clojure.lang.ExceptionInfo#"OpenAI API key not configured"@@ -174,7 +174,7 @@(is (thrown? Exception (decode [{:embedding invalid-base64}]))))))))(deftest test-get-embedding- (mt/with-temporary-setting-values [ee-openai-api-key "mock-openai-api-key"+ (mt/with-temporary-setting-values [llm-openai-api-key "mock-openai-api-key"ee-embedding-service-base-url "http://mock-embedding-service"ee-embedding-service-api-key "mock-embedding-service-key"](let [mock-embedding [1.0 2.0 3.0 4.0]diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/slack_connect_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/slack_connect_test.cljindex 3042a821300..7ad7b96ef45 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/slack_connect_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/slack_connect_test.clj@@ -2,10 +2,10 @@(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.sso.settings :as sso-settings][metabase-enterprise.sso.test-setup :as sso.test-setup][metabase.auth-identity.core :as auth-identity][metabase.sso.oidc.state :as oidc.state]+ [metabase.sso.settings :as sso-settings][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.test.http-client :as client]@@ -68,49 +68,40 @@(with-test-encryption!(sso.test-setup/do-with-other-sso-types-disabled!(fn []- (mt/with-additional-premium-features #{:sso-slack}- (testing "SSO requests fail if Slack Connect hasn't been configured or enabled"- (mt/with-temporary-setting-values- [slack-connect-enabled false- slack-connect-client-id nil- slack-connect-client-secret nil]- (is (= "Slack Connect is not enabled"- (mt/client :get 400 "/auth/sso/slack-connect"- {:request-options {:redirect-strategy :none}})))))-- (testing "SSO requests fail if Slack Connect is enabled but hasn't been configured"- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id nil]- (is (= "Slack Connect is not enabled"- (mt/client :get 400 "/auth/sso/slack-connect"- {:request-options {:redirect-strategy :none}})))))-- (testing "SSO requests fail if Slack Connect is configured but hasn't been enabled"- (mt/with-temporary-setting-values- [slack-connect-enabled false- slack-connect-client-id "test-slack-client-id"- slack-connect-client-secret "test-slack-client-secret"]- (is (= "Slack Connect is not enabled"- (mt/client :get 400 "/auth/sso/slack-connect"- {:request-options {:redirect-strategy :none}})))))-- (testing "The client secret must also be included for SSO to be configured"- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-slack-client-id"- slack-connect-client-secret nil]- (is (= "Slack Connect is not enabled"- (mt/client :get 400 "/auth/sso/slack-connect"- {:request-options {:redirect-strategy :none}}))))))-- (testing "SSO requests fail if they don't have a valid premium-features token"- (sso.test-setup/call-with-default-slack-config!- (fn []- (mt/with-premium-features #{}- (let [response (mt/client :get 402 "/auth/sso/slack-connect"- {:request-options {:redirect-strategy :none}})]- (is (str/includes? (str (:message response) response) "paid feature")))))))))))+ (testing "SSO requests fail if Slack Connect hasn't been configured or enabled"+ (mt/with-temporary-setting-values+ [slack-connect-enabled false+ slack-connect-client-id nil+ slack-connect-client-secret nil]+ (is (= "Slack Connect is not enabled"+ (mt/client :get 400 "/auth/sso/slack-connect"+ {:request-options {:redirect-strategy :none}})))))++ (testing "SSO requests fail if Slack Connect is enabled but hasn't been configured"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id nil]+ (is (= "Slack Connect is not enabled"+ (mt/client :get 400 "/auth/sso/slack-connect"+ {:request-options {:redirect-strategy :none}})))))++ (testing "SSO requests fail if Slack Connect is configured but hasn't been enabled"+ (mt/with-temporary-setting-values+ [slack-connect-enabled false+ slack-connect-client-id "test-slack-client-id"+ slack-connect-client-secret "test-slack-client-secret"]+ (is (= "Slack Connect is not enabled"+ (mt/client :get 400 "/auth/sso/slack-connect"+ {:request-options {:redirect-strategy :none}})))))++ (testing "The client secret must also be included for SSO to be configured"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-slack-client-id"+ slack-connect-client-secret nil]+ (is (= "Slack Connect is not enabled"+ (mt/client :get 400 "/auth/sso/slack-connect"+ {:request-options {:redirect-strategy :none}})))))))));;; -------------------------------------------------- Redirect Tests --------------------------------------------------@@ -348,17 +339,16 @@;; Don't use sso.test-setup/with-slack-default-setup! here because it sets env vars;; which take precedence over DB values when reading settings.;; This test only needs to verify the setter validates input correctly.- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-authentication-mode nil]- (testing "valid values are accepted"- (sso-settings/slack-connect-authentication-mode! "sso")- (is (= "sso" (sso-settings/slack-connect-authentication-mode)))- (sso-settings/slack-connect-authentication-mode! "link-only")- (is (= "link-only" (sso-settings/slack-connect-authentication-mode))))-- (testing "invalid values are rejected"- (is (thrown-with-msg?- clojure.lang.ExceptionInfo- #"Invalid authentication mode"- (sso-settings/slack-connect-authentication-mode! "invalid"))))))))+ (mt/with-temporary-setting-values+ [slack-connect-authentication-mode nil]+ (testing "valid values are accepted"+ (sso-settings/slack-connect-authentication-mode! "sso")+ (is (= "sso" (sso-settings/slack-connect-authentication-mode)))+ (sso-settings/slack-connect-authentication-mode! "link-only")+ (is (= "link-only" (sso-settings/slack-connect-authentication-mode))))++ (testing "invalid values are rejected"+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Invalid authentication mode"+ (sso-settings/slack-connect-authentication-mode! "invalid")))))))diff --git a/enterprise/backend/test/metabase_enterprise/sso/providers/slack_connect_test.clj b/enterprise/backend/test/metabase_enterprise/sso/providers/slack_connect_test.cljdeleted file mode 100644index 81b2431c68e..00000000000--- a/enterprise/backend/test/metabase_enterprise/sso/providers/slack_connect_test.clj+++ /dev/null@@ -1,478 +0,0 @@-(ns metabase-enterprise.sso.providers.slack-connect-test- (:require- [clj-http.client :as http]- [clojure.test :refer :all]- [metabase-enterprise.sso.providers.slack-connect]- [metabase-enterprise.sso.settings :as sso-settings]- [metabase.auth-identity.core :as auth-identity]- [metabase.auth-identity.provider :as provider]- [metabase.sso.oidc.discovery :as oidc.discovery]- [metabase.sso.oidc.state :as oidc.state]- [metabase.sso.oidc.tokens :as oidc.tokens]- [metabase.test :as mt]- [metabase.test.fixtures :as fixtures]- [toucan2.core :as t2]))--(set! *warn-on-reflection* true)--(use-fixtures :once (fixtures/initialize :db :test-users))-(use-fixtures :each (fn [f] (mt/with-premium-features #{:sso-slack} (f))))--(def ^:private slack-discovery-doc- {:authorization_endpoint "https://slack.com/oauth/v2/authorize"- :token_endpoint "https://slack.com/api/openid.connect.token"- :jwks_uri "https://slack.com/openid/connect/keys"- :userinfo_endpoint "https://slack.com/api/openid.connect.userInfo"})--;;; -------------------------------------------------- Provider Hierarchy Tests ----------------------------------------------------(deftest ^:parallel provider-hierarchy-test- (testing "Slack Connect provider derives from OIDC provider"- (is (isa? :provider/slack-connect :provider/oidc)))-- (testing "Slack Connect provider derives from create-user-if-not-exists"- (is (isa? :provider/slack-connect ::provider/create-user-if-not-exists))))--;;; -------------------------------------------------- Configuration Tests ----------------------------------------------------(deftest build-slack-oidc-config-test- (testing "Builds OIDC configuration from Slack settings"- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"]- (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}- config (#'metabase-enterprise.sso.providers.slack-connect/build-slack-oidc-config request)]- (is (= "test-client-id" (:client-id config)))- (is (= "test-secret" (:client-secret config)))- (is (= "https://slack.com" (:issuer-uri config)))- (is (= ["openid" "profile" "email"] (:scopes config)))- (is (= "https://metabase.example.com/auth/sso/slack-connect/callback" (:redirect-uri config))))))-- (testing "Returns nil when client ID is missing"- (mt/with-temporary-setting-values- [slack-connect-client-id nil- slack-connect-client-secret "test-secret"]- (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}- config (#'metabase-enterprise.sso.providers.slack-connect/build-slack-oidc-config request)]- (is (nil? config)))))-- (testing "Returns nil when client secret is missing"- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret nil]- (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}- config (#'metabase-enterprise.sso.providers.slack-connect/build-slack-oidc-config request)]- (is (nil? config))))))--;;; -------------------------------------------------- Claim Extraction Tests ----------------------------------------------------(deftest extract-slack-claims-test- (testing "Extracts Slack-specific claims from ID token"- (mt/with-temporary-setting-values- [slack-connect-attribute-team-id "https://slack.com/team_id"]- (let [id-token-claims {:sub "U12345678"- "https://slack.com/team_id" "T12345678"- "https://slack.com/team_image_230" "https://example.com/team.png"- :email_verified true- :locale "en-US"}- slack-attrs (#'metabase-enterprise.sso.providers.slack-connect/extract-slack-claims id-token-claims)]- (is (= "U12345678" (get slack-attrs "slack-user-id")))- (is (= "T12345678" (get slack-attrs "slack-team-id")))- (is (= "https://example.com/team.png" (get slack-attrs "slack-team-image")))- (is (= "true" (get slack-attrs "slack-email-verified")))- (is (= "en-US" (get slack-attrs "slack-locale"))))))-- (testing "Handles missing optional claims gracefully"- (mt/with-temporary-setting-values- [slack-connect-attribute-team-id "https://slack.com/team_id"]- (let [id-token-claims {:sub "U12345678"}- slack-attrs (#'metabase-enterprise.sso.providers.slack-connect/extract-slack-claims id-token-claims)]- (is (= "U12345678" (get slack-attrs "slack-user-id")))- (is (nil? (get slack-attrs "slack-team-id")))- (is (nil? (get slack-attrs "slack-team-image")))- (is (nil? (get slack-attrs "slack-email-verified")))- (is (nil? (get slack-attrs "slack-locale")))))))--;;; -------------------------------------------------- Authentication Tests ----------------------------------------------------(deftest authenticate-missing-premium-feature-test- (testing "Returns error when premium feature is not available"- (mt/with-premium-features #{}- (let [request {}- result (auth-identity/authenticate :provider/slack-connect request)]- (is (false? (:success? result)))- (is (= :feature-not-available (:error result)))- (is (some? (:message result)))))))--(deftest authenticate-not-enabled-test- (testing "Returns error when Slack Connect is not enabled"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled false]- (let [request {}- result (auth-identity/authenticate :provider/slack-connect request)]- (is (false? (:success? result)))- (is (= :slack-connect-not-enabled (:error result)))- (is (some? (:message result))))))))--(deftest authenticate-not-configured-test- (testing "Returns error when Slack Connect is not configured"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id nil- slack-connect-client-secret nil]- (let [request {}- result (auth-identity/authenticate :provider/slack-connect request)]- (is (false? (:success? result)))- (is (= :slack-connect-not-enabled (:error result)))- (is (some? (:message result))))))))--(deftest authenticate-link-only-requires-session-test- (testing "Returns error in link-only mode when no authenticated session"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "link-only"]- (let [request {:authenticated-user (delay nil)}- result (auth-identity/authenticate :provider/slack-connect request)]- (is (false? (:success? result)))- (is (= :authentication-required (:error result)))- (is (some? (:message result))))))))--(deftest authenticate-link-only-allows-callback-test- (testing "Does not require session for callback in link-only mode"- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "link-only"]- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub "U12345678"- :iss "https://slack.com"- :aud "test-client-id"- :email "[email protected]"}})]- (let [request {:code "test-code"- :state "test-state"- :oidc-nonce "test-nonce"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"- :authenticated-user (delay nil)}- result (auth-identity/authenticate :provider/slack-connect request)]- ;; The presence of :code indicates callback, so should not error even without authenticated-user- (is (true? (:success? result)))- (is (= "[email protected]" (get-in result [:user-data :email]))))))))--(deftest authenticate-enhances-with-slack-data-test- (testing "Enhances successful auth result with Slack-specific data"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-attribute-team-id "https://slack.com/team_id"]- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub "U12345678"- :iss "https://slack.com"- :aud "test-client-id"- :email "[email protected]"- "https://slack.com/team_id" "T12345678"- :email_verified true}})]- (let [request {:code "test-code"- :state "test-state"- :oidc-nonce "test-nonce"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}- result (auth-identity/authenticate :provider/slack-connect request)]- (is (= :slack (get-in result [:user-data :sso_source])))- (is (= "U12345678" (get-in result [:user-data :login_attributes "slack-user-id"])))- (is (= "T12345678" (get-in result [:user-data :login_attributes "slack-team-id"])))- (is (= "true" (get-in result [:user-data :login_attributes "slack-email-verified"])))- (is (some? (:slack-data result)))))))))--;;; -------------------------------------------------- Login Tests ----------------------------------------------------(deftest link-only-mode-no-session-creation-test- (testing "No session is created when authentication mode is link-only"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "link-only"- slack-connect-user-provisioning-enabled false]- (mt/with-temp [:model/User user {:email "[email protected]"}]- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- oidc.state/validate-oidc-callback- (fn [_request _state _provider & _opts]- {:valid? true- :nonce "test-nonce"- :redirect "/"})- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub "U12345678"- :iss "https://slack.com"- :aud "test-client-id"- :email "[email protected]"}})]- (let [initial-session-count (t2/count :model/Session :user_id (:id user))- request {:code "test-code"- :state "test-state"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"- :authenticated-user (delay user)- :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}- result (auth-identity/login! :provider/slack-connect request)]- (is (true? (:success? result)) "Login should succeed")- (is (nil? (:session result)) "Result should not contain a session")- (is (nil? (:user result)) "Result should not contain a user (dissoc'd by :after method)")- (is (= initial-session-count (t2/count :model/Session :user_id (:id user)))- "No new session should be created in the database"))))))))--;;; -------------------------------------------------- AuthIdentity Creation Tests ----------------------------------------------------(deftest sso-mode-creates-auth-identity-for-new-user-test- (testing "SSO mode creates AuthIdentity when a new user logs in via Slack"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "sso"- slack-connect-user-provisioning-enabled true]- (let [test-email "[email protected]"- slack-user-id "U_NEW_12345"]- ;; Ensure user doesn't exist- (t2/delete! :model/User :email test-email)- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- oidc.state/validate-oidc-callback- (fn [_request _state _provider & _opts]- {:valid? true- :nonce "test-nonce"- :redirect "/"})- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub slack-user-id- :iss "https://slack.com"- :aud "test-client-id"- :email test-email- :given_name "New"- :family_name "User"}})]- (try- (let [request {:code "test-code"- :state "test-state"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"- :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}- result (auth-identity/login! :provider/slack-connect request)]- (is (true? (:success? result)) "Login should succeed")- (is (some? (:user result)) "Result should contain a user")- ;; Verify AuthIdentity was created- (let [user (t2/select-one :model/User :email test-email)- auth-identity (t2/select-one :model/AuthIdentity- :user_id (:id user)- :provider "slack-connect")]- (is (some? user) "User should be created")- (is (some? auth-identity) "AuthIdentity should be created")- (is (= slack-user-id (:provider_id auth-identity))- "AuthIdentity should have correct provider_id")))- (finally- (t2/delete! :model/User :email test-email)))))))))--(deftest sso-mode-creates-auth-identity-for-existing-user-test- (testing "SSO mode creates AuthIdentity when an existing user logs in via Slack"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "sso"]- (let [slack-user-id "U_EXISTING_789"]- (mt/with-temp [:model/User user {:email "[email protected]"- :first_name "Existing"- :last_name "User"}]- ;; Ensure no AuthIdentity exists for this user- (t2/delete! :model/AuthIdentity :user_id (:id user) :provider "slack-connect")- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- oidc.state/validate-oidc-callback- (fn [_request _state _provider & _opts]- {:valid? true- :nonce "test-nonce"- :redirect "/"})- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub slack-user-id- :iss "https://slack.com"- :aud "test-client-id"- :email "[email protected]"}})]- (let [request {:code "test-code"- :state "test-state"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"- :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}- result (auth-identity/login! :provider/slack-connect request)]- (is (true? (:success? result)) "Login should succeed")- ;; Verify AuthIdentity was created- (let [auth-identity (t2/select-one :model/AuthIdentity- :user_id (:id user)- :provider "slack-connect")]- (is (some? auth-identity) "AuthIdentity should be created for existing user")- (is (= slack-user-id (:provider_id auth-identity))- "AuthIdentity should have correct provider_id"))))))))))--(deftest link-only-mode-creates-auth-identity-test- (testing "Link-only mode creates AuthIdentity for the authenticated user"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-enabled true- slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-authentication-mode "link-only"]- (let [slack-user-id "U_LINK_456"]- (mt/with-temp [:model/User user {:email "[email protected]"- :first_name "Link"- :last_name "User"}]- ;; Ensure no AuthIdentity exists for this user- (t2/delete! :model/AuthIdentity :user_id (:id user) :provider "slack-connect")- (with-redefs [oidc.discovery/discover-oidc-configuration- (fn [_issuer] slack-discovery-doc)- oidc.state/validate-oidc-callback- (fn [_request _state _provider & _opts]- {:valid? true- :nonce "test-nonce"- :redirect "/"})- http/post- (fn [_url _opts]- {:status 200- :body {:id_token "valid-token"- :access_token "access-token-123"}})- oidc.tokens/validate-id-token- (fn [_token _config _nonce]- {:valid? true- :claims {:sub slack-user-id- :iss "https://slack.com"- :aud "test-client-id"- :email "[email protected]"}})]- (let [initial-session-count (t2/count :model/Session :user_id (:id user))- request {:code "test-code"- :state "test-state"- :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"- :authenticated-user (delay user)- :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}- result (auth-identity/login! :provider/slack-connect request)]- (is (true? (:success? result)) "Login should succeed")- (is (nil? (:session result)) "No session should be created in link-only mode")- ;; Verify AuthIdentity was created- (let [auth-identity (t2/select-one :model/AuthIdentity- :user_id (:id user)- :provider "slack-connect")]- (is (some? auth-identity) "AuthIdentity should be created in link-only mode")- (is (= slack-user-id (:provider_id auth-identity))- "AuthIdentity should have correct provider_id"))- ;; Verify no new session was created- (is (= initial-session-count (t2/count :model/Session :user_id (:id user)))- "No new session should be created")))))))))--;;; -------------------------------------------------- Settings Validation Tests ----------------------------------------------------(deftest slack-connect-configured-test- (testing "Returns true when client ID and secret are configured"- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"]- (is (true? (sso-settings/slack-connect-configured)))))-- (testing "Returns false when client ID is missing"- (mt/with-temporary-setting-values- [slack-connect-client-id nil- slack-connect-client-secret "test-secret"]- (is (false? (sso-settings/slack-connect-configured)))))-- (testing "Returns false when client secret is missing"- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret nil]- (is (false? (sso-settings/slack-connect-configured))))))--(deftest slack-connect-enabled-test- (testing "Returns true when configured and enabled"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-enabled true]- (is (true? (sso-settings/slack-connect-enabled))))))-- (testing "Returns false when configured but not enabled"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-client-id "test-client-id"- slack-connect-client-secret "test-secret"- slack-connect-enabled false]- (is (false? (sso-settings/slack-connect-enabled))))))-- (testing "Returns false when not configured even if enabled is true"- (mt/with-additional-premium-features #{:sso-slack}- (mt/with-temporary-setting-values- [slack-connect-client-id nil- slack-connect-client-secret nil- slack-connect-enabled true]- (is (false? (sso-settings/slack-connect-enabled)))))))--(deftest slack-connect-authentication-mode-validation-test- (testing "Accepts valid authentication modes"- (mt/with-temporary-setting-values- [slack-connect-authentication-mode nil]- (sso-settings/slack-connect-authentication-mode! "sso")- (is (= "sso" (sso-settings/slack-connect-authentication-mode)))- (sso-settings/slack-connect-authentication-mode! "link-only")- (is (= "link-only" (sso-settings/slack-connect-authentication-mode)))))-- (testing "Rejects invalid authentication modes"- (is (thrown-with-msg?- clojure.lang.ExceptionInfo- #"Invalid authentication mode"- (sso-settings/slack-connect-authentication-mode! "invalid")))- (is (thrown-with-msg?- clojure.lang.ExceptionInfo- #"Invalid authentication mode"- (sso-settings/slack-connect-authentication-mode! "SSO")))- (is (thrown-with-msg?- clojure.lang.ExceptionInfo- #"Invalid authentication mode"- (sso-settings/slack-connect-authentication-mode! "")))))diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsxindex d54a3fad6d8..e066e7f2165 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatHistory.tsx@@ -1,10 +1,10 @@import { useEffect, useRef } from "react";+import { Messages } from "metabase/metabot/components/MetabotChat/MetabotChatMessage";+import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";+import { useMetabotAgent } from "metabase/metabot/hooks";+import { useMetabotReactions } from "metabase/metabot/hooks/use-metabot-reactions";import { Stack } from "metabase/ui";-import { Messages } from "metabase-enterprise/metabot/components/MetabotChat/MetabotChatMessage";-import { MetabotResetLongChatButton } from "metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";-import { useMetabotReactions } from "metabase-enterprise/metabot/hooks/use-metabot-reactions";import S from "./MetabotQuestion.module.css";diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsxindex 1fceece5924..4b2034b9602 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import type { LegacyRef } from "react";import { t } from "ttag";+import { useMetabotAgent } from "metabase/metabot/hooks";import {Flex,Icon,@@ -11,7 +12,6 @@ import {Tooltip,UnstyledButton,} from "metabase/ui";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";import S from "./MetabotQuestion.module.css";diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsxindex e60cf936306..3b0fb79d2f2 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx@@ -1,6 +1,6 @@+import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";+import { useMetabotAgent } from "metabase/metabot/hooks";import { Button, Stack } from "metabase/ui";-import { useGetSuggestedMetabotPromptsQuery } from "metabase-enterprise/api";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";import S from "./MetabotQuestion.module.css";diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsxindex f426278a174..f8e2b81a7ba 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx@@ -2,8 +2,10 @@ import type { StoryFn } from "@storybook/react";import { HttpResponse, http } from "msw";import type { ComponentProps } from "react";-import { CommonSdkStoryWrapper } from "embedding-sdk-bundle/test/CommonSdkStoryWrapper";+import { getStorybookSdkAuthConfigForUser } from "embedding-sdk-bundle/test/CommonSdkStoryWrapper";import { MetabotQuestion } from "embedding-sdk-package";+import { MetabaseProvider } from "embedding-sdk-package/components/public/MetabaseProvider";+import { getHostedBundleStoryDecorator } from "embedding-sdk-package/test/getHostedBundleStoryDecorator";import {MOCK_AD_HOC_QUESTION_ID,mockStreamResponse,@@ -15,13 +17,22 @@ import "./MetabotQuestion";type MetabotQuestionProps = ComponentProps<typeof MetabotQuestion>;+const config = getStorybookSdkAuthConfigForUser("admin");+export default {title: "EmbeddingSDK/MetabotQuestion",component: MetabotQuestion,parameters: {layout: "fullscreen",},- decorators: [CommonSdkStoryWrapper],+ decorators: [+ (Story: StoryFn) => (+ <MetabaseProvider authConfig={config}>+ <Story />+ </MetabaseProvider>+ ),+ getHostedBundleStoryDecorator(),+ ],};const Template: StoryFn<MetabotQuestionProps> = () => {@@ -62,7 +73,7 @@ export const MetabotError = {parameters: {msw: {handlers: [- http.post("*/api/ee/metabot-v3/agent-streaming", () => {+ http.post("*/api/metabot/agent-streaming", () => {return new HttpResponse(null, {status: 500,});diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsxindex a5692361bb8..89a1ff8d983 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx@@ -14,8 +14,8 @@ import { METABOT_SDK_EE_PLUGIN } from "embedding-sdk-bundle/components/public/Meimport { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";import { useSetting } from "metabase/common/hooks";import { useLocale } from "metabase/common/hooks/use-locale";+import { useMetabotReactions } from "metabase/metabot/hooks/use-metabot-reactions";import { Stack } from "metabase/ui";-import { useMetabotReactions } from "metabase-enterprise/metabot/hooks/use-metabot-reactions";import { MetabotChatHistory } from "./MetabotChatHistory";import { MetabotChatInput } from "./MetabotChatInput";diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsxindex e07164a24d6..a91ec054332 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx@@ -1,7 +1,7 @@import { t } from "ttag";+import { useMetabotAgent } from "metabase/metabot/hooks";import { Flex, Icon, Text, Tooltip, UnstyledButton } from "metabase/ui";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";import S from "./MetabotQuestion.module.css";diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/index.ts b/enterprise/frontend/src/embedding-sdk-ee/metabot/index.tsindex c3140f69bd7..adca540961f 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/index.ts+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/index.ts@@ -2,7 +2,7 @@import "./MetabotQuestion";import { METABOT_SDK_EE_PLUGIN } from "embedding-sdk-bundle/components/public/MetabotQuestion/MetabotQuestion";-import { MetabotProvider } from "metabase-enterprise/metabot/context";+import { MetabotProvider } from "metabase/metabot/context";METABOT_SDK_EE_PLUGIN.MetabotProvider = MetabotProvider;diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/actions.ts b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/actions.tsdeleted file mode 100644index 91a446b6022..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/actions.ts+++ /dev/null@@ -1,14 +0,0 @@-import { setSidebar } from "metabase/dashboard/actions";-import { SIDEBAR_NAME } from "metabase/dashboard/constants";-import type { DashCardId } from "metabase-types/api";-import type { Dispatch } from "metabase-types/store";--export const showDashCardAnalysisSidebar =- (dashcardId: DashCardId) => (dispatch: Dispatch) => {- dispatch(- setSidebar({- name: SIDEBAR_NAME.analyze,- props: { dashcardId },- }),- );- };diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/analytics.ts b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/analytics.tsdeleted file mode 100644index 458b30a5e76..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/analytics.ts+++ /dev/null@@ -1,7 +0,0 @@-import { trackSimpleEvent } from "metabase/lib/analytics";--export const trackExplainChartClicked = () => {- trackSimpleEvent({- event: "metabot_explain_chart_clicked",- });-};diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/index.tsdeleted file mode 100644index a7018e21deb..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/index.ts+++ /dev/null@@ -1 +0,0 @@-export { AIQuestionAnalysisSidebar } from "./AIQuestionAnalysisSidebar";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/index.ts b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/index.tsdeleted file mode 100644index 7d7e41ccefd..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/index.ts+++ /dev/null@@ -1,57 +0,0 @@-import { t } from "ttag";--import {- PLUGIN_AI_ENTITY_ANALYSIS,- PLUGIN_DASHCARD_MENU,-} from "metabase/plugins";-import { hasPremiumFeature } from "metabase-enterprise/settings";-import type Question from "metabase-lib/v1/Question";--import { showDashCardAnalysisSidebar } from "./actions";-import { AIDashboardAnalysisSidebar } from "./components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar";-import { AIQuestionAnalysisButton } from "./components/AIQuestionAnalysisButton";-import { AIQuestionAnalysisSidebar } from "./components/AIQuestionAnalysisSidebar";-import { CHART_ANALYSIS_RENDER_FORMATS, canAnalyzeQuestion } from "./utils";--export { AIQuestionAnalysisButton };-export { AIQuestionAnalysisSidebar };--/**- * Initialize ai-entity-analysis plugin features that depend on hasPremiumFeature.- */-export function initializePlugin() {- if (hasPremiumFeature("ai_entity_analysis")) {- PLUGIN_AI_ENTITY_ANALYSIS.AIQuestionAnalysisButton =- AIQuestionAnalysisButton;- PLUGIN_AI_ENTITY_ANALYSIS.AIQuestionAnalysisSidebar =- AIQuestionAnalysisSidebar;- PLUGIN_AI_ENTITY_ANALYSIS.AIDashboardAnalysisSidebar =- AIDashboardAnalysisSidebar;-- PLUGIN_AI_ENTITY_ANALYSIS.canAnalyzeQuestion = (question: Question) => {- return canAnalyzeQuestion(question.card().display);- };-- PLUGIN_AI_ENTITY_ANALYSIS.chartAnalysisRenderFormats =- CHART_ANALYSIS_RENDER_FORMATS;-- PLUGIN_DASHCARD_MENU.dashcardMenuItemGetters.push(- (question, dashcardId, dispatch) => {- if (!PLUGIN_AI_ENTITY_ANALYSIS.canAnalyzeQuestion(question)) {- return null;- }-- return {- key: "MB_ANALYZE_CHART",- iconName: "metabot",- label: t`Analyze chart`,- onClick: () => {- if (dashcardId != null) {- dispatch(showDashCardAnalysisSidebar(dashcardId));- }- },- };- },- );- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/analytics.ts b/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/analytics.tsdeleted file mode 100644index c67d398bf11..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/analytics.ts+++ /dev/null@@ -1,7 +0,0 @@-import { trackSimpleEvent } from "metabase/lib/analytics";--export const trackQueryFixClicked = () => {- trackSimpleEvent({- event: "metabot_fix_query_clicked",- });-};diff --git a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/index.ts b/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/index.tsdeleted file mode 100644index 1d561593c01..00000000000--- a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/index.ts+++ /dev/null@@ -1,13 +0,0 @@-import { PLUGIN_AI_SQL_FIXER } from "metabase/plugins";-import { hasPremiumFeature } from "metabase-enterprise/settings";--import { FixSqlQueryButton } from "./components/FixSqlQueryButton";--/**- * Initialize ai-sql-fixer plugin features that depend on hasPremiumFeature.- */-export function initializePlugin() {- if (hasPremiumFeature("ai_sql_fixer")) {- PLUGIN_AI_SQL_FIXER.FixSqlQueryButton = FixSqlQueryButton;- }-}diff --git a/enterprise/frontend/src/metabase-enterprise/api/index.ts b/enterprise/frontend/src/metabase-enterprise/api/index.tsindex d34be1599f7..4fdf6333723 100644--- a/enterprise/frontend/src/metabase-enterprise/api/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/index.ts@@ -1,4 +1,3 @@-export * from "./ai-entity-analysis";export * from "./api";export * from "./audit-info";export * from "./billing-info";@@ -8,7 +7,6 @@ export * from "./db-routing";export * from "./dependencies";export * from "./gdrive";export * from "./library";-export * from "./metabot";export * from "./remote-sync";export * from "./oidc";export * from "./replacement";diff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.tsindex dc6a8f706fa..e947c32da50 100644--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts@@ -34,9 +34,6 @@ import {export const ENTERPRISE_TAG_TYPES = [...TAG_TYPES,"scim",- "metabot",- "metabot-entities-list",- "metabot-prompt-suggestions","gsheets-status","sandbox","workspace-transforms",diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsxindex b76f7f55891..791e4001d39 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/MetabotTab.tsx@@ -1,7 +1,10 @@-import { PLUGIN_METABOT } from "metabase/plugins";+import { MetabotChat } from "metabase/metabot/components/MetabotChat";+import type { MetabotSuggestionActions } from "metabase/metabot/context";+import {+ MetabotProvider,+ useRegisterMetabotSuggestionActions,+} from "metabase/metabot/context";import { useRegisterMetabotTransformContext } from "metabase/transforms/hooks/use-register-transform-metabot-context";-import type { MetabotSuggestionActions } from "metabase-enterprise/metabot/context";-import { useRegisterMetabotSuggestionActions } from "metabase-enterprise/metabot/context";import type {DraftTransformSource,TaggedTransform,@@ -40,9 +43,6 @@ export const MetabotTab = ({source,suggestionActions,}: MetabotTabProps) => {- const MetabotProvider = PLUGIN_METABOT.getMetabotProvider();- const MetabotChat = PLUGIN_METABOT.MetabotChat;-return (<MetabotProvider><MetabotContextRegistration transform={transform} source={source} />diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsxindex 91ee1f9555e..b5a9cacc9da 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx@@ -3,6 +3,10 @@ import { useCallback, useEffect, useRef, useState } from "react";import { t } from "ttag";import { useDispatch, useSelector } from "metabase/lib/redux";+import {+ deactivateSuggestedTransform,+ getMetabotSuggestedTransform,+} from "metabase/metabot/state";import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";import { RunStatus } from "metabase/transforms/components/RunStatus";@@ -13,10 +17,6 @@ import {import { Box, Button, Group, Icon, Stack } from "metabase/ui";import { useDryRunWorkspaceTransformMutation } from "metabase-enterprise/api";import { useWorkspaceTransformRun } from "metabase-enterprise/data-studio/workspaces/hooks";-import {- deactivateSuggestedTransform,- getMetabotSuggestedTransform,-} from "metabase-enterprise/metabot/state";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.tsindex b5eb890fdfd..458bc0d4463 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts@@ -6,26 +6,26 @@ import { useLazyGetTransformQuery } from "metabase/api";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { useRegisterMetabotContextProvider } from "metabase/metabot";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { getIsWorkspace } from "metabase/selectors/routing";-import { METABOT_PROFILE_OVERRIDES } from "metabase-enterprise/metabot/constants";+import { METABOT_PROFILE_OVERRIDES } from "metabase/metabot/constants";import type {ApplySuggestionPayload,ApplySuggestionResult,MetabotSuggestionActions,-} from "metabase-enterprise/metabot/context";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks/use-metabot-agent";-import { useMetabotReactions } from "metabase-enterprise/metabot/hooks/use-metabot-reactions";+} from "metabase/metabot/context";+import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import { useMetabotAgent } from "metabase/metabot/hooks/use-metabot-agent";+import { useMetabotReactions } from "metabase/metabot/hooks/use-metabot-reactions";import type {MetabotConverstationState,MetabotState,-} from "metabase-enterprise/metabot/state";+} from "metabase/metabot/state";import {activateSuggestedTransform,updateSuggestedTransformId,-} from "metabase-enterprise/metabot/state/actions";-import { metabotActions } from "metabase-enterprise/metabot/state/reducer";-import { getMetabotState } from "metabase-enterprise/metabot/state/selectors";+} from "metabase/metabot/state/actions";+import { metabotActions } from "metabase/metabot/state/reducer";+import { getMetabotState } from "metabase/metabot/state/selectors";+import { getIsWorkspace } from "metabase/selectors/routing";import { useEnterpriseSelector } from "metabase-enterprise/redux";import type {DatabaseId,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/README.md b/enterprise/frontend/src/metabase-enterprise/metabot/README.mddeleted file mode 100644index 86f5857c828..00000000000--- a/enterprise/frontend/src/metabase-enterprise/metabot/README.md+++ /dev/null@@ -1,45 +0,0 @@-# Metabot v3--## Sending requests to Metabot--### Request format--Every request is made up of three parts: `message`, `context` and `history`.-The `message` is usually the prompt typed in the Metabot chat bar by the user.-In the case of user confirmation, `message` is a predefined value that Metabot has asked to be sent in response to the user choosing a path.-The `context` is the "eyes" of Metabot, allowing it to "see" what the user sees.-Lastly `history` is the `history` value from the last Metabot response forwarded back in the next request to keep all requests stateless.--### Registering chat context--Chat context is currently managed via React context, which is perfect because I heard you liked context with your context.-`context.tsx` defines two methods `registerChatContextProvider` and `getChatContext`.-Registered provider functions will be called when `getChatContext` is executed and are passed the redux state at that point in time.-These functions return partial context objects which are then shallow merged to produce a final chat context object for the current view.-The functions may pick values off the redux state or pull in values available within their defined scope.-Default chat context required for all requests, like the current time, can be set in base context defined in `context.tsx`.-In OSS,`registerChatContextProvider` and `getChatContext` are no-ops, so any registered context functions will not be consumed.-A helper util has been provided to make registering context easier in React. The `useRegisterMetabotContextProvider(providerFn, providerFnDeps)`-hook will automatically register/deregister a provider function from a component as it is mounted and unmounted.--## Handling responses from Metabot--### Processing reactions--The backend sends reactions as a list, which are processed sequentially.-Each reaction type should have an associated handler which can either return a `Promise<void>` or `void`.-Async reaction handlers will be awaited before processing the next reaction.--### Adding a new reaction--Reactions are defined by the backend and their definition must be hand-copied into the frontend.-You can define new reaction types in `frontend/src/metabase-types/api/metabot.ts`.-To handle your new reaction, add your reaction's `type` to the `reactionHandlers` map in `reactions/index.ts` with a matching handler.-The reactions folder organizes handlers by similar functionality – you can either add your handler to an existing file or create a new one to handle a new domain of reactions.--### Handling errors in reactions--If a handler encounters an error, it can halt all subsequent reaction processing by setting Metabot's `isProcessing` flag to `false` and returning early.-The reaction processor will detect this change and stop further execution.-Some basic error handling utilities can be found in `reactions/errors.ts`, but generally you can still leverage the same tools for making Metabot say something to notify the user of the error.-Future updates will improve this system to allow sending errors to the backend for better user-facing error messages or even coach Metabot to make corrections.diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsxdeleted file mode 100644index b70c51707c3..00000000000--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsx+++ /dev/null@@ -1,367 +0,0 @@-import { useDisclosure } from "@mantine/hooks";-import type { ReactNode } from "react";-import { IndexRoute, Route } from "react-router";-import { P, match } from "ts-pattern";-import { c, jt, t } from "ttag";--import ErrorBoundary from "metabase/ErrorBoundary";-import { SettingsSection } from "metabase/admin/components/SettingsSection";-import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";-import { skipToken, useGetCollectionQuery } from "metabase/api";-import { useAdminSetting } from "metabase/api/utils/settings";-import { canonicalCollectionId } from "metabase/collections/utils";-import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";-import { useToast } from "metabase/common/hooks";-import { getIcon } from "metabase/lib/icon";-import {- Box,- Button,- Flex,- Icon,- Loader,- Stack,- Switch,- Text,-} from "metabase/ui";-import {- useListMetabotsQuery,- useUpdateMetabotMutation,-} from "metabase-enterprise/api";-import {- FIXED_METABOT_ENTITY_IDS,- FIXED_METABOT_IDS,-} from "metabase-enterprise/metabot/constants";-import { hasPremiumFeature } from "metabase-enterprise/settings";-import type {- Collection,- CollectionEssentials,- EnterpriseSettingKey,- MetabotInfo,-} from "metabase-types/api";--import { MetabotPromptSuggestionPane } from "./MetabotAdminSuggestedPrompts";-import { MetabotNavPane } from "./MetabotNavPane";-import { useMetabotIdPath } from "./utils";--export function getAdminRoutes() {- return [- <IndexRoute key="index" component={MetabotAdminPage} />,- <Route key="route" path=":metabotId" component={MetabotAdminPage} />,- ];-}--export function MetabotAdminPage() {- const metabotId = useMetabotIdPath() ?? FIXED_METABOT_IDS.DEFAULT;- const { data, isLoading, error } = useListMetabotsQuery();-- const metabot = data?.items?.find((bot) => bot.id === metabotId);-- if (isLoading || !metabot) {- return (- <LoadingAndErrorWrapper- loading={isLoading || !data}- error={match({ isLoading, error, metabot })- .with(- { isLoading: false, error: P.not(null) },- () => t`Error fetching Metabots`,- )- .with({ isLoading: false, metabot: undefined }, () => t`Not found.`)- .otherwise(() => null)}- />- );- }-- const isEmbedMetabot =- metabot.entity_id === FIXED_METABOT_ENTITY_IDS.EMBEDDED;-- const enabledSettingKey: EnterpriseSettingKey = isEmbedMetabot- ? "embedded-metabot-enabled?"- : "metabot-enabled?";-- return (- <AdminSettingsLayout sidebar={<MetabotNavPane />}>- <ErrorBoundary>- <SettingsSection key={metabotId}>- <Box>- <SettingHeader- id="configure-metabot"- title={c("{0} is the name of an AI assistant")- .t`Configure ${metabot.name}`}- description={c("{0} is the name of an AI assistant") // eslint-disable-next-line metabase/no-literal-metabase-strings -- admin ui- .t`${metabot.name} is Metabase's AI agent. To help ${metabot.name} more easily find and focus on the data you care about most, configure what content it should be able to access or use to create queries.`}- />- {isEmbedMetabot && (- <Text c="text-secondary" maw="40rem">- {t`If you're embedding the Metabot component in an app, you can specify a different collection that embedded Metabot is allowed to use for creating queries.`}- </Text>- )}- <MetabotEnabledToggle- settingKey={enabledSettingKey}- isEmbedMetabot={isEmbedMetabot}- />- </Box>-- <MetabotSettingsBody settingKey={enabledSettingKey}>- <MetabotVerifiedContentConfigurationPane metabot={metabot} />-- <MetabotCollectionConfigurationPane- metabot={metabot}- title={- isEmbedMetabot- ? undefined- : t`Collection for natural language querying`- }- />-- <MetabotPromptSuggestionPane metabot={metabot} />- </MetabotSettingsBody>- </SettingsSection>- </ErrorBoundary>- </AdminSettingsLayout>- );-}--function MetabotEnabledToggle({- settingKey,- isEmbedMetabot = false,-}: {- settingKey: EnterpriseSettingKey;- isEmbedMetabot?: boolean;-}) {- const { value, updateSetting, isLoading } = useAdminSetting(settingKey);-- const handleToggle = async (checked: boolean) => {- await updateSetting({ key: settingKey, value: checked });- };-- return (- <Box mt="lg">- <SettingHeader- id="enable-metabot"- title={isEmbedMetabot ? t`Enable Embedded Metabot` : t`Enable Metabot`}- description={- isEmbedMetabot- ? undefined- : t`Metabot is Metabase's AI assistant. When enabled, Metabot will be available to help users create queries, analyze data, and answer questions about your data.` // eslint-disable-line metabase/no-literal-metabase-strings -- admin UI- }- />- <Flex align="center" gap="md" mt="md">- <Switch- data-testid="metabot-enabled-toggle"- checked={!!value}- onChange={(e) => handleToggle(e.target.checked)}- disabled={isLoading}- w="auto"- size="sm"- />- <Text c={value ? "text-primary" : "text-secondary"} fw="500">- {isEmbedMetabot- ? value- ? t`Embedded Metabot is enabled`- : t`Embedded Metabot is disabled`- : value- ? t`Metabot is enabled`- : t`Metabot is disabled`}- </Text>- </Flex>- </Box>- );-}--function MetabotSettingsBody({- settingKey,- children,-}: {- settingKey: EnterpriseSettingKey;- children: ReactNode;-}) {- const { value } = useAdminSetting(settingKey);- const isDisabled = value === false;-- return (- <Stack- gap="lg"- opacity={isDisabled ? 0.4 : 1}- aria-disabled={isDisabled || undefined}- style={{- pointerEvents: isDisabled ? "none" : "auto",- transition: "opacity 150ms ease",- }}- >- {children}- </Stack>- );-}--function MetabotVerifiedContentConfigurationPane({- metabot,-}: {- metabot: MetabotInfo;-}) {- const [updateMetabot, { isLoading: isUpdating }] = useUpdateMetabotMutation();- const [sendToast] = useToast();-- const handleVerifiedContentToggle = async (checked: boolean) => {- const result = await updateMetabot({- id: metabot.id,- use_verified_content: checked,- });-- if (result.error) {- sendToast({- message: t`Error updating Metabot`,- icon: "warning",- });- }- };-- if (!hasPremiumFeature("content_verification")) {- return null;- }-- return (- <Stack gap="sm">- <SettingHeader- id="verified-content"- title={t`Verified content`}- description={jt`When enabled, Metabot will only use models and metrics marked as Verified.`}- />- <Switch- label={t`Only use Verified content`}- checked={!!metabot.use_verified_content}- onChange={(e) => handleVerifiedContentToggle(e.target.checked)}- disabled={isUpdating}- w="auto"- size="sm"- />- </Stack>- );-}--function MetabotCollectionConfigurationPane({- metabot,- title,-}: {- metabot: MetabotInfo;- title?: string;-}) {- const metabotId = metabot.id;- const metabotName = metabot.name;-- const {- data: collection,- isLoading,- error,- } = useGetCollectionQuery({- id: metabot.collection_id ?? "root",- });-- const [updateMetabot, { isLoading: isUpdating }] = useUpdateMetabotMutation();- const [isOpen, { open, close }] = useDisclosure(false);- const [sendToast] = useToast();-- if (isLoading || !collection || error) {- return (- <LoadingAndErrorWrapper- loading={isLoading}- error={error ? t`Error fetching Metabot configuration` : null}- />- );- }-- const handleUpdateCollectionId = async (- newEntity: Pick<MetabotInfo, "id" | "name">,- ) => {- close();- const result = await updateMetabot({- id: metabotId,- collection_id: canonicalCollectionId(newEntity.id),- });-- if (result.error) {- sendToast({- message: t`Error setting ${newEntity.name}`,- icon: "warning",- });- }- };-- const defaultTitle = c("{0} is the name of an AI assistant")- .t`Collection ${metabotName} can use`;-- return (- <Box>- <SettingHeader id="allow-metabot" title={title ?? defaultTitle} />- <CollectionInfo collection={collection} />- <Flex gap="md" mt="md">- <Button onClick={open} leftSection={isUpdating && <Loader size="xs" />}>- {match({ isMutating: isUpdating, collection })- .with({ isMutating: true }, () => t`Updating collection...`)- .with({ collection: undefined }, () => t`Pick a collection`)- .otherwise(() => t`Pick a different collection`)}- </Button>- </Flex>- {isOpen && (- <CollectionPickerModal- title={t`Select a collection`}- value={{- id: collection?.id ?? null,- model: "collection",- }}- onChange={(item) =>- handleUpdateCollectionId(item as Pick<MetabotInfo, "id" | "name">)- }- onClose={close}- options={{- hasRootCollection: true,- hasPersonalCollections: false,- }}- />- )}- </Box>- );-}--function CollectionInfo({ collection }: { collection: Collection }) {- const { data: collectionInfo } = useGetCollectionQuery(- collection?.id ? { id: collection.id } : skipToken,- );-- if (!collection || !collectionInfo) {- return null;- }-- const parent = collectionInfo?.effective_ancestors?.slice(-1)?.[0];-- return (- <Flex align="center" gap="sm" c="text-tertiary" mb="sm">- {parent && (- <>- <CollectionDisplay collection={parent} />- <Text c="text-tertiary" fw="bold">- /- </Text>- </>- )}- <CollectionDisplay collection={collectionInfo} />- </Flex>- );-}--const CollectionDisplay = ({- collection,-}: {- collection: CollectionEssentials;-}) => {- const icon = getIcon({ model: "collection", ...collection });- return (- <Flex align="center" gap="sm">- <Icon {...icon} c={icon.color ?? "brand"} />- <Text c="text-secondary" fw="bold">- {collection.name}- </Text>- </Flex>- );-};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/index.ts b/enterprise/frontend/src/metabase-enterprise/metabot/hooks/index.tsdeleted file mode 100644index a59c183270d..00000000000--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export { useMetabotAgent } from "./use-metabot-agent";-export { useMetabotAgentsManager } from "./use-metabot-agents-manager";-export { useMetabotSQLSuggestion } from "./use-metabot-sql-suggestion";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-sql-suggestion.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-sql-suggestion.tsxdeleted file mode 100644index cb348df3f0c..00000000000--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-sql-suggestion.tsx+++ /dev/null@@ -1,113 +0,0 @@-import { isFulfilled, isRejected } from "@reduxjs/toolkit";-import { useCallback, useMemo, useState } from "react";-import { t } from "ttag";--import type { UseMetabotSQLSuggestionOptions } from "metabase/metabot/hooks/use-metabot-sql-suggestion";-import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";-import {- useMetabotDispatch,- useMetabotSelector,-} from "metabase-enterprise/metabot/hooks/use-metabot-store";-import {- addDeveloperMessage,- getMetabotSuggestedCodeEdit,- removeSuggestedCodeEdit,- resetConversation,-} from "metabase-enterprise/metabot/state";--import { METABOT_PROFILE_OVERRIDES } from "../constants";--import { useMetabotAgent } from "./use-metabot-agent";--type SubmitInputResult = Awaited<- ReturnType<ReturnType<typeof useMetabotAgent>["submitInput"]>->;--const responseHasCodeEdit = (action: SubmitInputResult) => {- return (- isFulfilled(action) &&- action.payload.data?.processedResponse.data.some(- (dp) =>- typeof dp === "object" &&- dp !== null &&- "type" in dp &&- (dp as { type: string }).type === "code_edit",- )- );-};--export function useMetabotSQLSuggestion({- bufferId,- onGenerated,-}: UseMetabotSQLSuggestionOptions) {- const { isDoingScience, submitInput, cancelRequest } = useMetabotAgent("sql");-- const [hasError, setHasError] = useState(false);-- const dispatch = useMetabotDispatch();- const source = useMetabotSelector((state) =>- getMetabotSuggestedCodeEdit(state, bufferId),- )?.value;-- const generate = useCallback(- async ({- prompt,- }: {- prompt: string;- sourceSql?: string;- referencedEntities?: unknown;- }) => {- setHasError(false);- const action = await submitInput(prompt, {- profile: METABOT_PROFILE_OVERRIDES.SQL,- preventOpenSidebar: true,- });- if (- isRejected(action) ||- (isFulfilled(action) && !action.payload?.success) ||- !responseHasCodeEdit(action)- ) {- setHasError(true);- throw new Error(t`Something went wrong. Please try again.`);- } else {- onGenerated?.();- }- },- [submitInput, onGenerated],- );-- const reject = useCallback(() => {- dispatch(- addDeveloperMessage({- agentId: "sql",- message: `User rejected the following suggestion:\n\n${source}`,- }),- );- }, [dispatch, source]);-- const clear = useCallback(() => {- dispatch(removeSuggestedCodeEdit(bufferId));- }, [dispatch, bufferId]);-- const reset = useCallback(() => {- dispatch(removeSuggestedCodeEdit(bufferId));- dispatch(resetConversation({ agentId: "sql" }));- }, [dispatch, bufferId]);-- const suggestionModels: SuggestionModel[] = useMemo(- () => ["dataset", "table"],- [],- );-- return {- source,- isLoading: isDoingScience,- generate,- error: hasError ? t`Something went wrong. Please try again.` : undefined,- cancelRequest,- clear,- reject,- reset,- suggestionModels,- };-}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-store.ts b/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-store.tsdeleted file mode 100644index 88b044eabfa..00000000000--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-store.ts+++ /dev/null@@ -1,16 +0,0 @@-import type { AnyAction, ThunkDispatch } from "@reduxjs/toolkit";-import type { TypedUseSelectorHook } from "react-redux";-import { createDispatchHook, createSelectorHook } from "react-redux";--import { MetabaseReduxContext } from "metabase/lib/redux";--import type { MetabotStoreState } from "../state/types";--export const useMetabotSelector: TypedUseSelectorHook<MetabotStoreState> =- createSelectorHook(MetabaseReduxContext);--export const useMetabotDispatch: () => ThunkDispatch<- MetabotStoreState,- void,- AnyAction-> = createDispatchHook(MetabaseReduxContext);diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsxindex 9e1c64f3c6e..e2353312323 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/index.tsx@@ -1,94 +1,24 @@import { Route } from "react-router";-import type { MetabotContext as MetabotContextType } from "metabase/metabot";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { PLUGIN_METABOT, PLUGIN_REDUCERS } from "metabase/plugins";-import { QueryBuilder } from "metabase/query_builder/containers/QueryBuilder";-import { useLazyMetabotGenerateContentQuery } from "metabase-enterprise/api";+import { getFullAdminRoutes } from "metabase/metabot/components/MetabotAdmin/MetabotAdminPage";+import { MetabotQueryBuilderOrFallback } from "metabase/metabot/components/MetabotQueryBuilderOrFallback";+import { useMetabotSQLSuggestion } from "metabase/metabot/hooks/use-metabot-sql-suggestion";+import { getMetabotRoutes } from "metabase/metabot/routes";+import { PLUGIN_METABOT } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";-import { Metabot } from "./components/Metabot";-import { getAdminRoutes } from "./components/MetabotAdmin/MetabotAdminPage";import { getAdminRoutes as getAdminUpsellRoutes } from "./components/MetabotAdmin/MetabotPurchasePage";-import { MetabotSlackSetup } from "./components/MetabotAdmin/MetabotSlackSetup";-import { MetabotAppBarButton } from "./components/MetabotAppBarButton";-import { MetabotChat } from "./components/MetabotChat";-import MetabotThinkingStyles from "./components/MetabotChat/MetabotThinking.module.css";-import { MetabotDataStudioButton } from "./components/MetabotDataStudioButton";-import { MetabotDataStudioSidebar } from "./components/MetabotDataStudioSidebar";-import { MetabotQueryBuilder } from "./components/MetabotQueryBuilder";-import { getMetabotQuickLinks } from "./components/MetabotQuickLinks";-import { getNewMenuItemAIExploration } from "./components/NewMenuItemAIExploration";-import { SlackConnectSuccess } from "./components/SlackConnectSuccess";-import { MetabotContext, MetabotProvider, defaultContext } from "./context";-import { useMetabotSQLSuggestion as useMetabotSQLSuggestionEE } from "./hooks";-import {- deactivateSuggestedTransform,- getMetabotSuggestedTransform,- getMetabotVisible,- metabotReducer,-} from "./state";-/**- * A wrapper component that renders MetabotQueryBuilder if metabot is enabled,- * otherwise falls back to the regular QueryBuilder.- */-function MetabotQueryBuilderOrFallback(props: any) {- const isMetabotEnabled = useMetabotEnabledEmbeddingAware();- return isMetabotEnabled ? (- <MetabotQueryBuilder {...props} />- ) : (- <QueryBuilder {...props} />- );-}--/**- * This is for Metabot in embedding- *- * TODO: Move this under a feature flag, but then we need to make our- * store allowing injecting reducers dynamically since the store would- * already be created before PLUGIN_REDUCERS.* is set via the dynamic EE plugin.- */-PLUGIN_METABOT.getMetabotProvider = () => MetabotProvider;-PLUGIN_METABOT.defaultMetabotContextValue = defaultContext;-PLUGIN_METABOT.MetabotContext =- MetabotContext as React.Context<MetabotContextType>;--PLUGIN_REDUCERS.metabotPlugin = metabotReducer;--/**- * Initialize metabot plugin features that depend on hasPremiumFeature.- */export function initializePlugin() {if (hasPremiumFeature("metabot_v3")) {Object.assign(PLUGIN_METABOT, {- // helpers- getNewMenuItemAIExploration,- getMetabotVisible,- // routes- getAdminRoutes,- getMetabotRoutes: () => (- <>- {getMetabotQuickLinks()}- <Route path="slack-connect-success" component={SlackConnectSuccess} />- </>- ),+ hasFeature: true,+ useMetabotSQLSuggestion,+ getAdminRoutes: getFullAdminRoutes,+ getMetabotRoutes: () => <>{getMetabotRoutes()}</>,getMetabotQueryBuilderRoute: () => (<Route path="ask" component={MetabotQueryBuilderOrFallback} />),- // components- Metabot,- MetabotChat,- MetabotAppBarButton,- MetabotDataStudioButton,- MetabotDataStudioSidebar,- MetabotSlackSetup,- MetabotThinkingStyles,- // hooks- useMetabotSQLSuggestion: useMetabotSQLSuggestionEE,- useLazyMetabotGenerateContentQuery,- getMetabotSuggestedTransform,- deactivateSuggestedTransform,});} else if (hasPremiumFeature("hosting")) {Object.assign(PLUGIN_METABOT, {diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsxnew file mode 100644index 00000000000..67366f45327--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx@@ -0,0 +1,48 @@+import { jt, t } from "ttag";++import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";+import { useUpdateMetabotMutation } from "metabase/api";+import { useToast } from "metabase/common/hooks";+import { Stack, Switch } from "metabase/ui";+import type { MetabotInfo } from "metabase-types/api";++export function MetabotVerifiedContentConfigurationPane({+ metabot,+}: {+ metabot: MetabotInfo;+}) {+ const [updateMetabot, { isLoading: isUpdating }] = useUpdateMetabotMutation();+ const [sendToast] = useToast();++ const handleVerifiedContentToggle = async (checked: boolean) => {+ const result = await updateMetabot({+ id: metabot.id,+ use_verified_content: checked,+ });++ if (result.error) {+ sendToast({+ message: t`Error updating Metabot`,+ icon: "warning",+ });+ }+ };++ return (+ <Stack gap="sm">+ <SettingHeader+ id="verified-content"+ title={t`Verified content`}+ description={jt`When enabled, Metabot will only use models and metrics marked as Verified.`}+ />+ <Switch+ label={t`Only use Verified content`}+ checked={!!metabot.use_verified_content}+ onChange={(e) => handleVerifiedContentToggle(e.target.checked)}+ disabled={isUpdating}+ w="auto"+ size="sm"+ />+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts b/enterprise/frontend/src/metabase-enterprise/moderation/index.tsindex bfe942154d4..01cada97615 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/index.ts@@ -2,6 +2,7 @@ import { PLUGIN_MODERATION } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";import { EntityModerationIcon } from "./components/EntityModerationIcon";+import { MetabotVerifiedContentConfigurationPane } from "./components/MetabotVerifiedContentConfigurationPane";import {ModerationReviewBanner,ModerationReviewTextForDashboard,@@ -34,6 +35,7 @@ export function initializePlugin() {getModerationTimelineEvents,useCardMenuItems,useDashboardMenuItems,+ MetabotVerifiedContentConfigurationPane,});}}diff --git a/enterprise/frontend/src/metabase-enterprise/plugins.ts b/enterprise/frontend/src/metabase-enterprise/plugins.tsindex 65b7c33baba..c800f4de211 100644--- a/enterprise/frontend/src/metabase-enterprise/plugins.ts+++ b/enterprise/frontend/src/metabase-enterprise/plugins.ts@@ -10,8 +10,6 @@ import "./license";// PLUGINS THAT USE hasPremiumFeature (import initialization functions):import { initializePlugin as initializeAdvancedPermissions } from "./advanced_permissions";-import { initializePlugin as initializeAiEntityAnalysis } from "./ai-entity-analysis";-import { initializePlugin as initializeAiSqlFixer } from "./ai-sql-fixer";import { initializePlugin as initializeApplicationPermissions } from "./application_permissions";import { initializePlugin as initializeAuditApp } from "./audit_app";import { initializePlugin as initializeAuth } from "./auth";@@ -79,19 +77,17 @@ export function initializePlugins() {initializeSharing();initializeModeration();initializeAdvancedPermissions();- initializeAiSqlFixer();- initializeAiEntityAnalysis();initializeAuditApp();initializeModelPersistence();initializeFeatureLevelPermissions();initializeApplicationPermissions();initializeGroupManagers();+ initializeMetabot();initializeLibrary();initializeUploadManagement();initializeResourceDownloads();initializeUserProvisioning();initializeCleanUp();- initializeMetabot();initializeDatabaseReplication();initializeTableEditing();initializeDependencies();diff --git a/enterprise/frontend/src/metabase-enterprise/sdk-plugins.ts b/enterprise/frontend/src/metabase-enterprise/sdk-plugins.tsindex 47574c8be26..0a17b57249c 100644--- a/enterprise/frontend/src/metabase-enterprise/sdk-plugins.ts+++ b/enterprise/frontend/src/metabase-enterprise/sdk-plugins.ts@@ -1,3 +1,4 @@+/* eslint-disable import/order */import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";import { initializeHandleLinkPlugin } from "../embedding-sdk-ee/handle-link/handle-link";@@ -17,7 +18,6 @@ import { initializePlugin as initializeTenants } from "./tenants";import { initializePlugin as initializeWhitelabelPlugin } from "./whitelabel";import { initializePlugin as initializeWhitelabelOverridePlugin } from "./whitelabel/sdk-overrides";-// eslint-disable-next-line import/order -- This needs to be imported after Metabot plugin, otherwise it will initialize reducers before the Metabot plugin has set a reducer.import { initializePlugin as initializeNotifications } from "../embedding-sdk-ee/notifications";/**diff --git a/enterprise/frontend/src/metabase-enterprise/urls.ts b/enterprise/frontend/src/metabase-enterprise/urls.tsindex d25d6d491f9..4d22309d8ba 100644--- a/enterprise/frontend/src/metabase-enterprise/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/urls.ts@@ -24,10 +24,6 @@ export function removeDestinationDatabase(return `/admin/databases/${databaseId}/destination-databases/${destinationDatabaseId}/remove`;}-export function newMetabotConversation({ prompt }: { prompt: string }) {- return `/metabot/new?q=${encodeURIComponent(prompt)}`;-}-export function newTenant() {return `/admin/people/tenants/new`;}diff --git a/frontend/src/embedding-sdk-bundle/store/index.ts b/frontend/src/embedding-sdk-bundle/store/index.tsindex cd2a9b3ee63..1360d56c672 100644--- a/frontend/src/embedding-sdk-bundle/store/index.ts+++ b/frontend/src/embedding-sdk-bundle/store/index.ts@@ -7,7 +7,6 @@ import {useStore,} from "metabase/lib/redux";import * as pulse from "metabase/notifications/pulse/reducers";-import { PLUGIN_REDUCERS } from "metabase/plugins";import * as qb from "metabase/query_builder/reducers";import { commonReducers } from "metabase/reducers-common";import { DEFAULT_EMBEDDING_ENTITY_TYPES } from "metabase/redux/embedding-data-picker";@@ -23,9 +22,6 @@ export const sdkReducers = {qb: combineReducers(qb),visualizer,sdk,- plugins: combineReducers({- metabotPlugin: PLUGIN_REDUCERS.metabotPlugin,- }),} as unknown as Record<string, Reducer>;export const getSdkStore = () =>diff --git a/frontend/src/embedding-sdk-shared/test/mocks/mock-metabot-response.ts b/frontend/src/embedding-sdk-shared/test/mocks/mock-metabot-response.tsindex 65b717a09b3..d8ff6cc8c8e 100644--- a/frontend/src/embedding-sdk-shared/test/mocks/mock-metabot-response.ts+++ b/frontend/src/embedding-sdk-shared/test/mocks/mock-metabot-response.ts@@ -4,7 +4,7 @@ export const MOCK_AD_HOC_QUESTION_ID ="/question#eyJkYXRhc2V0X3F1ZXJ5IjogeyJkYXRhYmFzZSI6IDEsICJ0eXBlIjogInF1ZXJ5IiwgInF1ZXJ5IjogeyJzb3VyY2UtdGFibGUiOiAiY2FyZF9fMSJ9fSwgImRpc3BsYXkiOiAidGFibGUiLCAiZGlzcGxheUlzTG9ja2VkIjogdHJ1ZSwgInZpc3VhbGl6YXRpb25fc2V0dGluZ3MiOiB7fX0=";export const mockStreamResponse = (chunks: string[]) => {- return http.post("*/api/ee/metabot-v3/agent-streaming", () => {+ return http.post("*/api/metabot/agent-streaming", () => {const encoder = new TextEncoder();const stream = new ReadableStream({diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.tsindex d1bb1ab152b..dc4d060fea2 100644--- a/frontend/src/metabase-types/api/mocks/settings.ts+++ b/frontend/src/metabase-types/api/mocks/settings.ts@@ -131,10 +131,10 @@ export const createMockTokenFeatures = (upload_management: false,serialization: false,cache_preemptive: false,- metabot_v3: false,ai_entity_analysis: false,ai_sql_fixer: false,ai_sql_generation: false,+ metabot_v3: false,database_routing: false,development_mode: false,table_data_editing: false,@@ -229,9 +229,8 @@ export const createMockSettings = ("deprecation-notice-version": undefined,"development-mode?": false,"disable-cors-on-localhost": false,- "ee-ai-features-enabled": false,- "ee-openai-model": "",- "ee-openai-api-key": "",+ "llm-openai-model": "",+ "llm-openai-api-key": "","llm-anthropic-model": "","email-configured?": false,"email-smtp-host": null,diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 1ca89f5a033..0ce7aa291e3 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -346,10 +346,10 @@ export const tokenFeatures = ["upload_management","collection_cleanup","cache_preemptive",- "metabot_v3","ai_sql_fixer","ai_sql_generation","ai_entity_analysis",+ "metabot_v3","database_routing","development_mode","etl_connections",@@ -509,7 +509,7 @@ interface AdminSettings {}interface SettingsManagerSettings {"bcc-enabled?": boolean;- "ee-openai-api-key"?: string;+ "llm-openai-api-key"?: string;"openai-api-key": string | null;"openai-available-models"?: OpenAiModel[];"openai-model": string | null;@@ -541,7 +541,6 @@ interface PublicSettings {"custom-homepage": boolean;"custom-homepage-dashboard": DashboardId | null;"development-mode?": boolean;- "ee-ai-features-enabled"?: boolean;"email-configured?": boolean;"embedding-app-origin": string | null;"embedding-app-origins-sdk": string | null;@@ -710,9 +709,8 @@ export interface EnterpriseSettings extends Settings {"no-object-illustration"?: IllustrationSettingValue;"no-object-illustration-custom"?: string;"landing-page"?: string;- "ee-ai-features-enabled"?: boolean;- "ee-openai-api-key"?: string;- "ee-openai-model"?: string;+ "llm-openai-api-key"?: string;+ "llm-openai-model"?: string;"session-timeout": TimeoutValue | null;"search-engine": SearchEngineSettingValue | null;"scim-enabled"?: boolean | null;diff --git a/frontend/src/metabase-types/store/metabot.ts b/frontend/src/metabase-types/store/metabot.tsnew file mode 100644index 00000000000..13fd7b4f057--- /dev/null+++ b/frontend/src/metabase-types/store/metabot.ts@@ -0,0 +1 @@+export { type MetabotState } from "metabase/metabot/state";diff --git a/frontend/src/metabase-types/store/state.ts b/frontend/src/metabase-types/store/state.tsindex 0e715396b0b..2148fdbaaa1 100644--- a/frontend/src/metabase-types/store/state.ts+++ b/frontend/src/metabase-types/store/state.ts@@ -13,6 +13,7 @@ import type { DownloadsState } from "./downloads";import type { EmbedState } from "./embed";import type { EmbeddingDataPickerState } from "./embedding-data-picker";import type { EntitiesState } from "./entities";+import type { MetabotState } from "./metabot";import type { ModalState } from "./modal";import type { ParametersState } from "./parameters";import type { PulseState } from "./pulse";@@ -54,6 +55,7 @@ export interface State {};"metabase-api": MetabaseApiState;documents: DocumentsState;+ metabot: MetabotState;}export type Dispatch<T = any> = (action: T) => unknown | Promise<unknown>;diff --git a/frontend/src/metabase/App.tsx b/frontend/src/metabase/App.tsxindex a37d5d3fcb4..0771b5792c4 100644--- a/frontend/src/metabase/App.tsx+++ b/frontend/src/metabase/App.tsx@@ -20,7 +20,6 @@ import { initializeIframeResizer } from "metabase/lib/dom";import { connect, useSelector } from "metabase/lib/redux";import AppBar from "metabase/nav/containers/AppBar";import Navbar from "metabase/nav/containers/Navbar";-import { PLUGIN_METABOT } from "metabase/plugins";import { setErrorPage } from "metabase/redux/app";import {getErrorPage,@@ -36,6 +35,7 @@ import type { AppErrorDescriptor, State } from "metabase-types/store";import { AppContainer, AppContent, AppContentContainer } from "./App.styled";import ErrorBoundary from "./ErrorBoundary";import { useTokenRefresh } from "./api/utils/use-token-refresh";+import { Metabot } from "./metabot/components/Metabot";import { NewModals } from "./new/components/NewModals/NewModals";import { Palette } from "./palette/components/Palette";@@ -129,7 +129,7 @@ function App({<UndoListing /><StatusListing /><NewModals />- <PLUGIN_METABOT.Metabot hide={isAdminApp || isDataStudioApp} />+ <Metabot hide={isAdminApp || isDataStudioApp} /></AppContentContainer></AppContainer><Palette />diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsxindex ed03d0cb35d..baa89d2c593 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/SlackSettingsPage.tsx@@ -1,6 +1,7 @@import { t } from "ttag";import { SettingsPageWrapper } from "metabase/admin/components/SettingsSection";+import { MetabotSlackSetup } from "metabase/metabot/components/MetabotAdmin/MetabotSlackSetup";import { PLUGIN_METABOT } from "metabase/plugins";import { Icon } from "metabase/ui";@@ -17,7 +18,7 @@ export const SlackSettingsPage = () => {}><SlackSetup />- <PLUGIN_METABOT.MetabotSlackSetup />+ {PLUGIN_METABOT.hasFeature && <MetabotSlackSetup />}</SettingsPageWrapper></>);diff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-entity-analysis.ts b/frontend/src/metabase/api/ai-entity-analysis.tssimilarity index 80%rename from enterprise/frontend/src/metabase-enterprise/api/ai-entity-analysis.tsrename to frontend/src/metabase/api/ai-entity-analysis.tsindex 713172272fb..bd76f300281 100644--- a/enterprise/frontend/src/metabase-enterprise/api/ai-entity-analysis.ts+++ b/frontend/src/metabase/api/ai-entity-analysis.ts@@ -3,11 +3,11 @@ import type {AIQuestionAnalysisParams,} from "metabase-types/api";-import { EnterpriseApi } from "./api";+import { Api } from "./api";const DEFAULT_TIMEOUT = 30000;-export const aiEntityAnalysisApi = EnterpriseApi.injectEndpoints({+export const aiEntityAnalysisApi = Api.injectEndpoints({endpoints: (builder) => ({analyzeChart: builder.mutation<AIEntityAnalysisResponse,@@ -15,7 +15,7 @@ export const aiEntityAnalysisApi = EnterpriseApi.injectEndpoints({>({query: ({ imageBase64, name, description, timelineEvents }) => {return {- url: "/api/ee/ai-entity-analysis/analyze-chart",+ url: "/api/ai-entity-analysis/analyze-chart",method: "POST",body: {image_base64: imageBase64,diff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snap b/frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snapsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snaprename to frontend/src/metabase/api/ai-streaming/__snapshots__/process-stream.unit.spec.ts.snapdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snap b/frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snapsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snaprename to frontend/src/metabase/api/ai-streaming/__snapshots__/requests.unit.spec.ts.snapdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/index.ts b/frontend/src/metabase/api/ai-streaming/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/index.tsrename to frontend/src/metabase/api/ai-streaming/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/process-stream.ts b/frontend/src/metabase/api/ai-streaming/process-stream.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/process-stream.tsrename to frontend/src/metabase/api/ai-streaming/process-stream.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/process-stream.unit.spec.ts b/frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/process-stream.unit.spec.tsrename to frontend/src/metabase/api/ai-streaming/process-stream.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/requests.ts b/frontend/src/metabase/api/ai-streaming/requests.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/requests.tsrename to frontend/src/metabase/api/ai-streaming/requests.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/requests.unit.spec.ts b/frontend/src/metabase/api/ai-streaming/requests.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/requests.unit.spec.tsrename to frontend/src/metabase/api/ai-streaming/requests.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/schemas.ts b/frontend/src/metabase/api/ai-streaming/schemas.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/schemas.tsrename to frontend/src/metabase/api/ai-streaming/schemas.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/api/ai-streaming/test-utils.ts b/frontend/src/metabase/api/ai-streaming/test-utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/api/ai-streaming/test-utils.tsrename to frontend/src/metabase/api/ai-streaming/test-utils.tsdiff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.tsindex 0364048b078..2865d8715b9 100644--- a/frontend/src/metabase/api/index.ts+++ b/frontend/src/metabase/api/index.ts@@ -50,3 +50,5 @@ export * from "./transform-tag";export * from "./user-key-value";export * from "./user";export * from "./analytics";+export * from "./metabot";+export * from "./ai-entity-analysis";diff --git a/enterprise/frontend/src/metabase-enterprise/api/metabot.ts b/frontend/src/metabase/api/metabot.tssimilarity index 83%rename from enterprise/frontend/src/metabase-enterprise/api/metabot.tsrename to frontend/src/metabase/api/metabot.tsindex c21ee4c01c5..4f7e8db80c1 100644--- a/enterprise/frontend/src/metabase-enterprise/api/metabot.ts+++ b/frontend/src/metabase/api/metabot.ts@@ -10,15 +10,15 @@ import type {SuggestedMetabotPromptsResponse,} from "metabase-types/api";-import { EnterpriseApi } from "./api";+import { Api } from "./api";import { idTag, invalidateTags, listTag } from "./tags";-export const metabotApi = EnterpriseApi.injectEndpoints({+export const metabotApi = Api.injectEndpoints({endpoints: (builder) => ({listMetabots: builder.query<{ items: MetabotInfo[] }, void>({query: () => ({method: "GET",- url: "/api/ee/metabot-v3/metabot",+ url: "/api/metabot/metabot",}),providesTags: (result) => [listTag("metabot"),@@ -33,7 +33,7 @@ export const metabotApi = EnterpriseApi.injectEndpoints({>({query: ({ id, ...updates }) => ({method: "PUT",- url: `/api/ee/metabot-v3/metabot/${id}`,+ url: `/api/metabot/metabot/${id}`,body: updates,}),invalidatesTags: (_, error, { id }) =>@@ -49,7 +49,7 @@ export const metabotApi = EnterpriseApi.injectEndpoints({>({query: ({ metabot_id, ...params }) => ({method: "GET",- url: `/api/ee/metabot-v3/metabot/${metabot_id}/prompt-suggestions`,+ url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions`,params,}),providesTags: (_, __, { metabot_id }) => [@@ -62,7 +62,7 @@ export const metabotApi = EnterpriseApi.injectEndpoints({>({query: ({ metabot_id, prompt_id }) => ({method: "DELETE",- url: `/api/ee/metabot-v3/metabot/${metabot_id}/prompt-suggestions/${prompt_id}`,+ url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions/${prompt_id}`,}),invalidatesTags: (_, error, { metabot_id }) =>invalidateTags(error, [@@ -72,7 +72,7 @@ export const metabotApi = EnterpriseApi.injectEndpoints({regenerateSuggestedMetabotPrompts: builder.mutation<void, MetabotId>({query: (metabot_id) => ({method: "POST",- url: `/api/ee/metabot-v3/metabot/${metabot_id}/prompt-suggestions/regenerate`,+ url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions/regenerate`,}),invalidatesTags: (_, error, metabot_id) =>invalidateTags(error, [@@ -85,14 +85,14 @@ export const metabotApi = EnterpriseApi.injectEndpoints({>({query: (params) => ({method: "POST",- url: "/api/ee/metabot-v3/document/native-generate-content",+ url: "/api/metabot/document/native-generate-content",body: params,}),}),submitMetabotFeedback: builder.mutation<void, MetabotFeedback>({query: (params) => ({method: "POST",- url: "/api/ee/metabot-v3/feedback",+ url: "/api/metabot/feedback",body: params,}),}),@@ -102,7 +102,7 @@ export const metabotApi = EnterpriseApi.injectEndpoints({>({query: (settings) => ({method: "PUT",- url: "/api/ee/metabot-v3/slack/settings",+ url: "/api/metabot/slack/settings",body: settings,}),invalidatesTags: ["session-properties"],diff --git a/frontend/src/metabase/api/tags/constants.ts b/frontend/src/metabase/api/tags/constants.tsindex a754bb955b3..11b999bde72 100644--- a/frontend/src/metabase/api/tags/constants.ts+++ b/frontend/src/metabase/api/tags/constants.ts@@ -63,6 +63,9 @@ export const TAG_TYPES = ["unique-tasks","user-key-value","tenant",+ "metabot",+ "metabot-entities-list",+ "metabot-prompt-suggestions",] as const;export const TAG_TYPE_MAPPING = {diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 6a462a9d003..a6731415903 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -42,7 +42,8 @@ import { captureConsoleErrors } from "metabase/lib/errors";import { initTracing, rotateTraceId } from "metabase/lib/otel";import { MetabaseReduxProvider } from "metabase/lib/redux/custom-context";import MetabaseSettings from "metabase/lib/settings";-import { PLUGIN_APP_INIT_FUNCTIONS, PLUGIN_METABOT } from "metabase/plugins";+import { MetabotProvider } from "metabase/metabot/context";+import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { refreshSiteSettings } from "metabase/redux/settings";import { EmotionCacheProvider } from "metabase/styled-components/components/EmotionCacheProvider";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";@@ -69,7 +70,6 @@ function _init(reducers, getRoutes, callback) {const store = getStore(reducers, browserHistory);const routes = getRoutes(store);const syncedHistory = syncHistoryWithStore(browserHistory, store);- const MetabotProvider = PLUGIN_METABOT.getMetabotProvider();createTracker(store);diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsxindex cbc991fc937..eb53f48c297 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { ForwardRefLink } from "metabase/common/components/Link";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";+import { getNewMenuItemAIExploration } from "metabase/metabot/components/NewMenuItemAIExploration";import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { PLUGIN_METABOT } from "metabase/plugins";import { setOpenModal } from "metabase/redux/ui";import { getSetting } from "metabase/selectors/settings";import { getUserCanWriteToCollections } from "metabase/selectors/user";@@ -47,7 +47,7 @@ export const NewItemMenuView = ({const menuItems = useMemo(() => {const items = [];- const aiExplorationItem = PLUGIN_METABOT.getNewMenuItemAIExploration(+ const aiExplorationItem = getNewMenuItemAIExploration(hasDataAccess,collectionId,isMetabotEnabled,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsxindex 5214a35e0de..f872284069a 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx@@ -2,13 +2,14 @@ import { useMemo } from "react";import { t } from "ttag";import { useSdkDashboardContext } from "embedding-sdk-bundle/components/public/dashboard/context";-import { editQuestion } from "metabase/dashboard/actions";+import { editQuestion, setSidebar } from "metabase/dashboard/actions";+import { SIDEBAR_NAME } from "metabase/dashboard/constants";import { useDashboardContext } from "metabase/dashboard/context";import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";import type { DashboardCardCustomMenuItem } from "metabase/embedding-sdk/types/plugins";import { useDispatch } from "metabase/lib/redux";-import { isNotNull } from "metabase/lib/types";-import { PLUGIN_DASHCARD_MENU } from "metabase/plugins";+import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import { canAnalyzeQuestion } from "metabase/metabot/utils/chart-analysis";import { Icon, Menu } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type { DashCardId, Dataset } from "metabase-types/api";@@ -35,6 +36,7 @@ export const DashCardMenuItems = ({canEdit,}: DashCardMenuItemsProps) => {const dispatch = useDispatch();+ const isMetabotEnabled = useMetabotEnabledEmbeddingAware();const {onEditQuestion = (@@ -105,11 +107,25 @@ export const DashCardMenuItems = ({});}- items.push(- ...PLUGIN_DASHCARD_MENU.dashcardMenuItemGetters- .map((itemGetter) => itemGetter(question, dashcardId, dispatch))- .filter(isNotNull),- );+ if (+ isMetabotEnabled &&+ canAnalyzeQuestion(question.card().display) &&+ dashcardId != null+ ) {+ items.push({+ key: "MB_ANALYZE_CHART",+ iconName: "metabot",+ label: t`Analyze chart`,+ onClick: () => {+ dispatch(+ setSidebar({+ name: SIDEBAR_NAME.analyze,+ props: { dashcardId },+ }),+ );+ },+ });+ }if (customItems) {items.push(@@ -131,6 +147,7 @@ export const DashCardMenuItems = ({}, [customItems,isDownloadingData,+ isMetabotEnabled,onDownload,onEditQuestion,question,diff --git a/frontend/src/metabase/dashboard/components/DashboardSidebars.tsx b/frontend/src/metabase/dashboard/components/DashboardSidebars.tsxindex a12d1958f00..1346e7a2e56 100644--- a/frontend/src/metabase/dashboard/components/DashboardSidebars.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSidebars.tsx@@ -1,8 +1,8 @@import { SIDEBAR_NAME } from "metabase/dashboard/constants";import { useDashboardContext } from "metabase/dashboard/context";+import { AIDashboardAnalysisSidebar } from "metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar";import DashboardSubscriptionsSidebar from "metabase/notifications/DashboardSubscriptionsSidebar";import { ParameterSidebar } from "metabase/parameters/components/ParameterSidebar";-import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";import { ActionSidebar } from "./ActionSidebar";import { AddCardSidebar } from "./AddCardSidebar";@@ -34,7 +34,7 @@ export function DashboardSidebars() {case SIDEBAR_NAME.info:return <DashboardInfoSidebar />;case SIDEBAR_NAME.analyze:- return <PLUGIN_AI_ENTITY_ANALYSIS.AIDashboardAnalysisSidebar />;+ return <AIDashboardAnalysisSidebar />;default:return null;}diff --git a/frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsx b/frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsxindex 90aa0e468e5..7659cbc6f1e 100644--- a/frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsx+++ b/frontend/src/metabase/data-studio/app/components/SectionLayout/SectionLayout.tsx@@ -1,6 +1,6 @@import type { ReactNode } from "react";-import { PLUGIN_METABOT } from "metabase/plugins";+import { MetabotDataStudioSidebar } from "metabase/metabot/components/MetabotDataStudioSidebar";import { Flex, Stack } from "metabase/ui";type SectionLayoutProps = {@@ -14,7 +14,7 @@ export function SectionLayout({ children }: SectionLayoutProps) {<Stack flex={1} miw={0} gap={0}>{children}</Stack>- <PLUGIN_METABOT.MetabotDataStudioSidebar />+ <MetabotDataStudioSidebar /></Flex></Stack>);diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsxindex bda613e1aed..3b84e86243e 100644--- a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx+++ b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { EditableText } from "metabase/common/components/EditableText";import { useSelector } from "metabase/lib/redux";+import { MetabotDataStudioButton } from "metabase/metabot/components/MetabotDataStudioButton";import { AppSwitcher } from "metabase/nav/components/AppSwitcher";-import { PLUGIN_METABOT } from "metabase/plugins";import { getLocation } from "metabase/selectors/routing";import {Box,@@ -49,7 +49,7 @@ export const PaneHeader = ({{breadcrumbs}<Group ml="auto" gap="md">- {showMetabotButton && <PLUGIN_METABOT.MetabotDataStudioButton />}+ {showMetabotButton && <MetabotDataStudioButton />}<AppSwitcher className={S.ProfileLink} /></Group></Flex>diff --git a/frontend/src/metabase/lib/urls/index.ts b/frontend/src/metabase/lib/urls/index.tsindex 4dcfcdecfb4..8abf6a5a49b 100644--- a/frontend/src/metabase/lib/urls/index.ts+++ b/frontend/src/metabase/lib/urls/index.ts@@ -10,6 +10,7 @@ export * from "./dependencies";export * from "./documents";export * from "./indexed-entities";export * from "./metrics";+export * from "./metabot";export * from "./modelToUrl";export * from "./permissions";export * from "./misc";diff --git a/frontend/src/metabase/lib/urls/metabot.ts b/frontend/src/metabase/lib/urls/metabot.tsnew file mode 100644index 00000000000..d01b2e84a07--- /dev/null+++ b/frontend/src/metabase/lib/urls/metabot.ts@@ -0,0 +1,3 @@+export function newMetabotConversation({ prompt }: { prompt: string }) {+ return `/metabot/new?q=${encodeURIComponent(prompt)}`;+}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/analytics.ts b/frontend/src/metabase/metabot/analytics.tssimilarity index 62%rename from enterprise/frontend/src/metabase-enterprise/metabot/analytics.tsrename to frontend/src/metabase/metabot/analytics.tsindex 085d27c3c08..f960b015043 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/analytics.ts+++ b/frontend/src/metabase/metabot/analytics.ts@@ -14,3 +14,15 @@ export const trackMetabotRequestSent = () => {event: "metabot_request_sent",});};++export const trackQueryFixClicked = () => {+ trackSimpleEvent({+ event: "metabot_fix_query_clicked",+ });+};++export const trackExplainChartClicked = () => {+ trackSimpleEvent({+ event: "metabot_explain_chart_clicked",+ });+};diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContent/AIAnalysisContent.module.css b/frontend/src/metabase/metabot/components/AIAnalysisContent/AIAnalysisContent.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContent/AIAnalysisContent.module.cssrename to frontend/src/metabase/metabot/components/AIAnalysisContent/AIAnalysisContent.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContent/AIAnalysisContent.tsx b/frontend/src/metabase/metabot/components/AIAnalysisContent/AIAnalysisContent.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContent/AIAnalysisContent.tsxrename to frontend/src/metabase/metabot/components/AIAnalysisContent/AIAnalysisContent.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsx b/frontend/src/metabase/metabot/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsxrename to frontend/src/metabase/metabot/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsxrename to frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsxrename to frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.module.css b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.module.cssrename to frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.tsxrename to frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsxrename to frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/components/InternalLink.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/components/InternalLink.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/components/InternalLink.tsxrename to frontend/src/metabase/metabot/components/AIMarkdown/components/InternalLink.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsxrename to frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/index.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/index.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/AIMarkdown/index.tsxrename to frontend/src/metabase/metabot/components/AIMarkdown/index.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsxsimilarity index 82%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.tsxrename to frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsxindex a294c378e14..04691b15920 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.tsx+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.tsx@@ -1,8 +1,10 @@import { t } from "ttag";import { ToolbarButton } from "metabase/common/components/ToolbarButton";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { trackExplainChartClicked } from "../analytics";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.unit.spec.tsxsimilarity index 77%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.unit.spec.tsxrename to frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.unit.spec.tsxindex 42ad164f12c..7f8e3066d37 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisButton.unit.spec.tsx@@ -1,20 +1,18 @@-import { combineReducers } from "@reduxjs/toolkit";import userEvent from "@testing-library/user-event";import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { mockStreamedEndpoint } from "metabase-enterprise/api/ai-streaming/test-utils";-import { MetabotProvider } from "metabase-enterprise/metabot/context";-import { metabotReducer } from "metabase-enterprise/metabot/state";-import { getMetabotInitialState } from "metabase-enterprise/metabot/state/reducer-utils";+import { mockStreamedEndpoint } from "metabase/api/ai-streaming/test-utils";+import { MetabotProvider } from "metabase/metabot/context";+import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";import { createMockTokenFeatures } from "metabase-types/api/mocks";import { createMockState } from "metabase-types/store/mocks";import { AIQuestionAnalysisButton } from "./AIQuestionAnalysisButton";const mockAgentEndpoint = () =>- mockStreamedEndpoint("/api/ee/metabot-v3/agent-streaming", {+ mockStreamedEndpoint("/api/metabot/agent-streaming", {textChunks: [`0:"Here is an analysis of the chart."`,`d:{"finishReason":"stop","usage":{"promptTokens":100,"completionTokens":10}}`,@@ -24,8 +22,6 @@ const mockAgentEndpoint = () =>function setup({isMetabotEnabled = true,}: { isMetabotEnabled?: boolean } = {}) {- setupEnterprisePlugins();-const settings = mockSettings({"metabot-enabled?": isMetabotEnabled,"token-features": createMockTokenFeatures({@@ -33,6 +29,8 @@ function setup({}),});+ setupEnterprisePlugins();+const metabotState = getMetabotInitialState();renderWithProviders(@@ -42,15 +40,8 @@ function setup({{storeInitialState: createMockState({settings,- plugins: {- metabotPlugin: metabotState,- },+ metabot: metabotState,} as any),- customReducers: {- plugins: combineReducers({- metabotPlugin: metabotReducer,- }),- },},);}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxsimilarity index 90%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxrename to frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxindex 6abe7146ac6..98b9016113f 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx@@ -2,18 +2,19 @@ import { useEffect, useRef } from "react";import { usePrevious } from "react-use";import { t } from "ttag";+import { useAnalyzeChartMutation } from "metabase/api";import { CopyButton } from "metabase/common/components/CopyButton";import { SidebarContent } from "metabase/common/components/SidebarContent";import { useSelector } from "metabase/lib/redux";-import type { AIQuestionAnalysisSidebarProps } from "metabase/plugins";import { getIsLoadingComplete } from "metabase/query_builder/selectors";import { Box } from "metabase/ui";import {getChartImagePngDataUri,getChartSelector,} from "metabase/visualizations/lib/image-exports";+import type Question from "metabase-lib/v1/Question";+import type { Timeline, TimelineEvent } from "metabase-types/api";-import { useAnalyzeChartMutation } from "../../../api/ai-entity-analysis";import { AIAnalysisContent } from "../AIAnalysisContent/AIAnalysisContent";import { getTimelineEventsForAnalysis } from "./utils";@@ -21,6 +22,14 @@ import { getTimelineEventsForAnalysis } from "./utils";// This is a hack to ensure visualizations have rendered after data loading, as they can render asynchronously.const RENDER_DELAY_MS = 100;+export interface AIQuestionAnalysisSidebarProps {+ question: Question;+ className?: string;+ onClose?: () => void;+ timelines?: Timeline[];+ visibleTimelineEvents?: TimelineEvent[];+}+export function AIQuestionAnalysisSidebar({question,timelines,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsxrename to frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsxindex 75af8b3e423..0d408d1d27c 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.unit.spec.tsx@@ -135,7 +135,7 @@ describe("AIQuestionAnalysisSidebar", () => {});const lastCallRequest = fetchMock.callHistory.lastCall(- "path:/api/ee/ai-entity-analysis/analyze-chart",+ "path:/api/ai-entity-analysis/analyze-chart",)?.request;const body = await lastCallRequest?.json();diff --git a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/index.ts b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/index.tsnew file mode 100644index 00000000000..aa50f131a22--- /dev/null+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/index.ts@@ -0,0 +1,2 @@+export { AIQuestionAnalysisSidebar } from "./AIQuestionAnalysisSidebar";+export type { AIQuestionAnalysisSidebarProps } from "./AIQuestionAnalysisSidebar";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/utils.ts b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/utils.tsrename to frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsxsimilarity index 85%rename from enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.tsxrename to frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsxindex c13725389bf..308cb570003 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx@@ -1,10 +1,12 @@import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";import { Button } from "metabase/ui";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";import { trackQueryFixClicked } from "../../analytics";diff --git a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsxsimilarity index 83%rename from enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsxrename to frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsxindex 3104cfd70a2..dbc8d430e18 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx@@ -1,12 +1,12 @@import userEvent from "@testing-library/user-event";-import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { useDispatch } from "metabase/lib/redux";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";-import { createMockTokenFeatures } from "metabase-types/api/mocks";-import { createMockState } from "metabase-types/store/mocks";import { trackQueryFixClicked } from "../../analytics";@@ -25,8 +25,10 @@ jest.mock("metabase/lib/redux", () => ({useDispatch: jest.fn(),}));-jest.mock("metabase-enterprise/metabot/hooks", () => ({+jest.mock("metabase/metabot/hooks", () => ({+ ...jest.requireActual("metabase/metabot/hooks"),useMetabotAgent: jest.fn(),+ useMetabotEnabledEmbeddingAware: jest.fn(),}));jest.mock("metabase/query_builder/actions", () => ({@@ -39,13 +41,10 @@ function setup(options?: {isDoingScience?: boolean;}) {const { isMetabotEnabled = true, isDoingScience = false } = options ?? {};- const settings = mockSettings({- "metabot-enabled?": isMetabotEnabled,- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),- });+ jest+ .mocked(useMetabotEnabledEmbeddingAware)+ .mockReturnValue(isMetabotEnabled);jest.mocked(useMetabotAgent).mockReturnValue({submitInput: mockSubmitInput,isDoingScience,@@ -55,9 +54,7 @@ function setup(options?: {.mocked(setIsNativeEditorOpen).mockImplementation(mockSetIsNativeEditorOpen as any);- renderWithProviders(<FixSqlQueryButton />, {- storeInitialState: createMockState({ settings }),- });+ renderWithProviders(<FixSqlQueryButton />);}describe("FixSqlQueryButton", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/index.ts b/frontend/src/metabase/metabot/components/FixSqlQueryButton/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-sql-fixer/components/FixSqlQueryButton/index.tsrename to frontend/src/metabase/metabot/components/FixSqlQueryButton/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsxrename to frontend/src/metabase/metabot/components/Metabot.tsxindex 23d946952ba..023074de06e 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsx+++ b/frontend/src/metabase/metabot/components/Metabot.tsx@@ -5,14 +5,16 @@ import { t } from "ttag";import MetabotFailure from "assets/img/metabot-failure.svg?component";import ErrorBoundary from "metabase/ErrorBoundary";import { useSelector } from "metabase/lib/redux";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { Sidebar } from "metabase/nav/containers/MainNavbar/MainNavbar.styled";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import { getUser } from "metabase/selectors/user";import { Box, Button, Flex, Text } from "metabase/ui";import { trackMetabotChatOpened } from "../analytics";-import { useMetabotAgent } from "../hooks";import type { MetabotAgentId } from "../state";import { MetabotChat } from "./MetabotChat";diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.tsxindex 6c2122350d3..9ebe1c86eda 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.tsx@@ -1,31 +1,75 @@-import { IndexRoute, Redirect } from "react-router";-import { t } from "ttag";+import { useDisclosure } from "@mantine/hooks";+import type { ReactNode } from "react";+import { IndexRoute, Redirect, Route } from "react-router";+import { P, match } from "ts-pattern";+import { c, t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";import {AdminNavItem,AdminNavWrapper,} from "metabase/admin/components/AdminNav";+import { SettingsSection } from "metabase/admin/components/SettingsSection";+import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";+import {+ skipToken,+ useGetCollectionQuery,+ useListMetabotsQuery,+ useUpdateMetabotMutation,+} from "metabase/api";+import { useAdminSetting } from "metabase/api/utils/settings";+import { canonicalCollectionId } from "metabase/collections/utils";import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";-import { PLUGIN_METABOT } from "metabase/plugins";-import { Flex } from "metabase/ui";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";+import { useToast } from "metabase/common/hooks";+import { getIcon } from "metabase/lib/icon";+import {+ FIXED_METABOT_ENTITY_IDS,+ FIXED_METABOT_IDS,+} from "metabase/metabot/constants";+import { PLUGIN_METABOT, PLUGIN_MODERATION } from "metabase/plugins";+import {+ Box,+ Button,+ Flex,+ Icon,+ Loader,+ Stack,+ Switch,+ Text,+} from "metabase/ui";+import type {+ Collection,+ CollectionEssentials,+ EnterpriseSettingKey,+ MetabotInfo,+} from "metabase-types/api";+import { MetabotPromptSuggestionPane } from "./MetabotAdminSuggestedPrompts";+import { MetabotNavPane } from "./MetabotNavPane";import { MetabotSQLGenerationSettingsSection } from "./MetabotSQLGenerationSettingsSection";+import { useMetabotIdPath } from "./utils";export function getAdminRoutes() {- // NOTE: weird cypress bundle error happens if this `getAdminRoutes` fn- // is imported into our ai plugin file as the default OSS implementation.return (PLUGIN_METABOT.getAdminRoutes?.() ?? [- <IndexRoute key="index" component={MetabotAdminPage} />,+ <IndexRoute key="index" component={OssMetabotAdminPage} />,<Redirect key="redirect" from="*" to="/admin/metabot" />,]);}-function MetabotAdminPage() {+export function getFullAdminRoutes() {+ return [+ <IndexRoute key="index" component={MetabotAdminPage} />,+ <Route key="metabot" path=":metabotId" component={MetabotAdminPage} />,+ ];+}++function OssMetabotAdminPage() {return (- <AdminSettingsLayout sidebar={<MetabotNavPane />}>+ <AdminSettingsLayout sidebar={<OssNavPane />}><ErrorBoundary><MetabotSQLGenerationSettingsSection /></ErrorBoundary>@@ -33,12 +77,11 @@ function MetabotAdminPage() {);}-function MetabotNavPane() {+function OssNavPane() {return (<Flex direction="column" flex="0 0 auto"><AdminNavWrapper><AdminNavItem- key="sql"icon="sql"label={t`SQL Generation`}path="/admin/metabot"@@ -47,3 +90,274 @@ function MetabotNavPane() {</Flex>);}++export function MetabotAdminPage() {+ const metabotId = useMetabotIdPath() ?? FIXED_METABOT_IDS.DEFAULT;+ const { data, isLoading, error } = useListMetabotsQuery();++ const metabot = data?.items?.find((bot) => bot.id === metabotId);++ if (isLoading || !metabot) {+ return (+ <LoadingAndErrorWrapper+ loading={isLoading || !data}+ error={match({ isLoading, error, metabot })+ .with(+ { isLoading: false, error: P.not(null) },+ () => t`Error fetching Metabots`,+ )+ .with({ isLoading: false, metabot: undefined }, () => t`Not found.`)+ .otherwise(() => null)}+ />+ );+ }++ const isEmbedMetabot =+ metabot.entity_id === FIXED_METABOT_ENTITY_IDS.EMBEDDED;++ const enabledSettingKey: EnterpriseSettingKey = isEmbedMetabot+ ? "embedded-metabot-enabled?"+ : "metabot-enabled?";++ return (+ <AdminSettingsLayout sidebar={<MetabotNavPane />}>+ <ErrorBoundary>+ <SettingsSection key={metabotId}>+ <Box>+ <SettingHeader+ id="configure-metabot"+ title={c("{0} is the name of an AI assistant")+ .t`Configure ${metabot.name}`}+ description={c("{0} is the name of an AI assistant") // eslint-disable-next-line metabase/no-literal-metabase-strings -- admin ui+ .t`${metabot.name} is Metabase's AI agent. To help ${metabot.name} more easily find and focus on the data you care about most, configure what content it should be able to access or use to create queries.`}+ />+ {isEmbedMetabot && (+ <Text c="text-secondary" maw="40rem">+ {t`If you're embedding the Metabot component in an app, you can specify a different collection that embedded Metabot is allowed to use for creating queries.`}+ </Text>+ )}+ <MetabotEnabledToggle+ settingKey={enabledSettingKey}+ isEmbedMetabot={isEmbedMetabot}+ />+ </Box>++ <MetabotSettingsBody settingKey={enabledSettingKey}>+ <PLUGIN_MODERATION.MetabotVerifiedContentConfigurationPane+ metabot={metabot}+ />++ <MetabotCollectionConfigurationPane+ metabot={metabot}+ title={+ isEmbedMetabot+ ? undefined+ : t`Collection for natural language querying`+ }+ />++ <MetabotPromptSuggestionPane metabot={metabot} />+ </MetabotSettingsBody>+ </SettingsSection>+ </ErrorBoundary>+ </AdminSettingsLayout>+ );+}++function MetabotEnabledToggle({+ settingKey,+ isEmbedMetabot = false,+}: {+ settingKey: EnterpriseSettingKey;+ isEmbedMetabot?: boolean;+}) {+ const { value, updateSetting, isLoading } = useAdminSetting(settingKey);++ const handleToggle = async (checked: boolean) => {+ await updateSetting({ key: settingKey, value: checked });+ };++ return (+ <Box mt="lg">+ <SettingHeader+ id="enable-metabot"+ title={isEmbedMetabot ? t`Enable Embedded Metabot` : t`Enable Metabot`}+ description={+ isEmbedMetabot+ ? undefined+ : t`Metabot is Metabase's AI assistant. When enabled, Metabot will be available to help users create queries, analyze data, and answer questions about your data.` // eslint-disable-line metabase/no-literal-metabase-strings -- admin UI+ }+ />+ <Flex align="center" gap="md" mt="md">+ <Switch+ data-testid="metabot-enabled-toggle"+ checked={!!value}+ onChange={(e) => handleToggle(e.target.checked)}+ disabled={isLoading}+ w="auto"+ size="sm"+ />+ <Text c={value ? "text-primary" : "text-secondary"} fw="500">+ {isEmbedMetabot+ ? value+ ? t`Embedded Metabot is enabled`+ : t`Embedded Metabot is disabled`+ : value+ ? t`Metabot is enabled`+ : t`Metabot is disabled`}+ </Text>+ </Flex>+ </Box>+ );+}++function MetabotSettingsBody({+ settingKey,+ children,+}: {+ settingKey: EnterpriseSettingKey;+ children: ReactNode;+}) {+ const { value } = useAdminSetting(settingKey);+ const isDisabled = value === false;++ return (+ <Stack+ gap="lg"+ opacity={isDisabled ? 0.4 : 1}+ aria-disabled={isDisabled || undefined}+ style={{+ pointerEvents: isDisabled ? "none" : "auto",+ transition: "opacity 150ms ease",+ }}+ >+ {children}+ </Stack>+ );+}++function MetabotCollectionConfigurationPane({+ metabot,+ title,+}: {+ metabot: MetabotInfo;+ title?: string;+}) {+ const metabotId = metabot.id;+ const metabotName = metabot.name;++ const {+ data: collection,+ isLoading,+ error,+ } = useGetCollectionQuery({+ id: metabot.collection_id ?? "root",+ });++ const [updateMetabot, { isLoading: isUpdating }] = useUpdateMetabotMutation();+ const [isOpen, { open, close }] = useDisclosure(false);+ const [sendToast] = useToast();++ if (isLoading || !collection || error) {+ return (+ <LoadingAndErrorWrapper+ loading={isLoading}+ error={error ? t`Error fetching Metabot configuration` : null}+ />+ );+ }++ const handleUpdateCollectionId = async (+ newEntity: Pick<MetabotInfo, "id" | "name">,+ ) => {+ close();+ const result = await updateMetabot({+ id: metabotId,+ collection_id: canonicalCollectionId(newEntity.id),+ });++ if (result.error) {+ sendToast({+ message: t`Error setting ${newEntity.name}`,+ icon: "warning",+ });+ }+ };++ const defaultTitle = c("{0} is the name of an AI assistant")+ .t`Collection ${metabotName} can use`;++ return (+ <Box>+ <SettingHeader id="allow-metabot" title={title ?? defaultTitle} />+ <CollectionInfo collection={collection} />+ <Flex gap="md" mt="md">+ <Button onClick={open} leftSection={isUpdating && <Loader size="xs" />}>+ {match({ isMutating: isUpdating, collection })+ .with({ isMutating: true }, () => t`Updating collection...`)+ .with({ collection: undefined }, () => t`Pick a collection`)+ .otherwise(() => t`Pick a different collection`)}+ </Button>+ </Flex>+ {isOpen && (+ <CollectionPickerModal+ title={t`Select a collection`}+ value={{+ id: collection?.id ?? null,+ model: "collection",+ }}+ onChange={(item) =>+ handleUpdateCollectionId(item as Pick<MetabotInfo, "id" | "name">)+ }+ onClose={close}+ options={{+ hasRootCollection: true,+ hasPersonalCollections: false,+ }}+ />+ )}+ </Box>+ );+}++function CollectionInfo({ collection }: { collection: Collection }) {+ const { data: collectionInfo } = useGetCollectionQuery(+ collection?.id ? { id: collection.id } : skipToken,+ );++ if (!collection || !collectionInfo) {+ return null;+ }++ const parent = collectionInfo?.effective_ancestors?.slice(-1)?.[0];++ return (+ <Flex align="center" gap="sm" c="text-tertiary" mb="sm">+ {parent && (+ <>+ <CollectionDisplay collection={parent} />+ <Text c="text-tertiary" fw="bold">+ /+ </Text>+ </>+ )}+ <CollectionDisplay collection={collectionInfo} />+ </Flex>+ );+}++const CollectionDisplay = ({+ collection,+}: {+ collection: CollectionEssentials;+}) => {+ const icon = getIcon({ model: "collection", ...collection });+ return (+ <Flex align="center" gap="sm">+ <Icon {...icon} c={icon.color ?? "brand"} />+ <Text c="text-secondary" fw="bold">+ {collection.name}+ </Text>+ </Flex>+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsxsimilarity index 91%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsxindex bf66812ee4c..3f857d02219 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminPage.unit.spec.tsx@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import { Route } from "react-router";+import { setupEnterprisePlugins } from "__support__/enterprise";import {findRequests,setupCollectionByIdEndpoint,@@ -16,6 +17,7 @@ import {setupMetabotPromptSuggestionsEndpoint,setupMetabotsEndpoints,} from "__support__/server-mocks/metabot";+import { mockSettings } from "__support__/settings";import {mockGetBoundingClientRect,renderWithProviders,@@ -27,23 +29,19 @@ import { waitForRequest } from "__support__/utils";import {FIXED_METABOT_ENTITY_IDS,FIXED_METABOT_IDS,-} from "metabase-enterprise/metabot/constants";-import { hasPremiumFeature } from "metabase-enterprise/settings";+} from "metabase/metabot/constants";+import { reinitialize } from "metabase/plugins";import type { MetabotId, RecentItem } from "metabase-types/api";import {createMockCollection,createMockMetabotInfo,createMockSettings,+ createMockTokenFeatures,} from "metabase-types/api/mocks";import { MetabotAdminPage } from "./MetabotAdminPage";import * as hooks from "./utils";-jest.mock("metabase-enterprise/settings");-const mockHasPremiumFeature = hasPremiumFeature as jest.MockedFunction<- typeof hasPremiumFeature->;-const mockPathParam = (id: MetabotId) => {jest.spyOn(hooks, "useMetabotIdPath").mockReturnValue(id);};@@ -148,7 +146,20 @@ const getLastSettingUpdateCall = (settingKey: string) =>`path:/api/setting/${encodeURIComponent(settingKey)}`,);+const setupContentVerificationPlugin = () => {+ mockSettings({+ "token-features": createMockTokenFeatures({+ content_verification: true,+ }),+ });+ setupEnterprisePlugins();+};+describe("MetabotAdminPage", () => {+ afterEach(() => {+ reinitialize();+ });+it("should render the page", async () => {await setup();expect(screen.getByText(/Configure Metabot/)).toBeInTheDocument();@@ -214,7 +225,7 @@ describe("MetabotAdminPage", () => {expect(fetchMock.callHistory.calls(- `path:/api/ee/metabot-v3/metabot/${FIXED_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,+ `path:/api/metabot/metabot/${FIXED_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,).length,).toEqual(1); // should have loaded prompt suggestions@@ -234,13 +245,13 @@ describe("MetabotAdminPage", () => {const puts = await findRequests("PUT");expect(puts[0].url).toMatch(- new RegExp(`/api/ee/metabot-v3/metabot/${FIXED_METABOT_IDS.EMBEDDED}`),+ new RegExp(`/api/metabot/metabot/${FIXED_METABOT_IDS.EMBEDDED}`),);expect(puts[0].body).toEqual({ collection_id: 31 });expect(fetchMock.callHistory.calls(- `path:/api/ee/metabot-v3/metabot/${FIXED_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,+ `path:/api/metabot/metabot/${FIXED_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,).length,).toEqual(2); // +1 refetch for DELETE, +1 for PUT});@@ -281,18 +292,7 @@ describe("MetabotAdminPage", () => {).toBeInTheDocument();});- const mockContentVerificationEnabled = (enabled: boolean) => {- mockHasPremiumFeature.mockImplementation((feature) => {- if (feature === "content_verification") {- return enabled;- }- return true; // Mock other features as enabled by default- });- };-it("should not show verification switch without content_verification feature", async () => {- mockContentVerificationEnabled(false);-await setup();// First ensure the page has loaded@@ -305,7 +305,7 @@ describe("MetabotAdminPage", () => {});it("should show verification switch with content_verification feature", async () => {- mockContentVerificationEnabled(true);+ setupContentVerificationPlugin();await setup();@@ -321,7 +321,7 @@ describe("MetabotAdminPage", () => {});it("should allow enabling/disabling verified switch affecting use_verified_content", async () => {- mockContentVerificationEnabled(true);+ setupContentVerificationPlugin();await setup();diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsxindex d0d86009925..2ba8ead95d7 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx@@ -3,11 +3,18 @@ import { useMemo } from "react";import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";+import {+ useDeleteSuggestedMetabotPromptMutation,+ useGetSuggestedMetabotPromptsQuery,+ useRegenerateSuggestedMetabotPromptsMutation,+} from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";import { PaginationControls } from "metabase/common/components/PaginationControls";import { Table } from "metabase/common/components/Table";import { useToast } from "metabase/common/hooks";import { usePagination } from "metabase/common/hooks/use-pagination";+import * as Urls from "metabase/lib/urls";+import { FIXED_METABOT_IDS } from "metabase/metabot/constants";import {ActionIcon,Box,@@ -19,13 +26,6 @@ import {Skeleton,Tooltip,} from "metabase/ui";-import {- useDeleteSuggestedMetabotPromptMutation,- useGetSuggestedMetabotPromptsQuery,- useRegenerateSuggestedMetabotPromptsMutation,-} from "metabase-enterprise/api";-import { FIXED_METABOT_IDS } from "metabase-enterprise/metabot/constants";-import * as Urls from "metabase-enterprise/urls";import type { MetabotInfo, SuggestedMetabotPrompt } from "metabase-types/api";export const PAGE_SIZE = 10;diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsxsimilarity index 99%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsxindex 3684962f1ee..1ada057777c 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.unit.spec.tsx@@ -8,7 +8,7 @@ import {setupRemoveMetabotPromptSuggestionEndpoint,} from "__support__/server-mocks/metabot";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { FIXED_METABOT_IDS } from "metabase-enterprise/metabot/constants";+import { FIXED_METABOT_IDS } from "metabase/metabot/constants";import type { SuggestedMetabotPrompt } from "metabase-types/api";import { MetabotPromptSuggestionPane } from "./MetabotAdminSuggestedPrompts";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotNavPane.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsxsimilarity index 89%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotNavPane.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsxindex 561dd31f791..6b531bac977 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotNavPane.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotNavPane.tsx@@ -4,8 +4,8 @@ import {AdminNavItem,AdminNavWrapper,} from "metabase/admin/components/AdminNav";+import { FIXED_METABOT_IDS } from "metabase/metabot/constants";import { Flex } from "metabase/ui";-import { FIXED_METABOT_IDS } from "metabase-enterprise/metabot/constants";export function MetabotNavPane() {return (diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSQLGenerationSettingsSection.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSQLGenerationSettingsSection.tsxindex daa9184dac4..842eaaa5b9b 100644--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSQLGenerationSettingsSection.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSQLGenerationSettingsSection.tsx@@ -10,7 +10,7 @@ import { useListModelsQuery } from "metabase/api/llm";import { getErrorMessage } from "metabase/api/utils/errors";import { useAdminSetting } from "metabase/api/utils/settings";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useToast } from "metabase/common/hooks";+import { useSetting, useToast } from "metabase/common/hooks";import { Box, PasswordInput, Select, Stack, TextInput } from "metabase/ui";export function MetabotSQLGenerationSettingsSection() {@@ -31,9 +31,14 @@ export function MetabotSQLGenerationSettingsSection() {modelDetails?.is_env_setting && modelDetails?.env_name);+ const isApiKeyConfigured = useSetting("llm-anthropic-api-key-configured?");const savedApiKey = apiKey.value ?? "";- const hasApiKey = savedApiKey.trim().length > 0;+ const hasApiKey = isApiKeyConfigured || savedApiKey.trim().length > 0;const apiKeyDisplayValue = localApiKey ?? savedApiKey;+ const apiKeyPlaceholder =+ isApiKeyConfigured && !localApiKey+ ? "•".repeat(108)+ : t`Enter your API key`;const ApiKeyInput = isApiKeyEnvVar ? TextInput : PasswordInput;const {@@ -105,7 +110,7 @@ export function MetabotSQLGenerationSettingsSection() {<ApiKeyInputdisabled={isApiKeyEnvVar}label={t`Anthropic API Key`}- placeholder={t`Enter your API key`}+ placeholder={apiKeyPlaceholder}value={apiKeyDisplayValue}onChange={(e) => {setLocalApiKey(e.target.value);diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.module.css b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.module.cssrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsxindex 300b7060c5b..b489398e2aa 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx@@ -6,6 +6,7 @@ import * as Yup from "yup";import { SettingsSection } from "metabase/admin/components/SettingsSection";import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";+import { useUpdateMetabotSlackSettingsMutation } from "metabase/api/metabot";import {useGetSlackAppInfoQuery,useGetSlackManifestQuery,@@ -23,7 +24,6 @@ import {} from "metabase/forms";import * as Errors from "metabase/lib/errors";import { Accordion, Button, Flex, Stack, Text } from "metabase/ui";-import { useUpdateMetabotSlackSettingsMutation } from "metabase-enterprise/api/metabot";import type { SlackAppInfo } from "metabase-types/api/slack";import {diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsxindex f95ba560be3..26b36e98d18 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.unit.spec.tsx@@ -198,7 +198,7 @@ describe("MetabotSlackSetup", () => {expect(await saveButton()).toBeDisabled();});- it("submits settings via PUT /api/ee/metabot-v3/slack/settings", async () => {+ it("submits settings via PUT /api/metabot/slack/settings", async () => {await setup();await userEvent.type(await clientIdInput(), "123.456");@@ -210,7 +210,7 @@ describe("MetabotSlackSetup", () => {await waitFor(async () => {const puts = await findRequests("PUT");const req = puts.find((r) =>- r.url.includes("/api/ee/metabot-v3/slack/settings"),+ r.url.includes("/api/metabot/slack/settings"),);expect(req?.body).toEqual({"slack-connect-client-id": "123.456",@@ -281,7 +281,7 @@ describe("MetabotSlackSetup", () => {await waitFor(async () => {const puts = await findRequests("PUT");const req = puts.find((r) =>- r.url.includes("/api/ee/metabot-v3/slack/settings"),+ r.url.includes("/api/metabot/slack/settings"),);expect(req?.body).toEqual({"slack-connect-client-id": null,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsxrename to frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetupAlerts.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/test-utils.ts b/frontend/src/metabase/metabot/components/MetabotAdmin/test-utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/test-utils.tsrename to frontend/src/metabase/metabot/components/MetabotAdmin/test-utils.tsdiff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.tsnew file mode 100644index 00000000000..13021089898--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts@@ -0,0 +1,62 @@+import type { FetchBaseQueryError } from "@reduxjs/toolkit/query";+import type { FormikErrors } from "formik";+import { P, isMatching } from "ts-pattern";++import { useSelector } from "metabase/lib/redux";+import { getLocation } from "metabase/selectors/routing";++export function useMetabotIdPath() {+ const location = useSelector(getLocation);+ const metabotId = Number(location?.pathname?.split("/").pop());+ return Number.isNaN(metabotId) ? null : metabotId;+}++// https://redux-toolkit.js.org/rtk-query/usage/error-handling+// https://redux-toolkit.js.org/rtk-query/usage-with-typescript#type-safe-error-handling+export const isFetchBaseQueryError = (+ error: unknown,+): error is FetchBaseQueryError =>+ isMatching({ status: P.any, data: P.any }, error);++type IFieldError<Values> =+ | string+ | {+ message: string;+ }+ | {+ errors: FormikErrors<Values>;+ };++const isFieldError = <Values>(error: unknown): error is IFieldError<Values> =>+ isMatching(+ P.union(+ P.string,+ { message: P.string },+ { errors: P.record(P.string, P.any) },+ ),+ error,+ );++// If `error` is a form field error, throw a structured exception with the shape+// `{data: {errors: FormikErrors}}` that will be caught as a validation error by+// [[FormProvider]] in `frontend/src/metabase/forms/components/FormProvider/`.+export const handleFieldError = <Values>(+ error: unknown,+ defaultField: keyof Values,+) => {+ if (!isFieldError<Values>(error)) {+ return;+ }++ if (typeof error === "string") {+ throw { data: { errors: { [defaultField]: error } } };+ }++ if ("message" in error) {+ throw { data: { errors: { [defaultField]: error.message } } };+ }++ if ("errors" in error) {+ throw { data: error };+ }+};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsxsimilarity index 88%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsxrename to frontend/src/metabase/metabot/components/MetabotAppBarButton.tsxindex 863911187e4..dd31f128573 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx@@ -1,9 +1,11 @@import { t } from "ttag";import { METAKEY } from "metabase/lib/browser";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";import { trackMetabotChatOpened } from "../analytics";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsxsimilarity index 67%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsxindex 11608ff9978..1c7c6655d81 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx@@ -1,4 +1,3 @@-import { combineReducers } from "@reduxjs/toolkit";import userEvent from "@testing-library/user-event";import { setupEnterprisePlugins } from "__support__/enterprise";@@ -8,24 +7,16 @@ import { createMockTokenFeatures } from "metabase-types/api/mocks";import { createMockState } from "metabase-types/store/mocks";import { MetabotProvider } from "../context";-import { metabotReducer } from "../state";-import { getMetabotInitialState } from "../state/reducer-utils";import { MetabotAppBarButton } from "./MetabotAppBarButton";function setup({isMetabotEnabled = true,}: { isMetabotEnabled?: boolean } = {}) {- setupEnterprisePlugins();-- const settings = mockSettings({- "metabot-enabled?": isMetabotEnabled,- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),+ mockSettings({+ "token-features": createMockTokenFeatures({ metabot_v3: true }),});-- const metabotState = getMetabotInitialState();+ setupEnterprisePlugins();const { store } = renderWithProviders(<MetabotProvider>@@ -33,16 +24,8 @@ function setup({</MetabotProvider>,{storeInitialState: createMockState({- settings,- plugins: {- metabotPlugin: metabotState,- },- } as any),- customReducers: {- plugins: combineReducers({- metabotPlugin: metabotReducer,- }),- },+ settings: mockSettings({ "metabot-enabled?": isMetabotEnabled }),+ }),},);@@ -68,17 +51,13 @@ describe("MetabotAppBarButton", () => {const { store } = setup({ isMetabotEnabled: true });const initialState = store.getState() as any;- expect(- initialState.plugins.metabotPlugin.conversations.omnibot.visible,- ).toBe(false);+ expect(initialState.metabot.conversations.omnibot.visible).toBe(false);await userEvent.click(screen.getByRole("button", { name: /Chat with Metabot/ }),);const newState = store.getState() as any;- expect(newState.plugins.metabotPlugin.conversations.omnibot.visible).toBe(- true,- );+ expect(newState.metabot.conversations.omnibot.visible).toBe(true);});});diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.module.cssrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex 49790aefdf0..779daf874b1 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -2,7 +2,7 @@ import { unifiedMergeView } from "@codemirror/merge";import { useDisclosure } from "@mantine/hooks";import type { UnknownAction } from "@reduxjs/toolkit";import cx from "classnames";-import { useMemo, useState } from "react";+import { useContext, useMemo, useState } from "react";import { push } from "react-router-redux";import { useLocation, useMount } from "react-use";import { P, match } from "ts-pattern";@@ -13,6 +13,12 @@ import { useLazyGetTransformQuery } from "metabase/api";import { CodeMirror } from "metabase/common/components/CodeMirror";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";+import { MetabotContext } from "metabase/metabot/context";+import {+ type MetabotAgentEditSuggestionChatMessage,+ activateSuggestedTransform,+ getIsSuggestedTransformActive,+} from "metabase/metabot/state";import { useMetadataToasts } from "metabase/metadata/hooks";import EditorS from "metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.css";import { getMetadata } from "metabase/selectors/metadata";@@ -27,12 +33,6 @@ import {Paper,Text,} from "metabase/ui";-import { useMetabotSuggestionActions } from "metabase-enterprise/metabot/context";-import {- type MetabotAgentEditSuggestionChatMessage,- activateSuggestedTransform,- getIsSuggestedTransformActive,-} from "metabase-enterprise/metabot/state";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {@@ -110,7 +110,7 @@ export const AgentSuggestionMessage = ({const dispatch = useDispatch();const metadata = useSelector(getMetadata);const isWorkspace = useSelector(getIsWorkspace);- const suggestionActions = useMetabotSuggestionActions();+ const { suggestionActions } = useContext(MetabotContext);const { sendErrorToast } = useMetadataToasts();const [isApplying, setIsApplying] = useState(false);const [hasAppliedInContext, setHasAppliedInContext] = useState(false);diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.module.cssrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentTodoMessage.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxindex 7af6e6504bc..e7012b1d142 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx@@ -3,6 +3,7 @@ import { useMemo } from "react";import { t } from "ttag";import { CodeEditor } from "metabase/common/components/CodeEditor";+import type { MetabotDebugToolCallMessage } from "metabase/metabot/state";import {ActionIcon,Badge,@@ -14,7 +15,6 @@ import {Stack,Text,} from "metabase/ui";-import type { MetabotDebugToolCallMessage } from "metabase-enterprise/metabot/state";const ToolCallDetailsModal = ({message,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.cssrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsxindex 9790b289ba8..25ce592442d 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx@@ -3,6 +3,8 @@ import { useMemo } from "react";import { t } from "ttag";import EmptyDashboardBot from "assets/img/dashboard-empty.svg?component";+import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";+import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";import {ActionIcon,Box,@@ -14,8 +16,6 @@ import {Text,Tooltip,} from "metabase/ui";-import { useGetSuggestedMetabotPromptsQuery } from "metabase-enterprise/api";-import { MetabotResetLongChatButton } from "metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton";import { useMetabotAgent } from "../../hooks";import type { MetabotConfig } from "../Metabot";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.cssrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/index.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/index.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/index.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/index.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatMessage.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsxindex 7940dee358a..ba70576c5a7 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatMessage.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx@@ -3,7 +3,15 @@ import cx from "classnames";import { forwardRef, useCallback, useState } from "react";import { t } from "ttag";+import { useSubmitMetabotFeedbackMutation } from "metabase/api/metabot";import { useToast } from "metabase/common/hooks";+import type {+ MetabotAgentChatMessage,+ MetabotAgentTextChatMessage,+ MetabotChatMessage,+ MetabotErrorMessage,+ MetabotUserChatMessage,+} from "metabase/metabot/state";import {ActionIcon,Flex,@@ -13,14 +21,6 @@ import {Text,Tooltip,} from "metabase/ui";-import { useSubmitMetabotFeedbackMutation } from "metabase-enterprise/api/metabot";-import type {- MetabotAgentChatMessage,- MetabotAgentTextChatMessage,- MetabotChatMessage,- MetabotErrorMessage,- MetabotUserChatMessage,-} from "metabase-enterprise/metabot/state";import type { MetabotFeedback } from "metabase-types/api";import { AIMarkdown } from "../AIMarkdown/AIMarkdown";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsxsimilarity index 94%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotFeedbackModal.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsxindex dd21842fa87..1dd6210a7ed 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotFeedbackModal.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx@@ -8,14 +8,10 @@ import { FormSelect } from "metabase/forms/components/FormSelect";import { FormTextarea } from "metabase/forms/components/FormTextarea";import * as Errors from "metabase/lib/errors";import { useSelector } from "metabase/lib/redux";+import { getMetabotId, getMetabotState } from "metabase/metabot/state";import { getUserIsAdmin } from "metabase/selectors/user";import { getApplicationName } from "metabase/selectors/whitelabel";import { Button, Group, Modal, Stack, Text } from "metabase/ui";-import { useMetabotSelector } from "metabase-enterprise/metabot/hooks/use-metabot-store";-import {- getMetabotId,- getMetabotState,-} from "metabase-enterprise/metabot/state";import type { MetabotFeedback } from "metabase-types/api";// Issue types that require free text feedback@@ -69,8 +65,8 @@ export const MetabotFeedbackModal = ({const isAdmin = useSelector(getUserIsAdmin);const version = useSetting("version");- const metabotId = useMetabotSelector(getMetabotId);- const metabotState = useMetabotSelector(getMetabotState);+ const metabotId = useSelector(getMetabotId);+ const metabotState = useSelector(getMetabotState);const handleSubmit = (values: Pick<diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotResetLongChatButton.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotResetLongChatButton.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotThinking.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.cssrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotThinking.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotThinking.tsxsimilarity index 95%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/MetabotThinking.tsxindex b95f6951908..0fe1d64b9b0 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotThinking.tsx@@ -1,8 +1,8 @@import cx from "classnames";import { useMemo } from "react";+import type { MetabotToolCall } from "metabase/metabot/state";import { Loader, Stack, Text, Transition } from "metabase/ui";-import type { MetabotToolCall } from "metabase-enterprise/metabot/state";import S from "./MetabotThinking.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/hooks.ts b/frontend/src/metabase/metabot/components/MetabotChat/hooks.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/hooks.tsrename to frontend/src/metabase/metabot/components/MetabotChat/hooks.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/index.tsx b/frontend/src/metabase/metabot/components/MetabotChat/index.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/index.tsxrename to frontend/src/metabase/metabot/components/MetabotChat/index.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsxsimilarity index 91%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsxrename to frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsxindex 0a1381685db..a464d9924fd 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioButton.tsx+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx@@ -3,12 +3,14 @@ import { t } from "ttag";import { METAKEY } from "metabase/lib/browser";import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";import { getLocation } from "metabase/selectors/routing";import { ActionIcon, Icon, Tooltip } from "metabase/ui";import { trackMetabotChatOpened } from "../analytics";-import { useMetabotAgent } from "../hooks";export const MetabotDataStudioButton = () => {const isMetabotEnabled = useMetabotEnabledEmbeddingAware();diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioSidebar.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotDataStudioSidebar.tsxrename to frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.css b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.cssrename to frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxrename to frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxindex 622e0a2f1c4..df8f5ab6e6a 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx@@ -6,8 +6,10 @@ import { isMatching } from "ts-pattern";import { t } from "ttag";import _ from "underscore";+import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";import { MetabotLogo } from "metabase/common/components/MetabotLogo";import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";import { MetabotPromptInput } from "metabase/metabot/components/MetabotPromptInput";import { useRouter } from "metabase/router";import {@@ -19,8 +21,6 @@ import {Text,UnstyledButton,} from "metabase/ui";-import { useGetSuggestedMetabotPromptsQuery } from "metabase-enterprise/api";-import { Urls } from "metabase-enterprise/urls";import { useMetabotAgent } from "../../hooks";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/index.ts b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/index.tsrename to frontend/src/metabase/metabot/components/MetabotQueryBuilder/index.tsdiff --git a/frontend/src/metabase/metabot/components/MetabotQueryBuilderOrFallback.tsx b/frontend/src/metabase/metabot/components/MetabotQueryBuilderOrFallback.tsxnew file mode 100644index 00000000000..87929a40a1e--- /dev/null+++ b/frontend/src/metabase/metabot/components/MetabotQueryBuilderOrFallback.tsx@@ -0,0 +1,16 @@+import { MetabotQueryBuilder } from "metabase/metabot/components/MetabotQueryBuilder";+import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";+import { QueryBuilder } from "metabase/query_builder/containers/QueryBuilder";++/**+ * A wrapper component that renders MetabotQueryBuilder if metabot is enabled,+ * otherwise falls back to the regular QueryBuilder.+ */+export function MetabotQueryBuilderOrFallback(props: any) {+ const isMetabotEnabled = useMetabotEnabledEmbeddingAware();+ return isMetabotEnabled ? (+ <MetabotQueryBuilder {...props} />+ ) : (+ <QueryBuilder {...props} />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxsimilarity index 84%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQuickLinks.tsxrename to frontend/src/metabase/metabot/components/MetabotQuickLinks.tsxindex 863b8d704d0..ab5b6de45b7 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQuickLinks.tsx+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx@@ -3,8 +3,10 @@ import { replace } from "react-router-redux";import { useMount } from "react-use";import { useDispatch } from "metabase/lib/redux";-import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";+import {+ useMetabotAgent,+ useMetabotEnabledEmbeddingAware,+} from "metabase/metabot/hooks";export const getMetabotQuickLinks = () => {return (diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/NewMenuItemAIExploration.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/NewMenuItemAIExploration.tsxrename to frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/NewMenuItemAIExploration.unit.spec.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/NewMenuItemAIExploration.unit.spec.tsxrename to frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/SlackConnectSuccess.tsx b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/components/SlackConnectSuccess.tsxrename to frontend/src/metabase/metabot/components/SlackConnectSuccess.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/constants.ts b/frontend/src/metabase/metabot/constants.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/constants.tsrename to frontend/src/metabase/metabot/constants.tsdiff --git a/frontend/src/metabase/metabot/context.ts b/frontend/src/metabase/metabot/context.tsdeleted file mode 100644index 94ac72762f7..00000000000--- a/frontend/src/metabase/metabot/context.ts+++ /dev/null@@ -1,57 +0,0 @@-import { type RefObject, useContext, useEffect, useMemo } from "react";--import { PLUGIN_METABOT } from "metabase/plugins";-import type { MetabotChatContext } from "metabase-types/api";-import type { State } from "metabase-types/store";--export type ChatContextProviderFn = (- state: State,-) => Promise<Partial<MetabotChatContext> | void>;--export type DeregisterChatContextProviderFn = () => void;--// internal type so we can support tiptap editor and textarea as inputs-export type MetabotPromptInputRef = {- focus: () => void;- getValue?: () => string;- scrollHeight: number;- scrollTop: number;-};--export interface MetabotContext {- prompt: string;- setPrompt: (prompt: string) => void;- promptInputRef: RefObject<MetabotPromptInputRef> | undefined;-- getChatContext: () => Promise<MetabotChatContext>;- registerChatContextProvider: (- fn: ChatContextProviderFn,- ) => DeregisterChatContextProviderFn;-- suggestionActions: unknown;- setSuggestionActions: (actions: unknown) => void;-}--export const useMetabotContext = () => {- const context = useContext(PLUGIN_METABOT.MetabotContext);- if (!context) {- throw new Error("useMetabotContext must be used within a MetabotProvider");- }-- return context;-};--export const useRegisterMetabotContextProvider = (- providerFn: ChatContextProviderFn,- dependencies: React.DependencyList = [],-) => {- const { registerChatContextProvider } = useMetabotContext();-- // eslint-disable-next-line react-hooks/exhaustive-deps- const cachedProviderFn = useMemo(() => providerFn, dependencies);-- useEffect(() => {- const deregister = registerChatContextProvider(cachedProviderFn);- return () => deregister();- }, [cachedProviderFn, registerChatContextProvider]);-};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx b/frontend/src/metabase/metabot/context.tsxsimilarity index 70%rename from enterprise/frontend/src/metabase-enterprise/metabot/context.tsxrename to frontend/src/metabase/metabot/context.tsxindex e5e4d595765..c400421b681 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/context.tsx+++ b/frontend/src/metabase/metabot/context.tsx@@ -1,21 +1,18 @@import dayjs from "dayjs";import type React from "react";import {+ type RefObject,createContext,useCallback,useContext,useEffect,+ useMemo,useRef,useState,} from "react";import _ from "underscore";import { useStore } from "metabase/lib/redux";-import type {- ChatContextProviderFn,- MetabotContext as MetabotCtx,- MetabotPromptInputRef,-} from "metabase/metabot";import {canUserCreateNativeQueries,canUserCreateQueries,@@ -27,6 +24,13 @@ import type {MetabotTransformInfo,TaggedTransform,} from "metabase-types/api";+import type { State } from "metabase-types/store";++export type ChatContextProviderFn = (+ state: State,+) => Promise<Partial<MetabotChatContext> | void>;++export type DeregisterChatContextProviderFn = () => void;export type ApplySuggestionPayload = {editorTransform: MetabotTransformInfo | undefined;@@ -37,6 +41,38 @@ export type ApplySuggestionResult =| { status: "applied" }| { status: "error"; message: string };+export type MetabotSuggestionActions = {+ openTransform: (transform: TaggedTransform) => void;+ applySuggestion: (+ payload: ApplySuggestionPayload,+ ) => Promise<ApplySuggestionResult>;+};++// internal type so we can support tiptap editor and textarea as inputs+export type MetabotPromptInputRef = {+ focus: () => void;+ getValue?: () => string;+ scrollHeight: number;+ scrollTop: number;+};++export type MetabotCtx = {+ prompt: string;+ setPrompt: (prompt: string) => void;+ promptInputRef: RefObject<MetabotPromptInputRef> | undefined;++ getChatContext: () => Promise<MetabotChatContext>;+ registerChatContextProvider: (+ fn: ChatContextProviderFn,+ ) => DeregisterChatContextProviderFn;++ // TODO: figure out how to make the enabled types EE only (probably should live in redux imo)+ // suggestionActions: unknown;+ // setSuggestionActions: (actions: unknown) => void;+ suggestionActions: MetabotSuggestionActions | null;+ setSuggestionActions: (actions: MetabotSuggestionActions | null) => void;+};+export const defaultContext: MetabotCtx = {prompt: "",setPrompt: () => {},@@ -54,6 +90,34 @@ export const defaultContext: MetabotCtx = {setSuggestionActions: () => {},};+export const MetabotContext = createContext<MetabotCtx>(+ defaultContext as MetabotCtx,+);++export const useMetabotContext = () => {+ const context = useContext(MetabotContext);+ if (!context) {+ throw new Error("useMetabotContext must be used within a MetabotProvider");+ }++ return context;+};++export const useRegisterMetabotContextProvider = (+ providerFn: ChatContextProviderFn,+ dependencies: React.DependencyList = [],+) => {+ const { registerChatContextProvider } = useMetabotContext();++ // eslint-disable-next-line react-hooks/exhaustive-deps+ const cachedProviderFn = useMemo(() => providerFn, dependencies);++ useEffect(() => {+ const deregister = registerChatContextProvider(cachedProviderFn);+ return () => deregister();+ }, [cachedProviderFn, registerChatContextProvider]);+};+const mergeCtx = (ctx: MetabotChatContext,partialCtx: Partial<MetabotChatContext>,@@ -67,28 +131,6 @@ const mergeCtx = (};};-export type MetabotSuggestionActions = {- openTransform: (transform: TaggedTransform) => void;- applySuggestion: (- payload: ApplySuggestionPayload,- ) => Promise<ApplySuggestionResult>;-};--interface EnterpriseMetabotContext- extends Omit<MetabotCtx, "suggestionActions" | "setSuggestionActions"> {- suggestionActions: MetabotSuggestionActions | null;- setSuggestionActions: (actions: MetabotSuggestionActions | null) => void;-}--export const MetabotContext = createContext<EnterpriseMetabotContext>(- defaultContext as EnterpriseMetabotContext,-);--export const useMetabotSuggestionActions = () => {- const { suggestionActions } = useContext(MetabotContext);- return suggestionActions;-};-export const useRegisterMetabotSuggestionActions = (actions: MetabotSuggestionActions | null | undefined,) => {diff --git a/frontend/src/metabase/metabot/hooks/index.ts b/frontend/src/metabase/metabot/hooks/index.tsindex e050d270f36..c053209f2a1 100644--- a/frontend/src/metabase/metabot/hooks/index.ts+++ b/frontend/src/metabase/metabot/hooks/index.ts@@ -1,3 +1,5 @@-export { useMetabotSQLSuggestion } from "./use-metabot-sql-suggestion";-export { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";export { useLlmSqlGenerationEnabled } from "./use-llm-sql-generation-enabled";+export { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";+export { useMetabotAgent } from "./use-metabot-agent";+export { useMetabotAgentsManager } from "./use-metabot-agents-manager";+export { useDashCardAnalysis } from "./useDashCardAnalysis";diff --git a/frontend/src/metabase/metabot/hooks/use-llm-sql-generation-enabled.ts b/frontend/src/metabase/metabot/hooks/use-llm-sql-generation-enabled.tsindex 68d3a34cc27..7462db89943 100644--- a/frontend/src/metabase/metabot/hooks/use-llm-sql-generation-enabled.ts+++ b/frontend/src/metabase/metabot/hooks/use-llm-sql-generation-enabled.ts@@ -1,4 +1,5 @@-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/common/hooks";+import { PLUGIN_METABOT } from "metabase/plugins";import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";@@ -9,13 +10,14 @@ import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-e* OSS path: not hosted AND Anthropic API key is configured*/export const useLlmSqlGenerationEnabled = (): boolean => {- const hasMetabotV3 = useHasTokenFeature("metabot_v3");- const isMetabotEnabled = useMetabotEnabledEmbeddingAware();+ const isMetabotEnabled = useMetabotEnabledEmbeddingAware({+ requireMeteabotFeature: false,+ });const isHosted = useSetting("is-hosted?");const isAnthropicConfigured = useSetting("llm-anthropic-api-key-configured?");// Enterprise: metabot_v3 feature + metabot enabled- if (hasMetabotV3) {+ if (PLUGIN_METABOT.hasFeature) {return isMetabotEnabled;}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agent.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agent.tssimilarity index 82%rename from enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agent.tsrename to frontend/src/metabase/metabot/hooks/use-metabot-agent.tsindex b731c4454fd..8429f3ed2ee 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agent.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts@@ -1,6 +1,7 @@import { isFulfilled } from "@reduxjs/toolkit";import { useCallback } from "react";+import { useDispatch, useSelector } from "metabase/lib/redux";import { useMetabotContext } from "metabase/metabot";import { trackMetabotRequestSent } from "../analytics";@@ -26,19 +27,15 @@ import {submitInput as submitInputAction,} from "../state";-import { useMetabotDispatch, useMetabotSelector } from "./use-metabot-store";-export const useMetabotAgent = (agentId: MetabotAgentId = "omnibot") => {- const dispatch = useMetabotDispatch();+ const dispatch = useDispatch();const { prompt, setPrompt, promptInputRef, getChatContext } =useMetabotContext();- const metabotRequestId = useMetabotSelector((state) =>+ const metabotRequestId = useSelector((state) =>getMetabotRequestId(state, agentId),);- const visible = useMetabotSelector((state) =>- getMetabotVisible(state, agentId),- );+ const visible = useSelector((state) => getMetabotVisible(state, agentId));const setVisible = useCallback((visible: boolean) => dispatch(setVisibleAction({ agentId, visible })),@@ -157,21 +154,17 @@ export const useMetabotAgent = (agentId: MetabotAgentId = "omnibot") => {submitInput,retryMessage,cancelRequest,- metabotId: useMetabotSelector(getMetabotId),- messages: useMetabotSelector((state) => getMessages(state, agentId)),- errorMessages: useMetabotSelector((state) =>+ metabotId: useSelector(getMetabotId),+ messages: useSelector((state) => getMessages(state, agentId)),+ errorMessages: useSelector((state) =>getAgentErrorMessages(state, agentId),),- isDoingScience: useMetabotSelector((state) =>- getIsProcessing(state, agentId),- ),- isLongConversation: useMetabotSelector((state) =>+ isDoingScience: useSelector((state) => getIsProcessing(state, agentId)),+ isLongConversation: useSelector((state) =>getIsLongMetabotConversation(state, agentId),),- activeToolCalls: useMetabotSelector((state) =>- getActiveToolCalls(state, agentId),- ),- debugMode: useMetabotSelector(getDebugMode),- reactions: useMetabotSelector(getMetabotReactionsState),+ activeToolCalls: useSelector((state) => getActiveToolCalls(state, agentId)),+ debugMode: useSelector(getDebugMode),+ reactions: useSelector(getMetabotReactionsState),};};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agents-manager.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.tssimilarity index 85%rename from enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agents-manager.tsrename to frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.tsindex 72ee6de6667..8985572c6ee 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-agents-manager.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts@@ -2,6 +2,8 @@ import { useCallback } from "react";import { useMount } from "react-use";import _ from "underscore";+import { useDispatch, useSelector } from "metabase/lib/redux";+import {type MetabotAgentId,createAgent as createAgentAction,@@ -10,8 +12,6 @@ import {resetConversation,} from "../state";-import { useMetabotDispatch, useMetabotSelector } from "./use-metabot-store";-type CreatePayload = Parameters<typeof createAgentAction>[0];type DestroyPayload = Parameters<typeof destroyAgent>[0];type ResetPayload = Parameters<typeof resetConversation>[0];@@ -19,8 +19,8 @@ type ResetPayload = Parameters<typeof resetConversation>[0];export const useMetabotAgentsManager = (autoStartAgentIds: MetabotAgentId[],) => {- const dispatch = useMetabotDispatch();- const activeAgentIds = useMetabotSelector(getActiveMetabotAgentIds);+ const dispatch = useDispatch();+ const activeAgentIds = useSelector(getActiveMetabotAgentIds);useMount(() => {const agentIdsToStart = _.difference(autoStartAgentIds, activeAgentIds);diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.tsindex 97dcea26064..d6315dbdd71 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts@@ -1,17 +1,21 @@-import { useHasTokenFeature, useSetting } from "metabase/common/hooks";+import { useSetting } from "metabase/common/hooks";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { isWithinIframe } from "metabase/lib/dom";+import { PLUGIN_METABOT } from "metabase/plugins";/** Returns the value for `metabot-enabled?` or `embedded-metabot-enabled?` depending on the context* only if the metabot token feature is enabled.* Use `forceEmbedding` to always check the embedding setting (e.g. in the embed wizard). */export const useMetabotEnabledEmbeddingAware = ({forceEmbedding = false,-}: { forceEmbedding?: boolean } = {}): boolean => {- const hasMetabotV3 = useHasTokenFeature("metabot_v3");+ requireMeteabotFeature = true,+}: {+ forceEmbedding?: boolean;+ requireMeteabotFeature?: boolean;+} = {}): boolean => {const isEmbedding = forceEmbedding || isWithinIframe() || isEmbeddingSdk();const isEnabled = useSetting(isEmbedding ? "embedded-metabot-enabled?" : "metabot-enabled?",);- return hasMetabotV3 && isEnabled;+ return (!requireMeteabotFeature || PLUGIN_METABOT.hasFeature) && isEnabled;};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-reactions.ts b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.tssimilarity index 66%rename from enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-reactions.tsrename to frontend/src/metabase/metabot/hooks/use-metabot-reactions.tsindex 6ce815d2b2c..987e99b62ab 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/hooks/use-metabot-reactions.ts+++ b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts@@ -1,17 +1,15 @@import { useCallback } from "react";-import { useDispatch } from "metabase/lib/redux";+import { useDispatch, useSelector } from "metabase/lib/redux";import {getNavigateToPath,setNavigateToPath as setNavigateToPathAction,-} from "metabase-enterprise/metabot/state";--import { useMetabotSelector } from "./use-metabot-store";+} from "metabase/metabot/state";export const useMetabotReactions = () => {const dispatch = useDispatch();- const navigateToPath = useMetabotSelector(getNavigateToPath);+ const navigateToPath = useSelector(getNavigateToPath);const setNavigateToPath = useCallback(async (navigateToPath: string | null) => {diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion-oss.tsx b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion-oss.tsxnew file mode 100644index 00000000000..af131286fcd--- /dev/null+++ b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion-oss.tsx@@ -0,0 +1,104 @@+import { useCallback, useMemo, useRef, useState } from "react";+import { t } from "ttag";++import { useGenerateSqlMutation } from "metabase/api";+import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";+import type {+ DatabaseId,+ GenerateSqlResponse,+ ReferencedEntityId,+} from "metabase-types/api";++export interface UseMetabotSQLSuggestionOptions {+ databaseId: DatabaseId | null;+ bufferId: string;+ onGenerated?: (result?: GenerateSqlResponse) => void;+}++export function useMetabotSQLSuggestion({+ databaseId,+ onGenerated,+}: UseMetabotSQLSuggestionOptions) {+ const [source, setSource] = useState<string | undefined>(undefined);+ const [error, setError] = useState<string | undefined>(undefined);+ const [generateSql, { isLoading }] = useGenerateSqlMutation();+ const requestRef = useRef<ReturnType<typeof generateSql> | null>(null);++ const generate = useCallback(+ async ({+ prompt,+ sourceSql,+ referencedEntities,+ }: {+ prompt: string;+ sourceSql?: string;+ referencedEntities?: ReferencedEntityId[];+ }) => {+ if (!databaseId) {+ const errText = t`No database selected.`;+ setError(errText);+ throw new Error(errText);+ }+ setError(undefined);+ try {+ const request = generateSql({+ prompt,+ database_id: databaseId,+ source_sql: sourceSql,+ referenced_entities: referencedEntities,+ });+ requestRef.current = request;+ const result = await request.unwrap();+ requestRef.current = null;++ if (result.sql) {+ setSource(result.sql);+ onGenerated?.(result);+ } else {+ throw new Error(t`Something went wrong. Please try again.`);+ }+ } catch (err) {+ const error = err as { status?: number; data?: unknown };+ let errText = t`Something went wrong. Please try again.`;+ if (error.status === 400 && typeof error.data === "string") {+ errText = error.data;+ }+ setError(errText);+ throw new Error(errText);+ }+ },+ [generateSql, databaseId, onGenerated],+ );++ const cancelRequest = useCallback(() => {+ requestRef.current?.abort();+ requestRef.current = null;+ }, []);++ const clear = useCallback(() => {+ setSource(undefined);+ }, []);++ const reset = useCallback(() => {+ clear();+ setError(undefined);+ }, [clear]);++ const reject = useCallback(() => {+ // no-op for OSS - upgrade to enterprise if you want the agent to be smarter after rejecting an edit!+ }, []);++ const suggestionModels: SuggestionModel[] = useMemo(() => ["table"], []);++ return {+ source,+ isLoading,+ generate,+ error,+ cancelRequest,+ clear,+ reject,+ reset,+ suggestionModels,+ };+}diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsxindex 8aca3ff4c89..7cc50e50eee 100644--- a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx+++ b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx@@ -1,13 +1,19 @@-import { useCallback, useMemo, useRef, useState } from "react";+import { isFulfilled, isRejected } from "@reduxjs/toolkit";+import { useCallback, useMemo, useState } from "react";import { t } from "ttag";-import { useGenerateSqlMutation } from "metabase/api";+import { useDispatch, useSelector } from "metabase/lib/redux";+import { METABOT_PROFILE_OVERRIDES } from "metabase/metabot/constants";+import {+ addDeveloperMessage,+ getMetabotSuggestedCodeEdit,+ removeSuggestedCodeEdit,+ resetConversation,+} from "metabase/metabot/state";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";-import type {- DatabaseId,- GenerateSqlResponse,- ReferencedEntity,-} from "metabase-types/api";+import type { DatabaseId, GenerateSqlResponse } from "metabase-types/api";++import { useMetabotAgent } from "./use-metabot-agent";export interface UseMetabotSQLSuggestionOptions {databaseId: DatabaseId | null;@@ -15,86 +21,91 @@ export interface UseMetabotSQLSuggestionOptions {onGenerated?: (result?: GenerateSqlResponse) => void;}+type SubmitInputResult = Awaited<+ ReturnType<ReturnType<typeof useMetabotAgent>["submitInput"]>+>;++const responseHasCodeEdit = (action: SubmitInputResult) => {+ return (+ isFulfilled(action) &&+ action.payload.data?.processedResponse.data.some(+ (dp) =>+ typeof dp === "object" &&+ dp !== null &&+ "type" in dp &&+ (dp as { type: string }).type === "code_edit",+ )+ );+};+export function useMetabotSQLSuggestion({- databaseId,+ bufferId,onGenerated,}: UseMetabotSQLSuggestionOptions) {- const [source, setSource] = useState<string | undefined>(undefined);- const [error, setError] = useState<string | undefined>(undefined);- const [generateSql, { isLoading }] = useGenerateSqlMutation();- const requestRef = useRef<ReturnType<typeof generateSql> | null>(null);+ const { isDoingScience, submitInput, cancelRequest } = useMetabotAgent("sql");++ const [hasError, setHasError] = useState(false);++ const dispatch = useDispatch();+ const source = useSelector((state) =>+ getMetabotSuggestedCodeEdit(state, bufferId),+ )?.value;const generate = useCallback(async ({prompt,- sourceSql,- referencedEntities,}: {prompt: string;sourceSql?: string;- referencedEntities?: ReferencedEntity[];+ referencedEntities?: unknown;}) => {- if (!databaseId) {- const errText = t`No database selected.`;- setError(errText);- throw new Error(errText);- }- setError(undefined);- try {- const request = generateSql({- prompt,- database_id: databaseId,- source_sql: sourceSql,- referenced_entities: referencedEntities,- });- requestRef.current = request;- const result = await request.unwrap();- requestRef.current = null;-- if (result.sql) {- setSource(result.sql);- onGenerated?.(result);- } else {- throw new Error(t`Something went wrong. Please try again.`);- }- } catch (err) {- const error = err as { status?: number; data?: unknown };- let errText = t`Something went wrong. Please try again.`;- if (error.status === 400 && typeof error.data === "string") {- errText = error.data;- }- setError(errText);- throw new Error(errText);+ setHasError(false);+ const action = await submitInput(prompt, {+ profile: METABOT_PROFILE_OVERRIDES.SQL,+ preventOpenSidebar: true,+ });+ if (+ isRejected(action) ||+ (isFulfilled(action) && !action.payload?.success) ||+ !responseHasCodeEdit(action)+ ) {+ setHasError(true);+ throw new Error(t`Something went wrong. Please try again.`);+ } else {+ onGenerated?.();}},- [generateSql, databaseId, onGenerated],+ [submitInput, onGenerated],);- const cancelRequest = useCallback(() => {- requestRef.current?.abort();- requestRef.current = null;- }, []);+ const reject = useCallback(() => {+ dispatch(+ addDeveloperMessage({+ agentId: "sql",+ message: `User rejected the following suggestion:\n\n${source}`,+ }),+ );+ }, [dispatch, source]);const clear = useCallback(() => {- setSource(undefined);- }, []);+ dispatch(removeSuggestedCodeEdit(bufferId));+ }, [dispatch, bufferId]);const reset = useCallback(() => {- clear();- setError(undefined);- }, [clear]);+ dispatch(removeSuggestedCodeEdit(bufferId));+ dispatch(resetConversation({ agentId: "sql" }));+ }, [dispatch, bufferId]);- const reject = useCallback(() => {- // no-op for OSS - upgrade to enterprise if you want the agent to be smarter after rejecting an edit!- }, []);-- const suggestionModels: SuggestionModel[] = useMemo(() => ["table"], []);+ const suggestionModels: SuggestionModel[] = useMemo(+ () => ["dataset", "table"],+ [],+ );return {source,- isLoading,+ isLoading: isDoingScience,generate,- error,+ error: hasError ? t`Something went wrong. Please try again.` : undefined,cancelRequest,clear,reject,diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/hooks/useDashCardAnalysis.ts b/frontend/src/metabase/metabot/hooks/useDashCardAnalysis.tssimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/hooks/useDashCardAnalysis.tsrename to frontend/src/metabase/metabot/hooks/useDashCardAnalysis.tsindex 712b84cd8af..49bc39bfae8 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/hooks/useDashCardAnalysis.ts+++ b/frontend/src/metabase/metabot/hooks/useDashCardAnalysis.ts@@ -1,14 +1,13 @@import { useEffect, useRef } from "react";import { usePrevious } from "react-use";+import { useAnalyzeChartMutation } from "metabase/api";import {getChartImagePngDataUri,getChartSelector,} from "metabase/visualizations/lib/image-exports";import type { DashCardId } from "metabase-types/api";-import { useAnalyzeChartMutation } from "../../api/ai-entity-analysis";-// Delay time to ensure visualizations have rendered after data loadingconst RENDER_DELAY_MS = 100;diff --git a/frontend/src/metabase/metabot/index.ts b/frontend/src/metabase/metabot/index.tsxsimilarity index 100%rename from frontend/src/metabase/metabot/index.tsrename to frontend/src/metabase/metabot/index.tsxdiff --git a/frontend/src/metabase/metabot/routes.tsx b/frontend/src/metabase/metabot/routes.tsxnew file mode 100644index 00000000000..6b4e84ea82a--- /dev/null+++ b/frontend/src/metabase/metabot/routes.tsx@@ -0,0 +1,13 @@+import { Route } from "react-router";++import { getMetabotQuickLinks } from "./components/MetabotQuickLinks";+import { SlackConnectSuccess } from "./components/SlackConnectSuccess";++export const getMetabotRoutes = () => {+ return (+ <>+ {getMetabotQuickLinks()}+ <Route path="slack-connect-success" component={SlackConnectSuccess} />+ </>+ );+};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tssimilarity index 93%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/actions.tsrename to frontend/src/metabase/metabot/state/actions.tsindex 3f533d7d647..049ac78ee59 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -1,22 +1,18 @@-import {- type UnknownAction,- createAsyncThunk as createAsyncThunkOriginal,- isRejected,- nanoid,-} from "@reduxjs/toolkit";+import { type UnknownAction, isRejected, nanoid } from "@reduxjs/toolkit";import { push } from "react-router-redux";import { P, match } from "ts-pattern";import _ from "underscore";+import {+ aiStreamingQuery,+ findMatchingInflightAiStreamingRequests,+} from "metabase/api/ai-streaming";+import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { createAsyncThunk } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";import { getIsWorkspace } from "metabase/selectors/routing";import { getUser } from "metabase/selectors/user";-import {- aiStreamingQuery,- findMatchingInflightAiStreamingRequests,-} from "metabase-enterprise/api/ai-streaming";-import type { ProcessedChatResponse } from "metabase-enterprise/api/ai-streaming/process-stream";import type {JSONValue,MetabotAgentRequest,@@ -24,7 +20,7 @@ import type {MetabotChatContext,MetabotTransformInfo,} from "metabase-types/api";-import type { Dispatch } from "metabase-types/store";+import type { Dispatch, State } from "metabase-types/store";import { METABOT_ERR_MSG } from "../constants";@@ -45,19 +41,11 @@ import type {MetabotAgentId,MetabotAgentTodoListChatMessage,MetabotErrorMessage,- MetabotStoreState,MetabotUserChatMessage,SlashCommand,} from "./types";import { createMessageId, parseSlashCommand } from "./utils";-interface MetabotThunkConfig {- state: MetabotStoreState;-}--const createAsyncThunk =- createAsyncThunkOriginal.withTypes<MetabotThunkConfig>();-export const {addAgentTextDelta,addAgentMessage,@@ -121,7 +109,7 @@ const handleResponseError = (error: unknown): PromptErrorOutcome => {export const setVisible =(payload: { agentId: MetabotAgentId; visible: boolean }) =>- (dispatch: Dispatch, getState: () => MetabotStoreState) => {+ (dispatch: Dispatch, getState: () => State) => {const currentUser = getUser(getState());if (!currentUser) {console.error(@@ -137,7 +125,7 @@ export const executeSlashCommand = createAsyncThunk<void,{ command: SlashCommand; agentId: MetabotAgentId }>(- "metabase-enterprise/metabot/executeSlashCommand",+ "metabase/metabot/executeSlashCommand",async ({ command, agentId }, { dispatch, getState }) => {match(command).with({ cmd: "profile" }, ({ args }) => {@@ -191,7 +179,7 @@ export const submitInput = createAsyncThunk<profile?: string;}>(- "metabase-enterprise/metabot/submitInput",+ "metabase/metabot/submitInput",async (payload, { dispatch, getState, signal }) => {const state = getState();const { agentId, message: rawPrompt, profile, ...data } = payload;@@ -306,7 +294,7 @@ export const sendAgentRequest = createAsyncThunk<MetabotAgentRequest & { agentId: MetabotAgentId },{ rejectValue: SendAgentRequestError }>(- "metabase-enterprise/metabot/sendAgentRequest",+ "metabase/metabot/sendAgentRequest",async (payload,{ dispatch, getState, signal, rejectWithValue, fulfillWithValue },@@ -320,7 +308,7 @@ export const sendAgentRequest = createAsyncThunk<const response = await aiStreamingQuery({- url: "/api/ee/metabot-v3/agent-streaming",+ url: "/api/metabot/agent-streaming",// NOTE: StructuredDatasetQuery as part of the EntityInfo in MetabotChatContext// is upsetting the types, casting for nowbody: request as JSONValue,@@ -429,17 +417,17 @@ export const sendAgentRequest = createAsyncThunk<);export const cancelInflightAgentRequests = createAsyncThunk(- "metabase-enterprise/metabot/cancelInflightAgentRequests",+ "metabase/metabot/cancelInflightAgentRequests",(agentId: MetabotAgentId) => {findMatchingInflightAiStreamingRequests(- "/api/ee/metabot-v3/agent-streaming",+ "/api/metabot/agent-streaming",agentId,).forEach((req) => req.abortController.abort());},);const rewindConversation = createAsyncThunk(- "metabase-enterprise/metabot/rewindConversation",+ "metabase/metabot/rewindConversation",({agentId,@@ -480,7 +468,7 @@ export const retryPrompt = createAsyncThunk<agentId: MetabotAgentId;}>(- "metabase-enterprise/metabot/retryPrompt",+ "metabase/metabot/retryPrompt",async ({ messageId, context, metabot_id, agentId },{ getState, dispatch },@@ -515,7 +503,7 @@ export const retryPrompt = createAsyncThunk<);export const resetConversation = createAsyncThunk(- "metabase-enterprise/metabot/resetConversation",+ "metabase/metabot/resetConversation",(payload: { agentId: MetabotAgentId }, { dispatch }) => {dispatch(cancelInflightAgentRequests(payload.agentId));dispatch(metabot.actions.resetConversation(payload));diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/index.ts b/frontend/src/metabase/metabot/state/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/index.tsrename to frontend/src/metabase/metabot/state/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer-utils.ts b/frontend/src/metabase/metabot/state/reducer-utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/reducer-utils.tsrename to frontend/src/metabase/metabot/state/reducer-utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts b/frontend/src/metabase/metabot/state/reducer.tssimilarity index 99%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.tsrename to frontend/src/metabase/metabot/state/reducer.tsindex 57d0adde81e..bcb87354146 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/reducer.ts+++ b/frontend/src/metabase/metabot/state/reducer.ts@@ -32,7 +32,7 @@ import type {import { createMessageId } from "./utils";export const metabot = createSlice({- name: "metabase-enterprise/metabot",+ name: "metabase/metabot",initialState: getMetabotInitialState(),reducers: {// TOP-LEVEL STATE REDUCERSdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.tssimilarity index 93%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.tsrename to frontend/src/metabase/metabot/state/selectors.tsindex 7e430b96459..c7518b05ee7 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.ts+++ b/frontend/src/metabase/metabot/state/selectors.ts@@ -3,9 +3,10 @@ import { match } from "ts-pattern";import _ from "underscore";import { isEmbedding } from "metabase/embedding/config";+import * as Urls from "metabase/lib/urls";import { getLocation } from "metabase/selectors/routing";-import { Urls } from "metabase-enterprise/urls";import type { TransformId } from "metabase-types/api";+import type { State } from "metabase-types/store";import {FIXED_METABOT_IDS,@@ -13,18 +14,14 @@ import {METABOT_REQUEST_IDS,} from "../constants";-import type {- MetabotAgentId,- MetabotStoreState,- MetabotUserChatMessage,-} from "./types";+import type { MetabotAgentId, MetabotUserChatMessage } from "./types";/** Top Level Selectors*/-export const getMetabotState = (state: MetabotStoreState) => {- return state.plugins.metabotPlugin;+export const getMetabotState = (state: State) => {+ return state.metabot;};export const getActiveMetabotAgentIds = createSelector(@@ -81,7 +78,7 @@ export const getIsSuggestedTransformActive = createSelector(* Conversation Selectors*/-const getAgentId = (_: MetabotStoreState, agentId: MetabotAgentId) => agentId;+const getAgentId = (_: State, agentId: MetabotAgentId) => agentId;export const getMetabotConversation = createSelector([getMetabotState, getAgentId],@@ -184,10 +181,7 @@ export const getMetabotReqIdOverride = createSelector((convo) => convo.experimental.metabotReqIdOverride,);-export const getMetabotRequestId = (- state: MetabotStoreState,- agentId: MetabotAgentId,-) => {+export const getMetabotRequestId = (state: State, agentId: MetabotAgentId) => {const metabotReqIdOverride = getMetabotReqIdOverride(state, agentId);return (metabotReqIdOverride ??diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.unit.spec.ts b/frontend/src/metabase/metabot/state/selectors.unit.spec.tssimilarity index 88%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.unit.spec.tsrename to frontend/src/metabase/metabot/state/selectors.unit.spec.tsindex c86d14c76f8..69e011f2acb 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.unit.spec.ts+++ b/frontend/src/metabase/metabot/state/selectors.unit.spec.ts@@ -1,14 +1,14 @@import { assocIn } from "icepick";import { setupEnterprisePlugins } from "__support__/enterprise";+import type { State } from "metabase-types/store";import { createMockState } from "metabase-types/store/mocks";import { getMetabotInitialState } from "./reducer-utils";-import type { MetabotStoreState } from "./types";import { type MetabotChatMessage, getUserPromptForMessageId } from "./index";-function setup(messages: MetabotChatMessage[]): MetabotStoreState {+function setup(messages: MetabotChatMessage[]): State {setupEnterprisePlugins();const state = getMetabotInitialState();@@ -23,11 +23,7 @@ function setup(messages: MetabotChatMessage[]): MetabotStoreState {messages,);- return createMockState({- plugins: {- metabotPlugin: withMessages,- },- } as any) as unknown as MetabotStoreState;+ return createMockState({ metabot: withMessages });}describe("metabot selectors", () => {diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts b/frontend/src/metabase/metabot/state/types.tssimilarity index 90%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/types.tsrename to frontend/src/metabase/metabot/state/types.tsindex a0db8d9a607..79d192f9f88 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/types.ts+++ b/frontend/src/metabase/metabot/state/types.ts@@ -1,5 +1,3 @@-import type { EnterpriseSharedState } from "metabase-enterprise/shared/reducer";-import type { EnterpriseState } from "metabase-enterprise/shared/types";import type {MetabotCodeEdit,MetabotHistory,@@ -123,13 +121,6 @@ export interface MetabotState {debugMode: boolean;}-export interface MetabotStoreState extends EnterpriseState {- plugins: {- shared: EnterpriseSharedState;- metabotPlugin: MetabotState;- };-}-export interface SlashCommand {cmd: string;args: string[];diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/utils.ts b/frontend/src/metabase/metabot/state/utils.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/state/utils.tsrename to frontend/src/metabase/metabot/state/utils.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/context.unit.spec.tsx b/frontend/src/metabase/metabot/tests/context.unit.spec.tsxsimilarity index 98%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/context.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/context.unit.spec.tsxindex 49b8418a727..c0ebc0c3710 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/context.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/context.unit.spec.tsx@@ -6,6 +6,7 @@ import _ from "underscore";import { setupDatabaseListEndpoint } from "__support__/server-mocks";import { screen } from "__support__/ui";import { useRegisterMetabotContextProvider } from "metabase/metabot";+import { FixSqlQueryButton } from "metabase/metabot/components/FixSqlQueryButton";import { setIsNativeEditorOpen } from "metabase/query_builder/actions";import {createMockDatabase,@@ -13,7 +14,6 @@ import {createMockUserPermissions,} from "metabase-types/api/mocks";-import { FixSqlQueryButton } from "../../ai-sql-fixer/components/FixSqlQueryButton/FixSqlQueryButton";import { Metabot } from "../components/Metabot";import { METABOT_PROFILE_OVERRIDES } from "../constants";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/convo-state.unit.spec.tsx b/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/convo-state.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsxindex 3954e9fcf93..5cfda808d95 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/convo-state.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/convo-state.unit.spec.tsx@@ -1,6 +1,6 @@import userEvent from "@testing-library/user-event";-import { getMetabotRequestState } from "metabase-enterprise/metabot/state";+import { getMetabotRequestState } from "metabase/metabot/state";import {assertConversation,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/error-boundary.unit.spec.tsx b/frontend/src/metabase/metabot/tests/error-boundary.unit.spec.tsxsimilarity index 83%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/error-boundary.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/error-boundary.unit.spec.tsxindex b55d25cd74d..d838de78f6d 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/error-boundary.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/error-boundary.unit.spec.tsx@@ -1,4 +1,3 @@-import { combineReducers } from "@reduxjs/toolkit";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import { assocIn } from "icepick";@@ -15,7 +14,6 @@ import { createMockState } from "metabase-types/store/mocks";import { Metabot } from "../components/Metabot";import { FIXED_METABOT_IDS } from "../constants";import { MetabotProvider } from "../context";-import { metabotReducer } from "../state";import { getMetabotInitialState } from "../state/reducer-utils";let mockShouldThrow = false;@@ -34,10 +32,8 @@ jest.mock("../components/MetabotChat", () => {});function setup() {- const settings = mockSettings({- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),+ mockSettings({+ "token-features": createMockTokenFeatures({ metabot_v3: true }),});setupEnterprisePlugins();@@ -49,7 +45,7 @@ function setup() {);fetchMock.get(- `path:/api/ee/metabot-v3/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,+ `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,{ prompts: [], offset: 0, limit: 3, total: 0 },);@@ -59,17 +55,9 @@ function setup() {</MetabotProvider>,{storeInitialState: createMockState({- settings,currentUser: createMockUser(),- plugins: {- metabotPlugin: metabotState,- },- } as any),- customReducers: {- plugins: combineReducers({- metabotPlugin: metabotReducer,- }),- },+ metabot: metabotState,+ }),},);}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/errors.unit.spec.tsx b/frontend/src/metabase/metabot/tests/errors.unit.spec.tsxsimilarity index 90%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/errors.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/errors.unit.spec.tsxindex 2faf8c64199..1c2826428fc 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/errors.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/errors.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { METABOT_ERR_MSG } from "metabase-enterprise/metabot/constants";+import { METABOT_ERR_MSG } from "metabase/metabot/constants";import {assertConversation,@@ -17,7 +17,7 @@ import {describe("metabot > errors", () => {it("should handle non-successful responses", async () => {setup();- fetchMock.post(`path:/api/ee/metabot-v3/agent-streaming`, 400);+ fetchMock.post(`path:/api/metabot/agent-streaming`, 400);await enterChatMessage("Who is your favorite?");@@ -31,7 +31,7 @@ describe("metabot > errors", () => {it("should show a better error message for unauthenticated requests", async () => {setup();- fetchMock.post(`path:/api/ee/metabot-v3/agent-streaming`, 401);+ fetchMock.post(`path:/api/metabot/agent-streaming`, 401);await enterChatMessage("Who is your favorite?");@@ -74,7 +74,7 @@ describe("metabot > errors", () => {it("should remove previous error messages and prompt when submitting next prompt", async () => {setup();- fetchMock.post(`path:/api/ee/metabot-v3/agent-streaming`, 500);+ fetchMock.post(`path:/api/metabot/agent-streaming`, 500);await enterChatMessage("Who is your favorite?");diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/experimental.unit.spec.tsx b/frontend/src/metabase/metabot/tests/experimental.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/experimental.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/experimental.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/feedback.unit.spec.ts b/frontend/src/metabase/metabot/tests/feedback.unit.spec.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/feedback.unit.spec.tsrename to frontend/src/metabase/metabot/tests/feedback.unit.spec.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/history.unit.spec.tsx b/frontend/src/metabase/metabot/tests/history.unit.spec.tsxsimilarity index 97%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/history.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/history.unit.spec.tsxindex 22a88c8cc35..61320b9160a 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/history.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/history.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import _ from "underscore";import { act, screen, waitFor } from "__support__/ui";-import { LONG_CONVO_MSG_LENGTH_THRESHOLD } from "metabase-enterprise/metabot/constants";+import { LONG_CONVO_MSG_LENGTH_THRESHOLD } from "metabase/metabot/constants";import {addUserMessage,getHistory,getMetabotConversation,-} from "metabase-enterprise/metabot/state";+} from "metabase/metabot/state";import {assertConversation,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/message.unit.spec.tsx b/frontend/src/metabase/metabot/tests/message.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/message.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/message.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/multi-convo.unit.spec.tsx b/frontend/src/metabase/metabot/tests/multi-convo.unit.spec.tsxsimilarity index 78%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/multi-convo.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/multi-convo.unit.spec.tsxindex 2acbd40ee84..6ddfb5b47e7 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/multi-convo.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/multi-convo.unit.spec.tsx@@ -1,20 +1,10 @@import type { AnyAction, ThunkDispatch } from "@reduxjs/toolkit";-import { combineReducers } from "@reduxjs/toolkit";-import { mockSettings } from "__support__/settings";import { act, renderHookWithProviders } from "__support__/ui";-import { createMockTokenFeatures } from "metabase-types/api/mocks";-import { createMockState } from "metabase-types/store/mocks";+import type { State } from "metabase-types/store";import { useMetabotAgentsManager } from "../hooks";-import {- type MetabotAgentId,- type MetabotStoreState,- getMessages,- metabotReducer,- submitInput,-} from "../state";-import { getMetabotInitialState } from "../state/reducer-utils";+import { type MetabotAgentId, getMessages, submitInput } from "../state";import { mockAgentEndpoint } from "./utils";@@ -26,32 +16,14 @@ function setup() {const { agentIds = ["omnibot", "sql"] } = options || {};- const settings = mockSettings({- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),- });-const { store: _store, result: hook } = renderHookWithProviders(() => useMetabotAgentsManager(agentIds),- {- storeInitialState: createMockState({- settings,- plugins: {- metabotPlugin: getMetabotInitialState(),- },- } as any),- customReducers: {- plugins: combineReducers({- metabotPlugin: metabotReducer,- }),- },- },+ {},);const store = _store as Omit<typeof _store, "getState" | "dispatch"> & {- getState: () => MetabotStoreState;- dispatch: ThunkDispatch<MetabotStoreState, void, AnyAction>;+ getState: () => State;+ dispatch: ThunkDispatch<State, void, AnyAction>;};return {diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reaction-state.unit.spec.tsx b/frontend/src/metabase/metabot/tests/reaction-state.unit.spec.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/reaction-state.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/reaction-state.unit.spec.tsxindex 07975098cde..70677dd997d 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reaction-state.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/reaction-state.unit.spec.tsx@@ -5,7 +5,7 @@ import {addSuggestedTransform,getMetabotReactionsState,setNavigateToPath,-} from "metabase-enterprise/metabot/state";+} from "metabase/metabot/state";import { createMockTransform } from "metabase-types/api/mocks";import { resetChatButton, setup } from "./utils";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts b/frontend/src/metabase/metabot/tests/reducer.unit.spec.tssimilarity index 99%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.tsrename to frontend/src/metabase/metabot/tests/reducer.unit.spec.tsindex b5fb229b220..5115f45feae 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/reducer.unit.spec.ts+++ b/frontend/src/metabase/metabot/tests/reducer.unit.spec.ts@@ -7,7 +7,7 @@ import {addSuggestedTransform,deactivateSuggestedTransform,metabotReducer,-} from "metabase-enterprise/metabot/state";+} from "metabase/metabot/state";import type { MetabotSuggestedTransform } from "metabase-types/api";import { createMockTransform } from "metabase-types/api/mocks/transform";diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/tool-calls.unit.spec.tsx b/frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsxsimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/tool-calls.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/tool-calls.unit.spec.tsxdiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/ui.unit.spec.tsx b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsxsimilarity index 96%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/ui.unit.spec.tsxrename to frontend/src/metabase/metabot/tests/ui.unit.spec.tsxindex d0781914aec..e76dcc8d21a 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/ui.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx@@ -5,9 +5,9 @@ import fetchMock from "fetch-mock";import { screen, waitFor, within } from "__support__/ui";import { logout } from "metabase/auth/actions";import * as domModule from "metabase/lib/dom";-import { useMetabotAgent } from "metabase-enterprise/metabot/hooks";-import { metabotActions } from "metabase-enterprise/metabot/state";-import { getMetabotInitialState } from "metabase-enterprise/metabot/state/reducer-utils";+import { useMetabotAgent } from "metabase/metabot/hooks";+import { metabotActions } from "metabase/metabot/state";+import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";import { Metabot } from "../components/Metabot";@@ -111,7 +111,7 @@ describe("metabot > ui", () => {try {const { store } = setup({- metabotPluginInitialState: getMetabotInitialState(),+ metabotInitialState: getMetabotInitialState(),currentUser: null,});await assertNotVisible();@@ -342,7 +342,7 @@ describe("metabot > ui", () => {await waitFor(async () => {expect(fetchMock.callHistory.calls(- `path:/api/ee/metabot-v3/metabot/1/prompt-suggestions`,+ `path:/api/metabot/metabot/1/prompt-suggestions`,),).toHaveLength(1);});@@ -352,7 +352,7 @@ describe("metabot > ui", () => {await waitFor(async () => {expect(fetchMock.callHistory.calls(- `path:/api/ee/metabot-v3/metabot/1/prompt-suggestions`,+ `path:/api/metabot/metabot/1/prompt-suggestions`,),).toHaveLength(2);});diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/tests/utils.tsx b/frontend/src/metabase/metabot/tests/utils.tsxsimilarity index 87%rename from enterprise/frontend/src/metabase-enterprise/metabot/tests/utils.tsxrename to frontend/src/metabase/metabot/tests/utils.tsxindex d68719b35a5..a688cccbfa9 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/tests/utils.tsx+++ b/frontend/src/metabase/metabot/tests/utils.tsx@@ -1,4 +1,3 @@-import { combineReducers } from "@reduxjs/toolkit";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import { assocIn } from "icepick";@@ -19,30 +18,25 @@ import {createMockReadableStream,createPauses,mockStreamedEndpoint,-} from "metabase-enterprise/api/ai-streaming/test-utils";+} from "metabase/api/ai-streaming/test-utils";import type { User } from "metabase-types/api";import {createMockTokenFeatures,createMockUser,} from "metabase-types/api/mocks";+import type { State } from "metabase-types/store";import { createMockState } from "metabase-types/store/mocks";import { Metabot } from "../components/Metabot";import { FIXED_METABOT_IDS } from "../constants";import { MetabotProvider } from "../context";-import {- type MetabotAgentId,- type MetabotState,- type MetabotStoreState,- metabotReducer,- setVisible,-} from "../state";+import { type MetabotAgentId, type MetabotState, setVisible } from "../state";import { getMetabotInitialState } from "../state/reducer-utils";export { createMockReadableStream, createPauses };export const mockAgentEndpoint = (params: MockStreamedEndpointParams) =>- mockStreamedEndpoint("/api/ee/metabot-v3/agent-streaming", params);+ mockStreamedEndpoint("/api/metabot/agent-streaming", params);export const chat = () => screen.findByTestId("metabot-chat");export const chatMessages = () =>@@ -81,7 +75,7 @@ export const thumbsUp = (message: HTMLElement) =>export const thumbsDown = (message: HTMLElement) =>within(message).findByTestId("metabot-chat-message-thumbs-down");export const mockFeedbackEndpoint = () => {- const path = "path:/api/ee/metabot-v3/feedback";+ const path = "path:/api/metabot/feedback";fetchMock.post(path, 204);return {calls: () => fetchMock.callHistory.calls(path),@@ -148,12 +142,12 @@ export const erroredResponse = [export function setup(options: {ui?: React.ReactElement;- metabotPluginInitialState?: MetabotState;+ metabotInitialState?: MetabotState;currentUser?: User | null | undefined;promptSuggestions?: { prompt: string }[];} | void,) {- const settings = mockSettings({+ mockSettings({"token-features": createMockTokenFeatures({metabot_v3: true,}),@@ -171,12 +165,12 @@ export function setup(const {ui = <Metabot />,currentUser = createMockUser(),- metabotPluginInitialState = metabotState,+ metabotInitialState = metabotState,promptSuggestions = [],} = options || {};fetchMock.get(- `path:/api/ee/metabot-v3/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,+ `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,{ prompts: promptSuggestions, offset: 0, limit: 3, total: 3 },);setupDatabaseListEndpoint([]);@@ -185,17 +179,9 @@ export function setup(<MetabotProvider>{ui}</MetabotProvider>,{storeInitialState: createMockState({- settings,currentUser: currentUser ? currentUser : undefined,- plugins: {- metabotPlugin: metabotPluginInitialState,- },- } as any),- customReducers: {- plugins: combineReducers({- metabotPlugin: metabotReducer,- }),- },+ metabot: metabotInitialState,+ }),},);@@ -203,7 +189,7 @@ export function setup(rerender,conversationIds: Object.keys(metabotState.conversations),store: store as Omit<typeof store, "getState"> & {- getState: () => MetabotStoreState;+ getState: () => State;},};}diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/utils.ts b/frontend/src/metabase/metabot/utils/chart-analysis.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/utils.tsrename to frontend/src/metabase/metabot/utils/chart-analysis.tsdiff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsxindex 068c9c906b3..774f0627b08 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx@@ -2,8 +2,9 @@ import { t } from "ttag";import { Nav as DetailViewNav } from "metabase/detail-view/components";import { DETAIL_VIEW_PADDING_LEFT } from "metabase/detail-view/constants";+import { MetabotAppBarButton } from "metabase/metabot/components/MetabotAppBarButton";import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { PLUGIN_METABOT, PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { Box, Flex } from "metabase/ui";import type { CollectionId } from "metabase-types/api";import type { DetailViewState } from "metabase-types/store";@@ -111,7 +112,7 @@ const AppBarLarge = ({{isSearchVisible &&(isEmbeddingIframe ? <SearchBar /> : <SearchButton mr="md" />)}{isNewButtonVisible && <NewItemButton collectionId={collectionId} />}- {<PLUGIN_METABOT.MetabotAppBarButton />}+ {<MetabotAppBarButton />}{isAppSwitcherVisible && (<Box c="text-primary" aria-label={t`Settings menu`}><AppSwitcher />diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsxindex 84a1206f816..7a0ca4cbc7c 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx@@ -1,8 +1,8 @@import { useCallback, useState } from "react";import { Nav as DetailViewNav } from "metabase/detail-view/components";+import { MetabotAppBarButton } from "metabase/metabot/components/MetabotAppBarButton";import { SearchBar } from "metabase/nav/components/search/SearchBar";-import { PLUGIN_METABOT } from "metabase/plugins";import { Box, Flex } from "metabase/ui";import type { DetailViewState } from "metabase-types/store";@@ -91,7 +91,7 @@ const AppBarSmall = ({</Flex>))}</AppBarSearchContainer>- {!isEmbeddingIframe && <PLUGIN_METABOT.MetabotAppBarButton />}+ {!isEmbeddingIframe && <MetabotAppBarButton />}{isAppSwitcherVisible && <AppSwitcher />}</Flex><AppBarLogoContainer isVisible={isLogoVisible && !isSearchActive}>diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsxindex 0a9cd1cae21..c3f5bce7699 100644--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx@@ -7,7 +7,7 @@ import {} from "metabase/documents/selectors";import { Collections } from "metabase/entities/collections";import { connect } from "metabase/lib/redux";-import { PLUGIN_METABOT } from "metabase/plugins";+import { getMetabotVisible } from "metabase/metabot/state";import { closeNavbar, toggleNavbar } from "metabase/redux/app";import type { RouterProps } from "metabase/selectors/app";import {@@ -32,7 +32,7 @@ const mapStateToProps = (state: State, props: RouterProps) => ({collectionId: Collections.selectors.getInitialCollectionId(state, props),isNavBarOpen: getIsNavbarOpen(state),isNavBarEnabled: getIsNavBarEnabled(state, props),- isMetabotVisible: PLUGIN_METABOT.getMetabotVisible(state, "omnibot"),+ isMetabotVisible: getMetabotVisible(state, "omnibot"),isDocumentSidebarOpen: getSidebarOpen(state),isCommentSidebarOpen: getCommentSidebarOpen(state),isLogoVisible: getIsLogoVisible(state),diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsxindex c5d847b4af2..8930e3442d9 100644--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx@@ -109,7 +109,6 @@ const recents_2 = createMockRecentCollectionItem({const TOKEN_FEATURES = createMockTokenFeatures({content_verification: true,- metabot_v3: true,});export interface CommonSetupProps {diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.tsindex de17676d5a2..2e95fb8e10f 100644--- a/frontend/src/metabase/plugins/index.ts+++ b/frontend/src/metabase/plugins/index.ts@@ -1,14 +1,5 @@// Re-export all plugins from OSS modules (excluding reinitialize functions to avoid conflicts)export { PLUGIN_API } from "./oss/api";-export {- PLUGIN_AI_SQL_FIXER,- PLUGIN_AI_ENTITY_ANALYSIS,- PLUGIN_METABOT,- type PluginAiSqlFixer,- type AIDashboardAnalysisSidebarProps,- type AIQuestionAnalysisSidebarProps,- type PluginAIEntityAnalysis,-} from "./oss/ai";export { PLUGIN_AUDIT, type InsightsLinkProps } from "./oss/audit";export {PLUGIN_AUTH_PROVIDERS,@@ -58,10 +49,6 @@ export {PLUGIN_IS_EE_BUILD,type IllustrationValue,} from "./oss/core";-export {- PLUGIN_DASHCARD_MENU,- type PluginDashcardMenu,-} from "./oss/dashcard-menu";export {PLUGIN_DB_ROUTING,PLUGIN_DATABASE_REPLICATION,@@ -83,6 +70,7 @@ export {type PublishTablesModalProps,type UnpublishTablesModalProps,} from "./oss/library";+export { PLUGIN_METABOT, type PluginMetabotType } from "./oss/metabot";export { PLUGIN_MODEL_PERSISTENCE } from "./oss/model-persistence";export {PLUGIN_MODERATION,@@ -164,7 +152,6 @@ export type {// Export a single reinitialize function that calls all individual reinitialize functionsimport { reinitialize as reinitializeNotificationsSdk } from "../../embedding-sdk-bundle/components/public/notifications";-import { reinitialize as reinitializeAi } from "./oss/ai";import { reinitialize as reinitializeApi } from "./oss/api";import { reinitialize as reinitializeAudit } from "./oss/audit";import { reinitialize as reinitializeAuth } from "./oss/auth";@@ -173,7 +160,6 @@ import { reinitialize as reinitializeCollections } from "./oss/collections";import { reinitialize as reinitializeContentTranslation } from "./oss/content-translation";import { reinitialize as reinitializeContentVerification } from "./oss/content-verification";import { reinitialize as reinitializeCore } from "./oss/core";-import { reinitialize as reinitializeDashcardMenu } from "./oss/dashcard-menu";import { reinitialize as reinitializeDatabase } from "./oss/database";import { reinitialize as reinitializeEmbedding } from "./oss/embedding";import { reinitialize as reinitializeEmbeddingIframeSdk } from "./oss/embedding-iframe-sdk";@@ -181,6 +167,7 @@ import { reinitialize as reinitializeEmbeddingIframeSdkSetup } from "./oss/embedimport { reinitialize as reinitializeEmbeddingSdk } from "./oss/embedding-sdk";import { reinitialize as reinitializeEntities } from "./oss/entities";import { reinitialize as reinitializeLibrary } from "./oss/library";+import { reinitialize as reinitializeMetabot } from "./oss/metabot";import { reinitialize as reinitializeModelPersistence } from "./oss/model-persistence";import { reinitialize as reinitializeModeration } from "./oss/moderation";import { reinitialize as reinitializePermissions } from "./oss/permissions";@@ -205,7 +192,6 @@ import { reinitialize as reinitializeWritableConnection } from "./oss/writable-cexport function reinitialize() {reinitializeNotificationsSdk();- reinitializeAi();reinitializeApi();reinitializeAudit();reinitializeAuth();@@ -214,7 +200,6 @@ export function reinitialize() {reinitializeContentTranslation();reinitializeContentVerification();reinitializeCore();- reinitializeDashcardMenu();reinitializeDatabase();reinitializeEmbedding();reinitializeEmbeddingIframeSdk();@@ -223,6 +208,7 @@ export function reinitialize() {reinitializeEntities();reinitializeLibrary();reinitializeModelPersistence();+ reinitializeMetabot();reinitializeModeration();reinitializePermissions();reinitializeRemoteSync();diff --git a/frontend/src/metabase/plugins/oss/ai.ts b/frontend/src/metabase/plugins/oss/ai.tsdeleted file mode 100644index 634f3aa6280..00000000000--- a/frontend/src/metabase/plugins/oss/ai.ts+++ /dev/null@@ -1,208 +0,0 @@-import type { ActionCreatorWithOptionalPayload } from "@reduxjs/toolkit";-import type { BaseQueryFn } from "@reduxjs/toolkit/query";-import type { TypedUseLazyQuery } from "@reduxjs/toolkit/src/query/react/buildHooks";-import type { ComponentType } from "react";-import React from "react";--import type { MetabotContext } from "metabase/metabot";-import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";-import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";-import type Question from "metabase-lib/v1/Question";-import type {- CollectionId,- DashCardId,- DatabaseId,- GenerateSqlResponse,- MetabotGenerateContentRequest,- MetabotGenerateContentResponse,- MetabotSuggestedTransform,- ReferencedEntityId,- SearchModel,- SuggestedTransform,- Timeline,- TimelineEvent,- TransformId,- VisualizationDisplay,-} from "metabase-types/api";-import type { State } from "metabase-types/store";--export type PluginAiSqlFixer = {- FixSqlQueryButton: ComponentType<{- rawSql?: string | null;- errorMessage?: string | null;- }>;-};--export interface AIDashboardAnalysisSidebarProps {- onClose?: () => void;- dashcardId?: DashCardId;-}--export interface AIQuestionAnalysisSidebarProps {- question: Question;- className?: string;- onClose?: () => void;- timelines?: Timeline[];- visibleTimelineEvents?: TimelineEvent[];-}--export type PluginAIEntityAnalysis = {- AIQuestionAnalysisButton: ComponentType<any>;- AIQuestionAnalysisSidebar: ComponentType<AIQuestionAnalysisSidebarProps>;- AIDashboardAnalysisSidebar: ComponentType<AIDashboardAnalysisSidebarProps>;- canAnalyzeQuestion: (question: Question) => boolean;- chartAnalysisRenderFormats: {- [display in VisualizationDisplay]?: "png" | "svg" | "none";- };-};--type PluginMetabotConfig = {- emptyText?: string;- hideSuggestedPrompts?: boolean;- preventClose?: boolean;- preventRetryMessage?: boolean;- suggestionModels: (SearchModel | "transform" | "user")[];-};--type PluginMetabotType = {- Metabot: (props: {- hide?: boolean;- config?: PluginMetabotConfig;- }) => React.ReactElement | null;- MetabotChat: (props: {- config?: PluginMetabotConfig;- }) => React.ReactElement | null;- defaultMetabotContextValue: MetabotContext;- MetabotContext: React.Context<MetabotContext>;- getMetabotProvider: () => ComponentType<{ children: React.ReactNode }>;- getAdminRoutes: (() => JSX.Element[]) | null;- getMetabotRoutes: () => React.ReactElement | null;- getMetabotQueryBuilderRoute: () => React.ReactElement | null;- getNewMenuItemAIExploration: (- hasDataAccess: boolean,- collectionId?: CollectionId,- isMetabotEnabled?: boolean,- ) => React.ReactElement | undefined;- getMetabotVisible: (state: State, conversation_id: string) => boolean;- MetabotAppBarButton: ComponentType;- MetabotDataStudioButton: ComponentType;- MetabotDataStudioSidebar: ComponentType;- MetabotSlackSetup: ComponentType;- useLazyMetabotGenerateContentQuery: TypedUseLazyQuery<- MetabotGenerateContentResponse,- MetabotGenerateContentRequest,- BaseQueryFn- >;- MetabotThinkingStyles: { [key: string]: string };- useMetabotSQLSuggestion: (options: {- databaseId: DatabaseId | null;- bufferId: string;- onGenerated?: (result?: GenerateSqlResponse) => void;- }) => {- source: string | undefined;- isLoading: boolean;- generate: (options: {- prompt: string;- sourceSql?: string;- referencedEntities?: ReferencedEntityId[];- }) => Promise<void>;- error: string | undefined;- cancelRequest: () => void;- clear: () => void;- reject: () => void;- reset: () => void;- suggestionModels: SuggestionModel[];- };- getMetabotSuggestedTransform: (- state: State,- transformId?: TransformId,- ) => MetabotSuggestedTransform | undefined;- deactivateSuggestedTransform: ActionCreatorWithOptionalPayload<- SuggestedTransform["id"] | undefined- >;-};--const getDefaultPluginAiSqlFixer = (): PluginAiSqlFixer => ({- FixSqlQueryButton: PluginPlaceholder,-});-export const PLUGIN_AI_SQL_FIXER: PluginAiSqlFixer =- getDefaultPluginAiSqlFixer();--const getDefaultPluginAIEntityAnalysis = (): PluginAIEntityAnalysis => ({- AIQuestionAnalysisButton: PluginPlaceholder,- AIQuestionAnalysisSidebar: PluginPlaceholder,- AIDashboardAnalysisSidebar: PluginPlaceholder,- canAnalyzeQuestion: () => false,- chartAnalysisRenderFormats: {},-});-export const PLUGIN_AI_ENTITY_ANALYSIS: PluginAIEntityAnalysis =- getDefaultPluginAIEntityAnalysis();--const getDefaultMetabotContextValue = (): MetabotContext => ({- prompt: "",- setPrompt: () => {},- promptInputRef: undefined,- getChatContext: () => ({}) as any,- registerChatContextProvider: () => () => {},- suggestionActions: null,- setSuggestionActions: () => {},-});--const defaultMetabotContextValue: MetabotContext =- getDefaultMetabotContextValue();--const getDefaultPluginMetabot = (): PluginMetabotType => ({- Metabot: (_props: { hide?: boolean; config?: PluginMetabotConfig }) =>- null as React.ReactElement | null,- MetabotChat: (_props: { config?: PluginMetabotConfig }) =>- null as React.ReactElement | null,- defaultMetabotContextValue,- MetabotContext: React.createContext(defaultMetabotContextValue),- getMetabotProvider: () => {- return ({ children }) =>- React.createElement(- PLUGIN_METABOT.MetabotContext.Provider,- { value: PLUGIN_METABOT.defaultMetabotContextValue },- children,- );- },- getAdminRoutes: null,- getMetabotRoutes: () => null,- getMetabotQueryBuilderRoute: () => null,- getNewMenuItemAIExploration: () => undefined,- getMetabotVisible: () => false,- MetabotAppBarButton: PluginPlaceholder,- MetabotDataStudioButton: PluginPlaceholder,- MetabotDataStudioSidebar: PluginPlaceholder,- MetabotSlackSetup: PluginPlaceholder,- useLazyMetabotGenerateContentQuery:- (() => []) as unknown as PluginMetabotType["useLazyMetabotGenerateContentQuery"],- MetabotThinkingStyles: {},- useMetabotSQLSuggestion: (options) => {- // lazy require to avoid loading metabase/api and its cljs dependencies at- // module init time. without this the jest unit tests will break.- const {- useMetabotSQLSuggestion,- // eslint-disable-next-line @typescript-eslint/no-require-imports- } = require("metabase/metabot/hooks/use-metabot-sql-suggestion");- return useMetabotSQLSuggestion(options);- },- getMetabotSuggestedTransform: () => undefined,- deactivateSuggestedTransform: (() => ({- type: "",- payload: undefined,- match: () => false,- })) as unknown as ActionCreatorWithOptionalPayload<- SuggestedTransform["id"] | undefined- >,-});-export const PLUGIN_METABOT: PluginMetabotType = getDefaultPluginMetabot();--/**- * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.- */-export function reinitialize() {- Object.assign(PLUGIN_AI_SQL_FIXER, getDefaultPluginAiSqlFixer());- Object.assign(PLUGIN_AI_ENTITY_ANALYSIS, getDefaultPluginAIEntityAnalysis());- Object.assign(PLUGIN_METABOT, getDefaultPluginMetabot());-}diff --git a/frontend/src/metabase/plugins/oss/core.ts b/frontend/src/metabase/plugins/oss/core.tsindex 97a35a14698..3207682bdc7 100644--- a/frontend/src/metabase/plugins/oss/core.ts+++ b/frontend/src/metabase/plugins/oss/core.ts@@ -131,7 +131,6 @@ const getDefaultReducers = () => ({applicationPermissionsPlugin: () => null,sandboxingPlugin: () => null,shared: () => null,- metabotPlugin: () => null,documents: () => null,remoteSyncPlugin: () => null,});@@ -140,7 +139,6 @@ export const PLUGIN_REDUCERS: {applicationPermissionsPlugin: any;sandboxingPlugin: any;shared: any;- metabotPlugin: any;documents: any;remoteSyncPlugin: any;} = getDefaultReducers();diff --git a/frontend/src/metabase/plugins/oss/dashcard-menu.ts b/frontend/src/metabase/plugins/oss/dashcard-menu.tsdeleted file mode 100644index 21a679d14b0..00000000000--- a/frontend/src/metabase/plugins/oss/dashcard-menu.ts+++ /dev/null@@ -1,27 +0,0 @@-import type { DashCardMenuItem } from "metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu";-import type Question from "metabase-lib/v1/Question";-import type { DashCardId } from "metabase-types/api";-import type { Dispatch as ReduxDispatch } from "metabase-types/store";--type DashCardMenuItemGetter = (- question: Question,- dashcardId: DashCardId | undefined,- dispatch: ReduxDispatch,-) => (DashCardMenuItem & { key: string }) | null;--export type PluginDashcardMenu = {- dashcardMenuItemGetters: DashCardMenuItemGetter[];-};--const getDefaultPluginDashcardMenu = (): PluginDashcardMenu => ({- dashcardMenuItemGetters: [],-});--export const PLUGIN_DASHCARD_MENU = getDefaultPluginDashcardMenu();--/**- * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.- */-export function reinitialize() {- Object.assign(PLUGIN_DASHCARD_MENU, getDefaultPluginDashcardMenu());-}diff --git a/frontend/src/metabase/plugins/oss/metabot.ts b/frontend/src/metabase/plugins/oss/metabot.tsnew file mode 100644index 00000000000..814d58cf420--- /dev/null+++ b/frontend/src/metabase/plugins/oss/metabot.ts@@ -0,0 +1,39 @@+import type React from "react";++import type {+ UseMetabotSQLSuggestionOptions,+ useMetabotSQLSuggestion as useMetabotSQLSuggestionType,+} from "metabase/metabot/hooks/use-metabot-sql-suggestion-oss";++export type PluginMetabotType = {+ hasFeature: boolean;+ useMetabotSQLSuggestion: typeof useMetabotSQLSuggestionType;+ getAdminRoutes: (() => React.ReactElement[]) | null;+ getMetabotRoutes: () => React.ReactElement | null;+ getMetabotQueryBuilderRoute: () => React.ReactElement | null;+};++const getDefaultPluginMetabot = (): PluginMetabotType => ({+ hasFeature: false,+ useMetabotSQLSuggestion: (options: UseMetabotSQLSuggestionOptions) => {+ // lazy require to avoid loading metabase/api and its cljs dependencies at+ // module init time. without this the jest unit tests will break.+ const {+ useMetabotSQLSuggestion,+ // eslint-disable-next-line @typescript-eslint/no-require-imports+ } = require("metabase/metabot/hooks/use-metabot-sql-suggestion-oss");+ return useMetabotSQLSuggestion(options);+ },+ getAdminRoutes: null,+ getMetabotRoutes: () => null,+ getMetabotQueryBuilderRoute: () => null,+});++export const PLUGIN_METABOT: PluginMetabotType = getDefaultPluginMetabot();++/**+ * @internal Do not call directly. Use the main reinitialize function from metabase/plugins instead.+ */+export function reinitialize() {+ Object.assign(PLUGIN_METABOT, getDefaultPluginMetabot());+}diff --git a/frontend/src/metabase/plugins/oss/moderation.ts b/frontend/src/metabase/plugins/oss/moderation.tsindex 4d7fde98c17..b600afb02f1 100644--- a/frontend/src/metabase/plugins/oss/moderation.ts+++ b/frontend/src/metabase/plugins/oss/moderation.ts@@ -1,8 +1,15 @@+import type React from "react";+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";import type { IconName, IconProps } from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";import type Question from "metabase-lib/v1/Question";-import type { BaseUser, Card, Dashboard } from "metabase-types/api";+import type {+ BaseUser,+ Card,+ Dashboard,+ MetabotInfo,+} from "metabase-types/api";export type RevisionOrModerationEvent = {title: string;@@ -28,6 +35,8 @@ const getDefaultPluginModeration = () => ({useDashboardMenuItems: (_model?: Dashboard, _reload?: () => void) => [],useQuestionMenuItems: (_model?: Question, _reload?: () => void) => [],useCardMenuItems: (_model?: Card, _reload?: () => void) => [],+ MetabotVerifiedContentConfigurationPane:+ PluginPlaceholder as React.ComponentType<{ metabot: MetabotInfo }>,});export const PLUGIN_MODERATION = getDefaultPluginModeration();diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex c3da8a91fbf..3b77fe35f56 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -13,7 +13,8 @@ import { t } from "ttag";import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";import { useSelector } from "metabase/lib/redux";-import { PLUGIN_METABOT, PLUGIN_REMOTE_SYNC } from "metabase/plugins";+import { getMetabotVisible } from "metabase/metabot/state";+import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { SnippetFormModal } from "metabase/query_builder/components/template_tags/SnippetFormModal";import { useNotebookScreenSize } from "metabase/query_builder/hooks/use-notebook-screen-size";import {@@ -197,7 +198,7 @@ export const NativeQueryEditor = forwardRef<// do not show reference sidebar on small screens automaticallyconst screenSize = useNotebookScreenSize();const isMetabotSidebarOpen = useSelector((state) =>- PLUGIN_METABOT.getMetabotVisible(state, "omnibot"),+ getMetabotVisible(state, "omnibot"),);const shouldOpenDataReference =screenSize !== "small" && !isMetabotSidebarOpen;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsxindex 3d3603932d8..ca16c993839 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx@@ -1,12 +1,9 @@-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import {setupCollectionsEndpoints,setupNativeQuerySnippetEndpoints,} from "__support__/server-mocks";-import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";import { useNotebookScreenSize } from "metabase/query_builder/hooks/use-notebook-screen-size";-import { createMockTokenFeatures } from "metabase-types/api/mocks";import { createMockState } from "metabase-types/store/mocks";import { NativeQueryEditor } from "./NativeQueryEditor";@@ -26,30 +23,12 @@ const mockQuestion = {} as any;describe("NativeQueryEditor", () => {- beforeAll(() => {- mockSettings({- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),- });-- setupEnterpriseOnlyPlugin("metabot");- });-const createEditor = (screenSize: Exclude<UseNotebookScreenSize, undefined>,isMetabotSidebarOpen: boolean,) => {const setIsNativeEditorOpen = jest.fn();- const metabotState = {- conversations: {- omnibot: {- visible: isMetabotSidebarOpen,- },- },- };-setupCollectionsEndpoints({collections: [],});@@ -70,8 +49,12 @@ describe("NativeQueryEditor", () => {/>,{storeInitialState: createMockState({- plugins: {- metabotPlugin: metabotState,+ metabot: {+ conversations: {+ omnibot: {+ visible: isMetabotSidebarOpen,+ },+ },},} as any),},diff --git a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsxindex 46a04448f56..c5a837158f2 100644--- a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx@@ -1,6 +1,6 @@import { match } from "ts-pattern";-import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";+import { AIQuestionAnalysisSidebar } from "metabase/metabot/components/AIQuestionAnalysisSidebar";import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";import { QuestionInfoSidebar } from "metabase/query_builder/components/view/sidebars/QuestionInfoSidebar";@@ -126,7 +126,7 @@ export const NativeQueryRightSidebar = (<QuestionSettingsSidebar question={question} />)).with({ isShowingAIQuestionAnalysisSidebar: true }, () => (- <PLUGIN_AI_ENTITY_ANALYSIS.AIQuestionAnalysisSidebar+ <AIQuestionAnalysisSidebarquestion={question}visibleTimelineEvents={timelineEvents}timelines={timelines}diff --git a/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.jsx b/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.jsxindex 9f46a417325..a8a920c2374 100644--- a/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.jsx+++ b/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.jsx@@ -1,6 +1,6 @@import { match } from "ts-pattern";-import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";+import { AIQuestionAnalysisSidebar } from "metabase/metabot/components/AIQuestionAnalysisSidebar";import { QuestionInfoSidebar } from "metabase/query_builder/components/view/sidebars/QuestionInfoSidebar";import { QuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";import { SummarizeSidebar } from "metabase/query_builder/components/view/sidebars/SummarizeSidebar";@@ -43,7 +43,7 @@ export const StructuredQueryRightSidebar = ({isShowingAIQuestionAnalysisSidebar: true,},() => (- <PLUGIN_AI_ENTITY_ANALYSIS.AIQuestionAnalysisSidebar+ <AIQuestionAnalysisSidebarquestion={question}visibleTimelineEvents={timelineEvents}timelines={timelines}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsxindex 3179092a263..6e5303a8f61 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx@@ -7,8 +7,9 @@ import { QuestionSharingMenu } from "metabase/embedding/components/SharingMenu";import { SERVER_ERROR_TYPES } from "metabase/lib/errors";import { useSelector } from "metabase/lib/redux";import MetabaseSettings from "metabase/lib/settings";+import { AIQuestionAnalysisButton } from "metabase/metabot/components/AIQuestionAnalysisButton";+import { canAnalyzeQuestion } from "metabase/metabot/utils/chart-analysis";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";-import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";import { canExploreResults } from "metabase/query_builder/components/view/ViewHeader/utils";import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";@@ -225,9 +226,8 @@ export function ViewTitleHeaderRightSide({{!isShowingNotebook && (hasSaveButton || isSaved) && (<QuestionSharingMenu question={question} />)}- {!isShowingNotebook &&- PLUGIN_AI_ENTITY_ANALYSIS.canAnalyzeQuestion(question) ? (- <PLUGIN_AI_ENTITY_ANALYSIS.AIQuestionAnalysisButton />+ {!isShowingNotebook && canAnalyzeQuestion(question.card().display) ? (+ <AIQuestionAnalysisButton />) : null}{isSaved && (<QuestionActionsdiff --git a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsxindex 7816ba81c67..d3fa1f4ca5a 100644--- a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx+++ b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx@@ -3,7 +3,7 @@ import { match } from "ts-pattern";import { useRegisterMetabotContextProvider } from "metabase/metabot";import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";+import { CHART_ANALYSIS_RENDER_FORMATS } from "metabase/metabot/utils/chart-analysis";import {getChartImagePngDataUri,getChartSelector,@@ -161,8 +161,9 @@ function getVisualizationDataUri(question: Question) {const display = question.card().display;const format =- PLUGIN_AI_ENTITY_ANALYSIS.chartAnalysisRenderFormats[display] ??- ("none" as const);+ (CHART_ANALYSIS_RENDER_FORMATS as Record<string, "png" | "svg" | "none">)[+ display+ ] ?? ("none" as const);return match(format).with("none", () => undefined)diff --git a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsxindex 9ae34a48d14..e5e93b5885d 100644--- a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx@@ -1,6 +1,5 @@import _ from "underscore";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderHookWithProviders } from "__support__/ui";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";@@ -16,7 +15,6 @@ import {createMockSettings,createMockSingleSeries,createMockTimelineEvent,- createMockTokenFeatures,createMockVisualizationSettings,} from "metabase-types/api/mocks";import { createAdHocCard } from "metabase-types/api/mocks/presets";@@ -93,19 +91,6 @@ function createMockData(opts: {}describe("registerQueryBuilderMetabotContextFn", () => {- beforeAll(() => {- mockSettings(- createMockSettings({- "token-features": createMockTokenFeatures({- ai_entity_analysis: true,- metabot_v3: true,- }),- }),- );- setupEnterpriseOnlyPlugin("metabot");- setupEnterpriseOnlyPlugin("ai-entity-analysis");- });-beforeEach(() => {jest.clearAllMocks();});diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsxindex ee2c7284834..6ac602e2e17 100644--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsx@@ -1,9 +1,5 @@import { EditorState } from "@codemirror/state";-import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";-import { mockSettings } from "__support__/settings";-import { createMockTokenFeatures } from "metabase-types/api/mocks";-import { getPlaceholderText, matchTagAtCursor } from "./util";describe("matchTagAtCursor", () => {@@ -176,15 +172,6 @@ describe("getPlaceholderText", () => {});describe("metabot is enabled", () => {- beforeAll(() => {- const tokenFeatures = createMockTokenFeatures({- metabot_v3: true,- });-- mockSettings({ "token-features": tokenFeatures });- setupEnterpriseOnlyPlugin("metabot");- });-it("should return metabot placeholder text for sql", () => {expect(getPlaceholderText("sql", true)).toBe("Write your SQL here, or press Ctrl + Shift + i to have SQL generated for you.",diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsxindex 5ce909bb20c..82d948a8dca 100644--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx@@ -10,7 +10,7 @@ import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";import { getEngineNativeType } from "metabase/lib/engine";import { useSelector } from "metabase/lib/redux";-import { PLUGIN_AI_SQL_FIXER } from "metabase/plugins";+import { FixSqlQueryButton } from "metabase/metabot/components/FixSqlQueryButton";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Center, Flex, Icon } from "metabase/ui";@@ -143,7 +143,7 @@ export function VisualizationError({{t`Learn how to debug SQL errors`}</ExternalLink>)}- {!isResultDirty && <PLUGIN_AI_SQL_FIXER.FixSqlQueryButton />}+ {!isResultDirty && <FixSqlQueryButton />}</Flex></Flex></Box>diff --git a/frontend/src/metabase/reducers-common.ts b/frontend/src/metabase/reducers-common.tsindex e55d4476214..a78a378a9e8 100644--- a/frontend/src/metabase/reducers-common.ts+++ b/frontend/src/metabase/reducers-common.ts@@ -20,6 +20,8 @@ import { undoReducer as undo } from "metabase/redux/undo";import upload from "metabase/redux/uploads";import { currentUser } from "metabase/redux/user";+import { metabotReducer as metabot } from "./metabot/state";+export const commonReducers = {// global reducersapp,@@ -40,4 +42,5 @@ export const commonReducers = {dashboard,parameters: combineReducers(parameters),downloads,+ metabot,};diff --git a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx b/frontend/src/metabase/reference/glossary/GlossaryTable.tsxindex 83f8a12f44c..ee6a5c816cf 100644--- a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx+++ b/frontend/src/metabase/reference/glossary/GlossaryTable.tsx@@ -7,7 +7,6 @@ import type { GlossaryItem } from "metabase/api";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { Table as CommonTable } from "metabase/common/components/Table/Table";import { NoObjectError } from "metabase/common/components/errors/NoObjectError";-import { useHasTokenFeature } from "metabase/common/hooks";import {ActionIcon,Box,@@ -53,8 +52,6 @@ export function GlossaryTable({>(null);const [sortDirection, setSortDirection] = useState<SortDirection>("asc");- const hasMetabot = useHasTokenFeature("metabot_v3");-const sortedRows = useMemo(() => {if (!sortColumnName) {return [@@ -78,9 +75,7 @@ export function GlossaryTable({<><Group justify="space-between" mb="xs"><Text>- {hasMetabot- ? t`Define terms to help your team and Metabot understand your data.`- : t`Define terms to help your team understand your data.`}+ {t`Define terms to help your team and Metabot understand your data.`}</Text><Buttonvariant="default"diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsxindex fee1b466167..c891743c777 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";import type { Editor } from "@tiptap/core";import { useState } from "react";+import { setupEnterprisePlugins } from "__support__/enterprise";import {setupCollectionByIdEndpoint,setupCollectionItemsEndpoint,@@ -439,14 +440,7 @@ describe("CommandSuggestion", () => {describe("when metabot is disabled", () => {it("should show all available commands except Metabot", async () => {- const settings = mockSettings({- "metabot-enabled?": false,- "token-features": createMockTokenFeatures({- metabot_v3: false,- }),- });-- setup({ settings });+ setup({ settings: mockSettings({ "metabot-enabled?": false }) });expect(screen.queryByText("Ask Metabot")).not.toBeInTheDocument();await expectStandardCommandsToBePresent();@@ -454,15 +448,15 @@ describe("CommandSuggestion", () => {});describe("when metabot is enabled", () => {- it("should show all available commands including Metabot", async () => {- const settings = mockSettings({- "metabot-enabled?": true,- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),+ beforeEach(() => {+ mockSettings({+ "token-features": createMockTokenFeatures({ metabot_v3: true }),});+ setupEnterprisePlugins();+ });- setup({ settings });+ it("should show all available commands including Metabot", async () => {+ setup({ settings: mockSettings({ "metabot-enabled?": true }) });expect(screen.getByText("Ask Metabot")).toBeInTheDocument();await expectStandardCommandsToBePresent();diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsxindex b3e76da6a9b..7ddf547f87a 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx@@ -11,6 +11,7 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";import { useLatest } from "react-use";import { t } from "ttag";+import { useLazyMetabotGenerateContentQuery } from "metabase/api";import CS from "metabase/css/core/index.css";import { trackDocumentAskMetabot } from "metabase/documents/analytics";import {@@ -20,8 +21,8 @@ import {} from "metabase/documents/documents.slice";import { getCurrentDocument } from "metabase/documents/selectors";import { useDispatch, useSelector } from "metabase/lib/redux";+import MetabotThinkingStyles from "metabase/metabot/components/MetabotChat/MetabotThinking.module.css";import { useMetabotEnabledEmbeddingAware } from "metabase/metabot/hooks";-import { PLUGIN_METABOT } from "metabase/plugins";import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";import type { Card, MetabotGenerateContentRequest } from "metabase-types/api";@@ -152,7 +153,7 @@ export const MetabotComponent = memo(const controllerRef = useRef<AbortController | null>(null);const [isLoading, setIsLoading] = useState(false);const [errorText, setErrorText] = useState("");- const [queryMetabot] = PLUGIN_METABOT.useLazyMetabotGenerateContentQuery();+ const [queryMetabot] = useLazyMetabotGenerateContentQuery();const isMetabotEnabled = useMetabotEnabledEmbeddingAware();const handleRunMetabot = async () => {@@ -338,9 +339,7 @@ export const MetabotComponent = memo({isLoading ? (<Textflex={1}- className={- PLUGIN_METABOT.MetabotThinkingStyles.toolCallStarted- }+ className={MetabotThinkingStyles.toolCallStarted}>{t`Working on it...`}</Text>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsxindex 7706675b05c..4dacfbb2c05 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx@@ -1,5 +1,6 @@import userEvent from "@testing-library/user-event";+import { setupEnterprisePlugins } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen, within } from "__support__/ui";import { createMockTokenFeatures } from "metabase-types/api/mocks";@@ -27,20 +28,19 @@ describe("MetabotEmbed", () => {beforeEach(() => {jest.clearAllMocks();+ mockSettings({+ "token-features": createMockTokenFeatures({ metabot_v3: true }),+ });+ setupEnterprisePlugins();});describe("when metabot is disabled", () => {it("should show disabled button with tooltip", async () => {- const settings = mockSettings({- "metabot-enabled?": false,- "token-features": createMockTokenFeatures({- metabot_v3: false,- }),- });-renderWithProviders(<MetabotComponent {...defaultProps} />, {storeInitialState: createMockState({- settings,+ settings: mockSettings({+ "metabot-enabled?": false,+ }),}),});@@ -57,16 +57,11 @@ describe("MetabotEmbed", () => {describe("when metabot is enabled", () => {it("should show enabled button without tooltip", async () => {- const settings = mockSettings({- "metabot-enabled?": true,- "token-features": createMockTokenFeatures({- metabot_v3: true,- }),- });-renderWithProviders(<MetabotComponent {...defaultProps} />, {storeInitialState: createMockState({- settings,+ settings: mockSettings({+ "metabot-enabled?": true,+ }),}),});diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsxindex 4238d3c5e86..98c4d91b959 100644--- a/frontend/src/metabase/routes.jsx+++ b/frontend/src/metabase/routes.jsx@@ -270,8 +270,8 @@ export const getRoutes = (store) => {})}/><IndexRoute component={QueryBuilder} />- {PLUGIN_METABOT.getMetabotQueryBuilderRoute()}<Route path="notebook" component={QueryBuilder} />+ {PLUGIN_METABOT.getMetabotQueryBuilderRoute()}<Route path=":slug" component={QueryBuilder} /><Route path=":slug/notebook" component={QueryBuilder} /><Route path=":slug/metabot" component={QueryBuilder} />diff --git a/frontend/src/metabase/transforms/hooks/use-source-state.ts b/frontend/src/metabase/transforms/hooks/use-source-state.tsindex 7acdec9573b..a840d5dc253 100644--- a/frontend/src/metabase/transforms/hooks/use-source-state.ts+++ b/frontend/src/metabase/transforms/hooks/use-source-state.ts@@ -1,7 +1,10 @@import { useMemo, useState } from "react";import { useDispatch, useSelector } from "metabase/lib/redux";-import { PLUGIN_METABOT } from "metabase/plugins";+import {+ deactivateSuggestedTransform,+ getMetabotSuggestedTransform,+} from "metabase/metabot/state";import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";@@ -66,7 +69,7 @@ export function useSourceState({const metadata = useSelector(getMetadata);const suggestedTransform = useSelector((state) =>- PLUGIN_METABOT.getMetabotSuggestedTransform(state, transformId),+ getMetabotSuggestedTransform(state, transformId),);const [source, setSource] = useState(() => {@@ -97,9 +100,7 @@ export function useSourceState({const setSourceAndRejectProposed = (source: DraftTransformSource) => {if (suggestedTransform != null) {- dispatch(- PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),- );+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));}setSource(source);};@@ -107,17 +108,13 @@ export function useSourceState({const acceptProposed = () => {if (suggestedTransform != null) {setSource(normalizeSource(suggestedTransform.source, metadata));- dispatch(- PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),- );+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));}};const rejectProposed = () => {if (suggestedTransform != null) {- dispatch(- PLUGIN_METABOT.deactivateSuggestedTransform(suggestedTransform.id),- );+ dispatch(deactivateSuggestedTransform(suggestedTransform.id));}};diff --git a/frontend/test/__support__/enterprise-typed.ts b/frontend/test/__support__/enterprise-typed.tsindex 98fb9a7e5ef..99081834278 100644--- a/frontend/test/__support__/enterprise-typed.ts+++ b/frontend/test/__support__/enterprise-typed.ts@@ -11,15 +11,13 @@ export const ENTERPRISE_PLUGIN_NAME_MAPPING = {tools: "metabase-enterprise/tools",advanced_permissions: "metabase-enterprise/advanced_permissions",sharing: "metabase-enterprise/sharing",- metabot: "metabase-enterprise/metabot",+ metabot: "metabase/metabot",rich_text_editing: "metabase-enterprise/rich_text_editing",- "ai-entity-analysis": "metabase-enterprise/ai-entity-analysis",license: "metabase-enterprise/license",user_provisioning: "metabase-enterprise/user_provisioning",application_permissions: "metabase-enterprise/application_permissions",auth: "metabase-enterprise/auth","smtp-override": "metabase-enterprise/smtp-override",- "ai-sql-fixer": "metabase-enterprise/ai-sql-fixer",embedding: "metabase-enterprise/embedding",admin: "metabase-enterprise/admin",dependencies: "metabase-enterprise/dependencies",diff --git a/frontend/test/__support__/server-mocks/ai-entity-analysis.ts b/frontend/test/__support__/server-mocks/ai-entity-analysis.tsindex 58a007f9003..3c4f7896b8c 100644--- a/frontend/test/__support__/server-mocks/ai-entity-analysis.ts+++ b/frontend/test/__support__/server-mocks/ai-entity-analysis.ts@@ -5,7 +5,7 @@ import type { AIEntityAnalysisResponse } from "metabase-types/api";export function setupAnalyzeChartEndpoint(response: AIEntityAnalysisResponse) {const name = "ai-analyze-chart";fetchMock.removeRoute(name);- fetchMock.post("path:/api/ee/ai-entity-analysis/analyze-chart", response, {+ fetchMock.post("path:/api/ai-entity-analysis/analyze-chart", response, {name,});}diff --git a/frontend/test/__support__/server-mocks/ai-sql-fixer.ts b/frontend/test/__support__/server-mocks/ai-sql-fixer.tsindex 284ae2f46c5..1790e809e2e 100644--- a/frontend/test/__support__/server-mocks/ai-sql-fixer.ts+++ b/frontend/test/__support__/server-mocks/ai-sql-fixer.ts@@ -3,9 +3,9 @@ import fetchMock from "fetch-mock";import type { FixSqlQueryResponse } from "metabase-types/api";export function setupFixNativeQueryEndpoint(response: FixSqlQueryResponse) {- fetchMock.post("path:/api/ee/ai-sql-fixer/fix", response);+ fetchMock.post("path:/api/ai-sql-fixer/fix", response);}export function setupErrorFixNativeQueryEndpoint() {- fetchMock.post("path:/api/ee/ai-sql-fixer/fix", 500);+ fetchMock.post("path:/api/ai-sql-fixer/fix", 500);}diff --git a/frontend/test/__support__/server-mocks/metabot.ts b/frontend/test/__support__/server-mocks/metabot.tsindex 9c83f8c7516..5ec585a7d22 100644--- a/frontend/test/__support__/server-mocks/metabot.ts+++ b/frontend/test/__support__/server-mocks/metabot.ts@@ -12,11 +12,11 @@ export function setupMetabotsEndpoints(statusCode?: number,) {fetchMock.get(- "path:/api/ee/metabot-v3/metabot",+ "path:/api/metabot/metabot",statusCode ? { status: statusCode } : { items: metabots },);metabots.forEach((metabot) => {- fetchMock.put(`path:/api/ee/metabot-v3/metabot/${metabot.id}`, (call) => {+ fetchMock.put(`path:/api/metabot/metabot/${metabot.id}`, (call) => {return { ...metabot, ...JSON.parse(call.options?.body as string) };});});@@ -25,14 +25,13 @@ export function setupMetabotsEndpoints(export function setupMetabotPromptSuggestionsEndpointError(metabotId: MetabotId,) {- fetchMock.get(- `path:/api/ee/metabot-v3/metabot/${metabotId}/prompt-suggestions`,- { status: 500 },- );+ fetchMock.get(`path:/api/metabot/metabot/${metabotId}/prompt-suggestions`, {+ status: 500,+ });}export function setupMetabotAddEntitiesEndpoint(metabotId: MetabotId) {- fetchMock.put(`path:/api/ee/metabot-v3/metabot/${metabotId}/entities`, {+ fetchMock.put(`path:/api/metabot/metabot/${metabotId}/entities`, {status: 204,});}@@ -60,7 +59,7 @@ export function setupMetabotPromptSuggestionsEndpoint({const body = { prompts: page, limit, offset, total };fetchMock.removeRoute(`metabot-${metabotId}-prompt-suggestions-get`);fetchMock.get({- url: `path:/api/ee/metabot-v3/metabot/${metabotId}/prompt-suggestions`,+ url: `path:/api/metabot/metabot/${metabotId}/prompt-suggestions`,query: { limit, offset },response: {status: 200,@@ -81,7 +80,7 @@ export function setupRemoveMetabotPromptSuggestionEndpoint(promptId: SuggestedMetabotPrompt["id"],) {fetchMock.delete(- `path:/api/ee/metabot-v3/metabot/${metabotId}/prompt-suggestions/${promptId}`,+ `path:/api/metabot/metabot/${metabotId}/prompt-suggestions/${promptId}`,{ status: 202 },);}@@ -91,7 +90,7 @@ export function setupRegenerateMetabotPromptSuggestionsEndpoint(options?: UserRouteConfig,) {fetchMock.post(- `path:/api/ee/metabot-v3/metabot/${metabotId}/prompt-suggestions/regenerate`,+ `path:/api/metabot/metabot/${metabotId}/prompt-suggestions/regenerate`,{ status: 204 },options,);@@ -102,7 +101,7 @@ const SLACK_SETTINGS_ROUTE_NAME = "metabot-slack-settings";export function setupMetabotSlackSettingsEndpoint() {fetchMock.removeRoute(SLACK_SETTINGS_ROUTE_NAME);fetchMock.put(- "path:/api/ee/metabot-v3/slack/settings",+ "path:/api/metabot/slack/settings",{ ok: true },{name: SLACK_SETTINGS_ROUTE_NAME,@@ -116,7 +115,7 @@ export function setupMetabotSlackSettingsEndpointWithError() {fetchMock.removeRoute(SLACK_SETTINGS_ROUTE_NAME);fetchMock.put(- "path:/api/ee/metabot-v3/slack/settings",+ "path:/api/metabot/slack/settings",{ status, body },{name: SLACK_SETTINGS_ROUTE_NAME,diff --git a/mage/src/mage/modules.clj b/mage/src/mage/modules.cljindex a229275f863..6d514722a47 100644--- a/mage/src/mage/modules.clj+++ b/mage/src/mage/modules.clj@@ -102,6 +102,7 @@configcontent-verificationdashboards+ documentseid-translationembeddingenterprise/api@@ -114,7 +115,9 @@formatterinitialization-statusinternal-stats+ llmlogin-history+ metabotnotificationpermissionspremium-features@@ -128,6 +131,7 @@sessionsettingssetup+ slackbotssostartupsystem@@ -140,7 +144,8 @@utilversionview-log- warehouse-schema})+ warehouse-schema+ workspaces})(defn- affected-modules"Set of modules that are direct or indirect dependents of `modules`, and thus are affected by changes to them.diff --git a/enterprise/backend/src/metabase_enterprise/agent_api/api.clj b/src/metabase/agent_api/api.cljsimilarity index 93%rename from enterprise/backend/src/metabase_enterprise/agent_api/api.cljrename to src/metabase/agent_api/api.cljindex 8de3e26c9ff..90ec4a1bcb7 100644--- a/enterprise/backend/src/metabase_enterprise/agent_api/api.clj+++ b/src/metabase/agent_api/api.clj@@ -1,23 +1,21 @@-(ns metabase-enterprise.agent-api.api+(ns metabase.agent-api.api"Customer-facing Agent API for headless BI applications.Endpoints are versioned (e.g., /v1/search) and use standard HTTP semantics."(:require[clojure.string :as str][malli.core :as mc]- [metabase-enterprise.agent-api.workspace :as agent-workspace]- [metabase-enterprise.metabot-v3.tools.api :as tools.api]- [metabase-enterprise.metabot-v3.tools.deftool :as deftool]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details]- [metabase-enterprise.metabot-v3.tools.field-stats :as field-stats]- [metabase-enterprise.metabot-v3.tools.filters :as metabot-filters]- [metabase-enterprise.metabot-v3.tools.search :as metabot-search]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.macros.scope :as scope][metabase.api.routes.common :as api.routes.common]- [metabase.api.util.handlers :as handlers][metabase.auth-identity.core :as auth-identity]+ [metabase.metabot.tools.api :as tools.api]+ [metabase.metabot.tools.deftool :as deftool]+ [metabase.metabot.tools.entity-details :as entity-details]+ [metabase.metabot.tools.field-stats :as field-stats]+ [metabase.metabot.tools.filters :as metabot-filters]+ [metabase.metabot.tools.search :as metabot-search]+ [metabase.metabot.util :as metabot.u][metabase.query-processor.core :as qp][metabase.query-processor.streaming :as qp.streaming][metabase.request.core :as request]@@ -62,7 +60,7 @@(mr/def ::field"A field from a table or metric. The field_id format is '<prefix><entity-id>-<field-index>' where prefix indicates the source (t=table, c=metric) and index is the position in the entity's fields."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:field_id :string][:name :string][:type {:optional true} [:maybe ::field-type]]@@ -77,7 +75,7 @@(mr/def ::metric-summary"Summary of a metric associated with a table. Includes the field_id of the default time dimension for temporal breakouts."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :metric]][:name :string]@@ -86,7 +84,7 @@(mr/def ::segment"A predefined filter condition that can be applied to queries via the segment_id in filters."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:display_name {:optional true} [:maybe :string]]@@ -94,7 +92,7 @@(mr/def ::measure"A reusable aggregation expression associated with a table. Reference via measure_id in the aggregations array."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:display_name {:optional true} [:maybe :string]]@@ -102,7 +100,7 @@(mr/def ::related-table"A table related to the queried entity via foreign key. The related_by field indicates the FK field name."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :table]][:name :string]@@ -116,7 +114,7 @@(mr/def ::table"Full details of a table including its fields, related tables, metrics, and segments."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type ::entity-type][:name :string]@@ -133,7 +131,7 @@(mr/def ::metric"A metric with its queryable dimensions and segments. The default_time_dimension_field_id is the field_id of the recommended time dimension for temporal breakouts."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :metric]][:name :string]@@ -145,7 +143,7 @@(mr/def ::statistics"Statistical summary of a field's values computed during database sync. Includes counts, percentages, numeric summaries (min/max/avg/quartiles/sd), and date ranges."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:distinct_count {:optional true} [:maybe :int]][:percent_null {:optional true} [:maybe number?]][:min {:optional true} [:maybe number?]]@@ -164,14 +162,14 @@(mr/def ::field-values"Statistics and sample values for a specific field."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:field_id {:optional true} [:maybe :string]][:statistics {:optional true} [:maybe ::statistics]][:values {:optional true} [:maybe [:sequential :any]]]])(mr/def ::search-result-item"A table or metric returned from search."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:enum "table" "metric"]][:name :string]@@ -185,7 +183,7 @@(mr/def ::search-response"Search results containing tables and metrics matching the query."- [:map {:encode/api #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:encode/api #(update-keys % metabot.u/safe->snake_case_en)}[:data [:sequential ::search-result-item]][:total_count :int]])@@ -328,7 +326,7 @@:description "Order by regular fields only. To order by aggregation results, use sort_order on the aggregation."}[:maybe [:sequential ::tools.api/order-by]]][:limit {:optional true} [:maybe ms/PositiveInt]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::construct-query-metric-request"Request schema for constructing a query from a metric.@@ -338,7 +336,7 @@[:metric_id ms/PositiveInt][:filters {:optional true} [:maybe [:sequential ::tools.api/filter]]][:group_by {:optional true} [:maybe [:sequential ::tools.api/group-by]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::construct-query-request"Request schema for /v1/construct-query. Accepts either table_id or metric_id."@@ -551,13 +549,12 @@(handler (assoc request :token-scopes (or (:scopes result) #{::scope/unrestricted}))respond raise))(respond (error-response (:error result) (:message result))))))))))-(def ^:private +auth+(def +auth+ "Agent API authentication middleware. Supports both session-based and stateless JWT authentication."(api.routes.common/wrap-middleware-for-open-api-spec-generation enforce-authentication));;; ---------------------------------------------------- Routes ------------------------------------------------------(def ^{:arglists '([request respond raise])} routes- "`/api/agent/` routes."- (handlers/routes- (api.macros/ns-handler *ns* +auth)- (agent-workspace/workspace-handler +auth)))+ "`/api/agent/` routes. Workspace routes are mounted separately via the EE routes file."+ (api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/agent_api/reference.md b/src/metabase/agent_api/reference.mdsimilarity index 100%rename from enterprise/backend/src/metabase_enterprise/agent_api/reference.mdrename to src/metabase/agent_api/reference.mddiff --git a/src/metabase/analytics/stats.clj b/src/metabase/analytics/stats.cljindex 22174cf9bd3..723bed0ece3 100644--- a/src/metabase/analytics/stats.clj+++ b/src/metabase/analytics/stats.clj@@ -908,15 +908,6 @@{:name :metabot-v3:available (premium-features/enable-metabot-v3?):enabled (premium-features/enable-metabot-v3?)}- {:name :ai-entity-analysis- :available (premium-features/enable-ai-entity-analysis?)- :enabled (premium-features/enable-ai-entity-analysis?)}- {:name :ai-sql-fixer- :available (premium-features/enable-ai-sql-fixer?)- :enabled (premium-features/enable-ai-sql-fixer?)}- {:name :ai-sql-generation- :available (premium-features/enable-ai-sql-generation?)- :enabled (premium-features/enable-ai-sql-generation?)}{:name :remote-sync:available (premium-features/enable-remote-sync?):enabled (premium-features/enable-remote-sync?)}diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.cljindex a7f5df1b133..a744b790fcc 100644--- a/src/metabase/api_routes/routes.clj+++ b/src/metabase/api_routes/routes.clj@@ -3,6 +3,7 @@[compojure.route :as route][metabase.actions-rest.api][metabase.activity-feed.api]+ [metabase.agent-api.api][metabase.analytics.api][metabase.api-keys.api][metabase.api.docs]@@ -32,6 +33,10 @@[metabase.logger.api][metabase.login-history.api][metabase.measures.api]+ [metabase.metabot.api]+ [metabase.metabot.api.entity-analysis]+ [metabase.metabot.api.sql-fixer]+ [metabase.metabot.api.sql-generation][metabase.metrics.api][metabase.model-persistence.api][metabase.native-query-snippets.api]@@ -69,6 +74,7 @@(comment metabase.actions-rest.api/keep-memetabase.activity-feed.api/keep-me+ metabase.agent-api.api/keep-memetabase.analytics.api/keep-memetabase.api-keys.api/keep-memetabase.api.util/keep-me@@ -149,6 +155,10 @@(def ^:private route-map{"/action" (+auth 'metabase.actions-rest.api)"/activity" (+auth 'metabase.activity-feed.api)+ "/agent" metabase.agent-api.api/routes+ "/ai-entity-analysis" metabase.metabot.api.entity-analysis/routes+ "/ai-sql-fixer" metabase.metabot.api.sql-fixer/routes+ "/ai-sql-generation" metabase.metabot.api.sql-generation/routes"/alert" (+auth metabase.pulse.api/alert-routes)"/analytics" (+auth 'metabase.analytics.api)"/api-key" (+auth 'metabase.api-keys.api)@@ -181,6 +191,7 @@"/logger" (+auth 'metabase.logger.api)"/login-history" (+auth 'metabase.login-history.api)"/measure" (+auth 'metabase.measures.api)+ "/metabot" metabase.metabot.api/routes"/metric" (+auth 'metabase.metrics.api)"/model-index" (+auth 'metabase.indexed-entities.api)"/native-query-snippet" (+auth 'metabase.native-query-snippets.api)diff --git a/src/metabase/channel/api/slack.clj b/src/metabase/channel/api/slack.cljindex e3e97c535a6..223fbc8916e 100644--- a/src/metabase/channel/api/slack.clj+++ b/src/metabase/channel/api/slack.clj@@ -8,8 +8,10 @@[metabase.channel.slack :as slack][metabase.config.core :as config][metabase.permissions.core :as perms]- [metabase.premium-features.core :refer [defenterprise defenterprise-schema]][metabase.settings.core :as setting]+ [metabase.slackbot.api :as slackbot]+ [metabase.slackbot.config :as slackbot.config]+ [metabase.system.core :as system][metabase.util.i18n :refer [tru]][metabase.util.json :as json][metabase.util.log :as log]@@ -17,12 +19,6 @@(set! *warn-on-reflection* true)-(defenterprise clear-slack-bot-settings!- "Clears enterprise slackbot settings when the Slack token is cleared.- OSS implementation is a no-op."- metabase-enterprise.slackbot.api- [])-(defn- truncate-url"Cut length of long URLs to avoid spamming the Slack channel"[url]@@ -112,7 +108,7 @@:slack-app-token nil:slack-bug-report-channel nil})(slack/clear-channel-cache!)- (clear-slack-bot-settings!))+ (slackbot/clear-slack-bot-settings!));; Set new token(do(when (and (not config/is-test?)@@ -174,22 +170,13 @@[:socket_mode_enabled :boolean][:token_rotation_enabled :boolean]]]])-(defenterprise-schema get-slack-manifest :- SlackManifest- "Returns the Slack app manifest. OSS returns basic manifest; EE with metabot-v3 returns full MetaBot manifest."- metabase-enterprise.slackbot.api+(defn get-slack-manifest+ "Returns the Slack manifest for bootstrapping new Slack apps."[]- {:display_information {:name "Metabot"- :description "Bringing the power of Metabase to your Slack #channels!"- :background_color "#509EE3"}- :features {:bot_user {:display_name "Metabot"}}- :oauth_config {:scopes {:bot ["users:read"- "channels:read"- "channels:join"- "files:write"- "chat:write"- "chat:write.customize"- "chat:write.public"- "groups:read"]}}})+ (let [base-url (system/site-url)]+ (when-not base-url+ (throw (ex-info (tru "You must configure a site-url for Slack integration to work.") {:status-code 503})))+ (slackbot.config/build-slack-manifest base-url)))(api.macros/defendpoint :get "/manifest" :- SlackManifest"Returns the JSON manifest file that should be used to bootstrap new Slack apps"diff --git a/src/metabase/cmd/copy.clj b/src/metabase/cmd/copy.cljindex fedb1cf7ebf..8fa6c812057 100644--- a/src/metabase/cmd/copy.clj+++ b/src/metabase/cmd/copy.clj@@ -124,15 +124,16 @@:model/Comment:model/CommentReaction;; 59+- :model/Measure]+ :model/Measure+ ;; 60++ :model/Metabot+ :model/MetabotConversation+ :model/MetabotMessage+ :model/MetabotPrompt](when config/ee-available?[:model/Sandbox:model/Tenant- :model/ConnectionImpersonation- :model/Metabot- :model/MetabotConversation- :model/MetabotMessage- :model/MetabotPrompt])))+ :model/ConnectionImpersonation])))(defn- objects->columns+values"Given a sequence of objects/rows fetched from the H2 DB, return a the `columns` that should be used in the `INSERT`diff --git a/src/metabase/core/init.clj b/src/metabase/core/init.cljindex 64cd03d38be..a0bbda245b8 100644--- a/src/metabase/core/init.clj+++ b/src/metabase/core/init.clj@@ -37,6 +37,7 @@[metabase.llm.init][metabase.logger.init][metabase.login-history.init]+ [metabase.metabot.init][metabase.model-persistence.init][metabase.models.init][metabase.notification.init]@@ -57,6 +58,7 @@[metabase.session.init][metabase.settings.init][metabase.setup.init]+ [metabase.slackbot.init][metabase.sql-tools.init][metabase.sso.init][metabase.store-api.init]diff --git a/src/metabase/internal_stats/core.clj b/src/metabase/internal_stats/core.cljindex 9da3f7aae59..f7f9fe1124e 100644--- a/src/metabase/internal_stats/core.clj+++ b/src/metabase/internal_stats/core.clj@@ -1,6 +1,7 @@(ns metabase.internal-stats.core(:require[metabase.internal-stats.embedding :as embedding-stats]+ [metabase.internal-stats.metabot :as metabot-stats][metabase.internal-stats.query-executions :as query-execution-stats][metabase.internal-stats.questions :as question-stats][metabase.internal-stats.users :as user-stats]@@ -26,3 +27,7 @@(p/import-vars[question-statsquestion-statistics-all-time])++(p/import-vars+ [metabot-stats+ metabot-stats])diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/core.clj b/src/metabase/internal_stats/metabot.cljsimilarity index 65%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/core.cljrename to src/metabase/internal_stats/metabot.cljindex 485c6eb4cf0..b866188481a 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/core.clj+++ b/src/metabase/internal_stats/metabot.clj@@ -1,31 +1,10 @@-(ns metabase-enterprise.metabot-v3.core- "API namespace for the `metabase-enterprise.metabot-v3` module."+(ns metabase.internal-stats.metabot(:require[java-time.api :as t]- [metabase-enterprise.metabot-v3.api]- [metabase-enterprise.metabot-v3.client]- [metabase-enterprise.metabot-v3.table-utils]- [metabase-enterprise.metabot-v3.util]- [metabase.premium-features.core :refer [defenterprise]]- [potemkin :as p][toucan2.core :as t2]))-(p/import-vars- [metabase-enterprise.metabot-v3.api- routes]- [metabase-enterprise.metabot-v3.client- analyze-chart- analyze-dashboard- fix-sql- generate-sql]- [metabase-enterprise.metabot-v3.table-utils- database-tables- used-tables- schema-sample])--(defenterprise metabot-stats- "Calculate total Metabot token usage over a window of the the previous UTC day 00:00-23:59"- :feature :none+(defn metabot-stats+ "Calculate total Metabot token usage over a window of the previous UTC day 00:00-23:59"[](let [yesterday-utc (-> (t/offset-date-time (t/zone-offset "+00"))(t/minus (t/days 1)))]diff --git a/src/metabase/llm/anthropic.clj b/src/metabase/llm/anthropic.cljindex 9cc39e69170..06d384caac7 100644--- a/src/metabase/llm/anthropic.clj+++ b/src/metabase/llm/anthropic.clj@@ -84,7 +84,7 @@(memoize/ttl(fn [api-key](try- (let [url (str (llm.settings/llm-anthropic-api-url) "/v1/models")+ (let [url (str (llm.settings/llm-anthropic-api-base-url) "/v1/models")response (http/get url{:headers {"x-api-key" api-key"anthropic-version" (llm.settings/llm-anthropic-api-version)}})@@ -119,7 +119,7 @@:messages messages}start-time (u/start-timer)](try- (let [url (str (llm.settings/llm-anthropic-api-url) "/v1/messages")+ (let [url (str (llm.settings/llm-anthropic-api-base-url) "/v1/messages")response (http/post url{:headers (build-request-headers (get-api-key-or-throw)):body (json/encode (build-request-body request))diff --git a/src/metabase/llm/api.clj b/src/metabase/llm/api.cljindex a35000f93d1..7dd440455f6 100644--- a/src/metabase/llm/api.clj+++ b/src/metabase/llm/api.clj@@ -1,5 +1,5 @@(ns metabase.llm.api- "API endpoints for LLM-powered SQL generation (OSS)."+ "API endpoints for OSS BYOK SQL generation."(:require[clojure.java.io :as io][clojure.set :as set]diff --git a/src/metabase/llm/settings.clj b/src/metabase/llm/settings.cljindex 51ca25682ad..dd00c35e6e5 100644--- a/src/metabase/llm/settings.clj+++ b/src/metabase/llm/settings.clj@@ -1,26 +1,29 @@(ns metabase.llm.settings- "Settings for OSS LLM integration."+ "Settings for LLM integration (API keys, model defaults, provider configuration)."(:require[clojure.string :as str][metabase.settings.core :as setting :refer [defsetting]][metabase.util.i18n :refer [deferred-tru tru]]))+;;; ------------------------------------------------- Anthropic -------------------------------------------------+(defsetting llm-anthropic-api-key- (deferred-tru "Anthropic API key for AI-assisted SQL generation.")- :sensitive? true- :visibility :settings-manager- :export? false- :setter (fn [new-value]- (let [trimmed (when (string? new-value)- (not-empty (str/trim new-value)))]- (when (and trimmed (not (str/starts-with? trimmed "sk-ant-")))- (throw (ex-info (tru "Invalid Anthropic API key format. Key must start with ''sk-ant-''.")- {:status-code 400})))- (setting/set-value-of-type! :string :llm-anthropic-api-key trimmed)))+ (deferred-tru "The Anthropic API Key.")+ :sensitive? true+ :visibility :settings-manager+ :export? false+ :deprecated-name :ee-anthropic-api-key+ :setter (fn [new-value]+ (let [trimmed (when (string? new-value)+ (not-empty (str/trim new-value)))]+ (when (and trimmed (not (str/starts-with? trimmed "sk-ant-")))+ (throw (ex-info (tru "Invalid Anthropic API key format. Key must start with ''sk-ant-''.")+ {:status-code 400})))+ (setting/set-value-of-type! :string :llm-anthropic-api-key trimmed))):doc false)(defsetting llm-anthropic-api-key-configured?- "Whether an Anthropic API key has been configured for AI-assisted SQL generation."+ "Whether an Anthropic API key has been configured.":type :boolean:visibility :public:setter :none@@ -29,29 +32,79 @@:doc false)(defsetting llm-anthropic-model- (deferred-tru "Anthropic model for AI-assisted SQL generation.")+ (deferred-tru "The Anthropic model to use."):encryption :no:visibility :settings-manager:default "claude-opus-4-5-20251101":export? false:doc false)-(defsetting llm-anthropic-api-url- (deferred-tru "Anthropic Base API URL for AI-assisted SQL generation.")- :encryption :no- :visibility :internal- :default "https://api.anthropic.com"- :export? false- :doc false)+(defsetting llm-anthropic-api-base-url+ (deferred-tru "The Anthropic API base URL.")+ :encryption :no+ :visibility :settings-manager+ :default "https://api.anthropic.com"+ :export? false+ :deprecated-name :ee-anthropic-api-base-url+ :doc false)(defsetting llm-anthropic-api-version- (deferred-tru "Anthropic API version for AI-assisted SQL generation.")+ (deferred-tru "The Anthropic API version."):encryption :no:visibility :internal:default "2023-06-01":export? false:doc false)+;;; -------------------------------------------------- OpenAI ---------------------------------------------------++(defsetting llm-openai-model+ (deferred-tru "The OpenAI Model (e.g. ''gpt-4'', ''gpt-3.5-turbo'')")+ :encryption :no+ :visibility :settings-manager+ :default "gpt-4.1-mini"+ :export? false+ :deprecated-name :ee-openai-model+ :doc false)++(defsetting llm-openai-api-base-url+ (deferred-tru "The OpenAI API base URL.")+ :encryption :no+ :visibility :settings-manager+ :default "https://api.openai.com"+ :export? false+ :deprecated-name :ee-openai-api-base-url+ :doc false)++(defsetting llm-openai-api-key+ (deferred-tru "The OpenAI API Key.")+ :sensitive? true+ :visibility :settings-manager+ :export? false+ :deprecated-name :ee-openai-api-key+ :doc false)++;;; ------------------------------------------------- OpenRouter ------------------------------------------------++(defsetting llm-openrouter-api-base-url+ (deferred-tru "The OpenRouter API base URL used for Chat Completions.")+ :encryption :no+ :visibility :settings-manager+ :default "https://openrouter.ai/api"+ :export? false+ :deprecated-name :ee-openrouter-api-base-url+ :doc false)++(defsetting llm-openrouter-api-key+ (deferred-tru "The OpenRouter API Key.")+ :sensitive? true+ :visibility :settings-manager+ :export? false+ :deprecated-name :ee-openrouter-api-key+ :doc false)++;;; -------------------------------------------------- General --------------------------------------------------+(defsetting llm-max-tokens(deferred-tru "Maximum tokens for LLM responses."):type :integerdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/analytics.clj b/src/metabase/metabot/agent/analytics.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/analytics.cljrename to src/metabase/metabot/agent/analytics.cljindex 1e2e1629257..ea47a7edcde 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/analytics.clj+++ b/src/metabase/metabot/agent/analytics.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.agent.analytics+(ns metabase.metabot.agent.analytics"Snowplow and Prometheus analytics and intent-classification helpers for the metabot agent."(:require[clojure.string :as str]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.self :as self][metabase.analytics.core :as analytics][metabase.api.common :as api]+ [metabase.metabot.self :as self]+ [metabase.metabot.settings :as metabot.settings][metabase.util.json :as json][metabase.util.log :as log]))@@ -90,7 +90,7 @@(let [context (json/encode (take-last 3 messages))text (transduce (keep (fn [{:keys [type text]}] (when (= type :text) text)))str- (self/call-llm (llm/ee-ai-metabot-provider-lite)+ (self/call-llm (metabot.settings/llm-metabot-provider-lite)nil[{:role "user" :content (build-intent-prompt context)}][]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/core.clj b/src/metabase/metabot/agent/core.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/core.cljrename to src/metabase/metabot/agent/core.cljindex 8f8f0e9016e..8ae696eb2a0 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/core.clj+++ b/src/metabase/metabot/agent/core.clj@@ -1,18 +1,18 @@-(ns metabase-enterprise.metabot-v3.agent.core+(ns metabase.metabot.agent.core"Main agent loop implementation using reducible streaming infrastructure."(:require[clojure.java.io :as io][clojure.string :as str]- [metabase-enterprise.llm.settings :as llm.settings]- [metabase-enterprise.metabot-v3.agent.analytics :as agent-analytics]- [metabase-enterprise.metabot-v3.agent.memory :as memory]- [metabase-enterprise.metabot-v3.agent.messages :as messages]- [metabase-enterprise.metabot-v3.agent.profiles :as profiles]- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]- [metabase-enterprise.metabot-v3.agent.tools :as agent-tools]- [metabase-enterprise.metabot-v3.self :as self][metabase.analytics.prometheus :as prometheus][metabase.config.core :as config]+ [metabase.metabot.agent.analytics :as agent-analytics]+ [metabase.metabot.agent.memory :as memory]+ [metabase.metabot.agent.messages :as messages]+ [metabase.metabot.agent.profiles :as profiles]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.agent.tools :as agent-tools]+ [metabase.metabot.self :as self]+ [metabase.metabot.settings :as metabot.settings][metabase.util :as u][metabase.util.json :as json][metabase.util.log :as log]@@ -335,7 +335,7 @@(defn- init-agent"Initialize agent state."- [{:keys [messages state profile-id context tracking-opts]}]+ [{:keys [messages state metabot-id profile-id context tracking-opts]}](let [context (assign-context-ids context)profile (or (profiles/get-profile profile-id)(throw (ex-info "Unknown profile" {:profile-id profile-id})))@@ -350,7 +350,7 @@(memory/load-transforms-from-state seeded)(memory/load-todos-from-state seeded))memory-atom (atom memory)- tools (agent-tools/wrap-tools-with-state base-tools memory-atom)]+ tools (agent-tools/wrap-tools-with-state base-tools memory-atom metabot-id)](log/info "Starting agent" {:profile profile-id:tools (count tools):max-iter (:max-iterations profile)@@ -400,7 +400,7 @@Streams parts to the consumer as they arrive while simultaneously accumulatingthem for memory updates and control flow decisions."[{:keys [agent rf result iteration usage-atom] :as loop-state}]- (with-span :debug {:name :metabot-v3.agent/loop-step+ (with-span :debug {:name :metabot.agent/loop-step:iteration iteration}(let [{:keys [profile tools context memory-atom tracking-opts]} agentmax-iter (:max-iterations profile 10)@@ -486,6 +486,7 @@[opts :- [:map[:messages ::messages][:profile-id ::profile-id]+ [:metabot-id {:optional true} [:maybe :string]][:state {:optional true} [:maybe ::state]][:context {:optional true} [:maybe ::context]][:tracking-opts {:optional true} [:maybe ::tracking-opts]]@@ -493,11 +494,11 @@(let [profile-id (:profile-id opts)debug? (:debug? opts)labels {:profile-id (name profile-id)}- track-user-intent? (and (llm.settings/ee-ai-metabot-internal-tasks-enabled?)+ track-user-intent? (and (metabot.settings/llm-metabot-internal-tasks-enabled?)(some-> opts :tracking-opts :track-user-intent?))](reify clojure.lang.IReduceInit(reduce [_ rf init]- (with-span :info {:name :metabot-v3.agent/run-agent-loop+ (with-span :info {:name :metabot.agent/run-agent-loop:profile-id profile-id:msg-count (count (:messages opts))}(prometheus/inc! :metabase-metabot/agent-requests labels)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/links.clj b/src/metabase/metabot/agent/links.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/links.cljrename to src/metabase/metabot/agent/links.cljindex dc936e44695..8fafa725634 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/links.clj+++ b/src/metabase/metabot/agent/links.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.links+(ns metabase.metabot.agent.links"Link resolution for metabase:// URIs in streaming text.Converts internal metabase:// links to proper Metabase URLs using agent memory state."(:requirediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/markdown_link_buffer.clj b/src/metabase/metabot/agent/markdown_link_buffer.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/markdown_link_buffer.cljrename to src/metabase/metabot/agent/markdown_link_buffer.cljindex 650fdf7fae8..6727a61a717 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/markdown_link_buffer.clj+++ b/src/metabase/metabot/agent/markdown_link_buffer.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.markdown-link-buffer+(ns metabase.metabot.agent.markdown-link-buffer"Streaming markdown link buffer for resolving metabase:// links.Buffers markdown links during streaming to prevent incomplete markdown rendering@@ -7,7 +7,7 @@Provides both a pure functional state machine and a transducer for stream processing."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.agent.links :as links]+ [metabase.metabot.agent.links :as links][metabase.system.core :as system][metabase.util.log :as log]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/memory.clj b/src/metabase/metabot/agent/memory.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/memory.cljrename to src/metabase/metabot/agent/memory.cljindex 19368e2c27e..71248b04bb4 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/memory.clj+++ b/src/metabase/metabot/agent/memory.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.memory+(ns metabase.metabot.agent.memory"Memory and state management for the agent loop.Tracks conversation history, tool execution steps, and conversation state."(:requirediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/messages.clj b/src/metabase/metabot/agent/messages.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/messages.cljrename to src/metabase/metabot/agent/messages.cljindex 9b6402fb54f..04587fc0493 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/messages.clj+++ b/src/metabase/metabot/agent/messages.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.messages+(ns metabase.metabot.agent.messages"Message formatting and history construction for the agent loop.The agent stores conversation history as AISDK parts — the format-neutral@@ -6,9 +6,9 @@is responsible for converting these parts into its own wire format (Claudemessages, Chat Completions messages, OpenAI Responses input items, etc.)."(:require- [metabase-enterprise.metabot-v3.agent.memory :as memory]- [metabase-enterprise.metabot-v3.agent.prompts :as prompts]- [metabase-enterprise.metabot-v3.agent.user-context :as user-context]+ [metabase.metabot.agent.memory :as memory]+ [metabase.metabot.agent.prompts :as prompts]+ [metabase.metabot.agent.user-context :as user-context][metabase.util.json :as json][metabase.util.log :as log]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/profiles.clj b/src/metabase/metabot/agent/profiles.cljsimilarity index 74%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/profiles.cljrename to src/metabase/metabot/agent/profiles.cljindex 8d555701a76..d3f9d5b3367 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/profiles.clj+++ b/src/metabase/metabot/agent/profiles.clj@@ -1,33 +1,41 @@-(ns metabase-enterprise.metabot-v3.agent.profiles+(ns metabase.metabot.agent.profiles"Profile configurations for different metabot use cases.- Each profile defines model settings, iteration limits, and available tools."+ Each profile defines model settings, iteration limits, and available tools.++ Tools are referenced as vars. Metadata on the var (`:tool-name`, `:schema`,+ `:capabilities`, etc.) describes the tool; the var itself is invoked to run it.+ `defenterprise` tools with `:ee-feature` metadata are filtered out at runtime+ when the feature is not available."(:require[clojure.string :as str][malli.error :as me]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.agent.tools :as agent-tools]+ [metabase.metabot.agent.tools :as agent-tools]+ [metabase.metabot.settings :as metabot.settings]+ [metabase.premium-features.core :as premium-features][metabase.util.malli :as mu][metabase.util.malli.registry :as mr]))-(def ^:private tool-definition-schema- [:map- [:tool-name [:and :string [:fn #(not (str/blank? %))]]]- [:schema [:fn some?]]- [:doc {:optional true} [:maybe :string]]- [:prompt {:optional true} [:maybe :string]]])+(def ^:private tool-var-schema+ "Schema for a tool var: must be a var with :tool-name and :schema in metadata."+ [:fn {:error/message "Expected a var with :tool-name and :schema metadata"}+ (fn [v]+ (and (var? v)+ (string? (:tool-name (meta v)))+ (some? (:schema (meta v)))))])(def ^:private *profiles"Map of profile-id to profile configuration"(atom {}))-(defn- validate-tool-definition!+(defn- validate-tool-var!+ "Validate that a var has the required tool metadata."[tool-var]- (let [definition (select-keys (meta tool-var) [:tool-name :schema :doc :prompt])]- (when-not (mr/validate tool-definition-schema definition)- (throw (ex-info "Invalid tool definition metadata"- {:tool tool-var- :definition definition- :errors (me/humanize (mu/explain tool-definition-schema definition))})))))+ (when-not (mr/validate tool-var-schema tool-var)+ (throw (ex-info "Invalid tool var: missing :tool-name or :schema metadata"+ {:tool-var tool-var+ :metadata (meta tool-var)+ :errors (me/humanize (mu/explain tool-var-schema tool-var))})))+ true)(mu/defn ^:private register-profile!"Register new profile configuration.@@ -37,22 +45,22 @@- :prompt-template - Selmer template name from resources/metabot/prompts/system/- :max-iterations - Maximum agent loop iterations- :temperature - LLM temperature setting- - :tools - Vector of tool vars available to this profile+ - :tools - Vector of tool vars (e.g. #'agent-tools/search-tool)- Note: `:model` is resolved at runtime from the `ee-ai-metabot-provider` setting- (see [[get-profile]]), not stored in the profile."+ Tool vars are validated at registration time to ensure they have required metadata."[profile :- [:map[:name :keyword][:prompt-template :string][:max-iterations :int][:temperature :float][:tools [:vector :any]]]]- (when-not (apply distinct? (map #(:tool-name (meta %)) (:tools profile)))- (let [dups (->> (frequencies (map #(:tool-name (meta %)) (:tools profile)))- (filter (fn [[_ cnt]] (< 1 cnt))))]- (throw (ex-info "Duplicate tool names in profile" {:tool-names (map first dups)}))))- (doseq [tool (:tools profile)]- (validate-tool-definition! tool))+ (let [tool-vars (:tools profile)]+ (doseq [tool-var tool-vars]+ (validate-tool-var! tool-var))+ (when-not (apply distinct? (map #(:tool-name (meta %)) tool-vars))+ (let [dups (->> (frequencies (map #(:tool-name (meta %)) tool-vars))+ (filter (fn [[_ cnt]] (< 1 cnt))))]+ (throw (ex-info "Duplicate tool names in profile" {:tool-names (map first dups)})))))(swap! *profiles assoc (:name profile) profile))(register-profile!@@ -179,7 +187,7 @@"Filter tool vars by user capabilities.Removes tools that require capabilities the user doesn't have.Capabilities from the API arrive as strings (e.g. \"frontend:navigate_user_v1\")- while tool metadata uses keywords (e.g. :frontend-navigate-user-v1), so we+ while tool definitions use keywords (e.g. :frontend-navigate-user-v1), so wenormalize to keywords before comparing."[tool-vars capabilities](let [capabilities-set (into #{} (map capability->keyword) capabilities)]@@ -187,24 +195,35 @@(every? capabilities-set (:capabilities (meta tool-var))))tool-vars)))+(defn- ee-feature-available?+ "Check if a tool's :ee-feature is available (or if the tool has no :ee-feature gate)."+ [tool-var]+ (if-let [feature (:ee-feature (meta tool-var))]+ (premium-features/has-feature? feature)+ true))+(defn- tool-map- [tools]- (into {} (map (juxt #(:tool-name (meta %)) identity) tools)))+ "Create a map of tool-name -> tool-var from a sequence of tool vars."+ [tool-vars]+ (into {} (map (juxt #(:tool-name (meta %)) identity) tool-vars)));;; API(defn get-profile"Get profile configuration by profile-id keyword.- The `:model` in the returned profile is resolved from the `ee-ai-metabot-provider`+ The `:model` in the returned profile is resolved from the `llm-metabot-provider`setting at call time, so it always reflects the current admin configuration."[profile-id](when-let [profile (get @*profiles profile-id)]- (assoc profile :model (llm/ee-ai-metabot-provider))))+ (assoc profile :model (metabot.settings/llm-metabot-provider))))(defn get-tools-for-profile- "Get tool registry filtered by profile configuration and user capabilities."+ "Get tool registry filtered by profile configuration and user capabilities.+ Filters out EE-only tools when the feature is not available, then filters by+ capabilities. Returns a map of tool-name -> tool-var."[profile-id capabilities](some-> (get-profile profile-id):tools+ (->> (filter ee-feature-available?))(filter-by-capabilities capabilities)tool-map))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/prompts.clj b/src/metabase/metabot/agent/prompts.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/prompts.cljrename to src/metabase/metabot/agent/prompts.cljindex 62948a01f7d..d0c132910f8 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/prompts.clj+++ b/src/metabase/metabot/agent/prompts.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.prompts+(ns metabase.metabot.agent.prompts"System for loading and rendering prompt templates using Selmer.Handles:@@ -119,7 +119,7 @@"Load template with caching. Cache is simple in-memory map.In development, you can clear the cache to reload templates:- (reset! metabot-v3.agent.prompts/template-cache {})"+ (reset! metabot.agent.prompts/template-cache {})"[resource-type resource-name loader-fn](let [key (cache-key resource-type resource-name)](or (get @template-cache key)@@ -167,7 +167,7 @@For each tool, loads a markdown prompt file from `resources/metabot/prompts/tools/`.The filename is determined by:- 1. `:prompt` key in the tool's metadata (if present), or+ 1. `:prompt` key in the tool definition map (if present), or2. `\"<tool-name>.md\"` as default.Only tools with a corresponding prompt resource file are included.@@ -175,8 +175,8 @@Returns vector of maps: [{:tool_name \"search\" :instructions \"...\"}]"[tools](vec- (for [[tool-name tool] tools- :let [fname (or (-> tool meta :prompt)+ (for [[tool-name tool-def] tools+ :let [fname (or (:prompt tool-def)(str tool-name ".md"))prompt (some-> (io/resource (str "metabot/prompts/tools/" fname))slurp)]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/streaming.clj b/src/metabase/metabot/agent/streaming.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/streaming.cljrename to src/metabase/metabot/agent/streaming.cljindex fb2f35ca1f1..1e2ea0c97a9 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/streaming.clj+++ b/src/metabase/metabot/agent/streaming.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.agent.streaming+(ns metabase.metabot.agent.streaming"Streaming helpers for the agent loop.Provides utilities for creating AI-SDK data parts, including navigation,and transducers for stream processing."(:require[buddy.core.codecs :as codecs]- [metabase-enterprise.metabot-v3.agent.markdown-link-buffer :as markdown-link-buffer]+ [metabase.metabot.agent.markdown-link-buffer :as markdown-link-buffer][metabase.util.json :as json]))(set! *warn-on-reflection* true)diff --git a/src/metabase/metabot/agent/tools.clj b/src/metabase/metabot/agent/tools.cljnew file mode 100644index 00000000000..e1a5cc57a78--- /dev/null+++ b/src/metabase/metabot/agent/tools.clj@@ -0,0 +1,132 @@+(ns metabase.metabot.agent.tools+ "Tool registry for the agent loop.+ Provides tool vars and state-aware wrapping.++ Each tool is a var whose metadata contains `:tool-name`, `:schema`, and optionally+ `:capabilities`, `:prompt`, `:decode`, and `:system-instructions`. The var itself+ is a function that takes the tool arguments and returns a result map."+ (:require+ [metabase.metabot.agent.tools.analyze-chart :as tools.analyze-chart]+ [metabase.metabot.agent.tools.autogen-dashboard :as tools.autogen-dashboard]+ [metabase.metabot.agent.tools.charts :as tools.charts]+ [metabase.metabot.agent.tools.clarification :as tools.clarification]+ [metabase.metabot.agent.tools.construct :as tools.construct]+ [metabase.metabot.agent.tools.create-alert :as tools.create-alert]+ [metabase.metabot.agent.tools.create-dashboard-subscription :as tools.create-dashboard-subscription]+ [metabase.metabot.agent.tools.document :as tools.document]+ [metabase.metabot.agent.tools.metadata :as tools.metadata]+ [metabase.metabot.agent.tools.navigation :as tools.navigation]+ [metabase.metabot.agent.tools.resources :as tools.resources]+ [metabase.metabot.agent.tools.search :as tools.search]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.agent.tools.slackbot-query :as tools.slackbot-query]+ [metabase.metabot.agent.tools.snippets :as tools.snippets]+ [metabase.metabot.agent.tools.sql :as tools.sql]+ [metabase.metabot.agent.tools.static-viz :as tools.static-viz]+ [metabase.metabot.agent.tools.subscriptions :as tools.subscriptions]+ [metabase.metabot.agent.tools.todo :as tools.todo]+ [metabase.metabot.agent.tools.transforms :as tools.transforms]+ [potemkin :as p]))++(set! *warn-on-reflection* true)++(p/import-vars+ [tools.analyze-chart+ analyze-chart-tool]+ [tools.search search-tool+ sql-search-tool+ nlq-search-tool+ transform-search-tool]+ [tools.construct+ construct-notebook-query-tool]+ [tools.document+ document-schema-collect-tool+ document-construct-sql-chart-tool+ document-construct-model-chart-tool]+ [tools.metadata+ list-available-data-sources-tool+ list-available-fields-tool+ get-field-values-tool]+ [tools.transforms+ get-transform-details-tool+ get-transform-python-library-details-tool+ write-transform-sql-tool+ write-transform-python-tool]+ [tools.sql+ create-sql-query-tool+ create-sql-query-code-edit-tool+ edit-sql-query-tool+ edit-sql-query-code-edit-tool+ replace-sql-query-tool+ replace-sql-query-code-edit-tool]+ [tools.charts+ create-chart-tool+ edit-chart-tool]+ [tools.resources+ read-resource-tool]+ [tools.todo+ todo-write-tool+ todo-read-tool]+ [tools.navigation+ navigate-user-tool]+ [tools.snippets+ list-snippets-tool+ get-snippet-details-tool]+ [tools.clarification+ ask-for-sql-clarification-tool]+ [tools.autogen-dashboard+ create-autogenerated-dashboard-tool]+ [tools.subscriptions+ create-dashboard-subscription-tool]+ [tools.slackbot-query+ slackbot-construct-notebook-query-tool]+ [tools.static-viz+ static-viz-tool]+ [tools.create-alert+ create-alert-tool]+ [tools.create-dashboard-subscription+ slackbot-create-dashboard-subscription-tool])++(def ^:private state-dependent-tools+ "Set of tool names that require access to agent state."+ #{"analyze_chart"+ "create_chart" "edit_chart" "todo_write" "todo_read" "navigate_user"+ "write_transform_sql" "write_transform_python" "create_autogenerated_dashboard"+ "create_sql_query" "edit_sql_query" "replace_sql_query"+ "document_schema_collect" "document_construct_sql_chart" "document_construct_model_chart"+ "create_alert" "create_dashboard_subscription" "static_viz"})++(defn wrap-tools-with-state+ "Wrap state-dependent tools with access to the memory atom.+ Tools in `state-dependent-tools` will have access to the memory atom+ via the dynamic `shared/*memory-atom*` binding.++ Takes a tools map where values are tool vars. Returns a tools map where+ values are tool definition maps (with :doc, :schema, :prompt, :fn, and+ optionally :decode keys).++ Tool-specific instructions are loaded from `resources/metabot/prompts/tools/`+ by `extract-tool-instructions` in `prompts.clj`, keyed by `:prompt` or+ `<tool-name>.md` by default."+ [tools memory-atom metabot-id]+ (reduce-kv+ (fn [acc tool-name tool-var]+ (let [m (meta tool-var)+ tool-def {:tool-name (:tool-name m)+ :doc (:doc m)+ :schema (:schema m)+ :prompt (:prompt m)+ :decode (:decode m)+ :system-instructions (:system-instructions m)+ :capabilities (:capabilities m)+ :fn (if (contains? state-dependent-tools tool-name)+ (fn [args]+ (binding [shared/*memory-atom* memory-atom+ shared/*metabot-id* metabot-id]+ (tool-var args)))+ (fn [args]+ (binding [shared/*metabot-id* metabot-id]+ (tool-var args))))}]+ (assoc acc tool-name tool-def)))+ {}+ tools))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/analyze_chart.clj b/src/metabase/metabot/agent/tools/analyze_chart.cljsimilarity index 88%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/analyze_chart.cljrename to src/metabase/metabot/agent/tools/analyze_chart.cljindex 53077098a48..0d83256af25 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/analyze_chart.clj+++ b/src/metabase/metabot/agent/tools/analyze_chart.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.agent.tools.analyze-chart+(ns metabase.metabot.agent.tools.analyze-chart"Native agent tool for chart statistics analysis.Analyzes charts from viewing context. The frontend provides pre-materializedseries data in chart_configs, which is seeded into agent memory duringinitialization. This avoids re-executing queries."(:require- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.stats.core :as stats.core]- [metabase-enterprise.metabot-v3.stats.repr :as stats.repr]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.stats.core :as stats.core]+ [metabase.metabot.stats.repr :as stats.repr][metabase.util.log :as log][metabase.util.malli :as mu][tech.v3.resource :as resource]))@@ -50,17 +50,16 @@ Do not use headers (##). Do not list statistics. Do not analyze series separatelstringify-series-keys))(mu/defn ^{:tool-name "analyze_chart"- :prompt "analyze_chart"}+ :prompt "analyze_chart"}analyze-chart-tool"Compute statistics and generate analysis context for a chart.Use this to analyze trends, outliers, volatility, and patterns in chart data.The chart_config_id references a chart from the user's current viewing context.Available chart IDs are provided in the system context."- [{:keys [chart_config_id deep]}- :- [:map {:closed true}- [:chart_config_id :string]- [:deep {:optional true :default true} [:maybe :boolean]]]]+ [{:keys [chart_config_id deep]} :- [:map {:closed true}+ [:chart_config_id :string]+ [:deep {:optional true :default true} [:maybe :boolean]]]](try(if-let [chart-config (resolve-chart-config-from-memory chart_config_id)];; Wrap TMD operations in resource context to ensure off-heap memory is releaseddiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/autogen_dashboard.clj b/src/metabase/metabot/agent/tools/autogen_dashboard.cljsimilarity index 70%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/autogen_dashboard.cljrename to src/metabase/metabot/agent/tools/autogen_dashboard.cljindex 6c48419e78c..ff9b0d93108 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/autogen_dashboard.clj+++ b/src/metabase/metabot/agent/tools/autogen_dashboard.clj@@ -1,14 +1,23 @@-(ns metabase-enterprise.metabot-v3.agent.tools.autogen-dashboard+(ns metabase.metabot.agent.tools.autogen-dashboard"Autogenerated dashboard tool wrappers."(:require- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.create-autogenerated-dashboard :as autogen-dashboard-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.create-autogenerated-dashboard :as autogen-dashboard-tools][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)-(mu/defn ^{:tool-name "create_autogenerated_dashboard"+(def ^:private autogen-dashboard-schema+ [:map {:closed true}+ [:source [:map+ [:table_id {:optional true} [:maybe :int]]+ [:model_id {:optional true} [:maybe :int]]+ [:metric_id {:optional true} [:maybe :int]]+ [:query_id {:optional true} [:maybe :string]]+ [:report_id {:optional true} [:maybe :int]]]]])++(mu/defn ^{:tool-name "create_autogenerated_dashboard":capabilities #{:automagic-dashboards}}create-autogenerated-dashboard-tool"Create an automatically generated dashboard using Metabase's X-ray feature.@@ -23,14 +32,7 @@- metric_id: Create dashboard for a metric- query_id: Create dashboard for query results from this conversation- report_id: Create dashboard for an existing report/question"- [{:keys [source]}- :- [:map {:closed true}- [:source [:map- [:table_id {:optional true} [:maybe :int]]- [:model_id {:optional true} [:maybe :int]]- [:metric_id {:optional true} [:maybe :int]]- [:query_id {:optional true} [:maybe :string]]- [:report_id {:optional true} [:maybe :int]]]]]]+ [{:keys [source]} :- autogen-dashboard-schema](try(let [result (autogen-dashboard-tools/create-autogenerated-dashboard{:source sourcediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/charts.clj b/src/metabase/metabot/agent/tools/charts.cljsimilarity index 58%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/charts.cljrename to src/metabase/metabot/agent/tools/charts.cljindex 4c53e80bdfe..1c062bc2eee 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/charts.clj+++ b/src/metabase/metabot/agent/tools/charts.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.agent.tools.charts+(ns metabase.metabot.agent.tools.charts"Chart tool wrappers."(:require[medley.core :as m]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.create-chart :as create-chart-tools]- [metabase-enterprise.metabot-v3.tools.edit-chart :as edit-chart-tools]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.create-chart :as create-chart-tools]+ [metabase.metabot.tools.edit-chart :as edit-chart-tools]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -18,18 +18,24 @@(str "<result>\n" chart-xml "\n</result>\n""<instructions>\n" (instructions/chart-created-instructions chart-id) "\n</instructions>")))-(mu/defn ^{:tool-name "create_chart"} create-chart-tool+(def ^:private chart-type-enum+ [:enum "table" "bar" "line" "pie" "sunburst" "area" "combo"+ "row" "pivot" "scatter" "waterfall" "sankey" "scalar"+ "smartscalar" "gauge" "progress" "funnel" "object" "map"])++(def ^:private create-chart-schema+ [:map {:closed true}+ [:data_source [:map {:closed true}+ [:query_id :string]]]+ [:viz_settings [:map {:closed true}+ [:chart_type chart-type-enum]]]])++(mu/defn ^{:tool-name "create_chart"}+ create-chart-tool"Create a chart from a query.Provide a query_id in data_source and a chart_type in viz_settings."- [{:keys [data_source viz_settings]}- :- [:map {:closed true}- [:data_source [:map {:closed true}- [:query_id :string]]]- [:viz_settings [:map {:closed true}- [:chart_type [:enum "table" "bar" "line" "pie" "sunburst" "area" "combo"- "row" "pivot" "scatter" "waterfall" "sankey" "scalar"- "smartscalar" "gauge" "progress" "funnel" "object" "map"]]]]]]+ [{:keys [data_source viz_settings]} :- create-chart-schema](try(let [result (create-chart-tools/create-chart{:query-id (get data_source :query_id)@@ -46,17 +52,18 @@{:output (ex-message e)}{:output (str "Failed to create chart: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "edit_chart"} edit-chart-tool+(def ^:private edit-chart-schema+ [:map {:closed true}+ [:chart_id :string]+ [:new_viz_settings [:map {:closed true}+ [:chart_type chart-type-enum]]]])++(mu/defn ^{:tool-name "edit_chart"}+ edit-chart-tool"Edit an existing chart's visualization type.Provide a new chart_type in new_viz_settings."- [{:keys [chart_id new_viz_settings]}- :- [:map {:closed true}- [:chart_id :string]- [:new_viz_settings [:map {:closed true}- [:chart_type [:enum "table" "bar" "line" "pie" "sunburst" "area" "combo"- "row" "pivot" "scatter" "waterfall" "sankey" "scalar"- "smartscalar" "gauge" "progress" "funnel" "object" "map"]]]]]]+ [{:keys [chart_id new_viz_settings]} :- edit-chart-schema](try(let [result (edit-chart-tools/edit-chart{:chart-id chart_iddiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/clarification.clj b/src/metabase/metabot/agent/tools/clarification.cljsimilarity index 69%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/clarification.cljrename to src/metabase/metabot/agent/tools/clarification.cljindex a2528ee7d97..9757df51961 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/clarification.clj+++ b/src/metabase/metabot/agent/tools/clarification.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.agent.tools.clarification+(ns metabase.metabot.agent.tools.clarification"Clarification tool wrappers."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.tools.ask-clarification :as ask-clarification-tools]+ [metabase.metabot.tools.ask-clarification :as ask-clarification-tools][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)@@ -13,15 +13,15 @@(when (seq options)(str "\n\nOptions:\n" (str/join "\n" (map #(str "- " %) options))))))-(mu/defn ^{:tool-name "ask_for_sql_clarification"} ask-for-sql-clarification-tool+(mu/defn ^{:tool-name "ask_for_sql_clarification"}+ ask-for-sql-clarification-tool"Ask the user for clarification about their SQL query request.Use this tool when you need more information from the user to properlycomplete their SQL request. The agent will stop and wait for the user's response."- [{:keys [question options]}- :- [:map {:closed true}- [:question :string]- [:options {:optional true} [:maybe [:sequential :string]]]]]+ [{:keys [question options]} :- [:map {:closed true}+ [:question :string]+ [:options {:optional true} [:maybe [:sequential :string]]]]](try(let [result (ask-clarification-tools/ask-for-sql-clarification {:question question:options options})]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/construct.clj b/src/metabase/metabot/agent/tools/construct.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/construct.cljrename to src/metabase/metabot/agent/tools/construct.cljindex 60dee2b1778..844fe68d7aa 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/construct.clj+++ b/src/metabase/metabot/agent/tools/construct.clj@@ -1,17 +1,17 @@-(ns metabase-enterprise.metabot-v3.agent.tools.construct+(ns metabase.metabot.agent.tools.construct"Notebook query construction tool wrappers."(:require[clojure.walk :as walk][malli.core :as mc][malli.transform :as mtx]- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]- [metabase-enterprise.metabot-v3.tmpl :as te]- [metabase-enterprise.metabot-v3.tools.create-chart :as create-chart-tools]- [metabase-enterprise.metabot-v3.tools.filters :as filter-tools]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]- [metabase-enterprise.metabot-v3.util :as metabot-u][metabase.lib.core :as lib]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.tmpl :as te]+ [metabase.metabot.tools.create-chart :as create-chart-tools]+ [metabase.metabot.tools.filters :as filter-tools]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep]+ [metabase.metabot.util :as metabot-u][metabase.util.json :as json][metabase.util.log :as log][metabase.util.malli :as mu]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_alert.clj b/src/metabase/metabot/agent/tools/create_alert.cljsimilarity index 83%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_alert.cljrename to src/metabase/metabot/agent/tools/create_alert.cljindex e7f67e5710d..819cc215716 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_alert.clj+++ b/src/metabase/metabot/agent/tools/create_alert.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.agent.tools.create-alert+(ns metabase.metabot.agent.tools.create-alert"Agent tool wrapper for creating alerts on saved questions.Gets slack_channel_id from agent context and calls the create-alert tool endpoint directly."(:require- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.create-alert :as tools.create-alert]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.create-alert :as tools.create-alert][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -59,15 +59,18 @@ CRITICAL: When a user asks to be alerted or notified about a saved question's reNEVER tell the user you have created an alert without actually calling the create_alert tool. If you cannot call the tool(e.g. missing required information), explain what is needed instead of pretending the alert was created.")-(mu/defn ^{:tool-name "create_alert"+(def ^:private alert-schema+ [:map {:closed true}+ [:card_id :int]+ [:send_condition [:enum "has_result" "goal_above" "goal_below"]]+ [:schedule schedule-schema]+ [:send_once {:optional true :default false} :boolean]])++(mu/defn ^{:tool-name "create_alert":system-instructions create-alert-system-instructions}create-alert-tool"Create an alert based on a saved question's results on a recurring schedule."- [{:keys [card_id send_condition schedule send_once]} :- [:map {:closed true}- [:card_id :int]- [:send_condition [:enum "has_result" "goal_above" "goal_below"]]- [:schedule schedule-schema]- [:send_once {:optional true :default false} :boolean]]]+ [{:keys [card_id send_condition schedule send_once]} :- alert-schema](let [slack-channel-id (:slack_channel_id (shared/current-context))](when-not slack-channel-id(throw (ex-info "This tool can only be used from a Slack channel"diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_dashboard_subscription.clj b/src/metabase/metabot/agent/tools/create_dashboard_subscription.cljsimilarity index 86%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_dashboard_subscription.cljrename to src/metabase/metabot/agent/tools/create_dashboard_subscription.cljindex e2e0019e273..dd2505dbfa5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/create_dashboard_subscription.clj+++ b/src/metabase/metabot/agent/tools/create_dashboard_subscription.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.agent.tools.create-dashboard-subscription+(ns metabase.metabot.agent.tools.create-dashboard-subscription"Agent tool wrapper for creating dashboard subscriptions.Gets slack_channel_id from agent context and calls the create-dashboard-subscription tool endpoint directly."(:require- [metabase-enterprise.metabot-v3.agent.tools.create-alert :as tools.create-alert]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.create-dashboard-subscription :as tools.create-dashboard-subscription]+ [metabase.metabot.agent.tools.create-alert :as tools.create-alert]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.create-dashboard-subscription :as tools.create-dashboard-subscription][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -31,7 +31,7 @@ Before calling the tool, ensure you have ALL of the following:If any required information is missing, ask the user for it rather than assuming or fabricating values.")-(mu/defn ^{:tool-name "create_dashboard_subscription"+(mu/defn ^{:tool-name "create_dashboard_subscription":system-instructions create-dashboard-subscription-system-instructions}slackbot-create-dashboard-subscription-tool"Create a recurring subscription that delivers a dashboard's contents to a Slack channel."diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/document.clj b/src/metabase/metabot/agent/tools/document.cljsimilarity index 87%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/document.cljrename to src/metabase/metabot/agent/tools/document.cljindex bf9bd6dd348..c0b2f21e238 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/document.clj+++ b/src/metabase/metabot/agent/tools/document.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.agent.tools.document+(ns metabase.metabot.agent.tools.document"Document-generation specific tool wrappers."(:require- [metabase-enterprise.metabot-v3.agent.tools.construct :as construct-tools]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.table-utils :as table-utils]- [metabase-enterprise.metabot-v3.tools.create-sql-query :as create-sql-query-tools]+ [metabase.metabot.agent.tools.construct :as construct-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.table-utils :as table-utils]+ [metabase.metabot.tools.create-sql-query :as create-sql-query-tools][metabase.util.log :as log][metabase.util.malli :as mu][metabase.warehouses.core :as warehouses]))@@ -87,19 +87,21 @@(log/error e "Error collecting document schema"){:output (str "Failed to collect schema: " (or (ex-message e) "Unknown error"))})))+(def ^:private sql-chart-schema+ [:map {:closed true}+ [:database_id :int]+ [:name :string]+ [:description :string]+ [:analysis :string]+ [:approach :string]+ [:sql :string]+ [:viz_settings [:map {:closed true}+ [:chart_type chart-type-enum]]]])+(mu/defn ^{:tool-name "document_construct_sql_chart"}document-construct-sql-chart-tool"Construct SQL-backed chart draft payload for document insertion."- [{:keys [database_id name description analysis approach sql viz_settings]}- :- [:map {:closed true}- [:database_id :int]- [:name :string]- [:description :string]- [:analysis :string]- [:approach :string]- [:sql :string]- [:viz_settings [:map {:closed true}- [:chart_type chart-type-enum]]]]]+ [{:keys [database_id name description analysis approach sql viz_settings]} :- sql-chart-schema](try(let [result (create-sql-query-tools/create-sql-query {:database-id database_id:sql sql})@@ -126,16 +128,18 @@{:output (ex-message e)}{:output (str "Failed to construct SQL chart draft: " (or (ex-message e) "Unknown error"))}))))+(def ^:private model-chart-schema+ [:map {:closed true}+ [:name :string]+ [:description :string]+ [:query :map]+ [:viz_settings [:map {:closed true}+ [:chart_type chart-type-enum]]]])+(mu/defn ^{:tool-name "document_construct_model_chart"}document-construct-model-chart-tool"Construct notebook/model-backed chart draft payload for document insertion."- [{:keys [name description query viz_settings]}- :- [:map {:closed true}- [:name :string]- [:description :string]- [:query :map]- [:viz_settings [:map {:closed true}- [:chart_type chart-type-enum]]]]]+ [{:keys [name description query viz_settings]} :- model-chart-schema](try(let [chart-type (get viz_settings :chart_type)result (construct-tools/construct-notebook-query-tooldiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/metadata.clj b/src/metabase/metabot/agent/tools/metadata.cljsimilarity index 62%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/metadata.cljrename to src/metabase/metabot/agent/tools/metadata.cljindex c64d6b97f23..9fef78349ab 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/metadata.clj+++ b/src/metabase/metabot/agent/tools/metadata.clj@@ -1,14 +1,14 @@-(ns metabase-enterprise.metabot-v3.agent.tools.metadata+(ns metabase.metabot.agent.tools.metadata"Metadata tool wrappers."(:require[clojure.string :as str][medley.core :as m]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details-tools]- [metabase-enterprise.metabot-v3.tools.field-stats :as field-stats-tools]- [metabase-enterprise.metabot-v3.tools.get-metadata :as metadata-tools]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.entity-details :as entity-details-tools]+ [metabase.metabot.tools.field-stats :as field-stats-tools]+ [metabase.metabot.tools.get-metadata :as metadata-tools]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)@@ -46,32 +46,41 @@[result format-fn](m/assoc-some result :output (some-> result :structured-output format-fn)))-(mu/defn ^{:tool-name "list_available_data_sources"} list-available-data-sources-tool+(mu/defn ^{:tool-name "list_available_data_sources"}+ list-available-data-sources-tool"List all data sources (metrics and models) available to the metabot instance."[_args :- [:maybe [:map {:closed true}]]](add-output- (entity-details-tools/answer-sources {:metabot-id metabot-v3.config/embedded-metabot-id+ (entity-details-tools/answer-sources {:metabot-id shared/*metabot-id*:with-field-values? false})format-answer-sources-output))-(mu/defn ^{:tool-name "list_available_fields"} list-available-fields-tool+(def ^:private list-available-fields-schema+ [:map {:closed true}+ [:table_ids [:sequential :int]]+ [:model_ids [:sequential :int]]+ [:metric_ids [:sequential :int]]])++(mu/defn ^{:tool-name "list_available_fields"}+ list-available-fields-tool"Retrieve metadata for tables, models, and metrics."- [{:keys [table_ids model_ids metric_ids]} :- [:map {:closed true}- [:table_ids [:sequential :int]]- [:model_ids [:sequential :int]]- [:metric_ids [:sequential :int]]]]+ [{:keys [table_ids model_ids metric_ids]} :- list-available-fields-schema](add-output(metadata-tools/get-metadata {:table-ids table_ids:model-ids model_ids:metric-ids metric_ids})format-metadata-output))-(mu/defn ^{:tool-name "get_field_values"} get-field-values-tool+(def ^:private get-field-values-schema+ [:map {:closed true}+ [:data_source [:enum "table" "model" "metric"]]+ [:source_id :int]+ [:field_id :string]])++(mu/defn ^{:tool-name "get_field_values"}+ get-field-values-tool"Return metadata for a given field of a given data source."- [{:keys [data_source source_id field_id]} :- [:map {:closed true}- [:data_source [:enum "table" "model" "metric"]]- [:source_id :int]- [:field_id :string]]]+ [{:keys [data_source source_id field_id]} :- get-field-values-schema](add-output(field-stats-tools/field-values {:entity-type data_source:entity-id source_iddiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/navigation.clj b/src/metabase/metabot/agent/tools/navigation.cljsimilarity index 54%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/navigation.cljrename to src/metabase/metabot/agent/tools/navigation.cljindex 483e1449b89..c602e0f2de1 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/navigation.clj+++ b/src/metabase/metabot/agent/tools/navigation.clj@@ -1,14 +1,30 @@-(ns metabase-enterprise.metabot-v3.agent.tools.navigation+(ns metabase.metabot.agent.tools.navigation"Navigation tool wrappers."(:require- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.navigate :as navigate-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.navigate :as navigate-tools][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)-(mu/defn ^{:tool-name "navigate_user"+(def ^:private navigation-schema+ [:map {:closed true}+ [:destination [:or+ [:map {:closed true}+ [:page [:enum "notebook_editor" "metrics_browser" "model_browser" "database_browser"]]]+ [:map {:closed true}+ [:page [:enum "sql_editor"]]+ [:database_id :int]]+ [:map {:closed true}+ [:entity_type [:enum "table" "model" "question" "metric" "dashboard"]]+ [:entity_id :int]]+ [:map {:closed true}+ [:query_id :string]]+ [:map {:closed true}+ [:chart_id :string]]]]])++(mu/defn ^{:tool-name "navigate_user":capabilities #{:frontend-navigate-user-v1}}navigate-user-tool"Navigate the user to a specific page or entity in Metabase.@@ -17,21 +33,7 @@- Pages: notebook_editor, metrics_browser, model_browser, database_browser, sql_editor- Entities: table, model, question, metric, dashboard- Query results or charts from the current conversation"- [{:keys [destination]}- :- [:map {:closed true}- [:destination [:or- [:map {:closed true}- [:page [:enum "notebook_editor" "metrics_browser" "model_browser" "database_browser"]]]- [:map {:closed true}- [:page [:enum "sql_editor"]]- [:database_id :int]]- [:map {:closed true}- [:entity_type [:enum "table" "model" "question" "metric" "dashboard"]]- [:entity_id :int]]- [:map {:closed true}- [:query_id :string]]- [:map {:closed true}- [:chart_id :string]]]]]]+ [{:keys [destination]} :- navigation-schema](try(let [result (navigate-tools/navigate {:destination destination:memory-atom shared/*memory-atom*})diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/resources.clj b/src/metabase/metabot/agent/tools/resources.cljsimilarity index 71%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/resources.cljrename to src/metabase/metabot/agent/tools/resources.cljindex ded834ba3d0..c6d2d1def51 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/resources.clj+++ b/src/metabase/metabot/agent/tools/resources.clj@@ -1,13 +1,14 @@-(ns metabase-enterprise.metabot-v3.agent.tools.resources+(ns metabase.metabot.agent.tools.resources"Resource reading tool wrappers."(:require- [metabase-enterprise.metabot-v3.tools.read-resource :as read-resource-tools]+ [metabase.metabot.tools.read-resource :as read-resource-tools][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)-(mu/defn ^{:tool-name "read_resource"} read-resource-tool+(mu/defn ^{:tool-name "read_resource"}+ read-resource-tool"Read detailed information about Metabase resources via URI patterns.Supports fetching multiple resources in parallel using metabase:// URIs:@@ -16,9 +17,8 @@- metabase://metric/{id}/dimensions - Get metric dimensions- metabase://transform/{id} - Get transform details- metabase://dashboard/{id} - Get dashboard details"- [{:keys [uris]}- :- [:map {:closed true}- [:uris [:sequential [:string {:description "Metabase resource URIs to fetch"}]]]]]+ [{:keys [uris]} :- [:map {:closed true}+ [:uris [:sequential [:string {:description "Metabase resource URIs to fetch"}]]]]](try(read-resource-tools/read-resource {:uris uris})(catch Exception ediff --git a/src/metabase/metabot/agent/tools/search.clj b/src/metabase/metabot/agent/tools/search.cljnew file mode 100644index 00000000000..4534a34220c--- /dev/null+++ b/src/metabase/metabot/agent/tools/search.clj@@ -0,0 +1,109 @@+(ns metabase.metabot.agent.tools.search+ "Search tool wrappers for Metabot v3."+ (:require+ [clojure.string :as str]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tmpl :as te]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep]+ [metabase.metabot.tools.search :as search-tools]+ [metabase.util.log :as log]+ [metabase.util.malli :as mu]))++(set! *warn-on-reflection* true)++(defn- format-search-output+ "Format search results as an LLM-ready string."+ [results]+ (let [results-xml (llm-rep/search-results->xml results)]+ (te/lines+ "<result>"+ results-xml+ ""+ (str "Total results: " (count results))+ "</result>"+ "<instructions>"+ instructions/search-result-instructions "</instructions>")))++(defn- invalid-entity-types+ [entity-types allowed]+ (when (seq entity-types)+ (seq (remove allowed entity-types))))++(defn- do-search+ [label allowed-types search-opts {:keys [semantic_queries keyword_queries entity_types] :as _args}]+ (if-let [invalid (invalid-entity-types entity_types allowed-types)]+ {:output (str "Invalid entity_types for " label ": " (pr-str (vec invalid))+ ". Allowed types: " (str/join ", " (sort allowed-types)) ".")}+ (try+ (let [results (search-tools/search (merge {:semantic-queries semantic_queries+ :term-queries keyword_queries+ :entity-types entity_types+ :metabot-id shared/*metabot-id*+ :limit 10}+ search-opts))]+ {:output (format-search-output results)+ :structured-output {:result-type :search+ :data results+ :total_count (count results)}})+ (catch Exception e+ (log/error e (str "Error in " label))+ {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))++(def ^:private search-schema+ [:map {:closed true}+ [:semantic_queries {:feature :semantic-search} [:sequential :string]]+ [:keyword_queries [:sequential :string]]+ [:entity_types {:optional true}+ [:maybe [:sequential [:enum "table" "model" "metric" "dashboard" "question"]]]]])++(mu/defn ^{:tool-name "search"}+ search-tool+ "Search for tables, models, metrics, dashboards, and saved questions."+ [args :- search-schema]+ (do-search "search" #{"table" "model" "metric" "dashboard" "question"} {} args))++(def ^:private sql-search-schema+ [:map {:closed true}+ [:semantic_queries {:feature :semantic-search} [:sequential :string]]+ [:keyword_queries [:sequential :string]]+ [:database_id :int]+ [:entity_types {:optional true}+ [:maybe [:sequential [:enum "table" "model"]]]]])++(mu/defn ^{:tool-name "search"+ :prompt "sql_search.md"}+ sql-search-tool+ "Search for SQL-queryable data sources (tables and models) within a database."+ [{:keys [database_id] :as args} :- sql-search-schema]+ (do-search "SQL search" #{"table" "model"} {:database-id database_id} args))++(def ^:private nlq-search-schema+ [:map {:closed true}+ [:semantic_queries {:feature :semantic-search} [:sequential :string]]+ [:keyword_queries [:sequential :string]]+ [:entity_types {:optional true}+ [:maybe [:sequential [:enum "model" "metric" "table"]]]]])++(mu/defn ^{:tool-name "search"+ :prompt "nql_search.md"}+ nlq-search-tool+ "Search for NLQ-queryable data sources (models, metrics, tables)."+ [args :- nlq-search-schema]+ (do-search "NLQ search" #{"model" "metric" "table"} {:profile-id "nlq"} args))++(def ^:private transform-search-schema+ [:map {:closed true}+ [:semantic_queries {:feature :semantic-search} [:sequential :string]]+ [:keyword_queries [:sequential :string]]+ [:search_native_query {:optional true} [:maybe :boolean]]+ [:entity_types {:optional true}+ [:maybe [:sequential [:enum "table" "model" "transform"]]]]])++(mu/defn ^{:tool-name "search"+ :prompt "transform_search"}+ transform-search-tool+ "Search for transforms, tables, and models."+ [{:keys [search_native_query] :as args} :- transform-search-schema]+ (do-search "transform search" #{"table" "model" "transform"}+ {:search-native-query search_native_query} args))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/shared.clj b/src/metabase/metabot/agent/tools/shared.cljsimilarity index 83%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/shared.cljrename to src/metabase/metabot/agent/tools/shared.cljindex fdcfeebb770..095605313e5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/shared.clj+++ b/src/metabase/metabot/agent/tools/shared.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.tools.shared+(ns metabase.metabot.agent.tools.shared"Shared tool helpers and state accessors."(:require[metabase.util.log :as log]))@@ -9,6 +9,11 @@"Dynamic memory atom bound for tools that need access to agent state."nil)+(def ^:dynamic *metabot-id*+ "The resolved metabot ID for the current agent session. Bound during the agent loop+ so that tools can scope queries to the correct metabot instance's collection."+ nil)+(defn current-memory"Returns the current agent memory map, or nil if not in an agent context."[]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/slackbot_query.clj b/src/metabase/metabot/agent/tools/slackbot_query.cljsimilarity index 90%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/slackbot_query.cljrename to src/metabase/metabot/agent/tools/slackbot_query.cljindex 30069e06625..e3799765251 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/slackbot_query.clj+++ b/src/metabase/metabot/agent/tools/slackbot_query.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.agent.tools.slackbot-query+(ns metabase.metabot.agent.tools.slackbot-query"Slackbot-specific notebook query tool.Like construct-notebook-query-tool but emits adhoc_viz data partsinstead of creating charts. Does not save or navigate."(:require- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]- [metabase-enterprise.metabot-v3.agent.tools.construct :as construct]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.agent.tools.construct :as construct][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -19,7 +19,8 @@:description "Visualization type for displaying the query results in Slack. Required in practice whenever the user asks for a chart or graph, and it must match any requested chart type. Valid values: 'table', 'bar', 'line', 'pie', 'area', 'row', 'scatter', 'funnel'. Use requested chart types like 'line', 'bar', 'area', 'pie', 'scatter', 'funnel', 'row', or 'table' when they fit the query. Omitting this field falls back to Metabase's default table display, so do not omit it for chart or graph requests. Only omit it when you intentionally want a plain table and the user did not request a chart type."}[:maybe [:enum "table" "bar" "line" "pie" "area" "row" "scatter" "funnel"]]]])-(mu/defn ^{:tool-name "construct_notebook_query"} slackbot-construct-notebook-query-tool+(mu/defn ^{:tool-name "construct_notebook_query"}+ slackbot-construct-notebook-query-tool"Construct a notebook query from a metric, model, or table. The query results will be rendered as a visualization in Slack."[{:keys [_reasoning query title display]} :- slackbot-query-schema](trydiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/snippets.clj b/src/metabase/metabot/agent/tools/snippets.cljsimilarity index 81%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/snippets.cljrename to src/metabase/metabot/agent/tools/snippets.cljindex 56fb6e0562f..db6249f9521 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/snippets.clj+++ b/src/metabase/metabot/agent/tools/snippets.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.agent.tools.snippets+(ns metabase.metabot.agent.tools.snippets"Snippet tool wrappers."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.tools.snippets :as snippet-tools]+ [metabase.metabot.tools.snippets :as snippet-tools][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)@@ -33,8 +33,9 @@(assoc result :output (format-fn structured))result))-(mu/defn ^{:tool-name "list_snippets"- :capabilities #{:feature-snippets}} list-snippets-tool+(mu/defn ^{:tool-name "list_snippets"+ :capabilities #{:feature-snippets}}+ list-snippets-tool"List all SQL snippets available in the Metabase instance.Use this tool before editing or creating SQL transforms to understand what@@ -43,13 +44,12 @@[_args :- [:maybe [:map {:closed true}]]](add-output (snippet-tools/get-snippets {}) format-snippet-list-output))-(mu/defn ^{:tool-name "get_snippet_details"- :capabilities #{:feature-snippets}} get-snippet-details-tool+(mu/defn ^{:tool-name "get_snippet_details"+ :capabilities #{:feature-snippets}}+ get-snippet-details-tool"Get the full details of a SQL snippet including its content.Use this tool to retrieve the actual SQL content of a snippet after identifyingit with list_snippets."- [{:keys [snippet_id]}- :- [:map {:closed true}- [:snippet_id :int]]]+ [{:keys [snippet_id]} :- [:map {:closed true} [:snippet_id :int]]](add-output (snippet-tools/get-snippet-details {:snippet-id snippet_id}) format-snippet-details-output))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/sql.clj b/src/metabase/metabot/agent/tools/sql.cljsimilarity index 73%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/sql.cljrename to src/metabase/metabot/agent/tools/sql.cljindex abf47d4b38a..2682a69630c 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/sql.clj+++ b/src/metabase/metabot/agent/tools/sql.clj@@ -1,14 +1,14 @@-(ns metabase-enterprise.metabot-v3.agent.tools.sql+(ns metabase.metabot.agent.tools.sql"SQL tool wrappers."(:require- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tmpl :as te]- [metabase-enterprise.metabot-v3.tools.create-sql-query :as create-sql-query-tools]- [metabase-enterprise.metabot-v3.tools.edit-sql-query :as edit-sql-query-tools]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]- [metabase-enterprise.metabot-v3.tools.replace-sql-query :as replace-sql-query-tools]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tmpl :as te]+ [metabase.metabot.tools.create-sql-query :as create-sql-query-tools]+ [metabase.metabot.tools.edit-sql-query :as edit-sql-query-tools]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep]+ [metabase.metabot.tools.replace-sql-query :as replace-sql-query-tools][metabase.util :as u][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -69,26 +69,31 @@:mode "rewrite":value sql}))-(mu/defn ^{:tool-name "create_sql_query"+;;; ──────────────────────────────────────────────────────────────────+;;; Create SQL query+;;; ──────────────────────────────────────────────────────────────────++(def ^:private create-sql-schema+ [:map {:closed true}+ [:database_id :int]+ [:sql_query :string]])++(mu/defn ^{:tool-name "create_sql_query":capabilities #{:permission-write-sql-queries}}create-sql-query-tool"Create a new SQL query."- [{:keys [database_id sql_query]}- :- [:map {:closed true}- [:database_id :int]- [:sql_query :string]]]+ [{:keys [database_id sql_query]} :- create-sql-schema](try(let [{:keys [validation-result action-result]}(create-sql-query-tools/create-sql-query{:database-id database_id:sql sql_query})-{:keys [valid? dialect error-message]} validation-result{:keys [query-id query]} action-result](if valid?- (let [structured (assoc action-result :result-type :query)- instr (instructions/query-created-instructions-for query-id)- results-url (streaming/query->question-url query)]+ (let [structured (assoc action-result :result-type :query)+ instr (instructions/query-created-instructions-for query-id)+ results-url (streaming/query->question-url query)]{:output (format-query-output structured instr {:preamble? true}):structured-output structured:instructions instr@@ -102,22 +107,18 @@{:output (ex-message e)}{:output (str "Failed to create SQL query: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "create_sql_query"+(mu/defn ^{:tool-name "create_sql_query":capabilities #{:permission-write-sql-queries}}create-sql-query-code-edit-tool"Create a new SQL query and update the code editor buffer."- [{:keys [database_id sql_query]}- :- [:map {:closed true}- [:database_id :int]- [:sql_query :string]]]- (let [buffer-id (first-code-editor-buffer-id)]+ [{:keys [database_id sql_query]} :- create-sql-schema]+ (let [buffer-id (first-code-editor-buffer-id)](if (nil? buffer-id){:output "No active code editor buffer found for SQL editing."}(let [{:keys [validation-result action-result]}(create-sql-query-tools/create-sql-query{:database-id database_id:sql sql_query})-{:keys [valid? dialect error-message]} validation-result{:keys [query-id query-content]} action-result](if valid?@@ -131,18 +132,24 @@{:output (format-validation-error-output instr):instructions instr}))))))-(mu/defn ^{:tool-name "edit_sql_query"+;;; ──────────────────────────────────────────────────────────────────+;;; Edit SQL query+;;; ──────────────────────────────────────────────────────────────────++(def ^:private edit-sql-schema+ [:map {:closed true}+ [:query_id [:or :string :int]]+ [:checklist :string]+ [:edits [:sequential [:map {:closed true}+ [:old_string :string]+ [:new_string :string]+ [:replace_all {:optional true} [:maybe :boolean]]]]]])++(mu/defn ^{:tool-name "edit_sql_query":capabilities #{:permission-write-sql-queries}}edit-sql-query-tool"Edit an existing SQL query using structured edits."- [{:keys [query_id edits checklist]}- :- [:map {:closed true}- [:query_id [:or :string :int]]- [:checklist :string]- [:edits [:sequential [:map {:closed true}- [:old_string :string]- [:new_string :string]- [:replace_all {:optional true} [:maybe :boolean]]]]]]]+ [{:keys [query_id edits checklist]} :- edit-sql-schema](try(let [{:keys [validation-result action-result]}(edit-sql-query-tools/edit-sql-query@@ -150,7 +157,6 @@:edits edits:checklist checklist:queries-state (shared/current-queries-state)})-{:keys [valid? error-message dialect]} validation-result{:keys [query-id query]} action-result](if valid?@@ -170,18 +176,11 @@{:output (ex-message e)}{:output (str "Failed to edit SQL query: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "edit_sql_query"+(mu/defn ^{:tool-name "edit_sql_query":capabilities #{:permission-write-sql-queries}}edit-sql-query-code-edit-tool"Edit an existing SQL query and update the code editor buffer."- [{:keys [query_id edits checklist]}- :- [:map {:closed true}- [:query_id [:or :string :int]]- [:checklist :string]- [:edits [:sequential [:map {:closed true}- [:old_string :string]- [:new_string :string]- [:replace_all {:optional true} [:maybe :boolean]]]]]]]+ [{:keys [query_id edits checklist]} :- edit-sql-schema](let [buffer-id (first-code-editor-buffer-id)](if (nil? buffer-id){:output "No active code editor buffer found for SQL editing."}@@ -191,7 +190,6 @@:edits edits:checklist checklist:queries-state (shared/current-queries-state)})-{:keys [valid? dialect error-message]} validation-result{:keys [query-id query-content]} action-result](if valid?@@ -205,15 +203,21 @@{:output (format-validation-error-output instr):instructions instr}))))))-(mu/defn ^{:tool-name "replace_sql_query"+;;; ──────────────────────────────────────────────────────────────────+;;; Replace SQL query+;;; ──────────────────────────────────────────────────────────────────++(def ^:private replace-sql-schema+ [:map {:closed true}+ [:query_id [:or :string :int]]+ [:checklist :string]+ [:new_query :string]])++(mu/defn ^{:tool-name "replace_sql_query":capabilities #{:permission-write-sql-queries}}replace-sql-query-tool"Replace the SQL content of an existing query entirely."- [{:keys [query_id new_query checklist]}- :- [:map {:closed true}- [:query_id [:or :string :int]]- [:checklist :string]- [:new_query :string]]]+ [{:keys [query_id new_query checklist]} :- replace-sql-schema](try(let [{:keys [validation-result action-result]}(replace-sql-query-tools/replace-sql-query@@ -221,7 +225,6 @@:sql new_query:checklist checklist:queries-state (shared/current-queries-state)})-{:keys [valid? dialect error-message]} validation-result{:keys [query-id query]} action-result](if valid?@@ -241,16 +244,12 @@{:output (ex-message e)}{:output (str "Failed to replace SQL query: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "replace_sql_query"+(mu/defn ^{:tool-name "replace_sql_query":capabilities #{:permission-write-sql-queries}}replace-sql-query-code-edit-tool"Replace an SQL query and update the code editor buffer."- [{:keys [query_id new_query checklist]}- :- [:map {:closed true}- [:query_id [:or :string :int]]- [:checklist :string]- [:new_query :string]]]- (let [buffer-id (first-code-editor-buffer-id)]+ [{:keys [query_id new_query checklist]} :- replace-sql-schema]+ (let [buffer-id (first-code-editor-buffer-id)](if (nil? buffer-id){:output "No active code editor buffer found for SQL editing."}(let [{:keys [validation-result action-result]}@@ -259,7 +258,6 @@:sql new_query:checklist checklist:queries-state (shared/current-queries-state)})-{:keys [valid? dialect error-message]} validation-result{:keys [query-id query-content]} action-result](if valid?diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/static_viz.clj b/src/metabase/metabot/agent/tools/static_viz.cljsimilarity index 84%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/static_viz.cljrename to src/metabase/metabot/agent/tools/static_viz.cljindex b7bcf792e7d..95b9778a310 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/static_viz.clj+++ b/src/metabase/metabot/agent/tools/static_viz.clj@@ -1,13 +1,14 @@-(ns metabase-enterprise.metabot-v3.agent.tools.static-viz+(ns metabase.metabot.agent.tools.static-viz"Static visualization tool for the slackbot profile.Renders existing saved questions/metrics as PNG images in Slack."(:require- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]+ [metabase.metabot.agent.streaming :as streaming][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)-(mu/defn ^{:tool-name "static_viz"} static-viz-tool+(mu/defn ^{:tool-name "static_viz"}+ static-viz-tool"Generate a static visualization (PNG image) of a saved question or metric. The visualization will be posted as a separate follow-up message in the thread."[{:keys [entity_id]} :- [:map {:closed true}[:entity_id :int]]]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/subscriptions.clj b/src/metabase/metabot/agent/tools/subscriptions.cljsimilarity index 70%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/subscriptions.cljrename to src/metabase/metabot/agent/tools/subscriptions.cljindex cd616976b75..793229a9447 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/subscriptions.clj+++ b/src/metabase/metabot/agent/tools/subscriptions.clj@@ -1,12 +1,23 @@-(ns metabase-enterprise.metabot-v3.agent.tools.subscriptions+(ns metabase.metabot.agent.tools.subscriptions"Dashboard subscription tool wrapper."(:require- [metabase-enterprise.metabot-v3.tools.create-dashboard-subscription :as subscription-tools]+ [metabase.metabot.tools.create-dashboard-subscription :as subscription-tools][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)+(def ^:private subscription-schema+ [:map {:closed true}+ [:dashboard_id :int]+ [:email {:optional true} [:maybe :string]]+ [:slack_channel {:optional true} [:maybe :string]]+ [:schedule [:map+ [:frequency [:enum "hourly" "daily" "weekly" "monthly"]]+ [:hour {:optional true} [:maybe :int]]+ [:day_of_week {:optional true} [:maybe :string]]+ [:day_of_month {:optional true} [:maybe :string]]]]])+(mu/defn ^{:tool-name "create_dashboard_subscription"}create-dashboard-subscription-tool"Create a dashboard subscription to send regular updates via email or Slack.@@ -17,16 +28,7 @@Do NOT infer email addresses from usernames or other information.If the email address is incomplete or missing a part like the TLD,ask the user for clarification before proceeding."- [{:keys [dashboard_id email slack_channel schedule]}- :- [:map {:closed true}- [:dashboard_id :int]- [:email {:optional true} [:maybe :string]]- [:slack_channel {:optional true} [:maybe :string]]- [:schedule [:map- [:frequency [:enum "hourly" "daily" "weekly" "monthly"]]- [:hour {:optional true} [:maybe :int]]- [:day_of_week {:optional true} [:maybe :string]]- [:day_of_month {:optional true} [:maybe :string]]]]]]+ [{:keys [dashboard_id email slack_channel schedule]} :- subscription-schema](try(subscription-tools/create-dashboard-subscription{:dashboard-id dashboard_iddiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/todo.clj b/src/metabase/metabot/agent/tools/todo.cljsimilarity index 74%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/todo.cljrename to src/metabase/metabot/agent/tools/todo.cljindex 1f7e9bfa3fd..fea084daadb 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/todo.clj+++ b/src/metabase/metabot/agent/tools/todo.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.agent.tools.todo+(ns metabase.metabot.agent.tools.todo"Todo tool wrappers."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.todo :as todo-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.todo :as todo-tools][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)@@ -27,7 +27,16 @@(assoc result :output (format-fn structured))result))-(mu/defn ^{:tool-name "todo_write"} todo-write-tool+(def ^:private todo-write-schema+ [:map {:closed true}+ [:todos [:sequential [:map {:closed true}+ [:id :string]+ [:content :string]+ [:status [:enum "pending" "in_progress" "completed" "cancelled"]]+ [:priority [:enum "high" "medium" "low"]]]]]])++(mu/defn ^{:tool-name "todo_write"}+ todo-write-tool"Create and manage a structured task list.Write or update the todo list with tasks for tracking progress.@@ -36,13 +45,7 @@- content: Description of what needs to be done- status: One of 'pending', 'in_progress', 'completed', 'cancelled'- priority: One of 'high', 'medium', 'low'"- [{:keys [todos]}- :- [:map {:closed true}- [:todos [:sequential [:map {:closed true}- [:id :string]- [:content :string]- [:status [:enum "pending" "in_progress" "completed" "cancelled"]]- [:priority [:enum "high" "medium" "low"]]]]]]]+ [{:keys [todos]} :- todo-write-schema](try(add-output(todo-tools/todo-write {:todos todos@@ -53,7 +56,8 @@{:output (ex-message e)}{:output (str "Failed to update todo list: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "todo_read"} todo-read-tool+(mu/defn ^{:tool-name "todo_read"}+ todo-read-tool"Read the current todo list from memory.Returns the list of todos that have been created during this conversation."[_args :- [:maybe [:map {:closed true}]]]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/transforms.clj b/src/metabase/metabot/agent/tools/transforms.cljsimilarity index 50%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/transforms.cljrename to src/metabase/metabot/agent/tools/transforms.cljindex 80a26cec117..50a2726cc41 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/tools/transforms.clj+++ b/src/metabase/metabot/agent/tools/transforms.clj@@ -1,16 +1,23 @@-(ns metabase-enterprise.metabot-v3.agent.tools.transforms- "Transform tool wrappers."+(ns metabase.metabot.agent.tools.transforms+ "Transform tool definitions.+ SQL transform tools are implemented directly in OSS.+ Python transform tools use defenterprise (return nil/error in OSS, real impl in EE)."(:require- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.tools.dependencies :as deps]- [metabase-enterprise.metabot-v3.tools.transforms :as transform-tools]- [metabase-enterprise.metabot-v3.tools.transforms-write :as transforms-write-tools]- [metabase-enterprise.metabot-v3.util :as metabot.u]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.tools.dependencies :as deps]+ [metabase.metabot.tools.transforms :as transform-tools]+ [metabase.metabot.tools.transforms-write :as transforms-write-tools]+ [metabase.metabot.util :as metabot.u]+ [metabase.premium-features.core :refer [defenterprise]][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)+;;; ──────────────────────────────────────────────────────────────────+;;; Formatting helpers+;;; ──────────────────────────────────────────────────────────────────+(defn- format-transform-details-output[{:keys [id name description source target] :as _transform}](metabot.u/xml@@ -22,17 +29,12 @@(when (:source-database source) [:database (:source-database source)])])(when target [:target (pr-str target)])]))-(defn- format-python-library-output- [{:keys [path] :as lib}]- (metabot.u/xml- [:python-library {:path path}- (when-let [content (:content lib)] [:content content])]))--(defn- format-transform-write-output+(defn format-transform-write-output+ "Format the output of a transform write operation."[{:keys [message]}](or message "Transform updated successfully."))-(defn- add-output+(defn add-output"Add :output to a tool result. Handles both :structured_output and :structured-output."[result format-fn](if-let [structured (or (:structured_output result) (:structured-output result))]@@ -72,21 +74,46 @@"\nYou must summarize these dependency issues for the user. ""Do not propose or apply fixes yourself."))-(mu/defn ^{:tool-name "get_transform_details"} get-transform-details-tool+;;; ──────────────────────────────────────────────────────────────────+;;; Tool definitions+;;; ──────────────────────────────────────────────────────────────────++(mu/defn ^{:tool-name "get_transform_details"}+ get-transform-details-tool"Get information about a transform."- [{:keys [transform_id]} :- [:map {:closed true}- [:transform_id :int]]]+ [{:keys [transform_id]} :- [:map {:closed true} [:transform_id :int]]](add-output (transform-tools/get-transform-details {:transform-id transform_id})format-transform-details-output))-(mu/defn ^{:tool-name "get_transform_python_library_details"} get-transform-python-library-details-tool- "Get information about a Python library by path."- [{:keys [path]} :- [:map {:closed true}- [:path :string]]]- (add-output (transform-tools/get-transform-python-library-details {:path path})- format-python-library-output))--(mu/defn ^{:tool-name "write_transform_sql"+(def ^:private python-lib-schema+ [:map {:closed true} [:path :string]])++(defenterprise ^{:tool-name "get_transform_python_library_details"+ :schema [:=> [:cat python-lib-schema] :map]+ :ee-feature :transforms}+ get-transform-python-library-details-tool+ "Get Python library details. EE-only; returns an error in OSS."+ metabase-enterprise.metabot.agent.tools.transforms+ [{:keys [_path]}]+ {:output "Python transform tools are only available in Metabase Enterprise Edition."})++(def ^:private write-transform-sql-schema+ [:map {:closed true}+ [:transform_id {:optional true} [:maybe :int]]+ [:edit_action [:map+ [:mode [:enum "edit" "replace"]]+ [:edits {:optional true} [:maybe [:sequential [:map+ [:old_string :string]+ [:new_string :string]+ [:replace_all {:optional true} [:maybe :boolean]]]]]]+ [:new_content {:optional true} [:maybe :string]]]]+ [:thinking {:optional true} [:maybe :string]]+ [:transform_name {:optional true} [:maybe :string]]+ [:transform_description {:optional true} [:maybe :string]]+ [:source_database {:optional true} [:maybe :int]]+ [:source_tables {:optional true} [:maybe :map]]])++(mu/defn ^{:tool-name "write_transform_sql":capabilities #{:feature-transforms :permission-write-transforms}}write-transform-sql-tool"Write new SQL queries or edit existing queries for transforms.@@ -98,21 +125,7 @@For edit mode, provide edits as an array of {old_string, new_string, replace_all} objects.For replace mode, provide new_content with the complete SQL."[{:keys [transform_id edit_action thinking transform_name transform_description- source_database source_tables]}- :- [:map {:closed true}- [:transform_id {:optional true} [:maybe :int]]- [:edit_action [:map- [:mode [:enum "edit" "replace"]]- [:edits {:optional true} [:maybe [:sequential [:map- [:old_string :string]- [:new_string :string]- [:replace_all {:optional true} [:maybe :boolean]]]]]]- [:new_content {:optional true} [:maybe :string]]]]- [:thinking {:optional true} [:maybe :string]]- [:transform_name {:optional true} [:maybe :string]]- [:transform_description {:optional true} [:maybe :string]]- [:source_database {:optional true} [:maybe :int]]- [:source_tables {:optional true} [:maybe :map]]]]+ source_database source_tables]} :- write-transform-sql-schema](try(let [result (add-output(transforms-write-tools/write-transform-sql@@ -135,51 +148,12 @@{:output (ex-message e)}{:output (str "Failed to write SQL transform: " (or (ex-message e) "Unknown error"))}))))-(mu/defn ^{:tool-name "write_transform_python"- :capabilities #{:feature-transforms :feature-transforms-python :permission-write-transforms}}+(defenterprise ^{:tool-name "write_transform_python"+ :schema [:=> [:cat write-transform-sql-schema] :map]+ :capabilities #{:feature-transforms :feature-transforms-python :permission-write-transforms}+ :ee-feature :transforms}write-transform-python-tool- "Write new Python code or edit existing code for transforms.-- Supports two modes:- - edit: Targeted string replacements with partial edits- - replace: Replace entire code atomically-- For edit mode, provide edits as an array of {old_string, new_string, replace_all} objects.- For replace mode, provide new_content with the complete Python code.-- Use `get_transform_python_library_details` before writing any Python code to inspect the shared library.- Use the shared library in your code by adding `import common` at the top of the file.- Keep `import common` at the top of the file even if it is currently unused."- [{:keys [transform_id edit_action thinking transform_name transform_description- source_database source_tables]}- :- [:map {:closed true}- [:transform_id {:optional true} [:maybe :int]]- [:edit_action [:map- [:mode [:enum "edit" "replace"]]- [:edits {:optional true} [:maybe [:sequential [:map- [:old_string :string]- [:new_string :string]- [:replace_all {:optional true} [:maybe :boolean]]]]]]- [:new_content {:optional true} [:maybe :string]]]]- [:thinking {:optional true} [:maybe :string]]- [:transform_name {:optional true} [:maybe :string]]- [:transform_description {:optional true} [:maybe :string]]- [:source_database {:optional true} [:maybe :int]]- [:source_tables {:optional true} [:maybe :map]]]]- (try- (add-output- (transforms-write-tools/write-transform-python- {:transform_id transform_id- :edit_action edit_action- :thinking thinking- :transform_name transform_name- :transform_description transform_description- :source_database source_database- :source_tables source_tables- :memory-atom shared/*memory-atom*- :context (shared/current-context)})- format-transform-write-output)- (catch Exception e- (if (:agent-error? (ex-data e))- {:output (ex-message e)}- {:output (str "Failed to write Python transform: " (or (ex-message e) "Unknown error"))}))))+ "Write Python transforms. EE-only; returns an error in OSS."+ metabase-enterprise.metabot.agent.tools.transforms+ [{:keys [_transform_id]}]+ {:output "Python transform tools are only available in Metabase Enterprise Edition."})diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/user_context.clj b/src/metabase/metabot/agent/user_context.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/agent/user_context.cljrename to src/metabase/metabot/agent/user_context.cljindex dfeeb9c08a1..9aff3c6cfa6 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/agent/user_context.clj+++ b/src/metabase/metabot/agent/user_context.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.agent.user-context+(ns metabase.metabot.agent.user-context"User context enrichment and formatting for agent system messages.Handles formatting of viewing context (what the user is currently looking at),recent views, user time formatting, and SQL dialect extraction from context."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.tmpl :as te]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.tmpl :as te]+ [metabase.metabot.tools.entity-details :as entity-details]+ [metabase.metabot.tools.llm-representations :as llm-rep][metabase.util :as u][metabase.util.log :as log])(:importdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/api.clj b/src/metabase/metabot/api.cljsimilarity index 80%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/api.cljrename to src/metabase/metabot/api.cljindex 1a44474b1a3..4743b02792c 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/api.clj+++ b/src/metabase/metabot/api.clj@@ -1,36 +1,40 @@-(ns metabase-enterprise.metabot-v3.api- "`/api/ee/metabot-v3/` routes"+(ns metabase.metabot.api+ "`/api/metabot/` routes"(:require[clojure.core.async :as a]- [metabase-enterprise.api.routes.common :as ee.api.routes]- [metabase-enterprise.metabot-v3.agent.core :as agent]- [metabase-enterprise.metabot-v3.api.document]- [metabase-enterprise.metabot-v3.api.metabot]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.client.schema :as metabot-v3.client.schema]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context]- [metabase-enterprise.metabot-v3.envelope :as metabot-v3.envelope]- [metabase-enterprise.metabot-v3.feedback :as metabot-v3.feedback]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u]- [metabase-enterprise.slackbot.api][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.api.util.handlers :as handlers][metabase.app-db.core :as app-db][metabase.config.core :as config]+ [metabase.metabot.agent.core :as agent]+ [metabase.metabot.api.describe]+ [metabase.metabot.api.document]+ [metabase.metabot.api.metabot]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.client.schema :as metabot.client.schema]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.envelope :as metabot.envelope]+ [metabase.metabot.feedback :as metabot.feedback]+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.settings :as metabot.settings]+ [metabase.metabot.tools.api]+ [metabase.metabot.util :as metabot.u][metabase.server.streaming-response :as sr]+ [metabase.slackbot.api][metabase.util :as u]- [metabase.util.i18n :refer [deferred-tru]][metabase.util.log :as log][metabase.util.malli.schema :as ms][toucan2.core :as t2])(:import(java.io OutputStream)))+(comment+ metabase.metabot.api.describe/keep-me+ metabase.metabot.tools.api/keep-me)+(set! *warn-on-reflection* true)(defn- store-aiservice-messages!@@ -64,10 +68,10 @@(defn- check-metabot-enabled!"Checks that the Metabot instance identified by `metabot-id` is enabled. Throws a 403 if it's not."[metabot-id]- (if (= metabot-id metabot-v3.config/embedded-metabot-id)- (api/check (metabot-v3.settings/embedded-metabot-enabled?)+ (if (= metabot-id metabot.config/embedded-metabot-id)+ (api/check (metabot.settings/embedded-metabot-enabled?)[403 "Embedded Metabot is not enabled."])- (api/check (metabot-v3.settings/metabot-enabled?)+ (api/check (metabot.settings/metabot-enabled?)[403 "Metabot is not enabled."])))(defn- extract-usage@@ -169,8 +173,8 @@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 [profile-id message context history conversation-id state debug?]}]- (let [enriched-context (metabot-v3.context/create-context context)+ [{:keys [metabot-id profile-id message context history conversation-id state debug?]}]+ (let [enriched-context (metabot.context/create-context context)messages (concat history [message])](sr/streaming-response {:content-type "text/event-stream"} [^OutputStream os canceled-chan](let [parts-atom (atom [])@@ -184,6 +188,7 @@(agent/run-agent-loop(cond-> {:messages messages:state state+ :metabot-id metabot-id:profile-id (keyword profile-id):context enriched-context:tracking-opts {:session-id conversation-id@@ -197,20 +202,21 @@(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]}]- (let [message (metabot-v3.envelope/user-message message)- metabot-id (metabot-v3.config/resolve-dynamic-metabot-id metabot_id)+ (let [message (metabot.envelope/user-message message)+ metabot-id (metabot.config/resolve-dynamic-metabot-id metabot_id)_ (check-metabot-enabled! metabot-id)- profile-id (metabot-v3.config/resolve-dynamic-profile-id profile_id metabot-id)+ 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])- (if (metabot-v3.settings/use-native-agent)+ (if (metabot.settings/use-native-agent);; Use native Clojure agent(do(log/info "Using native Clojure agent" {:profile-id profile-id :debug? debug?})(native-agent-streaming-request- {:profile-id profile-id+ {:metabot-id metabot-id+ :profile-id profile-id:message message:context context:history history@@ -219,10 +225,10 @@:debug? debug?}));; Fallback to Python AI Service- (let [session-id (metabot-v3.client/get-ai-service-token api/*current-user-id* metabot-id)]+ (let [session-id (metabot.client/get-ai-service-token api/*current-user-id* metabot-id)](log/info "Using Python AI Service" {:profile-id profile-id :debug? debug?})- (metabot-v3.client/streaming-request- {:context (metabot-v3.context/create-context context)+ (metabot.client/streaming-request+ {:context (metabot.context/create-context context):metabot-id metabot-id:profile-id profile-id:session-id session-id@@ -232,7 +238,7 @@:state state:debug? debug?:on-complete (fn [lines]- (store-aiservice-messages! conversation_id profile-id (metabot-v3.u/aisdk->messages :assistant lines))+ (store-aiservice-messages! conversation_id profile-id (metabot.u/aisdk->messages :assistant lines)):store-in-db)})))));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to@@ -247,12 +253,12 @@[:profile_id {:optional true} :string][:metabot_id {:optional true} :string][:message ms/NonBlankString]- [:context ::metabot-v3.context/context]+ [:context ::metabot.context/context][:conversation_id ms/UUIDString]- [:history [:maybe ::metabot-v3.client.schema/messages]]+ [:history [:maybe ::metabot.client.schema/messages]][:state :map][:debug {:optional true} [:maybe :boolean]]]]- (metabot-v3.context/log body :llm.log/fe->be)+ (metabot.context/log body :llm.log/fe->be)(streaming-request body));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to@@ -265,7 +271,7 @@_query-paramsfeedback :- :map](try- (api/check-400 (metabot-v3.feedback/submit-to-harbormaster! feedback)+ (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@@ -273,17 +279,13 @@(throw e))))(def ^{:arglists '([request respond raise])} routes- "`/api/ee/metabot-v3` routes."+ "`/api/metabot` routes."(handlers/routes(handlers/route-map-handler- {"/metabot" (ee.api.routes/+require-premium-feature- :metabot-v3 (deferred-tru "MetaBot")- metabase-enterprise.metabot-v3.api.metabot/routes)- "/document" (ee.api.routes/+require-premium-feature- :metabot-v3 (deferred-tru "MetaBot")- metabase-enterprise.metabot-v3.api.document/routes)+ {"/metabot" metabase.metabot.api.metabot/routes+ "/document" metabase.metabot.api.document/routes;; premium check happens in the route so we still ack events to prevent slack retrying- "/slack" metabase-enterprise.slackbot.api/routes})- (ee.api.routes/+require-premium-feature- :metabot-v3 (deferred-tru "MetaBot")- (api.macros/ns-handler *ns* +auth))))+ "/slack" metabase.slackbot.api/routes+ "/tools" (api.macros/ns-handler 'metabase.metabot.tools.api +auth)})+ (api.macros/ns-handler 'metabase.metabot.api.describe +auth)+ (api.macros/ns-handler *ns* +auth)))diff --git a/enterprise/backend/src/metabase_enterprise/llm/api.clj b/src/metabase/metabot/api/describe.cljsimilarity index 79%rename from enterprise/backend/src/metabase_enterprise/llm/api.cljrename to src/metabase/metabot/api/describe.cljindex 495a244ab73..a20b423a2fc 100644--- a/enterprise/backend/src/metabase_enterprise/llm/api.clj+++ b/src/metabase/metabot/api/describe.clj@@ -1,9 +1,10 @@-(ns metabase-enterprise.llm.api+(ns metabase.metabot.api.describe+ "API endpoints for LLM-powered autodescription of cards and dashboards."(:require- [metabase-enterprise.llm.tasks.describe-dashboard :refer [describe-dashboard]]- [metabase-enterprise.llm.tasks.describe-question :refer [describe-question]][metabase.analyze.query-results :as qr][metabase.api.macros :as api.macros]+ [metabase.metabot.tasks.describe-dashboard :refer [describe-dashboard]]+ [metabase.metabot.tasks.describe-question :refer [describe-question]][metabase.parameters.schema :as parameters.schema][metabase.util.malli.schema :as ms]))@@ -11,7 +12,7 @@;; 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 "/card/summarize"+(api.macros/defendpoint :post "/describe/card""Summarize a question."[_route-params_query-params@@ -27,15 +28,13 @@[:collection_position {:optional true} [:maybe ms/PositiveInt]][:result_metadata {:optional true} [:maybe qr/ResultsMetadata]][:cache_ttl {:optional true} [:maybe ms/PositiveInt]]]]- ;; check that we have permissions to run the query that we're trying to save- ;(check-data-permissions-for-query dataset_query){:summary (describe-question body)});; 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 "/dashboard/summarize/:id"+(api.macros/defendpoint :post "/describe/dashboard/:id""Provide a summary of a dashboard."[{:keys [id]} :- [:map[:id ms/PositiveInt]]]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj b/src/metabase/metabot/api/document.cljsimilarity index 87%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.cljrename to src/metabase/metabot/api/document.cljindex 0cb70503c93..b77c1ef2839 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/document.clj+++ b/src/metabase/metabot/api/document.clj@@ -1,14 +1,14 @@-(ns metabase-enterprise.metabot-v3.api.document- "`/api/ee/metabot-v3/document` routes"+(ns metabase.metabot.api.document+ "`/api/metabot/document` routes"(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.agent.core :as metabot-v3.agent]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context]- [metabase-enterprise.metabot-v3.table-utils :as table-utils][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]]+ [metabase.metabot.agent.core :as metabot.agent]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.table-utils :as table-utils][metabase.query-processor.core :as qp][metabase.util.malli.schema :as ms][metabase.warehouses.core :as warehouses]))@@ -16,7 +16,7 @@(set! *warn-on-reflection* true)(defn- fix-sql [fix-request]- (let [response (metabot-v3.client/fix-sql fix-request)+ (let [response (metabot.client/fix-sql fix-request)return-sql (:sql fix-request)](when-let [fixes (:fixes response)](str/join "\n" (reduce@@ -111,9 +111,9 @@(defn- native-generate-content[{:keys [instructions references]}](let [context (assoc- (metabot-v3.context/create-context {:capabilities #{"permission:write_sql_queries"}})+ (metabot.context/create-context {:capabilities #{"permission:write_sql_queries"}}):references references)- parts (into [] (metabot-v3.agent/run-agent-loop+ parts (into [] (metabot.agent/run-agent-loop{:messages [{:role :user:content instructions}]:profile-id :document-generate-content@@ -149,10 +149,10 @@body :- [:map[:instructions ms/NonBlankString][:references {:optional true} ms/Map]]]- (let [response (metabot-v3.client/document-generate-content {:instructions (:instructions body)- :references (:references body)- :user_id api/*current-user-id*- :conversation_id (str (random-uuid))})]+ (let [response (metabot.client/document-generate-content {:instructions (:instructions body)+ :references (:references body)+ :user_id api/*current-user-id*+ :conversation_id (str (random-uuid))})](maybe-fix-native-sql response (:references body))))(api.macros/defendpoint :post "/native-generate-content" :- [:map@@ -174,5 +174,5 @@(native-generate-content body))(def ^{:arglists '([request respond raise])} routes- "`/api/ee/metabot-v3/document` routes."+ "`/api/metabot/document` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/ai_entity_analysis/api.clj b/src/metabase/metabot/api/entity_analysis.cljsimilarity index 83%rename from enterprise/backend/src/metabase_enterprise/ai_entity_analysis/api.cljrename to src/metabase/metabot/api/entity_analysis.cljindex 4cf9eb81266..9301955c233 100644--- a/enterprise/backend/src/metabase_enterprise/ai_entity_analysis/api.clj+++ b/src/metabase/metabot/api/entity_analysis.clj@@ -1,10 +1,9 @@-(ns metabase-enterprise.ai-entity-analysis.api- "`/api/ee/ai-entity-analysis/` routes"+(ns metabase.metabot.api.entity-analysis+ "`/api/ai-entity-analysis/` routes"(:require- [metabase-enterprise.metabot-v3.core :as metabot-v3][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]]- [metabase.premium-features.core :as premium-features]))+ [metabase.metabot.core :as metabot]))(set! *warn-on-reflection* true)@@ -26,14 +25,13 @@[:description {:optional true} [:maybe :string]][:timestamp :string]]]]]]]- (premium-features/assert-has-feature :ai-entity-analysis "chart analysis")(let [chart-data {:image_base64 image_base64:chart {:name name:description description}:timeline_events timeline_events}- resp (metabot-v3/analyze-chart chart-data)]+ resp (metabot/analyze-chart chart-data)]{:summary (:analysis resp)}))(def ^{:arglists '([request respond raise])} routes- "`/api/ee/ai-entity-analysis` routes."+ "`/api/ai-entity-analysis` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.clj b/src/metabase/metabot/api/metabot.cljsimilarity index 90%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.cljrename to src/metabase/metabot/api/metabot.cljindex 0befe07c158..f3e097c7e0f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.clj+++ b/src/metabase/metabot/api/metabot.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.api.metabot- "`/api/ee/metabot-v3/metabot` routes"+(ns metabase.metabot.api.metabot+ "`/api/metabot/metabot` routes"(:require- [metabase-enterprise.metabot-v3.suggested-prompts :as metabot-v3.suggested-prompts]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.app-db.core :as mdb]+ [metabase.metabot.suggested-prompts :as metabot.suggested-prompts]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.premium-features.core :as premium-features][metabase.request.core :as request][metabase.util.i18n :refer [tru]]@@ -55,8 +55,8 @@(let [old-vals (select-keys old-metabot (keys metabot-updates))](when (not= old-vals metabot-updates)(t2/update! :model/Metabot id metabot-updates)- (metabot-v3.suggested-prompts/delete-all-metabot-prompts id)- (metabot-v3.suggested-prompts/generate-sample-prompts id))+ (metabot.suggested-prompts/delete-all-metabot-prompts id)+ (metabot.suggested-prompts/generate-sample-prompts id))(t2/select-one :model/Metabot :id id))));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to@@ -69,8 +69,8 @@(api/check-superuser)(t2/with-transaction [_conn](api/check-404 (t2/exists? :model/Metabot :id id))- (metabot-v3.suggested-prompts/delete-all-metabot-prompts id)- (metabot-v3.suggested-prompts/generate-sample-prompts id))+ (metabot.suggested-prompts/delete-all-metabot-prompts id)+ (metabot.suggested-prompts/generate-sample-prompts id))api/generic-204-no-content);; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest@@ -93,7 +93,7 @@:postgres :random:rand)base-query (cond-> {:join [[{:select [:id :name :type]- :from [[(metabot-v3.tools.u/metabot-metrics-and-models-query id)+ :from [[(metabot.tools.u/metabot-metrics-and-models-query id):scope]]}:card][:and@@ -132,7 +132,7 @@"Delete all prompt suggestions for the metabot instance with `id`."[{:keys [id]} :- [:map [:id pos-int?]]](api/check-superuser)- (metabot-v3.suggested-prompts/delete-all-metabot-prompts id)+ (metabot.suggested-prompts/delete-all-metabot-prompts id)api/generic-204-no-content);; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to@@ -151,5 +151,5 @@api/generic-204-no-content)(def ^{:arglists '([request respond raise])} routes- "`/api/ee/metabot-v3/metabot` routes."+ "`/api/metabot/metabot` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/ai_sql_fixer/api.clj b/src/metabase/metabot/api/sql_fixer.cljsimilarity index 74%rename from enterprise/backend/src/metabase_enterprise/ai_sql_fixer/api.cljrename to src/metabase/metabot/api/sql_fixer.cljindex d4fdc2a5775..ab1b01148e9 100644--- a/enterprise/backend/src/metabase_enterprise/ai_sql_fixer/api.clj+++ b/src/metabase/metabot/api/sql_fixer.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.ai-sql-fixer.api- "`/api/ee/ai-sql-fixer/` routes"+(ns metabase.metabot.api.sql-fixer+ "`/api/ai-sql-fixer/` routes"(:require- [metabase-enterprise.metabot-v3.core :as metabot-v3][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.driver.util :as driver.u][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.core :as metabot][metabase.query-processor.middleware.permissions :as qp.perms][metabase.util.malli.schema :as ms]))@@ -27,12 +27,12 @@(qp.perms/check-current-user-has-adhoc-native-query-perms query)(let [driver (-> query :database driver.u/database->driver)normalized-query (lib-be/normalize-query query)]- (-> (metabot-v3/fix-sql {:sql (lib/raw-native-query normalized-query)- :dialect driver- :error_message error_message- :schema_ddl (metabot-v3/schema-sample normalized-query)})+ (-> (metabot/fix-sql {:sql (lib/raw-native-query normalized-query)+ :dialect driver+ :error_message error_message+ :schema_ddl (metabot/schema-sample normalized-query)})(select-keys [:fixes]))))(def ^{:arglists '([request respond raise])} routes- "`/api/ee/ai-sql-fixer` routes."+ "`/api/ai-sql-fixer` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/ai_sql_generation/api.clj b/src/metabase/metabot/api/sql_generation.cljsimilarity index 69%rename from enterprise/backend/src/metabase_enterprise/ai_sql_generation/api.cljrename to src/metabase/metabot/api/sql_generation.cljindex b26cd410142..21de66487c2 100644--- a/enterprise/backend/src/metabase_enterprise/ai_sql_generation/api.clj+++ b/src/metabase/metabot/api/sql_generation.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.ai-sql-generation.api- "`/api/ee/ai-sql-generation/` routes"+(ns metabase.metabot.api.sql-generation+ "`/api/ai-sql-generation/` routes"(:require- [metabase-enterprise.metabot-v3.core :as metabot-v3][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]][metabase.driver.util :as driver.u]+ [metabase.metabot.core :as metabot][metabase.util.malli.schema :as ms]))(set! *warn-on-reflection* true)@@ -20,11 +20,11 @@{:keys [prompt database_id]} :- [:map[:prompt ms/NonBlankString][:database_id ms/PositiveInt]]]- (-> (metabot-v3/generate-sql {:dialect (driver.u/database->driver database_id)- :instructions prompt- :tables (metabot-v3/database-tables database_id)})+ (-> (metabot/generate-sql {:dialect (driver.u/database->driver database_id)+ :instructions prompt+ :tables (metabot/database-tables database_id)})(select-keys [:generated_sql])))(def ^{:arglists '([request respond raise])} routes- "`/api/ee/ai-sql-generation` routes."+ "`/api/ai-sql-generation` routes."(api.macros/ns-handler *ns* +auth))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/client.clj b/src/metabase/metabot/client.cljsimilarity index 89%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/client.cljrename to src/metabase/metabot/client.cljindex 836feafea29..5925179a917 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/client.clj+++ b/src/metabase/metabot/client.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.client+(ns metabase.metabot.client(:require[buddy.core.hash :as buddy-hash][buddy.sign.jwt :as jwt]@@ -10,11 +10,11 @@[java-time.api :as t][malli.core :as mc][malli.transform :as mtx]- [metabase-enterprise.metabot-v3.client.schema :as metabot-v3.client.schema]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings][metabase.api.common :as api]+ [metabase.metabot.client.schema :as metabot.client.schema]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.settings :as metabot.settings][metabase.premium-features.core :as premium-features][metabase.server.streaming-response :as sr][metabase.system.core :as system]@@ -35,12 +35,12 @@(defn get-ai-service-token"Get the token for the AI service."([]- (get-ai-service-token api/*current-user-id* metabot-v3.config/internal-metabot-id))+ (get-ai-service-token api/*current-user-id* metabot.config/internal-metabot-id))([user-id metabot-id]- (let [secret (buddy-hash/sha256 (metabot-v3.settings/site-uuid-for-metabot-tools))+ (let [secret (buddy-hash/sha256 (metabot.settings/site-uuid-for-metabot-tools))claims {:user user-id- :exp (t/plus (t/instant) (t/seconds (metabot-v3.settings/metabot-ai-service-token-ttl)))+ :exp (t/plus (t/instant) (t/seconds (metabot.settings/metabot-ai-service-token-ttl))):metabot-id metabot-id}](jwt/encrypt claims secret {:alg :dir, :enc :a128cbc-hs256}))))@@ -70,7 +70,7 @@(defn- post! [url options](let [response-metadata (promise)response-status (promise)]- (with-span :info {:name :metabot-v3.client/request+ (with-span :info {:name :metabot.client/request:url url:metadata response-metadata:status response-status}@@ -79,7 +79,7 @@(deliver response-status (some-> <> :status))))))(defn- ai-url [path]- (str (metabot-v3.settings/ai-service-base-url) path))+ (str (metabot.settings/ai-service-base-url) path))(defn- check-response!"Returns response body on success (200 or 202), throws on failure."@@ -92,25 +92,25 @@:response (dissoc response :headers)}))))(defn- metric-selection-endpoint-url []- (str (metabot-v3.settings/ai-service-base-url) "/v1/select-metric"))+ (str (metabot.settings/ai-service-base-url) "/v1/select-metric"))(defn- fix-sql-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/sql/fix"))+ (str (metabot.settings/ai-service-base-url) "/v1/sql/fix"))(defn- generate-sql-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/sql/generate"))+ (str (metabot.settings/ai-service-base-url) "/v1/sql/generate"))(defn- analyze-chart-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/analyze/chart"))+ (str (metabot.settings/ai-service-base-url) "/v1/analyze/chart"))(defn- analyze-dashboard-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/analyze/dashboard"))+ (str (metabot.settings/ai-service-base-url) "/v1/analyze/dashboard"))(defn- example-question-generation-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/example-question-generation/batch"))+ (str (metabot.settings/ai-service-base-url) "/v1/example-question-generation/batch"))(defn- document-generate-content-endpoint []- (str (metabot-v3.settings/ai-service-base-url) "/v1/document/generate-content"))+ (str (metabot.settings/ai-service-base-url) "/v1/document/generate-content"))(defn- quick-closing-body"Some requests come with body wrapped in ContentLengthInputStream, and that will never close the underlying stream.@@ -119,7 +119,7 @@Please use `Connection: close` header when using this function to prevent connection being reused by HttpClient.See: https://github.com/dakrone/clj-http/issues/627- Also: metabase-enterprise.metabot-v3.api-test/closing-connection-test (for 'chunked')"+ Also: metabase.metabot.api-test/closing-connection-test (for 'chunked')"[response](proxy [FilterInputStream] [^InputStream (:body response)](close []@@ -129,7 +129,6 @@"Make a streaming request to the AI service. Returns the HTTP response.Caller is responsible for reading from the response body and closing it."[{:keys [context message history profile-id conversation-id session-id state debug?]}]- (premium-features/assert-has-feature :metabot-v3 "MetaBot")(let [url (ai-url "/v2/agent/stream")body (cond-> {:messages (conj (vec history) message):context context@@ -138,7 +137,7 @@:user_id api/*current-user-id*:state state}debug? (assoc :debug true))- _ (metabot-v3.context/log body :llm.log/be->llm)+ _ (metabot.context/log body :llm.log/be->llm)_ (log/debugf "V2 request to AI Proxy:\n%s" (u/pprint-to-str body))options (cond-> {:headers {"Accept" "text/event-stream""Content-Type" "application/json;charset=UTF-8"@@ -176,8 +175,8 @@[{:keys [on-complete] :as opts}:- [:map[:context :map]- [:message ::metabot-v3.client.schema/message]- [:history ::metabot-v3.client.schema/messages]+ [:message ::metabot.client.schema/message]+ [:history ::metabot.client.schema/messages][:profile-id :string][:conversation-id :string][:session-id :string]@@ -222,8 +221,8 @@[{:keys [on-line on-complete] :as opts}:- [:map[:context :map]- [:message ::metabot-v3.client.schema/message]- [:history ::metabot-v3.client.schema/messages]+ [:message ::metabot.client.schema/message]+ [:history ::metabot.client.schema/messages][:profile-id :string][:conversation-id :string][:session-id :string]@@ -247,7 +246,7 @@(mu/defn select-metric-request"Make a request to AI Service to select a metric."- [metrics :- [:sequential ::metabot-v3.client.schema/metric]+ [metrics :- [:sequential ::metabot.client.schema/metric]query :- :string](try(let [url (metric-selection-endpoint-url)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/client/schema.clj b/src/metabase/metabot/client/schema.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/client/schema.cljrename to src/metabase/metabot/client/schema.cljindex 6cf7707efbd..1e56e693ecd 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/client/schema.clj+++ b/src/metabase/metabot/client/schema.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.client.schema+(ns metabase.metabot.client.schema(:require[metabase.util :as u][metabase.util.malli.registry :as mr]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/config.clj b/src/metabase/metabot/config.cljsimilarity index 91%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/config.cljrename to src/metabase/metabot/config.cljindex 6979e1512fc..433058687e9 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/config.clj+++ b/src/metabase/metabot/config.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.config+(ns metabase.metabot.config(:require[medley.core :as m]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings]+ [metabase.metabot.settings :as metabot.settings][toucan2.core :as t2]))(def internal-metabot-id@@ -46,7 +46,7 @@Precedence: explicit metabot-id > env metabot-id > default (internal)"[metabot-id](or metabot-id- (metabot-v3.settings/metabot-id)+ (metabot.settings/metabot-id)internal-metabot-id))(defn resolve-dynamic-profile-id@@ -56,6 +56,6 @@(resolve-dynamic-profile-id profile-id (resolve-dynamic-metabot-id nil)))([profile-id metabot-id](or profile-id- (metabot-v3.settings/ai-service-profile-id)+ (metabot.settings/ai-service-profile-id)(metabot-id->profile-id metabot-id)"embedding_next")))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj b/src/metabase/metabot/context.cljsimilarity index 90%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/context.cljrename to src/metabase/metabot/context.cljindex 4e3ee8dcf5f..884f6ea473e 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/context.clj+++ b/src/metabase/metabot/context.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.context+(ns metabase.metabot.context(:require[clojure.java.io :as io][medley.core :as m]- [metabase-enterprise.metabot-v3.table-utils :as table-utils][metabase.activity-feed.core :as activity-feed][metabase.api.common :as api][metabase.config.core :as config][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.table-utils :as table-utils][metabase.transforms-base.util :as transforms-base.u][metabase.util.json :as json][metabase.util.log :as log]@@ -28,9 +28,9 @@Examples calls are ;; using doto(doto (request message context history)- (metabot-v3.context/log :llm.log/be->fe))+ (metabot.context/log :llm.log/be->fe));; or just regularly- (metabot-v3.context/log _body :llm.log/fe->be)"+ (metabot.context/log _body :llm.log/fe->be)"[payload direction](when config/is-dev?(let [directions {:llm.log/fe->be "\"FE -----------------> BE\""@@ -48,20 +48,6 @@(mr/def ::context[:map-of :keyword :any])-(mr/def ::capabilities- [:set :string])--(defn backend-metabot-capabilities- "Set of backend capabilities available to the AI service. Those are determined by the endpoints available to- ai-service. When an endpoint would change in a non-backward compatible way, we should create a new version of this- capability."- []- ;; 20 ns per call, safe to keep unmemoized- (for [[[_method url _params] _spec] (-> (the-ns 'metabase-enterprise.metabot-v3.tools.api)- meta- :api/endpoints)]- (str "backend:/api/ee/metabot-tools" url)))-(defn- query-for-sql-parsing"Given an item in context, return the query if it is a native query or SQL transform that can have table usage parsedfrom it, otherwise nil."@@ -202,11 +188,6 @@(assoc context :user_is_viewing annotated-viewing))context))-(defn- add-backend-capabilities- "Add backend capabilities to context, merging with any existing capabilities."- [context]- (update context :capabilities (fnil into #{}) (backend-metabot-capabilities)))-(defn- add-recent-views"Add user's recent views to the context since these have a higher likelihood of being relevant to a user's query.Includes the 5 most recent items across cards, datasets, metrics, dashboards, and tables.@@ -248,6 +229,5 @@(-> contextenhance-context-with-schemaannotate-transform-source-types- add-backend-capabilitiesadd-recent-views(set-user-time opts))))diff --git a/src/metabase/metabot/core.clj b/src/metabase/metabot/core.cljnew file mode 100644index 00000000000..2245653a19a--- /dev/null+++ b/src/metabase/metabot/core.clj@@ -0,0 +1,21 @@+(ns metabase.metabot.core+ "API namespace for the `metabase.metabot` module."+ (:require+ [metabase.metabot.api]+ [metabase.metabot.client]+ [metabase.metabot.table-utils]+ [metabase.metabot.util]+ [potemkin :as p]))++(p/import-vars+ [metabase.metabot.api+ routes]+ [metabase.metabot.client+ analyze-chart+ analyze-dashboard+ fix-sql+ generate-sql]+ [metabase.metabot.table-utils+ database-tables+ used-tables+ schema-sample])diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/envelope.clj b/src/metabase/metabot/envelope.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/envelope.cljrename to src/metabase/metabot/envelope.cljindex 42ad05effb1..252200951c3 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/envelope.clj+++ b/src/metabase/metabot/envelope.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.envelope+(ns metabase.metabot.envelope"(Because 'context' was already taken.)The 'envelope' holds the context for our conversation with the LLM. Specifically, it bundles up the history, and thediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/example_question_generator.clj b/src/metabase/metabot/example_question_generator.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/example_question_generator.cljrename to src/metabase/metabot/example_question_generator.cljindex ba62b71f71d..bbc57d33e85 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/example_question_generator.clj+++ b/src/metabase/metabot/example_question_generator.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.example-question-generator+(ns metabase.metabot.example-question-generator"Native Clojure generator for example questions (prompts) for Metabot.Replaces the Python ai-service `/v1/example-question-generation/batch` endpoint@@ -15,8 +15,8 @@(:require[clojure.java.io :as io][clojure.string :as str]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.self :as self]+ [metabase.metabot.self :as self]+ [metabase.metabot.settings :as metabot.settings][metabase.util.log :as log][selmer.parser :as selmer]))@@ -105,7 +105,7 @@retry logic, error handling, and OTel tracing."[rendered-prompt](self/call-llm-structured- (llm/ee-ai-metabot-provider)+ (metabot.settings/llm-metabot-provider)[{:role "user" :content rendered-prompt}]questions-json-schematemperature@@ -161,7 +161,7 @@(defn generate-example-questions"Generate example questions natively using LLM via OpenRouter.- Accepts the same payload shape as `metabot-v3.client/generate-example-questions`:+ Accepts the same payload shape as `metabot.client/generate-example-questions`:{:tables [{:name ... :fields [...]}]:metrics [{:name ... :queryable-dimensions [...]}]}diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/feedback.clj b/src/metabase/metabot/feedback.cljsimilarity index 94%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/feedback.cljrename to src/metabase/metabot/feedback.cljindex e3aa33a3035..15d7b55b37a 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/feedback.clj+++ b/src/metabase/metabot/feedback.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.feedback+(ns metabase.metabot.feedback"Shared feedback submission to Harbormaster via the Store API."(:require[clj-http.client :as http]diff --git a/src/metabase/metabot/init.clj b/src/metabase/metabot/init.cljnew file mode 100644index 00000000000..779cd86bce0--- /dev/null+++ b/src/metabase/metabot/init.clj@@ -0,0 +1,4 @@+(ns metabase.metabot.init+ (:require+ [metabase.metabot.settings]+ [metabase.metabot.task.suggested-prompts-generator]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot.clj b/src/metabase/metabot/models/metabot.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot.cljrename to src/metabase/metabot/models/metabot.cljindex 460b12e9139..7d2959fd62d 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot.clj+++ b/src/metabase/metabot/models/metabot.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.models.metabot+(ns metabase.metabot.models.metabot(:require[metabase.models.interface :as mi][metabase.models.serialization :as serdes]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_conversation.clj b/src/metabase/metabot/models/metabot_conversation.cljsimilarity index 88%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_conversation.cljrename to src/metabase/metabot/models/metabot_conversation.cljindex 6778a0554b5..dcb2427f98f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_conversation.clj+++ b/src/metabase/metabot/models/metabot_conversation.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.models.metabot-conversation+(ns metabase.metabot.models.metabot-conversation(:require[metabase.models.interface :as mi][methodical.core :as methodical]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_message.clj b/src/metabase/metabot/models/metabot_message.cljsimilarity index 89%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_message.cljrename to src/metabase/metabot/models/metabot_message.cljindex 73adfa244c4..b8d2084a127 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_message.clj+++ b/src/metabase/metabot/models/metabot_message.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.models.metabot-message+(ns metabase.metabot.models.metabot-message(:require[metabase.models.interface :as mi][methodical.core :as methodical]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_prompt.clj b/src/metabase/metabot/models/metabot_prompt.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_prompt.cljrename to src/metabase/metabot/models/metabot_prompt.cljindex 518ab390639..2cdc0c12c99 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/models/metabot_prompt.clj+++ b/src/metabase/metabot/models/metabot_prompt.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.models.metabot-prompt+(ns metabase.metabot.models.metabot-prompt(:require[metabase.models.interface :as mi][metabase.models.serialization :as serdes]diff --git a/enterprise/backend/src/metabase_enterprise/llm/client.clj b/src/metabase/metabot/openai_client.cljsimilarity index 94%rename from enterprise/backend/src/metabase_enterprise/llm/client.cljrename to src/metabase/metabot/openai_client.cljindex 961bb335f65..a7da9a93700 100644--- a/enterprise/backend/src/metabase_enterprise/llm/client.clj+++ b/src/metabase/metabot/openai_client.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.llm.client+(ns metabase.metabot.openai-client"A wrapper around the OpenAI client API.The `create-chat-completion` function combines several useful middlewares to create a client that can be used for AI@@ -19,8 +19,8 @@[OpenAI Client](https://platform.openai.com/docs/libraries) with [Llama API](https://docs.llama-api.com/essentials/chat)."(:require- [metabase-enterprise.llm.settings :as llm-settings][metabase.analytics.core :as analytics]+ [metabase.llm.settings :as llm-settings][metabase.util.json :as json][metabase.util.log :as log][wkok.openai-clojure.api :as openai.api]))@@ -40,8 +40,6 @@(assocusage-summary:event :llm-usage))- ;; TODO -- Remove before final PR/merge- ;(tap> usage-summary)response))([params] (wrap-usage* params nil))))@@ -94,29 +92,29 @@([params] (wrap-openai-exceptions* params nil))))(defn wrap-model-defaults- "Add the EE default model from settings into the request"+ "Add the default model from settings into the request."[openai-fn](fn wrap-model-defaults*([params options](openai-fn(merge- {:model (llm-settings/ee-openai-model)}+ {:model (llm-settings/llm-openai-model)}params)options))([params] (wrap-model-defaults* params nil))))-(defn wrap-ee-auth- "Add the EE API key from settings into the request"+(defn wrap-auth+ "Add the API key from settings into the request."[openai-fn]- (fn wrap-ee-auth*+ (fn wrap-auth*([params options](openai-fnparams(merge- {:api-key (llm-settings/ee-openai-api-key)}+ {:api-key (llm-settings/llm-openai-api-key)}options)))([params]- (wrap-ee-auth* params nil))))+ (wrap-auth* params nil))))(defn wrap-find-result"Return the first choice for which a message is present and has content."@@ -190,7 +188,7 @@bottom up and postprocessing middlewares happen from the top down."[](-> *create-chat-completion-endpoint*- wrap-ee-auth+ wrap-authwrap-model-defaultswrap-openai-exceptionswrap-usagediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/persistence.clj b/src/metabase/metabot/persistence.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/persistence.cljrename to src/metabase/metabot/persistence.cljindex 3dc483f3233..dfe5a211643 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/persistence.clj+++ b/src/metabase/metabot/persistence.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.persistence+(ns metabase.metabot.persistence"Persistence for Metabot conversations and messages."(:require[metabase.api.common :as api]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer.clj b/src/metabase/metabot/query_analyzer.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer.cljrename to src/metabase/metabot/query_analyzer.cljindex b05def9661a..2f74aa3279f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer.clj+++ b/src/metabase/metabot/query_analyzer.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.query-analyzer+(ns metabase.metabot.query-analyzer"Integration with `sql-tools`, which parses native SQL queries. All SQL-specific logic is in `sql-tools,the purpose of this namespace is to:@@ -6,9 +6,9 @@2. Encapsulate Metabase-specific business logic."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.query-analyzer.parameter-substitution :as nqa.sub][metabase.driver :as driver][metabase.driver.util :as driver.u]+ [metabase.metabot.query-analyzer.parameter-substitution :as nqa.sub][metabase.sql-tools.core :as sql-tools][metabase.util :as u][toucan2.core :as t2]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution.clj b/src/metabase/metabot/query_analyzer/parameter_substitution.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution.cljrename to src/metabase/metabot/query_analyzer/parameter_substitution.cljindex 973bd7c5127..50422ca8bee 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution.clj+++ b/src/metabase/metabot/query_analyzer/parameter_substitution.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.query-analyzer.parameter-substitution+(ns metabase.metabot.query-analyzer.parameter-substitution"Replace {{variable}}s and {{field filters}} in SQL queries with parse-able equivalents."(:require[metabase.lib.core :as lib]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/reactions.clj b/src/metabase/metabot/reactions.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/reactions.cljrename to src/metabase/metabot/reactions.cljindex 7c0e91bd70a..a60610eb805 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/reactions.clj+++ b/src/metabase/metabot/reactions.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.reactions+(ns metabase.metabot.reactions"Schemas for various reactions.All reactions must have a `:type` with the namespace `metabot.reaction`, but declaring a schema for it is optional.@@ -53,7 +53,7 @@(defn- update-reaction-schema! [](log/debug "Updating reaction schema")- (mr/register! :metabase-enterprise.metabot-v3.reactions/reaction (reaction-schema)))+ (mr/register! :metabase.metabot.reactions/reaction (reaction-schema)))(update-reaction-schema!)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/repl.clj b/src/metabase/metabot/repl.cljsimilarity index 94%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/repl.cljrename to src/metabase/metabot/repl.cljindex 77d7709dcf9..6c4bc2edc44 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/repl.clj+++ b/src/metabase/metabot/repl.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.repl+(ns metabase.metabot.repl"Basic user message => AI Service => response chat flow. This namespace implements a text-based REPL you can use fromClojure or the CLI with- clj -X:ee:metabot-v3/repl"+ clj -X:metabot/repl"(:require[clojure.core.async :as a][clojure.string :as str]- [metabase-enterprise.metabot-v3.api :as api]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u][metabase.app-db.core :as mdb]+ [metabase.metabot.api :as api]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.util :as metabot.u][metabase.util :as u])(:import(java.io ByteArrayOutputStream)@@ -66,7 +66,7 @@:state state})consume-streaming-responsestr/split-lines- (metabot-v3.u/aisdk->messages "assistant"))]+ (metabot.u/aisdk->messages "assistant"))](run! handle-reaction result)result)))(catch Throwable e@@ -78,7 +78,7 @@(defn user-repl-cli"CLI entrypoint for using the MetaBot REPL.- clj -X:ee:metabot-v3/repl"+ clj -X:metabot/repl"[_options](mdb/setup-db! :create-sample-content? false)#_{:clj-kondo/ignore [:discouraged-var]}@@ -113,7 +113,7 @@:id 43}{:type :adhoc:query test-query}]}- metabot-v3.context/create-context)))+ metabot.context/create-context)))(defn- user-repl-with-context [context](user-repl [] context (str (random-uuid))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self.clj b/src/metabase/metabot/self.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self.cljrename to src/metabase/metabot/self.cljindex 388718f5925..6042b9bffab 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self.clj+++ b/src/metabase/metabot/self.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.self+(ns metabase.metabot.self"LLM client infrastructure using reducible streams.Key design decisions:@@ -11,13 +11,13 @@- figure out what's lacking compared to ai-service"(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.self.claude :as claude]- [metabase-enterprise.metabot-v3.self.core :as core]- [metabase-enterprise.metabot-v3.self.openai :as openai]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter][metabase.analytics.core :as analytics][metabase.analytics.prometheus :as prometheus][metabase.api.common :as api]+ [metabase.metabot.self.claude :as claude]+ [metabase.metabot.self.core :as core]+ [metabase.metabot.self.openai :as openai]+ [metabase.metabot.self.openrouter :as openrouter][metabase.util :as u][metabase.util.log :as log][metabase.util.o11y :refer [with-span]]))@@ -78,11 +78,12 @@Checks for retryable HTTP status codes in ex-data (set by claude-raw/openai-raw)and connection-level failures."[^Exception e]- (or (retryable-status? (:status (ex-data e)))- ;; Connection errors (e.g. under load, connection refused/reset)- (instance? java.net.ConnectException e)- (instance? java.net.SocketTimeoutException e)- (instance? java.io.IOException e)))+ (boolean+ (or (retryable-status? (:status (ex-data e)))+ ;; Connection errors (e.g. under load, connection refused/reset)+ (instance? java.net.ConnectException e)+ (instance? java.net.SocketTimeoutException e)+ (instance? java.io.IOException e))))(defn- parse-retry-after-header"Extract retry-after seconds from response headers in ex-data, if present and ≤ 60s.@@ -245,7 +246,7 @@(log/info "Calling LLM" {:provider provider :model model :parts (count parts) :tools (count tools):tool-choice tool-choice})(let [tracking-opts (assoc tracking-opts :model model)- streaming-opts (cond-> {:model model :input parts :tools (vec tools)}+ streaming-opts (cond-> {:model model :input parts :tools (vals tools)}system-msg (assoc :system system-msg)(and (seq tools)tool-choice) (assoc :tool_choice tool-choice))@@ -258,7 +259,7 @@(stream-fn streaming-opts)))](reify clojure.lang.IReduceInit(reduce [_ rf init]- (with-span :info {:name :metabot-v3.agent/call-llm+ (with-span :info {:name :metabot.agent/call-llm:provider provider:model model:part-count (count parts)@@ -293,7 +294,7 @@:schema json-schema:temperature temperature:max-tokens max-tokens}]- (with-span :info {:name :metabot-v3.agent/call-llm-structured+ (with-span :info {:name :metabot.agent/call-llm-structured:model model:msg-count (count messages)}(with-retriesdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/claude.clj b/src/metabase/metabot/self/claude.cljsimilarity index 92%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/claude.cljrename to src/metabase/metabot/self/claude.cljindex 81773c21be9..5174826eaaf 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/claude.clj+++ b/src/metabase/metabot/self/claude.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.self.claude+(ns metabase.metabot.self.claude(:require[clj-http.client :as http][clojure.string :as str][malli.json-schema :as mjs]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.self.core :as core]- [metabase-enterprise.metabot-v3.self.schema :as schema]+ [metabase.llm.settings :as llm]+ [metabase.metabot.self.core :as core]+ [metabase.metabot.self.schema :as schema][metabase.util :as u][metabase.util.json :as json][metabase.util.malli :as mu]@@ -171,16 +171,16 @@;;; ──────────────────────────────────────────────────────────────────(defn- tool->claude- "Convert a [name, var-or-map] tool entry to Claude API format."- [[tool-name tool]]- (let [{:keys [doc schema] :as tool} (if (map? tool) tool (meta tool))- [_:=> [_:cat params] _out] schema- params (schema/filter-schema-by-features params)- doc (if (str/starts-with? (or doc "") "Inputs: ")- ;; strip that stuff we're appending in mu/defn- (second (str/split doc #"\n\n " 2))- doc)]- {:name (or tool-name (name (:name tool)) "unknown")+ "Convert a tool definition map to Claude API format.+ Accepts a ToolEntry map with :tool-name, :doc, :schema, :fn."+ [{:keys [tool-name doc schema]}]+ (let [[_:=> [_:cat params] _out] schema+ params (schema/filter-schema-by-features params)+ doc (if (str/starts-with? (or doc "") "Inputs: ")+ ;; strip that stuff we're appending in mu/defn+ (second (str/split doc #"\n\n " 2))+ doc)]+ {:name (or tool-name "unknown"):description doc:input_schema (mjs/transform params {:additionalProperties false})}))@@ -188,7 +188,7 @@"Perform a streaming request to Claude API."[{:keys [model system input tools schema tool_choice temperature max-tokens]:or {model "claude-haiku-4-5"}} :- core/LLMRequestOpts]- (when-not (llm/ee-anthropic-api-key)+ (when-not (llm/llm-anthropic-api-key)(throw (ex-info "No Anthropic API key is set" {:api-error true})))(let [messages (parts->claude-messages input)all-tools (when (seq tools) (mapv tool->claude tools))@@ -208,14 +208,14 @@:tools [{:name "structured_output":description "Output structured data":input_schema schema}]))]- (with-span :info {:name :metabot-v3.claude/request+ (with-span :info {:name :metabot.claude/request:model model:msg-count (count input):tool-count (count tools)}(try- (let [res (http/post (str (llm/ee-anthropic-api-base-url) "/v1/messages")+ (let [res (http/post (str (llm/llm-anthropic-api-base-url) "/v1/messages"){:as :stream- :headers {"x-api-key" (llm/ee-anthropic-api-key)+ :headers {"x-api-key" (llm/llm-anthropic-api-key)"anthropic-version" "2023-06-01""content-type" "application/json"}:body (json/encode req)})]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/core.clj b/src/metabase/metabot/self/core.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/core.cljrename to src/metabase/metabot/self/core.cljindex f0702059448..607eb3c4b11 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/core.clj+++ b/src/metabase/metabot/self/core.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.self.core+(ns metabase.metabot.self.core(:require[clojure.java.io :as io][clojure.string :as str]@@ -20,14 +20,12 @@;; format) happens inside each adapter, but the **input contract is identical**.(def ToolEntry- "A tool entry: [name, var] or [name, wrapped-map].- The wrapped-map form comes from `wrap-tools-with-state` and carries- :doc, :schema, :fn, and optionally :decode/:prompt."- [:tuple :string [:or [:fn var?]- [:map- [:doc {:optional true} [:maybe :string]]- [:schema :any]- [:fn [:fn fn?]]]]])+ "A tool definition map with :tool-name, :doc, :schema, :fn, and optionally :decode/:prompt."+ [:map+ [:tool-name :string]+ [:doc {:optional true} [:maybe :string]]+ [:schema :any]+ [:fn [:fn fn?]]])(def LLMRequestOpts"Canonical schema for the opts map passed to every LLM provider adapter.@@ -38,7 +36,7 @@Optional::system - System prompt string:input - Sequence of AISDK parts and user messages- :tools - Sequence of [name, var-or-map] tool entries+ :tools - Sequence of tool definition maps:tool_choice - \"auto\" or \"required\":temperature - Sampling temperature:max-tokens - Maximum tokens in the response@@ -385,18 +383,16 @@args))(defn- tool-decode-fn- "Extract the `:decode` function from a tool (var, wrapped map, or fn with metadata).+ "Extract the `:decode` function from a tool definition map.The decode function transforms tool arguments before the tool runs.Returns `nil` if the tool has no decoder."[tool]- (cond- (map? tool) (:decode tool)- :else (:decode (meta tool))))+ (:decode tool))(defn- tool-call-fn- "Extract the callable function from a tool (var or wrapped map)."+ "Extract the callable function from a tool definition map."[tool]- (if (map? tool) (:fn tool) tool))+ (:fn tool))(defn- run-tool"Execute a tool and return output chunks. Handles errors gracefully.@@ -407,7 +403,7 @@Chunks have a ::duration-ms key added for internal use which is not part of the aisdk spec."[tool-call-id tool-name tool chunks]- (with-span :info {:name :metabot-v3.agent/run-tool+ (with-span :info {:name :metabot.agent/run-tool:tool-name tool-name:tool-call-id tool-call-id}(let [start-ms (u/start-timer)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/features.clj b/src/metabase/metabot/self/features.cljsimilarity index 93%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/features.cljrename to src/metabase/metabot/self/features.cljindex 0cc456cf9f4..b5a48a21ceb 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/features.clj+++ b/src/metabase/metabot/self/features.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.self.features+(ns metabase.metabot.self.features"Feature registry for conditional schema properties.Maps feature keywords to predicate functions that determine availabilitydiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/openai.clj b/src/metabase/metabot/self/openai.cljsimilarity index 91%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/openai.cljrename to src/metabase/metabot/self/openai.cljindex 276c1e05d53..9b40e624c55 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/openai.clj+++ b/src/metabase/metabot/self/openai.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.self.openai+(ns metabase.metabot.self.openai(:require[clj-http.client :as http][clojure.string :as str][malli.json-schema :as mjs]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.self.core :as core]- [metabase-enterprise.metabot-v3.self.schema :as schema]+ [metabase.llm.settings :as llm]+ [metabase.metabot.self.core :as core]+ [metabase.metabot.self.schema :as schema][metabase.util :as u][metabase.util.json :as json][metabase.util.malli :as mu]))@@ -143,17 +143,17 @@;;; Tool definition format(defn- tool->openai- "Convert a tool to OpenAI Responses API format."- [[tool-name tool]]- (let [{:keys [doc schema] :as tool} (if (map? tool) tool (meta tool))- [_:=> [_:cat params] _out] schema- params (schema/filter-schema-by-features params)- doc (if (str/starts-with? doc "Inputs: ")- ;; strip that stuff we're appending in mu/defn- (second (str/split doc #"\n\n " 2))- doc)]+ "Convert a tool definition map to OpenAI Responses API format.+ Accepts a ToolEntry map with :tool-name, :doc, :schema, :fn."+ [{:keys [tool-name doc schema]}]+ (let [[_:=> [_:cat params] _out] schema+ params (schema/filter-schema-by-features params)+ doc (if (str/starts-with? (or doc "") "Inputs: ")+ ;; strip that stuff we're appending in mu/defn+ (second (str/split doc #"\n\n " 2))+ doc)]{:type "function"- :name (or tool-name (name (:name tool)))+ :name tool-name:description doc:parameters (mjs/transform params {:additionalProperties false})}))@@ -161,7 +161,7 @@"Perform a streaming request to OpenAI Responses API."[{:keys [model system input tools schema tool_choice temperature max-tokens]:or {model "gpt-4.1-mini"}} :- core/LLMRequestOpts]- (when-not (llm/ee-openai-api-key)+ (when-not (llm/llm-openai-api-key)(throw (ex-info "No OpenAI API key is set" {:api-error true})))(let [all-tools (or (when schema;; Structured output: force a tool call with the given JSON schema@@ -183,9 +183,9 @@temperature (assoc :temperature temperature)max-tokens (assoc :max_tokens max-tokens))](try- (let [res (http/post (str (llm/ee-openai-api-base-url) "/v1/responses")+ (let [res (http/post (str (llm/llm-openai-api-base-url) "/v1/responses"){:as :stream- :headers {"Authorization" (str "Bearer " (llm/ee-openai-api-key))+ :headers {"Authorization" (str "Bearer " (llm/llm-openai-api-key))"Content-Type" "application/json"}:body (json/encode req)})](core/sse-reducible (:body res)))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/openrouter.clj b/src/metabase/metabot/self/openrouter.cljsimilarity index 93%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/openrouter.cljrename to src/metabase/metabot/self/openrouter.cljindex d92f20cf5f2..8b7ee65b16d 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/openrouter.clj+++ b/src/metabase/metabot/self/openrouter.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.self.openrouter+(ns metabase.metabot.self.openrouter"OpenRouter / Chat Completions adapter.OpenRouter exposes an OpenAI-compatible Chat Completions API (`/v1/chat/completions`)@@ -11,9 +11,9 @@[clj-http.client :as http][clojure.string :as str][malli.json-schema :as mjs]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.self.core :as core]- [metabase-enterprise.metabot-v3.self.schema :as schema]+ [metabase.llm.settings :as llm]+ [metabase.metabot.self.core :as core]+ [metabase.metabot.self.schema :as schema][metabase.util :as u][metabase.util.json :as json][metabase.util.log :as log]@@ -78,22 +78,16 @@;;; Tool definition format(defn- tool->openai-chat- "Convert a tool (name + var/map pair) to Chat Completions tool format.-- Accepts [name, var] or [name, {:doc :schema :fn}] pairs — the same format- that the agent loop provides."- [[tool-name tool]]- (let [{:keys [doc schema]} (if (map? tool) tool (meta tool))- [_:=> [_:cat params] _out] schema+ "Convert a tool definition map to Chat Completions tool format.+ Accepts a ToolEntry map with :tool-name, :doc, :schema, :fn."+ [{:keys [tool-name doc schema]}]+ (let [[_:=> [_:cat params] _out] schemaparams (schema/filter-schema-by-features params)doc (if (str/starts-with? (or doc "") "Inputs: ")(second (str/split doc #"\n\n " 2))- doc)- final-name (or tool-name- (when (var? tool) (name (:name (meta tool))))- "unknown")]+ doc)]{:type "function"- :function {:name final-name+ :function {:name tool-name:description doc:parameters (mjs/transform params {:additionalProperties false})}}))@@ -222,7 +216,7 @@`/v1/chat/completions` (e.g. vLLM, Ollama, Together, etc.)."[{:keys [model system input tools temperature max-tokens tool_choice schema]:or {model "anthropic/claude-haiku-4-5"}} :- core/LLMRequestOpts]- (when-not (llm/ee-openrouter-api-key)+ (when-not (llm/llm-openrouter-api-key)(throw (ex-info "No OpenRouter API key is set" {:api-error true})))(let [messages (cond-> (parts->cc-messages input)system (as-> msgs (into [{:role "system" :content system}] msgs)))@@ -245,14 +239,14 @@temperature (assoc :temperature temperature)max-tokens (assoc :max_tokens max-tokens))](log/debug "OpenRouter request" {:model model :msg-count (count messages) :tools (count (or tools []))})- (with-span :info {:name :metabot-v3.openrouter/request+ (with-span :info {:name :metabot.openrouter/request:model model:msg-count (count messages):tool-count (count (or tools []))}(try- (let [res (http/post (str (llm/ee-openrouter-api-base-url) "/v1/chat/completions")+ (let [res (http/post (str (llm/llm-openrouter-api-base-url) "/v1/chat/completions"){:as :stream- :headers {"Authorization" (str "Bearer " (llm/ee-openrouter-api-key))+ :headers {"Authorization" (str "Bearer " (llm/llm-openrouter-api-key))"Content-Type" "application/json""HTTP-Referer" "https://metabase.com""X-Title" "Metabase"}diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/schema.clj b/src/metabase/metabot/self/schema.cljsimilarity index 92%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/self/schema.cljrename to src/metabase/metabot/self/schema.cljindex 93a7e879cc1..e3823045587 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/self/schema.clj+++ b/src/metabase/metabot/self/schema.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.self.schema+(ns metabase.metabot.self.schema"Schema filtering for feature-gated properties.Walks Malli schemas and removes map entries whose `:feature` propertyindicates a feature that is not available in the current context."(:require[malli.core :as mc]- [metabase-enterprise.metabot-v3.self.features :as features]))+ [metabase.metabot.self.features :as features]))(defn- filter-map-entries"Filter map schema entries, keeping only those whose :feature is available.diff --git a/src/metabase/metabot/settings.clj b/src/metabase/metabot/settings.cljnew file mode 100644index 00000000000..e58f49d6ba3--- /dev/null+++ b/src/metabase/metabot/settings.clj@@ -0,0 +1,138 @@+(ns metabase.metabot.settings+ (:require+ [clojure.string :as str]+ [metabase.settings.core :as setting :refer [defsetting]]+ [metabase.util.i18n :refer [deferred-tru tru]]))++;; TODO: these three settings support the external AI service, which is being removed.+;; Remove these (and the functions in metabase.metabot.client that use them) once+;; all code paths use the native Clojure agent.++(defsetting ai-service-base-url+ (deferred-tru "URL for the AI Service")+ :type :string+ :encryption :no+ :default "http://localhost:8000"+ :visibility :internal+ :export? false+ :doc false)++(defsetting site-uuid-for-metabot-tools+ "UUID that we use for encrypting JWT tokens given to the AI service to make callbacks with."+ :encryption :when-encryption-key-set+ :visibility :internal+ :sensitive? true+ :doc false+ :export? false+ :base setting/uuid-nonce-base)++(defsetting metabot-ai-service-token-ttl+ (deferred-tru "The number of seconds the tokens passed to AI service should be valid.")+ :type :integer+ :visibility :settings-manager+ :default 180+ :doc false+ :export? true+ :audit :never)++(defsetting metabot-id+ (deferred-tru "Override Metabot ID for agent streaming requests.")+ :type :string+ :visibility :internal+ :encryption :no+ :export? false+ :doc false)++(defsetting ai-service-profile-id+ (deferred-tru "Override Metabot profile ID for agent streaming requests.")+ :type :string+ :visibility :internal+ :encryption :no+ :export? false+ :doc false)++(defsetting metabot-enabled?+ (deferred-tru "Whether Metabot is enabled for regular usage.")+ :type :boolean+ :visibility :public+ :default true+ :export? true+ :doc false)++(defsetting embedded-metabot-enabled?+ (deferred-tru "Whether Metabot is enabled for embedding.")+ :type :boolean+ :visibility :public+ :default true+ :export? true+ :doc false)++(defsetting use-native-agent+ (deferred-tru "Enable native Clojure agent instead of external Python AI Service.")+ :type :boolean+ :default true+ :visibility :internal+ :export? false+ :doc false)++;;; ------------------------------------------------- LLM Provider ------------------------------------------------++(def ^:private supported-metabot-providers+ "Set of supported LLM provider prefixes for the `llm-metabot-provider` setting."+ #{"anthropic" "openai" "openrouter"})++(defn- validate-metabot-provider!+ "Validate that `value` has the format `provider/model` with a supported provider prefix.+ Throws an exception with `:status-code 400` on invalid input."+ [value]+ (when-not (string? value)+ (throw (ex-info (tru "Metabot provider must be a string, got: {0}" (pr-str value))+ {:status-code 400})))+ (let [[provider model] (str/split value #"/" 2)]+ (when-not (contains? supported-metabot-providers provider)+ (throw (ex-info (tru "Unknown provider {0}. Supported providers: {1}"+ (pr-str provider) (str/join ", " (sort supported-metabot-providers)))+ {:status-code 400+ :provider provider+ :supported supported-metabot-providers})))+ (when (str/blank? model)+ (throw (ex-info (tru "Model name is required. Expected format: provider/model, e.g. \"anthropic/claude-haiku-4-5\"")+ {:status-code 400+ :value value})))))++(defsetting llm-metabot-provider+ (deferred-tru "The AI provider and model for Metabot. Format: provider/model-name, e.g. `anthropic/claude-haiku-4-5`, `openai/gpt-4.1-mini`, `openrouter/anthropic/claude-haiku-4-5`.")+ :type :string+ :encryption :no+ :default "openrouter/anthropic/claude-haiku-4-5"+ :visibility :settings-manager+ :export? false+ :deprecated-name :ee-ai-metabot-provider+ :doc false+ :setter (fn [new-value]+ (when new-value+ (validate-metabot-provider! new-value))+ (setting/set-value-of-type! :string :llm-metabot-provider new-value)))++(defsetting llm-metabot-provider-lite+ (deferred-tru "The AI provider and model for lightweight Metabot tasks (e.g. user intent classification).")+ :type :string+ :encryption :no+ :default "openrouter/openai/gpt-oss-20b"+ :visibility :settings-manager+ :export? false+ :deprecated-name :ee-ai-metabot-provider-lite+ :doc false+ :setter (fn [new-value]+ (when new-value+ (validate-metabot-provider! new-value))+ (setting/set-value-of-type! :string :llm-metabot-provider-lite new-value)))++(defsetting llm-metabot-internal-tasks-enabled?+ (deferred-tru "Controls whether Metabot performs internal tasks that might require background tasks or additional LLM calls (e.g. user intent classification).")+ :type :boolean+ :visibility :settings-manager+ :default true+ :export? false+ :deprecated-name :ee-ai-metabot-internal-tasks-enabled?+ :doc false)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/categorical.clj b/src/metabase/metabot/stats/categorical.cljsimilarity index 91%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/categorical.cljrename to src/metabase/metabot/stats/categorical.cljindex 2494e2cba5b..1167e21863a 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/categorical.clj+++ b/src/metabase/metabot/stats/categorical.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.stats.categorical+(ns metabase.metabot.stats.categorical"Categorical chart statistics."(:require- [metabase-enterprise.metabot-v3.stats.outliers :as outliers]- [metabase-enterprise.metabot-v3.stats.types :as stats.types]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]+ [metabase.metabot.stats.outliers :as outliers]+ [metabase.metabot.stats.types :as stats.types]+ [metabase.metabot.stats.util :as stats.u][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/core.clj b/src/metabase/metabot/stats/core.cljsimilarity index 94%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/core.cljrename to src/metabase/metabot/stats/core.cljindex 796249629c9..0360f02c2d7 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/core.clj+++ b/src/metabase/metabot/stats/core.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.stats.core+(ns metabase.metabot.stats.core"Chart type detection and statistics routing."(:require- [metabase-enterprise.metabot-v3.stats.categorical :as categorical]- [metabase-enterprise.metabot-v3.stats.histogram :as histogram]- [metabase-enterprise.metabot-v3.stats.scatter :as scatter]- [metabase-enterprise.metabot-v3.stats.time-series :as time-series]- [metabase-enterprise.metabot-v3.stats.types :as stats.types]+ [metabase.metabot.stats.categorical :as categorical]+ [metabase.metabot.stats.histogram :as histogram]+ [metabase.metabot.stats.scatter :as scatter]+ [metabase.metabot.stats.time-series :as time-series]+ [metabase.metabot.stats.types :as stats.types][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/histogram.clj b/src/metabase/metabot/stats/histogram.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/histogram.cljrename to src/metabase/metabot/stats/histogram.cljindex 9241d1f1f0c..6b1e42ceb2f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/histogram.clj+++ b/src/metabase/metabot/stats/histogram.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.histogram+(ns metabase.metabot.stats.histogram"Histogram chart statistics."(:require- [metabase-enterprise.metabot-v3.stats.types :as stats.types]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]+ [metabase.metabot.stats.types :as stats.types]+ [metabase.metabot.stats.util :as stats.u][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/outliers.clj b/src/metabase/metabot/stats/outliers.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/outliers.cljrename to src/metabase/metabot/stats/outliers.cljindex deefc36ec7b..8953f677dc8 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/outliers.clj+++ b/src/metabase/metabot/stats/outliers.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.stats.outliers+(ns metabase.metabot.stats.outliers"Modified Z-score based outlier detection for chart analysis.Uses the Modified Z-score method which is more robust than standard Z-scoresbecause it uses median and MAD (Median Absolute Deviation) instead of meanand standard deviation, making it resistant to outliers in the calculation itself."(:require- [metabase-enterprise.metabot-v3.stats.types :as stats.types]+ [metabase.metabot.stats.types :as stats.types][metabase.util.malli :as mu][tech.v3.datatype.argops :as argops][tech.v3.datatype.functional :as dfn]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/repr.clj b/src/metabase/metabot/stats/repr.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/repr.cljrename to src/metabase/metabot/stats/repr.cljindex 603674cfa5e..6c8d0f64d63 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/repr.clj+++ b/src/metabase/metabot/stats/repr.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.repr+(ns metabase.metabot.stats.repr"LLM-friendly text representation generator for chart statistics."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.stats.types :as stats.types]+ [metabase.metabot.stats.types :as stats.types][metabase.util.malli :as mu])(:import(java.time LocalDate LocalDateTime ZonedDateTime)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/scatter.clj b/src/metabase/metabot/stats/scatter.cljsimilarity index 92%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/scatter.cljrename to src/metabase/metabot/stats/scatter.cljindex 29bf8158254..0acff627274 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/scatter.clj+++ b/src/metabase/metabot/stats/scatter.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.stats.scatter+(ns metabase.metabot.stats.scatter"Scatter plot statistics."(:require- [metabase-enterprise.metabot-v3.stats.outliers :as outliers]- [metabase-enterprise.metabot-v3.stats.types :as stats.types]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]+ [metabase.metabot.stats.outliers :as outliers]+ [metabase.metabot.stats.types :as stats.types]+ [metabase.metabot.stats.util :as stats.u][metabase.util.malli :as mu][tech.v3.datatype.functional :as dfn]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/time_series.clj b/src/metabase/metabot/stats/time_series.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/time_series.cljrename to src/metabase/metabot/stats/time_series.cljindex 18f54f491b0..b0906e9ab37 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/time_series.clj+++ b/src/metabase/metabot/stats/time_series.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.stats.time-series+(ns metabase.metabot.stats.time-series"Time series statistics computation for chart analysis.Provides both basic stats (always computed) and deep stats (optional):- Basic: summary, time range, trend, cumulative detection, outliers- Deep: volatility, patterns, significant changes, correlations"(:require- [metabase-enterprise.metabot-v3.stats.outliers :as outliers]- [metabase-enterprise.metabot-v3.stats.types :as stats.types]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]+ [metabase.metabot.stats.outliers :as outliers]+ [metabase.metabot.stats.types :as stats.types]+ [metabase.metabot.stats.util :as stats.u][metabase.util.malli :as mu][tech.v3.datatype.functional :as dfn]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/types.clj b/src/metabase/metabot/stats/types.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/types.cljrename to src/metabase/metabot/stats/types.cljindex cf17359e72d..13b7f88779e 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/types.clj+++ b/src/metabase/metabot/stats/types.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.stats.types+(ns metabase.metabot.stats.types"Malli schemas for chart statistics computation."(:require[metabase.util.malli.registry :as mr]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/util.clj b/src/metabase/metabot/stats/util.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/stats/util.cljrename to src/metabase/metabot/stats/util.cljindex bef279d6a5a..41d22601820 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/stats/util.clj+++ b/src/metabase/metabot/stats/util.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.stats.util+(ns metabase.metabot.stats.util"Shared utilities used across various stats chart types."(:require- [metabase-enterprise.metabot-v3.stats.types :as stats.types]+ [metabase.metabot.stats.types :as stats.types][metabase.util.malli :as mu][tech.v3.datatype.functional :as dfn]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.clj b/src/metabase/metabot/suggested_prompts.cljsimilarity index 82%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.cljrename to src/metabase/metabot/suggested_prompts.cljindex 4376fe9de56..2cf24cca0fc 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.clj+++ b/src/metabase/metabot/suggested_prompts.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.suggested-prompts+(ns metabase.metabot.suggested-prompts(:require[medley.core :as m]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.example-question-generator :as native-generator]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings]- [metabase-enterprise.metabot-v3.tools.entity-details :as metabot-v3.tools.entity-details]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.lib-be.core :as lib-be]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.example-question-generator :as native-generator]+ [metabase.metabot.settings :as metabot.settings]+ [metabase.metabot.tools.entity-details :as metabot.tools.entity-details]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.util.log :as log][toucan2.core :as t2]))@@ -43,7 +43,7 @@On native failure, falls back to the Python ai-service and logs the error.When `use-native-agent` is false, calls the Python ai-service directly."[payload]- (if (metabot-v3.settings/use-native-agent)+ (if (metabot.settings/use-native-agent)(try(log/info "Using native generator for example questions"{:table-count (count (:tables payload))@@ -57,15 +57,15 @@(log/error e "Native example question generation failed, falling back to Python ai-service"{:error-class (.getName (class e)):error-msg (ex-message e)})- (metabot-v3.client/generate-example-questions payload)))- (metabot-v3.client/generate-example-questions payload)))+ (metabot.client/generate-example-questions payload)))+ (metabot.client/generate-example-questions payload)))(defn generate-sample-prompts"Generate suggested prompts for instance of Metabot."[metabot-id & {:as opts}](let [opts (merge default-opts opts)](lib-be/with-metadata-provider-cache- (let [{metrics :metric models :model} (->> (metabot-v3.tools.u/get-metrics-and-models metabot-id opts)+ (let [{metrics :metric models :model} (->> (metabot.tools.u/get-metrics-and-models metabot-id opts)(sort-by :view_count >)(group-by :type));; Limit to 5 metrics and 5 models@@ -73,7 +73,7 @@{metrics :metric, models :model}(->> (for [[[card-type database-id] group-cards] (group-by (juxt :type :database_id) limited-cards)detail (map (fn [detail card] (assoc detail ::origin card))- (metabot-v3.tools.entity-details/cards-details card-type database-id group-cards nil)+ (metabot.tools.entity-details/cards-details card-type database-id group-cards nil)group-cards)]detail)(group-by :type))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj b/src/metabase/metabot/table_utils.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.cljrename to src/metabase/metabot/table_utils.cljindex e07ef525568..979610d9f0f 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/table_utils.clj+++ b/src/metabase/metabot/table_utils.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.table-utils+(ns metabase.metabot.table-utils"Shared table utilities for enterprise modules."(:require[clojure.set :as set]- [metabase-enterprise.metabot-v3.query-analyzer :as query-analyzer]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.query-analyzer :as query-analyzer]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.models.interface :as mi][metabase.util :as u][metabase.util.humanization :as u.humanization]@@ -112,8 +112,8 @@(mapv (fn [{:keys [id name schema description]}](let [table-query (lib/query mp (lib.metadata/table mp id))cols (->> (lib/visible-columns table-query)- (map #(metabot-v3.tools.u/add-table-reference table-query %)))- field-id-prefix (metabot-v3.tools.u/table-field-id-prefix id)]+ (map #(metabot.tools.u/add-table-reference table-query %)))+ field-id-prefix (metabot.tools.u/table-field-id-prefix id)]{:id id:type :table:name name@@ -122,7 +122,7 @@:database_engine engine:database_schema schema:description description- :fields (into [] (map-indexed #(metabot-v3.tools.u/->result-column table-query %2 %1 field-id-prefix) cols))+ :fields (into [] (map-indexed #(metabot.tools.u/->result-column table-query %2 %1 field-id-prefix) cols)):metrics []}))all-tables))))))diff --git a/src/metabase/metabot/task/suggested_prompts_generator.clj b/src/metabase/metabot/task/suggested_prompts_generator.cljnew file mode 100644index 00000000000..e9b6358577a--- /dev/null+++ b/src/metabase/metabot/task/suggested_prompts_generator.clj@@ -0,0 +1,54 @@+(ns metabase.metabot.task.suggested-prompts-generator+ "Job to execute on start of an instance"+ (:require+ [clojurewerkz.quartzite.jobs :as jobs]+ [clojurewerkz.quartzite.triggers :as triggers]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.suggested-prompts :as metabot.suggested-prompts]+ [metabase.request.core :as request]+ [metabase.task.core :as task]+ [metabase.util.log :as log]+ [toucan2.core :as t2])+ (:import+ (java.time Instant)+ (java.util Date)+ (org.quartz DisallowConcurrentExecution)))++(set! *warn-on-reflection* true)++(def ^:private generator-job-key (jobs/key "metabase.task.metabot.suggested-prompts-generator.job"))+(def ^:private generator-trigger-key (triggers/key "metabase.task.metabot.suggested-prompts-generator.trigger"))++(defn- maybe-generate-suggested-prompts! []+ (try+ ;; Run as admin since this is a system task generating prompts for all content in scope.+ ;; Users will only see prompts for content they have access to (filtered at query time).+ (request/as-admin+ (let [metabot-eid (get-in metabot.config/metabot-config+ [metabot.config/internal-metabot-id :entity-id])+ metabot-id (t2/select-one-pk :model/Metabot :entity_id metabot-eid)+ suggested-prompts-cnt (t2/count :model/MetabotPrompt :metabot_id metabot-id)]+ (if (zero? suggested-prompts-cnt)+ (do+ (log/info "No suggested prompts found. Generating suggested prompts.")+ (metabot.suggested-prompts/generate-sample-prompts metabot-id)+ (log/info "Suggested prompts generated successfully."))+ (log/info "Suggested prompts are present. Not generating."))))+ (catch Exception e+ (log/errorf "Suggested prompts generation failed: %s" (.getMessage e)))))++(task/defjob ^{DisallowConcurrentExecution true+ :doc "Initial _suggested prompts_ generation for internal Metabot."}+ SuggestedPromptsGenerator [_ctx]+ (maybe-generate-suggested-prompts!))++(defmethod task/init! ::SuggestedPromptsGenerator+ [_]+ (let [job (jobs/build+ (jobs/of-type SuggestedPromptsGenerator)+ (jobs/with-identity generator-job-key))+ trigger (triggers/build+ (triggers/with-identity generator-trigger-key)+ ;; Start the job a moment after startup.+ (triggers/start-at (Date/from (.plusSeconds (Instant/now) 10))))]+ (task/schedule-task! job trigger)))diff --git a/enterprise/backend/src/metabase_enterprise/llm/tasks/describe_dashboard.clj b/src/metabase/metabot/tasks/describe_dashboard.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/llm/tasks/describe_dashboard.cljrename to src/metabase/metabot/tasks/describe_dashboard.cljindex e994958ff74..415f43ade2b 100644--- a/enterprise/backend/src/metabase_enterprise/llm/tasks/describe_dashboard.clj+++ b/src/metabase/metabot/tasks/describe_dashboard.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.llm.tasks.describe-dashboard+(ns metabase.metabot.tasks.describe-dashboard"LLM task(s) for generating dashboard descriptions"(:require[clojure.set :refer [rename-keys]][clojure.walk :as walk]- [metabase-enterprise.llm.client :as llm-client]+ [metabase.metabot.openai-client :as openai-client][metabase.util :as u][metabase.util.json :as json][toucan2.core :as t2]))@@ -61,8 +61,8 @@:keywords "%%FILL_THESE_KEYWORDS_IN%%":questions "%%FILL_THESE_QUESTIONS_IN%%"})json-str (json/encode summary-with-prompts)- client (-> (llm-client/create-chat-completion)- (llm-client/wrap-parse-json+ client (-> (openai-client/create-chat-completion)+ (openai-client/wrap-parse-json(fn [{:keys [description keywords questions]}]{:description (format "Keywords: %s\n\nDescription: %s\n\nQuestions:\n%s"keywordsdiff --git a/enterprise/backend/src/metabase_enterprise/llm/tasks/describe_question.clj b/src/metabase/metabot/tasks/describe_question.cljsimilarity index 93%rename from enterprise/backend/src/metabase_enterprise/llm/tasks/describe_question.cljrename to src/metabase/metabot/tasks/describe_question.cljindex ff56c788d65..8305e83825c 100644--- a/enterprise/backend/src/metabase_enterprise/llm/tasks/describe_question.clj+++ b/src/metabase/metabot/tasks/describe_question.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.llm.tasks.describe-question+(ns metabase.metabot.tasks.describe-question"LLM task(s) for generating question descriptions"(:require[clojure.set :refer [rename-keys]]- [metabase-enterprise.llm.client :as llm-client]+ [metabase.metabot.openai-client :as openai-client][metabase.query-processor.compile :as qp.compile][metabase.util :as u][metabase.util.json :as json]))@@ -31,8 +31,8 @@{:friendly_title "%%FILL_THIS_TITLE_IN%%":friendly_summary "%%FILL_THIS_SUMMARY_IN%%"})json-str (json/encode summary-with-prompts)- client (-> (llm-client/create-chat-completion)- (llm-client/wrap-parse-json+ client (-> (openai-client/create-chat-completion)+ (openai-client/wrap-parse-json(fn [rsp] (rename-keys rsp {:friendly_title :title:friendly_summary :description}))))](clientdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tmpl.clj b/src/metabase/metabot/tmpl.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tmpl.cljrename to src/metabase/metabot/tmpl.cljindex a1b77b89c9e..57623091eaa 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tmpl.clj+++ b/src/metabase/metabot/tmpl.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tmpl+(ns metabase.metabot.tmpl"Simple bag of functions for templating markdown-like strings"(:require[clojure.string :as str]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/api.clj b/src/metabase/metabot/tools/api.cljsimilarity index 68%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/api.cljrename to src/metabase/metabot/tools/api.cljindex 6350820614a..c101408adef 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/api.clj+++ b/src/metabase/metabot/tools/api.clj@@ -1,50 +1,29 @@-(ns metabase-enterprise.metabot-v3.tools.api- "Code for handling tool requests from the AI service."+(ns metabase.metabot.tools.api+ "Tool definitions for the Metabot agent."(:require- [buddy.core.hash :as buddy-hash]- [buddy.sign.jwt :as jwt][clojure.set :as set]- [metabase-enterprise.metabot-v3.reactions]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings]- [metabase-enterprise.metabot-v3.table-utils :as table-utils]- [metabase-enterprise.metabot-v3.tools.create-alert- :as metabot-v3.tools.create-alert]- [metabase-enterprise.metabot-v3.tools.create-dashboard-subscription- :as metabot-v3.tools.create-dashboard-subscription]- [metabase-enterprise.metabot-v3.tools.deftool :refer [deftool]]- [metabase-enterprise.metabot-v3.tools.dependencies :as metabot-v3.tools.dependencies]- [metabase-enterprise.metabot-v3.tools.entity-details :as metabot-v3.tools.entity-details]- [metabase-enterprise.metabot-v3.tools.field-stats :as metabot-v3.tools.field-stats]- [metabase-enterprise.metabot-v3.tools.filters :as metabot-v3.tools.filters]- [metabase-enterprise.metabot-v3.tools.generate-insights :as metabot-v3.tools.generate-insights]- [metabase-enterprise.metabot-v3.tools.search :as metabot-v3.tools.search]- [metabase-enterprise.metabot-v3.tools.snippets :as metabot-v3.tools.snippets]- [metabase-enterprise.metabot-v3.tools.transforms :as metabot-v3.tools.transforms]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u]- [metabase.api.macros :as api.macros]- [metabase.api.response :as api.response]- [metabase.api.routes.common :as api.routes.common];; TODO (Cam 10/10/25) -- update MetaBot to use Lib + MBQL 5^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.schema :as mbql.s][metabase.lib.schema.temporal-bucketing :as lib.schema.temporal-bucketing]- [metabase.request.core :as request]+ [metabase.metabot.reactions]+ [metabase.metabot.table-utils :as table-utils]+ [metabase.metabot.tools.create-alert :as metabot.tools.create-alert]+ [metabase.metabot.tools.create-dashboard-subscription :as metabot.tools.create-dashboard-subscription]+ [metabase.metabot.tools.deftool :refer [deftool]]+ [metabase.metabot.tools.entity-details :as metabot.tools.entity-details]+ [metabase.metabot.tools.field-stats :as metabot.tools.field-stats]+ [metabase.metabot.tools.filters :as metabot.tools.filters]+ [metabase.metabot.tools.generate-insights :as metabot.tools.generate-insights]+ [metabase.metabot.tools.search :as metabot.tools.search]+ [metabase.metabot.tools.snippets :as metabot.tools.snippets]+ [metabase.metabot.util :as metabot.u][metabase.util :as u]- [metabase.util.log :as log][metabase.util.malli.registry :as mr][metabase.util.malli.schema :as ms]))-(defn- decode-ai-service-token- [token]- (try- (when (string? token)- (jwt/decrypt token (buddy-hash/sha256 (metabot-v3.settings/site-uuid-for-metabot-tools))))- (catch Exception e- (log/error e "Bad AI service token")- nil)))-;;; ------------------------------------------------ Shared Schemas -------------------------------------------------;; NOTE: Some of these schemas are duplicated with small differences in the Agent API-;; (metabase-enterprise.agent-api.api). If you update schemas here, check if the+;; (metabase.agent-api.api). If you update schemas here, check if the;; corresponding Agent API schemas need updating too.(mr/def ::bucket@@ -61,7 +40,7 @@"is-null" "is-not-null""string-is-empty" "string-is-not-empty""is-true" "is-false"]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::temporal-extraction-filter[:and@@ -76,7 +55,7 @@"minute-equals" "minute-not-equals""second-equals" "second-not-equals"]][:value :int]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::disjunctive-temporal-extraction-filter[:and@@ -91,7 +70,7 @@"minute-equals" "minute-not-equals""second-equals" "second-not-equals"]][:values [:sequential :int]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::temporal-filter[:and@@ -103,7 +82,7 @@"greater-than" "greater-than-or-equal""less-than" "less-than-or-equal"]][:value [:or :string :int]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::disjunctive-temporal-filter[:and@@ -115,7 +94,7 @@"greater-than" "greater-than-or-equal""less-than" "less-than-or-equal"]][:values [:sequential [:or :string :int]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::string-filter[:and@@ -126,7 +105,7 @@"string-contains" "string-not-contains""string-starts-with" "string-ends-with"]][:value :string]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::disjunctive-string-date-filter[:and@@ -137,7 +116,7 @@"string-contains" "string-not-contains""string-starts-with" "string-ends-with"]][:values [:sequential :string]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::numeric-filter[:and@@ -148,7 +127,7 @@"greater-than" "greater-than-or-equal""less-than" "less-than-or-equal"]][:value [:or :int :double]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::disjunctive-numeric-filter[:and@@ -157,14 +136,14 @@[:operation [:enum {:encode/tool-api-request keyword}"equals" "not-equals"]][:values [:sequential [:or :int :double]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::segment-filter"Filter using a pre-defined segment."[:and[:map[:segment_id :int]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::filter[:or@@ -182,7 +161,7 @@[:field_granularity {:optional true}[:maybe [:enum {:encode/tool-api-request keyword}"minute", "hour" "day" "week" "month" "quarter" "year" "day-of-week"]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::count-aggregation"Count aggregation — counts rows, no field_id needed.@@ -192,7 +171,7 @@[:function [:= {:encode/tool-api-request keyword} "count"]][:bucket {:optional true} ::bucket][:sort_order {:optional true} [:maybe [:enum {:encode/tool-api-request keyword} "asc" "desc"]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::field-aggregation"Aggregation using a field and function. field_id is required.@@ -204,7 +183,7 @@[:sort_order {:optional true} [:maybe [:enum {:encode/tool-api-request keyword} "asc" "desc"]]][:function [:enum {:encode/tool-api-request keyword}"avg" "count-distinct" "max" "min" "sum"]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::measure-aggregation"Aggregation using a pre-defined measure."@@ -212,7 +191,7 @@[:map[:measure_id :int][:sort_order {:optional true} [:maybe [:enum {:encode/tool-api-request keyword} "asc" "desc"]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::aggregation"Aggregation — count (field optional), field-based (field required), or measure-based."@@ -223,7 +202,7 @@[:map[:field_id :string][:bucket {:optional true} ::bucket]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::order-by"Order by item specifying a field and sort direction."@@ -252,7 +231,7 @@[:sequential :string]])(mr/def ::statistics- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:distinct_count {:optional true} [:maybe ::count]][:percent_null {:optional true} [:maybe ::proportion]][:min {:optional true} [:maybe number?]]@@ -275,7 +254,7 @@"boolean" "date" "datetime" "time" "number" "string"])(mr/def ::column- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:field_id :string][:name :string][:type [:maybe ::field-type]]@@ -293,9 +272,9 @@(mr/def ::filtering-result[:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:type [:= :query]][:query_id :string][:query ::mbql.s/Query]@@ -304,7 +283,7 @@[:output :string]]])(mr/def ::basic-metric- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :metric]][:name :string]@@ -314,13 +293,13 @@(mr/def ::full-metric[:merge::basic-metric- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:queryable_dimensions {:optional true} ::columns][:segments {:optional true} [:sequential ::segment]][:verified {:optional true} :boolean]]])(mr/def ::measure- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:display_name {:optional true} [:maybe :string]]@@ -328,7 +307,7 @@[:definition {:optional true} [:maybe :map]]])(mr/def ::segment- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:display_name {:optional true} [:maybe :string]]@@ -352,28 +331,8 @@[:measures {:optional true} [:sequential ::measure]][:segments {:optional true} [:sequential ::segment]]])-(mr/def ::basic-transform- [:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:id :int]- [:name :string]- [:type [:enum {:decode/tool-api-response name} "mbql" "native" "python"]]- [:description {:optional true} [:maybe :string]]- [:entity_id {:optional true} [:maybe :string]]- ;; :source keys are not snake_cased to match what the FE expects / provides in user_is_viewing context- [:source ::metabot-v3.tools.transforms/transform-source]])--(mr/def ::full-transform- [:merge- ::basic-transform- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:created_at ms/TemporalString]- [:updated_at ms/TemporalString]- ;; :target keys are not snake_cased to match what the FE expects / provides in user_is_viewing context- [:target ::metabot-v3.tools.transforms/transform-target]]])-(mr/def ::basic-snippet- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:description {:optional true} [:maybe :string]]])@@ -381,7 +340,7 @@(mr/def ::full-snippet[:merge::basic-snippet- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:content :string]]]);;; ---------------------------------------------- Discovery & Search -----------------------------------------------@@ -402,7 +361,7 @@(mr/def ::answer-sources-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map[:metrics [:sequential ::full-metric]][:models [:sequential ::table-result]]]]]@@ -413,7 +372,7 @@{:args-schema ::answer-sources-arguments:args-optional? true:result-schema ::answer-sources-result- :handler metabot-v3.tools.entity-details/answer-sources})+ :handler metabot.tools.entity-details/answer-sources})(mr/def ::search-arguments[:and@@ -432,7 +391,7 @@(mr/def ::search-result-item"Unified schema for search result items."- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:enum :table :model :dashboard :question :metric :database :transform]][:name :string]@@ -451,7 +410,7 @@(mr/def ::search-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map[:data [:sequential ::search-result-item]][:total_count :int]]]]@@ -462,7 +421,7 @@{:args-schema ::search-arguments:args-optional? true:result-schema ::search-result- :handler metabot-v3.tools.search/search-tool})+ :handler metabot.tools.search/search-tool});; TODO (Cam 10/28/25) -- fix this endpoint route to use kebab-case for consistency with the rest of our REST API#_{:clj-kondo/ignore [:metabase/validate-defendpoint-route-uses-kebab-case]}@@ -473,7 +432,7 @@{:args-schema ::search-arguments:args-optional? true:result-schema ::search-result- :handler metabot-v3.tools.search/search-tool})+ :handler metabot.tools.search/search-tool});;; ----------------------------------------------------- Actions -----------------------------------------------------@@ -498,7 +457,7 @@(for [fl ["first" "last"]day days](str fl "-" day)))]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]]))+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]]))(mr/def ::create-dashboard-subscription-arguments[:and@@ -506,14 +465,14 @@[:dashboard_id :int][:slack_channel :string][:schedule ::subscription-schedule]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(deftool "/create-dashboard-subscription""Create a dashboard subscription and send it to a slack channel."{:args-schema ::create-dashboard-subscription-arguments:result-schema [:map [:error {:optional true} :string:output {:optional true} :string]]- :handler metabot-v3.tools.create-dashboard-subscription/create-dashboard-subscription})+ :handler metabot.tools.create-dashboard-subscription/create-dashboard-subscription})(mr/def ::create-alert-arguments[:and@@ -523,14 +482,14 @@[:send_once {:optional true, :default false} :boolean][:schedule ::subscription-schedule][:slack_channel :string]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(deftool "/create-alert""Create an alert for a saved question."{:args-schema ::create-alert-arguments:result-schema [:map [:error {:optional true} :string:output {:optional true} :string]]- :handler metabot-v3.tools.create-alert/create-alert})+ :handler metabot.tools.create-alert/create-alert});;; ---------------------------------------------------- Analytics ----------------------------------------------------@@ -541,13 +500,13 @@[:entity_id :int][:field_id :string][:limit {:optional true} [:maybe :int]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(mr/def ::field-values-result[:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:field_id :string][:value_metadata [:map[:field_values {:optional true} [:maybe [:sequential :any]]]@@ -559,12 +518,12 @@"Return statistics and/or values for a given field of a given entity."{:args-schema ::field-values-arguments:result-schema ::field-values-result- :handler metabot-v3.tools.field-stats/field-values})+ :handler metabot.tools.field-stats/field-values})(mr/def ::generate-insights-arguments[:map;; query should not be changed to kebab-case- {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}+ {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}[:for [:or[:map [:metric_id :int]][:map [:table_id :string]]@@ -577,14 +536,14 @@:result-schema [:map[:output :string][:reactions [:sequential :metabot.reaction/redirect]]]- :handler metabot-v3.tools.generate-insights/generate-insights})+ :handler metabot.tools.generate-insights/generate-insights});;; -------------------------------------------------- Entity Details -------------------------------------------------(mr/def ::get-current-user-result[:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:structured_output [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}+ [:structured_output [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :user]][:name :string]@@ -595,7 +554,7 @@(deftool "/get-current-user""Get information about user that started the conversation."{:result-schema ::get-current-user-result- :handler metabot-v3.tools.entity-details/get-current-user})+ :handler metabot.tools.entity-details/get-current-user})(mr/def ::get-dashboard-details-arguments[:and@@ -605,7 +564,7 @@(mr/def ::get-dashboard-details-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map[:id :int][:type [:= :dashboard]]@@ -618,7 +577,7 @@"Get information about a given dashboard."{:args-schema ::get-dashboard-details-arguments:result-schema ::get-dashboard-details-result- :handler metabot-v3.tools.entity-details/get-dashboard-details})+ :handler metabot.tools.entity-details/get-dashboard-details})(mr/def ::get-metric-details-arguments[:and@@ -637,7 +596,7 @@(mr/def ::get-metric-details-result[:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output ::full-metric]][:map [:output :string]]])@@ -645,7 +604,7 @@"Get information about a given metric."{:args-schema ::get-metric-details-arguments:result-schema ::get-metric-details-result- :handler metabot-v3.tools.entity-details/get-metric-details})+ :handler metabot.tools.entity-details/get-metric-details})(mr/def ::get-query-details-arguments[:map [:query :map]])@@ -653,9 +612,9 @@(mr/def ::get-query-details-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:type [:= :query]][:query_id :string][:query :map]@@ -666,7 +625,7 @@"Get information about a given query."{:args-schema ::get-query-details-arguments:result-schema ::get-query-details-result- :handler metabot-v3.tools.entity-details/get-query-details})+ :handler metabot.tools.entity-details/get-query-details})(mr/def ::get-report-details-arguments[:and@@ -682,9 +641,9 @@(mr/def ::get-report-details-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:type [:= :question]][:name :string]@@ -697,7 +656,7 @@"Get information about a given report."{:args-schema ::get-report-details-arguments:result-schema ::get-report-details-result- :handler metabot-v3.tools.entity-details/get-report-details})+ :handler metabot.tools.entity-details/get-report-details})(mr/def ::get-document-details-arguments[:and@@ -709,9 +668,9 @@(mr/def ::get-document-details-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:id :int][:name :string][:document :string]]]]@@ -721,7 +680,7 @@"Get information about a given document."{:args-schema ::get-document-details-arguments:result-schema ::get-document-details-result- :handler metabot-v3.tools.entity-details/get-document-details})+ :handler metabot.tools.entity-details/get-document-details})(mr/def ::get-table-details-arguments[:and@@ -750,7 +709,7 @@(mr/def ::get-table-details-result[:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output ::table-result]][:map [:output :string]]])@@ -758,7 +717,7 @@"Get information about a given table or model."{:args-schema ::get-table-details-arguments:result-schema ::get-table-details-result- :handler metabot-v3.tools.entity-details/get-table-details})+ :handler metabot.tools.entity-details/get-table-details})(mr/def ::get-tables-arguments[:and@@ -770,10 +729,10 @@(mr/def ::get-tables-result[:or[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:database [:map[:id :int][:engine :string]@@ -799,97 +758,6 @@:result-schema ::get-tables-result:handler table-utils/get-tables})-;;; ---------------------------------------------------- Transforms -----------------------------------------------------(mr/def ::get-transforms-result- [:or- [:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:structured_output [:sequential ::basic-transform]]]- [:map [:output :string]]])--(deftool "/get-transforms"- "Get a list of all known transforms."- {:result-schema ::get-transforms-result- :handler metabot-v3.tools.transforms/get-transforms})--(mr/def ::get-transform-details-arguments- [:and- [:map- [:transform_id :int]]- [:map {:encode/tool-api-request- #(set/rename-keys % {:transform_id :transform-id})}]])--(mr/def ::get-transform-details-result- [:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:structured_output [:sequential ::full-transform]]]- [:map [:output :string]]])--(deftool "/get-transform-details"- "Get information about a transform."- {:args-schema ::get-transform-details-arguments- :result-schema ::get-transform-details-result- :handler metabot-v3.tools.transforms/get-transform-details})--(mr/def ::get-transform-python-library-details-arguments- [:and- [:map- [:path :string]]- [:map {:encode/tool-api-request- #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])--(mr/def ::get-transform-python-library-details-result- [:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:structured_output [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:source :string]- [:path :string]- [:created_at ms/TemporalString]- [:updated_at ms/TemporalString]]]]- [:map [:output :string]]])--(deftool "/get-transform-python-library-details"- "Get information about a Python library by path."- {:args-schema ::get-transform-python-library-details-arguments- :result-schema ::get-transform-python-library-details-result- :handler metabot-v3.tools.transforms/get-transform-python-library-details})--(mr/def ::check-transform-dependencies-arguments- [:and- [:map- [:transform_id :int]- [:source ::metabot-v3.tools.transforms/transform-source]]- [:map {:encode/tool-api-request- #(set/rename-keys % {:transform_id :id})}]])--(mr/def ::broken-question- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:id :int]- [:name :string]])--(mr/def ::broken-transform- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:id :int]- [:name :string]])--(mr/def ::check-transform-dependencies-result- [:or- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}- [:structured_output [:map- [:success :boolean]- [:bad_transform_count :int]- [:bad_transforms [:sequential ::broken-transform]]- [:bad_question_count :int]- [:bad_questions [:sequential ::broken-question]]]]]- [:map [:output :string]]])--(deftool "/check-transform-dependencies"- "Check a proposed edit to a transform and return details of cards or transforms that would be broken by the change."- {:args-schema ::check-transform-dependencies-arguments- :result-schema ::check-transform-dependencies-result- :handler metabot-v3.tools.dependencies/check-transform-dependencies})-;;; ----------------------------------------------------- Querying ----------------------------------------------------(mr/def ::filter-records-arguments@@ -902,15 +770,15 @@[:query_id {:optional true} :string]][:map [:report_id :int]][:map [:table_id :string]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]]]+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]]][:filters [:sequential ::filter]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(deftool "/filter-records""Apply filters to records from a data source (query, report, or table)."{:args-schema ::filter-records-arguments:result-schema ::filtering-result- :handler metabot-v3.tools.filters/filter-records})+ :handler metabot.tools.filters/filter-records})(mr/def ::query-metric-arguments[:and@@ -918,13 +786,13 @@[:metric_id :int][:filters {:optional true} [:maybe [:sequential ::filter]]][:group_by {:optional true} [:maybe [:sequential ::group-by]]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]])(deftool "/query-metric""Construct a query from a metric."{:args-schema ::query-metric-arguments:result-schema ::filtering-result- :handler metabot-v3.tools.filters/query-metric})+ :handler metabot.tools.filters/query-metric})(mr/def ::query-model-arguments[:and@@ -936,14 +804,14 @@[:group_by {:optional true} [:maybe [:sequential ::group-by]]][:order_by {:optional true} [:maybe [:sequential ::order-by]]][:limit {:optional true} [:maybe :int]]]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]]);; TODO tsplude - drop the `/query-model` endpoint and filter logic in favor of this(deftool "/query-model""Construct a query from a model."{:args-schema ::query-model-arguments:result-schema ::filtering-result- :handler metabot-v3.tools.filters/query-model})+ :handler metabot.tools.filters/query-model})(mr/def ::query-datasource-arguments[:and@@ -958,27 +826,27 @@[:limit {:optional true} [:maybe :int]]][:fn {:error/message "Exactly one of table_id and model_id required"}#(= (count (select-keys % [:table_id :model_id])) 1)]- [:map {:encode/tool-api-request #(update-keys % metabot-v3.u/safe->kebab-case-en)}]])+ [:map {:encode/tool-api-request #(update-keys % metabot.u/safe->kebab-case-en)}]]);; TODO tsplude - drop the `/query-model` endpoint and filter logic in favor of this(deftool "/query-datasource""Construct a query from a model or table data source."{:args-schema ::query-datasource-arguments:result-schema ::filtering-result- :handler metabot-v3.tools.filters/query-datasource})+ :handler metabot.tools.filters/query-datasource});;; --------------------------------------------------- SQL Snippets --------------------------------------------------(mr/def ::get-snippets-result"Schema for SQL snippet list results"[:map- {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output [:sequential ::basic-snippet]]])(deftool "/get-snippets""Get a list of all known SQL snippets."{:result-schema ::get-snippets-result- :handler metabot-v3.tools.snippets/get-snippets})+ :handler metabot.tools.snippets/get-snippets})(mr/def ::get-snippet-details-arguments[:and@@ -989,35 +857,11 @@(mr/def ::get-snippet-details-result"Schema for SQL snippet detail results"- [:map {:decode/tool-api-response #(update-keys % metabot-v3.u/safe->snake_case_en)}+ [:map {:decode/tool-api-response #(update-keys % metabot.u/safe->snake_case_en)}[:structured_output ::full-snippet]])(deftool "/get-snippet-details""Get the content of a single SQL snippet."{:args-schema ::get-snippet-details-arguments:result-schema ::get-snippet-details-result- :handler metabot-v3.tools.snippets/get-snippet-details})--;;; --------------------------------------------------- Middleware ------------------------------------------------------(defn- enforce-authentication- "Middleware that returns a 401 response if no `ai-session` can be found for `request`."- [handler]- (fn [{:keys [headers] :as request} respond raise]- (if-let [{:keys [user metabot-id]} (-> headers- (get "x-metabase-session")- decode-ai-service-token)]- (request/with-current-user user- (handler (assoc request :metabot-v3/metabot-id metabot-id) respond raise))- (if (:metabase-user-id request)- ;; request relying on metabot-id are going to fail- (handler request respond raise)- (respond api.response/response-unauthentic)))))--(def ^{:arglists '([handler])} +tool-session- "Wrap `routes` so they may only be accessed with proper authentication credentials."- (api.routes.common/wrap-middleware-for-open-api-spec-generation enforce-authentication))--(def ^{:arglists '([request respond raise])} routes- "`/api/ee/metabot-tools` routes."- (api.macros/ns-handler *ns* +tool-session))+ :handler metabot.tools.snippets/get-snippet-details})diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/ask_clarification.clj b/src/metabase/metabot/tools/ask_clarification.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/ask_clarification.cljrename to src/metabase/metabot/tools/ask_clarification.cljindex 9d19ef6c76f..3896d0a5b12 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/ask_clarification.clj+++ b/src/metabase/metabot/tools/ask_clarification.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.ask-clarification+(ns metabase.metabot.tools.ask-clarification"Tool for asking users clarification questions about SQL query requests.This is an 'external' tool that signals the agent should stop and wait for user input."(:requirediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_alert.clj b/src/metabase/metabot/tools/create_alert.cljsimilarity index 90%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_alert.cljrename to src/metabase/metabot/tools/create_alert.cljindex 125e3a4e936..29ab668fe72 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_alert.clj+++ b/src/metabase/metabot/tools/create_alert.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.create-alert+(ns metabase.metabot.tools.create-alert(:require[clojure.set :as set]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.channel.settings :as channel.settings]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.notification.api :as notification.api][metabase.util.cron :as u.cron][toucan2.core :as t2]))@@ -13,7 +13,7 @@The schedule comes in as e.g. {:frequency :daily :hour 9} and needs to beconverted to a Quartz cron string like \"0 0 9 * * ? *\"."[schedule]- (u.cron/schedule-map->cron-string (metabot-v3.tools.u/schedule->schedule-map schedule)))+ (u.cron/schedule-map->cron-string (metabot.tools.u/schedule->schedule-map schedule)))(defn- create-alert*"Private helper for create-alert (call that instead)."@@ -70,5 +70,5 @@(try(create-alert* args)(catch Exception e- (-> (metabot-v3.tools.u/handle-agent-error e)+ (-> (metabot.tools.u/handle-agent-error e)(set/rename-keys {:output :error}))))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard.clj b/src/metabase/metabot/tools/create_autogenerated_dashboard.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard.cljrename to src/metabase/metabot/tools/create_autogenerated_dashboard.cljindex 1625dfac572..899bf1267b5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard.clj+++ b/src/metabase/metabot/tools/create_autogenerated_dashboard.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.create-autogenerated-dashboard+(ns metabase.metabot.tools.create-autogenerated-dashboard"Tool for creating auto-generated dashboards using Metabase's X-ray feature.X-ray builds complete dashboards with multiple visualizations that showcasedifferent aspects of data - distributions, breakdowns, trends, and relationships."diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_chart.clj b/src/metabase/metabot/tools/create_chart.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_chart.cljrename to src/metabase/metabot/tools/create_chart.cljindex ed91155b2ea..ea76faa6abe 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_chart.clj+++ b/src/metabase/metabot/tools/create_chart.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.create-chart+(ns metabase.metabot.tools.create-chart"Tool for creating charts from queries."(:require[buddy.core.codecs :as codecs]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_dashboard_subscription.clj b/src/metabase/metabot/tools/create_dashboard_subscription.cljsimilarity index 90%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_dashboard_subscription.cljrename to src/metabase/metabot/tools/create_dashboard_subscription.cljindex 92bb91627c9..f7e92cd2191 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_dashboard_subscription.clj+++ b/src/metabase/metabot/tools/create_dashboard_subscription.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.create-dashboard-subscription+(ns metabase.metabot.tools.create-dashboard-subscription(:require[clojure.set :as set]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.channel.settings :as channel.settings]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.pulse.api :as pulse.api][toucan2.core :as t2]))@@ -13,7 +13,7 @@(merge {:channel_type :slack:enabled true:details {:channel slack-channel}}- (metabot-v3.tools.u/schedule->schedule-map schedule)))+ (metabot.tools.u/schedule->schedule-map schedule)))(defn- create-dashboard-subscription*"Private helper for create-dashboard-subscription (call that instead)."@@ -67,5 +67,5 @@(try(create-dashboard-subscription* args)(catch Exception e- (-> (metabot-v3.tools.u/handle-agent-error e)+ (-> (metabot.tools.u/handle-agent-error e)(set/rename-keys {:output :error}))))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_sql_query.clj b/src/metabase/metabot/tools/create_sql_query.cljsimilarity index 83%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_sql_query.cljrename to src/metabase/metabot/tools/create_sql_query.cljindex 7b6c65be70d..f5ac3a2acfc 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/create_sql_query.clj+++ b/src/metabase/metabot/tools/create_sql_query.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.tools.create-sql-query+(ns metabase.metabot.tools.create-sql-query"Tool for creating new SQL queries."(:require- [metabase-enterprise.metabot-v3.tools.sql.common :as metabot-v3.tools.sql.common]- [metabase-enterprise.metabot-v3.tools.sql.validation :as metabot-v3.tools.sql.validation][metabase.api.common :as api][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.tools.sql.common :as metabot.tools.sql.common]+ [metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation][metabase.util :as u][metabase.util.i18n :refer [tru]][metabase.util.log :as log]@@ -32,7 +32,7 @@:database-id database-id})))(api/read-check :model/Database database-id))-(mu/defn create-sql-query :- ::metabot-v3.tools.sql.common/operation-result+(mu/defn create-sql-query :- ::metabot.tools.sql.common/operation-result"Create a new SQL query in memory.Parameters:@@ -55,10 +55,10 @@;; Validate access(validate-database-access database-id)- (let [dialect (metabot-v3.tools.sql.validation/database-id->dialect database-id)+ (let [dialect (metabot.tools.sql.validation/database-id->dialect database-id){:keys [valid? transpiled-sql] :as validation-result}- (metabot-v3.tools.sql.validation/validate-sql dialect sql)]+ (metabot.tools.sql.validation/validate-sql dialect sql)](merge {:validation-result validation-result}(when valid?(let [;; Create the in-memory query structurediff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/deftool.clj b/src/metabase/metabot/tools/deftool.cljsimilarity index 89%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/deftool.cljrename to src/metabase/metabot/tools/deftool.cljindex 571d289daf1..d5302b3220a 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/deftool.clj+++ b/src/metabase/metabot/tools/deftool.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.deftool+(ns metabase.metabot.tools.deftool"Macro for defining metabot tool endpoints with standard encoding/decoding behavior."(:require[malli.core :as mc][malli.transform :as mtx]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context][metabase.api.macros :as api.macros]+ [metabase.metabot.context :as metabot.context][metabase.util.malli.registry :as mr][metabase.util.malli.schema :as ms]))@@ -14,6 +14,7 @@"Base schema for all tool requests. Contains the conversation ID and optional profile ID."[:map[:conversation_id ms/UUIDString]+ [:metabot_id {:optional true} [:maybe :string]][:profile_id {:optional true} [:maybe :string]]])(def request-transformer@@ -31,7 +32,7 @@Arguments:- `body` - The request body containing `:arguments` and `:conversation_id`- - `request` - The Ring request map (used to extract `:metabot-v3/metabot-id`)+ - `request` - The Ring request map (used to extract `:metabot/metabot-id`)- `opts` - A map with:- `:api-name` - Keyword name for logging (e.g., `:field-values`)- `:args-schema` - Malli schema for encoding arguments (optional)@@ -40,11 +41,11 @@The handler receives a single map argument containing the encoded args plus `:metabot-id`and `:profile-id` (extracted from the request body)."- [{:keys [arguments conversation_id profile_id] :as body}+ [{:keys [arguments conversation_id metabot_id profile_id] :as body}request{:keys [api-name args-schema result-schema handler]}]- (metabot-v3.context/log (assoc body :api api-name) :llm.log/llm->be)- (let [metabot-id (:metabot-v3/metabot-id request)+ (metabot.context/log (assoc body :api api-name) :llm.log/llm->be)+ (let [metabot-id (or (:metabot/metabot-id request) metabot_id)encoded-args (cond-> (if args-schema(mc/encode args-schema arguments request-transformer){})@@ -55,7 +56,7 @@(mc/decode result-schema raw-result response-transformer)raw-result)](doto (assoc result :conversation_id conversation_id)- (metabot-v3.context/log :llm.log/be->llm))))+ (metabot.context/log :llm.log/be->llm))))(defmacro deftool"Define a tool endpoint with standard encoding/decoding and logging behavior.@@ -79,7 +80,7 @@\"Return statistics and/or values for a given field.\"{:args-schema ::field-values-arguments:result-schema ::field-values-result- :handler metabot-v3.tools.field-stats/field-values})"+ :handler metabot.tools.field-stats/field-values})"[route docstring {:keys [args-schema args-optional? result-schema handler]}](let [api-name (keyword (subs route 1)) ; "/field-values" -> :field-valuesbody-schema (if args-schemadiff --git a/src/metabase/metabot/tools/dependencies.clj b/src/metabase/metabot/tools/dependencies.cljnew file mode 100644index 00000000000..9406225c13d--- /dev/null+++ b/src/metabase/metabot/tools/dependencies.clj@@ -0,0 +1,9 @@+(ns metabase.metabot.tools.dependencies+ (:require+ [metabase.premium-features.core :refer [defenterprise]]))++(defenterprise check-transform-dependencies+ "Check for downstream breakages. Returns nil in OSS."+ metabase-enterprise.metabot.tools.dependencies+ [_transform-map]+ nil)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_chart.clj b/src/metabase/metabot/tools/edit_chart.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_chart.cljrename to src/metabase/metabot/tools/edit_chart.cljindex 055daa06348..cacec14d121 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_chart.clj+++ b/src/metabase/metabot/tools/edit_chart.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.edit-chart+(ns metabase.metabot.tools.edit-chart"Tool for editing chart visualization settings."(:require[metabase.util.log :as log]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_sql_query.clj b/src/metabase/metabot/tools/edit_sql_query.cljsimilarity index 84%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_sql_query.cljrename to src/metabase/metabot/tools/edit_sql_query.cljindex 71a84c22382..a4f3715a9ad 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/edit_sql_query.clj+++ b/src/metabase/metabot/tools/edit_sql_query.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.edit-sql-query+(ns metabase.metabot.tools.edit-sql-query"Tool for editing existing SQL queries."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.tools.sql.common :as metabot-v3.tools.sql.common]- [metabase-enterprise.metabot-v3.tools.sql.validation :as metabot-v3.tools.sql.validation]+ [metabase.metabot.tools.sql.common :as metabot.tools.sql.common]+ [metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation][metabase.util.i18n :refer [tru]][metabase.util.log :as log][metabase.util.malli :as mu]))@@ -46,7 +46,7 @@:else(str/replace-first sql old_string new_string))))-(mu/defn edit-sql-query :- ::metabot-v3.tools.sql.common/operation-result+(mu/defn edit-sql-query :- ::metabot.tools.sql.common/operation-result"Edit an existing SQL query from in-memory state.Parameters:@@ -76,13 +76,13 @@(let [;; Apply edits sequentiallynew-sql (reduce apply-sql-edit current-sql edits)- dialect (metabot-v3.tools.sql.validation/query->dialect query)+ dialect (metabot.tools.sql.validation/query->dialect query){:keys [valid? transpiled-sql] :as validation-result}- (metabot-v3.tools.sql.validation/validate-sql dialect new-sql)]+ (metabot.tools.sql.validation/validate-sql dialect new-sql)](merge {:validation-result validation-result}(when valid?- (let [updated-query (metabot-v3.tools.sql.common/update-query-sql query transpiled-sql)]+ (let [updated-query (metabot.tools.sql.common/update-query-sql query transpiled-sql)]{:action-result {:query-id query-id:query-content transpiled-sql:query updated-querydiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.clj b/src/metabase/metabot/tools/entity_details.cljsimilarity index 91%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.cljrename to src/metabase/metabot/tools/entity_details.cljindex b84f6259208..7d5088e56ed 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.clj+++ b/src/metabase/metabot/tools/entity_details.clj@@ -1,14 +1,14 @@-(ns metabase-enterprise.metabot-v3.tools.entity-details+(ns metabase.metabot.tools.entity-details(:require[medley.core :as m]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.documents.core :as documents][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.lib.types.isa :as lib.types.isa]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.parameters.field-values :as params.field-values][metabase.util :as u][metabase.util.humanization :as u.humanization]@@ -99,7 +99,7 @@"Get metric details as returned by tools."([id] (metric-details id nil))([id options]- (when-let [card (metabot-v3.tools.u/get-card id)]+ (when-let [card (metabot.tools.u/get-card id)](metric-details card (lib-be/application-database-metadata-provider (:database_id card)) options)))([card metadata-provider {:keys [field-values-fn with-default-temporal-breakout? with-queryable-dimensions?with-segments?]@@ -117,7 +117,7 @@(lib/remove-all-breakouts metric-query))visible-cols (when query-needed?(->> (lib/visible-columns base-query)- (map #(metabot-v3.tools.u/add-table-reference base-query %))))+ (map #(metabot.tools.u/add-table-reference base-query %))))col->index (when query-needed?(into {} (map-indexed (fn [i col] [col i])) visible-cols))col-index (when query-needed?@@ -126,13 +126,13 @@(->> breakouts(map #(lib/find-matching-column % visible-cols))(m/find-first lib.types.isa/temporal?)))- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix id)]+ field-id-prefix (metabot.tools.u/card-field-id-prefix id)](cond-> {:id id:type :metric:name (:name card):description (:description card):default_time_dimension_field_id (when default-temporal-breakout- (-> (metabot-v3.tools.u/->result-column+ (-> (metabot.tools.u/->result-columnmetric-querydefault-temporal-breakout(col-index default-temporal-breakout)@@ -141,8 +141,8 @@:verified (verified-review? id "card")}with-queryable-dimensions?(assoc :queryable-dimensions (into []- (comp (map #(metabot-v3.tools.u/add-table-reference base-query %))- (map #(metabot-v3.tools.u/->result-column+ (comp (map #(metabot.tools.u/add-table-reference base-query %))+ (map #(metabot.tools.u/->result-columnmetric-query % (col-index %) field-id-prefix)))(->> (lib/filterable-columns base-query)field-values-fn)))@@ -175,12 +175,12 @@:as options}](when-let [base (if metadata-provider(lib.metadata/table metadata-provider id)- (metabot-v3.tools.u/get-table id :db_id :description :name :schema))]+ (metabot.tools.u/get-table id :db_id :description :name :schema))](let [query-needed? (or with-fields? with-related-tables? with-metrics? with-measures? with-segments?)db-id (if metadata-provider (:db-id base) (:db_id base))db-engine (some-> (if metadata-provider(lib.metadata/database metadata-provider)- (metabot-v3.tools.u/get-database db-id :engine))+ (metabot.tools.u/get-database db-id :engine)):engine name)mp (when query-needed?(or metadata-provider@@ -190,14 +190,14 @@cols (when with-fields?(->> (lib/visible-columns table-query -1 {:include-implicitly-joinable? false})field-values-fn- (map #(metabot-v3.tools.u/add-table-reference table-query %))))+ (map #(metabot.tools.u/add-table-reference table-query %))))field-id-prefix (when (or with-fields? with-related-tables?)- (metabot-v3.tools.u/table-field-id-prefix id))+ (metabot.tools.u/table-field-id-prefix id))related-tables (when with-related-tables?(related-tables table-query field-id-prefix with-fields? field-values-fn))](-> {:id id:type :table- :fields (into [] (map-indexed #(metabot-v3.tools.u/->result-column table-query %2 %1 field-id-prefix)) cols)+ :fields (into [] (map-indexed #(metabot.tools.u/->result-column table-query %2 %1 field-id-prefix)) cols):name (:name base);; :display_name should be (lib/display-name table-query), but we want to avoid creating the query if possible:display_name (some->> (:name base)@@ -258,7 +258,7 @@"Get details for a card."([id] (card-details id nil))([id options]- (when-let [card (metabot-v3.tools.u/get-card id)]+ (when-let [card (metabot.tools.u/get-card id)](card-details card (lib-be/application-database-metadata-provider (:database_id card)) options)))([base metadata-provider {:keys [field-values-fn with-fields? with-related-tables? with-metrics?with-measures? with-segments?]@@ -286,12 +286,12 @@returned-fields (when with-fields?(->> (lib/returned-columns card-query)field-values-fn))- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix id)+ field-id-prefix (metabot.tools.u/card-field-id-prefix id)related-tables (when with-related-tables?(related-tables card-query field-id-prefix with-fields? field-values-fn))](-> {:id id:type card-type- :fields (into [] (map-indexed #(metabot-v3.tools.u/->result-column card-query %2 %1 field-id-prefix)) returned-fields)+ :fields (into [] (map-indexed #(metabot.tools.u/->result-column card-query %2 %1 field-id-prefix)) returned-fields):name (:name base):display_name (some->> (:name base)(u.humanization/name->human-readable-name :simple))@@ -328,9 +328,9 @@"Get the details of metrics and models in the scope of the Metabot instance with ID `metabot-id`.Accepts a map with `:metabot-id` and optional options for field values."[{:keys [metabot-id] :as options}]- (if-let [normalized-metabot-id (metabot-v3.config/normalize-metabot-id metabot-id)]+ (if-let [normalized-metabot-id (metabot.config/normalize-metabot-id metabot-id)](lib-be/with-metadata-provider-cache- (let [metrics-and-models (metabot-v3.tools.u/get-metrics-and-models normalized-metabot-id)+ (let [metrics-and-models (metabot.tools.u/get-metrics-and-models normalized-metabot-id){metrics :metric, models :model}(->> (for [[[card-type database-id] cards] (group-by (juxt :type :database_id) metrics-and-models)detail (cards-details card-type database-id cards options)]@@ -380,7 +380,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn get-metric-details"Get information about the metric with ID `metric-id`."@@ -397,7 +397,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn get-report-details"Get information about the report (card) with ID `report-id`."@@ -407,7 +407,7 @@(let [options (cond-> arguments(= (:with-field-values? arguments) false) (assoc :field-values-fn identity))details (if (int? report-id)- (let [card (t2/hydrate (metabot-v3.tools.u/get-card report-id)+ (let [card (t2/hydrate (metabot.tools.u/get-card report-id):average_query_time)mp (lib-be/application-database-metadata-provider (:database_id card))details (card-details card mp options)]@@ -421,7 +421,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn get-document-details"Get information about the document with ID `document-id`."@@ -441,7 +441,7 @@(defn- execute-query[query-id query-input](let [normalized-query (lib-be/normalize-query query-input)- field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)+ field-id-prefix (metabot.tools.u/query-field-id-prefix query-id)database-id (:database normalized-query)_ (api/read-check :model/Database database-id)mp (lib-be/application-database-metadata-provider database-id)@@ -451,7 +451,7 @@:query-id query-id:query normalized-query:result-columns (into []- (map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 field-id-prefix))+ (map-indexed #(metabot.tools.u/->result-column query %2 %1 field-id-prefix))returned-cols)}))(defn get-query-detailsdiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.clj b/src/metabase/metabot/tools/field_stats.cljsimilarity index 74%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.cljrename to src/metabase/metabot/tools/field_stats.cljindex 5c4e5be0e9a..293092788c9 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.clj+++ b/src/metabase/metabot/tools/field_stats.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.field-stats+(ns metabase.metabot.tools.field-stats(:require[clojure.set :as set][clojure.string :as str]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.lib.core :as lib]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.parameters.field-values :as params.field-values][metabase.request.core :as request][metabase.sync.core :as sync]@@ -36,57 +36,57 @@(defn- table-field-stats[table-id agent-field-id limit](try- (let [field-id-prefix (metabot-v3.tools.u/table-field-id-prefix table-id)+ (let [field-id-prefix (metabot.tools.u/table-field-id-prefix table-id);; When the field ID belongs to a different table (e.g., agent saw a related field;; listed under table 111 as t111-21 but requests it via metabase://table/173/fields/t111-21),;; resolve against the correct table from the field ID prefix.effective-table-id (if (str/starts-with? agent-field-id field-id-prefix)table-id- (let [parsed (metabot-v3.tools.u/parse-field-id agent-field-id)]+ (let [parsed (metabot.tools.u/parse-field-id agent-field-id)](if (and parsed (= "t" (:model-tag parsed)) (:model-id parsed))(:model-id parsed)table-id)))- query (or (metabot-v3.tools.u/table-query effective-table-id)+ query (or (metabot.tools.u/table-query effective-table-id)(throw (ex-info (str "No table found with ID " effective-table-id){:agent-error? true :status-code 404})))- eff-prefix (metabot-v3.tools.u/table-field-id-prefix effective-table-id)+ eff-prefix (metabot.tools.u/table-field-id-prefix effective-table-id)visible-cols (lib/visible-columns query)- col (:column (metabot-v3.tools.u/resolve-column {:field-id agent-field-id} eff-prefix visible-cols))]+ col (:column (metabot.tools.u/resolve-column {:field-id agent-field-id} eff-prefix visible-cols))]{:structured-output {:result-type :field-metadata:field_id agent-field-id:value_metadata (field-statistics col limit)}})(catch Exception ex- (metabot-v3.tools.u/handle-agent-error ex))))+ (metabot.tools.u/handle-agent-error ex))))(defn- card-field-stats[card-id agent-field-id limit card-type](try- (let [query (or (metabot-v3.tools.u/card-query card-id)+ (let [query (or (metabot.tools.u/card-query card-id)(throw (ex-info (str "No " card-type " found with ID " card-id){:agent-error? true :status-code 404})))- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix card-id)+ field-id-prefix (metabot.tools.u/card-field-id-prefix card-id)visible-cols (lib/visible-columns query)- col (:column (metabot-v3.tools.u/resolve-column {:field-id agent-field-id} field-id-prefix visible-cols))]+ col (:column (metabot.tools.u/resolve-column {:field-id agent-field-id} field-id-prefix visible-cols))]{:structured-output {:result-type :field-metadata:field_id agent-field-id:value_metadata (field-statistics col limit)}})(catch Exception ex- (metabot-v3.tools.u/handle-agent-error ex))))+ (metabot.tools.u/handle-agent-error ex))))(defn- metric-field-stats[metric-id agent-field-id limit](try- (let [query (or (metabot-v3.tools.u/metric-query metric-id)+ (let [query (or (metabot.tools.u/metric-query metric-id)(throw (ex-info (str "No metric found with ID " metric-id){:agent-error? true :status-code 404})))- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix metric-id)+ field-id-prefix (metabot.tools.u/card-field-id-prefix metric-id)filterable-cols (lib/filterable-columns query)- col (:column (metabot-v3.tools.u/resolve-column {:field-id agent-field-id} field-id-prefix filterable-cols))]+ col (:column (metabot.tools.u/resolve-column {:field-id agent-field-id} field-id-prefix filterable-cols))]{:structured-output {:result-type :field-metadata:field_id agent-field-id:value_metadata (field-statistics col limit)}})(catch Exception ex- (metabot-v3.tools.u/handle-agent-error ex))))+ (metabot.tools.u/handle-agent-error ex))))(defn field-values"Return statistics and/or values for a given field of a given entity."diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.clj b/src/metabase/metabot/tools/filters.cljsimilarity index 91%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.cljrename to src/metabase/metabot/tools/filters.cljindex 1b6c6d9fa6c..0f287a62bde 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.clj+++ b/src/metabase/metabot/tools/filters.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.tools.filters+(ns metabase.metabot.tools.filters(:require[buddy.core.codecs :as codecs]- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.api.common :as api][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.lib.types.isa :as lib.types.isa][metabase.lib.util :as lib.util]+ [metabase.metabot.agent.streaming :as streaming]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.util :as u][metabase.util.i18n :refer [tru]][metabase.util.json :as json]@@ -359,28 +359,28 @@(defn- query-metric*[{:keys [metric-id filters group-by] :as _arguments}]- (let [card (metabot-v3.tools.u/get-card metric-id)+ (let [card (metabot.tools.u/get-card metric-id)mp (lib-be/application-database-metadata-provider (:database_id card))base-query (->> (lib/query mp (lib.metadata/card mp metric-id))lib/remove-all-breakouts)- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix metric-id)+ field-id-prefix (metabot.tools.u/card-field-id-prefix metric-id)visible-cols (lib/visible-columns base-query)- resolve-visible-column #(metabot-v3.tools.u/resolve-column % field-id-prefix visible-cols)+ resolve-visible-column #(metabot.tools.u/resolve-column % field-id-prefix visible-cols);; Separate segment filters from field filters before column resolutionresolved-filters (map #(if (:segment-id %) % (resolve-visible-column %)) filters)query (as-> base-query $q(reduce add-filter $q resolved-filters)(reduce add-breakout$q- (map #(metabot-v3.tools.u/resolve-column % field-id-prefix visible-cols) group-by)))+ (map #(metabot.tools.u/resolve-column % field-id-prefix visible-cols) group-by)))query-id (u/generate-nano-id)- query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)+ query-field-id-prefix (metabot.tools.u/query-field-id-prefix query-id)returned-cols (lib/returned-columns query)]{:type :query:query-id query-id:query query:result-columns (into []- (map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 query-field-id-prefix))+ (map-indexed #(metabot.tools.u/->result-column query %2 %1 query-field-id-prefix))returned-cols)}))(defn query-metric@@ -399,7 +399,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn- apply-aggregation-sort-order"If sort-order is specified, add an order-by clause for the last aggregation in the query."@@ -472,12 +472,12 @@(defn- query-model*[{:keys [model-id fields filters aggregations group-by order-by limit] :as _arguments}]- (let [card (metabot-v3.tools.u/get-card model-id)+ (let [card (metabot.tools.u/get-card model-id)mp (lib-be/application-database-metadata-provider (:database_id card))base-query (lib/query mp (lib.metadata/card mp model-id))- field-id-prefix (metabot-v3.tools.u/card-field-id-prefix model-id)+ field-id-prefix (metabot.tools.u/card-field-id-prefix model-id)visible-cols (lib/visible-columns base-query)- resolve-visible-column #(metabot-v3.tools.u/resolve-column % field-id-prefix visible-cols)+ resolve-visible-column #(metabot.tools.u/resolve-column % field-id-prefix visible-cols)_ (log/debug "query_model field-id expectations"{:model-id model-id:field-id-prefix field-id-prefix@@ -503,13 +503,13 @@(reduce-query add-order-by (map resolve-order-by-column order-by))(add-limit limit))query-id (u/generate-nano-id)- query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)+ query-field-id-prefix (metabot.tools.u/query-field-id-prefix query-id)returned-cols (lib/returned-columns query)]{:type :query:query-id query-id:query query:result-columns (into []- (map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 query-field-id-prefix))+ (map-indexed #(metabot.tools.u/->result-column query %2 %1 query-field-id-prefix))returned-cols)}))(defn query-model@@ -528,7 +528,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn- resolve-datasource"Resolve datasource parameters to [field-id-prefix base-query] tuple.@@ -537,7 +537,7 @@(condmodel-id(try- [(metabot-v3.tools.u/card-field-id-prefix model-id) (metabot-v3.tools.u/card-query model-id)]+ [(metabot.tools.u/card-field-id-prefix model-id) (metabot.tools.u/card-query model-id)](catch clojure.lang.ExceptionInfo e(throw (if (= (:status-code (ex-data e)) 404)(ex-info (str "No model found with model_id " model-id)@@ -546,7 +546,7 @@table-id(try- [(metabot-v3.tools.u/table-field-id-prefix table-id) (metabot-v3.tools.u/table-query table-id)]+ [(metabot.tools.u/table-field-id-prefix table-id) (metabot.tools.u/table-query table-id)](catch clojure.lang.ExceptionInfo e(throw (if (= (:status-code (ex-data e)) 404)(ex-info (str "No table found with table_id " table-id)@@ -560,7 +560,7 @@[{:keys [fields filters aggregations group-by order-by limit] :as arguments}](let [[filter-field-id-prefix base-query] (resolve-datasource arguments)visible-cols (lib/visible-columns base-query)- resolve-visible-column #(metabot-v3.tools.u/resolve-column % filter-field-id-prefix visible-cols)+ resolve-visible-column #(metabot.tools.u/resolve-column % filter-field-id-prefix visible-cols)resolve-order-by-column (fn [{:keys [field direction]}] {:field (resolve-visible-column field) :direction direction})projection (map (comp (juxt filter-bucketed-column (fn [{:keys [column bucket]}](let [column (cond-> column@@ -582,13 +582,13 @@(reduce-query add-order-by (map resolve-order-by-column order-by))(add-limit limit))query-id (u/generate-nano-id)- query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)+ query-field-id-prefix (metabot.tools.u/query-field-id-prefix query-id)returned-cols (lib/returned-columns query)]{:type :query:query-id query-id:query query:result-columns (into []- (map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 query-field-id-prefix))+ (map-indexed #(metabot.tools.u/->result-column query %2 %1 query-field-id-prefix))returned-cols)}))(defn query-datasource@@ -611,7 +611,7 @@(catch Exception e(if (= (:status-code (ex-data e)) 404){:output (ex-message e) :status-code 404}- (metabot-v3.tools.u/handle-agent-error e)))))+ (metabot.tools.u/handle-agent-error e)))))(defn- base-query[data-source]@@ -623,27 +623,27 @@_ (api/read-check :model/Database database-id)mp (lib-be/application-database-metadata-provider database-id)][(if query-id- (metabot-v3.tools.u/query-field-id-prefix query-id)- metabot-v3.tools.u/any-prefix-pattern)+ (metabot.tools.u/query-field-id-prefix query-id)+ metabot.tools.u/any-prefix-pattern)(-> (lib/query mp normalized-query) lib/append-stage)]))](condmodel-id- (if-let [model-query (metabot-v3.tools.u/card-query model-id)]- [(metabot-v3.tools.u/card-field-id-prefix model-id) model-query]+ (if-let [model-query (metabot.tools.u/card-query model-id)]+ [(metabot.tools.u/card-field-id-prefix model-id) model-query](throw (ex-info (str "No model found with model_id " model-id){:agent-error? true :status-code 404 :data-source data-source})))table-id(let [table-id (cond-> table-id(string? table-id) parse-long)]- (if-let [table-query (metabot-v3.tools.u/table-query table-id)]- [(metabot-v3.tools.u/table-field-id-prefix table-id) table-query]+ (if-let [table-query (metabot.tools.u/table-query table-id)]+ [(metabot.tools.u/table-field-id-prefix table-id) table-query](throw (ex-info (str "No table found with table_id " table-id){:agent-error? true :status-code 404 :data-source data-source}))))report-id- (if-let [query (metabot-v3.tools.u/card-query report-id)]- [(metabot-v3.tools.u/card-field-id-prefix report-id) query]+ (if-let [query (metabot.tools.u/card-query report-id)]+ [(metabot.tools.u/card-field-id-prefix report-id) query](throw (ex-info (str "No report found with report_id " report-id){:agent-error? true :status-code 404 :data-source data-source})))@@ -660,16 +660,16 @@(try(let [[filter-field-id-prefix base] (base-query data-source)returned-cols (lib/returned-columns base)- query (reduce add-filter base (map #(metabot-v3.tools.u/resolve-column % filter-field-id-prefix returned-cols) filters))+ query (reduce add-filter base (map #(metabot.tools.u/resolve-column % filter-field-id-prefix returned-cols) filters))query-id (u/generate-nano-id)- query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)]+ query-field-id-prefix (metabot.tools.u/query-field-id-prefix query-id)]{:structured-output{:result-type :query:type :query:query-id query-id:query query:result-columns (into []- (map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 query-field-id-prefix))+ (map-indexed #(metabot.tools.u/->result-column query %2 %1 query-field-id-prefix))(lib/returned-columns query))}})(catch Exception ex- (metabot-v3.tools.u/handle-agent-error ex))))+ (metabot.tools.u/handle-agent-error ex))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/generate_insights.clj b/src/metabase/metabot/tools/generate_insights.cljsimilarity index 88%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/generate_insights.cljrename to src/metabase/metabot/tools/generate_insights.cljindex 4fb52987193..a4d6f8a05d5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/generate_insights.clj+++ b/src/metabase/metabot/tools/generate_insights.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.generate-insights+(ns metabase.metabot.tools.generate-insights(:require[buddy.core.codecs :as codecs]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u][metabase.lib.util :as lib.util]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.util.json :as json]))(set! *warn-on-reflection* true)@@ -33,4 +33,4 @@{:output results-url:reactions [{:type :metabot.reaction/redirect :url results-url}]})(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/get_metadata.clj b/src/metabase/metabot/tools/get_metadata.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/get_metadata.cljrename to src/metabase/metabot/tools/get_metadata.cljindex 9473abe8630..ce6ea2b8dde 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/get_metadata.clj+++ b/src/metabase/metabot/tools/get_metadata.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.tools.get-metadata+(ns metabase.metabot.tools.get-metadata"Tool for retrieving metadata for tables, models, and metrics."(:require- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details-tools]+ [metabase.metabot.tools.entity-details :as entity-details-tools][metabase.util.i18n :refer [tru]][metabase.util.log :as log]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/instructions.clj b/src/metabase/metabot/tools/instructions.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/instructions.cljrename to src/metabase/metabot/tools/instructions.cljindex bbb44d85491..3f21ffd640b 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/instructions.clj+++ b/src/metabase/metabot/tools/instructions.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.instructions+(ns metabase.metabot.tools.instructions"Instruction constants for LLM tool results.These guide the LLM on how to interpret and use tool outputs.Matches Python AI Service InstructionResultSchema patterns exactly.")diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/llm_representations.clj b/src/metabase/metabot/tools/llm_representations.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/llm_representations.cljrename to src/metabase/metabot/tools/llm_representations.cljindex d278aa6c6ab..5f54776a5b7 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/llm_representations.clj+++ b/src/metabase/metabot/tools/llm_representations.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.llm-representations+(ns metabase.metabot.tools.llm-representations"LLM representation utilities for formatting entities as XML.Matches Python AI Service patterns exactly for consistency."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.agent.prompts :as prompts]- [metabase-enterprise.metabot-v3.tmpl :as te]+ [metabase.metabot.agent.prompts :as prompts]+ [metabase.metabot.tmpl :as te][metabase.util :as u][metabase.util.log :as log][selmer.parser :as selmer]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/navigate.clj b/src/metabase/metabot/tools/navigate.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/navigate.cljrename to src/metabase/metabot/tools/navigate.cljindex 8718b9cc608..c2aef365c90 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/navigate.clj+++ b/src/metabase/metabot/tools/navigate.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.navigate+(ns metabase.metabot.tools.navigate"Tool for navigating users to specific pages in Metabase UI."(:require[buddy.core.codecs :as codecs]- [metabase-enterprise.metabot-v3.agent.links :as links]+ [metabase.metabot.agent.links :as links][metabase.util.json :as json][metabase.util.log :as log]))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/read_resource.clj b/src/metabase/metabot/tools/read_resource.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/read_resource.cljrename to src/metabase/metabot/tools/read_resource.cljindex 60a51904aba..ded2b60bbb4 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/read_resource.clj+++ b/src/metabase/metabot/tools/read_resource.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.read-resource+(ns metabase.metabot.tools.read-resource"Tool for reading Metabase resources via URI patterns.Implements 'Context Engineering with Links' pattern where URIs serve as lightweight,@@ -19,11 +19,11 @@- metabase://dashboard/{id} - Dashboard details"(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details]- [metabase-enterprise.metabot-v3.tools.field-stats :as field-stats]- [metabase-enterprise.metabot-v3.tools.instructions :as instructions]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]- [metabase-enterprise.metabot-v3.tools.transforms :as transforms]+ [metabase.metabot.tools.entity-details :as entity-details]+ [metabase.metabot.tools.field-stats :as field-stats]+ [metabase.metabot.tools.instructions :as instructions]+ [metabase.metabot.tools.llm-representations :as llm-rep]+ [metabase.metabot.tools.transforms :as transforms][metabase.util.log :as log]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/replace_sql_query.clj b/src/metabase/metabot/tools/replace_sql_query.cljsimilarity index 76%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/replace_sql_query.cljrename to src/metabase/metabot/tools/replace_sql_query.cljindex c8d14a3a4d9..d22011d4c4c 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/replace_sql_query.clj+++ b/src/metabase/metabot/tools/replace_sql_query.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.tools.replace-sql-query+(ns metabase.metabot.tools.replace-sql-query"Tool for replacing SQL query content entirely while preserving metadata."(:require- [metabase-enterprise.metabot-v3.tools.sql.common :as metabot-v3.tools.sql.common]- [metabase-enterprise.metabot-v3.tools.sql.validation :as metabot-v3.tools.sql.validation]+ [metabase.metabot.tools.sql.common :as metabot.tools.sql.common]+ [metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation][metabase.util.i18n :refer [tru]][metabase.util.log :as log][metabase.util.malli :as mu]))(set! *warn-on-reflection* true)-(mu/defn replace-sql-query :- ::metabot-v3.tools.sql.common/operation-result+(mu/defn replace-sql-query :- ::metabot.tools.sql.common/operation-result"Replace the SQL content of an existing query while preserving metadata.This is different from edit-sql-query in that it completely replaces the SQL@@ -37,14 +37,14 @@:query-id query-id:available-queries (keys queries-state)})))- (let [dialect (metabot-v3.tools.sql.validation/query->dialect query)+ (let [dialect (metabot.tools.sql.validation/query->dialect query){:keys [valid? transpiled-sql] :as validation-result}- (metabot-v3.tools.sql.validation/validate-sql dialect sql)]+ (metabot.tools.sql.validation/validate-sql dialect sql)](merge {:validation-result validation-result}(when valid?(let [;; Replace the SQL content - handle both formats- updated-query (metabot-v3.tools.sql.common/update-query-sql query transpiled-sql)]+ updated-query (metabot.tools.sql.common/update-query-sql query transpiled-sql)]{:action-result {:query-id query-id:query-content transpiled-sql:query updated-querydiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj b/src/metabase/metabot/tools/search.cljsimilarity index 97%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.cljrename to src/metabase/metabot/tools/search.cljindex c06eda11aa1..8d97457a7cc 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj+++ b/src/metabase/metabot/tools/search.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.search+(ns metabase.metabot.tools.search(:require[clojure.set :as set][medley.core :as m]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.reactions][metabase.api.common :as api]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.reactions][metabase.permissions.core :as perms][metabase.search.core :as search][metabase.search.engine :as search.engine]@@ -177,11 +177,11 @@(set (distinct (keep entity-type->search-model entity-types)))metabot-search-models)_ (log/infof "[METABOT-SEARCH] Converted entity-types %s to search-models %s" entity-types search-models)- metabot (t2/select-one :model/Metabot :entity_id (get-in metabot-v3.config/metabot-config [metabot-id :entity-id] metabot-id))+ metabot (t2/select-one :model/Metabot :entity_id (get-in metabot.config/metabot-config [metabot-id :entity-id] metabot-id))use-verified? (if metabot-id(:use_verified_content metabot)false)- embedded-metabot? (= metabot-id metabot-v3.config/embedded-metabot-id)+ embedded-metabot? (= metabot-id metabot.config/embedded-metabot-id)collection-id (when (or embedded-metabot? (= profile-id "nlq"))(:collection_id metabot))limit (or limit 50)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/snippets.clj b/src/metabase/metabot/tools/snippets.cljsimilarity index 74%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/snippets.cljrename to src/metabase/metabot/tools/snippets.cljindex a9b47538e95..8538c8b0160 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/snippets.clj+++ b/src/metabase/metabot/tools/snippets.clj@@ -1,6 +1,6 @@-(ns metabase-enterprise.metabot-v3.tools.snippets+(ns metabase.metabot.tools.snippets(:require- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.native-query-snippets.core :as snippets]))(defn get-snippets@@ -11,7 +11,7 @@(->> (snippets/list-native-query-snippets)(map #(select-keys % [:id :name :description])))}(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))(defn get-snippet-details"Retrieve a specific SQL snippet by ID, including its content."@@ -22,4 +22,4 @@(when-let [snippet (snippets/get-native-query-snippet snippet-id)](select-keys snippet [:id :name :description :content])))}(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/common.clj b/src/metabase/metabot/tools/sql/common.cljsimilarity index 80%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/common.cljrename to src/metabase/metabot/tools/sql/common.cljindex 885dbba8ac4..2b5bfdb1e35 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/common.clj+++ b/src/metabase/metabot/tools/sql/common.clj@@ -1,18 +1,18 @@-(ns metabase-enterprise.metabot-v3.tools.sql.common+(ns metabase.metabot.tools.sql.common"Namespace that aggregates functionality common to tools sql namespaces.Those are:- - `metabot-v3.tools.create-sql-query`,- - `metabot-v3.tools.edit-sql-query`,- - `metabot-v3.tools.replace-sql-query`.+ - `metabot.tools.create-sql-query`,+ - `metabot.tools.edit-sql-query`,+ - `metabot.tools.replace-sql-query`.Each of those namespaces define an _operation_:- `create-sql-query`,- `edit-sql-query`,- `replace-sql-query`."(:require- [metabase-enterprise.metabot-v3.tools.sql.validation :as metabot-v3.tools.sql.validation][metabase.lib.core :as lib]+ [metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation][metabase.util.i18n :refer [tru]][metabase.util.malli.registry :as mr]))@@ -33,7 +33,7 @@"Result of an operation as described this ns' docstring. Stores validation result and action result iff validationwas successful."[:map- [:validation-result ::metabot-v3.tools.sql.validation/validation-result]+ [:validation-result ::metabot.tools.sql.validation/validation-result][:action-result {:optional true} ::action-result]])(defn update-query-sqldiff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/validation.clj b/src/metabase/metabot/tools/sql/validation.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/validation.cljrename to src/metabase/metabot/tools/sql/validation.cljindex bce4c3f006a..aa2f7ed06f0 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/sql/validation.clj+++ b/src/metabase/metabot/tools/sql/validation.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.sql.validation+(ns metabase.metabot.tools.sql.validation(:require[clojure.string :as str][metabase.driver.util :as driver.u]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/todo.clj b/src/metabase/metabot/tools/todo.cljsimilarity index 96%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/todo.cljrename to src/metabase/metabot/tools/todo.cljindex 37a1229ef33..2c3b4cc177a 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/todo.clj+++ b/src/metabase/metabot/tools/todo.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.todo+(ns metabase.metabot.tools.todo"Tools for managing todo lists during agent conversations.Todos are stored in agent memory and streamed to the frontend via todo_list data parts."(:require- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]+ [metabase.metabot.agent.streaming :as streaming][metabase.util.log :as log]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj b/src/metabase/metabot/tools/transforms.cljsimilarity index 62%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.cljrename to src/metabase/metabot/tools/transforms.cljindex e012a523ad0..232f41f90f0 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms.clj+++ b/src/metabase/metabot/tools/transforms.clj@@ -1,7 +1,6 @@-(ns metabase-enterprise.metabot-v3.tools.transforms+(ns metabase.metabot.tools.transforms(:require- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]- [metabase-enterprise.transforms-python.api :as transforms-python.api]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.transforms.core :as transforms][metabase.transforms.schema :as transforms.schema][metabase.util.malli.registry :as mr]))@@ -20,7 +19,7 @@(filter :source_readable)(map #(select-keys % [:id :entity_id :name :type :description :source])))))}(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))(defn get-transform-details"Get information about a transform."@@ -29,13 +28,4 @@{:structured_output(transforms/get-transform transform-id)}(catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))--(defn get-transform-python-library-details- "Get information about a Python library by path."- [{:keys [path]}]- (try- {:structured_output- (transforms-python.api/get-python-library-by-path path)}- (catch Exception e- (metabot-v3.tools.u/handle-agent-error e))))+ (metabot.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms_write.clj b/src/metabase/metabot/tools/transforms_write.cljsimilarity index 60%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms_write.cljrename to src/metabase/metabot/tools/transforms_write.cljindex 876798b0433..8a5337f9e3b 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/transforms_write.clj+++ b/src/metabase/metabot/tools/transforms_write.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.transforms-write- "Tools for writing/editing SQL and Python transform source code.+(ns metabase.metabot.tools.transforms-write+ "Tools for writing/editing SQL transform source code.Supports both partial edits (targeted string replacements) and full replacement modes."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]+ [metabase.metabot.agent.streaming :as streaming][metabase.util.log :as log]))(set! *warn-on-reflection* true)@@ -40,7 +40,7 @@(str/replace content old_string new_string)(str/replace-first content old_string new_string)))))-(defn- apply-edits+(defn apply-edits"Apply a sequence of partial edits to content.Each edit is applied in order, and the result becomes input for the next edit.All edits must succeed or the operation fails (atomic behavior)."@@ -63,7 +63,7 @@ def transform():return pd.DataFrame([{\"message\": \"Hello from Python transform!\"}])")-(defn- create-fresh-transform+(defn create-fresh-transform"Create a fresh transform structure with the given source type."[source-type transform-name transform-description source-database source-tables](let [template (case source-type@@ -158,84 +158,3 @@ def transform()::message "Transform SQL updated successfully."}:data-parts [(streaming/transform-suggestion-part suggested-transform)]:instructions "The transform suggestion has been created and displayed to the user. Do not repeat the SQL content."}))--;;; Write Transform Python Tool--(defn write-transform-python- "Write or edit Python transform source code.-- Parameters:- - transform-id: Optional ID of existing transform to edit- - edit-action: Either {:mode \"edit\" :edits [...]} or {:mode \"replace\" :new-content \"...\"}- - thinking: Explanation of what changes are being made- - transform-name: Name for new transform (required if no transform-id)- - transform-description: Description for new transform- - source-database: Database ID for source tables- - source-tables: Map of table aliases to table IDs- - memory-atom: Atom containing agent memory (injected by wrapper)- - context: Request context with current transform if editing-- Returns map with:- - :structured-output - The suggested transform- - :data-parts - Transform suggestion data part for streaming"- [{:keys [transform_id edit_action thinking transform_name transform_description- source_database source_tables memory-atom context]}]- (log/info "Writing Python transform" {:transform-id transform_id- :edit-mode (:mode edit_action)- :has-context (some? context)})-- (let [;; Get current transform from context or memory, or create fresh one- current-transform (cond- ;; Try to get from context first- (and transform_id context)- (get-in context [:transforms (str transform_id)])-- ;; Then try memory- (and transform_id memory-atom)- (get-in @memory-atom [:state :transforms (str transform_id)])-- ;; Create fresh transform- :else- (create-fresh-transform :python transform_name transform_description- source_database source_tables))-- _ (when (and transform_id (nil? current-transform))- (throw (ex-info (str "Transform with ID " transform_id " not found. "- "Use search to find available transforms.")- {:agent-error? true- :transform-id transform_id})))-- current-python (get-in current-transform [:source :query] "")-- ;; Apply edits based on mode- new-python (case (:mode edit_action)- "edit" (apply-edits current-python (:edits edit_action))- "replace" (:new_content edit_action)- ;; Default to replace if no mode specified but new_content provided- (if (:new_content edit_action)- (:new_content edit_action)- (throw (ex-info "Invalid edit_action: must specify mode 'edit' with edits or mode 'replace' with new_content"- {:agent-error? true- :edit-action edit_action}))))-- ;; Build suggested transform- suggested-transform (cond-> current-transform- true (assoc-in [:source :query] new-python)- true (assoc-in [:source :type] "python")- transform_name (assoc :name transform_name)- transform_description (assoc :description transform_description)- source_database (assoc-in [:source :source-database] source_database)- source_tables (assoc-in [:source :source-tables] source_tables))]-- ;; Store in memory if we have an ID- (when (and transform_id memory-atom)- (swap! memory-atom assoc-in [:state :transforms (str transform_id)] suggested-transform))-- (log/debug "Python transform written" {:transform-id transform_id- :python-length (count new-python)})-- {:structured-output {:transform suggested-transform- :thinking thinking- :message "Transform Python code updated successfully."}- :data-parts [(streaming/transform-suggestion-part suggested-transform)]- :instructions "The transform suggestion has been created and displayed to the user. Do not repeat the Python content."}))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj b/src/metabase/metabot/tools/util.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.cljrename to src/metabase/metabot/tools/util.cljindex 8da8bfcb8b8..97356ca53b1 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj+++ b/src/metabase/metabot/tools/util.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.util+(ns metabase.metabot.tools.util(:require[clojure.string :as str][medley.core :as m]diff --git a/src/metabase/metabot/usage.clj b/src/metabase/metabot/usage.cljnew file mode 100644index 00000000000..979ee701015--- /dev/null+++ b/src/metabase/metabot/usage.clj@@ -0,0 +1,11 @@+(ns metabase.metabot.usage+ "Deprecated: use [[metabase.internal-stats.metabot]] instead."+ (:require+ [metabase.internal-stats.metabot :as internal-stats.metabot]))++(defn metabot-stats+ "Calculate total Metabot token usage over a window of the previous UTC day 00:00-23:59.+ Deprecated: use [[metabase.internal-stats.metabot/metabot-stats]] instead."+ {:deprecated "0.56.0"}+ []+ (internal-stats.metabot/metabot-stats))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/util.clj b/src/metabase/metabot/util.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/metabot_v3/util.cljrename to src/metabase/metabot/util.cljindex ca031594fb3..7e9e1db7a37 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/util.clj+++ b/src/metabase/metabot/util.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.util+(ns metabase.metabot.util(:require[clojure.data.xml :as xml][clojure.set :as set]diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.cljindex 3e70c79672d..72b098e2697 100644--- a/src/metabase/models/resolution.clj+++ b/src/metabase/models/resolution.clj@@ -54,10 +54,10 @@:model/ImplicitAction metabase.actions.models:model/LoginHistory metabase.login-history.models.login-history:model/Measure metabase.measures.models.measure- :model/Metabot metabase-enterprise.metabot-v3.models.metabot- :model/MetabotConversation metabase-enterprise.metabot-v3.models.metabot-conversation- :model/MetabotMessage metabase-enterprise.metabot-v3.models.metabot-message- :model/MetabotPrompt metabase-enterprise.metabot-v3.models.metabot-prompt+ :model/Metabot metabase.metabot.models.metabot+ :model/MetabotConversation metabase.metabot.models.metabot-conversation+ :model/MetabotMessage metabase.metabot.models.metabot-message+ :model/MetabotPrompt metabase.metabot.models.metabot-prompt:model/ModelIndex metabase.indexed-entities.models.model-index:model/ModelIndexValue metabase.indexed-entities.models.model-index:model/ModerationReview metabase.content-verification.models.moderation-reviewdiff --git a/src/metabase/premium_features/core.clj b/src/metabase/premium_features/core.cljindex 1215e0815ce..49b27bd2416 100644--- a/src/metabase/premium_features/core.clj+++ b/src/metabase/premium_features/core.clj@@ -42,9 +42,6 @@development-mode?enable-tenants?enable-advanced-permissions?- enable-ai-entity-analysis?- enable-ai-sql-fixer?- enable-ai-sql-generation?enable-any-sso?enable-audit-app?enable-cache-granular-controls?@@ -61,7 +58,6 @@enable-email-restrict-recipients?enable-embedding-sdk-origins?enable-embedding-simple-feature?- enable-llm-autodescription?enable-metabot-v3?enable-official-collections?enable-preemptive-caching?diff --git a/src/metabase/premium_features/defenterprise.clj b/src/metabase/premium_features/defenterprise.cljindex 741e873dbe3..25230ed6b48 100644--- a/src/metabase/premium_features/defenterprise.clj+++ b/src/metabase/premium_features/defenterprise.clj@@ -102,7 +102,7 @@`(fn ~(symbol (str fn-name)) ~@fn-tail))](register-mapping! ee-fn-name# (merge ~options {~oss-or-ee oss-or-ee-fn#}))(def- ~(vary-meta fn-name assoc :arglists ''([& args]))+ ~(vary-meta fn-name merge {:arglists ''([& args])})~docstr(dynamic-ee-oss-fn ee-ns# ee-fn-name#)))))diff --git a/src/metabase/premium_features/settings.clj b/src/metabase/premium_features/settings.cljindex ce1c05875af..69fa5abdfc8 100644--- a/src/metabase/premium_features/settings.clj+++ b/src/metabase/premium_features/settings.clj@@ -216,10 +216,6 @@"Enable restrict email recipients?":email-restrict-recipients)-(define-premium-feature ^{:added "0.50.0"} enable-llm-autodescription?- "Enable automatic descriptions of questions and dashboards by LLMs?"- :llm-autodescription)-(define-premium-feature ^{:added "0.51.0"} enable-query-reference-validation?"Enable the Query Validator Tool?":query-reference-validation)@@ -249,17 +245,9 @@:development-mode)(define-premium-feature ^{:added "0.52.0"} enable-metabot-v3?- "Enable the newest LLM-based MetaBot? (The one that lives in [[metabase-enterprise.metabot-v3.core]].)"+ "Enable the newest LLM-based MetaBot? (The one that lives in [[metabase.metabot.core]].)":metabot-v3)-(define-premium-feature ^{:added "0.54.0"} enable-ai-sql-fixer?- "Should Metabase suggest SQL fixes?"- :ai-sql-fixer)--(define-premium-feature ^{:added "0.54.0"} enable-ai-sql-generation?- "Should Metabase generate SQL queries?"- :ai-sql-generation)-; the "-feature" suffix avoids name collision with the setting getter(define-premium-feature ^{:added "0.55.0"} enable-embedding-simple-feature?"Should we enable modular embedding?"@@ -269,10 +257,6 @@"Should we enable the embedding hub?":embedding-hub)-(define-premium-feature ^{:added "0.55.0"} enable-ai-entity-analysis?- "Should Metabase do AI analysis on entities?"- :ai-entity-analysis)-(define-premium-feature ^{:added "0.56.0"} cloud-custom-smtp?"Can Metabase have a custom smtp details separate from the default Cloud details.":cloud-custom-smtp)@@ -331,9 +315,6 @@(defn- -token-features []{:advanced_permissions (enable-advanced-permissions?)- :ai_sql_fixer (enable-ai-sql-fixer?)- :ai_sql_generation (enable-ai-sql-generation?)- :ai_entity_analysis (enable-ai-entity-analysis?):attached_dwh (has-attached-dwh?):audit_app (enable-audit-app?):cache_granular_controls (enable-cache-granular-controls?)@@ -358,7 +339,6 @@:etl_connections (enable-etl-connections?):etl_connections_pg (enable-etl-connections-pg?):hosting (is-hosted?)- :llm_autodescription (enable-llm-autodescription?):metabot_v3 (enable-metabot-v3?):official_collections (enable-official-collections?):query_reference_validation (enable-query-reference-validation?)diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.cljindex 7888a1ab279..3dd32dc276d 100644--- a/src/metabase/premium_features/token_check.clj+++ b/src/metabase/premium_features/token_check.clj@@ -118,15 +118,6 @@t/local-datestr))-(defenterprise metabot-stats- "Stats for Metabot"- metabase-enterprise.metabot-v3.core- []- {:metabot-tokens 0- :metabot-queries 0- :metabot-users 0- :metabot-usage-date (yesterday)})-(defenterprise transform-stats"Stats for Transforms"metabase-enterprise.transforms.core@@ -149,7 +140,7 @@embedding-question-count (internal-stats/embedding-question-count)stats (merge (internal-stats/query-execution-last-utc-day)(embedding-settings embedding-dashboard-count embedding-question-count)- (metabot-stats)+ (internal-stats/metabot-stats)(transform-stats){:users users:embedding-dashboard-count embedding-dashboard-countdiff --git a/src/metabase/search/ingestion.clj b/src/metabase/search/ingestion.cljindex 5494df087d9..3e1003104dd 100644--- a/src/metabase/search/ingestion.clj+++ b/src/metabase/search/ingestion.clj@@ -141,7 +141,7 @@(if (true? v) as [v as]))))(defn- spec-index-query*- [search-model]+ [_db-type search-model](let [spec (search.spec/spec search-model)fn-deps (search.spec/collect-fn-attr-req-fields spec)fn-selects (map (fn [field]@@ -168,8 +168,13 @@[[(t2/table-name join-model) join-alias]join-condition])))})))-(def ^{:private true, :arglists '([search-model])} spec-index-query- (memoize spec-index-query*))+(def ^:private spec-index-query-memo (memoize spec-index-query*))++(defn- spec-index-query+ ;; Memoized per db-type since the generated HoneySQL varies by database engine+ ;; (e.g. searchable-value-trim-sql emits LEFT/CAST only for postgres and h2).+ [search-model]+ (spec-index-query-memo (mdb/db-type) search-model))(defn- spec-index-query-where [search-model where-clause](-> (spec-index-query search-model)diff --git a/src/metabase/server/auth_wrapper.clj b/src/metabase/server/auth_wrapper.cljindex 5f344d2aee9..c98944bdec4 100644--- a/src/metabase/server/auth_wrapper.clj+++ b/src/metabase/server/auth_wrapper.clj@@ -2,6 +2,7 @@(:require[metabase.api.util.handlers :as handlers][metabase.config.core :as config]+ [metabase.sso.api.slack-connect :as slack-connect.api][ring.util.response :as response]))(let [bad-req (response/bad-request {:message "The auth/sso endpoint only exists in enterprise builds"@@ -11,11 +12,14 @@(respond bad-req)))(def ^{:arglists '([request respond raise])} ee-missing-routes- "Ring routes for auth (SAML) API endpoints."+ "Ring routes for auth (SAML) API endpoints.+ Slack Connect routes are always available (OSS). Other SSO routes require EE.";; follows the same form as [[metabase-enterprise.sso.api.routes]]. Compojure is a bit opaque so need to manually keep;; them in sync.(handlers/route-map-handler- {"/auth" {"/sso" not-enabled}+ {"/auth" {"/sso" (handlers/route-map-handler+ {"/slack-connect" slack-connect.api/routes+ "/" not-enabled})}"/api" {"/saml" not-enabled"/ee" {"/sso" {"/oidc" not-enabled}}}}))diff --git a/src/metabase/server/middleware/auth.clj b/src/metabase/server/middleware/auth.cljindex e5802fb051d..68445f411d7 100644--- a/src/metabase/server/middleware/auth.clj+++ b/src/metabase/server/middleware/auth.clj@@ -5,16 +5,10 @@[buddy.core.bytes :as bytes][buddy.core.codecs :as codecs][buddy.core.mac :as mac]- [metabase.premium-features.core :refer [defenterprise]]))+ [metabase.server.settings :as server.settings]))(set! *warn-on-reflection* true)-(defenterprise metabot-slack-signing-secret-setting- "Returns the Slack signing secret for Metabot (EE only)."- metabase-enterprise.slackbot.settings- []- nil)-(def ^:private ^:const max-slack-timestamp-age-seconds"Maximum age in seconds for a Slack request timestamp. Requests older than this are rejectedto prevent replay attacks. Slack recommends 5 minutes (300 seconds)."@@ -64,7 +58,7 @@Returns nil if no signing secret is configured, false if timestamp is too old(replay attack prevention) or signature is invalid, true if valid."[request-body timestamp slack-signature]- (when-let [signing-secret (metabot-slack-signing-secret-setting)]+ (when-let [signing-secret (server.settings/unobfuscated-metabot-slack-signing-secret)](and (slack-timestamp-valid? timestamp)(some? slack-signature)(let [message (str "v0:" timestamp ":" request-body)diff --git a/src/metabase/server/settings.clj b/src/metabase/server/settings.cljindex 694c273003b..95183c5267c 100644--- a/src/metabase/server/settings.clj+++ b/src/metabase/server/settings.clj@@ -5,7 +5,8 @@[clojure.string :as str][metabase.settings.core :as setting :refer [defsetting]][metabase.system.core :as system]- [metabase.util.i18n :refer [deferred-tru tru]]))+ [metabase.util.i18n :refer [deferred-tru tru]]+ [metabase.util.string :as u.str]))(def ^:private default-allowed-iframe-hosts"youtube.com,@@ -88,3 +89,19 @@ x.com")(def ^:dynamic ^Long *thread-interrupt-escalation-timeout-ms*"Timeout in milliseconds to wait after query cancellation before escalating to thread interruption."(thread-interrupt-escalation-timeout-ms))++(defsetting metabot-slack-signing-secret+ (deferred-tru "Signing secret for verifying requests from the Metabot Slack app")+ :type :string+ :visibility :admin+ :encryption :when-encryption-key-set+ :export? false+ :audit :no-value+ :getter (fn []+ (-> (setting/get-value-of-type :string :metabot-slack-signing-secret)+ (u.str/mask 4))))++(defn unobfuscated-metabot-slack-signing-secret+ "Get the unobfuscated value of [[metabot-slack-signing-secret]]."+ []+ (setting/get-value-of-type :string :metabot-slack-signing-secret))diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/api.clj b/src/metabase/slackbot/api.cljsimilarity index 88%rename from enterprise/backend/src/metabase_enterprise/slackbot/api.cljrename to src/metabase/slackbot/api.cljindex 808f5bc2fa5..08dc02ba02b 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/api.clj+++ b/src/metabase/slackbot/api.clj@@ -1,28 +1,25 @@-(ns metabase-enterprise.slackbot.api- "`/api/ee/metabot-v3/slack` routes"+(ns metabase.slackbot.api+ "`/api/metabot/slack` routes"(:require[clojure.string :as str][malli.core :as mc]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.feedback :as metabot-v3.feedback]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.config :as slackbot.config]- [metabase-enterprise.slackbot.events :as slackbot.events]- [metabase-enterprise.slackbot.persistence :as slackbot.persistence]- [metabase-enterprise.slackbot.settings :as slackbot.settings]- [metabase-enterprise.slackbot.streaming :as slackbot.streaming]- [metabase-enterprise.slackbot.uploads :as slackbot.uploads]- [metabase-enterprise.sso.settings :as sso-settings][metabase.analytics.core :as analytics][metabase.api.macros :as api.macros]- [metabase.channel.api.slack :as channel.api.slack][metabase.channel.settings :as channel.settings][metabase.config.core :as config]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.feedback :as metabot.feedback][metabase.permissions.core :as perms]- [metabase.premium-features.core :as premium-features :refer [defenterprise- defenterprise-schema]][metabase.request.core :as request][metabase.settings.core :as setting]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.config :as slackbot.config]+ [metabase.slackbot.events :as slackbot.events]+ [metabase.slackbot.persistence :as slackbot.persistence]+ [metabase.slackbot.settings :as slackbot.settings]+ [metabase.slackbot.streaming :as slackbot.streaming]+ [metabase.slackbot.uploads :as slackbot.uploads]+ [metabase.sso.settings :as sso-settings][metabase.system.core :as system][metabase.util :as u][metabase.util.encryption :as encryption]@@ -53,10 +50,9 @@(.submit ^ExecutorService @event-handler-executor^Runnable (bound-fn* f)))-(defenterprise clear-slack-bot-settings!+(defn clear-slack-bot-settings!"Clears all slackbot-related settings when Slack token is cleared.This ensures enable-sso-slack? becomes false."- :feature :metabot-v3[](setting/set-many! {:slack-connect-enabled false:slack-connect-client-id nil@@ -64,15 +60,6 @@:metabot-slack-signing-secret nil})nil)-(defenterprise-schema get-slack-manifest :- channel.api.slack/SlackManifest- "Enterprise implementation - returns full MetaBot manifest with event subscriptions, slash commands, etc."- :feature :metabot-v3- []- (let [base-url (system/site-url)]- (when-not base-url- (throw (ex-info (tru "You must configure a site-url for Slack integration to work.") {:status-code 503})))- (slackbot.config/build-slack-manifest base-url)))-;; ------------------------- VALIDATION ----------------------------------(defn- assert-valid-slack-req@@ -361,7 +348,7 @@(when-not (slackbot.config/setup-complete?)(log/errorf "[slackbot] Slack setup incomplete (site_url=%s sso_enabled=%s client_id=%s client_secret=%s signing_secret=%s app_token=%s encryption=%s)"(boolean (system/site-url))- (boolean (premium-features/enable-sso-slack?))+ (boolean (sso-settings/slack-connect-enabled))(boolean (sso-settings/slack-connect-client-id))(boolean (sso-settings/slack-connect-client-secret))(boolean (slackbot.settings/metabot-slack-signing-secret))@@ -408,7 +395,6 @@ack-msg);; ----------------------- ROUTES ---------------------------;; NOTE: make sure to do premium-features/enable-metabot-v3? checks if you add new endpoints(api.macros/defendpoint :post "/events" :- slackbot.events/SlackEventsResponse"Respond to activities in Slack"@@ -426,15 +412,13 @@(assert-valid-slack-req request)(log/debugf "[slackbot] Received Slack event type=%s slack_event_type=%s" (:type body) (get-in body [:event :type]));; all handlers must respond within 3 seconds or slack will retry- (if (premium-features/enable-metabot-v3?)- (case (:type body)- "url_verification" (handle-url-verification body)- "event_callback" (handle-event-callback body)- ack-msg)+ (case (:type body)+ "url_verification" (handle-url-verification body)+ "event_callback" (handle-event-callback body)ack-msg))(def SlackBotSettingsRequest- "Malli schema for the request body of PUT /api/ee/metabot-v3/slack/settings.+ "Malli schema for the request body of PUT /api/metabot/slack/settings.All credential fields must be provided together (either all set or all nil)."[:map[:slack-connect-client-id [:maybe ms/NonBlankString]]@@ -442,7 +426,7 @@[:metabot-slack-signing-secret [:maybe ms/NonBlankString]]])(def SlackBotSettingsResponse- "Malli schema for the response of PUT /api/ee/metabot-v3/slack/settings."+ "Malli schema for the response of PUT /api/metabot/slack/settings."[:map[:ok :boolean]])@@ -463,10 +447,6 @@all-unset? (and (nil? slack-connect-client-id)(nil? slack-connect-client-secret)(nil? metabot-slack-signing-secret))]- ;; require metabot-v3 feature only when setting values (clearing is always allowed)- (when (not (or all-unset? (premium-features/enable-metabot-v3?)))- (throw (ex-info (tru "Metabot feature is not enabled.")- {:status-code 402})));; all values must be set together or unset together(when-not (or all-set? all-unset?)(throw (ex-info (tru "Must provide client id, client secret and signing secret together.")@@ -524,7 +504,7 @@(defn- build-base-feedback"Build the common feedback payload fields."[user-id conversation-id positive]- {:metabot_id (metabot-v3.config/normalize-metabot-id "slackbotmetabotmetabo")+ {:metabot_id (metabot.config/normalize-metabot-id "slackbotmetabotmetabo"):feedback {:positive positive:message_id conversation-id:freeform_feedback ""}@@ -583,7 +563,7 @@(submit-async(fn [](try- (metabot-v3.feedback/submit-to-harbormaster!+ (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)))@@ -595,40 +575,39 @@"Handle interactive payloads from Slack (button clicks, modal submissions)."[_route-params _query-params _body request](assert-valid-slack-req request)- (when (premium-features/enable-metabot-v3?)- (let [payload (-> (get-in request [:params :payload])- (json/decode true))]- (case (:type payload)- "block_actions"- (let [actions (:actions payload)- slack-user (get-in payload [:user :id])- trigger-id (:trigger_id payload)- channel-id (get-in payload [:channel :id])- message-ts (get-in payload [:message :ts])]- (doseq [action actions]- (case (:action_id action)- "metabot_feedback"- (handle-feedback-action {:action action- :trigger-id trigger-id- :slack-user-id slack-user- :channel-id channel-id- :message-ts message-ts})-- "metabot_delete_response"- (handle-delete-action {:slack-user-id slack-user+ (let [payload (-> (get-in request [:params :payload])+ (json/decode true))]+ (case (:type payload)+ "block_actions"+ (let [actions (:actions payload)+ slack-user (get-in payload [:user :id])+ trigger-id (:trigger_id payload)+ channel-id (get-in payload [:channel :id])+ message-ts (get-in payload [:message :ts])]+ (doseq [action actions]+ (case (:action_id action)+ "metabot_feedback"+ (handle-feedback-action {:action action+ :trigger-id trigger-id+ :slack-user-id slack-user:channel-id channel-id:message-ts message-ts})- nil)))- "view_submission"- (when (= (get-in payload [:view :callback_id]) "metabot_feedback_modal")- (handle-feedback-modal-submission payload))+ "metabot_delete_response"+ (handle-delete-action {:slack-user-id slack-user+ :channel-id channel-id+ :message-ts message-ts})+ nil)))++ "view_submission"+ (when (= (get-in payload [:view :callback_id]) "metabot_feedback_modal")+ (handle-feedback-modal-submission payload))- nil)))+ nil)){:status 200 :body ""})(def ^{:arglists '([request respond raise])} routes- "`/api/ee/metabot-v3/slack` routes."+ "`/api/metabot/slack` routes."(api.macros/ns-handler *ns*));; -------------- LOCAL DEV SETUP -------------------diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/channel.clj b/src/metabase/slackbot/channel.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/slackbot/channel.cljrename to src/metabase/slackbot/channel.cljindex cc7e7a25bed..32694e4bb01 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/channel.clj+++ b/src/metabase/slackbot/channel.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.slackbot.channel+(ns metabase.slackbot.channel"Visible Slack channel reply/update flow for metabot."(:require[clojure.string :as str]- [metabase-enterprise.metabot-v3.persistence :as metabot-v3.persistence]- [metabase-enterprise.slackbot.client :as slackbot.client]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.slackbot.client :as slackbot.client][metabase.util.log :as log]))(set! *warn-on-reflection* true)@@ -94,7 +94,7 @@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-v3.persistence/set-response-slack-msg-id! @stored-msg-id res-ts))+ (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)diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/client.clj b/src/metabase/slackbot/client.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/slackbot/client.cljrename to src/metabase/slackbot/client.cljindex f8de0f7460b..e0a742f886c 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/client.clj+++ b/src/metabase/slackbot/client.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.slackbot.client+(ns metabase.slackbot.client"Slack API client functions for Metabot slackbot."(:import(java.io InputStream))diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/config.clj b/src/metabase/slackbot/config.cljsimilarity index 86%rename from enterprise/backend/src/metabase_enterprise/slackbot/config.cljrename to src/metabase/slackbot/config.cljindex fc3878a9bdc..01a3489bfb1 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/config.clj+++ b/src/metabase/slackbot/config.clj@@ -1,11 +1,10 @@-(ns metabase-enterprise.slackbot.config+(ns metabase.slackbot.config"Configuration, manifest, and validation helpers for slackbot."(:require- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.settings :as slackbot.settings]- [metabase-enterprise.sso.settings :as sso-settings][metabase.channel.settings :as channel.settings]- [metabase.premium-features.core :as premium-features]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.settings :as slackbot.settings]+ [metabase.sso.settings :as sso-settings][metabase.system.core :as system][metabase.util.encryption :as encryption]))@@ -24,7 +23,7 @@:always_online false}:assistant_view {:assistant_description "Your AI-powered data assistant"}:slash_commands [{:command "/metabot"- :url (str base-url "/api/ee/metabot-v3/slack/commands")+ :url (str base-url "/api/metabot/slack/commands"):description "Issue a Metabot command":should_escape false}]}:oauth_config {:redirect_urls [(str base-url "/auth/sso/slack-connect/callback")]@@ -47,7 +46,7 @@"reactions:read""reactions:write""users:read"]}}- :settings {:event_subscriptions {:request_url (str base-url "/api/ee/metabot-v3/slack/events")+ :settings {:event_subscriptions {:request_url (str base-url "/api/metabot/slack/events"):bot_events ["app_home_opened""app_mention""message.channels"@@ -56,7 +55,7 @@"assistant_thread_started""assistant_thread_context_changed"]}:interactivity {:is_enabled true- :request_url (str base-url "/api/ee/metabot-v3/slack/interactive")}+ :request_url (str base-url "/api/metabot/slack/interactive")}:org_deploy_enabled true:socket_mode_enabled false:token_rotation_enabled false}})@@ -66,7 +65,6 @@[](boolean(and (some? (system/site-url))- (premium-features/enable-sso-slack?)(sso-settings/slack-connect-client-id)(sso-settings/slack-connect-client-secret)(slackbot.settings/metabot-slack-signing-secret)diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/events.clj b/src/metabase/slackbot/events.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/slackbot/events.cljrename to src/metabase/slackbot/events.cljindex 80775c08673..917e5d1e142 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/events.clj+++ b/src/metabase/slackbot/events.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.slackbot.events+(ns metabase.slackbot.events"Event definitions for slackbot."(:require[clojure.string :as str]))diff --git a/src/metabase/slackbot/init.clj b/src/metabase/slackbot/init.cljnew file mode 100644index 00000000000..ae237d74a75--- /dev/null+++ b/src/metabase/slackbot/init.clj@@ -0,0 +1,3 @@+(ns metabase.slackbot.init+ (:require+ [metabase.slackbot.settings]))diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/persistence.clj b/src/metabase/slackbot/persistence.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/slackbot/persistence.cljrename to src/metabase/slackbot/persistence.cljindex a7fb3b478ee..1514a80d5b7 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/persistence.clj+++ b/src/metabase/slackbot/persistence.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.slackbot.persistence+(ns metabase.slackbot.persistence"Slack-specific persistence: reconstruct conversation history from stored messages."(:require[toucan2.core :as t2]))diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/query.clj b/src/metabase/slackbot/query.cljsimilarity index 99%rename from enterprise/backend/src/metabase_enterprise/slackbot/query.cljrename to src/metabase/slackbot/query.cljindex f1e827770ea..60b588c2340 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/query.clj+++ b/src/metabase/slackbot/query.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.slackbot.query+(ns metabase.slackbot.query"Ad-hoc query execution and visualization for slackbot."(:require[metabase.api.common :as api]diff --git a/src/metabase/slackbot/settings.clj b/src/metabase/slackbot/settings.cljnew file mode 100644index 00000000000..f1b54cfc70b--- /dev/null+++ b/src/metabase/slackbot/settings.clj@@ -0,0 +1,25 @@+(ns metabase.slackbot.settings+ (:require+ [metabase.server.settings :as server.settings]+ [metabase.settings.core :refer [defsetting]]+ [metabase.util.i18n :refer [deferred-tru]]))++(defn metabot-slack-signing-secret+ "Signing secret for verifying requests from the Metabot Slack app.+ Delegates to [[metabase.server.settings/metabot-slack-signing-secret]]."+ []+ (server.settings/metabot-slack-signing-secret))++(defn unobfuscated-metabot-slack-signing-secret+ "Get the unobfuscated value of [[metabot-slack-signing-secret]].+ Delegates to [[metabase.server.settings/unobfuscated-metabot-slack-signing-secret]]."+ []+ (server.settings/unobfuscated-metabot-slack-signing-secret))++(defsetting slackbot-event-handler-pool-size+ (deferred-tru "Maximum number of concurrent Slack event handler threads.")+ :visibility :internal+ :type :integer+ :default 64+ :setter :none+ :export? false)diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/streaming.clj b/src/metabase/slackbot/streaming.cljsimilarity index 95%rename from enterprise/backend/src/metabase_enterprise/slackbot/streaming.cljrename to src/metabase/slackbot/streaming.cljindex 8e8fa5fb880..4b889a9da48 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/streaming.clj+++ b/src/metabase/slackbot/streaming.clj@@ -1,23 +1,23 @@-(ns metabase-enterprise.slackbot.streaming+(ns metabase.slackbot.streaming"Streaming AI responses to Slack using Slack's chat streaming API(startStream/appendStream/stopStream)."(:require[clojure.string :as str][java-time.api :as t]- [metabase-enterprise.metabot-v3.agent.core :as agent]- [metabase-enterprise.metabot-v3.context :as metabot-v3.context]- [metabase-enterprise.metabot-v3.envelope :as metabot-v3.envelope]- [metabase-enterprise.metabot-v3.persistence :as metabot-v3.persistence]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u]- [metabase-enterprise.slackbot.channel :as slackbot.channel]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.events :as slackbot.events]- [metabase-enterprise.slackbot.persistence :as slackbot.persistence]- [metabase-enterprise.slackbot.query :as slackbot.query][metabase.api.common :as api][metabase.channel.slack :as channel.slack]+ [metabase.metabot.agent.core :as agent]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.envelope :as metabot.envelope]+ [metabase.metabot.persistence :as metabot.persistence]+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.util :as metabot.u][metabase.permissions.core :as perms]+ [metabase.slackbot.channel :as slackbot.channel]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.events :as slackbot.events]+ [metabase.slackbot.persistence :as slackbot.persistence]+ [metabase.slackbot.query :as slackbot.query][metabase.system.core :as system][metabase.util :as u][metabase.util.json :as json]@@ -169,19 +169,19 @@[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-v3.envelope/user-message prompt)- request-message (metabot-v3.envelope/user-message (or request-prompt prompt))+ message (metabot.envelope/user-message prompt)+ request-message (metabot.envelope/user-message (or request-prompt prompt))capabilities (compute-capabilities)thread-history (thread->history thread bot-user-id conversation-id)history (into (vec thread-history) extra-history)- context (metabot-v3.context/create-context+ context (metabot.context/create-context{:current_time_with_timezone (str (java.time.OffsetDateTime/now)):capabilities capabilities:slack_channel_id channel-id})messages (conj (vec history) request-message)- _ (metabot-v3.persistence/store-message! conversation-id "slackbot" [message]- :channel-id channel-id- :slack-msg-id req-slack-msg-id)+ _ (metabot.persistence/store-message! conversation-id "slackbot" [message]+ :channel-id channel-id+ :slack-msg-id req-slack-msg-id)parts-atom (atom [])dispatch-xf (comp(u/tee-xf parts-atom)@@ -220,9 +220,9 @@:profile-id :slackbot:context context}))(let [lines (into [] (self.core/aisdk-line-xf) @parts-atom)- pk (metabot-v3.persistence/store-message!+ pk (metabot.persistence/store-message!conversation-id "slackbot"- (metabot-v3.u/aisdk->messages :assistant lines)+ (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*)]diff --git a/enterprise/backend/src/metabase_enterprise/slackbot/uploads.clj b/src/metabase/slackbot/uploads.cljsimilarity index 98%rename from enterprise/backend/src/metabase_enterprise/slackbot/uploads.cljrename to src/metabase/slackbot/uploads.cljindex 9ff6aa720dd..63b26d98a50 100644--- a/enterprise/backend/src/metabase_enterprise/slackbot/uploads.clj+++ b/src/metabase/slackbot/uploads.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.slackbot.uploads+(ns metabase.slackbot.uploads"CSV upload handling for slackbot."(:require[clojure.java.io :as io][clojure.string :as str]- [metabase-enterprise.slackbot.client :as slackbot.client][metabase.analytics.core :as analytics][metabase.channel.settings :as channel.settings]+ [metabase.slackbot.client :as slackbot.client][metabase.upload.core :as upload][metabase.util.log :as log][toucan2.core :as t2]))diff --git a/src/metabase/sso/api/slack_connect.clj b/src/metabase/sso/api/slack_connect.cljnew file mode 100644index 00000000000..68421f462ef--- /dev/null+++ b/src/metabase/sso/api/slack_connect.clj@@ -0,0 +1,34 @@+(ns metabase.sso.api.slack-connect+ "API routes for Slack Connect SSO authentication."+ (:require+ [metabase.api.macros :as api.macros]+ [metabase.sso.integrations.slack-connect :as slack-connect-integration]+ [metabase.util.log :as log]))++;; GET /auth/sso/slack-connect+;;+#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}+(api.macros/defendpoint :get "/slack-connect"+ "Initiate Slack Connect SSO flow."+ [_route-params _query-params _body request]+ (try+ (slack-connect-integration/sso-initiate request)+ (catch Throwable e+ (log/error e "Error initiating Slack Connect SSO")+ (throw e))))++;; GET /auth/sso/slack-connect/callback+;;+#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}+(api.macros/defendpoint :get "/slack-connect/callback"+ "Slack Connect OIDC callback."+ [_route-params _query-params _body request]+ (try+ (slack-connect-integration/sso-callback request)+ (catch Throwable e+ (log/error e "Error handling Slack Connect callback")+ (throw e))))++(def ^{:arglists '([request respond raise])} routes+ "`/auth/sso` Slack Connect routes."+ (api.macros/ns-handler *ns*))diff --git a/src/metabase/sso/init.clj b/src/metabase/sso/init.cljindex 257e4d7475e..a0718f33e4c 100644--- a/src/metabase/sso/init.clj+++ b/src/metabase/sso/init.clj@@ -3,4 +3,5 @@[metabase.sso.providers.google][metabase.sso.providers.ldap][metabase.sso.providers.oidc]+ [metabase.sso.providers.slack-connect][metabase.sso.settings]))diff --git a/enterprise/backend/src/metabase_enterprise/sso/integrations/slack_connect.clj b/src/metabase/sso/integrations/slack_connect.cljsimilarity index 92%rename from enterprise/backend/src/metabase_enterprise/sso/integrations/slack_connect.cljrename to src/metabase/sso/integrations/slack_connect.cljindex db93deb7364..16af053faac 100644--- a/enterprise/backend/src/metabase_enterprise/sso/integrations/slack_connect.clj+++ b/src/metabase/sso/integrations/slack_connect.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.sso.integrations.slack-connect+(ns metabase.sso.integrations.slack-connect"Implementation of the Slack Connect backend for SSO.Slack Connect uses OIDC (OpenID Connect) for authentication, which only uses GET requests.@@ -12,13 +12,12 @@5. Metabase exchanges code for tokens and creates session"(:require[java-time.api :as t]- [metabase-enterprise.sso.integrations.sso-utils :as sso-utils]- [metabase-enterprise.sso.settings :as sso-settings][metabase.api.common :as api][metabase.auth-identity.core :as auth-identity]- [metabase.premium-features.core :as premium-features][metabase.request.core :as request][metabase.sso.core :as sso]+ [metabase.sso.providers.slack-connect :as slack-connect.provider]+ [metabase.sso.settings :as sso-settings][metabase.system.core :as system][metabase.util.i18n :refer [tru]][metabase.util.log :as log]@@ -34,7 +33,6 @@(defn- check-slack-connect-prereqs!"Check that Slack Connect is available and enabled. Throws on failure."[]- (premium-features/assert-has-feature :sso-slack (tru "Slack Connect authentication"))(when-not (sso-settings/slack-connect-enabled)(throw (ex-info (tru "Slack Connect is not enabled"){:status-code 400}))))@@ -49,7 +47,7 @@(throw (ex-info (tru "Account linking requires an authenticated session"){:status-code 401})))redirect-url (if redirect- (sso-utils/check-sso-redirect redirect)+ (slack-connect.provider/check-sso-redirect redirect)"/")auth-result (auth-identity/authenticate :provider/slack-connect(assoc requestdiff --git a/enterprise/backend/src/metabase_enterprise/sso/providers/slack_connect.clj b/src/metabase/sso/providers/slack_connect.cljsimilarity index 79%rename from enterprise/backend/src/metabase_enterprise/sso/providers/slack_connect.cljrename to src/metabase/sso/providers/slack_connect.cljindex 0ffac188ec6..f22ed79aae1 100644--- a/enterprise/backend/src/metabase_enterprise/sso/providers/slack_connect.clj+++ b/src/metabase/sso/providers/slack_connect.clj@@ -1,11 +1,9 @@-(ns metabase-enterprise.sso.providers.slack-connect+(ns metabase.sso.providers.slack-connect"Slack Connect OIDC authentication provider. Derives from the base OIDC providerand adds Slack-specific configuration and claim extraction."(:require- [metabase-enterprise.sso.integrations.sso-utils :as sso-utils]- [metabase-enterprise.sso.settings :as sso-settings][metabase.auth-identity.core :as auth-identity]- [metabase.premium-features.core :as premium-features]+ [metabase.sso.settings :as sso-settings][metabase.util.i18n :refer [tru]][methodical.core :as methodical][toucan2.core :as t2]))@@ -69,16 +67,40 @@:scopes ["openid" "profile" "email"]:redirect-uri (get request :redirect-uri)}))+;;; -------------------------------------------------- Utilities --------------------------------------------------++(defn- maybe-throw-user-provisioning+ "Throw an error if `enabled?` is falsey, indicating new user creation is not allowed."+ [enabled?]+ (when-not enabled?+ (throw (ex-info (tru "Sorry, but you''ll need a Metabase account to view this page. Please contact your administrator.")+ {:status-code 401}))))++(defn check-sso-redirect+ "Check if open redirect is being exploited in SSO. If so, or if the redirect-url is invalid, throw a 400."+ [redirect-url]+ (try+ (let [redirect (some-> redirect-url (java.net.URI.))+ our-host (some-> ((requiring-resolve 'metabase.system.core/site-url)) (java.net.URI.) (.getHost))]+ (when-not (or (nil? redirect-url)+ (and (nil? (.getHost redirect))+ (nil? (.getScheme redirect)))+ (= (.getHost redirect) our-host))+ (throw (ex-info (tru "Invalid redirect URL")+ {:status-code 400+ :redirect-url redirect-url})))+ redirect-url)+ (catch clojure.lang.ExceptionInfo e (throw e))+ (catch Exception _e+ (throw (ex-info (tru "Invalid redirect URL")+ {:status-code 400+ :redirect-url redirect-url})))))+;;; -------------------------------------------------- Authentication Implementation --------------------------------------------------(methodical/defmethod auth-identity/authenticate :provider/slack-connect[_provider request](cond- (not (premium-features/enable-sso-slack?))- {:success? false- :error :feature-not-available- :message (tru "Slack Connect authentication is not available on your plan")}-(not (sso-settings/slack-connect-enabled)){:success? false:error :slack-connect-not-enabled@@ -138,7 +160,7 @@(condp = (sso-settings/slack-connect-authentication-mode)sso-settings/slack-connect-auth-mode-sso(do (when-not user- (sso-utils/check-user-provisioning (keyword provider-name)))+ (maybe-throw-user-provisioning (sso-settings/slack-connect-user-provisioning-enabled)))(next-method provider request))sso-settings/slack-connect-auth-mode-link-onlydiff --git a/src/metabase/sso/settings.clj b/src/metabase/sso/settings.cljindex d611ba8f869..c0a2c9cf614 100644--- a/src/metabase/sso/settings.clj+++ b/src/metabase/sso/settings.clj@@ -6,7 +6,8 @@[metabase.settings.core :as setting :refer [defsetting define-multi-setting define-multi-setting-impl]][metabase.util :as u][metabase.util.i18n :refer [deferred-tru tru]]- [metabase.util.json :as json])+ [metabase.util.json :as json]+ [metabase.util.string :as u.str])(:import(com.unboundid.ldap.sdk DN)))@@ -144,6 +145,89 @@:export? false:default 15.0)+;;; ------------------------------------------------ Slack Connect ------------------------------------------------++(defsetting slack-connect-client-id+ (deferred-tru "Client ID for your Slack app. Get this from https://api.slack.com/apps")+ :encryption :when-encryption-key-set+ :export? false+ :audit :getter)++(defsetting slack-connect-client-secret+ (deferred-tru "Client Secret for your Slack app")+ :encryption :when-encryption-key-set+ :export? false+ :audit :no-value+ :getter (fn []+ (-> (setting/get-value-of-type :string :slack-connect-client-secret)+ (u.str/mask 4))))++(defn unobfuscated-slack-connect-client-secret+ "Get the unobfuscated value of [[slack-connect-client-secret]]."+ []+ (setting/get-value-of-type :string :slack-connect-client-secret))++(def slack-connect-auth-mode-sso+ "Authentication mode for full SSO login."+ "sso")++(def slack-connect-auth-mode-link-only+ "Authentication mode for account linking only (no session creation)."+ "link-only")++(defsetting slack-connect-authentication-mode+ (deferred-tru "Controls whether Slack can be used for SSO login or just account linking. Valid values: \"sso\" or \"link-only\" (default)")+ :type :string+ :export? false+ :default slack-connect-auth-mode-link-only+ :audit :getter+ :encryption :no+ :setter (fn [new-value]+ (when (and new-value+ (not (contains? #{slack-connect-auth-mode-sso slack-connect-auth-mode-link-only} new-value)))+ (throw (ex-info (tru "Invalid authentication mode. Must be \"sso\" or \"link-only\"")+ {:status-code 400})))+ (setting/set-value-of-type! :string :slack-connect-authentication-mode new-value)))++(defsetting slack-connect-user-provisioning-enabled+ (deferred-tru "When a user logs in via Slack Connect, create a Metabase account for them automatically if they don''t have one.")+ :type :boolean+ :export? false+ :default true+ :getter (fn []+ (if (= (slack-connect-authentication-mode) slack-connect-auth-mode-link-only)+ false+ (setting/get-value-of-type :boolean :slack-connect-user-provisioning-enabled)))+ :audit :getter)++(defsetting slack-connect-attribute-team-id+ (deferred-tru "Slack OIDC claim for the team/workspace ID")+ :default "https://slack.com/team_id"+ :export? false+ :encryption :when-encryption-key-set+ :audit :getter)++(defsetting slack-connect-configured+ (deferred-tru "Are the mandatory Slack Connect settings configured?")+ :type :boolean+ :export? false+ :default false+ :setter :none+ :getter (fn [] (boolean+ (and (slack-connect-client-id)+ (slack-connect-client-secret)))))++(defsetting slack-connect-enabled+ (deferred-tru "Is Slack Connect authentication configured and enabled?")+ :type :boolean+ :export? false+ :default false+ :audit :getter+ :getter (fn []+ (if (slack-connect-configured)+ (setting/get-value-of-type :boolean :slack-connect-enabled)+ false)))+;;;;;; Google Auth;;;diff --git a/test/metabase/analytics/stats_test.clj b/test/metabase/analytics/stats_test.cljindex ef460e19deb..851f5f52e6b 100644--- a/test/metabase/analytics/stats_test.clj+++ b/test/metabase/analytics/stats_test.clj@@ -566,7 +566,6 @@:enhancements:etl-connections:etl-connections-pg- :llm-autodescription:query-reference-validation:cloud-custom-smtp:session-timeout-configdiff --git a/test/metabase/channel/api/slack_test.clj b/test/metabase/channel/api/slack_test.cljindex fdf3974b471..b8d85d65ca0 100644--- a/test/metabase/channel/api/slack_test.clj+++ b/test/metabase/channel/api/slack_test.clj@@ -58,10 +58,11 @@(mt/user-http-request :rasta :put 403 "slack/settings"{:slack-app-token "fake-token"}))))-(deftest ^:parallel manifest-test+(deftest manifest-test(testing "GET /api/slack/manifest"(testing "The Slack manifest can be fetched via an API call"- (is (map? (mt/user-http-request :crowberto :get 200 "slack/manifest"))))))+ (mt/with-temporary-setting-values [site-url "https://example.com"]+ (is (map? (mt/user-http-request :crowberto :get 200 "slack/manifest")))))))(deftest ^:parallel manifest-test-2(testing "GET /api/slack/manifest"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/core_test.clj b/test/metabase/metabot/agent/core_test.cljsimilarity index 95%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/core_test.cljrename to test/metabase/metabot/agent/core_test.cljindex e9dc6511fd2..2dad7d3b2c9 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/core_test.clj+++ b/test/metabase/metabot/agent/core_test.clj@@ -1,16 +1,16 @@-(ns metabase-enterprise.metabot-v3.agent.core-test+(ns metabase.metabot.agent.core-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.analytics :as agent-analytics]- [metabase-enterprise.metabot-v3.agent.core :as agent]- [metabase-enterprise.metabot-v3.agent.memory :as memory]- [metabase-enterprise.metabot-v3.api :as api]- [metabase-enterprise.metabot-v3.self :as self]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.test-util :as mut]- [metabase-enterprise.metabot-v3.tools.search :as metabot-search][metabase.analytics.prometheus :as prometheus][metabase.analytics.snowplow-test :as snowplow-test]+ [metabase.metabot.agent.analytics :as agent-analytics]+ [metabase.metabot.agent.core :as agent]+ [metabase.metabot.agent.memory :as memory]+ [metabase.metabot.api :as api]+ [metabase.metabot.self :as self]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.test-util :as mut]+ [metabase.metabot.tools.search :as metabot-search][metabase.test :as mt][metabase.test.util :as tu][metabase.util.malli :as mu]))@@ -25,7 +25,10 @@{:structured-output {:data [{:id 1 :name "Test Result"}]}})(def test-tools- {"search" #'test-search-tool})+ {"search" {:tool-name "search"+ :schema (:schema (meta #'test-search-tool))+ :doc (:doc (meta #'test-search-tool))+ :fn test-search-tool}})(defn- run-agent-loop!"run-agent-loop for side effects, discarding results"@@ -117,7 +120,7 @@(testing "handles errors gracefully"(with-redefs [openrouter/openrouter (fn [_](throw (ex-info "Mock error" {})))]- (let [result (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :fatal]+ (let [result (mt/with-log-level [metabase.metabot.agent.core :fatal](into [] (agent/run-agent-loop{:messages [{:role :user :content "Hi"}]:state {}@@ -346,7 +349,7 @@:data-type "state":data {:queries map?:charts map?}}]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (mt/with-log-level [metabase.metabot.agent.core :warn](into [] (#'api/combine-text-parts-xf)(agent/run-agent-loop{:messages [{:role :user@@ -380,7 +383,7 @@{:type :text :text "Done"}{:type :usage :usage {:promptTokens 150 :completionTokens 30}:model "gpt-4" :id "msg-2"}]))))]- (let [result (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (let [result (mt/with-log-level [metabase.metabot.agent.core :warn](into [] (agent/run-agent-loop{:messages [{:role :user :content "test"}]:state {}@@ -415,7 +418,7 @@{:type :text :text "Done"}{:type :usage :usage {:promptTokens 200 :completionTokens 40}:model "model-b" :id "msg-2"}]))))]- (let [result (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (let [result (mt/with-log-level [metabase.metabot.agent.core :warn](into [] (agent/run-agent-loop{:messages [{:role :user :content "test"}]:state {}@@ -442,7 +445,7 @@[{:type :text :text "Hello after retry"}])))](is (=? [{:type :text :text "Hello after retry"}{:type :data :data-type "state"}]- (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (mt/with-log-level [metabase.metabot.self :fatal](into [] (#'api/combine-text-parts-xf)(agent/run-agent-loop{:messages [{:role :user :content "Hi"}]@@ -470,7 +473,7 @@:arguments {:query "test"}}])(mut/mock-llm-response[{:type :text :text "Done"}]))))]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (mt/with-log-level [metabase.metabot.agent.core :warn](run-agent-loop! {:messages [{:role :user :content "test"}]:state {}:profile-id :internal@@ -498,7 +501,7 @@(testing "records agent-errors on failure"(with-redefs [openrouter/openrouter (fn [_] (throw (ex-info "boom" {})))]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :fatal]+ (mt/with-log-level [metabase.metabot.agent.core :fatal](run-agent-loop! {:messages [{:role :user :content "test"}]:state {}:profile-id :internal@@ -544,7 +547,7 @@:model "test-model" :id "msg-2"}]))))metabot-search/search(fn [_args] [{:id 1 :type "table" :name "test" :display_name "Test" :database_id 1}])]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (mt/with-log-level [metabase.metabot.agent.core :warn](mt/with-current-user rasta-id(snowplow-test/with-fake-snowplow-collector(run-agent-loop! {:messages [{:role :user :content "test"}]@@ -588,7 +591,7 @@:model "test-model" :id "msg-2"}]))))metabot-search/search(fn [_args] (throw (ex-info "should not be called" {})))]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (mt/with-log-level [metabase.metabot.agent.core :warn](mt/with-current-user rasta-id(snowplow-test/with-fake-snowplow-collector(run-agent-loop! {:messages [{:role :user :content "test"}]@@ -623,7 +626,7 @@{:type :text :text "Done"}{:type :usage :usage {:promptTokens 150 :completionTokens 30}:model "test-model" :id "msg-2"}]))))]- (mt/with-log-level [metabase-enterprise.metabot-v3.agent.core :warn]+ (mt/with-log-level [metabase.metabot.agent.core :warn](mt/with-current-user rasta-id(snowplow-test/with-fake-snowplow-collector(run-agent-loop! {:messages [{:role :user :content "test"}]@@ -720,12 +723,12 @@agent-analytics/classify-and-track-user-intent-async!(fn [_ _] (swap! classify-called inc))]- (testing "does not call classify-and-track-user-intent-async! when ee-ai-metabot-internal-tasks-enabled? is false"- (mt/with-temporary-setting-values [ee-ai-metabot-internal-tasks-enabled? false]+ (testing "does not call classify-and-track-user-intent-async! when llm-metabot-internal-tasks-enabled? is false"+ (mt/with-temporary-setting-values [llm-metabot-internal-tasks-enabled? false](run-agent-loop! opts)(is (zero? @classify-called))))- (testing "calls classify-and-track-user-intent-async! when ee-ai-metabot-internal-tasks-enabled? is true"- (mt/with-temporary-setting-values [ee-ai-metabot-internal-tasks-enabled? true]+ (testing "calls classify-and-track-user-intent-async! when llm-metabot-internal-tasks-enabled? is true"+ (mt/with-temporary-setting-values [llm-metabot-internal-tasks-enabled? true](run-agent-loop! opts)(is (= 1 @classify-called)))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/links_test.clj b/test/metabase/metabot/agent/links_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/links_test.cljrename to test/metabase/metabot/agent/links_test.cljindex 0be0937ff02..dfb1a4fdf7b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/links_test.clj+++ b/test/metabase/metabot/agent/links_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.agent.links-test+(ns metabase.metabot.agent.links-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.links :as links]))+ [metabase.metabot.agent.links :as links]))(deftest resolve-metabase-uri-test(testing "resolves query links"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/markdown_link_buffer_test.clj b/test/metabase/metabot/agent/markdown_link_buffer_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/markdown_link_buffer_test.cljrename to test/metabase/metabot/agent/markdown_link_buffer_test.cljindex 3b42c7ef954..ddcfb102f1b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/markdown_link_buffer_test.clj+++ b/test/metabase/metabot/agent/markdown_link_buffer_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.agent.markdown-link-buffer-test+(ns metabase.metabot.agent.markdown-link-buffer-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.markdown-link-buffer :as mlb]+ [metabase.metabot.agent.markdown-link-buffer :as mlb][metabase.system.core :as system]))(defn- processdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/memory_test.clj b/test/metabase/metabot/agent/memory_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/memory_test.cljrename to test/metabase/metabot/agent/memory_test.cljindex c1e787c3c74..2d55b401f3e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/memory_test.clj+++ b/test/metabase/metabot/agent/memory_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.agent.memory-test+(ns metabase.metabot.agent.memory-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.memory :as memory]))+ [metabase.metabot.agent.memory :as memory]))(deftest initialize-test(testing "initializes memory with messages and state"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/messages_test.clj b/test/metabase/metabot/agent/messages_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/messages_test.cljrename to test/metabase/metabot/agent/messages_test.cljindex 5ed59e75830..51779f13673 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/messages_test.clj+++ b/test/metabase/metabot/agent/messages_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.agent.messages-test+(ns metabase.metabot.agent.messages-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.memory :as memory]- [metabase-enterprise.metabot-v3.agent.messages :as messages]))+ [metabase.metabot.agent.memory :as memory]+ [metabase.metabot.agent.messages :as messages]));;; ──────────────────────────────────────────────────────────────────;;; input-message->partsdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/profiles_test.clj b/test/metabase/metabot/agent/profiles_test.cljsimilarity index 93%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/profiles_test.cljrename to test/metabase/metabot/agent/profiles_test.cljindex 4345bbda0ce..d5d7c72a00f 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/profiles_test.clj+++ b/test/metabase/metabot/agent/profiles_test.clj@@ -1,13 +1,12 @@-(ns metabase-enterprise.metabot-v3.agent.profiles-test+(ns metabase.metabot.agent.profiles-test(:require[clojure.test :refer :all]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.agent.profiles :as profiles]+ [metabase.metabot.agent.profiles :as profiles][metabase.test :as mt]))(deftest get-profile-test(letfn [(tool-names [profile]- (set (map (comp :tool-name meta) (:tools profile))))]+ (set (map #(:tool-name (meta %)) (:tools profile))))](testing "retrieves embedding_next profile with default provider"(let [profile (profiles/get-profile :embedding_next)](is (some? profile))@@ -42,7 +41,6 @@(is (= 0.3 (:temperature profile)))(is (vector? (:tools profile)))(is (contains? (tool-names profile) "search"))- (is (contains? (tool-names profile) "get_transform_details"))(is (contains? (tool-names profile) "list_available_fields"))))(testing "retrieves sql profile"@@ -94,10 +92,10 @@(is (every? var? (:tools profile))))))))(deftest get-profile-respects-provider-setting-test- (testing "model reflects ee-ai-metabot-provider setting"- (mt/with-temporary-setting-values [llm/ee-ai-metabot-provider "openai/gpt-4.1-mini"]+ (testing "model reflects llm-metabot-provider setting"+ (mt/with-temporary-setting-values [llm-metabot-provider "openai/gpt-4.1-mini"](is (= "openai/gpt-4.1-mini" (:model (profiles/get-profile :internal)))))- (mt/with-temporary-setting-values [llm/ee-ai-metabot-provider "openrouter/google/gemini-2.5-flash"]+ (mt/with-temporary-setting-values [llm-metabot-provider "openrouter/google/gemini-2.5-flash"](is (= "openrouter/google/gemini-2.5-flash" (:model (profiles/get-profile :embedding_next)))))))(deftest get-tools-for-profile-capabilities-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/prompts_test.clj b/test/metabase/metabot/agent/prompts_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/prompts_test.cljrename to test/metabase/metabot/agent/prompts_test.cljindex 9646379a10d..4fab5640f18 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/prompts_test.clj+++ b/test/metabase/metabot/agent/prompts_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.agent.prompts-test+(ns metabase.metabot.agent.prompts-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.prompts :as prompts]))+ [metabase.metabot.agent.prompts :as prompts]))(deftest load-system-prompt-template-test(testing "loads internal.selmer template"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/streaming_test.clj b/test/metabase/metabot/agent/streaming_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/streaming_test.cljrename to test/metabase/metabot/agent/streaming_test.cljindex 402372883ee..af97d6e73ed 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/streaming_test.clj+++ b/test/metabase/metabot/agent/streaming_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.agent.streaming-test+(ns metabase.metabot.agent.streaming-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.streaming :as streaming]))+ [metabase.metabot.agent.streaming :as streaming]))(deftest navigate-to-part-test(testing "creates correct navigate_to data part structure"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tool_output_test.clj b/test/metabase/metabot/agent/tool_output_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tool_output_test.cljrename to test/metabase/metabot/agent/tool_output_test.cljindex 56cdc710f8d..05ce4d842aa 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tool_output_test.clj+++ b/test/metabase/metabot/agent/tool_output_test.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.agent.tool-output-test+(ns metabase.metabot.agent.tool-output-test"Tests that agent-level tools return pre-formatted `:output` stringssuitable for LLM consumption — not raw data in `:structured-output`.@@ -6,11 +6,11 @@leak EDN/Clojure data structures to the LLM."(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.tools.metadata :as metadata-tools]- [metabase-enterprise.metabot-v3.agent.tools.resources :as resource-tools]- [metabase-enterprise.metabot-v3.agent.tools.search :as search-tools][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.agent.tools.metadata :as metadata-tools]+ [metabase.metabot.agent.tools.resources :as resource-tools]+ [metabase.metabot.agent.tools.search :as search-tools][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.warehouse-schema.models.field-values :as field-values]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/document_test.clj b/test/metabase/metabot/agent/tools/document_test.cljsimilarity index 91%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/document_test.cljrename to test/metabase/metabot/agent/tools/document_test.cljindex 46ef6dd6a17..88afaa2c0b2 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/document_test.clj+++ b/test/metabase/metabot/agent/tools/document_test.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.agent.tools.document-test+(ns metabase.metabot.agent.tools.document-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.tools.construct :as construct-tools]- [metabase-enterprise.metabot-v3.agent.tools.document :as document-tools]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.table-utils :as table-utils]- [metabase-enterprise.metabot-v3.tools.create-sql-query :as create-sql-query-tools]+ [metabase.metabot.agent.tools.construct :as construct-tools]+ [metabase.metabot.agent.tools.document :as document-tools]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.table-utils :as table-utils]+ [metabase.metabot.tools.create-sql-query :as create-sql-query-tools][metabase.warehouses.core :as warehouses]))(deftest document-schema-collect-tool-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/slackbot_query_test.clj b/test/metabase/metabot/agent/tools/slackbot_query_test.cljsimilarity index 85%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/slackbot_query_test.cljrename to test/metabase/metabot/agent/tools/slackbot_query_test.cljindex 69ebdaaf77a..06982363520 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/slackbot_query_test.clj+++ b/test/metabase/metabot/agent/tools/slackbot_query_test.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.agent.tools.slackbot-query-test+(ns metabase.metabot.agent.tools.slackbot-query-test"Tests for slackbot query tool schema and prompt content."(:require[clojure.java.io :as io][clojure.string :as str][clojure.test :refer :all][malli.json-schema :as mjs]- [metabase-enterprise.metabot-v3.agent.tools.slackbot-query]))+ [metabase.metabot.agent.tools.slackbot-query]));;; ---------------------------------------- prompt content tests ---------------------------------------------------@@ -25,7 +25,7 @@(deftest display-field-has-description-test(testing "display field in slackbot-query-schema has a description in JSON Schema"- (let [schema @#'metabase-enterprise.metabot-v3.agent.tools.slackbot-query/slackbot-query-schema+ (let [schema @#'metabase.metabot.agent.tools.slackbot-query/slackbot-query-schemajson-schema (mjs/transform schema)display-prop (get-in json-schema [:properties :display])](is (some? (:description display-prop))@@ -35,7 +35,7 @@(deftest display-field-is-optional-test(testing "display field is not in the required list"- (let [schema @#'metabase-enterprise.metabot-v3.agent.tools.slackbot-query/slackbot-query-schema+ (let [schema @#'metabase.metabot.agent.tools.slackbot-query/slackbot-query-schemajson-schema (mjs/transform schema)required (set (:required json-schema))](is (not (contains? required "display"))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/sql_test.clj b/test/metabase/metabot/agent/tools/sql_test.cljsimilarity index 97%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/sql_test.cljrename to test/metabase/metabot/agent/tools/sql_test.cljindex 67cd228cd57..db922029321 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/sql_test.clj+++ b/test/metabase/metabot/agent/tools/sql_test.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.agent.tools.sql-test+(ns metabase.metabot.agent.tools.sql-test"Tests that agent-level SQL tools produce correctly formatted :output stringswith preambles, query IDs in links, and operation-specific instructions."(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.agent.tools.sql :as agent-sql][metabase.lib.core :as lib]+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.agent.tools.sql :as agent-sql][metabase.test :as mt]))(deftest create-sql-query-output-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/subscriptions_test.clj b/test/metabase/metabot/agent/tools/subscriptions_test.cljsimilarity index 92%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/subscriptions_test.cljrename to test/metabase/metabot/agent/tools/subscriptions_test.cljindex 378405a30ec..d04540cc0fc 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/subscriptions_test.clj+++ b/test/metabase/metabot/agent/tools/subscriptions_test.clj@@ -1,23 +1,22 @@-(ns metabase-enterprise.metabot-v3.agent.tools.subscriptions-test+(ns metabase.metabot.agent.tools.subscriptions-test"Tests for the create_dashboard_subscription agent tool wrapper."(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.tools.subscriptions :as agent-subscriptions]- [metabase-enterprise.metabot-v3.tools.create-dashboard-subscription :as subscription-tools][metabase.channel.settings :as channel.settings]+ [metabase.metabot.agent.tools.subscriptions :as agent-subscriptions]+ [metabase.metabot.tools.create-dashboard-subscription :as subscription-tools][metabase.test :as mt]));;; ------------------------------------------ schema / metadata tests -----------------------------------------------(deftest create-dashboard-subscription-tool-schema-test- (testing "tool has correct :tool-name metadata"- (let [tool-meta (meta #'agent-subscriptions/create-dashboard-subscription-tool)]- (is (= "create_dashboard_subscription" (:tool-name tool-meta)))))+ (let [m (meta #'agent-subscriptions/create-dashboard-subscription-tool)]+ (testing "tool has correct :tool-name"+ (is (= "create_dashboard_subscription" (:tool-name m))))- (testing "tool schema matches expected shape"- (let [tool-meta (meta #'agent-subscriptions/create-dashboard-subscription-tool)]- (is (some? (:schema tool-meta)))- (is (string? (:doc tool-meta))))))+ (testing "tool var has expected metadata"+ (is (some? (:schema m)))+ (is (string? (:doc m))))));;; --------------------------------------- integration tests (with-temp) -------------------------------------------@@ -40,9 +39,6 @@(deftest create-dashboard-subscription-invalid-dashboard-id-test(testing "non-integer dashboard_id → 'invalid dashboard_id'"(mt/with-current-user (mt/user->id :crowberto)- ;; The underlying tool checks (int? dashboard-id), and the agent wrapper- ;; passes the value through. If the schema lets a string through we'd still- ;; get the right error from the underlying tool.(with-redefs [subscription-tools/create-dashboard-subscription(fn [{:keys [dashboard-id]}](if (int? dashboard-id)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/transforms_test.clj b/test/metabase/metabot/agent/tools/transforms_test.cljsimilarity index 95%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/transforms_test.cljrename to test/metabase/metabot/agent/tools/transforms_test.cljindex ebef9dfdd80..296d929179b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools/transforms_test.clj+++ b/test/metabase/metabot/agent/tools/transforms_test.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.agent.tools.transforms-test+(ns metabase.metabot.agent.tools.transforms-test"Tests for agent-level transform tool wrappers, particularly thedependency checking integration in write-transform-sql-tool."(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.tools.shared :as shared]- [metabase-enterprise.metabot-v3.agent.tools.transforms :as agent-transforms]- [metabase-enterprise.metabot-v3.tools.dependencies :as deps]- [metabase-enterprise.metabot-v3.tools.transforms-write :as transforms-write]))+ [metabase.metabot.agent.tools.shared :as shared]+ [metabase.metabot.agent.tools.transforms :as agent-transforms]+ [metabase.metabot.tools.dependencies :as deps]+ [metabase.metabot.tools.transforms-write :as transforms-write]));;; ----------------------------------- dependency check integration tests -------------------------------------------diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools_test.clj b/test/metabase/metabot/agent/tools_test.cljsimilarity index 72%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools_test.cljrename to test/metabase/metabot/agent/tools_test.cljindex c014dc9e900..40ed4dc4674 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/tools_test.clj+++ b/test/metabase/metabot/agent/tools_test.clj@@ -1,21 +1,20 @@-(ns metabase-enterprise.metabot-v3.agent.tools-test+(ns metabase.metabot.agent.tools-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.profiles :as profiles]- [metabase-enterprise.metabot-v3.agent.tools :as agent-tools]- [metabase-enterprise.metabot-v3.tools.create-chart :as create-chart-tools]- [metabase-enterprise.metabot-v3.tools.filters :as filter-tools]))+ [metabase.metabot.agent.profiles :as profiles]+ [metabase.metabot.agent.tools :as agent-tools]+ [metabase.metabot.tools.create-chart :as create-chart-tools]+ [metabase.metabot.tools.filters :as filter-tools]))(deftest all-tools-test- (testing "profile tools are vars with tool metadata"+ (testing "profile tools are vars with required metadata"(let [tool-vars (mapcat :tools (vals @@#'profiles/*profiles))](is (seq tool-vars))(doseq [tool-var tool-vars]- (let [tool-meta (meta tool-var)]- (is (var? tool-var))- (is (some? tool-meta))- (is (string? (:tool-name tool-meta)))- (is (some? (:schema tool-meta))))))))+ (is (var? tool-var))+ (let [m (meta tool-var)]+ (is (string? (:tool-name m)))+ (is (some? (:schema m))))))))(deftest filter-by-capabilities-test(testing "returns tools with no capability requirements when capabilities empty"@@ -29,39 +28,25 @@#'agent-tools/create-autogenerated-dashboard-tool]capabilities #{}result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= [#'agent-tools/search-tool] (vec result)))))+ (is (= ["search"] (mapv #(:tool-name (meta %)) result)))))(testing "includes tools when capabilities are provided"(let [tool-vars [#'agent-tools/search-tool #'agent-tools/navigate-user-tool #'agent-tools/create-chart-tool]capabilities #{:frontend-navigate-user-v1}result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= tool-vars (vec result)))))-- (testing "filters transform tools by capabilities"- (let [tool-vars [#'agent-tools/write-transform-sql-tool- #'agent-tools/write-transform-python-tool- #'agent-tools/search-tool]- capabilities #{:feature-transforms :permission-write-transforms}- result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= [#'agent-tools/write-transform-sql-tool #'agent-tools/search-tool] (vec result)))))-- (testing "includes write_transform_python when all capabilities present"- (let [tool-vars [#'agent-tools/write-transform-python-tool #'agent-tools/search-tool]- capabilities #{:feature-transforms :feature-transforms-python :permission-write-transforms}- result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= tool-vars (vec result)))))+ (is (= tool-vars result))))(testing "filters snippet tools by capabilities"(let [tool-vars [#'agent-tools/list-snippets-tool #'agent-tools/get-snippet-details-tool #'agent-tools/search-tool]capabilities #{}result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= [#'agent-tools/search-tool] (vec result)))))+ (is (= ["search"] (mapv #(:tool-name (meta %)) result)))))(testing "includes snippet tools when capability present"(let [tool-vars [#'agent-tools/list-snippets-tool #'agent-tools/get-snippet-details-tool #'agent-tools/search-tool]capabilities #{:feature-snippets}result (#'profiles/filter-by-capabilities tool-vars capabilities)]- (is (= tool-vars (vec result))))))+ (is (= tool-vars result)))))(deftest get-tools-for-profile-test(testing "returns tools for embedding_next profile"@@ -84,7 +69,6 @@(let [tools (profiles/get-tools-for-profile :transforms_codegen #{})](is (map? tools))(is (contains? tools "search"))- (is (contains? tools "get_transform_details"))(is (contains? tools "list_available_fields"))(is (contains? tools "todo_write"))(is (contains? tools "todo_read"))))@@ -128,22 +112,19 @@(let [tools (profiles/get-tools-for-profile :unknown-profile #{})](is (empty? tools))))- (testing "returned tools have correct structure"+ (testing "returned tools are vars with correct metadata"(let [tools (profiles/get-tools-for-profile :embedding_next #{})](doseq [[tool-name tool-var] tools](is (var? tool-var))- (is (string? tool-name))))))+ (is (string? tool-name))+ (is (= tool-name (:tool-name (meta tool-var))))+ (is (some? (:schema (meta tool-var))))))))(deftest search-tool-test- (testing "search-tool exists and is a function"- (let [tool-var #'agent-tools/search-tool- tool-meta (meta tool-var)]- (is (some? tool-meta))- (is (some? (:tool-name tool-meta)))))-- (testing "search-tool is callable"- (let [tool-fn @#'agent-tools/search-tool]- (is (fn? tool-fn)))))+ (testing "search-tool var has valid metadata"+ (let [m (meta #'agent-tools/search-tool)]+ (is (= "search" (:tool-name m)))+ (is (some? (:schema m))))))(deftest construct-notebook-query-tool-raw-table-test(testing "construct_notebook_query maps raw table query args"@@ -203,98 +184,74 @@(is (contains? @#'agent-tools/state-dependent-tools "create_dashboard_subscription"))(is (contains? @#'agent-tools/state-dependent-tools "static_viz"))))-(defn ^{:doc "Test tool"- :schema [:=> [:cat [:map]] :any]- :prompt "test_tool.md"}- test-stateful-tool- [_]- nil)-(deftest wrap-tools-with-state-test(testing "wraps state-dependent tools with state injection"(let [memory-atom (atom {:state {:queries {"q1" {:database 1}}:charts {"c1" {:query-id "q1"}}}})base-tools {"create_sql_query" #'agent-tools/create-sql-query-tool"search" #'agent-tools/search-tool}- wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom)]+ wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom nil)]+ ;; State-dependent tool should be wrapped into a tool-def map(is (map? (get wrapped-tools "create_sql_query")))(is (contains? (get wrapped-tools "create_sql_query") :fn))(is (contains? (get wrapped-tools "create_sql_query") :doc))(is (contains? (get wrapped-tools "create_sql_query") :schema))- (is (contains? (get wrapped-tools "create_sql_query") :prompt))- (is (var? (get wrapped-tools "search")))))+ ;; Non-state-dependent tool should also be a tool-def map+ (is (map? (get wrapped-tools "search")))))(testing "wrapped tools preserve original metadata"(let [memory-atom (atom {:state {:queries {} :charts {}}})base-tools {"create_chart" #'agent-tools/create-chart-tool}- wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom)- wrapped-tool (get wrapped-tools "create_chart")- original-meta (meta #'agent-tools/create-chart-tool)]- (is (= (:doc original-meta) (:doc wrapped-tool)))- (is (= (:schema original-meta) (:schema wrapped-tool)))))-- (deftest wrap-tools-with-state-preserves-prompt-test- (testing "preserves prompt metadata for wrapped tools"- (let [memory-atom (atom {:state {:queries {} :charts {}}})- base-tools {"create_sql_query" #'test-stateful-tool}- wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom)]- (is (= "test_tool.md"- (get-in wrapped-tools ["create_sql_query" :prompt]))))))+ wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom nil)+ wrapped-tool (get wrapped-tools "create_chart")]+ (is (= (:doc (meta #'agent-tools/create-chart-tool)) (:doc wrapped-tool)))+ (is (= (:schema (meta #'agent-tools/create-chart-tool)) (:schema wrapped-tool)))))(testing "wrapped function receives augmented args with state"- (let [seen-memory (atom nil)- memory-atom (atom {:state {:queries {"test-query" {:db 1}}+ (let [memory-atom (atom {:state {:queries {"test-query" {:db 1}}:charts {"test-chart" {:type :bar}}}})- test-stateful-tool- (with-meta- (fn [_] (reset! seen-memory @#'agent-tools/*memory-atom*) {:output "ok"})- {:doc "Test tool"- :schema [:=> [:cat [:map]] :any]- :prompt "test_tool.md"})- wrapped (agent-tools/wrap-tools-with-state {"create_sql_query" test-stateful-tool} memory-atom)+ wrapped (agent-tools/wrap-tools-with-state {"create_sql_query" #'agent-tools/create-sql-query-tool} memory-atom nil)wrapped-fn (get-in wrapped ["create_sql_query" :fn])]- (wrapped-fn {:database_id 1 :sql_query "SELECT 1"})- (is (= memory-atom @seen-memory))))+ ;; Just verify the wrapped function is callable+ (is (fn? wrapped-fn))))- (testing "non-state-dependent tools are not modified"+ (testing "non-state-dependent tools are also wrapped into tool-def maps"(let [memory-atom (atom {:state {:queries {"q1" {:db 1}} :charts {}}})base-tools {"search" #'agent-tools/search-tool"construct_notebook_query" #'agent-tools/construct-notebook-query-tool}- wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom)]- (is (var? (get wrapped-tools "search")))- (is (var? (get wrapped-tools "construct_notebook_query"))))))+ wrapped-tools (agent-tools/wrap-tools-with-state base-tools memory-atom nil)]+ ;; All tools are converted to tool-def maps+ (is (map? (get wrapped-tools "search")))+ (is (fn? (:fn (get wrapped-tools "search"))))+ (is (map? (get wrapped-tools "construct_notebook_query")))+ (is (fn? (:fn (get wrapped-tools "construct_notebook_query")))))))(deftest tool-schemas-exclude-state-keys-test(testing "create_chart schema does not expose state keys"- (let [tool-var #'agent-tools/create-chart-tool- {:keys [schema]} (meta tool-var)+ (let [{:keys [schema]} (meta #'agent-tools/create-chart-tool)[_:=> [_:cat params] _out] schema](is (not-any? #(= :charts_state (first %)) (rest params)))))(testing "edit_chart schema does not expose state keys"- (let [tool-var #'agent-tools/edit-chart-tool- {:keys [schema]} (meta tool-var)+ (let [{:keys [schema]} (meta #'agent-tools/edit-chart-tool)[_:=> [_:cat params] _out] schema](is (not-any? #(= :queries_state (first %)) (rest params)))))(testing "create_sql_query schema does not expose state keys"- (let [tool-var #'agent-tools/create-sql-query-tool- {:keys [schema]} (meta tool-var)+ (let [{:keys [schema]} (meta #'agent-tools/create-sql-query-tool)[_:=> [_:cat params] _out] schema](is (not-any? #(= :queries_state (first %)) (rest params)))(is (not-any? #(= :charts_state (first %)) (rest params)))(is (not-any? #(= :memory_atom (first %)) (rest params)))))(testing "edit_sql_query schema does not expose state keys"- (let [tool-var #'agent-tools/edit-sql-query-tool- {:keys [schema]} (meta tool-var)+ (let [{:keys [schema]} (meta #'agent-tools/edit-sql-query-tool)[_:=> [_:cat params] _out] schema](is (not-any? #(= :queries_state (first %)) (rest params)))(is (not-any? #(= :charts_state (first %)) (rest params)))))(testing "replace_sql_query schema does not expose state keys"- (let [tool-var #'agent-tools/replace-sql-query-tool- {:keys [schema]} (meta tool-var)+ (let [{:keys [schema]} (meta #'agent-tools/replace-sql-query-tool)[_:=> [_:cat params] _out] schema](is (not-any? #(= :queries_state (first %)) (rest params)))(is (not-any? #(= :charts_state (first %)) (rest params))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/user_context_test.clj b/test/metabase/metabot/agent/user_context_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/agent/user_context_test.cljrename to test/metabase/metabot/agent/user_context_test.cljindex ba6986ea1f0..d9456fca3e8 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/agent/user_context_test.clj+++ b/test/metabase/metabot/agent/user_context_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.agent.user-context-test+(ns metabase.metabot.agent.user-context-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.user-context :as user-context]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]+ [metabase.metabot.agent.user-context :as user-context]+ [metabase.metabot.tools.entity-details :as entity-details]+ [metabase.metabot.tools.llm-representations :as llm-rep][metabase.test :as mt]))(deftest format-current-time-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream1.txt b/test/metabase/metabot/aisdkstream1.txtsimilarity index 100%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream1.txtrename to test/metabase/metabot/aisdkstream1.txtdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream2.txt b/test/metabase/metabot/aisdkstream2.txtsimilarity index 100%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream2.txtrename to test/metabase/metabot/aisdkstream2.txtdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream3.txt b/test/metabase/metabot/aisdkstream3.txtsimilarity index 100%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream3.txtrename to test/metabase/metabot/aisdkstream3.txtdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream4.txt b/test/metabase/metabot/aisdkstream4.txtsimilarity index 100%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/aisdkstream4.txtrename to test/metabase/metabot/aisdkstream4.txtdiff --git a/test/metabase/metabot/api/describe_test.clj b/test/metabase/metabot/api/describe_test.cljnew file mode 100644index 00000000000..e15754d0b30--- /dev/null+++ b/test/metabase/metabot/api/describe_test.clj@@ -0,0 +1,83 @@+(ns metabase.metabot.api.describe-test+ (:require+ [clojure.test :refer :all]+ [metabase.metabot.openai-client :as openai-client]+ [metabase.test :as mt]+ [metabase.util.json :as json]))++(deftest summarize-card-test+ (testing "POST /api/metabot/describe/card"+ (mt/dataset test-data+ (mt/with-temp [:model/Card card {:name "Orders"+ :dataset_query+ {:database (mt/id)+ :type :query+ :query {:source-table (mt/id :orders)}}}]+ (let [fake-response {:title "Title" :description "Description"}+ json-response (json/encode fake-response)+ expected {:summary fake-response}]+ (testing "Card summarization works in the happy path"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content json-response}}]})]+ (is (= expected+ (mt/user-http-request :rasta :post 200 "metabot/describe/card" card)))))+ (testing "We can handle json in markdown"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content+ (format+ "```json%s```"+ json-response)}}]})]+ (is (= expected+ (mt/user-http-request :rasta :post 200 "metabot/describe/card" card)))))+ (testing "We can't handle bad responses"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content+ (format+ "This is not a good json message -- %s"+ json-response)}}]})]+ (is (= 500+ (get-in+ (mt/user-http-request :rasta :post 500 "metabot/describe/card" card)+ [:data :status-code]))))))))))++(deftest summarize-dashboard-test+ (testing "POST /api/metabot/describe/dashboard/:id"+ (mt/dataset test-data+ (mt/with-temp [:model/Card {card-id :id} {:name "Orders"+ :dataset_query+ {:database (mt/id)+ :type :query+ :query {:source-table (mt/id :orders)}}}+ :model/Dashboard {dash-id :id} {:name "Dashboard"}+ :model/DashboardCard {_ :id} {:dashboard_id dash-id+ :card_id card-id}]+ (let [url (format "metabot/describe/dashboard/%s" dash-id)+ fake-response {:description "Description"+ :keywords "awesome, amazing"+ :questions "- What is this?"}+ json-response (json/encode fake-response)+ expected {:summary {:description "Keywords: awesome, amazing\n\nDescription: Description\n\nQuestions:\n- What is this?"}}]+ (testing "Dashboard summarization works in the happy path"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content json-response}}]})]+ (is (= expected+ (mt/user-http-request :rasta :post 200 url)))))+ (testing "We can handle json in markdown"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content (format "```json%s```" json-response)}}]})]+ (is (= expected+ (mt/user-http-request :rasta :post 200 url)))))+ (testing "We can't handle bad responses"+ (with-redefs [openai-client/*create-chat-completion-endpoint*+ (fn [_ _]+ {:choices [{:message {:content+ (format "This is not a good json message -- %s" json-response)}}]})]+ (is (= 500+ (get-in+ (mt/user-http-request :rasta :post 500 url)+ [:data :status-code]))))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/api/document_test.clj b/test/metabase/metabot/api/document_test.cljsimilarity index 89%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/api/document_test.cljrename to test/metabase/metabot/api/document_test.cljindex 3fed55a3c7d..254e44b3d62 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/api/document_test.clj+++ b/test/metabase/metabot/api/document_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.api.document-test+(ns metabase.metabot.api.document-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.test-util :as mut][metabase.analytics.snowplow-test :as snowplow-test]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.test-util :as mut][metabase.test :as mt][metabase.test.fixtures :as fixtures]))@@ -22,7 +22,7 @@{:type :usage :usage {:promptTokens 100 :completionTokens 20}:model "test-model" :id "msg-1"}]))](mt/user-http-request :crowberto- :post 200 "ee/metabot-v3/document/native-generate-content"+ :post 200 "metabot/document/native-generate-content"{:instructions "Show me sales data"}))(is (== 1 (mt/metric-value system :metabase-metabot/agent-requests{:profile-id "document-generate-content"})))@@ -47,7 +47,7 @@:model "test-model" :id "msg-1"}]))](snowplow-test/with-fake-snowplow-collector(mt/user-http-request :rasta- :post 200 "ee/metabot-v3/document/native-generate-content"+ :post 200 "metabot/document/native-generate-content"{:instructions "Show me sales data"})(is (=? [{:user-id (str rasta-id):data {"model_id" "test-model"diff --git a/test/metabase/metabot/api/entity_analysis_test.clj b/test/metabase/metabot/api/entity_analysis_test.cljnew file mode 100644index 00000000000..c93036dd360--- /dev/null+++ b/test/metabase/metabot/api/entity_analysis_test.clj@@ -0,0 +1,18 @@+(ns metabase.metabot.api.entity-analysis-test+ (:require+ [clojure.test :refer :all]+ [metabase.metabot.client :as metabot-client]+ [metabase.test :as mt]))++(deftest analyze-chart-test+ (testing "POST /api/ai-entity-analysis/analyze-chart"+ (with-redefs [metabot-client/analyze-chart (constantly {:analysis "This chart shows a steady increase in sales over time, with a notable peak in Q4."})]+ (let [response (mt/user-http-request :rasta :post 200 "ai-entity-analysis/analyze-chart"+ {:image_base64 "base64encodedimage"+ :name "Sales Trend"+ :description "Quarterly sales data"+ :timeline_events [{:name "Product Launch"+ :description "New product line introduced"+ :timestamp "2023-04-15"}]})]+ (is (= {:summary "This chart shows a steady increase in sales over time, with a notable peak in Q4."}+ response))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/api/metabot_test.clj b/test/metabase/metabot/api/metabot_test.cljsimilarity index 85%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/api/metabot_test.cljrename to test/metabase/metabot/api/metabot_test.cljindex 63951579784..5116b837164 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/api/metabot_test.clj+++ b/test/metabase/metabot/api/metabot_test.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.api.metabot-test+(ns metabase.metabot.api.metabot-test(:require[clojure.set :as set][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.suggested-prompts :as metabot-v3.suggested-prompts][metabase.collections.models.collection :as collection][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.suggested-prompts :as metabot.suggested-prompts][metabase.permissions.core :as perms][metabase.permissions.models.permissions-group :as perms-group][metabase.test :as mt]@@ -66,10 +66,10 @@:tables :table_questions})))];; --------------------------- Generating sample prompts ---------------------------(testing "should generate prompt suggestions for metabot"- (with-redefs [metabot-v3.client/generate-example-questions prompt-generator]+ (with-redefs [metabot.client/generate-example-questions prompt-generator];; Trigger prompt generation by calling the regenerate endpoint(mt/user-http-request :crowberto :post 204- (format "ee/metabot-v3/metabot/%d/prompt-suggestions/regenerate" metabot-id)))+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))(let [added-prompts (t2/select [:model/MetabotPrompt [:card.name :model_name] :prompt]:metabot_id metabot-id{:join [[:report_card :card] [:= :card.id :card_id]]@@ -81,14 +81,14 @@;; --------------------------- Querying sample prompts ---------------------------(let [expected-prompts (into #{} (mapcat val) prompts)all-prompts (mt/user-http-request :rasta :get 200- (format "ee/metabot-v3/metabot/%d/prompt-suggestions" metabot-id))]+ (format "metabot/metabot/%d/prompt-suggestions" metabot-id))](testing "can get all prompts"(is (= (count expected-prompts) (:total all-prompts)))(is (= expected-prompts (into #{} (map :prompt) (:prompts all-prompts)))))(testing "can page through the prompts"(let [offset 3limit 5- url (format "ee/metabot-v3/metabot/%d/prompt-suggestions?offset=%d&limit=%d"+ url (format "metabot/metabot/%d/prompt-suggestions?offset=%d&limit=%d"metabot-id offset limit)page-prompts (mt/user-http-request :rasta :get 200 url)](is (= {:prompts (->> all-prompts :prompts (drop offset) (take limit))@@ -96,7 +96,7 @@page-prompts))))(testing "can filter by model type"(doseq [model-type ["metric" "model"]]- (let [url (format "ee/metabot-v3/metabot/%d/prompt-suggestions?model=%s" metabot-id model-type)+ (let [url (format "metabot/metabot/%d/prompt-suggestions?model=%s" metabot-id model-type)expected-prompts (->> all-prompts :prompts (filter (comp #{model-type} :model)))filtered-prompts (mt/user-http-request :rasta :get 200 url)](is (= {:prompts expected-prompts@@ -104,7 +104,7 @@filtered-prompts)))))(testing "can filter by model type and model ID"(let [selected-prompt (rand-nth (:prompts all-prompts))- url (format "ee/metabot-v3/metabot/%d/prompt-suggestions?model=%s&model_id=%d"+ url (format "metabot/metabot/%d/prompt-suggestions?model=%s&model_id=%d"metabot-id (:model selected-prompt) (:model_id selected-prompt))expected-prompts (->> all-prompts :prompts (filter (comp #{(:model_id selected-prompt)} :model_id)))filtered-prompts (mt/user-http-request :rasta :get 200 url)]@@ -113,7 +113,7 @@filtered-prompts))))(testing "can return a sample"(let [limit 5- url (format "ee/metabot-v3/metabot/%d/prompt-suggestions?sample=true&limit=%d"+ url (format "metabot/metabot/%d/prompt-suggestions?sample=true&limit=%d"metabot-id limit)expected-prompts? (fn [prompts](and (= (count prompts) limit)@@ -126,7 +126,7 @@(let [all-prompt-ids (into #{} (map :id) (:prompts all-prompts))current-prompt-ids #(t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)selected-prompt (rand-nth (:prompts all-prompts))- url (format "ee/metabot-v3/metabot/%d/prompt-suggestions/%d" metabot-id (:id selected-prompt))+ url (format "metabot/metabot/%d/prompt-suggestions/%d" metabot-id (:id selected-prompt))remaining-prompt-ids (disj all-prompt-ids (:id selected-prompt))](testing "deleting a specific prompt"@@ -138,19 +138,19 @@(is (= remaining-prompt-ids (current-prompt-ids)))))(testing "generating new prompts"- (let [url (format "ee/metabot-v3/metabot/%d/prompt-suggestions/regenerate" metabot-id)]+ (let [url (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)](testing "normal users are not allowed"(mt/user-http-request :rasta :post 403 url)(is (= remaining-prompt-ids (current-prompt-ids))))(testing "admin users are allowed"- (with-redefs [metabot-v3.client/generate-example-questions prompt-generator]+ (with-redefs [metabot.client/generate-example-questions prompt-generator](mt/user-http-request :crowberto :post 204 url)))))(let [new-prompt-ids (current-prompt-ids)](is (= (count all-prompt-ids) (count new-prompt-ids)))(is (empty? (set/intersection all-prompt-ids new-prompt-ids)))(testing "can delete all prompts"- (let [url (format "ee/metabot-v3/metabot/%d/prompt-suggestions" metabot-id)]+ (let [url (format "metabot/metabot/%d/prompt-suggestions" metabot-id)](testing "normal users cannot delete"(mt/user-http-request :rasta :delete 403 url)(is (= new-prompt-ids (current-prompt-ids))))@@ -159,7 +159,7 @@(is (nil? (current-prompt-ids)))))))))))))))(deftest metabot-list-test- (testing "GET /api/ee/metabot-v3/metabot"+ (testing "GET /api/metabot/metabot"(mt/with-premium-features #{:metabot-v3}(with-clean-metabots(mt/with-temp [:model/Metabot {metabot-id-1 :id} {:name "Alpha Metabot"}@@ -167,7 +167,7 @@:model/Metabot {metabot-id-3 :id} {:name "Gamma Metabot"}](testing "should return all metabots in alphabetical order by name"- (let [{response :items} (mt/user-http-request :crowberto :get 200 "ee/metabot-v3/metabot")]+ (let [{response :items} (mt/user-http-request :crowberto :get 200 "metabot/metabot")](is (= 3 (count response)))(is (= ["Alpha Metabot" "Beta Metabot" "Gamma Metabot"](mapv :name response)))@@ -176,10 +176,10 @@(testing "should require superuser permissions"(is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :get 403 "ee/metabot-v3/metabot")))))))))+ (mt/user-http-request :rasta :get 403 "metabot/metabot")))))))))(deftest metabot-get-single-test- (testing "GET /api/ee/metabot-v3/metabot/:id"+ (testing "GET /api/metabot/metabot/:id"(mt/with-premium-features #{:metabot-v3}(mt/with-temp [:model/Collection {collection-id :id} {:name "Test Collection"}:model/Metabot {metabot-id :id} {:name "Test Metabot"@@ -189,7 +189,7 @@(testing "should return metabot with all fields"(let [response (mt/user-http-request :crowberto :get 200- (format "ee/metabot-v3/metabot/%d" metabot-id))]+ (format "metabot/metabot/%d" metabot-id))](is (= metabot-id (:id response)))(is (= "Test Metabot" (:name response)))(is (= "Test Description" (:description response)))@@ -199,15 +199,15 @@(testing "should require superuser permissions"(is (= "You don't have permissions to do that."(mt/user-http-request :rasta :get 403- (format "ee/metabot-v3/metabot/%d" metabot-id)))))+ (format "metabot/metabot/%d" metabot-id)))))(testing "should return 404 for non-existent metabot"(is (= "Not found."(mt/user-http-request :crowberto :get 404- (format "ee/metabot-v3/metabot/%d" Integer/MAX_VALUE)))))))))+ (format "metabot/metabot/%d" Integer/MAX_VALUE)))))))))(deftest metabot-put-test- (testing "PUT /api/ee/metabot-v3/metabot/:id"+ (testing "PUT /api/metabot/metabot/:id"(mt/with-premium-features #{:metabot-v3 :content-verification}(mt/with-temp [:model/Collection {collection-id-1 :id} {:name "Collection 1"}:model/Collection {collection-id-2 :id} {:name "Collection 2"}@@ -216,9 +216,9 @@:collection_id collection-id-1}](testing "should update use_verified_content field"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts (constantly nil)]+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts (constantly nil)](let [response (mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content true})](is (true? (:use_verified_content response)))(is (= collection-id-1 (:collection_id response))) ; Should remain unchanged@@ -227,9 +227,9 @@(is (true? (:use_verified_content updated-metabot)))))))(testing "should update collection_id field"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts (constantly nil)]+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts (constantly nil)](let [response (mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:collection_id collection-id-2})](is (= collection-id-2 (:collection_id response)))(is (true? (:use_verified_content response))) ; Should remain from previous test@@ -238,9 +238,9 @@(is (= collection-id-2 (:collection_id updated-metabot)))))))(testing "should update collection_id to null"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts (constantly nil)]+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts (constantly nil)](let [response (mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:collection_id nil})](is (= nil (:collection_id response)));; Verify in database@@ -248,9 +248,9 @@(is (= nil (:collection_id updated-metabot)))))))(testing "should update all fields simultaneously"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts (constantly nil)]+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts (constantly nil)](let [response (mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content false:collection_id collection-id-1})](is (= false (:use_verified_content response)))@@ -259,25 +259,25 @@(testing "should require superuser permissions"(is (= "You don't have permissions to do that."(mt/user-http-request :rasta :put 403- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content true}))))(testing "should return 404 for non-existent metabot"(is (= "Not found."(mt/user-http-request :crowberto :put 404- (format "ee/metabot-v3/metabot/%d" Integer/MAX_VALUE)+ (format "metabot/metabot/%d" Integer/MAX_VALUE){:use_verified_content true}))))(testing "should prevent enabling verified content without premium feature"(mt/with-premium-features #{:metabot-v3} ; Only metabot-v3, no content-verification(is (= "Content verification is a paid feature not currently available to your instance. Please upgrade to use it. Learn more at metabase.com/upgrade/"(:message (mt/user-http-request :crowberto :put 402- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content true}))))))))))(deftest metabot-prompt-regeneration-on-config-change-test(mt/dataset test-data- (testing "PUT /api/ee/metabot-v3/metabot/:id should regenerate prompts when config changes"+ (testing "PUT /api/metabot/metabot/:id should regenerate prompts when config changes"(mt/with-premium-features #{:metabot-v3 :content-verification}(let [metric-query {:type :query, :database (mt/id), :query {:source-table (mt/id :products)}}model-query {:type :query, :database (mt/id), :query {:source-table (mt/id :products)}}]@@ -313,14 +313,14 @@(let [original-prompt-ids #{prompt-id-1 prompt-id-2}](testing "should regenerate prompts when use_verified_content changes"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts(fn [metabot-id](t2/insert! :model/MetabotPrompt {:metabot_id metabot-id:prompt "new prompt after verified change":model :metric:card_id card-id-3}))](mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content true});; Verify old prompts were deleted and new ones created@@ -331,14 +331,14 @@(is (= "new prompt after verified change" (:prompt (first current-prompts)))))))(testing "should regenerate prompts when collection_id changes"- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts(fn [metabot-id](t2/insert! :model/MetabotPrompt {:metabot_id metabot-id:prompt "new prompt after collection change":model :model:card_id card-id-4}))](mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:collection_id collection-id-2});; Verify prompts were regenerated again@@ -358,10 +358,10 @@;; Make a PUT request that doesn't change verified content or collection_id;; (This would be if we add other fields to update in the future)- (with-redefs [metabot-v3.suggested-prompts/generate-sample-prompts+ (with-redefs [metabot.suggested-prompts/generate-sample-prompts(fn [_] (throw (Exception. "Should not be called")))](mt/user-http-request :crowberto :put 200- (format "ee/metabot-v3/metabot/%d" metabot-id)+ (format "metabot/metabot/%d" metabot-id){:use_verified_content true ; Same as current value:collection_id collection-id-2})) ; Same as current value@@ -372,7 +372,7 @@(is (= "baseline prompt" (:prompt (first current-prompts))))))))))))))(deftest prompt-suggestions-collection-permissions-test- (testing "GET /api/ee/metabot-v3/metabot/:id/prompt-suggestions respects collection permissions"+ (testing "GET /api/metabot/metabot/:id/prompt-suggestions respects collection permissions"(mt/dataset test-data(mt/with-premium-features #{:metabot-v3}(let [mp (mt/metadata-provider)@@ -401,7 +401,7 @@(testing "admin sees all prompts"(let [response (mt/user-http-request :crowberto :get 200- (format "ee/metabot-v3/metabot/%d/prompt-suggestions" metabot-id))+ (format "metabot/metabot/%d/prompt-suggestions" metabot-id))prompts (set (map :prompt (:prompts response)))](is (= 2 (:total response)))(is (contains? prompts "Accessible prompt"))@@ -409,7 +409,7 @@(testing "non-admin user only sees prompts for cards in accessible collections"(let [response (mt/user-http-request :rasta :get 200- (format "ee/metabot-v3/metabot/%d/prompt-suggestions" metabot-id))+ (format "metabot/metabot/%d/prompt-suggestions" metabot-id))prompts (set (map :prompt (:prompts response)))](is (= 1 (:total response)))(is (contains? prompts "Accessible prompt"))diff --git a/enterprise/backend/test/metabase_enterprise/ai_sql_fixer/api_test.clj b/test/metabase/metabot/api/sql_fixer_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/ai_sql_fixer/api_test.cljrename to test/metabase/metabot/api/sql_fixer_test.cljindex b9fe297292f..04c699fe3e5 100644--- a/enterprise/backend/test/metabase_enterprise/ai_sql_fixer/api_test.clj+++ b/test/metabase/metabot/api/sql_fixer_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.ai-sql-fixer.api-test+(ns metabase.metabot.api.sql-fixer-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.table-utils :as table-utils][metabase.lib.core :as lib]+ [metabase.metabot.table-utils :as table-utils][metabase.test :as mt]))(deftest ^:parallel schema-sample-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/api_test.clj b/test/metabase/metabot/api_test.cljsimilarity index 85%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/api_test.cljrename to test/metabase/metabot/api_test.cljindex 5383166f7b1..fe0a006fe29 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/api_test.clj+++ b/test/metabase/metabot/api_test.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.api-test+(ns metabase.metabot.api-test(:require[clj-http.client :as http][clojure.core.async :as a]@@ -6,17 +6,17 @@[clojure.test :refer :all][compojure.response][medley.core :as m]- [metabase-enterprise.llm.settings :as llm.settings]- [metabase-enterprise.metabot-v3.api :as api]- [metabase-enterprise.metabot-v3.client :as client]- [metabase-enterprise.metabot-v3.client-test :as client-test]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.context :as metabot.context]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.settings :as metabot.settings]- [metabase-enterprise.metabot-v3.test-util :as mut]- [metabase-enterprise.metabot-v3.util :as metabot.u][metabase.config.core :as config]+ [metabase.llm.settings :as llm.settings]+ [metabase.metabot.api :as api]+ [metabase.metabot.client :as client]+ [metabase.metabot.client-test :as client-test]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.context :as metabot.context]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.settings :as metabot.settings]+ [metabase.metabot.test-util :as mut]+ [metabase.metabot.util :as metabot.u][metabase.search.test-util :as search.tu][metabase.server.instance :as server.instance][metabase.server.streaming-response :as sr]@@ -47,7 +47,7 @@(mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]](reset! ai-requests [])- (let [response (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (let [response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"(-> {:message (:content question):context {}:conversation_id conversation-id@@ -92,7 +92,7 @@(testing "Native agent streaming request"(mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (let [response (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (let [response (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"{:message (:content question):context {}:conversation_id conversation-id@@ -136,7 +136,7 @@(compojure.response/render(sr/streaming-response {:content-type "text/event-stream; charset=utf-8";; Transfer-Encoding: chunked is what makes normal .close on body fail- ;; See: `metabase-enterprise.metabot-v3.client/quick-closing-body`+ ;; See: `metabase.metabot.client/quick-closing-body`:headers {"Transfer-Encoding" "chunked"}} [os canceled-chan](try(loop []@@ -164,7 +164,7 @@(reset! messages msgs))sr/async-cancellation-poll-interval-ms 5](testing "Closing stream body will drop connection to LLM"- (let [body (mt/user-real-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (let [body (mt/user-real-request :rasta :post 202 "metabot/agent-streaming"{:request-options {:as :stream:decompress-body false}}{:message "Test closure"@@ -261,8 +261,8 @@(mt/with-premium-features #{:metabot-v3}(mt/with-temporary-setting-values [metabot.settings/use-native-agent true](let [real-http-post http/post]- (with-redefs [llm.settings/ee-openrouter-api-key (constantly "fake-key")- llm.settings/ee-openrouter-api-base-url (constantly llm-url)+ (with-redefs [llm.settings/llm-openrouter-api-key (constantly "fake-key")+ llm.settings/llm-openrouter-api-base-url (constantly llm-url);; The fake LLM server doesn't gzip, but clj-http wraps with;; GZIPInputStream by default. Closing mid-stream causes ZLIB errors.http/post (fn [url opts]@@ -274,7 +274,7 @@(testing "Closing stream body will drop connection to LLM"(reset! cnt total-chunks)(reset! stored-parts nil)- (let [body (mt/user-real-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (let [body (mt/user-real-request :rasta :post 202 "metabot/agent-streaming"{:request-options {:as :stream:decompress-body false}}{:message "Test closure"@@ -307,49 +307,12 @@(finally(.stop llm-server))))))-(deftest feedback-endpoint-test- (mt/with-premium-features #{:metabot-v3}- (mt/with-random-premium-token! [premium-token]- (let [store-url "http://hm.example"]- (testing "Submits feedback to Harbormaster with token and base URL"- (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/" premium-token)]- (mt/with-dynamic-fn-redefs- [http/post (fn [url opts]- (reset! captured {:url url- :body (json/decode+kw (:body opts))}))]- (let [_resp (mt/user-http-request :rasta :post 204 "ee/metabot-v3/feedback" feedback)]- (is (= {:url expected-url :body feedback}- @captured)))))))-- (testing "Returns 500 when http post fails"- (mt/with-temporary-setting-values [premium-embedding-token premium-token]- (mt/with-dynamic-fn-redefs- [http/post (fn [_url _opts]- (throw (ex-info "boom" {:status 404})))]- (mt/user-http-request :rasta :post 500 "ee/metabot-v3/feedback" {:any "payload"}))))-- ;; We're not testing the branch where the store-api-url is missing because that defsetting- ;; has the default value. It doesn't work well with `with-temporary-setting-values` helper.- (testing "Throws when premium token is missing"- (mt/with-temporary-setting-values [premium-embedding-token nil]- (mt/user-http-request :rasta :post 400 "ee/metabot-v3/feedback" {:foo "bar"})))))))-(deftest endpoints-require-authentication-test(mt/with-premium-features #{:metabot-v3}(testing "Metabot v3 endpoints require authentication"(testing "/agent-streaming"(is (= "Unauthenticated"- (mt/client :post 401 "ee/metabot-v3/agent-streaming"+ (mt/client :post 401 "metabot/agent-streaming"{:message "Test":context {}:conversation_id (str (random-uuid))@@ -357,7 +320,7 @@:state {}}))))(testing "/feedback"(is (= "Unauthenticated"- (mt/client :post 401 "ee/metabot-v3/feedback"+ (mt/client :post 401 "metabot/feedback"{:feedback {}})))))))(deftest metabot-enabled-setting-test@@ -376,32 +339,32 @@(mt/with-temporary-setting-values [metabot-enabled? false](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 403 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 403 "metabot/agent-streaming"base-request))))(testing "Regular metabot works when metabot-enabled is true"(mt/with-temporary-setting-values [metabot-enabled? true](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"(assoc base-request :conversation_id (str (random-uuid)))))))(testing "Embedded metabot is blocked when embedded-metabot-enabled? is false"(mt/with-temporary-setting-values [embedded-metabot-enabled? false](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 403 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 403 "metabot/agent-streaming"(assoc base-request- :metabot_id metabot-v3.config/embedded-metabot-id+ :metabot_id metabot.config/embedded-metabot-id:conversation_id (str (random-uuid)))))))(testing "Embedded metabot works when embedded-metabot-enabled? is true"(mt/with-temporary-setting-values [embedded-metabot-enabled? true](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"(assoc base-request- :metabot_id metabot-v3.config/embedded-metabot-id+ :metabot_id metabot.config/embedded-metabot-id:conversation_id (str (random-uuid)))))))(testing "Regular metabot still works when only embedded is disabled"@@ -409,7 +372,7 @@embedded-metabot-enabled? false](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"(assoc base-request :conversation_id (str (random-uuid)))))))(testing "Embedded metabot still works when only regular is disabled"@@ -417,9 +380,9 @@embedded-metabot-enabled? true](mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]]- (mt/user-http-request :rasta :post 202 "ee/metabot-v3/agent-streaming"+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"(assoc base-request- :metabot_id metabot-v3.config/embedded-metabot-id+ :metabot_id metabot.config/embedded-metabot-id:conversation_id (str (random-uuid)))))))))))(deftest extract-usage-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.clj b/test/metabase/metabot/client_test.cljsimilarity index 85%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.cljrename to test/metabase/metabot/client_test.cljindex 904b6173b2d..1f656e5cd78 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.clj+++ b/test/metabase/metabot/client_test.clj@@ -1,16 +1,16 @@-(ns metabase-enterprise.metabot-v3.client-test+(ns metabase.metabot.client-test(:require[clj-http.client :as http][clojure.core.async :as a][clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.client.schema :as metabot-v3.client.schema]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.suggested-prompts :as metabot-v3.suggested-prompts]- [metabase-enterprise.metabot-v3.util :as metabot-v3.util][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.client.schema :as metabot.client.schema]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.suggested-prompts :as metabot.suggested-prompts]+ [metabase.metabot.util :as metabot.util][metabase.test :as mt][metabase.util.json :as json][metabase.util.malli :as mu]@@ -21,16 +21,16 @@(set! *warn-on-reflection* true)-(mu/defn- make-mock-stream-response* [part-prefix finish-reason chunks usage :- ::metabot-v3.client.schema/usage]+(mu/defn- make-mock-stream-response* [part-prefix finish-reason chunks usage :- ::metabot.client.schema/usage](str (->> chunks(map #(str part-prefix (json/encode %) "\n"))(str/join))"d:" (json/encode {:finishReason finish-reason :usage usage})))-(mu/defn make-mock-text-stream-response [chunks usage :- ::metabot-v3.client.schema/usage]+(mu/defn make-mock-text-stream-response [chunks usage :- ::metabot.client.schema/usage](make-mock-stream-response* "0:" "stop" chunks usage))-(mu/defn make-mock-error-stream-response [chunks usage :- ::metabot-v3.client.schema/usage]+(mu/defn make-mock-error-stream-response [chunks usage :- ::metabot.client.schema/usage](make-mock-stream-response* "3:" "error" chunks usage))(defn mock-post! [^String body & [{:keys [delay-ms]@@ -77,14 +77,14 @@:state {:some "state"}}](mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)- (let [res (metabot-v3.client/streaming-request req)+ (let [res (metabot.client/streaming-request req)body (consume-streaming-response res)](is (instance? StreamingResponse res))(is (= "text/event-stream; charset=utf-8" (:content-type (.options ^StreamingResponse res))))(is (string? body))(is (=? [{:_type :TEXT :content "a1a2a3"}{:_type :FINISH_MESSAGE :finish_reason "stop"}]- (metabot-v3.util/aisdk->messages :assistant (str/split-lines body))))))))))+ (metabot.util/aisdk->messages :assistant (str/split-lines body))))))))))(deftest client-error-test(mt/with-premium-features #{:metabot-v3}@@ -100,14 +100,14 @@:state {:some "state"}}](mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)- (let [res (metabot-v3.client/streaming-request req)+ (let [res (metabot.client/streaming-request req)body (consume-streaming-response res)](is (instance? StreamingResponse res))(is (= "text/event-stream; charset=utf-8" (:content-type (.options ^StreamingResponse res))))(is (string? body))(is (=? [{:_type :ERROR :content "oof bad error!"}{:_type :FINISH_MESSAGE :finish_reason "error"}]- (metabot-v3.util/aisdk->messages :assistant (str/split-lines body))))))))))+ (metabot.util/aisdk->messages :assistant (str/split-lines body))))))))))(deftest streaming-request-with-callback-test(mt/with-premium-features #{:metabot-v3}@@ -123,24 +123,24 @@(testing "collects and returns all lines"(mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)- (let [lines (metabot-v3.client/streaming-request-with-callback req)]+ (let [lines (metabot.client/streaming-request-with-callback req)](is (sequential? lines))(is (pos? (count lines)))(is (=? [{:_type :TEXT :content "a1a2a3"}{:_type :FINISH_MESSAGE :finish_reason "stop"}]- (metabot-v3.util/aisdk->messages :assistant lines)))))))+ (metabot.util/aisdk->messages :assistant lines)))))))(testing "invokes on-line callback for each line"(mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)(let [callback-lines (atom [])- lines (metabot-v3.client/streaming-request-with-callback+ lines (metabot.client/streaming-request-with-callback(assoc req :on-line #(swap! callback-lines conj %)))](is (= lines @callback-lines))))))(testing "handles stream errors gracefully"(mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response {:delay-ms 10})](mt/with-current-user (mt/user->id :crowberto)(let [error-lines (atom [])- lines (metabot-v3.client/streaming-request-with-callback+ lines (metabot.client/streaming-request-with-callback(assoc req :on-line #(swap! error-lines conj %)))](is (sequential? lines))(is (= lines @error-lines)))))))))@@ -155,13 +155,13 @@(mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)(let [result (atom nil)- lines (metabot-v3.client/streaming-request-with-callback+ lines (metabot.client/streaming-request-with-callback(assoc req :on-complete #(reset! result %)))](is (= lines @result))))))(testing "works without on-complete"(mt/with-dynamic-fn-redefs [http/post (mock-post! mock-response)](mt/with-current-user (mt/user->id :crowberto)- (is (sequential? (metabot-v3.client/streaming-request-with-callback req)))))))))+ (is (sequential? (metabot.client/streaming-request-with-callback req)))))))))(deftest streaming-request-error-excludes-headers-test(testing "When streaming-request gets an error response, the exception should not include headers"@@ -181,7 +181,7 @@:body "Error message"})](mt/with-current-user (mt/user->id :crowberto)(let [ex (try- (metabot-v3.client/streaming-request req)+ (metabot.client/streaming-request req)nil(catch Exception ee))]@@ -195,8 +195,8 @@(deftest example-generation-payload-unknown-field-types-test(let [mp (mt/metadata-provider)- metabot-eid (get-in metabot-v3.config/metabot-config [metabot-v3.config/internal-metabot-id- :entity-id])+ metabot-eid (get-in metabot.config/metabot-config [metabot.config/internal-metabot-id+ :entity-id])original-collection-id (t2/select-one-fn :collection_id :model/Metabot :entity_id metabot-eid)];; Ensure internal metabot is set to the root collection for generating prompts(t2/update! :model/Metabot :entity_id metabot-eid {:collection_id nil})@@ -219,11 +219,11 @@(try;; Override calls to ai service as we are interested in no exception being thrown;; prior to those calls.- (with-redefs [metabot-v3.client/post! (constantly {:status 200- :body {:table_questions []- :metric_questions []}})]+ (with-redefs [metabot.client/post! (constantly {:status 200+ :body {:table_questions []+ :metric_questions []}})](let [metabot-id (t2/select-one-fn :id :model/Metabot :entity_id metabot-eid)]- (metabot-v3.suggested-prompts/generate-sample-prompts metabot-id)+ (metabot.suggested-prompts/generate-sample-prompts metabot-id):not-thrown))(catch Exception ee))))))diff --git a/test/metabase/metabot/config_test.clj b/test/metabase/metabot/config_test.cljnew file mode 100644index 00000000000..a766396b01d--- /dev/null+++ b/test/metabase/metabot/config_test.clj@@ -0,0 +1,78 @@+(ns metabase.metabot.config-test+ (:require+ [clojure.test :refer :all]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.settings :as metabot.settings]+ [metabase.test :as mt]))++(deftest resolve-dynamic-metabot-id-test+ (testing "metabot ID resolution precedence"+ (mt/with-premium-features #{:metabot-v3}+ (mt/with-temporary-setting-values [metabot.settings/metabot-id nil]+ (testing "explicit metabot-id takes precedence"+ (is (= "explicit-id"+ (metabot.config/resolve-dynamic-metabot-id "explicit-id"))))++ (testing "falls back to environment variable"+ (mt/with-temporary-setting-values [metabot.settings/metabot-id "env-metabot-id"]+ (is (= "env-metabot-id"+ (metabot.config/resolve-dynamic-metabot-id nil)))))++ (testing "falls back to internal default when no explicit or env value"+ (is (= metabot.config/internal-metabot-id+ (metabot.config/resolve-dynamic-metabot-id nil))))))))++(deftest resolve-dynamic-profile-id-test+ (testing "profile ID resolution precedence"+ (mt/with-premium-features #{:metabot-v3}+ (mt/with-temporary-setting-values [metabot.settings/ai-service-profile-id nil]+ (testing "explicit profile-id takes highest precedence"+ (is (= "explicit-profile"+ (metabot.config/resolve-dynamic-profile-id "explicit-profile" "any-metabot-id"))))++ (testing "environment variable takes second precedence"+ (mt/with-temporary-setting-values [metabot.settings/ai-service-profile-id "env-profile"]+ (is (= "env-profile"+ (metabot.config/resolve-dynamic-profile-id nil "any-metabot-id")))))++ (testing "metabot-id mapping takes third precedence"+ (is (= "internal"+ (metabot.config/resolve-dynamic-profile-id nil metabot.config/internal-metabot-id)))+ (is (= "embedding_next"+ (metabot.config/resolve-dynamic-profile-id nil metabot.config/embedded-metabot-id))))++ (testing "falls back to default when no matches"+ (is (= "embedding_next"+ (metabot.config/resolve-dynamic-profile-id nil "unknown-metabot-id"))))++ (testing "single arity version uses dynamic metabot resolution"+ (mt/with-temporary-setting-values [metabot.settings/metabot-id metabot.config/embedded-metabot-id]+ (is (= "embedding_next"+ (metabot.config/resolve-dynamic-profile-id nil)))))))))++(deftest integrated-resolution-test+ (testing "combination of metabot-id and profile-id precedence resolution"+ (mt/with-premium-features #{:metabot-v3}+ (testing "explicit params override everything"+ (mt/with-temporary-setting-values [metabot.settings/metabot-id nil+ metabot.settings/ai-service-profile-id nil]+ (let [metabot-id (metabot.config/resolve-dynamic-metabot-id "custom-metabot")+ profile-id (metabot.config/resolve-dynamic-profile-id "custom-profile" metabot-id)]+ (is (= "custom-metabot" metabot-id))+ (is (= "custom-profile" profile-id)))))++ (testing "environment variables work together"+ (mt/with-temporary-setting-values [metabot.settings/metabot-id "env-metabot"+ metabot.settings/ai-service-profile-id "env-profile"]+ (let [metabot-id (metabot.config/resolve-dynamic-metabot-id nil)+ profile-id (metabot.config/resolve-dynamic-profile-id nil metabot-id)]+ (is (= "env-metabot" metabot-id))+ (is (= "env-profile" profile-id)))))++ (testing "defaults work together"+ (mt/with-temporary-setting-values [metabot.settings/metabot-id nil+ metabot.settings/ai-service-profile-id nil]+ (let [metabot-id (metabot.config/resolve-dynamic-metabot-id nil)+ profile-id (metabot.config/resolve-dynamic-profile-id nil metabot-id)]+ (is (= metabot.config/internal-metabot-id metabot-id))+ (is (= "internal" profile-id))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.clj b/test/metabase/metabot/context_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.cljrename to test/metabase/metabot/context_test.cljindex c9efeb70bf7..f344df068f5 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/context_test.clj+++ b/test/metabase/metabot/context_test.clj@@ -1,14 +1,12 @@-(ns metabase-enterprise.metabot-v3.context-test+(ns metabase.metabot.context-test(:require- [clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.user-context :as user-context]- [metabase-enterprise.metabot-v3.context :as context]- [metabase-enterprise.metabot-v3.table-utils :as table-utils]- [metabase-enterprise.metabot-v3.tools.api][metabase.activity-feed.models.recent-views :as recent-views][metabase.lib.core :as lib][metabase.lib.test-metadata :as meta]+ [metabase.metabot.agent.user-context :as user-context]+ [metabase.metabot.context :as context]+ [metabase.metabot.table-utils :as table-utils][metabase.test :as mt]))(def ^:private users-native-query (lib/native-query meta/metadata-provider "SELECT * FROM users"))@@ -176,15 +174,6 @@(is (nil? (get-in result [:user_is_viewing 0 :used_tables])))(is (false? @called?)))))))-(deftest capabilities-signalling- (testing "We signal our capabilities to ai-service"- (is (= (count (-> (the-ns 'metabase-enterprise.metabot-v3.tools.api)- meta- :api/endpoints))- (count (->> (context/create-context {})- :capabilities- (filter #(str/starts-with? % "backend:"))))))))-(deftest annotate-transform-source-types-native-transform-test(testing "Annotates draft native transform with source_type :native"(let [input {:user_is_viewing [{:type "transform"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/example_question_generator_test.clj b/test/metabase/metabot/example_question_generator_test.cljsimilarity index 93%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/example_question_generator_test.cljrename to test/metabase/metabot/example_question_generator_test.cljindex 8085607f463..64dc2d52838 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/example_question_generator_test.clj+++ b/test/metabase/metabot/example_question_generator_test.clj@@ -1,11 +1,10 @@-(ns metabase-enterprise.metabot-v3.example-question-generator-test+(ns metabase.metabot.example-question-generator-test(:require[clojure.test :refer :all]- [metabase-enterprise.llm.settings :as llm]- [metabase-enterprise.metabot-v3.example-question-generator :as native-generator]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.test-util :as test-util][metabase.analytics.snowplow-test :as snowplow-test]+ [metabase.metabot.example-question-generator :as native-generator]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.test-util :as test-util][metabase.test :as mt]))(set! *warn-on-reflection* true)@@ -112,7 +111,7 @@;; Mocks openrouter/openrouter rather than native-generator/call-llm to exercise the path through;; self/call-llm-structured and parse-provider-model.(let [captured-opts (atom [])]- (mt/with-temporary-setting-values [llm/ee-ai-metabot-provider "openrouter/anthropic/claude-haiku-4-5"]+ (mt/with-temporary-setting-values [llm-metabot-provider "openrouter/anthropic/claude-haiku-4-5"](with-redefs [openrouter/openrouter (fn [opts](swap! captured-opts conj opts)[{:type :start :messageId "msg-1"}@@ -131,7 +130,7 @@:queryable-dimensions [{:name "region" :type "string"}]}]}))))(testing "makes one openrouter call per table and metric"(is (= 2 (count @captured-opts))))- (testing "passes the model name derived from ee-ai-metabot-provider for every call"+ (testing "passes the model name derived from llm-metabot-provider for every call"(is (=? [{:model "anthropic/claude-haiku-4-5"}{:model "anthropic/claude-haiku-4-5"}]@captured-opts))))))))@@ -148,7 +147,7 @@(deftest call-llm-prometheus-test(mt/with-prometheus-system! [_ system]- (mt/with-temporary-setting-values [llm/ee-ai-metabot-provider "openrouter/test-model"]+ (mt/with-temporary-setting-values [llm-metabot-provider "openrouter/test-model"](let [labels {:model "test-model" :source "example-question-generation"}](testing "increments llm-requests and observes duration on success"(with-redefs [openrouter/openrouter@@ -165,7 +164,7 @@(deftest call-llm-snowplow-test(testing "fires token_usage snowplow event for call-llm"(let [rasta-id (mt/user->id :rasta)]- (mt/with-temporary-setting-values [llm/ee-ai-metabot-provider "openrouter/test-model"]+ (mt/with-temporary-setting-values [llm-metabot-provider "openrouter/test-model"](with-redefs [openrouter/openrouter(constantly (test-util/mock-llm-response[{:type :start :id "msg-1"}diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/middleware/auth_test.clj b/test/metabase/metabot/middleware/auth_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/middleware/auth_test.cljrename to test/metabase/metabot/middleware/auth_test.cljindex e91f6748c4b..96fa2a575bd 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/middleware/auth_test.clj+++ b/test/metabase/metabot/middleware/auth_test.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.middleware.auth-test+(ns metabase.metabot.middleware.auth-test"EE-specific tests for auth middleware, particularly Slack signature verification."(:require[buddy.core.codecs :as codecs]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/models/metabot_test.clj b/test/metabase/metabot/models/metabot_test.cljsimilarity index 92%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/models/metabot_test.cljrename to test/metabase/metabot/models/metabot_test.cljindex ea66b27e145..ab9369baf2e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/models/metabot_test.clj+++ b/test/metabase/metabot/models/metabot_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.models.metabot-test+(ns metabase.metabot.models.metabot-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.models.metabot]- [metabase-enterprise.metabot-v3.models.metabot-prompt]+ [metabase.metabot.models.metabot]+ [metabase.metabot.models.metabot-prompt][metabase.test :as mt][metabase.test.fixtures :as fixtures][toucan2.core :as t2]))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/native_generation_integration_test.clj b/test/metabase/metabot/native_generation_integration_test.cljsimilarity index 86%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/native_generation_integration_test.cljrename to test/metabase/metabot/native_generation_integration_test.cljindex ef9d8b67e9d..36a13302338 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/native_generation_integration_test.clj+++ b/test/metabase/metabot/native_generation_integration_test.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.native-generation-integration-test+(ns metabase.metabot.native-generation-integration-test"Integration tests for native example question generation path.Tests the full regenerate endpoint flow with `use-native-agent=true`."(:require[clojure.set :as set][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.example-question-generator :as native-generator]- [metabase-enterprise.metabot-v3.settings :as metabot-v3.settings][metabase.collections.models.collection :as collection][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.example-question-generator :as native-generator]+ [metabase.metabot.settings :as metabot.settings][metabase.test :as mt][toucan2.core :as t2]))@@ -52,10 +52,10 @@native-mock (make-native-prompt-generator prompts-by-name)](testing "regenerate endpoint works with native path (use-native-agent=true)"- (with-redefs [metabot-v3.settings/use-native-agent (constantly true)+ (with-redefs [metabot.settings/use-native-agent (constantly true)native-generator/generate-example-questions native-mock](mt/user-http-request :crowberto :post 204- (format "ee/metabot-v3/metabot/%d/prompt-suggestions/regenerate" metabot-id)))+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))(let [prompts (t2/select [:model/MetabotPrompt :prompt :model [:card.name :model_name]]:metabot_id metabot-id@@ -69,10 +69,10 @@(testing "native path prompts are replaced on re-regenerate"(let [old-ids (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)]- (with-redefs [metabot-v3.settings/use-native-agent (constantly true)+ (with-redefs [metabot.settings/use-native-agent (constantly true)native-generator/generate-example-questions native-mock](mt/user-http-request :crowberto :post 204- (format "ee/metabot-v3/metabot/%d/prompt-suggestions/regenerate" metabot-id)))+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))(let [new-ids (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)](is (= 10 (count new-ids)))(is (empty? (set/intersection old-ids new-ids))))))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution_test.clj b/test/metabase/metabot/query_analyzer/parameter_substitution_test.cljsimilarity index 92%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution_test.cljrename to test/metabase/metabot/query_analyzer/parameter_substitution_test.cljindex 7073d7a604e..7535366cc5e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/query_analyzer/parameter_substitution_test.clj+++ b/test/metabase/metabot/query_analyzer/parameter_substitution_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.query-analyzer.parameter-substitution-test+(ns metabase.metabot.query-analyzer.parameter-substitution-test(:require[clojure.test :refer [deftest is testing]]- [metabase-enterprise.metabot-v3.query-analyzer.parameter-substitution :as nqa.sub][metabase.lib.core :as lib]- [metabase.lib.test-metadata :as meta]))+ [metabase.lib.test-metadata :as meta]+ [metabase.metabot.query-analyzer.parameter-substitution :as nqa.sub]))(deftest replace-tags-without-template-tags-test(testing "Query without template tags returns raw SQL"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/reactions_test.clj b/test/metabase/metabot/reactions_test.cljsimilarity index 64%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/reactions_test.cljrename to test/metabase/metabot/reactions_test.cljindex 0d028a184a1..1e47c12a2a1 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/reactions_test.clj+++ b/test/metabase/metabot/reactions_test.clj@@ -1,18 +1,18 @@-(ns metabase-enterprise.metabot-v3.reactions-test+(ns metabase.metabot.reactions-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.reactions :as metabot-v3.reactions]+ [metabase.metabot.reactions :as metabot.reactions][metabase.util.malli.registry :as mr]))(deftest ^:parallel reaction-schema-test(testing "Known/registered reactions"(is (mr/validate- ::metabot-v3.reactions/reaction+ ::metabot.reactions/reaction{:type :metabot.reaction/message, :message "Hello"}))(is (not (mr/validate- ::metabot-v3.reactions/reaction+ ::metabot.reactions/reaction{:type :metabot.reaction/message}))))(testing "Should allow unregistered reactions"(mr/validate- ::metabot-v3.reactions/reaction+ ::metabot.reactions/reaction{:type :metabot.reaction/unknown-does-not-exist})))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/claude_test.clj b/test/metabase/metabot/self/claude_test.cljsimilarity index 94%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self/claude_test.cljrename to test/metabase/metabot/self/claude_test.cljindex 9fc07a479ec..85e2aa7069d 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/claude_test.clj+++ b/test/metabase/metabot/self/claude_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.self.claude-test+(ns metabase.metabot.self.claude-test(:require[clojure.test :refer :all][medley.core :as m]- [metabase-enterprise.metabot-v3.self.claude :as claude]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.test-util :as test-util]))+ [metabase.metabot.self.claude :as claude]+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.test-util :as test-util]))(set! *warn-on-reflection* true)@@ -32,7 +32,7 @@(deftest ^:parallel claude-tool-input-conv-test(let [raw-chunks (fixture "claude-tool-input"{:input [{:role :user :content "What time is it in Kyiv?"}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "tool input chunks are mapped correctly"(is (=? [{:type :start} {:type :tool-input-start} {:type :tool-input-delta} {:type :tool-input-available} {:type :usage}](into [] (comp (claude/claude->aisdk-chunks-xf) (m/distinct-by :type)) raw-chunks))))@@ -45,7 +45,7 @@(deftest ^:parallel claude-text-and-tool-input-conv-test(let [raw-chunks (fixture "claude-text-and-tool-input"{:input [{:role :user :content "Tell me what time it is in Kyiv. First explain what you're going to do, then call the tool."}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "text + tool input chunks are mapped correctly"(is (=? [{:type :start}{:type :text-start} {:type :text-delta} {:type :text-end}@@ -62,7 +62,7 @@(deftest ^:parallel claude-lite-aisdk-xf-test(let [raw-chunks (fixture "claude-text-and-tool-input"{:input [{:role :user :content "Tell me what time it is in Kyiv. First explain what you're going to do, then call the tool."}]- :tools [#'test-util/get-time]})+ :tools [(test-util/get-time-tool)]})res (into [] (comp (claude/claude->aisdk-chunks-xf) (self.core/lite-aisdk-xf)) raw-chunks)](testing "lite-aisdk-xf collects tool inputs"(is (=? [{:type :start}diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/features_test.clj b/test/metabase/metabot/self/features_test.cljsimilarity index 93%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self/features_test.cljrename to test/metabase/metabot/self/features_test.cljindex 954b0c3fc62..a3abce6ad65 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/features_test.clj+++ b/test/metabase/metabot/self/features_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.self.features-test+(ns metabase.metabot.self.features-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.self.features :as features]))+ [metabase.metabot.self.features :as features]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/openai_test.clj b/test/metabase/metabot/self/openai_test.cljsimilarity index 95%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self/openai_test.cljrename to test/metabase/metabot/self/openai_test.cljindex f91bdeee212..4e52bc25073 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/openai_test.clj+++ b/test/metabase/metabot/self/openai_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.self.openai-test+(ns metabase.metabot.self.openai-test(:require[clojure.test :refer :all][medley.core :as m]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.self.openai :as openai]- [metabase-enterprise.metabot-v3.test-util :as test-util]))+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.self.openai :as openai]+ [metabase.metabot.test-util :as test-util]))(set! *warn-on-reflection* true)@@ -32,7 +32,7 @@(deftest ^:parallel openai-tool-calls-conv-test(let [raw-chunks (fixture "openai-tool-calls"{:input [{:role :user :content "What time is it in Kyiv?"}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "tool call chunks are mapped correctly"(is (=? [{:type :start} {:type :tool-input-start} {:type :tool-input-delta} {:type :tool-input-available} {:type :usage}](into [] (comp (openai/openai->aisdk-chunks-xf) (m/distinct-by :type)) raw-chunks))))@@ -64,7 +64,7 @@(deftest ^:parallel openai-text-and-tool-calls-conv-test(let [raw-chunks (fixture "openai-text-and-tool-calls"{:input [{:role :user :content "Tell me what time it is in Kyiv. First explain what you're going to do, then call the tool."}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "text + tool call chunks contain expected types"(is (=? [{:type :start}{:type :text-start} {:type :text-delta} {:type :text-end}diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/openrouter_test.clj b/test/metabase/metabot/self/openrouter_test.cljsimilarity index 94%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self/openrouter_test.cljrename to test/metabase/metabot/self/openrouter_test.cljindex 0c48b94dd8d..a1e8e460e55 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/openrouter_test.clj+++ b/test/metabase/metabot/self/openrouter_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.self.openrouter-test+(ns metabase.metabot.self.openrouter-test(:require[clojure.test :refer :all][medley.core :as m]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.test-util :as test-util]))+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.test-util :as test-util]))(set! *warn-on-reflection* true)@@ -94,7 +94,7 @@(deftest ^:parallel openrouter-tool-calls-conv-test(let [raw-chunks (fixture "openrouter-tool-calls"{:input [{:role :user :content "What time is it in Kyiv?"}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "single tool call chunks are mapped correctly"(is (=? [{:type :start} {:type :tool-input-start} {:type :tool-input-delta} {:type :tool-input-available} {:type :usage}](into [] (comp (openrouter/openrouter->aisdk-chunks-xf) (m/distinct-by :type)) raw-chunks))))@@ -112,7 +112,8 @@(deftest ^:parallel openrouter-parallel-tool-calls-conv-test(let [raw-chunks (fixture "openrouter-parallel-tool-calls"{:input [{:role :user :content "What time is it in Kyiv AND convert 100 EUR to USD? Use both tools in parallel."}]- :tools [#'test-util/get-time #'test-util/convert-currency]})]+ :tools [(test-util/get-time-tool)+ (test-util/convert-currency-tool)]})](testing "parallel tool calls are mapped correctly"(is (=? [{:type :start} {:type :tool-input-start} {:type :tool-input-delta} {:type :tool-input-available} {:type :usage}](into [] (comp (openrouter/openrouter->aisdk-chunks-xf) (m/distinct-by :type)) raw-chunks))))@@ -132,7 +133,7 @@(deftest ^:parallel openrouter-text-and-tool-calls-conv-test(let [raw-chunks (fixture "openrouter-text-and-tool-calls"{:input [{:role :user :content "Tell me what time it is in Kyiv. First explain what you're going to do, then call the tool."}]- :tools [#'test-util/get-time]})]+ :tools [(test-util/get-time-tool)]})](testing "text + tool call chunks contain expected types"(is (=? [{:type :start}{:type :text-start} {:type :text-delta} {:type :text-end}@@ -155,7 +156,7 @@(testing "lite-aisdk-xf streams text deltas for openrouter format"(let [raw-chunks (fixture "openrouter-text-and-tool-calls"{:input [{:role :user :content "Tell me what time it is in Kyiv. First explain what you're going to do, then call the tool."}]- :tools [#'test-util/get-time]})+ :tools [(test-util/get-time-tool)]})res (into [] (comp (openrouter/openrouter->aisdk-chunks-xf)(self.core/lite-aisdk-xf))raw-chunks)]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/schema_test.clj b/test/metabase/metabot/self/schema_test.cljsimilarity index 97%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self/schema_test.cljrename to test/metabase/metabot/self/schema_test.cljindex fb9a2a9def2..2d62807bd94 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self/schema_test.clj+++ b/test/metabase/metabot/self/schema_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.self.schema-test+(ns metabase.metabot.self.schema-test(:require[clojure.test :refer :all][malli.core :as mc]- [metabase-enterprise.metabot-v3.self.features :as features]- [metabase-enterprise.metabot-v3.self.schema :as schema]))+ [metabase.metabot.self.features :as features]+ [metabase.metabot.self.schema :as schema]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/self_test.clj b/test/metabase/metabot/self_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/self_test.cljrename to test/metabase/metabot/self_test.cljindex 2fd186ee1eb..6d4cbbed46b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/self_test.clj+++ b/test/metabase/metabot/self_test.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.self-test+(ns metabase.metabot.self-test(:require[clj-http.client :as http][clojure.java.io :as io][clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.self :as self]- [metabase-enterprise.metabot-v3.self.core :as self.core]- [metabase-enterprise.metabot-v3.self.openrouter :as openrouter]- [metabase-enterprise.metabot-v3.test-util :as test-util][metabase.analytics.prometheus :as prometheus][metabase.analytics.snowplow-test :as snowplow-test]+ [metabase.metabot.self :as self]+ [metabase.metabot.self.core :as self.core]+ [metabase.metabot.self.openrouter :as openrouter]+ [metabase.metabot.test-util :as test-util][metabase.test :as mt][metabase.util.json :as json][ring.adapter.jetty :as jetty]))@@ -48,9 +48,9 @@(mt/with-dynamic-fn-redefs [http/post (fn [_url opts](reset! captured (json/decode+kw (:body opts)))(throw (ex-info "stop" {::skip true :status 401 :body "skip parsing"})))]- (mt/with-temporary-setting-values [ee-anthropic-api-key "test-key"- ee-openrouter-api-key "test-key"- ee-openai-api-key "test-key"]+ (mt/with-temporary-setting-values [llm-anthropic-api-key "sk-ant-test-key"+ llm-openrouter-api-key "test-key"+ llm-openai-api-key "test-key"](doseq [[model expected] [["anthropic/test-model" {:type "any"}]["openrouter/test-model" "required"]["openai/test-model" "required"]]]@@ -58,7 +58,7 @@(run! identity (self/call-llm modelnil[]- {"search" #'test-util/get-time}+ {"search" (get test-util/TOOLS "get-time")}{:tag "agent"}{:tool-choice "required"}))(catch Exception e@@ -267,20 +267,17 @@decode-fn (assoc :decode decode-fn))))(deftest ^:parallel tool-decode-var-test- (testing "tool with :decode metadata on a fn has decode applied before invocation"+ (testing "tool definition map with :decode has decode applied before invocation"(let [received (atom nil)decode-fn (fn [args](update args :x inc))- ;; with-meta on a fn attaches metadata; tool-decode-fn reads it via (meta tool)- tool-fn (with-meta- (fn [args]- (reset! received args)- {:output "ok"})- {:name 'decode-inc+ tool-def {:fn (fn [args]+ (reset! received args)+ {:output "ok"}):decode decode-fn:schema [:=> [:cat [:map [:x :int]]] :any]- :doc "increment x"})- tools {"decode-inc" tool-fn}+ :doc "increment x"}+ tools {"decode-inc" tool-def}chunks (test-util/parts->aisdk-chunks[{:type :start :id "msg-dec-1"}{:type :tool-input :id "call-d1" :function "decode-inc" :arguments {:x 41}}])@@ -517,7 +514,7 @@(is (= 1 @calls))))(testing "retries on retryable error and succeeds"(let [calls (atom 0)]- (is (= :ok (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (is (= :ok (mt/with-log-level [metabase.metabot.self :fatal](#'self/with-retries{:model "test-model" :tag "agent"}(fn []@@ -539,7 +536,7 @@(let [calls (atom 0)](is (thrown-with-msg?clojure.lang.ExceptionInfo #"overloaded"- (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (mt/with-log-level [metabase.metabot.self :fatal](#'self/with-retries{:model "test-model" :tag "agent"}(fn []@@ -548,7 +545,7 @@(is (= 3 @calls))))(testing "retries on connection errors"(let [calls (atom 0)]- (is (= :ok (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (is (= :ok (mt/with-log-level [metabase.metabot.self :fatal](#'self/with-retries{:model "test-model" :tag "agent"}(fn []@@ -578,7 +575,7 @@(testing "increments llm-retries on transient failures, no errors on eventual success"(let [calls (atom 0)]- (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (mt/with-log-level [metabase.metabot.self :fatal](with-redefs [openrouter/openrouter(fn [_opts](reify clojure.lang.IReduceInit@@ -662,7 +659,7 @@(testing "increments llm-retries on transient failures, no errors on eventual success"(let [calls (atom 0)]- (mt/with-log-level [metabase-enterprise.metabot-v3.self :fatal]+ (mt/with-log-level [metabase.metabot.self :fatal](with-redefs [openrouter/openrouter(fn [_opts](if (< (swap! calls inc) 3)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/categorical_test.clj b/test/metabase/metabot/stats/categorical_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/categorical_test.cljrename to test/metabase/metabot/stats/categorical_test.cljindex d40a2d91a17..18bc184dd41 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/categorical_test.clj+++ b/test/metabase/metabot/stats/categorical_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.categorical-test+(ns metabase.metabot.stats.categorical-test(:require[clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.categorical :as categorical]))+ [metabase.metabot.stats.categorical :as categorical]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/core_test.clj b/test/metabase/metabot/stats/core_test.cljsimilarity index 97%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/core_test.cljrename to test/metabase/metabot/stats/core_test.cljindex 5b76d92ad2e..8fc7f4e8f77 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/core_test.clj+++ b/test/metabase/metabot/stats/core_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.stats.core-test+(ns metabase.metabot.stats.core-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.stats.core :as stats.core]))+ [metabase.metabot.stats.core :as stats.core]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/histogram_test.clj b/test/metabase/metabot/stats/histogram_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/histogram_test.cljrename to test/metabase/metabot/stats/histogram_test.cljindex 85b52f47888..d34703058b8 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/histogram_test.clj+++ b/test/metabase/metabot/stats/histogram_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.histogram-test+(ns metabase.metabot.stats.histogram-test(:require[clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.histogram :as histogram]))+ [metabase.metabot.stats.histogram :as histogram]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/outliers_test.clj b/test/metabase/metabot/stats/outliers_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/outliers_test.cljrename to test/metabase/metabot/stats/outliers_test.cljindex 51bac558a32..513cea9f1d0 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/outliers_test.clj+++ b/test/metabase/metabot/stats/outliers_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.outliers-test+(ns metabase.metabot.stats.outliers-test(:require[clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.outliers :as outliers]))+ [metabase.metabot.stats.outliers :as outliers]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/repr_test.clj b/test/metabase/metabot/stats/repr_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/repr_test.cljrename to test/metabase/metabot/stats/repr_test.cljindex 2ccea5769e0..29cb114e0f8 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/repr_test.clj+++ b/test/metabase/metabot/stats/repr_test.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.stats.repr-test+(ns metabase.metabot.stats.repr-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.stats.categorical :as categorical]- [metabase-enterprise.metabot-v3.stats.core :as stats.core]- [metabase-enterprise.metabot-v3.stats.histogram :as histogram]- [metabase-enterprise.metabot-v3.stats.repr :as repr]- [metabase-enterprise.metabot-v3.stats.scatter :as scatter]- [metabase-enterprise.metabot-v3.stats.time-series :as time-series]+ [metabase.metabot.stats.categorical :as categorical]+ [metabase.metabot.stats.core :as stats.core]+ [metabase.metabot.stats.histogram :as histogram]+ [metabase.metabot.stats.repr :as repr]+ [metabase.metabot.stats.scatter :as scatter]+ [metabase.metabot.stats.time-series :as time-series][metabase.util :as u]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/scatter_test.clj b/test/metabase/metabot/stats/scatter_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/scatter_test.cljrename to test/metabase/metabot/stats/scatter_test.cljindex ac624aec341..019b2d7be53 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/scatter_test.clj+++ b/test/metabase/metabot/stats/scatter_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.scatter-test+(ns metabase.metabot.stats.scatter-test(:require[clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.scatter :as scatter]))+ [metabase.metabot.stats.scatter :as scatter]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/time_series_test.clj b/test/metabase/metabot/stats/time_series_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/time_series_test.cljrename to test/metabase/metabot/stats/time_series_test.cljindex 460ca1f2b5e..7cec5b0af2e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/time_series_test.clj+++ b/test/metabase/metabot/stats/time_series_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.stats.time-series-test+(ns metabase.metabot.stats.time-series-test(:require[clojure.string :as str][clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.time-series :as time-series]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]))+ [metabase.metabot.stats.time-series :as time-series]+ [metabase.metabot.stats.util :as stats.u]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/util_test.clj b/test/metabase/metabot/stats/util_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/stats/util_test.cljrename to test/metabase/metabot/stats/util_test.cljindex 20c39bbf9b8..a0c290ed462 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/stats/util_test.clj+++ b/test/metabase/metabot/stats/util_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.stats.util-test+(ns metabase.metabot.stats.util-test(:require[clojure.test :refer :all][mb.hawk.assert-exprs.approximately-equal :as =?]- [metabase-enterprise.metabot-v3.stats.util :as stats.u]))+ [metabase.metabot.stats.util :as stats.u]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj b/test/metabase/metabot/table_utils_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.cljrename to test/metabase/metabot/table_utils_test.cljindex 857a09d3cfb..2b1b5569681 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/table_utils_test.clj+++ b/test/metabase/metabot/table_utils_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.table-utils-test+(ns metabase.metabot.table-utils-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.query-analyzer :as query-analyzer]- [metabase-enterprise.metabot-v3.table-utils :as table-utils][metabase.lib.core :as lib]+ [metabase.metabot.query-analyzer :as query-analyzer]+ [metabase.metabot.table-utils :as table-utils][metabase.test :as mt]))(set! *warn-on-reflection* true)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/task/suggested_prompts_generator_test.clj b/test/metabase/metabot/task/suggested_prompts_generator_test.cljsimilarity index 80%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/task/suggested_prompts_generator_test.cljrename to test/metabase/metabot/task/suggested_prompts_generator_test.cljindex 418329a9dee..f8530138e30 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/task/suggested_prompts_generator_test.clj+++ b/test/metabase/metabot/task/suggested_prompts_generator_test.clj@@ -1,13 +1,13 @@-(ns metabase-enterprise.metabot-v3.task.suggested-prompts-generator-test+(ns metabase.metabot.task.suggested-prompts-generator-test(:require[clojure.test :refer [deftest is testing]]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.config :as metabot-v3.config]- [metabase-enterprise.metabot-v3.task.suggested-prompts-generator- :as metabot-v3.task.suggested-prompts-generator][metabase.lib.convert :as lib.convert][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.client :as metabot.client]+ [metabase.metabot.config :as metabot.config]+ [metabase.metabot.task.suggested-prompts-generator+ :as metabot.task.suggested-prompts-generator][metabase.test :as mt][toucan2.core :as t2]))@@ -15,8 +15,8 @@(mt/with-premium-features #{:metabot-v3 :content-verification}(mt/with-empty-h2-app-db!(let [original-metabot (t2/select-one :model/Metabot- :entity_id (get-in metabot-v3.config/metabot-config- [metabot-v3.config/internal-metabot-id :entity-id]))+ :entity_id (get-in metabot.config/metabot-config+ [metabot.config/internal-metabot-id :entity-id]))mp (mt/metadata-provider)query (-> (lib/query mp (lib.metadata/table mp (mt/id :orders)))lib.convert/->legacy-MBQL)@@ -27,7 +27,7 @@{card-id :id}{:type :model:dataset_query query}]- (with-redefs [metabot-v3.client/generate-example-questions+ (with-redefs [metabot.client/generate-example-questions(fn [input];; Return fake prompts if we have cards, empty otherwise(if (or (seq (:metrics input)) (seq (:tables input)))@@ -40,14 +40,14 @@(testing "Non-verified card with use_verified_content=false generates prompts"(t2/update! :model/Metabot (:id original-metabot) {:use_verified_content false})- (#'metabot-v3.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)+ (#'metabot.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)(let [prompts (t2/select :model/MetabotPrompt :card_id card-id)](is (seq prompts))))(testing "Non-verified card with use_verified_content=true generates no prompts"(t2/delete! :model/MetabotPrompt)(t2/update! :model/Metabot (:id original-metabot) {:use_verified_content true})- (#'metabot-v3.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)+ (#'metabot.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)(let [prompts (t2/select :model/MetabotPrompt :card_id card-id)](is (empty? prompts))))@@ -64,14 +64,14 @@(testing "with use_verified_content=true"(t2/delete! :model/MetabotPrompt)(t2/update! :model/Metabot (:id original-metabot) {:use_verified_content true})- (#'metabot-v3.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)+ (#'metabot.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)(let [prompts (t2/select :model/MetabotPrompt :card_id card-id)](is (seq prompts))))(testing "with use_verified_content=false"(t2/delete! :model/MetabotPrompt)(t2/update! :model/Metabot (:id original-metabot) {:use_verified_content false})- (#'metabot-v3.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)+ (#'metabot.task.suggested-prompts-generator/maybe-generate-suggested-prompts!)(let [prompts (t2/select :model/MetabotPrompt :card_id card-id)](is (seq prompts))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/test_util.clj b/test/metabase/metabot/test_util.cljsimilarity index 74%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/test_util.cljrename to test/metabase/metabot/test_util.cljindex dc51ffb1f34..9116c58a225 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/test_util.clj+++ b/test/metabase/metabot/test_util.clj@@ -1,11 +1,9 @@-(ns metabase-enterprise.metabot-v3.test-util+(ns metabase.metabot.test-util(:require[clojure.java.io :as io][clojure.string :as str]- [metabase.util :as u][metabase.util.json :as json]- [metabase.util.log :as log]- [metabase.util.malli :as mu]))+ [metabase.util.log :as log]))(set! *warn-on-reflection* true)@@ -105,42 +103,45 @@;;; - self_test (tool-executor-xf — tools are actually called);;; ──────────────────────────────────────────────────────────────────-(mu/defn get-time- "Return current time for a given IANA timezone."- [{:keys [tz]} :- [:map {:closed true}- [:tz [:string {:description "IANA timezone, e.g. Europe/Bucharest"}]]]]- (str (java.time.ZonedDateTime/now (java.time.ZoneId/of tz))))--(mu/defn convert-currency- "Convert an amount between two ISO currencies using a dummy rate."- [{:keys [amount from to]} :- [:map {:closed true}- [:amount :float]- [:from :string]- [:to :string]]]- (let [rate (if (= [from to] ["EUR" "USD"]) 1.16 1.0)]- {:amount amount- :from from- :to to- :rate rate- :converted (* amount rate)}))--(mu/defn mock-llm- "Return aisdk-formatted results as a reducible (IReduceInit).+(defn get-time-tool []+ {:tool-name "get-time"+ :doc "Return current time for a given IANA timezone."+ :schema [:=> [:cat [:map {:closed true}+ [:tz [:string {:description "IANA timezone, e.g. Europe/Bucharest"}]]]] :any]+ :fn (fn [{:keys [tz]}]+ (str (java.time.ZonedDateTime/now (java.time.ZoneId/of tz))))})++(defn convert-currency-tool []+ {:tool-name "convert-currency"+ :doc "Convert an amount between two ISO currencies using a dummy rate."+ :schema [:=> [:cat [:map {:closed true}+ [:amount :float]+ [:from :string]+ [:to :string]]] :any]+ :fn (fn [{:keys [amount from to]}]+ (let [rate (if (= [from to] ["EUR" "USD"]) 1.16 1.0)]+ {:amount amount+ :from from+ :to to+ :rate rate+ :converted (* amount rate)}))})++(defn mock-llm-tool []+ {:tool-name "mock-llm"+ :doc "Return aisdk-formatted results as a reducible (IReduceInit).Useful for testing tool-executor-xf with tools that call back to an LLM."- [{:keys [id input]} :- [:map {:closed true}+ :schema [:=> [:cat [:map {:closed true}[:id :string]- [:input :string]]]- (let [chunks (parts->aisdk-chunks- [{:type :start :id "mock-1"}- {:type :text :id id :text input}])]- (reify clojure.lang.IReduceInit- (reduce [_ rf init]- (reduce rf init chunks)))))+ [:input :string]]] :any]+ :fn (fn [{:keys [id input]}]+ (let [chunks (parts->aisdk-chunks+ [{:type :start :id "mock-1"}+ {:type :text :id id :text input}])]+ (reify clojure.lang.IReduceInit+ (reduce [_ rf init]+ (reduce rf init chunks)))))})(def TOOLS"Tool map for tests — keyed by tool name string."- (u/index-by- #(-> % meta :name name)- [#'get-time- #'convert-currency- #'mock-llm]))+ (let [tool-defs (map #(%) [get-time-tool convert-currency-tool mock-llm-tool])]+ (into {} (map (juxt :tool-name identity)) tool-defs)))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj b/test/metabase/metabot/tools/api_test.cljsimilarity index 79%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.cljrename to test/metabase/metabot/tools/api_test.cljindex f32e2a0c78d..244978e6fa5 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/api_test.clj+++ b/test/metabase/metabot/tools/api_test.clj@@ -1,21 +1,20 @@-(ns metabase-enterprise.metabot-v3.tools.api-test+(ns metabase.metabot.tools.api-test(:require[clojure.test :refer :all][malli.core :as mc][malli.transform :as mtx][medley.core :as m]- [metabase-enterprise.metabot-v3.client :as metabot-v3.client]- [metabase-enterprise.metabot-v3.tools.api :as metabot-v3.tools.api]- [metabase-enterprise.metabot-v3.tools.create-alert :as metabot-v3.tools.create-alert]- [metabase-enterprise.metabot-v3.tools.create-dashboard-subscription :as metabot-v3.tools.create-dashboard-subscription]- [metabase-enterprise.metabot-v3.tools.entity-details :as metabot-v3.tools.entity-details]- [metabase-enterprise.metabot-v3.tools.filters :as metabot-v3.tools.filters]- [metabase-enterprise.metabot-v3.tools.test-util :as tools.tu]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]- [metabase-enterprise.metabot-v3.util :as metabot-v3.u][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.api :as metabot.tools.api]+ [metabase.metabot.tools.create-alert :as metabot.tools.create-alert]+ [metabase.metabot.tools.create-dashboard-subscription :as metabot.tools.create-dashboard-subscription]+ [metabase.metabot.tools.entity-details :as metabot.tools.entity-details]+ [metabase.metabot.tools.filters :as metabot.tools.filters]+ [metabase.metabot.tools.test-util :as tools.tu]+ [metabase.metabot.tools.util :as metabot.tools.u]+ [metabase.metabot.util :as metabot.u][metabase.test :as mt][metabase.util :as u][metabase.util.malli.registry :as mr]@@ -32,27 +31,19 @@{:test-case "unknown type", :type-value nil}]](testing test-case(let [col (assoc base-col :type type-value)- decoded (mc/decode ::metabot-v3.tools.api/column col (mtx/transformer {:name :tool-api-response}))]- (is (mr/validate ::metabot-v3.tools.api/column decoded)))))))--(defn- ai-session-token- ([] (ai-session-token :rasta (str (random-uuid))))- ([metabot-id] (ai-session-token :rasta metabot-id))- ([user metabot-id]- (-> user mt/user->id (#'metabot-v3.client/get-ai-service-token metabot-id))))+ decoded (mc/decode ::metabot.tools.api/column col (mtx/transformer {:name :tool-api-response}))]+ (is (mr/validate ::metabot.tools.api/column decoded)))))))(deftest create-alert-test(mt/with-premium-features #{:metabot-v3}(let [tool-requests (atom [])conversation-id (str (random-uuid))- output (str (random-uuid))- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.create-alert/create-alert+ output (str (random-uuid))]+ (with-redefs [metabot.tools.create-alert/create-alert(fn [arguments](swap! tool-requests conj arguments){:output output})]- (let [response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/create-alert"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (let [response (mt/user-http-request :rasta :post 200 "metabot/tools/create-alert"{:arguments {:card_id 42:send_condition "has_result":slack_channel "data-team"@@ -73,14 +64,12 @@(mt/with-premium-features #{:metabot-v3}(let [tool-requests (atom [])conversation-id (str (random-uuid))- output (str (random-uuid))- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.create-dashboard-subscription/create-dashboard-subscription+ output (str (random-uuid))]+ (with-redefs [metabot.tools.create-dashboard-subscription/create-dashboard-subscription(fn [arguments](swap! tool-requests conj arguments){:output output})]- (let [response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/create-dashboard-subscription"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (let [response (mt/user-http-request :rasta :post 200 "metabot/tools/create-dashboard-subscription"{:arguments {:dashboard_id 1:slack_channel "data-team":schedule {:frequency "monthly"@@ -100,13 +89,11 @@(deftest field-values-test(mt/with-premium-features #{:metabot-v3}(let [conversation-id (str (random-uuid))- ai-token (ai-session-token)table-id (mt/id :people)field-id (-> table-id- metabot-v3.tools.u/table-field-id-prefix+ metabot.tools.u/table-field-id-prefix(str 4))- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/field-values"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/field-values"{:arguments {:entity_type "table":entity_id table-id:field_id field-id ; name@@ -133,9 +120,8 @@{:table_id "1"}]](let [tool-requests (atom [])conversation-id (str (random-uuid))- query-id (str (random-uuid))- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.filters/filter-records+ query-id (str (random-uuid))]+ (with-redefs [metabot.tools.filters/filter-records(fn [arguments](swap! tool-requests conj arguments){:structured-output {:type :query@@ -149,12 +135,11 @@{:field_id "q2a-6", :operation "month-equals", :values [4 5 9]}{:field_id "c2a-6", :bucket "week-of-year" :operation "not-equals", :values [14 15 19]}{:field_id "q2a-6", :operation "year-equals", :value 2008}]- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/filter-records"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/filter-records"{:arguments {:data_source data-source:filters filters}:conversation_id conversation-id})]- (is (=? [{:data-source (metabot-v3.u/recursive-update-keys data-source u/->kebab-case-en)}]+ (is (=? [{:data-source (metabot.u/recursive-update-keys data-source u/->kebab-case-en)}]@tool-requests))(is (=? {:structured_output {:type "query":query_id query-id@@ -167,9 +152,8 @@(mt/with-premium-features #{:metabot-v3}(let [tool-requests (atom [])conversation-id (str (random-uuid))- output (str (random-uuid))- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.filters/query-metric+ output (str (random-uuid))]+ (with-redefs [metabot.tools.filters/query-metric(fn [arguments](swap! tool-requests conj arguments){:structured-output {:type :query@@ -185,8 +169,7 @@{:field_id "c2-6", :operation "year-equals", :value 2008}]breakouts [{:field_id "c2-4", :field_granularity "week"}{:field_id "c2-6", :field_granularity "day"}]- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/query-metric"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/query-metric"{:arguments {:metric_id 1:filters filters:group_by breakouts}@@ -201,7 +184,6 @@(deftest query-metric-e2e-test(mt/with-premium-features #{:metabot-v3}(let [conversation-id (str (random-uuid))- ai-token (ai-session-token)mp (mt/metadata-provider)source-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))(lib/aggregate (lib/avg (lib.metadata/field mp (mt/id :products :rating))))@@ -222,8 +204,7 @@{:field_id (fid 7), :operation "year-equals", :value 2008}]breakouts [{:field_id (fid 7), :field_granularity "week"}{:field_id (fid 7), :field_granularity "day"}]- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/query-metric"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/query-metric"{:arguments {:metric_id metric-id:filters filters:group_by breakouts}@@ -275,9 +256,8 @@(mt/with-premium-features #{:metabot-v3}(let [tool-requests (atom [])conversation-id (str (random-uuid))- output (str (random-uuid))- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.filters/query-model+ output (str (random-uuid))]+ (with-redefs [metabot.tools.filters/query-model(fn [arguments](swap! tool-requests conj arguments){:structured-output {:type :query@@ -297,8 +277,7 @@{:field_id "c2-11", :function "sum"}]breakouts [{:field_id "c2-4", :field_granularity "week"}{:field_id "c2-6", :field_granularity "day"}]- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/query-model"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/query-model"{:arguments {:model_id 1:fields fields:filters filters@@ -321,16 +300,14 @@:query {:database 1:type :query:query {:source-table 1}}- :result-columns []}- ai-token (ai-session-token)]- (with-redefs [metabot-v3.tools.filters/query-model+ :result-columns []}]+ (with-redefs [metabot.tools.filters/query-model(fn [arguments](swap! tool-requests conj arguments){:structured-output output})](let [fields []filters [{:field_id "c2-7", :operation "greater-than", :value 50}]- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/query-model"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/query-model"{:arguments {:model_id 1:fields fields:filters filters}@@ -377,7 +354,7 @@:model/Card {model-id :id} (assoc model-data :collection_id collection-id):model/Metabot {metabot-eid :entity_id} {:name "Test Metabot":collection_id collection-id}]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [model-metric-base-query (lib/query mp (lib.metadata/card mp model-id))rating-column (m/find-first (comp #{"RATING"} :name) (lib/visible-columns model-metric-base-query))created-at-column (m/find-first (comp #{"CREATED_AT"} :name) (lib/breakoutable-columns model-metric-base-query))@@ -390,16 +367,12 @@:type :metric}](mt/with-temp [:model/Card {model-metric-id :id} (assoc model-metric-data :collection_id collection-id)](testing "Calling with wrong metabot-id"- (let [conversation-id (str (random-uuid))- ai-token (ai-session-token (str metabot-eid "-"))]- (mt/user-http-request :rasta :post 400 "ee/metabot-tools/answer-sources"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (let [conversation-id (str (random-uuid))]+ (mt/user-http-request :rasta :post 400 "metabot/tools/answer-sources"{:conversation_id conversation-id})))(testing "Normal call"(let [conversation-id (str (random-uuid))- ai-token (ai-session-token metabot-eid)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/answer-sources"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/answer-sources"{:metabot_id metabot-eid:conversation_id conversation-id})expected-fields@@ -447,9 +420,7 @@response))))(testing "Minimal call"(let [conversation-id (str (random-uuid))- ai-token (ai-session-token metabot-eid)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/answer-sources"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/answer-sources"{:metabot_id metabot-eid:arguments {:with_model_fields false:with_model_metrics false@@ -487,9 +458,7 @@(mt/with-premium-features #{:metabot-v3}(mt/with-temp [:model/Glossary _ {:term "asdf" :definition "Sales Team Performance"}](let [conversation-id (str (random-uuid))- ai-token (ai-session-token)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-current-user"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/get-current-user"{:conversation_id conversation-id})](is (=? {:structured_output {:id (mt/user->id :rasta):type "user"@@ -503,11 +472,9 @@(mt/with-premium-features #{:metabot-v3}(let [dash-data {:name "dashing dash", :description "dash description"}](mt/with-temp [:model/Dashboard {dash-id :id} dash-data]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [conversation-id (str (random-uuid))- ai-token (ai-session-token)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-dashboard-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/get-dashboard-details"{:arguments {:dashboard_id dash-id}:conversation_id conversation-id})](is (=? {:structured_output (assoc dash-data :id dash-id, :type "dashboard" :verified true)@@ -566,15 +533,13 @@{:name "PRICE" :display_name "Price" :type "number" :table_reference "Product"}{:name "RATING" :display_name "Rating" :type "number" :semantic_type "score" :table_reference "Product"}{:name "CREATED_AT" :display_name "Created At" :type "datetime" :semantic_type "creation_timestamp" :table_reference "Product"}]- ai-token (ai-session-token)conversation-id (str (random-uuid))request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-metric-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-metric-details"{:arguments arguments:conversation_id conversation-id}))](mt/with-temp [:model/Card {metric-id :id} metric-data]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](testing "Normal call"(is (=? {:structured_output (-> metric-data(select-keys [:name :display_name :description])@@ -635,9 +600,7 @@(lib.metadata/field mp (mt/id :products :created_at)) :week)))query (lib/->legacy-MBQL source-query)conversation-id (str (random-uuid))- ai-token (ai-session-token)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-query-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/get-query-details"{:arguments {:query query}:conversation_id conversation-id})generated-id (-> response :structured_output :query_id)]@@ -673,13 +636,11 @@:dataset_query (lib/->legacy-MBQL source-query):type :question}](mt/with-temp [:model/Card {question-id :id} question-data]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [conversation-id (str (random-uuid))- ai-token (ai-session-token)arguments {:report_id question-id}request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-report-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-report-details"{:arguments arguments:conversation_id conversation-id}))expected-fields [{:name "VENDOR"@@ -808,18 +769,16 @@(deftest get-model-details-basic-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data metric-data expected-core-fields expected-related-tables]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {metric-id :id} (assoc metric-data :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))](doseq [arguments [{:model_id model-id}@@ -852,18 +811,16 @@(deftest get-model-details-without-field-values-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data metric-data expected-core-fields expected-related-tables]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {metric-id :id} (assoc metric-data :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))arguments {:model_id model-id}]@@ -901,18 +858,16 @@(deftest get-model-details-without-fields-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data metric-data expected-related-tables]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {metric-id :id} (assoc metric-data :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))arguments {:model_id model-id}]@@ -937,18 +892,16 @@(deftest get-model-details-without-metric-temporal-breakout-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data metric-data expected-related-tables]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {metric-id :id} (assoc metric-data :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))arguments {:model_id model-id}]@@ -975,18 +928,16 @@(deftest get-model-details-without-metrics-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data expected-related-tables]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {_metric-id :id} (assoc (:metric-data (model-test-fixtures)) :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))arguments {:model_id model-id}]@@ -1010,18 +961,16 @@(deftest get-model-details-without-related-tables-test(mt/with-premium-features #{:metabot-v3}(let [{:keys [model-data]} (model-test-fixtures)- conversation-id (str (random-uuid))- ai-token (ai-session-token)]+ conversation-id (str (random-uuid))](mt/with-temp [:model/Card {model-id :id} model-data:model/Card {_metric-id :id} (assoc (:metric-data (model-test-fixtures)) :dataset_query(mt/mbql-query orders{:source-table (str "card__" model-id):aggregation [[:count]]:breakout [!month.*created_at *quantity]}))]- (with-redefs [metabot-v3.tools.entity-details/verified-review? (constantly true)]+ (with-redefs [metabot.tools.entity-details/verified-review? (constantly true)](let [request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))](testing "Without related tables"@@ -1046,14 +995,12 @@(t2/delete! :model/FieldValues :field_id [:in (t2/select-fn-vec :id :model/Field :table_id (mt/id :orders))])(let [table-id (mt/id :orders)conversation-id (str (random-uuid))- ai-token (ai-session-token)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/field-values"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/field-values"{:arguments{:entity_type "table":entity_id table-id:field_id (-> table-id- metabot-v3.tools.u/table-field-id-prefix+ metabot.tools.u/table-field-id-prefix(str 8)) ; quantity:limit 15}:conversation_id conversation-id})]@@ -1068,7 +1015,6 @@:description "Model based metric":type :metric}conversation-id (str (random-uuid))- ai-token (ai-session-token)expected-fields[{:name "ID", :display_name "ID", :type "number", :semantic_type "pk"}{:name "USER_ID", :display_name "User ID", :type "number", :semantic_type "fk"}@@ -1080,8 +1026,7 @@{:name "CREATED_AT", :display_name "Created At", :type "datetime", :semantic_type "creation_timestamp"}{:name "QUANTITY", :display_name "Quantity", :type "number", :semantic_type "quantity", :field_values int-sequence?}]request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))](mt/with-temp [:model/Card {metric-id :id} (assoc metric-data :dataset_query@@ -1177,7 +1122,6 @@(mt/with-premium-features #{:metabot-v3}(let [table-id (mt/id :orders)conversation-id (str (random-uuid))- ai-token (ai-session-token)expected-fields-with-h2-db-types[{:name "ID", :type "number", :database_type "bigint"}{:name "USER_ID", :type "number", :database_type "integer"}@@ -1189,8 +1133,7 @@{:name "CREATED_AT", :type "datetime", :database_type "timestamp_with_time_zone"}{:name "QUANTITY", :type "number", :database_type "integer"}]request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))expected-fields (cond->> expected-fields-with-h2-db-types@@ -1212,10 +1155,8 @@(deftest get-table-details-related-tables-test(mt/with-premium-features #{:metabot-v3}(let [conversation-id (str (random-uuid))- ai-token (ai-session-token)request (fn [arguments]- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments arguments:conversation_id conversation-id}))](testing "Normal call includes related_tables by default"@@ -1235,9 +1176,7 @@(mt/with-premium-features #{:metabot-v3}(testing "Related tables include related_by field indicating the FK field name"(let [conversation-id (str (random-uuid))- ai-token (ai-session-token)- response (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-table-details"- {:request-options {:headers {"x-metabase-session" ai-token}}}+ response (mt/user-http-request :rasta :post 200 "metabot/tools/get-table-details"{:arguments {:table_id (mt/id :orders)}:conversation_id conversation-id})related-tables (get-in response [:structured_output :related_tables])@@ -1248,137 +1187,9 @@(testing "Products table is related by PRODUCT_ID FK"(is (= "PRODUCT_ID" (:related_by products-table))))))))-(deftest get-transforms-test- (mt/with-premium-features #{:metabot-v3 :transforms-basic :transforms-python}- (let [conversation-id (str (random-uuid))- rasta-ai-token (ai-session-token)- crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))]- (mt/with-temp [:model/Transform t1 {:name "People Transform"- :description "Simple select on People table"- :source {:type "query"- :query (lib/native-query (mt/metadata-provider) "SELECT * FROM PEOPLE")}- :target {:type "table"- :name "t1_table"}}- :model/Transform t2 {:name "MBQL Transform"- :description "Simple MQBL query on Products table"- :source {:type "query"- :query (mt/mbql-query products)}- :target {:type "table"- :name "t2_table"}}- :model/Transform t3 {:name "Python Transform"- :description "Simple python transform"- :source {:type "python"- :source-database (mt/id)- :body "print('hello world')"- :source-tables []}- :target {:type "table"- :name "t2_table"}}]- (testing "With insufficient permissions"- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :post 403 "ee/metabot-tools/get-transforms"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}- {:conversation_id conversation-id}))))- (testing "With superuser permissions"- (is (=? {:structured_output [(mt/obj->json->obj (select-keys t1 [:id :entity_id :name :description :source]))- ;; note: t2 not included because it's a (non-native) MBQL query- (mt/obj->json->obj (select-keys t3 [:id :entity_id :name :description :source]))]- :conversation_id conversation-id}- (-> (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-transforms"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:conversation_id conversation-id})- (update :structured_output (fn [output]- (->> output- (filter #(#{(:id t1) (:id t2) (:id t3)} (:id %)))- (sort-by :id))))))))))))--(deftest get-transform-test- (mt/with-premium-features #{:metabot-v3 :transforms-basic :transforms-python}- (let [conversation-id (str (random-uuid))- rasta-ai-token (ai-session-token)- crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))]- (mt/with-temp [:model/Transform t1 {:name "People Transform"- :description "Simple select on People table"- :source {:type "query"- :query (mt/native-query {:query "SELECT * FROM PEOPLE"})}- :target {:type "table"- :name "t1_table"}}- :model/Transform t2 {:name "Python Transform"- :description "Simple Python transform"- :source {:type "python"- :body "print('hello world')"- :source-database (mt/id)- :source-tables []}- :target {:type "table"- :name "t2_table"- :database (mt/id)}}]- (testing "With insufficient permissions"- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :post 403 "ee/metabot-tools/get-transform-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}- {:arguments {:transform_id (:id t1)}- :conversation_id conversation-id}))))- (testing "With non-existent transform"- (is (= "Not found."- (mt/user-http-request :rasta :post 404 "ee/metabot-tools/get-transform-details"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:arguments {:transform_id (+ 10000 (:id t2))}- :conversation_id conversation-id}))))- (testing "With superuser permissions"- (doseq [transform [t1 t2]]- (testing (:name transform)- (is (=? {:structured_output (mt/obj->json->obj (select-keys transform [:id :entity_id :name :description :source :target]))- :conversation_id conversation-id}- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-transform-details"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:arguments {:transform_id (:id transform)}- :conversation_id conversation-id}))))))))))--(deftest get-transform-python-library-details-test- (mt/with-premium-features #{:metabot-v3 :python-transforms :transforms-basic}- (let [conversation-id (str (random-uuid))- rasta-ai-token (ai-session-token)- crowberto-ai-token (ai-session-token :crowberto (str (random-uuid)))- saved-python-library (t2/select-one :model/PythonLibrary :path "common.py")]- (when (seq saved-python-library)- (t2/delete! :model/PythonLibrary))- (try- (testing "With no Python library present"- (is (= "Not found."- (mt/user-http-request :rasta :post 404 "ee/metabot-tools/get-transform-python-library-details"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:arguments {:path "common.py"}- :conversation_id conversation-id}))))- (mt/with-temp [:model/PythonLibrary lib1 {:path "common.py"- :source "def hello():\n return 'world'"}]- (testing "With insufficient permissions"- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :post 403 "ee/metabot-tools/get-transform-python-library-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}- {:arguments {:path (:path lib1)}- :conversation_id conversation-id}))))- (testing "With non-existent library path"- (is (=? {:allowed-paths ["common.py"]- :message "Invalid library path. Only 'common' is currently supported."- :path "nonexistent.py"}- (mt/user-http-request :rasta :post 400 "ee/metabot-tools/get-transform-python-library-details"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:arguments {:path "nonexistent.py"}- :conversation_id conversation-id}))))- (testing "With superuser permissions"- (is (=? {:structured_output (select-keys lib1 [:source :path :created_at :updated_at])- :conversation_id conversation-id}- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-transform-python-library-details"- {:request-options {:headers {"x-metabase-session" crowberto-ai-token}}}- {:arguments {:path (:path lib1)}- :conversation_id conversation-id})))))- (finally- (when (seq saved-python-library)- (t2/insert! :model/PythonLibrary saved-python-library)))))))--(deftest get-snippets-test+(deftest ^:sequential get-snippets-test(mt/with-premium-features #{:metabot-v3}- (let [conversation-id (str (random-uuid))- rasta-ai-token (ai-session-token)]+ (let [conversation-id (str (random-uuid))](mt/with-temp [:model/NativeQuerySnippet snippet-1 {:content "1":name "snippet_1":description "great snippet 1"}@@ -1388,8 +1199,7 @@(is (=? {:structured_output []:conversation_id conversation-id}(-> (mt/with-no-data-perms-for-all-users!- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-snippets"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-snippets"{:conversation_id conversation-id}))(update :structured_output (fn [output](filter #(#{(:id snippet-1) (:id snippet-2)} (:id %))@@ -1399,17 +1209,15 @@(select-keys snippet-2 [:id :name :description])]:conversation_id conversation-id}(-> (mt/with-full-data-perms-for-all-users!- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-snippets"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-snippets"{:conversation_id conversation-id}))(update :structured_output (fn [output](filter #(#{(:id snippet-1) (:id snippet-2)} (:id %))output)))))))))))-(deftest get-snippet-details-test+(deftest ^:sequential get-snippet-details-test(mt/with-premium-features #{:metabot-v3}- (let [conversation-id (str (random-uuid))- rasta-ai-token (ai-session-token)]+ (let [conversation-id (str (random-uuid))](mt/with-temp [:model/NativeQuerySnippet snippet-1 {:content "1":name "snippet_1":description "great snippet 1"}@@ -1419,29 +1227,25 @@(is (=? {:errors{:arguments {:snippet_id string?}},:specific-errors {:arguments {:snippet_id ["should be an integer, received: nil"]}}}- (mt/user-http-request :rasta :post 400 "ee/metabot-tools/get-snippet-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 400 "metabot/tools/get-snippet-details"{:arguments {:snippet_id nil}:conversation_id conversation-id}))))(testing "404 returned for non-existent snippet"(is (= "Not found."(let [max-snippet-id (t2/select-one-fn :max-id [:model/NativeQuerySnippet [:%max.id :max-id]])]- (mt/user-http-request :rasta :post 404 "ee/metabot-tools/get-snippet-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 404 "metabot/tools/get-snippet-details"{:arguments {:snippet_id (inc max-snippet-id)}:conversation_id conversation-id})))))(testing "403 returned for missing data perms"(is (= "You don't have permissions to do that."(mt/with-no-data-perms-for-all-users!- (mt/user-http-request :rasta :post 403 "ee/metabot-tools/get-snippet-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 403 "metabot/tools/get-snippet-details"{:arguments {:snippet_id (:id snippet-1)}:conversation_id conversation-id})))))(testing "Snippet details returned with sufficient data perms"(is (=? {:structured_output (select-keys snippet-1 [:id :name :description :content]):conversation_id conversation-id}(mt/with-full-data-perms-for-all-users!- (mt/user-http-request :rasta :post 200 "ee/metabot-tools/get-snippet-details"- {:request-options {:headers {"x-metabase-session" rasta-ai-token}}}+ (mt/user-http-request :rasta :post 200 "metabot/tools/get-snippet-details"{:arguments {:snippet_id (:id snippet-1)}:conversation_id conversation-id})))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/ask_clarification_test.clj b/test/metabase/metabot/tools/ask_clarification_test.cljsimilarity index 92%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/ask_clarification_test.cljrename to test/metabase/metabot/tools/ask_clarification_test.cljindex af1fa7ba9b1..90d2453313f 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/ask_clarification_test.clj+++ b/test/metabase/metabot/tools/ask_clarification_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.ask-clarification-test+(ns metabase.metabot.tools.ask-clarification-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.ask-clarification :as ask-clarification]))+ [metabase.metabot.tools.ask-clarification :as ask-clarification]))(deftest ask-for-sql-clarification-test(testing "returns final-response? flag"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_alert_test.clj b/test/metabase/metabot/tools/create_alert_test.cljsimilarity index 90%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_alert_test.cljrename to test/metabase/metabot/tools/create_alert_test.cljindex 82476e3e6a1..03fa37b71c1 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_alert_test.clj+++ b/test/metabase/metabot/tools/create_alert_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.create-alert-test+(ns metabase.metabot.tools.create-alert-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.create-alert- :as metabot-v3.tools.create-alert][metabase.channel.settings :as channel.settings]+ [metabase.metabot.tools.create-alert+ :as metabot.tools.create-alert][metabase.test :as mt]))(defn- alert-data [card-id]@@ -20,7 +20,7 @@(mt/with-model-cleanup [:model/Notification](mt/with-temp [:model/Card {card-id :id} {}](let [invoke-tool #(mt/with-current-user (mt/user->id :rasta)- (metabot-v3.tools.create-alert/create-alert %))+ (metabot.tools.create-alert/create-alert %))base-data (alert-data card-id)](with-redefs [channel.settings/slack-configured? (constantly true)channel.settings/slack-cached-channels-and-usernames (constantly fake-channels)]@@ -40,7 +40,7 @@(deftest create-alert-validation-test(mt/with-temp [:model/Card {card-id :id} {}](let [invoke-tool #(mt/with-current-user (mt/user->id :rasta)- (metabot-v3.tools.create-alert/create-alert %))+ (metabot.tools.create-alert/create-alert %))base-data (alert-data card-id)](with-redefs [channel.settings/slack-configured? (constantly true)channel.settings/slack-cached-channels-and-usernames (constantly fake-channels)]@@ -63,7 +63,7 @@(deftest create-alert-channel-not-configured-test(mt/with-temp [:model/Card {card-id :id} {}](let [invoke-tool #(mt/with-current-user (mt/user->id :rasta)- (metabot-v3.tools.create-alert/create-alert %))+ (metabot.tools.create-alert/create-alert %))base-data (alert-data card-id)](testing "Slack alert fails when Slack is not configured"(with-redefs [channel.settings/slack-configured? (constantly false)]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard_test.clj b/test/metabase/metabot/tools/create_autogenerated_dashboard_test.cljsimilarity index 97%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard_test.cljrename to test/metabase/metabot/tools/create_autogenerated_dashboard_test.cljindex c8c13d42245..ed160ca74c5 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_autogenerated_dashboard_test.clj+++ b/test/metabase/metabot/tools/create_autogenerated_dashboard_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.create-autogenerated-dashboard-test+(ns metabase.metabot.tools.create-autogenerated-dashboard-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.create-autogenerated-dashboard :as autogen-dashboard]+ [metabase.metabot.tools.create-autogenerated-dashboard :as autogen-dashboard][metabase.test :as mt]));;; Source Resolution Tests (without database)diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_chart_test.clj b/test/metabase/metabot/tools/create_chart_test.cljsimilarity index 94%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_chart_test.cljrename to test/metabase/metabot/tools/create_chart_test.cljindex 2a54257442d..16d863eafe9 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_chart_test.clj+++ b/test/metabase/metabot/tools/create_chart_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.create-chart-test+(ns metabase.metabot.tools.create-chart-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.create-chart :as create-chart]))+ [metabase.metabot.tools.create-chart :as create-chart]))(deftest create-chart-test(testing "creates a chart from a query"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_sql_query_test.clj b/test/metabase/metabot/tools/create_sql_query_test.cljsimilarity index 92%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_sql_query_test.cljrename to test/metabase/metabot/tools/create_sql_query_test.cljindex e87d6238a18..133b7317117 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/create_sql_query_test.clj+++ b/test/metabase/metabot/tools/create_sql_query_test.clj@@ -1,9 +1,9 @@-(ns metabase-enterprise.metabot-v3.tools.create-sql-query-test+(ns metabase.metabot.tools.create-sql-query-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.create-sql-query :as create-sql-query][metabase.driver :as driver]+ [metabase.metabot.tools.create-sql-query :as create-sql-query][metabase.test :as mt]))(deftest create-sql-query-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/deftool_test.clj b/test/metabase/metabot/tools/deftool_test.cljsimilarity index 90%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/deftool_test.cljrename to test/metabase/metabot/tools/deftool_test.cljindex 4b8d083cef9..9cd90288a40 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/deftool_test.clj+++ b/test/metabase/metabot/tools/deftool_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.deftool-test+(ns metabase.metabot.tools.deftool-test(:require[clojure.set :as set][clojure.test :refer [deftest is testing]]- [metabase-enterprise.metabot-v3.tools.deftool :as deftool]+ [metabase.metabot.tools.deftool :as deftool][metabase.util.malli.registry :as mr]));;; ---------------------------------------------------- invoke-tool tests ----------------------------------------------------@@ -14,7 +14,7 @@(reset! received-args args){:structured_output {:message "hello"}})body {:conversation_id "conv-123"}- request {:metabot-v3/metabot-id "bot-456"}+ request {:metabot/metabot-id "bot-456"}opts {:api-name :test-tool:handler handler:result-schema nil}@@ -49,7 +49,7 @@{:structured_output {:processed true}})body {:arguments {:user_id 42}:conversation_id "conv-456"}- request {:metabot-v3/metabot-id "bot-789"}+ request {:metabot/metabot-id "bot-789"}opts {:api-name :test-tool:args-schema ::test-args:handler handler@@ -79,7 +79,7 @@(deftest ^:parallel deftool-macro-expansion-test(testing "deftool macro expands to a defendpoint form"- (let [expansion (macroexpand-1 '(metabase-enterprise.metabot-v3.tools.deftool/deftool "/test-endpoint"+ (let [expansion (macroexpand-1 '(metabase.metabot.tools.deftool/deftool "/test-endpoint""Test docstring"{:args-schema ::my-args:result-schema ::my-result@@ -90,7 +90,7 @@(is (= "/test-endpoint" (nth expansion 2)))))(testing "deftool macro expands correctly for no-args tool"- (let [expansion (macroexpand-1 '(metabase-enterprise.metabot-v3.tools.deftool/deftool "/no-args"+ (let [expansion (macroexpand-1 '(metabase.metabot.tools.deftool/deftool "/no-args""No args tool"{:result-schema ::my-result:handler identity}))]@@ -98,7 +98,7 @@(is (= 'metabase.api.macros/defendpoint (first expansion)))))(testing "deftool macro always includes request in binding vector"- (let [expansion (macroexpand-1 '(metabase-enterprise.metabot-v3.tools.deftool/deftool "/test"+ (let [expansion (macroexpand-1 '(metabase.metabot.tools.deftool/deftool "/test""Test"{:result-schema ::my-result:handler identity}))]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/edit_chart_test.clj b/test/metabase/metabot/tools/edit_chart_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/edit_chart_test.cljrename to test/metabase/metabot/tools/edit_chart_test.cljindex 72ea099c1db..ff41887e580 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/edit_chart_test.clj+++ b/test/metabase/metabot/tools/edit_chart_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.edit-chart-test+(ns metabase.metabot.tools.edit-chart-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.edit-chart :as edit-chart]))+ [metabase.metabot.tools.edit-chart :as edit-chart]))(deftest edit-chart-test(testing "edits a chart's visualization type"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/entity_details_test.clj b/test/metabase/metabot/tools/entity_details_test.cljsimilarity index 93%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/entity_details_test.cljrename to test/metabase/metabot/tools/entity_details_test.cljindex 4268d21d8bf..d351d90f37e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/entity_details_test.clj+++ b/test/metabase/metabot/tools/entity_details_test.clj@@ -1,13 +1,11 @@-(ns metabase-enterprise.metabot-v3.tools.entity-details-test+(ns metabase.metabot.tools.entity-details-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.entity-details :as entity-details]- [metabase-enterprise.test :as met][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.entity-details :as entity-details][metabase.test :as mt]- [metabase.test.fixtures :as fixtures]- [toucan2.core :as t2]))+ [metabase.test.fixtures :as fixtures]))(use-fixtures :once (fixtures/initialize :db :test-users))@@ -276,20 +274,3 @@(let [segment (first segments)](is (= segment-id (:id segment)))(is (= "Large Orders" (:name segment)))))))))))--(defn- sandboxed-query []- (let [mp (mt/metadata-provider)- table (lib.metadata/table mp (mt/id :categories))- id-field (lib.metadata/field mp (mt/id :categories :id))]- (lib/filter (lib/query mp table) (lib/< id-field 3))))--(deftest sandboxed-field-values-test- (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}- (let [field-id (mt/id :categories :name)]- (try- (let [result (entity-details/get-table-details {:table-id (mt/id :categories)})- name-field (some #(when (= "NAME" (:name %)) %) (get-in result [:structured-output :fields]))]- (testing "returns sandboxed field values"- (is (= ["African" "American"] (:field_values name-field)))))- (finally- (t2/delete! :model/FieldValues :field_id field-id :type :advanced))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/field_stats_test.clj b/test/metabase/metabot/tools/field_stats_test.cljsimilarity index 68%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/field_stats_test.cljrename to test/metabase/metabot/tools/field_stats_test.cljindex 9f417827289..94abfd1c57c 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/field_stats_test.clj+++ b/test/metabase/metabot/tools/field_stats_test.clj@@ -1,11 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.field-stats-test+(ns metabase.metabot.tools.field-stats-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.field-stats :as metabot-v3.tools.field-stats]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]- [metabase-enterprise.test :as met][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.field-stats :as metabot.tools.field-stats]+ [metabase.metabot.tools.util :as metabot.tools.u][metabase.test :as mt][metabase.warehouse-schema.models.field-values :as field-values][toucan2.core :as t2]))@@ -42,14 +41,14 @@(let [mp (mt/metadata-provider)people-id (mt/id :people)people-query (table-query mp people-id)- birth-date-id (visible-field-id people-query (metabot-v3.tools.u/table-field-id-prefix people-id) "Birth Date")- state-id (visible-field-id people-query (metabot-v3.tools.u/table-field-id-prefix people-id) "State")+ birth-date-id (visible-field-id people-query (metabot.tools.u/table-field-id-prefix people-id) "Birth Date")+ state-id (visible-field-id people-query (metabot.tools.u/table-field-id-prefix people-id) "State")products-id (mt/id :products)products-query (table-query mp products-id)- category-id (visible-field-id products-query (metabot-v3.tools.u/table-field-id-prefix products-id) "Category")]+ category-id (visible-field-id products-query (metabot.tools.u/table-field-id-prefix products-id) "Category")](testing "No read permission results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "table", :entity-id people-id, :field-id state-id, :limit 5}))))(testing "Getting statistics and values for table fields works."(mt/as-admin@@ -57,7 +56,7 @@(= {:structured-output {:result-type :field-metadata:field_id field-id:value_metadata value-metadata}}- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "table", :entity-id table-id, :field-id field-id, :limit 5}))people-id birth-date-id {:statistics{:distinct-count 2308@@ -89,21 +88,21 @@:type :model}](let [mp (mt/metadata-provider)model-query (lib/query mp (lib.metadata/card mp model-id))- card-field-id-prefix (metabot-v3.tools.u/card-field-id-prefix model-id)+ card-field-id-prefix (metabot.tools.u/card-field-id-prefix model-id);; All fields use c<card-id> syntax with indices from model's visible-columnsquantity-id (visible-field-id model-query card-field-id-prefix "Quantity")state-id (visible-field-id model-query card-field-id-prefix "State")category-id (visible-field-id model-query card-field-id-prefix "Category")](testing "No read permission results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "model", :entity-id model-id, :field-id state-id, :limit 5}))))(testing "Getting statistics and values for model fields works."(mt/as-admin(are [field-id value-metadata](=? {:structured-output {:field_id field-id:value_metadata value-metadata}}- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "model", :entity-id model-id, :field-id field-id, :limit 5}))quantity-id {:statistics {:distinct-count 62:percent-null 0.0}@@ -134,20 +133,20 @@:type :metric}](let [mp (mt/metadata-provider)metric-query (lib/query mp (lib.metadata/metric mp metric-id))- card-field-id-prefix (metabot-v3.tools.u/card-field-id-prefix metric-id)+ card-field-id-prefix (metabot.tools.u/card-field-id-prefix metric-id);; All fields use c<card-id> syntax with indices from metric's filterable-columnsquantity-id (filterable-field-id metric-query card-field-id-prefix "Quantity")birth-date-id (filterable-field-id metric-query card-field-id-prefix "Birth Date")](testing "No read permission results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "metric", :entity-id metric-id, :field-id birth-date-id, :limit 5}))))(testing "Getting statistics and values for metric fields works."(mt/as-admin(are [field-id value-metadata](=? {:structured-output {:field_id field-id:value_metadata value-metadata}}- (metabot-v3.tools.field-stats/field-values+ (metabot.tools.field-stats/field-values{:entity-type "metric", :entity-id metric-id, :field-id field-id, :limit 5}))quantity-id {:statistics {:distinct-count 62:percent-null 0.0}@@ -157,50 +156,3 @@:percent-null 0.0:earliest "1958-04-26":latest "2000-04-03"}}))))))--(defn- sandboxed-query []- (let [mp (mt/metadata-provider)- table (lib.metadata/table mp (mt/id :categories))- id-field (lib.metadata/field mp (mt/id :categories :id))]- (lib/filter (lib/query mp table) (lib/< id-field 3))))--(deftest sandboxed-field-values-test- (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}- (let [field-id (mt/id :categories :name)- table-id (mt/id :categories)- mp (mt/metadata-provider)- tq (table-query mp table-id)- agent-field-id (visible-field-id tq (metabot-v3.tools.u/table-field-id-prefix table-id) "Name")]- (try- (let [result (metabot-v3.tools.field-stats/field-values- {:entity-type "table", :entity-id table-id, :field-id agent-field-id, :limit 10})]- (testing "returns sandboxed field values"- (is (= ["African" "American"] (get-in result [:structured-output :value_metadata :field_values])))))- (finally- (t2/delete! :model/FieldValues :field_id field-id :type :advanced))))))--(deftest refingerprint-bypasses-sandboxing-test- (testing "When Metabot triggers re-fingerprinting for a missing fingerprint, the fingerprint reflects the full- (unsandboxed) data, not the sandboxed view of the current user."- (met/with-gtaps! {:gtaps {:categories {:query (sandboxed-query)}}}- (let [field-id (mt/id :categories :name)- table-id (mt/id :categories)- original-fp (t2/select-one-fn :fingerprint :model/Field :id field-id)- full-distinct-count (get-in original-fp [:global :distinct-count])]- (testing "precondition: the field has a fingerprint with a distinct count greater than 0"- (is (> full-distinct-count 0)))- (try- ;; Clear the fingerprint to force re-fingerprinting via get-or-create-fingerprint!- (t2/update! :model/Field field-id {:fingerprint nil :fingerprint_version 0})- (let [mp (mt/metadata-provider)- tq (table-query mp table-id)- agent-field-id (visible-field-id tq (metabot-v3.tools.u/table-field-id-prefix table-id) "Name")]- (metabot-v3.tools.field-stats/field-values- {:entity-type "table", :entity-id table-id, :field-id agent-field-id})- (let [new-fp (t2/select-one-fn :fingerprint :model/Field :id field-id)]- (testing "fingerprint was saved"- (is (some? new-fp)))- (testing "fingerprint reflects full table data, not the sandboxed subset"- (is (= full-distinct-count (get-in new-fp [:global :distinct-count]))))))- (finally- (t2/update! :model/Field field-id {:fingerprint original-fp})))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/filters_test.clj b/test/metabase/metabot/tools/filters_test.cljsimilarity index 91%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/filters_test.cljrename to test/metabase/metabot/tools/filters_test.cljindex be74aa541c6..bcd13b1edb3 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/filters_test.clj+++ b/test/metabase/metabot/tools/filters_test.clj@@ -1,16 +1,16 @@-(ns metabase-enterprise.metabot-v3.tools.filters-test+(ns metabase.metabot.tools.filters-test(:require[clojure.string :as str][clojure.test :refer :all][medley.core :as m]- [metabase-enterprise.metabot-v3.tools.entity-details :as metabot-v3.tools.entity-details]- [metabase-enterprise.metabot-v3.tools.filters :as metabot-v3.tools.filters]- [metabase-enterprise.metabot-v3.tools.test-util :as tools.tu][metabase.lib-be.core :as lib-be][metabase.lib.convert :as lib.convert][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.lib.test-util :as lib.tu]+ [metabase.metabot.tools.entity-details :as metabot.tools.entity-details]+ [metabase.metabot.tools.filters :as metabot.tools.filters]+ [metabase.metabot.tools.test-util :as tools.tu][metabase.test :as mt][metabase.util :as u]))@@ -36,17 +36,17 @@:type :metric}](testing "User has to have execution rights."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters []:group-by []}))))(mt/with-current-user (mt/user->id :crowberto)- (let [metric-details (metabot-v3.tools.entity-details/metric-details metric-id)+ (let [metric-details (metabot.tools.entity-details/metric-details metric-id)->field-id #(u/prog1 (-> metric-details :queryable-dimensions (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))](testing "Trivial query works."- (let [result (metabot-v3.tools.filters/query-metric+ (let [result (metabot.tools.filters/query-metric{:metric-id metric-id:filters []:group-by []})@@ -72,7 +72,7 @@"TX"][:> {} [:field {} (mt/id :orders :discount)]3]]}]}}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id ["User" "State"]):operation :string-equals@@ -98,7 +98,7 @@6 7 8]]:breakout [[:field {:temporal-unit :week}(mt/id :orders :created_at)]]}]}}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Created At"):bucket :week-of-year@@ -139,7 +139,7 @@[:!= {}[:field {} (mt/id :orders :discount)]3 42]]}]}}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id state-id:operation :string-contains@@ -159,11 +159,11 @@(testing "Missing metric results in an error."(is (= {:output "Not found.":status-code 404}- (metabot-v3.tools.filters/query-metric {:metric-id Integer/MAX_VALUE}))))+ (metabot.tools.filters/query-metric {:metric-id Integer/MAX_VALUE}))))(testing "Invalid metric-id results in an error."(is (= {:output (str "Invalid metric_id " metric-id):status-code 400}- (metabot-v3.tools.filters/query-metric {:metric-id (str metric-id)}))))))))+ (metabot.tools.filters/query-metric {:metric-id (str metric-id)}))))))))(deftest query-metric-temporal-value-validation-test(let [mp (mt/metadata-provider)@@ -178,12 +178,12 @@:description "The average subtotal of orders.":type :metric}](mt/with-current-user (mt/user->id :crowberto)- (let [metric-details (metabot-v3.tools.entity-details/metric-details metric-id)+ (let [metric-details (metabot.tools.entity-details/metric-details metric-id)->field-id #(u/prog1 (-> metric-details :queryable-dimensions (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))](testing "Negative value on temporal field without bucket is rejected"- (let [result (metabot-v3.tools.filters/query-metric+ (let [result (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Created At"):operation :greater-than-or-equal@@ -192,7 +192,7 @@(is (= 400 (:status-code result)))(is (str/includes? (:output result) "not valid for a date/datetime field"))))(testing "Small positive integer on temporal field without bucket is rejected"- (let [result (metabot-v3.tools.filters/query-metric+ (let [result (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Created At"):operation :greater-than-or-equal@@ -202,7 +202,7 @@(is (str/includes? (:output result) "not valid for a date/datetime field"))))(testing "Date string on temporal field without bucket passes validation"(is (=? {:structured-output {:type :query}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Created At"):operation :greater-than-or-equal@@ -210,7 +210,7 @@:group-by []}))))(testing "Large integer (year) on temporal field without bucket passes validation"(is (=? {:structured-output {:type :query}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Created At"):operation :greater-than-or-equal@@ -218,7 +218,7 @@:group-by []}))))(testing "Numeric value on non-temporal field without bucket passes validation"(is (=? {:structured-output {:type :query}}- (metabot-v3.tools.filters/query-metric+ (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:field-id (->field-id "Discount"):operation :greater-than-or-equal@@ -233,12 +233,12 @@:type :model}](testing "User has to have execution rights."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/query-model+ (metabot.tools.filters/query-model{:model-id model-id:filters []:group-by []}))))(mt/with-current-user (mt/user->id :crowberto)- (let [model-details (-> (metabot-v3.tools.entity-details/get-table-details {:model-id model-id})+ (let [model-details (-> (metabot.tools.entity-details/get-table-details {:model-id model-id}):structured-output)->field-id #(u/prog1 (-> model-details :fields (by-name %) :field_id)(when-not <>@@ -251,7 +251,7 @@:lib/type :mbql/query:stages [{:lib/type :mbql.stage/mbql:source-card model-id}]}}}- (metabot-v3.tools.filters/query-model+ (metabot.tools.filters/query-model{:model-id model-id:filters []:group-by []}))))@@ -265,7 +265,7 @@:aggregation [[:sum {} [:field {} "SUBTOTAL"]]]:breakout [[:field {} "PRODUCT_ID"]]:filters [[:> {} [:field {} "DISCOUNT"] 3]]}]}}}- (metabot-v3.tools.filters/query-model+ (metabot.tools.filters/query-model{:model-id model-id:filters [{:field-id (->field-id "Discount"):operation :number-greater-than@@ -289,7 +289,7 @@[:= {} [:get-month {} [:field {} "CREATED_AT"]] 6 7 8]]:breakout [[:field {} "PRODUCT_ID"][:field {:temporal-unit :week} "CREATED_AT"]]}]}}}- (metabot-v3.tools.filters/query-model+ (metabot.tools.filters/query-model{:model-id model-id:filters [{:field-id order-created-at-field-id:bucket :week-of-year@@ -330,7 +330,7 @@[:expression "Created At: Day of week" {:base-type :type/Integer}][:field "TOTAL" {:base-type :type/Float}]]:filter [:!= [:field "USER_ID" {}] 3 42]})}}- (metabot-v3.tools.filters/query-model+ (metabot.tools.filters/query-model{:model-id model-id:fields [{:field-id order-created-at-field-id:bucket :day-of-month}@@ -353,34 +353,34 @@:filters [{:field-id (->field-id "User ID"):operation :not-equals:values [3 42]}]}]- (are [input] (=? expected-query (metabot-v3.tools.filters/query-model input))+ (are [input] (=? expected-query (metabot.tools.filters/query-model input))input(assoc input :fields nil)(assoc input :fields [])))))(testing "Missing model results in an error."(is (= {:output "Not found.":status-code 404}- (metabot-v3.tools.filters/query-model {:model-id Integer/MAX_VALUE}))))+ (metabot.tools.filters/query-model {:model-id Integer/MAX_VALUE}))))(testing "Invalid model-id results in an error."(is (= {:output (str "Invalid model_id " model-id):status-code 400}- (metabot-v3.tools.filters/query-model {:model-id (str model-id)})))))))+ (metabot.tools.filters/query-model {:model-id (str model-id)})))))))(deftest ^:parallel filter-records-table-test(testing "User has to have execution rights, otherwise the table should be invisible."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id (mt/id :orders)}:filters []}))))(mt/with-current-user (mt/user->id :crowberto)(let [mp (mt/metadata-provider)table-id (mt/id :orders)- table-details (#'metabot-v3.tools.entity-details/table-details table-id {:metadata-provider mp})+ table-details (#'metabot.tools.entity-details/table-details table-id {:metadata-provider mp})->field-id #(u/prog1 (-> table-details :fields (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))](testing "Trivial query works."- (let [result (metabot-v3.tools.filters/filter-records+ (let [result (metabot.tools.filters/filter-records{:data-source {:table-id table-id}:filters []})actual-query (get-in result [:structured-output :query])@@ -389,7 +389,7 @@(is (string? (get-in result [:structured-output :query-id])))(is (tools.tu/query= expected-query actual-query))))(testing "Filtering works."- (let [result (metabot-v3.tools.filters/filter-records+ (let [result (metabot.tools.filters/filter-records{:data-source {:table-id table-id}:filters [{:field-id (->field-id "Created At"):bucket :day-of-week@@ -410,7 +410,7 @@(is (tools.tu/query= expected-query actual-query)))))(testing "Missing table results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Not found."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id Integer/MAX_VALUE}}))))))(deftest ^:parallel filter-records-model-test@@ -424,11 +424,11 @@:type :model}](testing "User has to have execution rights."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id (str "card__" model-id)}:filters []}))))(mt/with-current-user (mt/user->id :crowberto)- (let [model-details (#'metabot-v3.tools.entity-details/card-details model-id)+ (let [model-details (#'metabot.tools.entity-details/card-details model-id)table-id (str "card__" model-id)->field-id #(u/prog1 (-> model-details :fields (by-name %) :field_id)(when-not <>@@ -440,7 +440,7 @@:lib/type :mbql/query:stages [{:lib/type :mbql.stage/mbql:source-card model-id}]}}}- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id table-id}:filters []}))))(testing "Filtering works."@@ -451,14 +451,14 @@:stages [{:lib/type :mbql.stage/mbql:source-card model-id:filters [[:> {} [:field {} "DISCOUNT"] 3]]}]}}}- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id table-id}:filters [{:field-id (->field-id "Discount"):operation :number-greater-than:value 3}]})))))(testing "Missing table results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Not found."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:table-id (str "card__" Integer/MAX_VALUE)}}))))))))(deftest ^:parallel filter-records-report-test@@ -473,11 +473,11 @@:type :question}](testing "User has to have execution rights."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:report-id card-id}:filters []}))))(mt/with-current-user (mt/user->id :crowberto)- (let [report-details (#'metabot-v3.tools.entity-details/card-details card-id)+ (let [report-details (#'metabot.tools.entity-details/card-details card-id)->field-id #(u/prog1 (-> report-details :fields (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))]@@ -488,7 +488,7 @@:lib/type :mbql/query:stages [{:lib/type :mbql.stage/mbql:source-table table-id}]}}}- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:report-id card-id}:filters []}))))(testing "Filtering works."@@ -499,14 +499,14 @@:stages [{:lib/type :mbql.stage/mbql:source-table table-id:filters [[:> {} [:field {} (mt/id :orders :discount)] 3]]}]}}}- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:report-id card-id}:filters [{:field-id (->field-id "Discount"):operation :number-greater-than:value 3}]})))))(testing "Missing table results in an error."(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Not found."- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records{:data-source {:report-id Integer/MAX_VALUE}}))))))))(deftest ^:parallel filter-records-query-test@@ -516,7 +516,7 @@query (lib/query mp (lib.metadata/table mp table-id))legacy-query (lib.convert/->legacy-MBQL query)query-details (mt/with-current-user (mt/user->id :crowberto)- (#'metabot-v3.tools.entity-details/execute-query query-id legacy-query))+ (#'metabot.tools.entity-details/execute-query query-id legacy-query))->field-id #(u/prog1 (-> query-details :result-columns (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))@@ -536,22 +536,22 @@(testing "Filtering works."(testing "new tool call with query and query-id"(is (=? expected- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records(assoc input :data-source (select-keys query-details [:query :query-id]))))))(testing "new tool call with just query"(is (=? expected- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records(assoc input :data-source (select-keys query-details [:query]))))))(testing "MBQL v5 query works"(is (=? expected- (metabot-v3.tools.filters/filter-records+ (metabot.tools.filters/filter-records(assoc input :data-source {:query query})))))))))(deftest ^:parallel query-datasource-table-test(mt/with-current-user (mt/user->id :crowberto)(let [mp (mt/metadata-provider)table-id (mt/id :orders)- table-details (#'metabot-v3.tools.entity-details/table-details table-id {:metadata-provider mp})+ table-details (#'metabot.tools.entity-details/table-details table-id {:metadata-provider mp})->field-id #(u/prog1 (-> table-details :fields (by-name %) :field_id)(when-not <>(throw (ex-info (str "Column " % " not found") {:column %}))))]@@ -562,7 +562,7 @@:lib/type :mbql/query:stages [{:lib/type :mbql.stage/mbql:source-table table-id}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id}))))(testing "Table query with fields selection"@@ -574,7 +574,7 @@:source-table table-id:fields [[:field {} (mt/id :orders :created_at)][:field {} (mt/id :orders :total)]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id:fields [{:field-id (->field-id "Created At")}{:field-id (->field-id "Total")}]}))))@@ -588,7 +588,7 @@:source-table table-id:filters [[:> {} [:field {} (mt/id :orders :discount)] 3][:= {} [:field {} (mt/id :orders :user_id)] 10]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id:filters [{:field-id (->field-id "Discount"):operation :number-greater-than@@ -607,7 +607,7 @@:aggregation [[:sum {} [:field {} (mt/id :orders :subtotal)]][:avg {} [:field {} (mt/id :orders :discount)]]]:breakout [[:field {} (mt/id :orders :product_id)]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id:aggregations [{:field-id (->field-id "Subtotal"):function :sum}@@ -625,7 +625,7 @@:order-by [[:asc {} [:field {} (mt/id :orders :created_at)]][:desc {} [:field {} (mt/id :orders :total)]]]:limit 100}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id:order-by [{:field {:field-id (->field-id "Created At")}:direction :asc}@@ -642,7 +642,7 @@:source-table table-id:aggregation [[:count {}]]:breakout [[:field {:temporal-unit :month} (mt/id :orders :created_at)]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id table-id:aggregations [{:field-id (->field-id "Product ID"):function :count}]@@ -656,7 +656,7 @@:description "Test model for orders":type :model}](mt/with-current-user (mt/user->id :crowberto)- (let [model-details (-> (metabot-v3.tools.entity-details/get-table-details {:model-id model-id})+ (let [model-details (-> (metabot.tools.entity-details/get-table-details {:model-id model-id}):structured-output)->field-id #(u/prog1 (-> model-details :fields (by-name %) :field_id)(when-not <>@@ -668,7 +668,7 @@:lib/type :mbql/query:stages [{:lib/type :mbql.stage/mbql:source-card model-id}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id}))))(testing "Model query with fields selection"@@ -680,7 +680,7 @@:source-card model-id:fields [[:field {} "CREATED_AT"][:field {} "TOTAL"]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id:fields [{:field-id (->field-id "Created At")}{:field-id (->field-id "Total")}]}))))@@ -694,7 +694,7 @@:source-card model-id:filters [[:> {} [:field {} "DISCOUNT"] 5][:< {} [:field {} "SUBTOTAL"] 100]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id:filters [{:field-id (->field-id "Discount"):operation :number-greater-than@@ -713,7 +713,7 @@:aggregation [[:count {}][:max {} [:field {} "TOTAL"]]]:breakout [[:field {} "USER_ID"]]}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id:aggregations [{:field-id (->field-id "Product ID"):function :count}@@ -730,7 +730,7 @@:source-card model-id:order-by [[:desc {} [:field {} "CREATED_AT"]]]:limit 50}]}}}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id:order-by [{:field {:field-id (->field-id "Created At")}:direction :desc}]@@ -741,37 +741,37 @@(testing "Error when neither table-id nor model-id provided"(is (= {:output "Either table_id or model_id must be provided":status-code 400}- (metabot-v3.tools.filters/query-datasource {}))))+ (metabot.tools.filters/query-datasource {}))))(testing "Error when both table-id and model-id provided"(is (= {:output "Cannot provide both table_id and model_id":status-code 400}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):model-id 123}))))(testing "Error with invalid table-id"(is (= {:output "Invalid table_id not-a-number":status-code 400}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id "not-a-number"}))))(testing "Error with invalid model-id"(is (= {:output "Invalid model_id not-a-number":status-code 400}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id "not-a-number"}))))(testing "Error with non-existent table"(is (= {:output (str "No table found with table_id " Integer/MAX_VALUE):status-code 404}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id Integer/MAX_VALUE}))))(testing "Error with non-existent model"(is (= {:output (str "No model found with model_id " Integer/MAX_VALUE):status-code 404}- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id Integer/MAX_VALUE}))))))(deftest ^:parallel query-datasource-permissions-test@@ -781,12 +781,12 @@:type :model}](testing "User without permissions gets error for table"(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:table-id (mt/id :orders)}))))(testing "User without permissions gets error for model"(is (thrown-with-msg? clojure.lang.ExceptionInfo #"You don't have permissions to do that."- (metabot-v3.tools.filters/query-datasource+ (metabot.tools.filters/query-datasource{:model-id model-id}))))))(defn- mbql-measure-definition@@ -848,7 +848,7 @@(mt/with-current-user (mt/user->id :crowberto)(testing "query-metric with segment filter applies the segment"(with-redefs [lib-be/application-database-metadata-provider (constantly mock-mp)]- (let [result (metabot-v3.tools.filters/query-metric+ (let [result (metabot.tools.filters/query-metric{:metric-id metric-id:filters [{:segment-id mock-segment-id}]:group-by []})@@ -866,7 +866,7 @@(mt/with-current-user (mt/user->id :crowberto)(with-redefs [lib-be/application-database-metadata-provider (constantly mock-mp)](testing "query-datasource with measure aggregation"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):aggregations [{:measure-id mock-measure-id}]})query (get-in result [:structured-output :query])@@ -877,7 +877,7 @@(is (some #(and (vector? %) (= :measure (first %))) aggregations))))(testing "query-datasource with measure aggregation and sort order"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):aggregations [{:measure-id mock-measure-id:sort-order :desc}]})@@ -894,7 +894,7 @@(mt/with-current-user (mt/user->id :crowberto)(with-redefs [lib-be/application-database-metadata-provider (constantly mock-mp)](testing "query-datasource with segment filter"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):filters [{:segment-id mock-segment-id}]})query (get-in result [:structured-output :query])@@ -916,7 +916,7 @@(mt/with-current-user (mt/user->id :crowberto)(with-redefs [lib-be/application-database-metadata-provider (constantly mock-mp)](testing "query-datasource with both measure aggregation and segment filter"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):aggregations [{:measure-id mock-measure-id}]:filters [{:segment-id mock-segment-id}]})@@ -934,7 +934,7 @@(mt/with-current-user (mt/user->id :crowberto)(with-redefs [lib-be/application-database-metadata-provider (constantly mp)](testing "query-datasource with non-existent segment returns error"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):filters [{:segment-id non-existent-segment-id}]})](is (nil? (:structured-output result)))@@ -948,7 +948,7 @@(mt/with-current-user (mt/user->id :crowberto)(with-redefs [lib-be/application-database-metadata-provider (constantly mp)](testing "query-datasource with non-existent measure returns error"- (let [result (metabot-v3.tools.filters/query-datasource+ (let [result (metabot.tools.filters/query-datasource{:table-id (mt/id :orders):aggregations [{:measure-id non-existent-measure-id}]})](is (nil? (:structured-output result)))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/llm_representations_test.clj b/test/metabase/metabot/tools/llm_representations_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/llm_representations_test.cljrename to test/metabase/metabot/tools/llm_representations_test.cljindex 1727245cc3f..4dcb564b911 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/llm_representations_test.clj+++ b/test/metabase/metabot/tools/llm_representations_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.llm-representations-test+(ns metabase.metabot.tools.llm-representations-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.llm-representations :as llm-rep]))+ [metabase.metabot.tools.llm-representations :as llm-rep]))(deftest escape-xml-test(testing "escape-xml handles special characters"@@ -18,7 +18,7 @@(deftest field->xml-test(testing "formats field with all attributes matching Python format"- ;; for field data format see `metabase-enterprise.metabot-v3.tools.util/->result-column`+ ;; for field data format see `metabase.metabot.tools.util/->result-column`(let [field {:field_id "f1":name "user_id":display_name "User ID"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/navigate_test.clj b/test/metabase/metabot/tools/navigate_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/navigate_test.cljrename to test/metabase/metabot/tools/navigate_test.cljindex d93e43350b9..9473a9d8a66 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/navigate_test.clj+++ b/test/metabase/metabot/tools/navigate_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.navigate-test+(ns metabase.metabot.tools.navigate-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.navigate :as navigate]))+ [metabase.metabot.tools.navigate :as navigate]))(deftest page->path-test(testing "page navigation produces correct paths"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/read_resource_test.clj b/test/metabase/metabot/tools/read_resource_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/read_resource_test.cljrename to test/metabase/metabot/tools/read_resource_test.cljindex 206b2e2d27e..0fb0a217b1d 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/read_resource_test.clj+++ b/test/metabase/metabot/tools/read_resource_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.metabot-v3.tools.read-resource-test+(ns metabase.metabot.tools.read-resource-test"Tests for read_resource tool."(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.read-resource :as read-resource][metabase.lib.core :as lib]+ [metabase.metabot.tools.read-resource :as read-resource][metabase.test :as mt]))(deftest parse-uri-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj b/test/metabase/metabot/tools/search_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.cljrename to test/metabase/metabot/tools/search_test.cljindex 5450a5d6eaf..b0c68a5075e 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj+++ b/test/metabase/metabot/tools/search_test.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.metabot-v3.tools.search-test+(ns metabase.metabot.tools.search-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.search :as search][metabase.api.common :as api][metabase.lib-be.metadata.jvm :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.tools.search :as search][metabase.permissions.core :as perms][metabase.permissions.models.permissions-group :as perms-group][metabase.search.core :as search-core]diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql/validation_test.clj b/test/metabase/metabot/tools/sql/validation_test.cljsimilarity index 91%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql/validation_test.cljrename to test/metabase/metabot/tools/sql/validation_test.cljindex 29c4e2043af..0be71f087d7 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql/validation_test.clj+++ b/test/metabase/metabot/tools/sql/validation_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.tools.sql.validation-test+(ns metabase.metabot.tools.sql.validation-test(:require[clojure.string :as str][clojure.test :refer [deftest testing is]]- [metabase-enterprise.metabot-v3.tools.sql.validation :as metabot-v3.tools.sql.validation]))+ [metabase.metabot.tools.sql.validation :as metabot.tools.sql.validation]));;;; contains-template-tags?@@ -21,7 +21,7 @@(deftest contains-template-tags?-positive-test(doseq [{:keys [context sql]} contains-template-tags-positive-cases](testing context- (is (true? (#'metabot-v3.tools.sql.validation/contains-template-tags? sql))))))+ (is (true? (#'metabot.tools.sql.validation/contains-template-tags? sql))))))(def ^:private contains-template-tags-negative-cases[{:context "Single curly braces (e.g., JSON) should not trigger detection"@@ -34,7 +34,7 @@(deftest contains-template-tags?-negative-test(doseq [{:keys [context sql]} contains-template-tags-negative-cases](testing context- (is (false? (#'metabot-v3.tools.sql.validation/contains-template-tags? sql))))))+ (is (false? (#'metabot.tools.sql.validation/contains-template-tags? sql))))));;;; validate-sql@@ -80,7 +80,7 @@(doseq [{:keys [context dialect expected sql]} validation-cases](testing context(is (=? expected- (metabot-v3.tools.sql.validation/validate-sql dialect sql))))))+ (metabot.tools.sql.validation/validate-sql dialect sql))))))(def ^:private transpilation-cases"Testing _context_ describe a test case. Apart from that, pretty formatting is checked by comparisons of raw output@@ -107,4 +107,4 @@(doseq [{:keys [context dialect expected sql]} transpilation-cases](testing context(is (=? expected- (metabot-v3.tools.sql.validation/validate-sql dialect sql))))))+ (metabot.tools.sql.validation/validate-sql dialect sql))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql_tools_test.clj b/test/metabase/metabot/tools/sql_tools_test.cljsimilarity index 94%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql_tools_test.cljrename to test/metabase/metabot/tools/sql_tools_test.cljindex 1b9942339a5..1266aefd15b 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/sql_tools_test.clj+++ b/test/metabase/metabot/tools/sql_tools_test.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.tools.sql-tools-test+(ns metabase.metabot.tools.sql-tools-test"Comprehensive tests for SQL query manipulation tools."(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.create-sql-query :as create-sql-query]- [metabase-enterprise.metabot-v3.tools.edit-sql-query :as edit-sql-query]- [metabase-enterprise.metabot-v3.tools.replace-sql-query :as replace-sql-query][metabase.lib.core :as lib]+ [metabase.metabot.tools.create-sql-query :as create-sql-query]+ [metabase.metabot.tools.edit-sql-query :as edit-sql-query]+ [metabase.metabot.tools.replace-sql-query :as replace-sql-query][metabase.test :as mt]))(deftest edit-sql-query-testdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/test_util.clj b/test/metabase/metabot/tools/test_util.cljsimilarity index 80%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/test_util.cljrename to test/metabase/metabot/tools/test_util.cljindex 43fa71ec3ad..4c82ae1476d 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/test_util.clj+++ b/test/metabase/metabot/tools/test_util.clj@@ -1,4 +1,4 @@-(ns metabase-enterprise.metabot-v3.tools.test-util+(ns metabase.metabot.tools.test-util(:require[metabase.lib.core :as lib]))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/todo_test.clj b/test/metabase/metabot/tools/todo_test.cljsimilarity index 97%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/todo_test.cljrename to test/metabase/metabot/tools/todo_test.cljindex 47957f95dcf..a78d7ee56b5 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/todo_test.clj+++ b/test/metabase/metabot/tools/todo_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.tools.todo-test+(ns metabase.metabot.tools.todo-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.todo :as todo]))+ [metabase.metabot.tools.todo :as todo]))(deftest todo-write-test(testing "todo-write validates and stores todos in memory"diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_test.clj b/test/metabase/metabot/tools/transforms_test.cljsimilarity index 80%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_test.cljrename to test/metabase/metabot/tools/transforms_test.cljindex 7d820f3b014..94b44b29501 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_test.clj+++ b/test/metabase/metabot/tools/transforms_test.clj@@ -1,15 +1,15 @@-(ns metabase-enterprise.metabot-v3.tools.transforms-test+(ns metabase.metabot.tools.transforms-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.transforms :as metabot-v3.tools.transforms][metabase.lib-be.metadata.jvm :as lib-be][metabase.lib.core :as lib]+ [metabase.metabot.tools.transforms :as metabot.tools.transforms][metabase.permissions.models.permissions-group :as perms-group][metabase.test :as mt]))(deftest get-transforms-test(testing "get-transforms correctly returns transform when the user has access to the source database"- (mt/with-premium-features #{:metabot-v3 :transforms-basic}+ (mt/with-premium-features #{:transforms-basic}(mt/with-temp [:model/Database {db-id :id} {}](let [mp (lib-be/application-database-metadata-provider db-id)](mt/with-temp [:model/Transform transform@@ -18,32 +18,32 @@:query (lib/native-query mp "SELECT 1")}}](testing "returns transform when user can query the source database"(mt/with-test-user :crowberto- (let [result (:structured_output (metabot-v3.tools.transforms/get-transforms {}))+ (let [result (:structured_output (metabot.tools.transforms/get-transforms {}))returned (first (filter #(= (:id transform) (:id %)) result))](is (some? returned)))))(testing "filters out transform when user cannot query the source database"(mt/with-data-analyst-role! (mt/user->id :rasta)(mt/with-db-perm-for-group! (perms-group/all-users) db-id :perms/create-queries :no(mt/with-test-user :rasta- (let [result (:structured_output (metabot-v3.tools.transforms/get-transforms {}))+ (let [result (:structured_output (metabot.tools.transforms/get-transforms {}))returned (first (filter #(= (:id transform) (:id %)) result))](is (nil? returned)))))))))))))(deftest get-transform-details-test(testing "get-transform-details returns transform when user can query the source database"- (mt/with-premium-features #{:metabot-v3 :transforms-basic}+ (mt/with-premium-features #{:transforms-basic}(mt/with-temp [:model/Transform transform{:name "Test Transform":source {:type "query":query (lib/native-query (mt/metadata-provider) "SELECT 1")}}](mt/with-test-user :crowberto- (let [result (:structured_output (metabot-v3.tools.transforms/get-transform-details+ (let [result (:structured_output (metabot.tools.transforms/get-transform-details{:transform-id (:id transform)}))](is (= (:id transform) (:id result)))))))))(deftest get-transform-details-blocked-test(testing "get-transform-details throws when user cannot query the source database"- (mt/with-premium-features #{:metabot-v3 :transforms-basic}+ (mt/with-premium-features #{:transforms-basic}(mt/with-temp [:model/Database {db-id :id} {}](let [mp (lib-be/application-database-metadata-provider db-id)](mt/with-temp [:model/Transform transform@@ -56,5 +56,5 @@(is (thrown-with-msg?clojure.lang.ExceptionInfo#"You don't have permissions to do that"- (metabot-v3.tools.transforms/get-transform-details+ (metabot.tools.transforms/get-transform-details{:transform-id (:id transform)}))))))))))))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_write_test.clj b/test/metabase/metabot/tools/transforms_write_test.cljsimilarity index 86%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_write_test.cljrename to test/metabase/metabot/tools/transforms_write_test.cljindex e96b1202927..12c2816638f 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/transforms_write_test.clj+++ b/test/metabase/metabot/tools/transforms_write_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.metabot-v3.tools.transforms-write-test+(ns metabase.metabot.tools.transforms-write-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.transforms-write :as transforms-write]))+ [metabase.metabot.tools.transforms-write :as transforms-write]));;; Edit Application Tests@@ -103,24 +103,7 @@:memory-atom memory-atom})](is (= "New Transform" (get-in result [:structured-output :transform :name])))(is (= "A test transform" (get-in result [:structured-output :transform :description])))- (is (= "SELECT 1" (get-in result [:structured-output :transform :source :query])))))-- (testing "creates fresh Python transform"- (let [memory-atom (atom {:state {}})- result (transforms-write/write-transform-python- {:edit_action {:mode "replace"- :new_content "def transform():\n return pd.DataFrame()"}- :transform_name "Python Transform"- :memory-atom memory-atom})]- (is (= "Python Transform" (get-in result [:structured-output :transform :name])))- (is (= "python" (get-in result [:structured-output :transform :source :type]))))))--(deftest create-fresh-python-template-test- (testing "fresh Python transforms include common import"- (let [result (#'transforms-write/create-fresh-transform- :python "Python Transform" nil nil nil)]- (is (= "import common\nimport pandas as pd\n\ndef transform():\n # Your transformation logic here\n return pd.DataFrame([{\"message\": \"Hello from Python transform!\"}])\n"- (get-in result [:source :query]))))))+ (is (= "SELECT 1" (get-in result [:structured-output :transform :source :query]))))));;; Data Parts Testsdiff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj b/test/metabase/metabot/tools/util_test.cljsimilarity index 80%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.cljrename to test/metabase/metabot/tools/util_test.cljindex 9d21404b4ac..226a7f6fd51 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/util_test.clj+++ b/test/metabase/metabot/tools/util_test.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.metabot-v3.tools.util-test+(ns metabase.metabot.tools.util-test(:require[clojure.test :refer :all]- [metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.util][metabase.collections.models.collection :as collection][metabase.content-verification.core :as moderation][metabase.lib-be.core :as lib-be][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.metabot.tools.util :as metabot.tools.util][metabase.permissions.models.permissions :as perms][metabase.test :as mt]))@@ -16,14 +16,14 @@:schedule_hour nil:schedule_day nil:schedule_frame nil}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :hourly}))))(testing "daily schedule"(is (= {:schedule_type "daily":schedule_hour 9:schedule_day nil:schedule_frame nil}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :daily:hour 9}))))(testing "weekly schedule"@@ -31,14 +31,14 @@:schedule_hour 8:schedule_day "mon":schedule_frame nil}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :weekly:hour 8:day-of-week :monday}))))(testing "weekly schedule truncates day name to 3 chars"(is (= "wed"(:schedule_day- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :weekly:hour 10:day-of-week :wednesday})))))@@ -47,7 +47,7 @@:schedule_hour 6:schedule_day "mon":schedule_frame "first"}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :monthly:hour 6:day-of-month :first-mon}))))@@ -56,7 +56,7 @@:schedule_hour 17:schedule_day "fri":schedule_frame "last"}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :monthly:hour 17:day-of-month :last-fri}))))@@ -65,7 +65,7 @@:schedule_hour 12:schedule_day nil:schedule_frame "mid"}- (metabot-v3.tools.util/schedule->schedule-map+ (metabot.tools.util/schedule->schedule-map{:frequency :monthly:hour 12:day-of-month :mid})))))@@ -101,7 +101,7 @@(testing "admin can see all cards in metabot collection and subcollections"(let [admin-result (mt/with-test-user :crowberto- (metabot-v3.tools.util/get-metrics-and-models (:id metabot)))+ (metabot.tools.util/get-metrics-and-models (:id metabot)))card-ids (set (map :id admin-result))](is (contains? card-ids (:id mb-model1)))(is (contains? card-ids (:id mb-model2)))@@ -112,7 +112,7 @@(testing "normal user sees only permitted cards"(let [user-result (mt/with-test-user :rasta- (metabot-v3.tools.util/get-metrics-and-models (:id metabot)))+ (metabot.tools.util/get-metrics-and-models (:id metabot)))card-ids (set (map :id user-result))](is (contains? card-ids (:id mb-model1)))(is (contains? card-ids (:id mb-model2)))@@ -131,7 +131,7 @@:use_verified_content false}](testing "metabot with root collection sees all content"(let [result (mt/with-test-user :crowberto- (metabot-v3.tools.util/get-metrics-and-models (:id metabot)))+ (metabot.tools.util/get-metrics-and-models (:id metabot)))card-ids (set (map :id result))](is (contains? card-ids (:id root-model)))(is (contains? card-ids (:id root-metric)))@@ -147,7 +147,7 @@columns (lib/visible-columns orders-query)](testing "adds table-reference for implicitly joined columns"- (let [processed-columns (map #(metabot-v3.tools.util/add-table-reference orders-query %) columns)+ (let [processed-columns (map #(metabot.tools.util/add-table-reference orders-query %) columns)user-name-column (first (filter #(and (= "NAME" (:name %))(:fk-field-id %)) processed-columns))](is (some? user-name-column) "Expected to find implicitly joined User NAME column")@@ -157,7 +157,7 @@(is (= "User" (:table-reference user-name-column)))))(testing "does not add table-reference for direct table columns"- (let [processed-columns (map #(metabot-v3.tools.util/add-table-reference orders-query %) columns)+ (let [processed-columns (map #(metabot.tools.util/add-table-reference orders-query %) columns)id-column (first (filter #(and (= "ID" (:name %))(not (:fk-field-id %))) processed-columns))](is (some? id-column) "Expected to find direct ORDERS ID column")@@ -165,19 +165,19 @@(testing "handles columns without fk-field-id or table-id gracefully"(let [mock-column {:name "test-column" :type :string}- result (metabot-v3.tools.util/add-table-reference orders-query mock-column)]+ result (metabot.tools.util/add-table-reference orders-query mock-column)](is (= mock-column result))(is (not (contains? result :table-reference)))))(testing "handles columns with fk-field-id but no table-id"(let [mock-column {:name "test-fk" :fk-field-id 123}- result (metabot-v3.tools.util/add-table-reference orders-query mock-column)]+ result (metabot.tools.util/add-table-reference orders-query mock-column)](is (= mock-column result))(is (not (contains? result :table-reference)))))(testing "handles columns with table-id but no fk-field-id"(let [mock-column {:name "test-field" :table-id (mt/id :orders)}- result (metabot-v3.tools.util/add-table-reference orders-query mock-column)]+ result (metabot.tools.util/add-table-reference orders-query mock-column)](is (= mock-column result))(is (not (contains? result :table-reference))))))))))@@ -210,7 +210,7 @@(testing "metabot with use_verified_content=true sees only verified content"(let [result (mt/with-test-user :crowberto- (metabot-v3.tools.util/get-metrics-and-models (:id verified-metabot)))+ (metabot.tools.util/get-metrics-and-models (:id verified-metabot)))card-ids (set (map :id result))](is (contains? card-ids (:id verified-model)))(is (contains? card-ids (:id verified-metric)))@@ -219,7 +219,7 @@(testing "metabot with use_verified_content=false sees all content"(let [result (mt/with-test-user :crowberto- (metabot-v3.tools.util/get-metrics-and-models (:id unverified-metabot)))+ (metabot.tools.util/get-metrics-and-models (:id unverified-metabot)))card-ids (set (map :id result))](is (contains? card-ids (:id verified-model)))(is (contains? card-ids (:id verified-metric)))@@ -238,37 +238,37 @@:model/Table {active-table-id :id} {:db_id db-id, :name "active_table", :active true, :visibility_type nil}:model/Table {inactive-table-id :id} {:db_id db-id, :name "inactive_table", :active false, :visibility_type nil}](mt/with-current-user (mt/user->id :crowberto)- (is (= active-table-id (:id (metabot-v3.tools.util/get-table active-table-id))))+ (is (= active-table-id (:id (metabot.tools.util/get-table active-table-id))))(is (thrown? clojure.lang.ExceptionInfo- (metabot-v3.tools.util/get-table inactive-table-id)))))))+ (metabot.tools.util/get-table inactive-table-id)))))))(deftest parse-field-id-test(testing "parse-field-id parses valid field IDs correctly"(testing "table field IDs with numeric table ID"(is (= {:model-tag "t", :model-id 154, :field-index 1}- (metabot-v3.tools.util/parse-field-id "t154-1")))+ (metabot.tools.util/parse-field-id "t154-1")))(is (= {:model-tag "t", :model-id 1, :field-index 0}- (metabot-v3.tools.util/parse-field-id "t1-0")))+ (metabot.tools.util/parse-field-id "t1-0")))(is (= {:model-tag "t", :model-id 999, :field-index 42}- (metabot-v3.tools.util/parse-field-id "t999-42"))))+ (metabot.tools.util/parse-field-id "t999-42"))))(testing "card/model/metric field IDs with numeric card ID"(is (= {:model-tag "c", :model-id 125, :field-index 7}- (metabot-v3.tools.util/parse-field-id "c125-7")))+ (metabot.tools.util/parse-field-id "c125-7")))(is (= {:model-tag "c", :model-id 2, :field-index 0}- (metabot-v3.tools.util/parse-field-id "c2-0"))))+ (metabot.tools.util/parse-field-id "c2-0"))))(testing "query field IDs with nano-id string"(is (= {:model-tag "q", :model-id "puL95JSvym3k23W1UUuog", :field-index 0}- (metabot-v3.tools.util/parse-field-id "qpuL95JSvym3k23W1UUuog-0")))+ (metabot.tools.util/parse-field-id "qpuL95JSvym3k23W1UUuog-0")))(is (= {:model-tag "q", :model-id "abc123XYZ", :field-index 5}- (metabot-v3.tools.util/parse-field-id "qabc123XYZ-5"))))+ (metabot.tools.util/parse-field-id "qabc123XYZ-5"))))(testing "query field IDs with nano-id containing dashes"(is (= {:model-tag "q", :model-id "wG9GfYTcE-wKTg3wlZyuc", :field-index 6}- (metabot-v3.tools.util/parse-field-id "qwG9GfYTcE-wKTg3wlZyuc-6")))+ (metabot.tools.util/parse-field-id "qwG9GfYTcE-wKTg3wlZyuc-6")))(is (= {:model-tag "q", :model-id "a-b-c", :field-index 0}- (metabot-v3.tools.util/parse-field-id "qa-b-c-0"))))))+ (metabot.tools.util/parse-field-id "qa-b-c-0"))))))(deftest resolve-column-test(testing "resolve-column resolves field IDs to columns"@@ -279,26 +279,26 @@{:name "TOTAL" :table-id 2 :type :number}]] ; index 1 for table 2(testing "resolves table field IDs correctly"(let [item {:field-id "t1-0" :operation "equals"}- result (metabot-v3.tools.util/resolve-column item "t1-" columns)]+ result (metabot.tools.util/resolve-column item "t1-" columns)](is (= "ID" (get-in result [:column :name])))(is (= 1 (get-in result [:column :table-id])))(is (= :number (get-in result [:column :type])))))(testing "resolves field IDs using flat index into columns vector"(let [item {:field-id "t1-3" :operation "equals"}- result (metabot-v3.tools.util/resolve-column item "t1-" columns)]+ result (metabot.tools.util/resolve-column item "t1-" columns)](is (= "USER_ID" (get-in result [:column :name])))(is (= 2 (get-in result [:column :table-id])))))(testing "resolves card field IDs using flat index"(let [item {:field-id "c125-1" :operation "equals"}- result (metabot-v3.tools.util/resolve-column item "c125-" columns)]+ result (metabot.tools.util/resolve-column item "c125-" columns)](is (= "NAME" (get-in result [:column :name])))(is (= 1 (get-in result [:column :table-id])))))(testing "resolves query field IDs using flat index"(let [item {:field-id "qabc123-2" :operation "equals"}- result (metabot-v3.tools.util/resolve-column item "qabc123-" columns)]+ result (metabot.tools.util/resolve-column item "qabc123-" columns)](is (= "EMAIL" (get-in result [:column :name])))))))(testing "resolve-column throws for invalid field IDs"@@ -308,45 +308,45 @@(is (thrown-with-msg?clojure.lang.ExceptionInfo#"Invalid field_id format"- (metabot-v3.tools.util/resolve-column {:field-id "invalid"} "t1-" columns)))+ (metabot.tools.util/resolve-column {:field-id "invalid"} "t1-" columns)))(is (thrown-with-msg?clojure.lang.ExceptionInfo#"Invalid field_id format"- (metabot-v3.tools.util/resolve-column {:field-id "t154/1"} "t154-" columns))))+ (metabot.tools.util/resolve-column {:field-id "t154/1"} "t154-" columns))))(testing "throws when field index is out of bounds"(is (thrown-with-msg?clojure.lang.ExceptionInfo#"field t1-10 not found"- (metabot-v3.tools.util/resolve-column {:field-id "t1-10"} "t1-" columns))))+ (metabot.tools.util/resolve-column {:field-id "t1-10"} "t1-" columns))))(testing "throws when field ID prefix doesn't match expected prefix"(is (thrown-with-msg?clojure.lang.ExceptionInfo#"does not match expected prefix"- (metabot-v3.tools.util/resolve-column {:field-id "t999-0"} "t1-" columns)))))))+ (metabot.tools.util/resolve-column {:field-id "t999-0"} "t1-" columns)))))));;; Nil handling tests - important for robustness against LLM edge cases(deftest parse-field-id-nil-handling-test(testing "returns nil for nil input (no NPE)"- (is (nil? (metabot-v3.tools.util/parse-field-id nil))))+ (is (nil? (metabot.tools.util/parse-field-id nil))))(testing "returns nil for empty string"- (is (nil? (metabot-v3.tools.util/parse-field-id ""))))+ (is (nil? (metabot.tools.util/parse-field-id ""))))(testing "returns nil for non-string input"- (is (nil? (metabot-v3.tools.util/parse-field-id 123)))- (is (nil? (metabot-v3.tools.util/parse-field-id {:field-id "t1-0"})))- (is (nil? (metabot-v3.tools.util/parse-field-id [:t 1 0]))))+ (is (nil? (metabot.tools.util/parse-field-id 123)))+ (is (nil? (metabot.tools.util/parse-field-id {:field-id "t1-0"})))+ (is (nil? (metabot.tools.util/parse-field-id [:t 1 0]))))(testing "returns nil for invalid format strings"- (is (nil? (metabot-v3.tools.util/parse-field-id "invalid")))- (is (nil? (metabot-v3.tools.util/parse-field-id "x1-0"))) ; invalid model tag- (is (nil? (metabot-v3.tools.util/parse-field-id "t-1"))) ; missing model-id- (is (nil? (metabot-v3.tools.util/parse-field-id "t1-"))) ; missing field-index- (is (nil? (metabot-v3.tools.util/parse-field-id "t1"))) ; no separator- (is (nil? (metabot-v3.tools.util/parse-field-id "-1-0"))) ; missing model tag+ (is (nil? (metabot.tools.util/parse-field-id "invalid")))+ (is (nil? (metabot.tools.util/parse-field-id "x1-0"))) ; invalid model tag+ (is (nil? (metabot.tools.util/parse-field-id "t-1"))) ; missing model-id+ (is (nil? (metabot.tools.util/parse-field-id "t1-"))) ; missing field-index+ (is (nil? (metabot.tools.util/parse-field-id "t1"))) ; no separator+ (is (nil? (metabot.tools.util/parse-field-id "-1-0"))) ; missing model tag))(deftest resolve-column-nil-handling-test@@ -355,26 +355,26 @@(is (thrown-with-msg?clojure.lang.ExceptionInfo#"Invalid field_id format"- (metabot-v3.tools.util/resolve-column {:field-id nil} "t1-" columns)))))+ (metabot.tools.util/resolve-column {:field-id nil} "t1-" columns)))))(testing "throws informative error for empty field-id"(let [columns [{:name "ID" :table-id 1 :type :number}]](is (thrown-with-msg?clojure.lang.ExceptionInfo#"Invalid field_id format"- (metabot-v3.tools.util/resolve-column {:field-id ""} "t1-" columns)))))+ (metabot.tools.util/resolve-column {:field-id ""} "t1-" columns)))))(testing "throws informative error for numeric field-id"(let [columns [{:name "ID" :table-id 1 :type :number}]](is (thrown-with-msg?clojure.lang.ExceptionInfo#"Invalid field_id format"- (metabot-v3.tools.util/resolve-column {:field-id 123} "t1-" columns)))))+ (metabot.tools.util/resolve-column {:field-id 123} "t1-" columns)))))(testing "error data contains agent-error? flag for user-friendly handling"(let [columns [{:name "ID" :table-id 1 :type :number}]](try- (metabot-v3.tools.util/resolve-column {:field-id nil} "t1-" columns)+ (metabot.tools.util/resolve-column {:field-id nil} "t1-" columns)(is false "Expected exception to be thrown")(catch clojure.lang.ExceptionInfo e(is (:agent-error? (ex-data e)))@@ -385,26 +385,26 @@(is (thrown-with-msg?clojure.lang.ExceptionInfo#"not found"- (metabot-v3.tools.util/resolve-column {:field-id "t1-0"} "t1-" []))))+ (metabot.tools.util/resolve-column {:field-id "t1-0"} "t1-" []))))(testing "handles columns vector with nil entries at accessed index";; Index 0 is nil, so get returns nil and throws an error(is (thrown-with-msg?clojure.lang.ExceptionInfo#"not found"- (metabot-v3.tools.util/resolve-column {:field-id "t1-0"} "t1-" [nil {:name "NAME"}]))))+ (metabot.tools.util/resolve-column {:field-id "t1-0"} "t1-" [nil {:name "NAME"}]))))(testing "handles columns vector with nil entries at other indices";; Access index 1 which has valid data, index 0 is nil but not accessed(let [columns [nil {:name "NAME" :table-id 1 :type :string}]- result (metabot-v3.tools.util/resolve-column {:field-id "t1-1"} "t1-" columns)]+ result (metabot.tools.util/resolve-column {:field-id "t1-1"} "t1-" columns)](is (some? (:column result)))(is (= "NAME" (get-in result [:column :name])))))(testing "preserves other item keys when resolving"(let [columns [{:name "ID" :table-id 1 :type :number}]item {:field-id "t1-0" :operation "equals" :value 42 :custom-key "preserved"}- result (metabot-v3.tools.util/resolve-column item "t1-" columns)]+ result (metabot.tools.util/resolve-column item "t1-" columns)](is (= "equals" (:operation result)))(is (= 42 (:value result)))(is (= "preserved" (:custom-key result)))diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/util_test.clj b/test/metabase/metabot/util_test.cljsimilarity index 94%rename from enterprise/backend/test/metabase_enterprise/metabot_v3/util_test.cljrename to test/metabase/metabot/util_test.cljindex e262991770d..726d9f54379 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/util_test.clj+++ b/test/metabase/metabot/util_test.clj@@ -1,8 +1,8 @@-(ns metabase-enterprise.metabot-v3.util-test+(ns metabase.metabot.util-test(:require[clojure.java.io :as io][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.util :as metabot.u]))+ [metabase.metabot.util :as metabot.u]))(deftest ^:parallel aisdk-line-parse-test(testing "We should be able to parse AI SDK streaming format to ai-service format 1"@@ -26,7 +26,7 @@:_type :FINISH_MESSAGE:usage {}}](metabot.u/aisdk->messages "assistant"- (-> (io/resource "metabase_enterprise/metabot_v3/aisdkstream1.txt")+ (-> (io/resource "metabase/metabot/aisdkstream1.txt")io/readerline-seq)))))(testing "We should be able to parse AI SDK streaming format to ai-service format 2"@@ -63,7 +63,7 @@:_type :FINISH_MESSAGE:usage {}}](metabot.u/aisdk->messages "assistant"- (-> (io/resource "metabase_enterprise/metabot_v3/aisdkstream2.txt")+ (-> (io/resource "metabase/metabot/aisdkstream2.txt")io/readerline-seq)))))(testing "We should be able to parse AI SDK streaming format with error messages 3"@@ -74,7 +74,7 @@:_type :FINISH_MESSAGE:usage {}}](metabot.u/aisdk->messages "assistant"- (-> (io/resource "metabase_enterprise/metabot_v3/aisdkstream3.txt")+ (-> (io/resource "metabase/metabot/aisdkstream3.txt")io/readerline-seq)))))(testing "We should be able to parse AI SDK streaming format with error messages 4"@@ -97,6 +97,6 @@:_type :FINISH_MESSAGE:usage {}}](metabot.u/aisdk->messages "assistant"- (-> (io/resource "metabase_enterprise/metabot_v3/aisdkstream4.txt")+ (-> (io/resource "metabase/metabot/aisdkstream4.txt")io/readerline-seq))))))diff --git a/test/metabase/parameters/dashboard_test.clj b/test/metabase/parameters/dashboard_test.cljindex 8a6efc4f231..0195c80e4a9 100644--- a/test/metabase/parameters/dashboard_test.clj+++ b/test/metabase/parameters/dashboard_test.clj@@ -112,19 +112,22 @@(mt/with-column-remappings [orders.product_id products.titlereviews.product_id products.title](testing "Test parameter remapping for multi-field scenario"- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))]+ (mt/with-full-data-perms-for-all-users!+ (data-perms/disable-perms-cache+ (binding [api/*current-user-id* (mt/user->id :rasta)+ qp.perms/*param-values-query* true]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))]- (testing "Should get remapped values for parameter with multiple FK fields pointing to same PK"- (let [remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (some? remapped-values)- "Should get remapped values for multi-field FK scenario")+ (testing "Should get remapped values for parameter with multiple FK fields pointing to same PK"+ (let [remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (some? remapped-values)+ "Should get remapped values for multi-field FK scenario")- (when remapped-values- (is- (= [1 "Rustic Paper Wallet"]- remapped-values))))))))))))))+ (when remapped-values+ (is+ (= [1 "Rustic Paper Wallet"]+ remapped-values))))))))))))))))(deftest ^:sequential dashboard-remapping-restricted-permissions-test;; Test for issue #47951: Dashboard filters should show remapped values even when@@ -234,77 +237,80 @@;; by design.(testing "Remapping conflict resolution scenarios"(mt/dataset test-data- (let [orders-product-id-field-id (mt/id :orders :product_id)- reviews-product-id-field-id (mt/id :reviews :product_id)]- (mt/with-temp [:model/Card {orders-card-id :id} {:dataset_query (mt/mbql-query orders)}- :model/Card {reviews-card-id :id} {:dataset_query (mt/mbql-query reviews)}- :model/Dashboard {dashboard-id :id} {:parameters [{:id "p1"- :name "Product ID"- :slug "p1"- :type "id"- :sectionId "id"- :default 1}]}- :model/DashboardCard {} {:dashboard_id dashboard-id- :card_id orders-card-id- :parameter_mappings [{:card_id orders-card-id- :parameter_id "p1"- :target ["dimension" ["field" orders-product-id-field-id nil]]}]}- :model/DashboardCard {} {:dashboard_id dashboard-id- :card_id reviews-card-id- :parameter_mappings [{:card_id reviews-card-id- :parameter_id "p1"- :target ["dimension" ["field" reviews-product-id-field-id nil]]}]}]+ (mt/with-full-data-perms-for-all-users!+ (data-perms/disable-perms-cache+ (binding [qp.perms/*param-values-query* true]+ (let [orders-product-id-field-id (mt/id :orders :product_id)+ reviews-product-id-field-id (mt/id :reviews :product_id)]+ (mt/with-temp [:model/Card {orders-card-id :id} {:dataset_query (mt/mbql-query orders)}+ :model/Card {reviews-card-id :id} {:dataset_query (mt/mbql-query reviews)}+ :model/Dashboard {dashboard-id :id} {:parameters [{:id "p1"+ :name "Product ID"+ :slug "p1"+ :type "id"+ :sectionId "id"+ :default 1}]}+ :model/DashboardCard {} {:dashboard_id dashboard-id+ :card_id orders-card-id+ :parameter_mappings [{:card_id orders-card-id+ :parameter_id "p1"+ :target ["dimension" ["field" orders-product-id-field-id nil]]}]}+ :model/DashboardCard {} {:dashboard_id dashboard-id+ :card_id reviews-card-id+ :parameter_mappings [{:card_id reviews-card-id+ :parameter_id "p1"+ :target ["dimension" ["field" reviews-product-id-field-id nil]]}]}]- (testing "Scenario 1: FK1→A, FK2→B should return raw value (no common remapping)"- (mt/with-column-remappings [orders.product_id products.title- reviews.product_id products.category ; Different remapping- products.id products.title] ; PK remapping (ignored)- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))- remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (= [1] remapped-values)- "Should return raw value when FK remappings conflict")))))+ (testing "Scenario 1: FK1→A, FK2→B should return raw value (no common remapping)"+ (mt/with-column-remappings [orders.product_id products.title+ reviews.product_id products.category ; Different remapping+ products.id products.title] ; PK remapping (ignored)+ (binding [api/*current-user-id* (mt/user->id :rasta)]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))+ remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (= [1] remapped-values)+ "Should return raw value when FK remappings conflict")))))- (testing "Scenario 2: FK1→A, FK2→A, PK→C should return A (common FK remapping wins)"- (mt/with-column-remappings [orders.product_id products.title- reviews.product_id products.title ; Same remapping as FK1- products.id products.category] ; Different PK remapping- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))- remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (= [1 "Rustic Paper Wallet"] remapped-values)- "Should return common FK remapping when FKs agree")))))+ (testing "Scenario 2: FK1→A, FK2→A, PK→C should return A (common FK remapping wins)"+ (mt/with-column-remappings [orders.product_id products.title+ reviews.product_id products.title ; Same remapping as FK1+ products.id products.category] ; Different PK remapping+ (binding [api/*current-user-id* (mt/user->id :rasta)]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))+ remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (= [1 "Rustic Paper Wallet"] remapped-values)+ "Should return common FK remapping when FKs agree")))))- (testing "Scenario 3: FK1→∅, FK2→A should return raw value (no consensus among FKs)"- ;; Set up FK2 with remapping, but leave FK1 without remapping, PK with different remapping- (mt/with-column-remappings [reviews.product_id products.title- products.id products.category]- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))- remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (= [1] remapped-values)- "Should return raw value when only some FKs have remapping")))))+ (testing "Scenario 3: FK1→∅, FK2→A should return raw value (no consensus among FKs)"+ ;; Set up FK2 with remapping, but leave FK1 without remapping, PK with different remapping+ (mt/with-column-remappings [reviews.product_id products.title+ products.id products.category]+ (binding [api/*current-user-id* (mt/user->id :rasta)]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))+ remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (= [1] remapped-values)+ "Should return raw value when only some FKs have remapping")))))- (testing "Scenario 4: No remappings at all should return raw value"- ;; No remappings set up- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))- remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (= [1] remapped-values)- "Should return only raw value when no remappings are configured"))))+ (testing "Scenario 4: No remappings at all should return raw value"+ ;; No remappings set up+ (binding [api/*current-user-id* (mt/user->id :rasta)]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))+ remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (= [1] remapped-values)+ "Should return only raw value when no remappings are configured"))))- (testing "Scenario 5: Only PK remapping should return raw value (PK ignored)"- (mt/with-column-remappings [products.id products.title]- (binding [api/*current-user-id* (mt/user->id :rasta)]- (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)- parameter (first (:parameters dashboard))- remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]- (is (= [1] remapped-values)- "Should return raw value when only PK is remapped (PK ignored)"))))))))))+ (testing "Scenario 5: Only PK remapping should return raw value (PK ignored)"+ (mt/with-column-remappings [products.id products.title]+ (binding [api/*current-user-id* (mt/user->id :rasta)]+ (let [dashboard (t2/select-one :model/Dashboard :id dashboard-id)+ parameter (first (:parameters dashboard))+ remapped-values (parameters.dashboard/dashboard-param-remapped-value dashboard (:id parameter) 1)]+ (is (= [1] remapped-values)+ "Should return raw value when only PK is remapped (PK ignored)")))))))))))))(deftest find-common-remapping-target-test(testing "Finding common remapping targets"diff --git a/test/metabase/premium_features/defenterprise_test.clj b/test/metabase/premium_features/defenterprise_test.cljindex dd3c75bf5a2..d56f908c810 100644--- a/test/metabase/premium_features/defenterprise_test.clj+++ b/test/metabase/premium_features/defenterprise_test.clj@@ -53,6 +53,13 @@(is (= "Hi rasta, you're an EE customer but not extra special."(special-greeting-or-custom :rasta))))))))+(defenterprise ^{:tool-name "greeting_with_meta" :custom-key :custom-value}+ greeting-with-user-metadata+ "Returns a greeting; used to test that user-provided symbol metadata is preserved."+ metabase-enterprise.util-test+ [username]+ (format "Hi %s, metadata preserved!" (name username)))+(defenterprise-schema greeting-with-schema :- :string"Returns a greeting for a user."metabase-enterprise.util-test@@ -77,6 +84,12 @@[username](format "Hi %s, you're an OSS customer!" username))+(deftest defenterprise-preserves-user-metadata-test+ (testing "User-provided metadata on the defenterprise symbol is preserved on the resulting var"+ (is (= "greeting_with_meta" (:tool-name (meta #'greeting-with-user-metadata))))+ (is (= :custom-value (:custom-key (meta #'greeting-with-user-metadata))))+ (is (= '([& args]) (:arglists (meta #'greeting-with-user-metadata))))))+(deftest defenterprise-schema-test(when-not config/ee-available?(testing "Argument schemas are validated for OSS implementations"diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/api_test.clj b/test/metabase/slackbot/api_test.cljsimilarity index 86%rename from enterprise/backend/test/metabase_enterprise/slackbot/api_test.cljrename to test/metabase/slackbot/api_test.cljindex 94500f339fb..bcbed65ad2d 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/api_test.clj+++ b/test/metabase/slackbot/api_test.clj@@ -1,18 +1,18 @@-(ns metabase-enterprise.slackbot.api-test+(ns metabase.slackbot.api-test(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.metabot-v3.agent.core :as agent]- [metabase-enterprise.metabot-v3.feedback :as metabot-v3.feedback]- [metabase-enterprise.slackbot.api :as slackbot]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.persistence :as slackbot.persistence]- [metabase-enterprise.slackbot.query :as slackbot.query]- [metabase-enterprise.slackbot.streaming :as slackbot.streaming]- [metabase-enterprise.slackbot.test-util :as tu]- [metabase-enterprise.sso.settings :as sso-settings][metabase.analytics.prometheus-test :as prometheus-test]- [metabase.server.middleware.auth :as mw.auth]+ [metabase.metabot.agent.core :as agent]+ [metabase.metabot.feedback :as metabot.feedback]+ [metabase.slackbot.api :as slackbot]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.persistence :as slackbot.persistence]+ [metabase.slackbot.query :as slackbot.query]+ [metabase.slackbot.settings :as slackbot.settings]+ [metabase.slackbot.streaming :as slackbot.streaming]+ [metabase.slackbot.test-util :as tu]+ [metabase.sso.settings :as sso-settings][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.util :as u]@@ -25,36 +25,35 @@(deftest manifest-endpoint-test(testing "GET /api/slack/manifest with metabot-v3 feature"- (mt/with-premium-features #{:metabot-v3}- (mt/with-temporary-setting-values [site-url "https://localhost:3000"]- (testing "with site-url configured"- (testing "admins can access manifest"- (let [response (mt/user-http-request :crowberto :get 200 "slack/manifest")]- (is (map? response))- (is (contains? response :display_information))- (is (contains? response :features))- (is (contains? response :oauth_config))- (is (contains? response :settings))- (let [scopes (set (get-in response [:oauth_config :scopes :bot]))]- (is (contains? scopes "reactions:read"))- (is (contains? scopes "reactions:write")))))- (testing "non-admins cannot access manifest"- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :get 403 "slack/manifest"))))))- (mt/with-temporary-setting-values [site-url nil]- (testing "without site-url configured"- (testing "raises a 503 error"- (is (= "You must configure a site-url for Slack integration to work."- (mt/user-http-request :crowberto :get 503 "slack/manifest")))))))))+ (mt/with-temporary-setting-values [site-url "https://localhost:3000"]+ (testing "with site-url configured"+ (testing "admins can access manifest"+ (let [response (mt/user-http-request :crowberto :get 200 "slack/manifest")]+ (is (map? response))+ (is (contains? response :display_information))+ (is (contains? response :features))+ (is (contains? response :oauth_config))+ (is (contains? response :settings))+ (let [scopes (set (get-in response [:oauth_config :scopes :bot]))]+ (is (contains? scopes "reactions:read"))+ (is (contains? scopes "reactions:write")))))+ (testing "non-admins cannot access manifest"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 "slack/manifest"))))))+ (mt/with-temporary-setting-values [site-url nil]+ (testing "without site-url configured"+ (testing "raises a 503 error"+ (is (= "You must configure a site-url for Slack integration to work."+ (mt/user-http-request :crowberto :get 503 "slack/manifest"))))))))(deftest events-endpoint-test- (testing "POST /api/ee/metabot-v3/slack/events"+ (testing "POST /api/metabot/slack/events"(tu/with-slackbot-setup(testing "handles URL verification challenge"(let [body {:type "url_verification":token "Jhj5dZrVaK7ZwHHjRyZWbDl":challenge "3eZbrw1aBm2rZgRNFdxV2595E9CY3gmdALWMmHkvFXO7tYXAYM8P"}- response (mt/client :post 200 "ee/metabot-v3/slack/events"+ response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options body)body)](is (= "3eZbrw1aBm2rZgRNFdxV2595E9CY3gmdALWMmHkvFXO7tYXAYM8P" response))))@@ -63,7 +62,7 @@(let [body {:type "event_callback":event {:type "team_rename":event_ts "1234567890.000001"}}- response (mt/client :post 200 "ee/metabot-v3/slack/events"+ response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options body)body)](is (= "ok" response))))@@ -72,30 +71,29 @@(let [body (-> tu/base-dm-event(assoc-in [:event :channel] "D123")(assoc-in [:event :text] "Hello from DM"))- response (mt/client :post 200 "ee/metabot-v3/slack/events"+ response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options body)body)](is (= "ok" response))))(testing "rejects requests without valid signature"(is (= "Slack request signature is not valid."- (mt/client :post 401 "ee/metabot-v3/slack/events"+ (mt/client :post 401 "metabot/slack/events"{:request-options {:headers {"x-slack-signature" "v0=invalid""x-slack-request-timestamp" "1234567890"}}}{:type "url_verification":challenge "test"})))))))(deftest feature-flag-test- (testing "POST /api/ee/metabot-v3/slack/events"+ (testing "POST /api/metabot/slack/events"(testing "ack events even when metabot-v3 feature is disabled to prevent Slack retries"(tu/with-slackbot-setup- (with-redefs [mw.auth/metabot-slack-signing-secret-setting (constantly tu/test-signing-secret)]- (mt/with-premium-features #{:sso-slack}- (let [body (assoc-in tu/base-dm-event [:event :channel] "D123")- response (mt/client :post 200 "ee/metabot-v3/slack/events"- (tu/slack-request-options body)- body)]- (is (= "ok" response) "Should ACK the event with 200 OK"))))))))+ (with-redefs [slackbot.settings/unobfuscated-metabot-slack-signing-secret (constantly tu/test-signing-secret)]+ (let [body (assoc-in tu/base-dm-event [:event :channel] "D123")+ response (mt/client :post 200 "metabot/slack/events"+ (tu/slack-request-options body)+ body)]+ (is (= "ok" response) "Should ACK the event with 200 OK")))))))(deftest edited-message-ignored-test(testing "POST /events ignores edited messages"@@ -107,7 +105,7 @@(tu/with-slackbot-mocks{:ai-text "Should not be called"}(fn [{:keys [post-calls ephemeral-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -125,7 +123,7 @@(tu/with-slackbot-mocks{:ai-text "Should not be called"}(fn [{:keys [post-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -143,7 +141,7 @@(tu/with-slackbot-mocks{:ai-text "Should not be called"}(fn [{:keys [post-calls delete-calls ephemeral-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -161,7 +159,7 @@{:ai-text mock-ai-text}(fn [{:keys [stream-calls append-text-calls stop-stream-callsadd-reaction-calls remove-reaction-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -187,7 +185,7 @@(tu/with-slackbot-mocks{:ai-text mock-ai-text}(fn [{:keys [post-calls stream-calls stop-stream-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -214,7 +212,7 @@(fn [{:keys [post-calls stop-stream-calls]}](mt/with-dynamic-fn-redefs[slackbot.client/start-stream (constantly nil)]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -244,7 +242,7 @@(let [big-text (apply str (repeat (inc @#'slackbot.streaming/min-text-batch-size) "x"))](rf init {:type :text :text big-text}))(throw (ex-info "Agent loop error" {})))))]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -269,7 +267,7 @@(tu/with-slackbot-mocks{:ai-text "response"}(fn [{:keys [ai-request-calls stop-stream-calls update-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events"+ (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)(u/poll {:thunk #(or (>= (count @stop-stream-calls) 1)@@ -304,7 +302,7 @@(mt/with-model-cleanup [:model/MetabotMessage[:model/MetabotConversation :created_at]](let [event (assoc-in tu/base-dm-event [:event :ts] event-ts)]- (mt/client :post 200 "ee/metabot-v3/slack/events"+ (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event) event)(u/poll {:thunk #(>= (count @stop-stream-calls) 1):done? true?@@ -339,7 +337,7 @@:data-parts mock-data-parts}(fn [{:keys [stream-calls append-text-calls stop-stream-calls image-callsgenerate-card-output-calls fake-png-bytes]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -378,9 +376,9 @@(let [event-body (assoc-in tu/base-dm-event [:event :user] "U-UNKNOWN-USER")](tu/with-slackbot-mocks{:ai-text "Should not be called"- :user-id :metabase-enterprise.slackbot.test-util/no-user}+ :user-id ::tu/no-user}(fn [{:keys [post-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -409,9 +407,9 @@thread-ts (assoc-in [:event :thread_ts] thread-ts))](tu/with-slackbot-mocks{:ai-text "Should not be called"- :user-id :metabase-enterprise.slackbot.test-util/no-user}+ :user-id ::tu/no-user}(fn [{:keys [post-calls]}]- (is (= "ok" (mt/client :post 200 "ee/metabot-v3/slack/events"+ (is (= "ok" (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body) event-body)))(u/poll {:thunk #(= 1 (count @post-calls)):done? true?@@ -473,9 +471,9 @@:channel_type "channel"})](tu/with-slackbot-mocks{:ai-text "Should not be called"- :user-id :metabase-enterprise.slackbot.test-util/no-user}+ :user-id ::tu/no-user}(fn [{:keys [post-calls ephemeral-calls stream-calls ai-request-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -498,7 +496,7 @@(tu/with-slackbot-mocks{:ai-text "Should not be called"}(fn [{:keys [post-calls ephemeral-calls stream-calls ai-request-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -523,7 +521,7 @@(tu/with-slackbot-mocks{:ai-text "Should not be called"}(fn [{:keys [post-calls ephemeral-calls stream-calls ai-request-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -595,7 +593,7 @@(mt/with-dynamic-fn-redefs[slackbot.persistence/response-owner-user-id (constantly owner-id)slackbot.persistence/soft-delete-response! (constantly true)]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -621,7 +619,7 @@(tu/with-slackbot-mocks{:ai-text "not-called"}(fn [{:keys [update-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events"+ (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)(Thread/sleep 200)@@ -642,52 +640,43 @@(fn [{:keys [update-calls]}](mt/with-dynamic-fn-redefs[slackbot.persistence/response-owner-user-id (constantly (mt/user->id :crowberto))]- (mt/client :post 200 "ee/metabot-v3/slack/events"+ (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)(Thread/sleep 200)(is (= 0 (count @update-calls)) "delete from non-owner should produce no update"))))))))(deftest put-slack-settings-test- (mt/with-premium-features #{:metabot-v3 :sso-slack}- (let [creds {:slack-connect-client-id "id"- :slack-connect-client-secret "secret"- :metabot-slack-signing-secret "signing"}- clear {:slack-connect-client-id nil- :slack-connect-client-secret nil- :metabot-slack-signing-secret nil}]- (testing "set all credentials"- (mt/with-temporary-setting-values [sso-settings/slack-connect-enabled false]- (mt/with-temporary-raw-setting-values [slack-connect-client-id nil- slack-connect-client-secret nil- metabot-slack-signing-secret nil]- (is (= {:ok true} (mt/user-http-request :crowberto :put 200 "ee/metabot-v3/slack/settings" creds))))))-- (testing "clear all credentials"- (mt/with-temporary-setting-values [sso-settings/slack-connect-enabled true]- (mt/with-temporary-raw-setting-values [slack-connect-client-id "x"- slack-connect-client-secret "x"- metabot-slack-signing-secret "x"]- (is (= {:ok true} (mt/user-http-request :crowberto :put 200 "ee/metabot-v3/slack/settings" clear))))))-- (testing "partial credentials returns 400"- (doseq [partial [(assoc creds :slack-connect-client-id nil)- (assoc creds :slack-connect-client-secret nil)- (assoc creds :metabot-slack-signing-secret nil)]]- (is (= "Must provide client id, client secret and signing secret together."- (mt/user-http-request :crowberto :put 400 "ee/metabot-v3/slack/settings" partial)))))-- (testing "non-admin returns 403"- (is (= "You don't have permissions to do that."- (mt/user-http-request :rasta :put 403 "ee/metabot-v3/slack/settings" creds))))))-- (testing "setting values without metabot-v3 feature returns 402"- (mt/with-premium-features #{:sso-slack}- (is (= "Metabot feature is not enabled."- (mt/user-http-request :crowberto :put 402 "ee/metabot-v3/slack/settings"- {:slack-connect-client-id "id"- :slack-connect-client-secret "secret"- :metabot-slack-signing-secret "signing"}))))))+ (let [creds {:slack-connect-client-id "id"+ :slack-connect-client-secret "secret"+ :metabot-slack-signing-secret "signing"}+ clear {:slack-connect-client-id nil+ :slack-connect-client-secret nil+ :metabot-slack-signing-secret nil}]+ (testing "set all credentials"+ (mt/with-temporary-setting-values [sso-settings/slack-connect-enabled false]+ (mt/with-temporary-raw-setting-values [slack-connect-client-id nil+ slack-connect-client-secret nil+ metabot-slack-signing-secret nil]+ (is (= {:ok true} (mt/user-http-request :crowberto :put 200 "metabot/slack/settings" creds))))))++ (testing "clear all credentials"+ (mt/with-temporary-setting-values [sso-settings/slack-connect-enabled true]+ (mt/with-temporary-raw-setting-values [slack-connect-client-id "x"+ slack-connect-client-secret "x"+ metabot-slack-signing-secret "x"]+ (is (= {:ok true} (mt/user-http-request :crowberto :put 200 "metabot/slack/settings" clear))))))++ (testing "partial credentials returns 400"+ (doseq [partial [(assoc creds :slack-connect-client-id nil)+ (assoc creds :slack-connect-client-secret nil)+ (assoc creds :metabot-slack-signing-secret nil)]]+ (is (= "Must provide client id, client secret and signing secret together."+ (mt/user-http-request :crowberto :put 400 "metabot/slack/settings" partial)))))++ (testing "non-admin returns 403"+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :put 403 "metabot/slack/settings" creds))))))(deftest feedback-modal-view-test(testing "positive feedback modal has no issue type dropdown"@@ -708,9 +697,9 @@harbormaster-calls (atom [])open-view-calls (atom [])](with-redefs [slackbot/slack-id->user-id (constantly (mt/user->id :rasta))- metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)+ metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)slackbot.client/open-view (fn [_ params](swap! open-view-calls conj params){:ok true})]@@ -759,9 +748,9 @@(let [harbormaster-calls (atom [])open-view-calls (atom [])](with-redefs [slackbot/slack-id->user-id (constantly nil)- metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)+ metabot.feedback/submit-to-harbormaster! (fn [feedback]+ (swap! harbormaster-calls conj feedback)+ true)slackbot.client/open-view (fn [_ params](swap! open-view-calls conj params){:ok true})]@@ -781,9 +770,9 @@(deftest handle-feedback-modal-submission-test(testing "modal submission sends feedback to harbormaster"(let [harbormaster-calls (atom [])]- (with-redefs [metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]+ (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"@@ -804,9 +793,9 @@(testing "modal submission with only freeform text submits"(let [harbormaster-calls (atom [])]- (with-redefs [metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]+ (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"@@ -822,9 +811,9 @@(testing "modal submission with no details still submits basic feedback"(let [harbormaster-calls (atom [])]- (with-redefs [metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]+ (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"@@ -840,9 +829,9 @@(testing "modal submission with only issue type submits"(let [harbormaster-calls (atom [])]- (with-redefs [metabot-v3.feedback/submit-to-harbormaster! (fn [feedback]- (swap! harbormaster-calls conj feedback)- true)]+ (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"@@ -872,7 +861,7 @@(tu/with-slackbot-mocks{:ai-text mock-ai-text :data-parts mock-data-parts}(fn [{:keys [stop-stream-calls image-calls generate-adhoc-output-calls fake-png-bytes]}]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(and (>= (count @stop-stream-calls) 1) (>= (count @image-calls) 1)):done? true? :timeout-ms 5000})(testing "generate-adhoc-output called with correct query and display"@@ -898,7 +887,7 @@(tu/with-slackbot-mocks{:ai-text "Here's your table" :data-parts mock-data-parts}(fn [{:keys [generate-adhoc-output-calls stop-stream-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(and (>= (count @stop-stream-calls) 1) (>= (count @generate-adhoc-output-calls) 1)):done? true? :timeout-ms 5000})(testing "display defaults to :table"@@ -918,7 +907,7 @@(tu/with-slackbot-mocks{:ai-text "Here's everything" :data-parts mock-data-parts}(fn [{:keys [image-calls stop-stream-calls generate-card-output-calls generate-adhoc-output-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(>= (count @image-calls) 3) :done? true? :timeout-ms 5000})(testing "static_viz cards rendered"(is (= #{101 202} (set (map :card-id @generate-card-output-calls)))))@@ -945,7 +934,7 @@(mt/with-dynamic-fn-redefs[slackbot.query/generate-card-output (fn [_card-id](throw (ex-info "Unexpected render error" {})))]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(let [error-msg "Query execution failed, please try again."](u/poll {:thunk #(and (>= (count @stop-stream-calls) 1)(some (fn [m] (= error-msg (:text m))) @post-calls))@@ -970,7 +959,7 @@(if (= card-id 999999)(throw (ex-info "Unexpected render error" {})){:type :image :content fake-png :card-name (str "Card " card-id)}))]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(and (>= (count @stop-stream-calls) 1) (>= (count @image-calls) 1)):done? true? :timeout-ms 5000})(testing "error message posted for failing viz"@@ -989,7 +978,7 @@(tu/with-slackbot-mocks{:ai-text "Here's your chart" :data-parts mock-data-parts}(fn [{:keys [image-calls stop-stream-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(and (>= (count @stop-stream-calls) 1) (>= (count @image-calls) 1)):done? true? :timeout-ms 5000})(let [img (first @image-calls)@@ -1015,7 +1004,7 @@(tu/with-slackbot-mocks{:ai-text "Here's your table" :data-parts mock-data-parts}(fn [{:keys [stop-stream-calls generate-adhoc-output-calls]}]- (mt/client :post 200 "ee/metabot-v3/slack/events" (tu/slack-request-options event-body) event-body)+ (mt/client :post 200 "metabot/slack/events" (tu/slack-request-options event-body) event-body)(u/poll {:thunk #(and (>= (count @stop-stream-calls) 1) (>= (count @generate-adhoc-output-calls) 1)):done? true? :timeout-ms 5000})(let [viz-blocks (:blocks (first @stop-stream-calls))]@@ -1039,7 +1028,7 @@(tu/with-slackbot-mocks{:ai-text "Hello!"}(fn [{:keys [stop-stream-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options tu/base-dm-event) tu/base-dm-event)](is (= "ok" response))(u/poll {:thunk #(>= (count @stop-stream-calls) 1) :done? true? :timeout-ms 5000})@@ -1056,7 +1045,7 @@(tu/with-slackbot-mocks{:ai-text "Hello!"}(fn [{:keys [update-calls remove-reaction-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options tu/base-mention-event) tu/base-mention-event)](is (= "ok" response))(u/poll {:thunk #(and (>= (count @update-calls) 1) (>= (count @remove-reaction-calls) 1))@@ -1073,7 +1062,7 @@{:ai-text "Hello!"}(fn [_](with-redefs [slackbot.streaming/send-response (fn [& _] (throw (Exception. "boom")))]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options tu/base-dm-event) tu/base-dm-event)](is (= "ok" response))(u/poll {:thunk #(prometheus-test/approx= 1 (mt/metric-value system :metabase-slackbot/responses-generateddiff --git a/enterprise/backend/test/metabase_enterprise/slackbot/config_test.clj b/test/metabase/slackbot/config_test.cljsimilarity index 76%rename from enterprise/backend/test/metabase_enterprise/slackbot/config_test.cljrename to test/metabase/slackbot/config_test.cljindex dbed07fa134..0aa44b6f466 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/config_test.clj+++ b/test/metabase/slackbot/config_test.clj@@ -1,10 +1,9 @@-(ns metabase-enterprise.slackbot.config-test+(ns metabase.slackbot.config-test(:require[clojure.test :refer :all]- [metabase-enterprise.slackbot.test-util :as tu]- [metabase-enterprise.sso.settings :as sso-settings][metabase.channel.settings :as channel.settings]- [metabase.premium-features.core :as premium-features]+ [metabase.slackbot.test-util :as tu]+ [metabase.sso.settings :as sso-settings][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.util.encryption :as encryption]))@@ -16,15 +15,11 @@(deftest setup-complete-test(tu/with-slackbot-setup(let [request-body (assoc-in tu/base-dm-event [:event :text] "test")- post-events #(mt/client :post %1 "ee/metabot-v3/slack/events"+ post-events #(mt/client :post %1 "metabot/slack/events"(tu/slack-request-options request-body) request-body)](testing "succeeds when all settings are configured"(is (= "ok" (post-events 200))))- (testing "returns 503 when sso-slack feature disabled"- (with-redefs [premium-features/enable-sso-slack? (constantly false)]- (is (= "Slack integration is not fully configured." (post-events 503)))))-(testing "returns 503 when client-id missing"(mt/with-temporary-setting-values [sso-settings/slack-connect-client-id nil](is (= "Slack integration is not fully configured." (post-events 503)))))@@ -48,4 +43,4 @@(testing "returns 503 when signing-secret missing (can't sign request)"(mt/with-temporary-raw-setting-values [metabot-slack-signing-secret nil](is (= "Slack integration is not fully configured."- (mt/client :post 503 "ee/metabot-v3/slack/events" request-body))))))))+ (mt/client :post 503 "metabot/slack/events" request-body))))))))diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/persistence_test.clj b/test/metabase/slackbot/persistence_test.cljsimilarity index 98%rename from enterprise/backend/test/metabase_enterprise/slackbot/persistence_test.cljrename to test/metabase/slackbot/persistence_test.cljindex 4774870ff32..c975f996efd 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/persistence_test.clj+++ b/test/metabase/slackbot/persistence_test.clj@@ -1,7 +1,7 @@-(ns metabase-enterprise.slackbot.persistence-test+(ns metabase.slackbot.persistence-test(:require[clojure.test :refer :all]- [metabase-enterprise.slackbot.persistence :as slackbot.persistence]+ [metabase.slackbot.persistence :as slackbot.persistence][metabase.test :as mt][metabase.test.fixtures :as fixtures][toucan2.core :as t2]))diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/query_test.clj b/test/metabase/slackbot/query_test.cljsimilarity index 99%rename from enterprise/backend/test/metabase_enterprise/slackbot/query_test.cljrename to test/metabase/slackbot/query_test.cljindex 84facdf55b7..bce393233b1 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/query_test.clj+++ b/test/metabase/slackbot/query_test.clj@@ -1,11 +1,11 @@-(ns metabase-enterprise.slackbot.query-test+(ns metabase.slackbot.query-test"Integration tests for ad-hoc query execution and visualization."(:require[clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.slackbot.query :as slackbot.query][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata]+ [metabase.slackbot.query :as slackbot.query][metabase.test :as mt])(:import(java.awt.image BufferedImage)diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/streaming_test.clj b/test/metabase/slackbot/streaming_test.cljsimilarity index 96%rename from enterprise/backend/test/metabase_enterprise/slackbot/streaming_test.cljrename to test/metabase/slackbot/streaming_test.cljindex 0b60c2a15de..13ee19a2e57 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/streaming_test.clj+++ b/test/metabase/slackbot/streaming_test.clj@@ -1,10 +1,10 @@-(ns metabase-enterprise.slackbot.streaming-test+(ns metabase.slackbot.streaming-test(:require[clojure.test :refer :all]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.persistence :as slackbot.persistence]- [metabase-enterprise.slackbot.streaming :as slackbot.streaming]- [metabase-enterprise.slackbot.test-util :as tu]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.persistence :as slackbot.persistence]+ [metabase.slackbot.streaming :as slackbot.streaming]+ [metabase.slackbot.test-util :as tu][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.util :as u]@@ -135,7 +135,7 @@(tu/with-slackbot-mocks{:ai-text "Here is a response"}(fn [{:keys [stop-stream-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/test_util.clj b/test/metabase/slackbot/test_util.cljsimilarity index 91%rename from enterprise/backend/test/metabase_enterprise/slackbot/test_util.cljrename to test/metabase/slackbot/test_util.cljindex 49391997c7f..89f5ec2e0f6 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/test_util.clj+++ b/test/metabase/slackbot/test_util.clj@@ -1,14 +1,14 @@-(ns metabase-enterprise.slackbot.test-util+(ns metabase.slackbot.test-util"Shared test infrastructure for slackbot tests."(:require[buddy.core.codecs :as codecs][buddy.core.mac :as mac]- [metabase-enterprise.metabot-v3.agent.core :as agent]- [metabase-enterprise.slackbot.api :as slackbot]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.config :as slackbot.config]- [metabase-enterprise.slackbot.query :as slackbot.query][metabase.channel.slack :as channel.slack]+ [metabase.metabot.agent.core :as agent]+ [metabase.slackbot.api :as slackbot]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.config :as slackbot.config]+ [metabase.slackbot.query :as slackbot.query][metabase.test :as mt][metabase.util.encryption :as encryption][metabase.util.json :as json]))@@ -62,14 +62,13 @@`(with-redefs [slackbot.config/validate-bot-token! (constantly {:ok true})slackbot.client/get-bot-user-id (constantly "UBOT123")](with-ensure-encryption- (mt/with-premium-features #{:metabot-v3 :sso-slack}- (mt/with-temporary-raw-setting-values [site-url "https://localhost:3000"- slack-connect-client-id "test-client-id"- slack-connect-enabled "true"- metabot-slack-signing-secret test-signing-secret- slack-app-token "xoxb-test"- slack-connect-client-secret "test-secret"]- ~@body)))))+ (mt/with-temporary-raw-setting-values [site-url "https://localhost:3000"+ slack-connect-client-id "test-client-id"+ slack-connect-enabled "true"+ metabot-slack-signing-secret test-signing-secret+ slack-app-token "xoxb-test"+ slack-connect-client-secret "test-secret"]+ ~@body))))(defn compute-slack-signature"Compute a valid Slack signature for testing"diff --git a/enterprise/backend/test/metabase_enterprise/slackbot/uploads_test.clj b/test/metabase/slackbot/uploads_test.cljsimilarity index 95%rename from enterprise/backend/test/metabase_enterprise/slackbot/uploads_test.cljrename to test/metabase/slackbot/uploads_test.cljindex c48723fc1d9..e6b9ca8d8b2 100644--- a/enterprise/backend/test/metabase_enterprise/slackbot/uploads_test.clj+++ b/test/metabase/slackbot/uploads_test.clj@@ -1,12 +1,12 @@-(ns metabase-enterprise.slackbot.uploads-test+(ns metabase.slackbot.uploads-test(:require[clojure.java.io :as io][clojure.string :as str][clojure.test :refer :all]- [metabase-enterprise.slackbot.client :as slackbot.client]- [metabase-enterprise.slackbot.test-util :as tu]- [metabase-enterprise.slackbot.uploads :as slackbot.uploads][metabase.channel.settings :as channel.settings]+ [metabase.slackbot.client :as slackbot.client]+ [metabase.slackbot.test-util :as tu]+ [metabase.slackbot.uploads :as slackbot.uploads][metabase.test :as mt][metabase.test.fixtures :as fixtures][metabase.upload.db :as upload.db]@@ -64,7 +64,7 @@(tu/with-slackbot-mocks{:ai-text "CSV uploads are not enabled on this Metabase instance."}(fn [{:keys [stop-stream-calls append-text-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -92,7 +92,7 @@(tu/with-slackbot-mocks{:ai-text "Your CSV has been uploaded successfully as a model."}(fn [{:keys [stop-stream-calls append-text-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -127,7 +127,7 @@(tu/with-slackbot-mocks{:ai-text "Only CSV files can be uploaded."}(fn [{:keys [stop-stream-calls append-text-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -161,7 +161,7 @@(tu/with-slackbot-mocks{:ai-text "This should not be called"}(fn [{:keys [post-calls delete-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -207,7 +207,7 @@(tu/with-slackbot-mocks{:ai-text "Uploaded 2 files, skipped 1 non-CSV file."}(fn [{:keys [stop-stream-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -239,7 +239,7 @@(tu/with-slackbot-mocks{:ai-text "The file exceeds the 200MB size limit."}(fn [{:keys [stop-stream-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))@@ -265,7 +265,7 @@(tu/with-slackbot-mocks{:ai-text "You don't have permission to upload files."}(fn [{:keys [stop-stream-calls append-text-calls]}]- (let [response (mt/client :post 200 "ee/metabot-v3/slack/events"+ (let [response (mt/client :post 200 "metabot/slack/events"(tu/slack-request-options event-body)event-body)](is (= "ok" response))diff --git a/test/metabase/sso/providers/slack_connect_test.clj b/test/metabase/sso/providers/slack_connect_test.cljnew file mode 100644index 00000000000..eceb096f306--- /dev/null+++ b/test/metabase/sso/providers/slack_connect_test.clj@@ -0,0 +1,457 @@+(ns metabase.sso.providers.slack-connect-test+ (:require+ [clj-http.client :as http]+ [clojure.test :refer :all]+ [metabase.auth-identity.core :as auth-identity]+ [metabase.auth-identity.provider :as provider]+ [metabase.sso.oidc.discovery :as oidc.discovery]+ [metabase.sso.oidc.state :as oidc.state]+ [metabase.sso.oidc.tokens :as oidc.tokens]+ [metabase.sso.providers.slack-connect]+ [metabase.sso.settings :as sso-settings]+ [metabase.test :as mt]+ [metabase.test.fixtures :as fixtures]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(use-fixtures :once (fixtures/initialize :db :test-users))++(def ^:private slack-discovery-doc+ {:authorization_endpoint "https://slack.com/oauth/v2/authorize"+ :token_endpoint "https://slack.com/api/openid.connect.token"+ :jwks_uri "https://slack.com/openid/connect/keys"+ :userinfo_endpoint "https://slack.com/api/openid.connect.userInfo"})++;;; -------------------------------------------------- Provider Hierarchy Tests --------------------------------------------------++(deftest ^:parallel provider-hierarchy-test+ (testing "Slack Connect provider derives from OIDC provider"+ (is (isa? :provider/slack-connect :provider/oidc)))++ (testing "Slack Connect provider derives from create-user-if-not-exists"+ (is (isa? :provider/slack-connect ::provider/create-user-if-not-exists))))++;;; -------------------------------------------------- Configuration Tests --------------------------------------------------++(deftest build-slack-oidc-config-test+ (testing "Builds OIDC configuration from Slack settings"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"]+ (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}+ config (#'metabase.sso.providers.slack-connect/build-slack-oidc-config request)]+ (is (= "test-client-id" (:client-id config)))+ (is (= "test-secret" (:client-secret config)))+ (is (= "https://slack.com" (:issuer-uri config)))+ (is (= ["openid" "profile" "email"] (:scopes config)))+ (is (= "https://metabase.example.com/auth/sso/slack-connect/callback" (:redirect-uri config))))))++ (testing "Returns nil when client ID is missing"+ (mt/with-temporary-setting-values+ [slack-connect-client-id nil+ slack-connect-client-secret "test-secret"]+ (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}+ config (#'metabase.sso.providers.slack-connect/build-slack-oidc-config request)]+ (is (nil? config)))))++ (testing "Returns nil when client secret is missing"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret nil]+ (let [request {:redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}+ config (#'metabase.sso.providers.slack-connect/build-slack-oidc-config request)]+ (is (nil? config))))))++;;; -------------------------------------------------- Claim Extraction Tests --------------------------------------------------++(deftest extract-slack-claims-test+ (testing "Extracts Slack-specific claims from ID token"+ (mt/with-temporary-setting-values+ [slack-connect-attribute-team-id "https://slack.com/team_id"]+ (let [id-token-claims {:sub "U12345678"+ "https://slack.com/team_id" "T12345678"+ "https://slack.com/team_image_230" "https://example.com/team.png"+ :email_verified true+ :locale "en-US"}+ slack-attrs (#'metabase.sso.providers.slack-connect/extract-slack-claims id-token-claims)]+ (is (= "U12345678" (get slack-attrs "slack-user-id")))+ (is (= "T12345678" (get slack-attrs "slack-team-id")))+ (is (= "https://example.com/team.png" (get slack-attrs "slack-team-image")))+ (is (= "true" (get slack-attrs "slack-email-verified")))+ (is (= "en-US" (get slack-attrs "slack-locale"))))))++ (testing "Handles missing optional claims gracefully"+ (mt/with-temporary-setting-values+ [slack-connect-attribute-team-id "https://slack.com/team_id"]+ (let [id-token-claims {:sub "U12345678"}+ slack-attrs (#'metabase.sso.providers.slack-connect/extract-slack-claims id-token-claims)]+ (is (= "U12345678" (get slack-attrs "slack-user-id")))+ (is (nil? (get slack-attrs "slack-team-id")))+ (is (nil? (get slack-attrs "slack-team-image")))+ (is (nil? (get slack-attrs "slack-email-verified")))+ (is (nil? (get slack-attrs "slack-locale")))))))++;;; -------------------------------------------------- Authentication Tests --------------------------------------------------++(deftest authenticate-not-enabled-test+ (testing "Returns error when Slack Connect is not enabled"+ (mt/with-temporary-setting-values+ [slack-connect-enabled false]+ (let [request {}+ result (auth-identity/authenticate :provider/slack-connect request)]+ (is (false? (:success? result)))+ (is (= :slack-connect-not-enabled (:error result)))+ (is (some? (:message result)))))))++(deftest authenticate-not-configured-test+ (testing "Returns error when Slack Connect is not configured"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id nil+ slack-connect-client-secret nil]+ (let [request {}+ result (auth-identity/authenticate :provider/slack-connect request)]+ (is (false? (:success? result)))+ (is (= :slack-connect-not-enabled (:error result)))+ (is (some? (:message result)))))))++(deftest authenticate-link-only-requires-session-test+ (testing "Returns error in link-only mode when no authenticated session"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "link-only"]+ (let [request {:authenticated-user (delay nil)}+ result (auth-identity/authenticate :provider/slack-connect request)]+ (is (false? (:success? result)))+ (is (= :authentication-required (:error result)))+ (is (some? (:message result)))))))++(deftest authenticate-link-only-allows-callback-test+ (testing "Does not require session for callback in link-only mode"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "link-only"]+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub "U12345678"+ :iss "https://slack.com"+ :aud "test-client-id"+ :email "[email protected]"}})]+ (let [request {:code "test-code"+ :state "test-state"+ :oidc-nonce "test-nonce"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"+ :authenticated-user (delay nil)}+ result (auth-identity/authenticate :provider/slack-connect request)]+ ;; The presence of :code indicates callback, so should not error even without authenticated-user+ (is (true? (:success? result)))+ (is (= "[email protected]" (get-in result [:user-data :email]))))))))++(deftest authenticate-enhances-with-slack-data-test+ (testing "Enhances successful auth result with Slack-specific data"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-attribute-team-id "https://slack.com/team_id"]+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub "U12345678"+ :iss "https://slack.com"+ :aud "test-client-id"+ :email "[email protected]"+ "https://slack.com/team_id" "T12345678"+ :email_verified true}})]+ (let [request {:code "test-code"+ :state "test-state"+ :oidc-nonce "test-nonce"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"}+ result (auth-identity/authenticate :provider/slack-connect request)]+ (is (= :slack (get-in result [:user-data :sso_source])))+ (is (= "U12345678" (get-in result [:user-data :login_attributes "slack-user-id"])))+ (is (= "T12345678" (get-in result [:user-data :login_attributes "slack-team-id"])))+ (is (= "true" (get-in result [:user-data :login_attributes "slack-email-verified"])))+ (is (some? (:slack-data result))))))))++;;; -------------------------------------------------- Login Tests --------------------------------------------------++(deftest link-only-mode-no-session-creation-test+ (testing "No session is created when authentication mode is link-only"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "link-only"+ slack-connect-user-provisioning-enabled false]+ (mt/with-temp [:model/User user {:email "[email protected]"}]+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ oidc.state/validate-oidc-callback+ (fn [_request _state _provider & _opts]+ {:valid? true+ :nonce "test-nonce"+ :redirect "/"})+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub "U12345678"+ :iss "https://slack.com"+ :aud "test-client-id"+ :email "[email protected]"}})]+ (let [initial-session-count (t2/count :model/Session :user_id (:id user))+ request {:code "test-code"+ :state "test-state"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"+ :authenticated-user (delay user)+ :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}+ result (auth-identity/login! :provider/slack-connect request)]+ (is (true? (:success? result)) "Login should succeed")+ (is (nil? (:session result)) "Result should not contain a session")+ (is (nil? (:user result)) "Result should not contain a user (dissoc'd by :after method)")+ (is (= initial-session-count (t2/count :model/Session :user_id (:id user)))+ "No new session should be created in the database")))))))++;;; -------------------------------------------------- AuthIdentity Creation Tests --------------------------------------------------++(deftest sso-mode-creates-auth-identity-for-new-user-test+ (testing "SSO mode creates AuthIdentity when a new user logs in via Slack"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "sso"+ slack-connect-user-provisioning-enabled true]+ (let [test-email "[email protected]"+ slack-user-id "U_NEW_12345"]+ ;; Ensure user doesn't exist+ (t2/delete! :model/User :email test-email)+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ oidc.state/validate-oidc-callback+ (fn [_request _state _provider & _opts]+ {:valid? true+ :nonce "test-nonce"+ :redirect "/"})+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub slack-user-id+ :iss "https://slack.com"+ :aud "test-client-id"+ :email test-email+ :given_name "New"+ :family_name "User"}})]+ (try+ (let [request {:code "test-code"+ :state "test-state"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"+ :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}+ result (auth-identity/login! :provider/slack-connect request)]+ (is (true? (:success? result)) "Login should succeed")+ (is (some? (:user result)) "Result should contain a user")+ ;; Verify AuthIdentity was created+ (let [user (t2/select-one :model/User :email test-email)+ auth-identity (t2/select-one :model/AuthIdentity+ :user_id (:id user)+ :provider "slack-connect")]+ (is (some? user) "User should be created")+ (is (some? auth-identity) "AuthIdentity should be created")+ (is (= slack-user-id (:provider_id auth-identity))+ "AuthIdentity should have correct provider_id")))+ (finally+ (t2/delete! :model/User :email test-email))))))))++(deftest sso-mode-creates-auth-identity-for-existing-user-test+ (testing "SSO mode creates AuthIdentity when an existing user logs in via Slack"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "sso"]+ (let [slack-user-id "U_EXISTING_789"]+ (mt/with-temp [:model/User user {:email "[email protected]"+ :first_name "Existing"+ :last_name "User"}]+ ;; Ensure no AuthIdentity exists for this user+ (t2/delete! :model/AuthIdentity :user_id (:id user) :provider "slack-connect")+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ oidc.state/validate-oidc-callback+ (fn [_request _state _provider & _opts]+ {:valid? true+ :nonce "test-nonce"+ :redirect "/"})+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub slack-user-id+ :iss "https://slack.com"+ :aud "test-client-id"+ :email "[email protected]"}})]+ (let [request {:code "test-code"+ :state "test-state"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"+ :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}+ result (auth-identity/login! :provider/slack-connect request)]+ (is (true? (:success? result)) "Login should succeed")+ ;; Verify AuthIdentity was created+ (let [auth-identity (t2/select-one :model/AuthIdentity+ :user_id (:id user)+ :provider "slack-connect")]+ (is (some? auth-identity) "AuthIdentity should be created for existing user")+ (is (= slack-user-id (:provider_id auth-identity))+ "AuthIdentity should have correct provider_id")))))))))++(deftest link-only-mode-creates-auth-identity-test+ (testing "Link-only mode creates AuthIdentity for the authenticated user"+ (mt/with-temporary-setting-values+ [slack-connect-enabled true+ slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-authentication-mode "link-only"]+ (let [slack-user-id "U_LINK_456"]+ (mt/with-temp [:model/User user {:email "[email protected]"+ :first_name "Link"+ :last_name "User"}]+ ;; Ensure no AuthIdentity exists for this user+ (t2/delete! :model/AuthIdentity :user_id (:id user) :provider "slack-connect")+ (with-redefs [oidc.discovery/discover-oidc-configuration+ (fn [_issuer] slack-discovery-doc)+ oidc.state/validate-oidc-callback+ (fn [_request _state _provider & _opts]+ {:valid? true+ :nonce "test-nonce"+ :redirect "/"})+ http/post+ (fn [_url _opts]+ {:status 200+ :body {:id_token "valid-token"+ :access_token "access-token-123"}})+ oidc.tokens/validate-id-token+ (fn [_token _config _nonce]+ {:valid? true+ :claims {:sub slack-user-id+ :iss "https://slack.com"+ :aud "test-client-id"+ :email "[email protected]"}})]+ (let [initial-session-count (t2/count :model/Session :user_id (:id user))+ request {:code "test-code"+ :state "test-state"+ :redirect-uri "https://metabase.example.com/auth/sso/slack-connect/callback"+ :authenticated-user (delay user)+ :device-info {:device_id "test-device" :device_description "Test Device" :ip_address "127.0.0.1" :embedded false}}+ result (auth-identity/login! :provider/slack-connect request)]+ (is (true? (:success? result)) "Login should succeed")+ (is (nil? (:session result)) "No session should be created in link-only mode")+ ;; Verify AuthIdentity was created+ (let [auth-identity (t2/select-one :model/AuthIdentity+ :user_id (:id user)+ :provider "slack-connect")]+ (is (some? auth-identity) "AuthIdentity should be created in link-only mode")+ (is (= slack-user-id (:provider_id auth-identity))+ "AuthIdentity should have correct provider_id"))+ ;; Verify no new session was created+ (is (= initial-session-count (t2/count :model/Session :user_id (:id user)))+ "No new session should be created"))))))))++;;; -------------------------------------------------- Settings Validation Tests --------------------------------------------------++(deftest slack-connect-configured-test+ (testing "Returns true when client ID and secret are configured"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"]+ (is (true? (sso-settings/slack-connect-configured)))))++ (testing "Returns false when client ID is missing"+ (mt/with-temporary-setting-values+ [slack-connect-client-id nil+ slack-connect-client-secret "test-secret"]+ (is (false? (sso-settings/slack-connect-configured)))))++ (testing "Returns false when client secret is missing"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret nil]+ (is (false? (sso-settings/slack-connect-configured))))))++(deftest slack-connect-enabled-test+ (testing "Returns true when configured and enabled"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-enabled true]+ (is (true? (sso-settings/slack-connect-enabled)))))++ (testing "Returns false when configured but not enabled"+ (mt/with-temporary-setting-values+ [slack-connect-client-id "test-client-id"+ slack-connect-client-secret "test-secret"+ slack-connect-enabled false]+ (is (false? (sso-settings/slack-connect-enabled)))))++ (testing "Returns false when not configured even if enabled is true"+ (mt/with-temporary-setting-values+ [slack-connect-client-id nil+ slack-connect-client-secret nil+ slack-connect-enabled true]+ (is (false? (sso-settings/slack-connect-enabled))))))++(deftest slack-connect-authentication-mode-validation-test+ (testing "Accepts valid authentication modes"+ (mt/with-temporary-setting-values+ [slack-connect-authentication-mode nil]+ (sso-settings/slack-connect-authentication-mode! "sso")+ (is (= "sso" (sso-settings/slack-connect-authentication-mode)))+ (sso-settings/slack-connect-authentication-mode! "link-only")+ (is (= "link-only" (sso-settings/slack-connect-authentication-mode)))))++ (testing "Rejects invalid authentication modes"+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Invalid authentication mode"+ (sso-settings/slack-connect-authentication-mode! "invalid")))+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Invalid authentication mode"+ (sso-settings/slack-connect-authentication-mode! "SSO")))+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"Invalid authentication mode"+ (sso-settings/slack-connect-authentication-mode! "")))))diff --git a/test/metabase/warehouse_schema_rest/api/table_test.clj b/test/metabase/warehouse_schema_rest/api/table_test.cljindex 21503cef2e9..ca0e6efa9c9 100644--- a/test/metabase/warehouse_schema_rest/api/table_test.clj+++ b/test/metabase/warehouse_schema_rest/api/table_test.clj@@ -1316,9 +1316,6 @@{:visibility_type "hidden":data_layer "hidden"})))))))-;; NOTE: unused-only-filter-test moved to enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj-;; because it depends on EE event handlers to populate the dependency table-(deftest orphan-only-filter-test(testing "GET /api/table?orphan-only=true"(testing "filters tables that have no owner"