Skip to content

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

Move metabot's endpoints into the metabot module (#79563)

Fraser1be7ee6d1b71
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
index 8c275aaf1bf..85da359a005 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatSuggestions.tsx
@@ -1,4 +1,4 @@
-import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";
+import { useGetSuggestedMetabotPromptsQuery } from "metabase/metabot";
import { useMetabotAgent } from "metabase/metabot/hooks";
import { Button, Stack } from "metabase/ui";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
index 4b362725dba..93ceef2e94e 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
@@ -2,12 +2,12 @@ import { useCallback, useEffect, useState } from "react";
import { match } from "ts-pattern";
import { jt, t } from "ttag";
+import { useRefreshTokenStatusMutation } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils";
import {
- useRefreshTokenStatusMutation,
+ useAIProviderConfigurationContext,
useUpdateMetabotSettingsMutation,
-} from "metabase/api";
-import { getErrorMessage } from "metabase/api/utils";
-import { useAIProviderConfigurationContext } from "metabase/metabot";
+} from "metabase/metabot";
import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";
import type { MetabaseAIProviderSetupProps } from "metabase/plugins";
import { useSelector } from "metabase/redux";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
index f7264ff70d6..da0551747e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";
-import { useUpdateMetabotMutation } from "metabase/api";
import { useToast } from "metabase/common/hooks";
+import { useUpdateMetabotMutation } from "metabase/metabot";
import { Stack, Switch } from "metabase/ui";
import type { MetabotInfo } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx
index bed4d282dd8..05d57259ac4 100644
--- a/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx
+++ b/frontend/src/metabase/admin/ai/AIProviderSettingsSection.tsx
@@ -3,11 +3,12 @@ import { P, match } from "ts-pattern";
import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
-import { skipToken, useGetMetabotSettingsQuery } from "metabase/api";
+import { skipToken } from "metabase/api";
import {
AIProviderConfigurationForm,
getProviderOptions,
parseProviderAndModel,
+ useGetMetabotSettingsQuery,
} from "metabase/metabot";
import { PLUGIN_METABOT } from "metabase/plugins";
import { useAdminSetting, useSetting } from "metabase/settings";
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
index aafef3d7cb7..085e510d4a7 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.tsx
@@ -5,12 +5,12 @@ import {
SettingsPageWrapper,
SettingsSection,
} from "metabase/admin/components/SettingsSection";
-import { useListMetabotsQuery } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
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 {
PLUGIN_EMBEDDING_IFRAME_SDK,
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
index e78e1c501e5..6ce46827067 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
@@ -4,16 +4,16 @@ import { match } from "ts-pattern";
import { t } from "ttag";
import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";
-import {
- useDeleteSuggestedMetabotPromptMutation,
- useGetSuggestedMetabotPromptsQuery,
- useRegenerateSuggestedMetabotPromptsMutation,
-} from "metabase/api";
import { ForwardRefLink } from "metabase/common/components/Link";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { Table } from "metabase/common/components/Table";
import { useToast } from "metabase/common/hooks";
import { usePagination } from "metabase/common/hooks/use-pagination";
+import {
+ useDeleteSuggestedMetabotPromptMutation,
+ useGetSuggestedMetabotPromptsQuery,
+ useRegenerateSuggestedMetabotPromptsMutation,
+} from "metabase/metabot";
import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
import {
ActionIcon,
diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
index d3393c66b40..7a5781ac23f 100644
--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
@@ -4,16 +4,13 @@ import { match } from "ts-pattern";
import { c, t } from "ttag";
import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";
-import {
- skipToken,
- useGetCollectionQuery,
- useUpdateMetabotMutation,
-} from "metabase/api";
+import { skipToken, useGetCollectionQuery } from "metabase/api";
import { canonicalCollectionId } from "metabase/common/collections/utils";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";
import { useToast } from "metabase/common/hooks";
import { useGetIcon } from "metabase/hooks/use-icon";
+import { useUpdateMetabotMutation } from "metabase/metabot";
import { FIXED_METABOT_ENTITY_IDS } from "metabase/metabot/constants";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { useAdminSetting } from "metabase/settings";
diff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
index 432ca7c9dd9..d5b06ab6684 100644
--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx
@@ -6,7 +6,6 @@ import * as Yup from "yup";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { BasicAdminSettingInput } from "metabase/admin/settings/components/widgets/AdminSettingInput";
-import { useUpdateMetabotSlackSettingsMutation } from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
@@ -17,6 +16,7 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
+import { useUpdateMetabotSlackSettingsMutation } from "metabase/metabot";
import {
useAdminSetting,
useAdminSettings,
diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.ts
index b7e5967479e..c54e82bccce 100644
--- a/frontend/src/metabase/api/index.ts
+++ b/frontend/src/metabase/api/index.ts
@@ -25,7 +25,6 @@ export * from "./group-table-access-policy";
export * from "./index-manager";
export * from "./llm";
export * from "./measure";
-export * from "./metabot";
export * from "./metric";
export * from "./notification";
export * from "./parameters";
diff --git a/frontend/src/metabase/api/metabot.ts b/frontend/src/metabase/metabot/api.ts
similarity index 97%
rename from frontend/src/metabase/api/metabot.ts
rename to frontend/src/metabase/metabot/api.ts
index 8e45906c3e8..35251475dc3 100644
--- a/frontend/src/metabase/api/metabot.ts
+++ b/frontend/src/metabase/metabot/api.ts
@@ -1,4 +1,5 @@
-import type { MetabotConversationDetail } from "metabase/metabot/utils/normalize-fetched-chat-messages";
+import { Api } from "metabase/api";
+import { idTag, invalidateTags, listTag } from "metabase/api/tags";
import type {
Card,
DeleteSuggestedMetabotPromptRequest,
@@ -23,8 +24,7 @@ import type {
UserMetabotPermissionsResponse,
} from "metabase-types/api";
-import { Api } from "./api";
-import { idTag, invalidateTags, listTag } from "./tags";
+import type { MetabotConversationDetail } from "./utils/normalize-fetched-chat-messages";
export const metabotApi = Api.injectEndpoints({
endpoints: (builder) => ({
@@ -49,6 +49,22 @@ export const metabotApi = Api.injectEndpoints({
}),
providesTags: () => [listTag("metabot-conversations")],
}),
+ getMetabotConversation: builder.query<MetabotConversationDetail, string>({
+ query: (conversationId) => ({
+ method: "GET",
+ url: `/api/metabot/conversations/${conversationId}`,
+ }),
+ }),
+ forkMetabotConversation: builder.mutation<
+ MetabotConversationDetail,
+ ForkMetabotConversationRequest
+ >({
+ query: ({ conversation_id, ...body }) => ({
+ method: "POST",
+ url: `/api/metabot/conversations/${conversation_id}/fork`,
+ body,
+ }),
+ }),
getMetabotConversationTitle: builder.query<
MetabotConversationTitleResponse,
string
@@ -58,12 +74,6 @@ export const metabotApi = Api.injectEndpoints({
url: `/api/metabot/conversations/${conversationId}/title`,
}),
}),
- getMetabotConversation: builder.query<MetabotConversationDetail, string>({
- query: (conversationId) => ({
- method: "GET",
- url: `/api/metabot/conversations/${conversationId}`,
- }),
- }),
getMetabotSettings: builder.query<
MetabotSettingsResponse,
{ provider: MetabotProvider }
@@ -162,16 +172,6 @@ export const metabotApi = Api.injectEndpoints({
}),
invalidatesTags: (_, error) => invalidateTags(error, [listTag("card")]),
}),
- forkMetabotConversation: builder.mutation<
- MetabotConversationDetail,
- ForkMetabotConversationRequest
- >({
- query: ({ conversation_id, ...body }) => ({
- method: "POST",
- url: `/api/metabot/conversations/${conversation_id}/fork`,
- body,
- }),
- }),
submitMetabotFeedback: builder.mutation<void, MetabotFeedback>({
query: (params) => ({
method: "POST",
@@ -213,6 +213,7 @@ export const metabotApi = Api.injectEndpoints({
export const {
useGetMetabotSettingsQuery,
useGetMetabotConversationQuery,
+ useForkMetabotConversationMutation,
useListMetabotConversationsQuery,
useListMetabotsQuery,
useUpdateMetabotSettingsMutation,
@@ -222,7 +223,6 @@ export const {
useRegenerateSuggestedMetabotPromptsMutation,
useLazyMetabotGenerateContentQuery,
useSaveMetabotEntityMutation,
- useForkMetabotConversationMutation,
useSubmitMetabotFeedbackMutation,
useSubmitMetabotSourceFeedbackMutation,
useUpdateMetabotSlackSettingsMutation,
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx
index 96ad78de90b..a8fd08ff271 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderConfigurationForm.tsx
@@ -2,7 +2,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { P, match } from "ts-pattern";
import { t } from "ttag";
-import { useUpdateMetabotSettingsMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";
@@ -28,6 +27,8 @@ import {
} from "metabase/ui";
import type { MetabotProvider } from "metabase-types/api";
+import { useUpdateMetabotSettingsMutation } from "../../api";
+
import { AIProviderConfigurationContext } from "./AIProviderConfigurationContext";
import { ApiKeyProviderFields } from "./ApiKeyProviderFields";
import { AzureProviderFields } from "./AzureProviderFields";
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx
index f7dedd3d3fa..543dcf23c00 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ApiKeyProviderFields.tsx
@@ -1,13 +1,14 @@
import { type ChangeEvent, useEffect, useState } from "react";
import { c, t } from "ttag";
-import { useUpdateMetabotSettingsMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";
import { useAdminSettings } from "metabase/settings";
import { Text, TextInput } from "metabase/ui";
+import { useUpdateMetabotSettingsMutation } from "../../api";
+
import { useAIProviderConfigurationContext } from "./AIProviderConfigurationContext";
import {
ProviderModelPicker,
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx
index fdd6ff49755..388e979a2fa 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AzureProviderFields.tsx
@@ -2,7 +2,6 @@ import { type FormikHelpers, useFormikContext } from "formik";
import { useMemo } from "react";
import { c, t } from "ttag";
-import { useUpdateMetabotSettingsMutation } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";
import {
@@ -13,6 +12,8 @@ import {
} from "metabase/forms";
import { useAdminSettings } from "metabase/settings";
+import { useUpdateMetabotSettingsMutation } from "../../api";
+
import { useAIProviderConfigurationContext } from "./AIProviderConfigurationContext";
import {
AZURE_MODEL_FAMILIES,
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx
index 147a1e981cf..3e50946f795 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/BedrockProviderFields.tsx
@@ -2,7 +2,6 @@ import { type FormikHelpers, useFormikContext } from "formik";
import { useMemo } from "react";
import { t } from "ttag";
-import { useUpdateMetabotSettingsMutation } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";
import { FormErrorMessage, FormProvider, FormTextInput } from "metabase/forms";
@@ -10,6 +9,8 @@ import { useAdminSettings } from "metabase/settings";
import { Text } from "metabase/ui";
import type { BedrockCredentials } from "metabase-types/api";
+import { useUpdateMetabotSettingsMutation } from "../../api";
+
import { useAIProviderConfigurationContext } from "./AIProviderConfigurationContext";
import {
ProviderModelPicker,
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderModelPicker.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderModelPicker.tsx
index 5936244d84d..73e93bf839e 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderModelPicker.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/ProviderModelPicker.tsx
@@ -2,10 +2,6 @@ import { useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
-import {
- useGetMetabotSettingsQuery,
- useUpdateMetabotSettingsMutation,
-} from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { useToast } from "metabase/common/hooks";
import { type ComboboxItem, Select } from "metabase/ui";
@@ -14,6 +10,11 @@ import type {
MetabotSettingsResponse,
} from "metabase-types/api";
+import {
+ useGetMetabotSettingsQuery,
+ useUpdateMetabotSettingsMutation,
+} from "../../api";
+
type MetabotModelOption = ComboboxItem & {
group?: string | null;
};
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index 0b798602d38..e8a791ca60b 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import MetabotFailure from "assets/img/metabot-failure.svg?component";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { metabotApi } from "metabase/api";
import { idTag } from "metabase/api/tags";
import {
useIsFullPageMetabot,
@@ -26,6 +25,7 @@ import {
} from "metabase/ui";
import { trackMetabotChatOpened } from "../analytics";
+import { metabotApi } from "../api";
import { isHistoryEnabledProfile } from "../constants";
import type { MetabotAgentId } from "../state";
diff --git a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
index f27791d5e07..745e0513058 100644
--- a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
@@ -3,7 +3,6 @@ import { useState } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";
import { ForwardRefLink } from "metabase/common/components/Link";
import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";
import { AIProviderConfigurationNotice } from "metabase/metabot/components/AIProviderConfigurationNotice";
@@ -27,6 +26,8 @@ import {
} from "metabase/ui";
import * as Urls from "metabase/urls";
+import { useGetSuggestedMetabotPromptsQuery } from "../../api";
+
import S from "./MetabotGreeting.module.css";
const SUGGESTED_PROMPTS_LIMIT = 4;
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
index 420c3644bcd..f9456b3da43 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
@@ -8,7 +8,6 @@ import {
useGetDatabaseQuery,
useGetFieldTableIdsQuery,
useGetTableQuery,
- useSubmitMetabotSourceFeedbackMutation,
} from "metabase/api";
import type { GeneratedCard } from "metabase/api/ai-streaming/schemas";
import { ForwardRefLink } from "metabase/common/components/Link";
@@ -44,6 +43,8 @@ import type {
TemplateTags,
} from "metabase-types/api";
+import { useSubmitMetabotSourceFeedbackMutation } from "../../api";
+
import S from "./MetabotAgentDataPartMessage.module.css";
type DecodedQuery =
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
index 9bab9b47c3d..cbadb0f6c60 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
@@ -4,13 +4,13 @@ import { type ReactNode, useMemo } from "react";
import { t } from "ttag";
import EmptyDashboardBot from "assets/img/dashboard-empty.svg?component";
-import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";
import { AIProviderConfigurationModal } from "metabase/metabot/components/AIProviderConfigurationModal";
import { AIProviderConfigurationNotice } from "metabase/metabot/components/AIProviderConfigurationNotice";
import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";
import { useSetting } from "metabase/settings";
import { Box, Button, Flex, Paper, Stack, Text } from "metabase/ui";
+import { useGetSuggestedMetabotPromptsQuery } from "../../api";
import { useMetabotAgent, useUserMetabotPermissions } from "../../hooks";
import type { MetabotConfig } from "../Metabot";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index 7a070c66034..a2b1e15afa3 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -5,7 +5,6 @@ import { Fragment, forwardRef, useCallback, useMemo, useState } from "react";
import { match } from "ts-pattern";
import { t } from "ttag";
-import { useSubmitMetabotFeedbackMutation } from "metabase/api/metabot";
import { useToast } from "metabase/common/hooks";
import { MetabotManagedProviderLimitActions } from "metabase/metabot/components/MetabotManagedProviderLimit";
import {
@@ -39,6 +38,7 @@ import {
} from "metabase/ui";
import type { IconName, MetabotFeedback } from "metabase-types/api";
+import { useSubmitMetabotFeedbackMutation } from "../../api";
import { AIMarkdown } from "../AIMarkdown/AIMarkdown";
import { AgentDataPartMessage } from "./MetabotAgentDataPartMessage";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
index 5fd2555f8eb..23d05740e97 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
@@ -2,7 +2,6 @@ import { useState } from "react";
import { match } from "ts-pattern";
import { t } from "ttag";
-import { useListMetabotConversationsQuery } from "metabase/api";
import {
ActionIcon,
Box,
@@ -18,6 +17,7 @@ import {
import { getRelativeTime } from "metabase/utils/time-dayjs";
import type { MetabotConversation } from "metabase-types/api";
+import { useListMetabotConversationsQuery } from "../../api";
import {
type MetabotProfileId,
resolveMetabotProfileId,
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
index f825e5391c0..4e965986d85 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotInlineChart.tsx
@@ -10,7 +10,6 @@ import {
useGetCardQuery,
} from "metabase/api";
import type { GeneratedCard } from "metabase/api/ai-streaming/schemas";
-import { useSaveMetabotEntityMutation } from "metabase/api/metabot";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";
@@ -41,6 +40,8 @@ import {
import Question from "metabase-lib/v1/Question";
import type { DashboardTabId } from "metabase-types/api";
+import { useSaveMetabotEntityMutation } from "../../api";
+
import S from "./MetabotInlineChart.module.css";
/**
diff --git a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx
index 48737bbd54d..53f5f98566f 100644
--- a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.tsx
@@ -2,7 +2,6 @@ import { useEffect } from "react";
import { t } from "ttag";
import { skipToken } from "metabase/api";
-import { useGetMetabotConversationQuery } from "metabase/api/metabot";
import { GenericError } from "metabase/common/components/ErrorPages";
import { MetabotAsk } from "metabase/metabot/components/MetabotAsk";
import {
@@ -20,6 +19,8 @@ import { getSettingsLoading } from "metabase/settings";
import { Center, Loader } from "metabase/ui";
import * as Urls from "metabase/urls";
+import { useGetMetabotConversationQuery } from "../../api";
+
export const IN_PROGRESS_POLL_MS = 2500;
export const MetabotConversationPage = () => {
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
index 1f796a875f6..02c1b94fee9 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
@@ -11,7 +11,6 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
-import { useLazyMetabotGenerateContentQuery } from "metabase/api";
import CS from "metabase/css/core/index.css";
import { MetabotIcon } from "metabase/metabot/components/MetabotIcon";
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
@@ -23,6 +22,8 @@ import { useSetting } from "metabase/settings";
import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";
import type { MetabotGenerateContentRequest } from "metabase-types/api";
+import { useLazyMetabotGenerateContentQuery } from "../../../api";
+
import S from "./MetabotEmbed.module.css";
declare module "@tiptap/core" {
diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
index 1d86bd46409..ce34f50539c 100644
--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.ts
@@ -1,10 +1,11 @@
import { useMemo } from "react";
-import { useGetUserMetabotPermissionsQuery } from "metabase/api";
import { useSelector } from "metabase/redux";
import { canAccessSettings, getUser } from "metabase/selectors/user";
import { useSetting } from "metabase/settings";
+import { useGetUserMetabotPermissionsQuery } from "../api";
+
import { useMetabotEnabledEmbeddingAware } from "./use-metabot-embedding-aware-enabled";
/** Returns granular metabot permission booleans for the current user.
diff --git a/frontend/src/metabase/metabot/index.tsx b/frontend/src/metabase/metabot/index.tsx
index 3c61d78a4d0..6a03a3aca3f 100644
--- a/frontend/src/metabase/metabot/index.tsx
+++ b/frontend/src/metabase/metabot/index.tsx
@@ -1,3 +1,13 @@
+export {
+ useDeleteSuggestedMetabotPromptMutation,
+ useGetMetabotSettingsQuery,
+ useGetSuggestedMetabotPromptsQuery,
+ useListMetabotsQuery,
+ useRegenerateSuggestedMetabotPromptsMutation,
+ useUpdateMetabotMutation,
+ useUpdateMetabotSettingsMutation,
+ useUpdateMetabotSlackSettingsMutation,
+} from "./api";
export * from "./context";
export {
AIProviderConfigurationForm,
diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.ts
index 06e87c22de8..d02c1d0d679 100644
--- a/frontend/src/metabase/metabot/state/actions.ts
+++ b/frontend/src/metabase/metabot/state/actions.ts
@@ -13,7 +13,6 @@ import {
findMatchingInflightAiStreamingRequests,
} from "metabase/api/ai-streaming";
import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";
-import { metabotApi } from "metabase/api/metabot";
import { listTag } from "metabase/api/tags";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { PLUGIN_AUDIT } from "metabase/plugins";
@@ -37,6 +36,7 @@ import type {
MetabotTransformInfo,
} from "metabase-types/api";
+import { metabotApi } from "../api";
import {
METABOT_ERR_MSG,
type MetabotProfileId,