Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Use entity IDs for Metabot requests (#83895)

Andrei Simionescuc65a98fd0485
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.tsx
index 8058e2b3f26..6817ca8aefe 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
@@ -13,7 +13,7 @@ import { mockAuthProviderAndJwtSignIn } from "e2e/support/helpers/embedding-sdk-
const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
-const metabot_id = "c61bf5f5-1025-47b6-9298-bf1827105bb6";
+const metabot_id = "embeddedmetabotmetabo";
const query = {
"source-table": ORDERS_ID,
aggregation: [["max", ["field", ORDERS.QUANTITY, null]]],
@@ -403,7 +403,7 @@ describe("scenarios > embedding-sdk > metabot-question > enablement", () => {
const mockSuggestedPrompts = () => {
cy.intercept(
"GET",
- "/api/metabot/metabot/2/prompt-suggestions?limit=3&sample=true",
+ `/api/metabot/metabot/${metabot_id}/prompt-suggestions?limit=3&sample=true`,
{
statusCode: 200,
body: {
diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/metabot_scope.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/metabot_scope.clj
index e6b29a9d1d7..351c410074d 100644
--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/metabot_scope.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/metabot_scope.clj
@@ -7,8 +7,7 @@
(defn internal-metabot-scope
"`{:curated-only? <bool> :collection-id <nil|Long>}` matching the filters Metabot search applies."
[]
- (let [entity-id (get-in metabot.config/metabot-config [metabot.config/internal-metabot-id :entity-id])
- metabot (data-complexity-score.db/metabot-by-entity-id entity-id)]
+ (let [metabot (data-complexity-score.db/metabot-by-entity-id metabot.config/internal-metabot-id)]
;; `use_verified_content` means "verified or curated content only" (see the note in
;; `metabase.metabot.models.metabot`). No premium-feature gate, mirroring the search index's
;; precomputed `curated` column: a curation signal can only be set while its feature is present,
diff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj
index ec24f4bbd49..d7d9a17519c 100644
--- a/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/api_test.clj
@@ -42,8 +42,7 @@
[]
(mt/initialize-if-needed! :db)
(t2/select-one-pk :model/Metabot
- :entity_id (get-in metabot.config/metabot-config
- [metabot.config/internal-metabot-id :entity-id])))
+ :entity_id metabot.config/internal-metabot-id))
(deftest complexity-endpoint-requires-superuser-test
(testing "non-superusers are rejected"
diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
index e43e51a025b..e10766d3215 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
@@ -3,7 +3,6 @@
(:require
[clojure.test :refer :all]
[metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase.metabot.db :as metabot.db]
[metabase.metabot.tools.search :as search]
[metabase.permissions.core :as perms]
[metabase.search.core :as search-core]
@@ -114,15 +113,12 @@
(testing "search with metabot verified-or-curated content flag"
(let [metabot {:entity_id "test-bot"
:use_verified_content true}]
- (mt/with-dynamic-fn-redefs [metabot.db/metabot-by-entity-id (fn [entity-id]
- (is (= "test-bot" entity-id) "Should look up the Metabot")
- metabot)
- search-core/ranked-results (fn [context]
+ (mt/with-dynamic-fn-redefs [search-core/ranked-results (fn [context]
;; use_verified_content now drives the curated filter, not :verified
(is (true? (:curated? context)))
[dashboard])]
(let [results (search/search {:term-queries ["test"]
- :metabot-id "test-bot"
+ :metabot metabot
:entity-types ["dashboard"]})]
(is (= 1 (count results)))
(is (= 2 (:id (first results)))))))))))))
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
index 86d77c5eb39..c6571388b8b 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
@@ -9,7 +9,7 @@ export const MetabotChatSuggestions = () => {
// Keep in sync with [MetabotChat.tsx]
const suggestedPromptsQuery = useGetSuggestedMetabotPromptsQuery({
- metabot_id: metabot.metabotId,
+ metabot_id: metabot.metabotEntityId,
limit: 3,
sample: true,
});
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx
index d923db2ea49..140e301f5b1 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx
@@ -335,7 +335,6 @@ describe("ConversationDetailPage", () => {
it("resolves feedback left on a regenerated-away attempt", async () => {
const feedback: ConversationFeedback = {
id: 1,
- metabot_id: 1,
message_id: "10",
user_id: 1,
external_id: "a1",
diff --git a/frontend/src/metabase-types/api/metabot.ts b/frontend/src/metabase-types/api/metabot.ts
index a4ef69e90e5..a02725fdbbf 100644
--- a/frontend/src/metabase-types/api/metabot.ts
+++ b/frontend/src/metabase-types/api/metabot.ts
@@ -209,17 +209,14 @@ export type SuggestedMetabotPrompt = {
};
type BaseSuggestedMetabotPromptsRequest = {
- metabot_id: MetabotId;
+ metabot_id: MetabotId | MetabotInfo["entity_id"];
model?: string;
model_id?: number;
};
export type SuggestedMetabotPromptsRequest =
- BaseSuggestedMetabotPromptsRequest & {
- metabot_id: MetabotId;
- model?: string;
- model_id?: number;
- } & (
+ BaseSuggestedMetabotPromptsRequest &
+ (
| { sample?: void; limit?: number | null; offset?: number | null }
| { sample: true; limit?: number | null; offset?: void }
);
@@ -251,7 +248,6 @@ export const METABOT_ISSUE_TYPE_VALUES = [
export type MetabotIssueType = (typeof METABOT_ISSUE_TYPE_VALUES)[number];
export type MetabotFeedback = {
- metabot_id: MetabotId;
message_id: string;
freeform_feedback?: string;
} & ({ positive: true } | { positive: false; issue_type?: MetabotIssueType });
@@ -259,7 +255,6 @@ export type MetabotFeedback = {
export type MetabotSourceType = "table" | "card" | "model";
export type MetabotSourceFeedback = {
- metabot_id: MetabotId;
message_id: string;
source_id: number;
source_type: MetabotSourceType;
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
index ae76c5b20b4..e3febb58182 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
@@ -7,7 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
import { useDocsUrl } from "metabase/common/hooks";
import { useListMetabotsQuery } from "metabase/metabot";
-import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
import {
PLUGIN_EMBEDDING_IFRAME_SDK,
PLUGIN_EMBEDDING_SDK,
@@ -26,9 +26,9 @@ import { EmbeddedMetabotUpsell } from "./EmbeddedMetabotUpsell";
import { McpAppsSettings } from "./McpAppsSettings";
import { MetabotSettingsPanel } from "./MetabotSettingsPanel";
-type MetabotTabId =
- | typeof FIXED_METABOT_IDS.DEFAULT
- | typeof FIXED_METABOT_IDS.EMBEDDED;
+type MetabotTabEntityId =
+ | typeof FIXED_METABOT_ENTITY_IDS.DEFAULT
+ | typeof FIXED_METABOT_ENTITY_IDS.EMBEDDED;
const SETUP_SECTION_ID = "setup";
const MODELS_SECTION_ID = "models";
@@ -38,6 +38,7 @@ const AGENT_API_SECTION_ID = "agent-api";
const AI_FEATURES_ENABLED_SECTION_ID = "ai-features-enabled";
const METABOT_SETTINGS_PATH = "/admin/metabot";
const METABOT_ID_QUERY_PARAM = "metabot_id";
+const LEGACY_EMBEDDED_TAB_URL_VALUE = "2";
export function AISettingsPage() {
const [searchParams] = useSearchParams();
@@ -53,7 +54,7 @@ export function AISettingsPage() {
} = useAdminSetting("ai-features-enabled?");
const areAiFeaturesEnabled = aiFeaturesEnabledValue !== false;
- const selectedMetabotId = getSelectedMetabotId(
+ const selectedMetabotEntityId = getSelectedMetabotEntityId(
searchParams.get(METABOT_ID_QUERY_PARAM),
);
@@ -77,7 +78,7 @@ export function AISettingsPage() {
<MetabotSettingsSection
hasEmbedding={hasEmbedding}
id={METABOT_SECTION_ID}
- selectedMetabotId={selectedMetabotId}
+ selectedMetabotEntityId={selectedMetabotEntityId}
/>
</DisabledSection>
<Divider />
@@ -152,31 +153,32 @@ function AgentApiSettingsSection({ disabled }: { disabled: boolean }) {
function MetabotSettingsSection({
hasEmbedding,
id,
- selectedMetabotId,
+ selectedMetabotEntityId,
}: {
hasEmbedding: boolean;
id: string;
- selectedMetabotId: MetabotTabId;
+ selectedMetabotEntityId: MetabotTabEntityId;
}) {
const { data, isLoading, error } = useListMetabotsQuery();
const shouldShowUpsell =
- !hasEmbedding && selectedMetabotId === FIXED_METABOT_IDS.EMBEDDED;
+ !hasEmbedding &&
+ selectedMetabotEntityId === FIXED_METABOT_ENTITY_IDS.EMBEDDED;
const activeMetabot = !shouldShowUpsell
- ? data?.items.find((m) => m.id === selectedMetabotId)
+ ? data?.items.find((m) => m.entity_id === selectedMetabotEntityId)
: null;
return (
<SettingsSection id={id} title={t`Metabot settings`}>
- <Tabs value={String(selectedMetabotId)}>
+ <Tabs value={selectedMetabotEntityId}>
<Tabs.List>
<Tabs.Tab
renderRoot={(props) => (
<Link
{...props}
- to={getMetabotTabPath(FIXED_METABOT_IDS.DEFAULT)}
+ to={getMetabotTabPath(FIXED_METABOT_ENTITY_IDS.DEFAULT)}
/>
)}
- value={String(FIXED_METABOT_IDS.DEFAULT)}
+ value={FIXED_METABOT_ENTITY_IDS.DEFAULT}
>
{t`Internal`}
</Tabs.Tab>
@@ -184,10 +186,10 @@ function MetabotSettingsSection({
renderRoot={(props) => (
<Link
{...props}
- to={getMetabotTabPath(FIXED_METABOT_IDS.EMBEDDED)}
+ to={getMetabotTabPath(FIXED_METABOT_ENTITY_IDS.EMBEDDED)}
/>
)}
- value={String(FIXED_METABOT_IDS.EMBEDDED)}
+ value={FIXED_METABOT_ENTITY_IDS.EMBEDDED}
rightSection={!hasEmbedding && <UpsellGem.New size={14} />}
>
{t`Embedded`}
@@ -265,19 +267,24 @@ function DisabledSection({
);
}
-function getSelectedMetabotId(metabotId: string | null): MetabotTabId {
- if (metabotId === String(FIXED_METABOT_IDS.EMBEDDED)) {
- return FIXED_METABOT_IDS.EMBEDDED;
+function getSelectedMetabotEntityId(
+ metabotId: string | null,
+): MetabotTabEntityId {
+ if (
+ metabotId === FIXED_METABOT_ENTITY_IDS.EMBEDDED ||
+ metabotId === LEGACY_EMBEDDED_TAB_URL_VALUE
+ ) {
+ return FIXED_METABOT_ENTITY_IDS.EMBEDDED;
}
- return FIXED_METABOT_IDS.DEFAULT;
+ return FIXED_METABOT_ENTITY_IDS.DEFAULT;
}
-function getMetabotTabPath(metabotId: MetabotTabId) {
+function getMetabotTabPath(metabotEntityId: MetabotTabEntityId) {
return {
pathname: METABOT_SETTINGS_PATH,
search: queryToSearch({
- [METABOT_ID_QUERY_PARAM]: String(metabotId),
+ [METABOT_ID_QUERY_PARAM]: metabotEntityId,
}),
};
}
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
index 132557994db..88e60e87950 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
@@ -21,7 +21,7 @@ import {
import { mockSettings } from "__support__/settings";
import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
import { buildDefaultMetabots } from "metabase/metabot/tests/utils";
import { reinitialize } from "metabase/plugins";
import { Route } from "metabase/router";
@@ -116,7 +116,7 @@ const setup = async ({
setupRecentViewsAndSelectionsEndpoints(defaultSeedCollections as any);
setupMetabotsEndpoints(metabots);
- [FIXED_METABOT_IDS.DEFAULT, FIXED_METABOT_IDS.EMBEDDED].forEach((metabotId) =>
+ metabots.forEach(({ id: metabotId }) =>
setupMetabotPromptSuggestionsEndpoint({
metabotId,
prompts: [],
@@ -224,23 +224,30 @@ describe("AISettingsPage", () => {
expect(screen.getByRole("switch", { name: "Agent API" })).toBeDisabled();
});
- it("keeps the embedded deep link working by selecting the embedded tab", async () => {
- await setup({
- enableEmbedding: true,
- initialRoute: `/admin/metabot?metabot_id=${FIXED_METABOT_IDS.EMBEDDED}`,
- });
+ it.each([FIXED_METABOT_ENTITY_IDS.EMBEDDED, "2"])(
+ "selects the embedded Metabot for %s",
+ async (metabotId) => {
+ await setup({
+ enableEmbedding: true,
+ initialRoute: `/admin/metabot?metabot_id=${metabotId}`,
+ metabots: buildDefaultMetabots({
+ default: { id: 41 },
+ embedded: { id: 42 },
+ }),
+ });
- expect(
- screen.getByRole("tab", { name: "Embedded", selected: true }),
- ).toBeInTheDocument();
- expect(screen.getByText("Enable Embedded Metabot")).toBeInTheDocument();
- });
+ expect(
+ screen.getByRole("tab", { name: "Embedded", selected: true }),
+ ).toBeInTheDocument();
+ expect(screen.getByText("Enable Embedded Metabot")).toBeInTheDocument();
+ },
+ );
it("reflects the persisted use_verified_content state from the API", async () => {
await setup({
contentVerification: true,
metabots: buildDefaultMetabots({
- default: { use_verified_content: true },
+ default: { id: 41, use_verified_content: true },
}),
});
@@ -282,7 +289,7 @@ describe("AISettingsPage", () => {
expect(router?.location).toMatchObject({
pathname: "/admin/metabot",
- search: `?metabot_id=${FIXED_METABOT_IDS.EMBEDDED}`,
+ search: `?metabot_id=${FIXED_METABOT_ENTITY_IDS.EMBEDDED}`,
hash: "",
});
});
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
index fda98417c60..1f4d2bd1317 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
@@ -13,7 +13,7 @@ import {
useGetSuggestedMetabotPromptsQuery,
useRegenerateSuggestedMetabotPromptsMutation,
} from "metabase/metabot";
-import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
import { SettingHeader } from "metabase/settings-components";
import {
ActionIcon,
@@ -35,7 +35,7 @@ export const MetabotPromptSuggestionPane = ({
metabot,
pageSize = PAGE_SIZE,
}: {
- metabot: Pick<MetabotInfo, "id" | "collection_id">;
+ metabot: Pick<MetabotInfo, "id" | "entity_id" | "collection_id">;
pageSize?: number;
}) => {
const [sendToast] = useToast();
@@ -158,7 +158,7 @@ export const MetabotPromptSuggestionPane = ({
// Unjustified type cast. FIXME
row={row as SuggestedMetabotPrompt}
onDelete={() => handleDeletePrompt(row.id)}
- metabotId={metabot.id}
+ metabotEntityId={metabot.entity_id}
/>
)
}
@@ -210,11 +210,11 @@ const SkeletonSuggestedPromptRow = () => (
const SuggestedPromptRow = ({
row,
onDelete,
- metabotId,
+ metabotEntityId,
}: {
row: SuggestedMetabotPrompt;
onDelete: () => Promise<void>;
- metabotId: number;
+ metabotEntityId: MetabotInfo["entity_id"];
}) => {
const clipboard = useClipboard();
@@ -230,7 +230,7 @@ const SuggestedPromptRow = ({
</td>
<Box component="td" h="3.5rem">
<Flex align="center" gap="sm">
- {metabotId === FIXED_METABOT_IDS.DEFAULT ? (
+ {metabotEntityId === FIXED_METABOT_ENTITY_IDS.DEFAULT ? (
<Tooltip label={t`Run prompt`}>
<ActionIcon
component={ForwardRefLink}
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
index e24691f72e0..8eb6c4907e1 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
@@ -9,18 +9,25 @@ import {
} from "__support__/server-mocks/metabot";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
+import { metabotApi } from "metabase/metabot/api";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
+import {
+ TEST_METABOT_IDS,
+ buildDefaultMetabots,
+} from "metabase/metabot/tests/utils";
import { Route } from "metabase/router";
+import { checkNotNull } from "metabase/utils/types";
import type {
RegenerateSuggestedMetabotPromptsResponse,
SuggestedMetabotPrompt,
+ SuggestedMetabotPromptsRequest,
} from "metabase-types/api";
import { MetabotPromptSuggestionPane } from "./MetabotAdminSuggestedPrompts";
import { mockSuggestedPrompts } from "./test-utils";
const defaultMetabotMockedPrompts =
- mockSuggestedPrompts[FIXED_METABOT_IDS.DEFAULT];
+ mockSuggestedPrompts[TEST_METABOT_IDS.INTERNAL];
const userEvent = _userEvent.setup();
@@ -52,7 +59,7 @@ type SetupOpts = {
const setup = async (opts?: SetupOpts) => {
const {
- metabotId = FIXED_METABOT_IDS.DEFAULT,
+ metabotId = TEST_METABOT_IDS.INTERNAL,
pageSize = 3,
mockInitialPage = true,
regenerateBody,
@@ -88,18 +95,23 @@ const setup = async (opts?: SetupOpts) => {
const TestComponent = () => (
<>
<MetabotPromptSuggestionPane
- metabot={{ id: metabotId, collection_id: null }}
+ metabot={checkNotNull(
+ buildDefaultMetabots().find((metabot) => metabot.id === metabotId),
+ )}
pageSize={pageSize}
/>
<UndoListing />
</>
);
- renderWithProviders(<Route path="/" element={<TestComponent />} />, {
- withRouter: true,
- });
+ const { store } = renderWithProviders(
+ <Route path="/" element={<TestComponent />} />,
+ {
+ withRouter: true,
+ },
+ );
- return { metabotId, nextPaginationContext };
+ return { metabotId, nextPaginationContext, store };
};
describe("suggested prompts", () => {
@@ -113,9 +125,48 @@ describe("suggested prompts", () => {
await expectVisiblePrompts(defaultMetabotMockedPrompts.slice(0, 3));
});
+ it("refreshes chat suggestions after an admin deletes a prompt", async () => {
+ const [firstPrompt] = defaultMetabotMockedPrompts;
+ let prompts = [firstPrompt];
+ fetchMock.get(
+ `path:/api/metabot/metabot/${FIXED_METABOT_ENTITY_IDS.DEFAULT}/prompt-suggestions`,
+ () => ({ prompts, limit: 3, offset: 0, total: prompts.length }),
+ );
+ const { store, metabotId } = await setup();
+ const query: SuggestedMetabotPromptsRequest = {
+ metabot_id: FIXED_METABOT_ENTITY_IDS.DEFAULT,
+ limit: 3,
+ sample: true,
+ };
+ const subscription = store.dispatch(
+ metabotApi.endpoints.getSuggestedMetabotPrompts.initiate(query),
+ );
+ expect((await subscription.unwrap()).prompts).toEqual([firstPrompt]);
+
+ prompts = [];
+ setupRemoveMetabotPromptSuggestionEndpoint(metabotId, firstPrompt.id);
+ await store
+ .dispatch(
+ metabotApi.endpoints.deleteSuggestedMetabotPrompt.initiate({
+ metabot_id: metabotId,
+ prompt_id: firstPrompt.id,
+ }),
+ )
+ .unwrap();
+
+ await waitFor(() => {
+ expect(
+ metabotApi.endpoints.getSuggestedMetabotPrompts.select(query)(
+ store.getState(),
+ ).data?.prompts,
+ ).toEqual([]);
+ });
+ subscription.unsubscribe();
+ });
+
it("should show loading state", async () => {
setupMetabotPromptSuggestionsEndpoint({
- metabotId: FIXED_METABOT_IDS.DEFAULT,
+ metabotId: TEST_METABOT_IDS.INTERNAL,
prompts: defaultMetabotMockedPrompts,
paginationContext: {
offset: 0,
@@ -131,7 +182,7 @@ describe("suggested prompts", () => {
it("should show empty state", async () => {
setupMetabotPromptSuggestionsEndpoint({
- metabotId: FIXED_METABOT_IDS.DEFAULT,
+ metabotId: TEST_METABOT_IDS.INTERNAL,
prompts: [],
paginationContext: {
offset: 0,
@@ -144,7 +195,7 @@ describe("suggested prompts", () => {
});
it("should show error state", async () => {
- setupMetabotPromptSuggestionsEndpointError(FIXED_METABOT_IDS.DEFAULT);
+ setupMetabotPromptSuggestionsEndpointError(TEST_METABOT_IDS.INTERNAL);
await setup({ mockInitialPage: false });
expect(
await screen.findByText("Something went wrong."),
@@ -196,7 +247,7 @@ describe("suggested prompts", () => {
});
it("should show copy button for prompt on non-default metabots", async () => {
- await setup({ metabotId: FIXED_METABOT_IDS.EMBEDDED });
+ await setup({ metabotId: TEST_METABOT_IDS.EMBEDDED });
const [copyPromptAction] = await screen.findAllByTestId("prompt-copy");
expect(copyPromptAction).toBeInTheDocument();
@@ -310,7 +361,7 @@ describe("suggested prompts", () => {
await waitFor(() => {
expect(
fetchMock.callHistory.called(
- `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions/regenerate`,
+ `path:/api/metabot/metabot/${TEST_METABOT_IDS.INTERNAL}/prompt-suggestions/regenerate`,
),
).toBe(true);
});
diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
index 843e8e03de9..dd2b89a161a 100644
--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
@@ -27,10 +27,8 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { waitForRequest } from "__support__/utils";
-import {
- FIXED_METABOT_ENTITY_IDS,
- FIXED_METABOT_IDS,
-} from "metabase/metabot/constants";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
+import { TEST_METABOT_IDS } from "metabase/metabot/tests/utils";
import { reinitialize } from "metabase/plugins";
import type { MetabotId, MetabotInfo, RecentItem } from "metabase-types/api";
import {
@@ -44,11 +42,11 @@ import { MetabotSettingsPanel } from "./MetabotSettingsPanel";
const defaultMetabots = [
createMockMetabotInfo({
- id: FIXED_METABOT_IDS.DEFAULT,
+ id: TEST_METABOT_IDS.INTERNAL,
entity_id: FIXED_METABOT_ENTITY_IDS.DEFAULT,
}),
createMockMetabotInfo({
- id: FIXED_METABOT_IDS.EMBEDDED,
+ id: TEST_METABOT_IDS.EMBEDDED,
name: "Embedded Metabot",
entity_id: FIXED_METABOT_ENTITY_IDS.EMBEDDED,
collection_id: 21,
@@ -90,7 +88,7 @@ const defaultSeedCollections = [
},
];
const setup = async (
- initialPathParam: MetabotId = 1,
+ initialPathParam: MetabotId = TEST_METABOT_IDS.INTERNAL,
metabots: MetabotInfo[] = defaultMetabots,
seedCollections = defaultSeedCollections,
settings = createMockSettings({ "llm-metabot-configured?": true }),
@@ -198,15 +196,15 @@ describe("MetabotSettingsPanel", () => {
it("should render a selected collection for embedded metabot", async () => {
setupEmbeddingPlugin();
- await setup(FIXED_METABOT_IDS.EMBEDDED);
+ await setup(TEST_METABOT_IDS.EMBEDDED);
expect(await screen.findByText("Collection Two")).toBeInTheDocument();
});
it("should render a root collection if collection_id is null for metabot", async () => {
setupEmbeddingPlugin();
- await setup(FIXED_METABOT_IDS.EMBEDDED, [
+ await setup(TEST_METABOT_IDS.EMBEDDED, [
createMockMetabotInfo({
- id: FIXED_METABOT_IDS.EMBEDDED,
+ id: TEST_METABOT_IDS.EMBEDDED,
name: "Embedded Metabot",
entity_id: FIXED_METABOT_ENTITY_IDS.EMBEDDED,
collection_id: null,
@@ -217,11 +215,11 @@ describe("MetabotSettingsPanel", () => {
it("should change selected collection for embedded metabot", async () => {
setupEmbeddingPlugin();
- await setup(FIXED_METABOT_IDS.EMBEDDED);
+ await setup(TEST_METABOT_IDS.EMBEDDED);
expect(
fetchMock.callHistory.calls(
- `path:/api/metabot/metabot/${FIXED_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,
+ `path:/api/metabot/metabot/${TEST_METABOT_IDS.EMBEDDED}/prompt-suggestions?limit=10&offset=0`,
).length,
).toEqual(1); // should have loaded prompt suggestions
@@ -241,14 +239,14 @@ describe("MetabotSettingsPanel", () => {
const puts = await findRequests("PUT");
expect(puts[0].url).toMatch(
- new RegExp(`/api/metabot/metabot/${FIXED_METABOT_IDS.EMBEDDED}`),
+ new RegExp(`/api/metabot/metabot/${TEST_METABOT_IDS.EMBEDDED}`),
);
expect(puts[0].body).toEqual({ collection_id: 31 });
});
it("should show special copy for embedded metabot", async () => {
setupEmbeddingPlugin();
- await setup(FIXED_METABOT_IDS.EMBEDDED);
+ await setup(TEST_METABOT_IDS.EMBEDDED);
expect(
await screen.findByText(/embedding the metabot component/i),
@@ -257,7 +255,7 @@ describe("MetabotSettingsPanel", () => {
it("should toggle embedded metabot enabled state", async () => {
setupEmbeddingPlugin();
- await setup(FIXED_METABOT_IDS.EMBEDDED);
+ await setup(TEST_METABOT_IDS.EMBEDDED);
// Shows title but NOT description for embedded
expect(
diff --git a/frontend/src/metabase/admin/ai/test-utils.ts b/frontend/src/metabase/admin/ai/test-utils.ts
index 164af0f4abb..1d2ce63b997 100644
--- a/frontend/src/metabase/admin/ai/test-utils.ts
+++ b/frontend/src/metabase/admin/ai/test-utils.ts
@@ -1,11 +1,12 @@
+import { TEST_METABOT_IDS } from "metabase/metabot/tests/utils";
import type { MetabotId, SuggestedMetabotPrompt } from "metabase-types/api";
export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
{
- "1": [
+ [TEST_METABOT_IDS.INTERNAL]: [
{
id: 1,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What is the total revenue for this quarter?",
model: "metric",
model_id: 1,
@@ -15,7 +16,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 2,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt:
"Show me the customer acquisition trends over the last 6 months",
model: "model",
@@ -26,7 +27,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 3,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What are our top performing products by sales volume?",
model: "metric",
model_id: 3,
@@ -36,7 +37,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 4,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "How has our monthly recurring revenue changed this year?",
model: "model",
model_id: 1,
@@ -46,7 +47,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 5,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What is our customer churn rate compared to last quarter?",
model: "metric",
model_id: 2,
@@ -56,7 +57,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 6,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "Show me the geographic distribution of our user base",
model: "model",
model_id: 4,
@@ -66,7 +67,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 7,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What is the average order value for new customers?",
model: "metric",
model_id: 4,
@@ -76,7 +77,7 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
},
{
id: 8,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "How do our conversion rates vary by traffic source?",
model: "model",
model_id: 3,
@@ -85,10 +86,10 @@ export const mockSuggestedPrompts: Record<MetabotId, SuggestedMetabotPrompt[]> =
updated_at: "2025-05-18T15:30:00Z",
},
],
- "2": [
+ [TEST_METABOT_IDS.EMBEDDED]: [
{
id: 1,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.EMBEDDED,
prompt: "What is the total revenue for this quarter?",
model: "metric",
model_id: 1,
diff --git a/frontend/src/metabase/metabot/api.ts b/frontend/src/metabase/metabot/api.ts
index c672144878c..41937032d70 100644
--- a/frontend/src/metabase/metabot/api.ts
+++ b/frontend/src/metabase/metabot/api.ts
@@ -97,7 +97,7 @@ export const metabotApi = Api.injectEndpoints({
invalidateTags(error, [
listTag("metabot"),
idTag("metabot", id),
- idTag("metabot-prompt-suggestions", id),
+ listTag("metabot-prompt-suggestions"),
]),
}),
getSuggestedMetabotPrompts: builder.query<
@@ -109,9 +109,7 @@ export const metabotApi = Api.injectEndpoints({
url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions`,
params,
}),
- providesTags: (_, __, { metabot_id }) => [
- idTag("metabot-prompt-suggestions", metabot_id),
- ],
+ providesTags: () => [listTag("metabot-prompt-suggestions")],
}),
deleteSuggestedMetabotPrompt: builder.mutation<
void,
@@ -121,10 +119,8 @@ export const metabotApi = Api.injectEndpoints({
method: "DELETE",
url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions/${prompt_id}`,
}),
- invalidatesTags: (_, error, { metabot_id }) =>
- invalidateTags(error, [
- idTag("metabot-prompt-suggestions", metabot_id),
- ]),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [listTag("metabot-prompt-suggestions")]),
}),
regenerateSuggestedMetabotPrompts: builder.mutation<
RegenerateSuggestedMetabotPromptsResponse,
@@ -134,10 +130,8 @@ export const metabotApi = Api.injectEndpoints({
method: "POST",
url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions/regenerate`,
}),
- invalidatesTags: (_, error, metabot_id) =>
- invalidateTags(error, [
- idTag("metabot-prompt-suggestions", metabot_id),
- ]),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [listTag("metabot-prompt-suggestions")]),
}),
metabotGenerateContent: builder.query<
MetabotGenerateContentResponse,
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index 052738058f4..1d113848da8 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -3,7 +3,7 @@ import { tinykeys } from "tinykeys";
import { t } from "ttag";
import MetabotFailure from "assets/img/metabot-failure.svg?component";
-import { idTag } from "metabase/api/tags";
+import { listTag } from "metabase/api/tags";
import ErrorBoundary from "metabase/common/components/ErrorBoundary";
import { getUser } from "metabase/current-user";
import {
@@ -67,9 +67,7 @@ const MetabotSidebarActions = ({ agentId }: { agentId: MetabotAgentId }) => {
const handleNewConversation = () => {
metabot.createNewConversation();
dispatch(
- metabotApi.util.invalidateTags([
- idTag("metabot-prompt-suggestions", metabot.metabotId),
- ]),
+ metabotApi.util.invalidateTags([listTag("metabot-prompt-suggestions")]),
);
};
diff --git a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
index 3969696f51b..6c43db1b842 100644
--- a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
@@ -61,7 +61,7 @@ export const MetabotGreeting = ({
const suggestedPromptsReq = useGetSuggestedMetabotPromptsQuery(
{
- metabot_id: metabot.metabotId,
+ metabot_id: metabot.metabotEntityId,
limit: SUGGESTED_PROMPTS_LIMIT,
sample: true,
},
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
index bf21c2e5cb6..e9a57995559 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
@@ -13,12 +13,10 @@ import { EntityIcon } from "metabase/common/components/EntityIcon";
import { useToast } from "metabase/common/hooks";
import { deserializeCardFromQuery } from "metabase/common/utils/card";
import { useGetIcon } from "metabase/hooks/use-icon";
-import { getMetabotId } from "metabase/metabot/state";
import {
getCollectionLocationLabel,
getDatabaseLocationLabel,
} from "metabase/metabot/utils/source-location";
-import { useSelector } from "metabase/redux";
import { EntitySmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/EntitySmartLink";
import { useEntityData } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/use-entity-data";
import {
@@ -192,7 +190,6 @@ const SourceFeedbackButtons = ({
const iconSize = size === "sm" ? 12 : 16;
const [feedback, setFeedback] = useState<boolean | null>(null);
const [sendToast] = useToast();
- const metabotId = useSelector(getMetabotId);
const [submitMetabotSourceFeedback, { isLoading }] =
useSubmitMetabotSourceFeedbackMutation();
@@ -206,7 +203,6 @@ const SourceFeedbackButtons = ({
try {
await submitMetabotSourceFeedback({
- metabot_id: metabotId,
message_id: messageId,
positive,
...source,
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.unit.spec.tsx
index b125cf86a35..5297dec5029 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.unit.spec.tsx
@@ -3,7 +3,6 @@ import fetchMock from "fetch-mock";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import type { GeneratedCard } from "metabase/api/ai-streaming/schemas";
-import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
import type {
DatasetQuery,
MetabotCodeEdit,
@@ -151,7 +150,6 @@ describe("MetabotAgentDataSourcePills", () => {
expect(
fetchMock.callHistory.calls(SOURCE_FEEDBACK_ENDPOINT, {
body: {
- metabot_id: FIXED_METABOT_IDS.DEFAULT,
message_id: "message-1",
source_id: ORDERS_TABLE.id,
source_type: "table",
@@ -187,7 +185,6 @@ describe("MetabotAgentDataSourcePills", () => {
expect(
fetchMock.callHistory.calls(SOURCE_FEEDBACK_ENDPOINT, {
body: {
- metabot_id: FIXED_METABOT_IDS.DEFAULT,
message_id: "message-2",
source_id: ORDERS_TABLE.id,
source_type: "table",
@@ -209,7 +206,6 @@ describe("MetabotAgentDataSourcePills", () => {
expect(
fetchMock.callHistory.calls(SOURCE_FEEDBACK_ENDPOINT, {
body: {
- metabot_id: FIXED_METABOT_IDS.DEFAULT,
message_id: "message-3",
source_id: ORDERS_TABLE.id,
source_type: "table",
@@ -331,7 +327,6 @@ describe("MetabotAgentDataSourcePills", () => {
expect(
fetchMock.callHistory.calls(SOURCE_FEEDBACK_ENDPOINT, {
body: {
- metabot_id: FIXED_METABOT_IDS.DEFAULT,
message_id: "message-5-model",
source_id: 4,
source_type: "model",
@@ -411,7 +406,6 @@ describe("MetabotAgentDataSourcePills", () => {
expect(
fetchMock.callHistory.calls(SOURCE_FEEDBACK_ENDPOINT, {
body: {
- metabot_id: FIXED_METABOT_IDS.DEFAULT,
message_id: "message-11",
source_id: 4,
source_type: "model",
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
index 01eb7135d5d..98dfc76cd20 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
@@ -99,7 +99,7 @@ export const MetabotChat = ({
const suggestedPromptsReq = useGetSuggestedMetabotPromptsQuery(
{
- metabot_id: metabot.metabotId,
+ metabot_id: metabot.metabotEntityId,
limit: 3,
sample: true,
},
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
index 667584176ee..b49f88a7668 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
@@ -5,7 +5,6 @@ import * as Yup from "yup";
import { Form, FormProvider } from "metabase/forms";
import { FormSelect } from "metabase/forms/components/FormSelect";
import { FormTextarea } from "metabase/forms/components/FormTextarea";
-import { getMetabotId } from "metabase/metabot/state";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { useSetting } from "metabase/settings";
@@ -65,14 +64,12 @@ export const MetabotFeedbackModal = ({
}: MetabotFeedbackModalProps) => {
const applicationName = useSelector(getApplicationName);
const metabotName = useSetting("metabot-name");
- const metabotId = useSelector(getMetabotId);
const handleSubmit = (values: {
freeform_feedback: string;
issue_type?: MetabotIssueType | "";
}) => {
const base = {
- metabot_id: metabotId,
message_id: messageId,
freeform_feedback: values.freeform_feedback,
};
diff --git a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
index 80a0e50b43b..6b4d13a112d 100644
--- a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
@@ -21,7 +21,7 @@ import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { createMockTable, createMockUser } from "metabase-types/api/mocks";
-import { FIXED_METABOT_IDS } from "../../constants";
+import { FIXED_METABOT_ENTITY_IDS } from "../../constants";
import { MetabotProvider } from "../../context";
import { getMetabotState, metabotReducer } from "../../state";
import {
@@ -96,7 +96,7 @@ const setup = ({
setupDatabaseListEndpoint([]);
setupListMetabotConversationsEndpoint([]);
fetchMock.get(
- `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,
+ `path:/api/metabot/metabot/${FIXED_METABOT_ENTITY_IDS.DEFAULT}/prompt-suggestions`,
{ prompts: [], offset: 0, limit: 3, total: 3 },
);
diff --git a/frontend/src/metabase/metabot/constants.ts b/frontend/src/metabase/metabot/constants.ts
index 4e4d6ae8f8f..1e7572acdce 100644
--- a/frontend/src/metabase/metabot/constants.ts
+++ b/frontend/src/metabase/metabot/constants.ts
@@ -4,16 +4,6 @@ import { isEmbedding } from "metabase/embedding/config";
export const CONTEXT_WINDOW_WARNING_PERCENT = 90;
-// NOTE: this is not ideal, but will get fixed w/ BOT-189 allowing us to use fixed entity_ids
-export const FIXED_METABOT_IDS = {
- DEFAULT: 1 as const,
- EMBEDDED: 2 as const,
-};
-
-export const METABOT_REQUEST_IDS = {
- EMBEDDED: "c61bf5f5-1025-47b6-9298-bf1827105bb6",
-};
-
export const FIXED_METABOT_ENTITY_IDS = {
DEFAULT: "metabotmetabotmetabot" as const,
EMBEDDED: "embeddedmetabotmetabo" as const,
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-conversation.ts b/frontend/src/metabase/metabot/hooks/use-metabot-conversation.ts
index 51cd640cbab..a88f3fa9f0c 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-conversation.ts
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-conversation.ts
@@ -20,9 +20,9 @@ import {
getIsConversationProcessing,
getLongChatNotice,
getMessages,
- getMetabotId,
+ getMetabotEntityId,
getMetabotReactionsState,
- getMetabotRequestId,
+ getMetabotRequestEntityId,
getProfileOverride,
retryPrompt,
setProfileOverride as setProfileOverrideAction,
@@ -48,8 +48,8 @@ export const useMetabotConversation = (conversationId: string) => {
const isFullPageMetabot = useIsFullPageMetabot();
- const metabotRequestId = useSelector((state) =>
- getMetabotRequestId(state, conversationId),
+ const metabotRequestEntityId = useSelector((state) =>
+ getMetabotRequestEntityId(state, conversationId),
);
const prepareRetryIfUnsuccesful = useCallback(
@@ -88,7 +88,7 @@ export const useMetabotConversation = (conversationId: string) => {
: prompt),
context: await getChatContext(),
conversationId,
- metabot_id: metabotRequestId,
+ metabot_id: metabotRequestEntityId,
profile: options?.profile,
isFullPageMetabot,
}),
@@ -105,7 +105,7 @@ export const useMetabotConversation = (conversationId: string) => {
[
dispatch,
getChatContext,
- metabotRequestId,
+ metabotRequestEntityId,
prepareRetryIfUnsuccesful,
conversationId,
promptInputRef,
@@ -121,7 +121,7 @@ export const useMetabotConversation = (conversationId: string) => {
retryPrompt({
messageId,
context,
- metabot_id: metabotRequestId,
+ metabot_id: metabotRequestEntityId,
conversationId,
profile: options?.profile,
isFullPageMetabot,
@@ -134,7 +134,7 @@ export const useMetabotConversation = (conversationId: string) => {
[
dispatch,
getChatContext,
- metabotRequestId,
+ metabotRequestEntityId,
prepareRetryIfUnsuccesful,
conversationId,
isFullPageMetabot,
@@ -179,7 +179,7 @@ export const useMetabotConversation = (conversationId: string) => {
continueResponse,
cancelRequest,
reloadConversation,
- metabotId: useSelector(getMetabotId),
+ metabotEntityId: useSelector(getMetabotEntityId),
profile: useSelector((state) => getProfileOverride(state, conversationId)),
title: useSelector((state) => getConversationTitle(state, conversationId)),
forkedFromConversationId: useSelector((state) =>
diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.ts
index 928a4b8eca9..38a5ffebae9 100644
--- a/frontend/src/metabase/metabot/state/selectors.ts
+++ b/frontend/src/metabase/metabot/state/selectors.ts
@@ -7,8 +7,7 @@ import * as Urls from "metabase/urls";
import {
CONTEXT_WINDOW_WARNING_PERCENT,
- FIXED_METABOT_IDS,
- METABOT_REQUEST_IDS,
+ FIXED_METABOT_ENTITY_IDS,
} from "../constants";
import {
getContextWindowPercentUsage,
@@ -46,8 +45,10 @@ export const getActiveMetabotAgentIds = createSelector(
(state) => Object.keys(state.agents) as MetabotAgentId[],
);
-export const getMetabotId = () =>
- isEmbedding() ? FIXED_METABOT_IDS.EMBEDDED : FIXED_METABOT_IDS.DEFAULT;
+export const getMetabotEntityId = () =>
+ isEmbedding()
+ ? FIXED_METABOT_ENTITY_IDS.EMBEDDED
+ : FIXED_METABOT_ENTITY_IDS.DEFAULT;
export const getDebugMode = createSelector(
getMetabotState,
@@ -295,9 +296,12 @@ export const getMetabotReqIdOverride = createSelector(
(convo) => convo.experimental.metabotReqIdOverride,
);
-export const getMetabotRequestId = (state: State, conversationId: string) =>
+export const getMetabotRequestEntityId = (
+ state: State,
+ conversationId: string,
+) =>
getMetabotReqIdOverride(state, conversationId) ??
- (isEmbedding() ? METABOT_REQUEST_IDS.EMBEDDED : undefined);
+ (isEmbedding() ? FIXED_METABOT_ENTITY_IDS.EMBEDDED : undefined);
export const getProfileOverride = createSelector(
getConversation,
diff --git a/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts b/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts
index c0472552b2f..7300bb130b3 100644
--- a/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts
+++ b/frontend/src/metabase/metabot/tests/feedback.unit.spec.ts
@@ -75,7 +75,6 @@ describe("metabot > feedback", () => {
expect(feedbackEndpoint.calls()).toHaveLength(1);
const body = await feedbackEndpoint.calls()[0].request?.json();
expect(body).toEqual({
- metabot_id: expect.any(Number),
message_id: agentRequestBody.assistant_message_id,
positive: false,
freeform_feedback: "",
@@ -142,7 +141,6 @@ describe("metabot > feedback", () => {
expect(feedbackEndpoint.calls()).toHaveLength(1);
const body = await feedbackEndpoint.calls()[0].request?.json();
expect(body).toEqual({
- metabot_id: expect.any(Number),
message_id: agentRequestBody.assistant_message_id,
positive: true,
freeform_feedback: "",
diff --git a/frontend/src/metabase/metabot/tests/message.unit.spec.tsx b/frontend/src/metabase/metabot/tests/message.unit.spec.tsx
index f796bfe7cb0..c5eb21b73c8 100644
--- a/frontend/src/metabase/metabot/tests/message.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/message.unit.spec.tsx
@@ -23,7 +23,7 @@ describe("metabot > message", () => {
it("should properly send chat messages", async () => {
setup();
- const { sendResponse } = mockAgentEndpoint({
+ const agentSpy = mockAgentEndpoint({
events: whoIsYourFavoriteResponse,
waitForResponse: true,
});
@@ -36,7 +36,9 @@ describe("metabot > message", () => {
await screen.findByTestId("metabot-chain-of-thought"),
).toBeInTheDocument();
- sendResponse();
+ agentSpy.sendResponse();
+
+ expect(await lastReqBody(agentSpy)).not.toHaveProperty("metabot_id");
expect(
await screen.findByText("You, but don't tell anyone."),
diff --git a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
index 789ab7b419c..d2cf4cf6cbb 100644
--- a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
@@ -11,6 +11,7 @@ import {
} from "__support__/server-mocks";
import { act, fireEvent, screen, waitFor, within } from "__support__/ui";
import type { SSEEvent } from "metabase/api/ai-streaming/sse-types";
+import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
import { useMetabotAgent } from "metabase/metabot/hooks";
import { metabotActions } from "metabase/metabot/state";
import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";
@@ -25,6 +26,7 @@ import { Metabot } from "../components/Metabot";
import { MetabotChat } from "../components/MetabotChat";
import {
+ TEST_METABOT_IDS,
assertConversation,
assertNotVisible,
assertVisible,
@@ -421,7 +423,7 @@ describe("metabot > ui", () => {
const prompts = [
{
id: 1,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What is the total revenue for this quarter?",
model: "metric" as const,
model_id: 1,
@@ -431,7 +433,7 @@ describe("metabot > ui", () => {
},
{
id: 2,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt:
"Show me the customer acquisition trends over the last 6 months",
model: "model" as const,
@@ -442,7 +444,7 @@ describe("metabot > ui", () => {
},
{
id: 3,
- metabot_id: 1,
+ metabot_id: TEST_METABOT_IDS.INTERNAL,
prompt: "What are our top performing products by sales volume?",
model: "metric" as const,
model_id: 3,
@@ -480,7 +482,7 @@ describe("metabot > ui", () => {
await waitFor(async () => {
expect(
fetchMock.callHistory.calls(
- `path:/api/metabot/metabot/1/prompt-suggestions`,
+ `path:/api/metabot/metabot/${FIXED_METABOT_ENTITY_IDS.DEFAULT}/prompt-suggestions`,
),
).toHaveLength(1);
});
@@ -490,7 +492,7 @@ describe("metabot > ui", () => {
await waitFor(async () => {
expect(
fetchMock.callHistory.calls(
- `path:/api/metabot/metabot/1/prompt-suggestions`,
+ `path:/api/metabot/metabot/${FIXED_METABOT_ENTITY_IDS.DEFAULT}/prompt-suggestions`,
),
).toHaveLength(2);
});
diff --git a/frontend/src/metabase/metabot/tests/utils.tsx b/frontend/src/metabase/metabot/tests/utils.tsx
index 429bd76d61e..15f061b54d8 100644
--- a/frontend/src/metabase/metabot/tests/utils.tsx
+++ b/frontend/src/metabase/metabot/tests/utils.tsx
@@ -43,7 +43,7 @@ import {
import { Metabot } from "../components/Metabot";
import "../components/MetabotChat/MetabotChat";
-import { FIXED_METABOT_ENTITY_IDS, FIXED_METABOT_IDS } from "../constants";
+import { FIXED_METABOT_ENTITY_IDS } from "../constants";
import { MetabotProvider } from "../context";
import {
type MetabotAgentId,
@@ -335,6 +335,8 @@ export const adminQuotaLimitErroredResponse: SSEEvent[] = [
},
];
+export const TEST_METABOT_IDS = { INTERNAL: 41, EMBEDDED: 42 } as const;
+
type DefaultMetabotOverrides = {
default?: Partial<MetabotInfo>;
embedded?: Partial<MetabotInfo>;
@@ -345,12 +347,12 @@ export function buildDefaultMetabots(
): MetabotInfo[] {
return [
createMockMetabotInfo({
- id: FIXED_METABOT_IDS.DEFAULT,
+ id: TEST_METABOT_IDS.INTERNAL,
entity_id: FIXED_METABOT_ENTITY_IDS.DEFAULT,
...overrides.default,
}),
createMockMetabotInfo({
- id: FIXED_METABOT_IDS.EMBEDDED,
+ id: TEST_METABOT_IDS.EMBEDDED,
entity_id: FIXED_METABOT_ENTITY_IDS.EMBEDDED,
name: "Embedded Metabot",
...overrides.embedded,
@@ -403,7 +405,7 @@ export function setup(
});
fetchMock.get(
- `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions`,
+ `path:/api/metabot/metabot/${FIXED_METABOT_ENTITY_IDS.DEFAULT}/prompt-suggestions`,
{ prompts: promptSuggestions, offset: 0, limit: 3, total: 3 },
);
fetchMock.get(
diff --git a/resources/openapi/openapi.json b/resources/openapi/openapi.json
index 6c054d2c68c..19d250b992c 100644
--- a/resources/openapi/openapi.json
+++ b/resources/openapi/openapi.json
@@ -35711,6 +35711,7 @@
"content" : {
"application/json" : {
"schema" : {
+ "additionalProperties" : false,
"properties" : {
"freeform_feedback" : {
"oneOf" : [ {
@@ -35731,15 +35732,19 @@
"type" : "string"
},
"metabot_id" : {
- "description" : "value must be an integer greater than zero.",
- "minimum" : 1,
- "type" : "integer"
+ "anyOf" : [ {
+ "description" : "value must be an integer greater than zero.",
+ "minimum" : 1,
+ "type" : "integer"
+ }, {
+ "type" : "string"
+ } ]
},
"positive" : {
"type" : "boolean"
}
},
- "required" : [ "metabot_id", "message_id", "positive" ],
+ "required" : [ "message_id", "positive" ],
"type" : "object"
}
}
@@ -35901,15 +35906,19 @@
"tags" : [ "/api/metabot/metabot" ]
},
"get" : {
- "description" : "Return the prompt suggestions for the metabot instance with `id`.",
+ "description" : "Return the prompt suggestions for a Metabot primary key or entity ID.",
"operationId" : "get-api-metabot-metabot-id-prompt-suggestions",
"parameters" : [ {
"in" : "path",
"name" : "id",
"required" : true,
"schema" : {
- "minimum" : 1,
- "type" : "integer"
+ "anyOf" : [ {
+ "minimum" : 1,
+ "type" : "integer"
+ }, {
+ "type" : "string"
+ } ]
}
}, {
"in" : "query",
@@ -36463,15 +36472,20 @@
"content" : {
"application/json" : {
"schema" : {
+ "additionalProperties" : false,
"properties" : {
"message_id" : {
"minLength" : 1,
"type" : "string"
},
"metabot_id" : {
- "description" : "value must be an integer greater than zero.",
- "minimum" : 1,
- "type" : "integer"
+ "anyOf" : [ {
+ "description" : "value must be an integer greater than zero.",
+ "minimum" : 1,
+ "type" : "integer"
+ }, {
+ "type" : "string"
+ } ]
},
"positive" : {
"type" : "boolean"
@@ -36486,7 +36500,7 @@
"type" : "string"
}
},
- "required" : [ "metabot_id", "message_id", "source_id", "source_type", "positive" ],
+ "required" : [ "message_id", "source_id", "source_type", "positive" ],
"type" : "object"
}
}
diff --git a/src/metabase/metabot/agent/core.clj b/src/metabase/metabot/agent/core.clj
index 6ebdbef2eb3..bf9981ed691 100644
--- a/src/metabase/metabot/agent/core.clj
+++ b/src/metabase/metabot/agent/core.clj
@@ -487,7 +487,7 @@
The system message and the tool declarations are rendered once for the whole turn. Both read settings or status
that can change mid-turn, and a change would invalidate replayed thinking the same way an edited earlier message
does (see [[turn-input-parts]])."
- [{:keys [messages state metabot-id profile-id context tracking-opts conversation-id]
+ [{:keys [messages state metabot profile-id context tracking-opts conversation-id]
external-memory-atom :memory-atom}]
(let [context (assign-context-ids context)
;; Resolve the profile once (its nlq availability redirect probes the index): reuse it for both the
@@ -504,7 +504,7 @@
(assoc :conversation-id conversation-id)
(memory/add-client-ids (client-content-ids context)))
memory-atom (doto (or external-memory-atom (atom nil)) (reset! memory))
- tools (update-vals (tools/wrap-tools-with-state base-tools memory-atom metabot-id profile-id)
+ tools (update-vals (tools/wrap-tools-with-state base-tools memory-atom metabot profile-id)
#(assoc % :declaration (delay (self.schema/tool-function %))))]
(log/info "Starting agent" {:profile profile-id
:tools (count tools)
@@ -704,7 +704,7 @@
[opts :- [:map {:closed true}
[:messages ::messages]
[:profile-id ::profile-id]
- [:metabot-id {:optional true} [:maybe :string]]
+ [:metabot ::metabot.schema/metabot]
[:conversation-id {:optional true} [:maybe :string]]
[:state {:optional true} [:maybe ::metabot.schema/state]]
[:context {:optional true} [:maybe ::context]]
@@ -718,8 +718,7 @@
[:maybe [:and [:string {:max ait/max-session-id-length}] [:re ait/safe-session-id-re]]]]
[:debug? {:optional true} [:maybe :boolean]]
[:memory-atom {:optional true} [:maybe [:fn #(instance? clojure.lang.Atom %)]]]]]
- (let [opts (m/update-existing-in opts [:context :capabilities]
- capabilities/enforce-permissions)
+ (let [opts (m/update-existing-in opts [:context :capabilities] capabilities/enforce-permissions)
profile-id (:profile-id opts)
debug? (:debug? opts)
labels {:profile-id (name profile-id)}
diff --git a/src/metabase/metabot/api.clj b/src/metabase/metabot/api.clj
index 4ae07a77d76..be40662973c 100644
--- a/src/metabase/metabot/api.clj
+++ b/src/metabase/metabot/api.clj
@@ -200,9 +200,9 @@
emitted as the `start` event's `messageMetadata.userMessageId`.
`:state` is the reconstructed [[metabot.persistence/conversation-state]] —
it seeds the agent loop as the immutable baseline for this turn's state."
- [{:keys [metabot-id profile-id message context history conversation-id state debug?
+ [{:keys [metabot profile-id message context history conversation-id state debug?
eval-session-id assistant-msg-id external-id user-external-id title-job]}]
- (let [enriched-context (metabot.context/create-context context {:metabot-id metabot-id
+ (let [enriched-context (metabot.context/create-context context {:metabot metabot
:profile-id (keyword profile-id)})
messages (concat history [message])]
;; a reasoning model can spend longer than MB_JETTY_ASYNC_RESPONSE_TIMEOUT on one turn
@@ -232,7 +232,7 @@
(agent/run-agent-loop
(cond-> {:messages messages
:state state
- :metabot-id metabot-id
+ :metabot metabot
:conversation-id conversation-id
:profile-id (keyword profile-id)
:context enriched-context
@@ -305,10 +305,10 @@
[{:keys [metabot_id profile_id message context conversation_id debug eval_session_id parent_message_id retry_message_id
user_message_id assistant_message_id]} request-info]
(let [message (metabot.envelope/user-message message)
- metabot-id (metabot.config/resolve-dynamic-metabot-id metabot_id)
- _ (metabot.config/check-metabot-enabled! metabot-id)
+ metabot (metabot.config/resolve-metabot metabot_id)
+ _ (metabot.config/check-metabot-enabled! metabot)
_ (metabot.usage/check-metabase-managed-free-limit!)
- profile-id (metabot.config/resolve-dynamic-profile-id profile_id metabot-id)
+ profile-id (metabot.config/resolve-dynamic-profile-id profile_id (:entity_id metabot))
;; reject before `start-turn!` persists anything or the title job calls the LLM
_ (when-not (profiles/profile-registered? (keyword profile-id))
(throw (ex-info (tru "Unknown profile") {:status-code 400 :profile-id profile-id})))
@@ -351,7 +351,7 @@
first-msg)]
(log/info "Using native Clojure agent" {:profile-id profile-id :debug? debug?})
(native-agent-streaming-request
- {:metabot-id metabot-id
+ {:metabot metabot
:profile-id profile-id
:message message
:context context
@@ -429,7 +429,7 @@
[_route-params
_query-params
body :- [:map {:closed true}
- [:metabot_id ms/PositiveInt]
+ [:metabot_id {:optional true} [:or ms/PositiveInt :string]]
[:message_id ms/NonBlankString]
[:positive :boolean]
[:issue_type {:optional true} [:maybe :string]]
@@ -445,7 +445,7 @@
[_route-params
_query-params
body :- [:map {:closed true}
- [:metabot_id ms/PositiveInt]
+ [:metabot_id {:optional true} [:or ms/PositiveInt :string]]
[:message_id ms/NonBlankString]
[:source_id ms/PositiveInt]
[:source_type [:enum "table" "card" "model"]]
diff --git a/src/metabase/metabot/api/document.clj b/src/metabase/metabot/api/document.clj
index 59e43f4378e..10929315b64 100644
--- a/src/metabase/metabot/api/document.clj
+++ b/src/metabase/metabot/api/document.clj
@@ -93,20 +93,20 @@
[_route-params
_query-params
{:keys [instructions references]} :- generate-content-body-schema]
- (let [metabot-id (metabot.config/resolve-dynamic-metabot-id nil)]
- (metabot.config/check-metabot-enabled! metabot-id)
+ (let [metabot (metabot.config/resolve-metabot nil)]
+ (metabot.config/check-metabot-enabled! metabot)
(metabot.usage/check-metabase-managed-free-limit!)
(let [context (assoc
;; a request, not a grant: `enforce-permissions` drops it unless the user
;; really can write native queries
(metabot.context/create-context {:capabilities #{"permission:write_sql_queries"}}
- {:metabot-id metabot-id
+ {:metabot metabot
:profile-id :document-generate-content})
:references references)
parts (into [] (metabot.agent/run-agent-loop
{:messages [{:role :user
:content instructions}]
- :metabot-id metabot-id
+ :metabot metabot
:profile-id :document-generate-content
:state {}
:context context
diff --git a/src/metabase/metabot/api/metabot.clj b/src/metabase/metabot/api/metabot.clj
index 64552d465b5..92fa1724c28 100644
--- a/src/metabase/metabot/api/metabot.clj
+++ b/src/metabase/metabot/api/metabot.clj
@@ -4,6 +4,7 @@
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
+ [metabase.metabot.config :as metabot.config]
[metabase.metabot.db :as metabot.db]
[metabase.metabot.suggested-prompts :as metabot.suggested-prompts]
[metabase.metabot.task.suggested-prompts-refresh :as metabot.suggested-prompts-refresh]
@@ -92,13 +93,14 @@
#_{:clj-kondo/ignore [:metabase/validate-defendpoint-query-params-use-kebab-case
:metabase/validate-defendpoint-has-response-schema]}
(api.macros/defendpoint :get "/:id/prompt-suggestions"
- "Return the prompt suggestions for the metabot instance with `id`."
- [{:keys [id]} :- [:map {:closed true} [:id pos-int?]]
+ "Return the prompt suggestions for a Metabot primary key or entity ID."
+ [{:keys [id]} :- [:map {:closed true} [:id [:or pos-int? :string]]]
{:keys [sample model model_id]} :- [:map {:closed true}
[:sample {:optional true} :boolean]
[:model {:optional true} [:enum "metric" "model"]]
[:model_id {:optional true} pos-int?]]]
- (let [offset (when-not sample (request/offset))
+ (let [id (:id (api/check-404 (metabot.config/find-metabot id) "Unknown Metabot."))
+ offset (when-not sample (request/offset))
total (metabot.db/prompt-count id model model_id)
prompts (metabot.db/prompts id model model_id sample (request/limit) offset)]
{:prompts prompts
diff --git a/src/metabase/metabot/config.clj b/src/metabase/metabot/config.clj
index 14e90a5c76c..4fd7b35d9e8 100644
--- a/src/metabase/metabot/config.clj
+++ b/src/metabase/metabot/config.clj
@@ -1,18 +1,22 @@
(ns metabase.metabot.config
(:require
- [medley.core :as m]
[metabase.api.common :as api]
[metabase.llm.settings :as llm.settings]
[metabase.metabot.db :as metabot.db]
[metabase.metabot.settings :as metabot.settings]))
(def internal-metabot-id
- "The ID of the internal Metabot instance."
- "b5716059-ad40-4d83-a4e1-673af020b2d8")
+ "The entity ID of the internal Metabot instance."
+ "metabotmetabotmetabot")
(def embedded-metabot-id
- "The ID of the embedded Metabot instance."
- "c61bf5f5-1025-47b6-9298-bf1827105bb6")
+ "The entity ID of the embedded Metabot instance."
+ "embeddedmetabotmetabo")
+
+(def legacy-metabot-ids
+ "Legacy UUIDs mapped to Metabot entity IDs."
+ {"b5716059-ad40-4d83-a4e1-673af020b2d8" internal-metabot-id
+ "c61bf5f5-1025-47b6-9298-bf1827105bb6" embedded-metabot-id})
(defn any-metabot-enabled?
"Returns true if at least one of the metabot instances (internal or embedded) is enabled."
@@ -23,51 +27,55 @@
(defn check-metabot-enabled!
"Throws a 403 if metabot is not enabled. When called with no arguments, checks that at least one metabot instance is
- enabled. When called with a `metabot-id`, checks the specific instance's setting."
+ enabled. When called with a Metabot row, checks the specific instance's setting."
([]
(api/check (llm.settings/ai-features-enabled?)
[403 "AI features are not enabled."])
(api/check (any-metabot-enabled?)
[403 "Metabot is not enabled."]))
- ([metabot-id]
+ ([metabot]
(api/check (llm.settings/ai-features-enabled?)
[403 "AI features are not enabled."])
- (if (= metabot-id embedded-metabot-id)
+ (if (= (:entity_id metabot) embedded-metabot-id)
(api/check (metabot.settings/embedded-metabot-enabled?)
[403 "Embedded Metabot is not enabled."])
(api/check (metabot.settings/metabot-enabled?)
[403 "Metabot is not enabled."]))))
-(def metabot-config
- "The name of the collection exposed by the answer-sources tool."
- {internal-metabot-id {:profile-id "internal"
- :entity-id "metabotmetabotmetabot"}
- embedded-metabot-id {:profile-id "embedding_next"
- :entity-id "embeddedmetabotmetabo"}})
-
(defn metabot-id->profile-id
- "Return the profile-id for the Metabot instance with ID `metabot-id` or \"default\" if no profile-id is configured."
+ "Return the configured profile ID for a Metabot entity ID, or nil."
[metabot-id]
- (or (get-in metabot-config [metabot-id :profile-id])
- (:profile-id (m/find-first #(when (= (:entity-id %) metabot-id)
- (:profile-id %))
- (vals metabot-config)))))
+ (get {internal-metabot-id "internal"
+ embedded-metabot-id "embedding_next"}
+ metabot-id))
-(defn normalize-metabot-id
- "Return the primary key for the metabot instance identified by `metabot-id`.
+(defn resolve-dynamic-metabot-id
+ "Resolve an explicit ID, the configured ID, or the internal Metabot entity ID.
- Returns nil if no entry can be found.
- The provided ID can be a UUID from [[metabot-config]] or an entity_id of a Metabot instance."
+ Maps UUIDs in [[legacy-metabot-ids]] to their entity IDs."
[metabot-id]
- (metabot.db/metabot-id-by-entity-id (get-in metabot-config [metabot-id :entity-id] metabot-id)))
+ (let [metabot-id (or metabot-id
+ (metabot.settings/metabot-id)
+ internal-metabot-id)]
+ (get legacy-metabot-ids metabot-id metabot-id)))
-(defn resolve-dynamic-metabot-id
- "Resolve dynamic metabot ID with logical fall backs
- Precedence: explicit metabot-id > env metabot-id > default (internal)"
+(defn find-metabot
+ "Return the Metabot row for an entity ID, a legacy UUID, or a numeric primary key, or nil.
+
+ A nil ID uses the configured or internal Metabot."
+ [metabot-id]
+ (if (integer? metabot-id)
+ (metabot.db/metabot metabot-id)
+ (metabot.db/metabot-by-entity-id (resolve-dynamic-metabot-id metabot-id))))
+
+(defn resolve-metabot
+ "Return the Metabot row for an entity ID, a legacy UUID, or a numeric primary key.
+
+ A nil ID uses the configured or internal Metabot. Throws a 400 if the ID matches no Metabot."
[metabot-id]
- (or metabot-id
- (metabot.settings/metabot-id)
- internal-metabot-id))
+ (let [metabot (find-metabot metabot-id)]
+ (api/check metabot [400 "Unknown Metabot."])
+ metabot))
(defn resolve-dynamic-profile-id
"Resolve the profile ID: explicit profile-id > metabot-id->profile-id > embedding_next.
diff --git a/src/metabase/metabot/context.clj b/src/metabase/metabot/context.clj
index 69aa362d702..2d6945c98f7 100644
--- a/src/metabase/metabot/context.clj
+++ b/src/metabase/metabot/context.clj
@@ -10,10 +10,10 @@
[metabase.lib.core :as lib]
[metabase.lib.schema :as lib.schema]
[metabase.lib.schema.template-tag :as lib.schema.template-tag]
- [metabase.metabot.config :as metabot.config]
[metabase.metabot.curation :as curation]
[metabase.metabot.db :as metabot.db]
[metabase.metabot.metadata-perms :as metabot.perms]
+ [metabase.metabot.schema :as metabot.schema]
[metabase.metabot.settings :as metabot.settings]
[metabase.metabot.table-utils :as table-utils]
[metabase.parameters.schema :as parameters.schema]
@@ -361,14 +361,6 @@
(assoc context :user_is_viewing enhanced-viewing))
context))
-(defn- get-metabot
- "Look up the metabot row for the given UUID/entity-id, mirroring the resolution used by `metabase.metabot.tools.search`."
- [metabot-id]
- (when metabot-id
- (metabot.db/metabot-by-entity-id (get-in metabot.config/metabot-config
- [metabot-id :entity-id]
- metabot-id))))
-
(defn- filter-recents-to-curated
"Keep only recents that are curated (verified, official-collection, library/published, or authoritative).
Delegates to metabot.curation/curated-ids, the source-of-truth check, so recent-view filtering can't drift
@@ -392,12 +384,12 @@
Includes the 5 most recent items across cards, datasets, metrics, dashboards, and tables.
(Excludes collections and documents for now, which aren't searchable by Metabot.)
- When `metabot-id` is provided and the metabot has `use_verified_content` enabled, filters recents down
+ When the Metabot has `use_verified_content` enabled, filters recents down
to curated content (verified, official-collection, library/published, or authoritative) before taking
the top 5, matching how search filters answer sources.
Skips recents entirely for profiles in [[profiles-excluding-recent-views]]."
- [context {:keys [metabot-id profile-id] :as _opts}]
+ [context {:keys [metabot profile-id] :as _opts}]
(try
;; When disabled (or excluded for this profile), strip any preexisting :user_recently_viewed so recent
;; views never reach the prompt, even for a caller-supplied context that already carries the key.
@@ -409,7 +401,7 @@
[:views :selections]
{:models [:card :dataset :metric :dashboard :table]}))
recents (cond->> recents
- (:use_verified_content (get-metabot metabot-id))
+ (:use_verified_content metabot)
filter-recents-to-curated)]
(mapv (fn [item]
(let [item-type
@@ -435,15 +427,13 @@
(mu/defn create-context :- ::context
"Create a tool context."
- ([context :- ::context]
- (create-context context nil))
- ([context :- ::context
- opts :- [:maybe [:map {:closed true}
- [:metabot-id {:optional true} [:maybe :string]]
- [:profile-id {:optional true} [:maybe :keyword]]
- [:date-format {:optional true} [:maybe (ms/InstanceOfClass DateTimeFormatter)]]]]]
- (metabot.perms/with-cache
- (-> context
- enhance-context-with-schema
- (add-recent-views (or opts {}))
- (set-user-time opts)))))
+ [context :- ::context
+ opts :- [:map {:closed true}
+ [:metabot ::metabot.schema/metabot]
+ [:profile-id {:optional true} [:maybe :keyword]]
+ [:date-format {:optional true} [:maybe (ms/InstanceOfClass DateTimeFormatter)]]]]
+ (metabot.perms/with-cache
+ (-> context
+ enhance-context-with-schema
+ (add-recent-views opts)
+ (set-user-time opts))))
diff --git a/src/metabase/metabot/task/suggested_prompts_generator.clj b/src/metabase/metabot/task/suggested_prompts_generator.clj
index b157c007a4a..ded768536ae 100644
--- a/src/metabase/metabot/task/suggested_prompts_generator.clj
+++ b/src/metabase/metabot/task/suggested_prompts_generator.clj
@@ -31,8 +31,7 @@
(metabot.settings/embedded-metabot-enabled?) (conj metabot.config/embedded-metabot-id)))
(defn- generate-suggested-prompts-for-metabot! [config-id]
- (let [metabot-eid (get-in metabot.config/metabot-config [config-id :entity-id])
- metabot-id (metabot.db/metabot-id-by-entity-id metabot-eid)]
+ (let [metabot-id (metabot.db/metabot-id-by-entity-id config-id)]
(cond
(nil? metabot-id)
(log/warnf "No Metabot instance found for %s. Skipping suggested prompt generation." config-id)
diff --git a/src/metabase/metabot/tools.clj b/src/metabase/metabot/tools.clj
index 7db930392c2..568ec766a3d 100644
--- a/src/metabase/metabot/tools.clj
+++ b/src/metabase/metabot/tools.clj
@@ -147,18 +147,18 @@
the skill registry (`metabase.metabot.skills`) and are surfaced as a manifest
in the system prompt, with full bodies loaded on demand via the `load_skill`
tool."
- [tools memory-atom metabot-id profile-id]
+ [tools memory-atom metabot profile-id]
(reduce-kv
(fn [acc tool-name tool-var]
(let [m (meta tool-var)
base-fn (if (contains? state-dependent-tools tool-name)
(fn [args]
(binding [shared/*memory-atom* memory-atom
- shared/*metabot-id* metabot-id
+ shared/*metabot* metabot
shared/*profile-id* profile-id]
(tool-var args)))
(fn [args]
- (binding [shared/*metabot-id* metabot-id
+ (binding [shared/*metabot* metabot
shared/*profile-id* profile-id]
(tool-var args))))
tool-scope (:scope m)
diff --git a/src/metabase/metabot/tools/entity_details.clj b/src/metabase/metabot/tools/entity_details.clj
index 30cbdd137bf..a76a89a2b41 100644
--- a/src/metabase/metabot/tools/entity_details.clj
+++ b/src/metabase/metabot/tools/entity_details.clj
@@ -8,7 +8,6 @@
[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.db :as metabot.db]
[metabase.metabot.metadata-perms :as metabot.perms]
[metabase.metabot.tools.shared.content-store :as shared.content-store]
@@ -711,12 +710,12 @@
cards))))
(defn answer-sources
- "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.config/normalize-metabot-id metabot-id)]
+ "Get the details of metrics and models in the scope of a Metabot row.
+ Accepts a map with `:metabot` and optional options for field values."
+ [{:keys [metabot] :as options}]
+ (if-let [metabot-id (:id metabot)]
(lib-be/with-metadata-provider-cache
- (let [metrics-and-models (metabot.tools.u/get-metrics-and-models normalized-metabot-id)
+ (let [metrics-and-models (metabot.tools.u/get-metrics-and-models 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)]
@@ -729,8 +728,8 @@
{:structured-output {:result-type :answer-sources
:metrics (vec metrics)
:models (vec models)}}))
- (throw (ex-info (i18n/tru "Invalid metabot_id {0}" metabot-id)
- {:metabot_id metabot-id, :status-code 400}))))
+ (throw (ex-info (i18n/tru "Unknown Metabot.")
+ {:status-code 400}))))
(defn get-table-details
"Get information about the table, question or model with .
diff --git a/src/metabase/metabot/tools/metadata.clj b/src/metabase/metabot/tools/metadata.clj
index d1ae1ee294f..852336817ff 100644
--- a/src/metabase/metabot/tools/metadata.clj
+++ b/src/metabase/metabot/tools/metadata.clj
@@ -149,7 +149,7 @@
"List all data sources (metrics and models) available to the metabot instance."
[_args :- [:map {:closed true}]]
(add-output
- (entity-details-tools/answer-sources {:metabot-id shared/*metabot-id*
+ (entity-details-tools/answer-sources {:metabot shared/*metabot*
:with-field-values? false
:with-measures? true
:with-segments? true})
diff --git a/src/metabase/metabot/tools/search.clj b/src/metabase/metabot/tools/search.clj
index 02d0af04e93..5bd1e12e7ed 100644
--- a/src/metabase/metabot/tools/search.clj
+++ b/src/metabase/metabot/tools/search.clj
@@ -296,7 +296,7 @@
multi-query search is coherent. The result carries the size of the fused, deduped match set as
`:total` metadata."
[{:keys [term-queries semantic-queries database-id created-at last-edited-at
- entity-types limit metabot-id profile-id search-native-query weights
+ entity-types limit metabot profile-id search-native-query weights
created-by archived collection-id offset filters-only?]}]
(log/infof "[METABOT-SEARCH] Starting search with params: %s"
{:term-query-count (count term-queries)
@@ -304,7 +304,7 @@
:database-id database-id
:entity-types entity-types
:limit limit
- :metabot-id metabot-id
+ :metabot-id (:entity_id metabot)
:profile-id profile-id
:search-native-query search-native-query
:weights weights
@@ -317,11 +317,8 @@
(set (distinct (keep metabot.search-models/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 (metabot.db/metabot-by-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.config/embedded-metabot-id)
+ use-verified? (:use_verified_content metabot)
+ embedded-metabot? (= (:entity_id metabot) metabot.config/embedded-metabot-id)
;; A confined metabot (embedded, or the nlq profile) may only search inside its own
;; collection. That is a containment boundary, not a default, so a caller-supplied
;; collection-id — which the v2 search tool fills from a request filter — can never
@@ -595,7 +592,7 @@
(let [results (search (merge {:semantic-queries semantic_queries
:term-queries keyword_queries
:entity-types (or (seq entity_types) (vec allowed-types))
- :metabot-id shared/*metabot-id*
+ :metabot shared/*metabot*
:limit (min max-search-limit
(or limit default-search-limit))}
search-opts))]
diff --git a/src/metabase/metabot/tools/shared.clj b/src/metabase/metabot/tools/shared.clj
index 3cb2309f868..6a40d46d3f0 100644
--- a/src/metabase/metabot/tools/shared.clj
+++ b/src/metabase/metabot/tools/shared.clj
@@ -19,8 +19,8 @@
nil)
#_{:clj-kondo/ignore [:metabase/discourage-dynamic-vars]}
-(def ^:dynamic *metabot-id*
- "The resolved metabot ID for the current agent session. Bound during the agent loop
+(def ^:dynamic *metabot*
+ "The resolved Metabot row for the current agent session. Bound during the agent loop
so that tools can scope queries to the correct metabot instance's collection."
nil)
diff --git a/src/metabase/slackbot/streaming.clj b/src/metabase/slackbot/streaming.clj
index ad4c60b889f..a4924d83a0f 100644
--- a/src/metabase/slackbot/streaming.clj
+++ b/src/metabase/slackbot/streaming.clj
@@ -278,7 +278,8 @@
[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 team-id thread-ts]}]
- (let [message (metabot.envelope/user-message prompt)
+ (let [metabot (metabot.config/resolve-metabot metabot.config/internal-metabot-id)
+ message (metabot.envelope/user-message prompt)
model-ref (metabot.settings/llm-metabot-provider)
ai-proxy? (llm.provider/managed-model-ref? model-ref)
;; Read with `ai-proxy?`, before the loop, so the row's verdict uses the model the turn ran on.
@@ -314,7 +315,7 @@
{:current_time_with_timezone (str (java.time.OffsetDateTime/now))
:capabilities capabilities
:slack_channel_id channel-id}
- {:metabot-id metabot.config/internal-metabot-id
+ {:metabot metabot
:profile-id :slackbot})
messages (conj (vec history) request-message)
parts-atom (atom [])
@@ -360,6 +361,7 @@
(agent/run-agent-loop
{:messages messages
:state baseline-state
+ :metabot metabot
:profile-id :slackbot
:conversation-id conversation-id
:context context
diff --git a/test/metabase/metabot/agent/core_test.clj b/test/metabase/metabot/agent/core_test.clj
index 520953d46cd..36ff88796ea 100644
--- a/test/metabase/metabot/agent/core_test.clj
+++ b/test/metabase/metabot/agent/core_test.clj
@@ -14,6 +14,7 @@
[metabase.metabot.agent.core :as agent]
[metabase.metabot.agent.memory :as memory]
[metabase.metabot.agent.profiles :as profiles]
+ [metabase.metabot.config :as metabot.config]
[metabase.metabot.persistence :as metabot.persistence]
[metabase.metabot.self :as self]
[metabase.metabot.self.claude :as claude]
@@ -42,12 +43,17 @@
(mt/with-dynamic-fn-redefs [ai-tracing.settings/ai-eval-capture (constantly false)]
(thunk))))
+(defn- run-agent-loop
+ [opts]
+ (agent/run-agent-loop (merge {:metabot (metabot.config/resolve-metabot metabot.config/internal-metabot-id)}
+ opts)))
+
(defn- run-agent-loop!
"run-agent-loop for side effects, discarding results.
Runs as admin so the base metabot permission check passes."
[opts]
(mt/as-admin
- (reduce (fn [_ _]) nil (agent/run-agent-loop opts))))
+ (reduce (fn [_ _]) nil (run-agent-loop opts))))
(deftest has-tool-calls-test
(testing "detects tool calls in parts"
@@ -124,7 +130,7 @@
(mt/with-dynamic-fn-redefs [self/call-llm (fn [_model _system _parts tools _tracking-opts _llm-opts]
(reset! captured (set (keys tools)))
(mut/mock-llm-response [{:type :text :text "Hello"}]))]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "Open the SQL editor"}]
:state {}
:profile-id profile-id
@@ -206,7 +212,7 @@
:sql_query "SELECT 1"
:title "Results"}}])
(mut/mock-llm-response [{:type :text :text "Sorry."}])))]
- (let [parts (into [] (agent/run-agent-loop
+ (let [parts (into [] (run-agent-loop
{:messages [{:role :user :content "Query that database"}]
:state {}
:profile-id profile-id
@@ -266,7 +272,7 @@
(mt/with-dynamic-fn-redefs [openrouter/openrouter (fn [_]
(mut/mock-llm-response
[{:type :text :text "Hello"}]))]
- (let [result (into [] (agent/run-agent-loop
+ (let [result (into [] (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :embedding_next
@@ -282,7 +288,7 @@
(reset! captured llm-opts)
(mut/mock-llm-response
[{:type :text :text "Hello"}]))]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :sql
@@ -301,7 +307,7 @@
:arguments {:query "test"}}])
(mut/mock-llm-response
[{:type :text :text "Found results"}]))))]
- (let [result (into [] (agent/run-agent-loop
+ (let [result (into [] (run-agent-loop
{:messages [{:role :user :content "Search for test"}]
:state {}
:profile-id :embedding_next
@@ -325,7 +331,7 @@
{:type :usage :model "m"
:usage {:promptTokens 1 :completionTokens 64 :totalTokens 65}
:finish-reason "length" :raw-finish-reason "max_tokens"}]))]
- (let [result (into [] (agent/run-agent-loop
+ (let [result (into [] (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :embedding_next
@@ -347,7 +353,7 @@
:function "search"
:arguments {:query "test"}}
{:type :error :errorText "Overloaded"}]))]
- (let [result (into [] (agent/run-agent-loop
+ (let [result (into [] (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :embedding_next
@@ -358,7 +364,7 @@
(mt/with-dynamic-fn-redefs [openrouter/openrouter (fn [_]
(throw (ex-info "Mock error" {})))]
(let [result (mt/with-log-level [metabase.metabot.agent.core :fatal]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :embedding_next
@@ -386,8 +392,8 @@
((nth responses (dec n)) n))))
metabot-search/search (constantly [])]
(mt/with-log-level [metabase.metabot.agent.core :warn]
- (->> (agent/run-agent-loop {:messages [{:role :user :content "Hi"}]
- :profile-id :embedding_next})
+ (->> (run-agent-loop {:messages [{:role :user :content "Hi"}]
+ :profile-id :embedding_next})
(into [])
last))))]
(testing "still calling tools at the cap"
@@ -434,7 +440,7 @@
(mt/with-dynamic-fn-redefs [openrouter/openrouter (fn [_]
(mut/mock-llm-response
[{:type :text :text "Test response"}]))]
- (let [result (into [] (agent/run-agent-loop
+ (let [result (into [] (run-agent-loop
{:messages [{:role :user :content "Hello"}]
:state {}
:profile-id :embedding_next
@@ -656,7 +662,7 @@
{:type :finish :finish-reason :stop}]
(mt/with-log-level [metabase.metabot.agent.core :warn]
(into [] (metabot.persistence/combine-text-parts-xf)
- (agent/run-agent-loop
+ (run-agent-loop
{:messages [{:role :user
:content "Show me the first 10 orders"}]
:state {}
@@ -710,7 +716,7 @@
:moderated_status nil
:collection {:id nil :name nil}}])]
(let [result (mt/with-log-level [metabase.metabot.agent.core :fatal]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "Where are the orders?"}]
:state {}
:profile-id :internal
@@ -809,7 +815,7 @@
:function "load_skill"
:arguments {:ids ["read-resource"]}}]))
(mut/mock-llm-response [{:type :text :text "Done."}])))]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "Help me with this dashboard."}]
:state {}
:profile-id :internal
@@ -867,7 +873,7 @@
:database_id (mt/id)}])]
(let [{:keys [trace result]} (mt/with-log-level [metabase.metabot.agent.core :warn]
(ait/capture-reducible
- (agent/run-agent-loop
+ (run-agent-loop
{:messages [{:role :user :content "Show me orders"}]
:state {}
:profile-id :internal
@@ -926,7 +932,7 @@
{:type :usage :usage {:promptTokens 150 :completionTokens 30}
:model "gpt-4" :id "msg-2"}]))))]
(let [result (mt/with-log-level [metabase.metabot.agent.core :warn]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "test"}]
:state {}
:profile-id :embedding_next
@@ -960,7 +966,7 @@
{:type :usage :usage {:promptTokens 200 :completionTokens 40}
:model "model-b" :id "msg-2"}]))))]
(let [result (mt/with-log-level [metabase.metabot.agent.core :warn]
- (into [] (agent/run-agent-loop
+ (into [] (run-agent-loop
{:messages [{:role :user :content "test"}]
:state {}
:profile-id :embedding_next
@@ -993,7 +999,7 @@
{:type :finish :finish-reason :stop}]
(mt/with-log-level [metabase.metabot.self :fatal]
(into [] (metabot.persistence/combine-text-parts-xf)
- (agent/run-agent-loop
+ (run-agent-loop
{:messages [{:role :user :content "Hi"}]
:state {}
:profile-id :embedding_next
@@ -1020,10 +1026,10 @@
self/retry-delay-ms (constantly 0)]
(mt/with-log-level [metabase.metabot :fatal]
(filterv #(= :error (:type %))
- (agent/run-agent-loop {:messages [{:role :user :content "Hi"}]
- :state {}
- :profile-id :embedding_next
- :context {}}))))))
+ (run-agent-loop {:messages [{:role :user :content "Hi"}]
+ :state {}
+ :profile-id :embedding_next
+ :context {}}))))))
throw-credit (fn [_] (throw credit-error))]
(testing "on the customer's own key, the error part says what to fix instead of passing the provider's text on"
(is (=? [{:error {:error-code "ai_provider_billing" :message #"Anthropic rejected the request .*"}}]
diff --git a/test/metabase/metabot/api/metabot_test.clj b/test/metabase/metabot/api/metabot_test.clj
index 16b2cf1a80e..6362020faed 100644
--- a/test/metabase/metabot/api/metabot_test.clj
+++ b/test/metabase/metabot/api/metabot_test.clj
@@ -17,6 +17,15 @@
(set! *warn-on-reflection* true)
+(deftest prompt-suggestions-metabot-id-test
+ (mt/with-temp [:model/Metabot {:keys [id entity_id]} {:name "Prompt sources"}]
+ (doseq [metabot-id [id entity_id]]
+ (is (=? {:prompts [] :total 0}
+ (mt/user-http-request :rasta :get 200
+ (format "metabot/metabot/%s/prompt-suggestions" metabot-id))))))
+ (is (= "Unknown Metabot."
+ (mt/user-http-request :rasta :get 404 "metabot/metabot/nonexistent-entity-id/prompt-suggestions"))))
+
(defmacro with-clean-metabots
"Macro to reset the Metabots table to an empty state before a test and restore it after the test runs."
[& body]
diff --git a/test/metabase/metabot/api_test.clj b/test/metabase/metabot/api_test.clj
index 5d72c0f923c..67824e0d469 100644
--- a/test/metabase/metabot/api_test.clj
+++ b/test/metabase/metabot/api_test.clj
@@ -17,6 +17,7 @@
[metabase.metabot.config :as metabot.config]
[metabase.metabot.context :as metabot.context]
[metabase.metabot.conversation-title :as conversation-title]
+ [metabase.metabot.feedback :as metabot.feedback]
[metabase.metabot.persistence :as metabot.persistence]
[metabase.metabot.scope :as scope]
[metabase.metabot.self :as metabot.self]
@@ -39,6 +40,61 @@
(def ^:private test-provider "openrouter/anthropic/claude-haiku-4-5")
+(deftest agent-streaming-metabot-resolution-test
+ (mt/with-temporary-setting-values [metabot-enabled? true
+ embedded-metabot-enabled? true]
+ (doseq [[request-id entity-id profile-id]
+ [["metabotmetabotmetabot" "metabotmetabotmetabot" :internal]
+ ["embeddedmetabotmetabo" "embeddedmetabotmetabo" :embedding_next]
+ ["b5716059-ad40-4d83-a4e1-673af020b2d8" "metabotmetabotmetabot" :internal]
+ ["c61bf5f5-1025-47b6-9298-bf1827105bb6" "embeddedmetabotmetabo" :embedding_next]
+ [nil "metabotmetabotmetabot" :internal]]]
+ (testing (str "Metabot request id " request-id)
+ (let [received (atom nil)
+ received-context (atom nil)
+ create-context (mt/original-fn #'metabot.context/create-context)]
+ (mt/with-model-cleanup [:model/MetabotMessage
+ [:model/MetabotConversation :created_at]]
+ (mt/with-dynamic-fn-redefs [metabot.context/create-context (fn [ctx opts]
+ (reset! received-context opts)
+ (create-context ctx opts))
+ agent/run-agent-loop (fn [opts]
+ (reset! received opts)
+ [])
+ conversation-title/ensure-title! (constantly {:status :missing})]
+ (mt/user-http-request :rasta :post 202 "metabot/agent-streaming"
+ (cond-> {:message "Hello"
+ :context {}
+ :conversation_id (str (random-uuid))}
+ request-id (assoc :metabot_id request-id)))
+ (is (= (t2/select-one :model/Metabot :entity_id entity-id)
+ (:metabot @received)))
+ (is (= (:metabot @received) (:metabot @received-context)))
+ (is (= profile-id (:profile-id @received))))))))))
+
+(deftest agent-streaming-unknown-metabot-test
+ (let [conversation-id (str (random-uuid))]
+ (is (= "Unknown Metabot."
+ (mt/user-http-request :rasta :post 400 "metabot/agent-streaming"
+ {:metabot_id "nonexistent-entity-id"
+ :message "Hello"
+ :context {}
+ :conversation_id conversation-id})))
+ (is (not (t2/exists? :model/MetabotConversation :id conversation-id)))))
+
+(deftest feedback-metabot-id-test
+ (mt/with-temp [:model/Metabot {:keys [id entity_id]} {:name "Feedback Metabot"}]
+ (mt/with-temporary-setting-values [metabot-enabled? false
+ embedded-metabot-enabled? true]
+ (mt/with-dynamic-fn-redefs [metabot.feedback/persist-feedback! (constantly nil)
+ metabot.feedback/persist-source-feedback! (constantly nil)]
+ (doseq [metabot-id [nil id entity_id]
+ [endpoint feedback] [["feedback" {:positive true}]
+ ["source-feedback" {:positive true :source_id 42 :source_type "table"}]]]
+ (is (nil? (mt/user-http-request :rasta :post 204 (str "metabot/" endpoint)
+ (cond-> (assoc feedback :message_id "test-message")
+ metabot-id (assoc :metabot_id metabot-id))))))))))
+
(deftest native-agent-streaming-test
(mt/with-temporary-setting-values [llm.settings/llm-providers llm.tu/default-connections
metabot.settings/llm-metabot-provider test-provider]
@@ -1373,8 +1429,8 @@
{:type "model" :query native :chart_configs [{:query native}]}]
result)))))
-(deftest streaming-request-passes-metabot-id-test
- (testing "streaming-request passes metabot-id to native-agent-streaming-request"
+(deftest streaming-request-metabot-test
+ (testing "streaming requests include the resolved Metabot"
(let [captured-args (atom nil)
test-metabot-id metabot.config/embedded-metabot-id]
(mt/with-model-cleanup [:model/MetabotMessage
@@ -1400,11 +1456,8 @@
:state {}
:debug false}
{:origin nil :referer nil :user-agent nil :ip-address nil})
- (testing "metabot-id is included in the arguments"
- (is (some? (:metabot-id @captured-args))
- "metabot-id should not be nil")
- (is (= test-metabot-id (:metabot-id @captured-args))
- "metabot-id should match the input metabot_id")))))))
+ (is (= (t2/select-one :model/Metabot :entity_id test-metabot-id)
+ (:metabot @captured-args))))))))
(deftest streaming-request-ip-address-test
(mt/with-model-cleanup [:model/MetabotMessage
diff --git a/test/metabase/metabot/config_test.clj b/test/metabase/metabot/config_test.clj
index dfeec6712cf..b5b289725f5 100644
--- a/test/metabase/metabot/config_test.clj
+++ b/test/metabase/metabot/config_test.clj
@@ -52,8 +52,8 @@
(testing "1-arity checks the specific instance's setting"
(mt/with-temporary-setting-values [metabot-enabled? false embedded-metabot-enabled? true]
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Metabot is not enabled"
- (metabot.config/check-metabot-enabled! metabot.config/internal-metabot-id)))
- (is (metabot.config/check-metabot-enabled! metabot.config/embedded-metabot-id))))
+ (metabot.config/check-metabot-enabled! {:entity_id metabot.config/internal-metabot-id})))
+ (is (metabot.config/check-metabot-enabled! {:entity_id metabot.config/embedded-metabot-id}))))
(testing "global AI disable blocks all Metabot instances"
(mt/with-temporary-raw-setting-values [:ai-features-enabled? "false"
:metabot-enabled? "true"
@@ -61,9 +61,9 @@
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"AI features are not enabled"
(metabot.config/check-metabot-enabled!)))
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"AI features are not enabled"
- (metabot.config/check-metabot-enabled! metabot.config/internal-metabot-id)))
+ (metabot.config/check-metabot-enabled! {:entity_id metabot.config/internal-metabot-id})))
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"AI features are not enabled"
- (metabot.config/check-metabot-enabled! metabot.config/embedded-metabot-id))))))
+ (metabot.config/check-metabot-enabled! {:entity_id metabot.config/embedded-metabot-id}))))))
(deftest integrated-resolution-test
(testing "combination of metabot-id and profile-id precedence resolution"
diff --git a/test/metabase/metabot/context_test.clj b/test/metabase/metabot/context_test.clj
index 08d0c72f893..29b4c8d1df5 100644
--- a/test/metabase/metabot/context_test.clj
+++ b/test/metabase/metabot/context_test.clj
@@ -7,6 +7,7 @@
[metabase.lib.metadata :as lib.metadata]
[metabase.lib.test-metadata :as meta]
[metabase.metabot.agent.user-context :as user-context]
+ [metabase.metabot.config :as metabot.config]
[metabase.metabot.context :as context]
[metabase.metabot.curation :as curation]
[metabase.metabot.table-utils :as table-utils]
@@ -16,6 +17,10 @@
(def ^:private users-native-query (lib/native-query meta/metadata-provider "SELECT * FROM users"))
(def ^:private users-mbql-query (lib/query meta/metadata-provider (meta/table-metadata :users)))
+(defn- create-context
+ [context]
+ (context/create-context context {:metabot (metabot.config/resolve-metabot metabot.config/internal-metabot-id)}))
+
(deftest database-tables-for-context-returns-stubs
(testing "Used tables become lightweight stubs — id/type/name/schema/description only, never columns"
(let [used [{:id 1 :name "used1" :schema "public" :description "first"}
@@ -118,7 +123,7 @@
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Table table-id :selection)
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Dashboard dash-id :view)
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Collection col-id :view)
- (let [recently-viewed (-> (context/create-context {})
+ (let [recently-viewed (-> (create-context {})
:user_recently_viewed)]
(is (= 5 (count recently-viewed)))
;; Assert that collection is excluded even though it was viewed most recently
@@ -134,7 +139,7 @@
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Card card-id :view)
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Table table-id :selection)
(mt/with-temporary-setting-values [metabot-recent-views-enabled? false]
- (let [ctx (context/create-context {})]
+ (let [ctx (create-context {})]
(is (not (contains? ctx :user_recently_viewed))))))))))
(deftest recent-views-disabled-strips-preexisting-test
@@ -173,8 +178,8 @@
:model/Card {um :id} {:type "model" :name "unverified m"}
:model/Dashboard {ud :id} {:name "unverified d"}
:model/Table {table-id :id} {}
- :model/Metabot {metabot-eid :entity_id} {:name "test metabot"
- :use_verified_content true}]
+ :model/Metabot metabot {:name "test metabot"
+ :use_verified_content true}]
(doseq [[id type] [[vq1 "card"] [vq2 "card"] [vm1 "card"] [vm2 "card"] [vd "dashboard"]]]
(moderation/create-review! {:moderated_item_id id
:moderated_item_type type
@@ -205,9 +210,9 @@
ud* (as-pair "dashboard" ud)
table* (as-pair "table" table-id)
keys-of (fn [items] (set (map (juxt :type :id) items)))]
- (testing "no metabot-id passed -> no filtering (even with :content-verification active)"
+ (testing "The default Metabot includes recent views"
(mt/with-premium-features #{:content-verification}
- (let [items (-> (context/create-context {}) :user_recently_viewed)
+ (let [items (-> (create-context {}) :user_recently_viewed)
ks (keys-of items)]
(is (= 5 (count items)))
(is (contains? ks uq*))
@@ -216,7 +221,7 @@
(is (contains? ks table*)))))
(testing "use_verified_content=true -> filters recents to curated content"
(mt/with-premium-features #{:content-verification}
- (let [items (-> (context/create-context {} {:metabot-id metabot-eid})
+ (let [items (-> (context/create-context {} {:metabot metabot})
:user_recently_viewed)
ks (keys-of items)]
(is (not (contains? ks table*)) "a plain table is not curated, so it is filtered out")
@@ -232,26 +237,20 @@
(testing "filtering is gated on the setting, not the :content-verification feature — curated is
precomputed at ingestion, so recents still filter without the feature (matches search)"
(mt/with-premium-features #{}
- (let [items (-> (context/create-context {} {:metabot-id metabot-eid})
+ (let [items (-> (context/create-context {} {:metabot metabot})
:user_recently_viewed)
ks (keys-of items)]
(is (not (contains? ks uq*)))
(is (not (contains? ks um*)))
- (is (not (contains? ks ud*))))))
- (testing "metabot-id that does not resolve -> no filtering"
- (mt/with-premium-features #{:content-verification}
- (let [items (-> (context/create-context {} {:metabot-id "nonexistent-entity-id"})
- :user_recently_viewed)
- ks (keys-of items)]
- (is (contains? ks uq*))))))))))
+ (is (not (contains? ks ud*)))))))))))
(deftest recent-views-most-recent-review-wins-test
(testing "A card that was verified and later un-verified is correctly excluded"
(mt/with-test-user :rasta
(mt/with-premium-features #{:content-verification}
(mt/with-temp [:model/Card {card-id :id} {:type "question" :name "flip-flop"}
- :model/Metabot {metabot-eid :entity_id} {:name "test metabot"
- :use_verified_content true}]
+ :model/Metabot metabot {:name "test metabot"
+ :use_verified_content true}]
;; First verify, then un-verify. create-review! marks older rows as most_recent=false.
(moderation/create-review! {:moderated_item_id card-id
:moderated_item_type "card"
@@ -262,7 +261,7 @@
:moderator_id (mt/user->id :crowberto)
:status nil})
(recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Card card-id :view)
- (let [items (-> (context/create-context {} {:metabot-id metabot-eid})
+ (let [items (-> (context/create-context {} {:metabot metabot})
:user_recently_viewed)
ids (set (map :id items))]
(is (not (contains? ids card-id))
@@ -292,7 +291,7 @@
raw {:user_is_viewing [{:type "adhoc"
:query (lib/query mp (lib.metadata/table mp (mt/id :orders)))}]
:current_time_with_timezone "2025-01-15T12:00:00+02:00"}
- enriched (context/create-context raw)
+ enriched (create-context raw)
uc-vars (user-context/enrich-context-for-template enriched)
viewing (:viewing_context uc-vars)]
(testing "viewing context is non-empty"
diff --git a/test/metabase/metabot/task/suggested_prompts_generator_test.clj b/test/metabase/metabot/task/suggested_prompts_generator_test.clj
index 6bfda35b492..436a24101af 100644
--- a/test/metabase/metabot/task/suggested_prompts_generator_test.clj
+++ b/test/metabase/metabot/task/suggested_prompts_generator_test.clj
@@ -19,8 +19,7 @@
;; seeded separately (see `enabled-builtin-metabots-test`) and would otherwise add prompts.
(mt/with-temporary-setting-values [metabot.settings/embedded-metabot-enabled? false]
(let [original-metabot (t2/select-one :model/Metabot
- :entity_id (get-in metabot.config/metabot-config
- [metabot.config/internal-metabot-id :entity-id]))
+ :entity_id metabot.config/internal-metabot-id)
mp (mt/metadata-provider)
query (-> (lib/query mp (lib.metadata/table mp (mt/id :orders)))
lib.convert/->legacy-MBQL)
@@ -100,8 +99,8 @@
(let [mp (mt/metadata-provider)
query (-> (lib/query mp (lib.metadata/table mp (mt/id :orders)))
lib.convert/->legacy-MBQL)
- internal-id (metabot.config/normalize-metabot-id metabot.config/internal-metabot-id)
- embedded-id (metabot.config/normalize-metabot-id metabot.config/embedded-metabot-id)]
+ internal-id (:id (metabot.config/resolve-metabot metabot.config/internal-metabot-id))
+ embedded-id (:id (metabot.config/resolve-metabot metabot.config/embedded-metabot-id))]
(mt/with-model-cleanup [:model/MetabotPrompt]
(mt/with-temp [:model/Card {card-id :id} {:type :model, :dataset_query query}]
(mt/with-dynamic-fn-redefs [metabot.example-question-generator/generate-example-questions
@@ -121,8 +120,7 @@
(mt/with-temporary-setting-values [metabot.settings/llm-metabot-provider
"metabase/anthropic/claude-sonnet-4-6"]
(let [original-metabot (t2/select-one :model/Metabot
- :entity_id (get-in metabot.config/metabot-config
- [metabot.config/internal-metabot-id :entity-id]))
+ :entity_id metabot.config/internal-metabot-id)
mp (mt/metadata-provider)
query (-> (lib/query mp (lib.metadata/table mp (mt/id :orders)))
lib.convert/->legacy-MBQL)]
diff --git a/test/metabase/metabot/tools/entity_details_test.clj b/test/metabase/metabot/tools/entity_details_test.clj
index 11194e2a451..9999f943ada 100644
--- a/test/metabase/metabot/tools/entity_details_test.clj
+++ b/test/metabase/metabot/tools/entity_details_test.clj
@@ -699,7 +699,7 @@
(mt/with-no-data-perms-for-all-users!
(mt/with-current-user (mt/user->id :rasta)
(let [{:keys [structured-output]} (entity-details/answer-sources
- {:metabot-id (:entity_id metabot)})]
+ {:metabot metabot})]
(is (not (contains? (set (map :id (:models structured-output))) model-id)))))))))
(deftest related-tables-with-fields-capped-test
diff --git a/test/metabase/metabot/tools/search_test.clj b/test/metabase/metabot/tools/search_test.clj
index 006c8d3cd51..ca6050e3f6f 100644
--- a/test/metabase/metabot/tools/search_test.clj
+++ b/test/metabase/metabot/tools/search_test.clj
@@ -3,8 +3,10 @@
[clojure.string :as str]
[clojure.test :refer :all]
[metabase.api.common :as api]
+ [metabase.collections.models.collection :as collection]
[metabase.lib-be.metadata.jvm :as lib-be]
[metabase.lib.core :as lib]
+ [metabase.metabot.config :as metabot.config]
[metabase.metabot.test-util :as test-util]
[metabase.metabot.tools :as metabot.tools]
[metabase.metabot.tools.search :as search]
@@ -772,6 +774,30 @@
:base_table_schema
:base_table_portable_fk])))))))))
+(deftest embedded-metabot-search-test
+ (mt/with-test-user :crowberto
+ (search.tu/with-temp-index-table
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Embedded sources" :authority_level "official"}
+ :model/Collection {elsewhere-id :id} {:name "Other sources" :authority_level "official"}
+ :model/Collection {drafts-id :id} {:name "Embedded drafts"
+ :location (collection/location-path collection-id)}
+ :model/Dashboard {included-id :id} {:name "Embedded report" :collection_id collection-id}
+ :model/Dashboard {draft-id :id} {:name "Embedded report draft" :collection_id drafts-id}
+ :model/Dashboard _ {:name "Embedded report elsewhere" :collection_id elsewhere-id}]
+ (mt/with-temp-vals-in-db :model/Metabot
+ (:id (metabot.config/resolve-metabot metabot.config/embedded-metabot-id))
+ {:collection_id collection-id :use_verified_content true}
+ (doseq [request-id [metabot.config/embedded-metabot-id "c61bf5f5-1025-47b6-9298-bf1827105bb6"]]
+ (let [metabot (metabot.config/resolve-metabot request-id)
+ search-args {:term-queries ["Embedded report"]
+ :entity-types ["dashboard"]
+ :collection-id elsewhere-id
+ :metabot metabot}]
+ (is (= #{included-id draft-id}
+ (into #{} (map :id) (search/search (assoc-in search-args [:metabot :use_verified_content] false)))))
+ (is (= [included-id]
+ (mapv :id (search/search search-args)))))))))))
+
(deftest confined-collection-is-not-overridable-test
(testing "an embedded metabot (and the nlq profile) is confined to its own collection — that is a
containment boundary, not a default. An explicit collection-id, which the v2 search tool
@@ -780,8 +806,8 @@
(mt/with-test-user :crowberto
(mt/with-temp [:model/Collection {confined-id :id} {:name "Bot's collection"}
:model/Collection {elsewhere-id :id} {:name "Somewhere else"}
- :model/Metabot {metabot-eid :entity_id} {:name "confined bot"
- :collection_id confined-id}]
+ :model/Metabot metabot {:name "confined bot"
+ :collection_id confined-id}]
(let [collection-for (fn [search-args]
(let [captured (atom ::unset)]
(mt/with-dynamic-fn-redefs [search-core/ranked-results
@@ -791,7 +817,7 @@
(search/search (merge {:term-queries ["anything"]
:entity-types ["dashboard"]
:profile-id "nlq"
- :metabot-id metabot-eid}
+ :metabot metabot}
search-args)))
@captured))]
(testing "with no collection-id, the metabot's own collection scopes the search"
@@ -799,8 +825,8 @@
(testing "an explicit collection-id elsewhere cannot escape the confinement"
(is (= confined-id (collection-for {:collection-id elsewhere-id}))))
(testing "an unconfined metabot still honours an explicit collection-id"
- (mt/with-temp [:model/Metabot {open-eid :entity_id} {:name "open bot" :collection_id nil}]
- (is (= elsewhere-id (collection-for {:metabot-id open-eid
+ (mt/with-temp [:model/Metabot open-metabot {:name "open bot" :collection_id nil}]
+ (is (= elsewhere-id (collection-for {:metabot open-metabot
:collection-id elsewhere-id}))))))))))
(deftest transform-visibility-is-superuser-only-test
diff --git a/test/metabase/slackbot/streaming_test.clj b/test/metabase/slackbot/streaming_test.clj
index a3ed24f53b0..617dd67c192 100644
--- a/test/metabase/slackbot/streaming_test.clj
+++ b/test/metabase/slackbot/streaming_test.clj
@@ -6,6 +6,7 @@
[metabase.app-db.encryption-test-util :as encryption-tu]
[metabase.channel.slack :as channel.slack]
[metabase.metabot.agent.core :as agent]
+ [metabase.metabot.config :as metabot.config]
[metabase.metabot.persistence :as metabot.persistence]
[metabase.metabot.scope :as metabot.scope]
[metabase.metabot.self :as metabot.self]
@@ -479,6 +480,21 @@
(testing "start-turn! received ai-proxy? = true"
(is (=? [{:ai-proxy? true}] @start-opts)))))))))
+(deftest ^:synchronized slackbot-streaming-internal-metabot-test
+ (tu/with-slackbot-setup
+ (let [event-body tu/base-dm-event]
+ (tu/with-slackbot-mocks
+ {:ai-text "Hello!"}
+ (fn [{:keys [ai-request-calls stop-stream-calls]}]
+ (mt/client :post 200 "metabot/slack/events"
+ (tu/slack-request-options event-body)
+ event-body)
+ (u/poll {:thunk #(pos? (count @stop-stream-calls))
+ :done? true?
+ :timeout-ms 5000})
+ (is (= (t2/select-one :model/Metabot :entity_id metabot.config/internal-metabot-id)
+ (:metabot (last @ai-request-calls)))))))))
+
(deftest ^:synchronized slackbot-streaming-seeds-state-from-db-test
(testing "a turn seeds the agent loop with the state earlier turns in the thread persisted (BOT-522)"
(tu/with-slackbot-setup