Skip to content

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

Distinguish empty Metabot prompt regeneration from errors (#74406)

Chris Truter0fe9d30bea65
diff --git a/docs/api.json b/docs/api.json
index acfa52f7be1..d399e87ba8f 100644
--- a/docs/api.json
+++ b/docs/api.json
@@ -36403,7 +36403,7 @@
"post" : {
"operationId" : "post-api-metabot-metabot-id-prompt-suggestions-regenerate",
"summary" : "POST /api/metabot/metabot/{id}/prompt-suggestions/regenerate",
- "description" : "Remove any existing prompt suggestions for the Metabot instance with `id` and generate new ones.",
+ "description" : "Remove any existing prompt suggestions for the Metabot with `id` and generate new ones.\n The response `:status` is `:generated` (with a `:prompt_count`) when prompts were created,\n `:no-library-content` when the Metabot has no models or metrics to summarize, or\n `:ai-produced-no-prompts` when generation produced nothing.\n Returns a 402 if the instance has reached its managed-AI usage limit.",
"parameters" : [ {
"in" : "path",
"name" : "id",
@@ -36415,6 +36415,44 @@
} ],
"responses" : {
"2XX" : {
+ "content" : {
+ "application/json" : {
+ "schema" : {
+ "oneOf" : [ {
+ "additionalProperties" : false,
+ "properties" : {
+ "prompt_count" : {
+ "minimum" : 1,
+ "type" : "integer"
+ },
+ "status" : {
+ "const" : "generated"
+ }
+ },
+ "required" : [ "status", "prompt_count" ],
+ "type" : "object"
+ }, {
+ "additionalProperties" : false,
+ "properties" : {
+ "status" : {
+ "const" : "no-library-content"
+ }
+ },
+ "required" : [ "status" ],
+ "type" : "object"
+ }, {
+ "additionalProperties" : false,
+ "properties" : {
+ "status" : {
+ "const" : "ai-produced-no-prompts"
+ }
+ },
+ "required" : [ "status" ],
+ "type" : "object"
+ } ]
+ }
+ }
+ },
"description" : "Successful response"
},
"4XX" : {
diff --git a/frontend/src/metabase-types/api/metabot.ts b/frontend/src/metabase-types/api/metabot.ts
index 4a2d3a9c200..146f658ffd2 100644
--- a/frontend/src/metabase-types/api/metabot.ts
+++ b/frontend/src/metabase-types/api/metabot.ts
@@ -246,6 +246,11 @@ export type DeleteSuggestedMetabotPromptRequest = {
prompt_id: SuggestedMetabotPrompt["id"];
};
+export type RegenerateSuggestedMetabotPromptsResponse =
+ | { status: "generated"; prompt_count: number }
+ | { status: "no-library-content" }
+ | { status: "ai-produced-no-prompts" };
+
export const METABOT_ISSUE_TYPE_VALUES = [
"ui-bug",
"took-incorrect-actions",
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
index 7504d243672..d5fa9fa0842 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
@@ -1,5 +1,6 @@
import { useClipboard } from "@mantine/hooks";
import { useMemo } from "react";
+import { match } from "ts-pattern";
import { t } from "ttag";
import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";
@@ -73,15 +74,27 @@ export const MetabotPromptSuggestionPane = ({
};
const handleRegeneratePrompts = async () => {
- const { error } = await regeneratePrompts(metabot.id);
- if (error) {
- sendToast({
- message: t`Error regenerate prompts`,
- icon: "warning",
- });
- } else {
- setPage(0);
+ const { data, error } = await regeneratePrompts(metabot.id);
+ if (error || !data) {
+ sendToast({ message: t`Error regenerating prompts`, icon: "warning" });
+ return;
}
+ setPage(0);
+ match(data)
+ .with({ status: "generated" }, () => undefined)
+ .with({ status: "no-library-content" }, () => {
+ sendToast({
+ message: t`Add some models or metrics to this Metabot's collection to generate prompts.`,
+ icon: "info",
+ });
+ })
+ .with({ status: "ai-produced-no-prompts" }, () => {
+ sendToast({
+ message: t`Metabot couldn't come up with any prompts. Try again in a moment.`,
+ icon: "info",
+ });
+ })
+ .exhaustive();
};
const prompts = useMemo(() => data?.prompts ?? [], [data?.prompts]);
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
index 1ada057777c..12fd5944bb7 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.unit.spec.tsx
@@ -1,4 +1,5 @@
import _userEvent from "@testing-library/user-event";
+import fetchMock from "fetch-mock";
import { Route } from "react-router";
import {
@@ -8,8 +9,12 @@ import {
setupRemoveMetabotPromptSuggestionEndpoint,
} 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 type { SuggestedMetabotPrompt } from "metabase-types/api";
+import type {
+ RegenerateSuggestedMetabotPromptsResponse,
+ SuggestedMetabotPrompt,
+} from "metabase-types/api";
import { MetabotPromptSuggestionPane } from "./MetabotAdminSuggestedPrompts";
import { mockSuggestedPrompts } from "./test-utils";
@@ -31,10 +36,18 @@ const prevPage = async () =>
const nextPage = async () =>
userEvent.click(await screen.findByLabelText("chevronright icon"));
+const clickRegenerate = async () =>
+ userEvent.click(
+ await screen.findByRole("button", {
+ name: /Regenerate suggested prompts/,
+ }),
+ );
+
type SetupOpts = {
metabotId?: number;
pageSize?: number;
mockInitialPage?: boolean;
+ regenerateBody?: RegenerateSuggestedMetabotPromptsResponse;
};
const setup = async (opts?: SetupOpts) => {
@@ -42,6 +55,7 @@ const setup = async (opts?: SetupOpts) => {
metabotId = FIXED_METABOT_IDS.DEFAULT,
pageSize = 3,
mockInitialPage = true,
+ regenerateBody,
} = opts ?? {};
const paginationContext = {
@@ -58,11 +72,27 @@ const setup = async (opts?: SetupOpts) => {
})
: paginationContext;
+ if (regenerateBody) {
+ setupMetabotPromptSuggestionsEndpoint({
+ metabotId,
+ prompts: defaultMetabotMockedPrompts,
+ paginationContext,
+ });
+ setupRegenerateMetabotPromptSuggestionsEndpoint(
+ metabotId,
+ undefined,
+ regenerateBody,
+ );
+ }
+
const TestComponent = () => (
- <MetabotPromptSuggestionPane
- metabot={{ id: metabotId, collection_id: null }}
- pageSize={pageSize}
- />
+ <>
+ <MetabotPromptSuggestionPane
+ metabot={{ id: metabotId, collection_id: null }}
+ pageSize={pageSize}
+ />
+ <UndoListing />
+ </>
);
renderWithProviders(<Route path="/" component={TestComponent} />, {
@@ -254,4 +284,42 @@ describe("suggested prompts", () => {
expect(await screen.findByText(firstPrompt.prompt)).toBeInTheDocument();
});
+
+ describe("regenerate empty-state toasts", () => {
+ it("shows the no-library-content toast", async () => {
+ await setup({ regenerateBody: { status: "no-library-content" } });
+ await clickRegenerate();
+ expect(
+ await screen.findByText(/Add some models or metrics/),
+ ).toBeInTheDocument();
+ });
+
+ it("shows the ai-produced-no-prompts toast", async () => {
+ await setup({ regenerateBody: { status: "ai-produced-no-prompts" } });
+ await clickRegenerate();
+ expect(
+ await screen.findByText(/Metabot couldn't come up with any prompts/),
+ ).toBeInTheDocument();
+ });
+
+ it("does not show a toast on the happy path", async () => {
+ await setup({
+ regenerateBody: { status: "generated", prompt_count: 3 },
+ });
+ await clickRegenerate();
+ await waitFor(() => {
+ expect(
+ fetchMock.callHistory.called(
+ `path:/api/metabot/metabot/${FIXED_METABOT_IDS.DEFAULT}/prompt-suggestions/regenerate`,
+ ),
+ ).toBe(true);
+ });
+ expect(
+ screen.queryByText(/Add some models or metrics/),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByText(/Metabot couldn't come up with any prompts/),
+ ).not.toBeInTheDocument();
+ });
+ });
});
diff --git a/frontend/src/metabase/api/metabot.ts b/frontend/src/metabase/api/metabot.ts
index e034353a6fd..865fa737e81 100644
--- a/frontend/src/metabase/api/metabot.ts
+++ b/frontend/src/metabase/api/metabot.ts
@@ -9,6 +9,7 @@ import type {
MetabotSettingsResponse,
MetabotSlackSettings,
MetabotSourceFeedback,
+ RegenerateSuggestedMetabotPromptsResponse,
SuggestedMetabotPromptsRequest,
SuggestedMetabotPromptsResponse,
UpdateMetabotSettingsRequest,
@@ -97,7 +98,10 @@ export const metabotApi = Api.injectEndpoints({
idTag("metabot-prompt-suggestions", metabot_id),
]),
}),
- regenerateSuggestedMetabotPrompts: builder.mutation<void, MetabotId>({
+ regenerateSuggestedMetabotPrompts: builder.mutation<
+ RegenerateSuggestedMetabotPromptsResponse,
+ MetabotId
+ >({
query: (metabot_id) => ({
method: "POST",
url: `/api/metabot/metabot/${metabot_id}/prompt-suggestions/regenerate`,
diff --git a/frontend/test/__support__/server-mocks/metabot.ts b/frontend/test/__support__/server-mocks/metabot.ts
index 3304b9a86c9..5b5be8afa7a 100644
--- a/frontend/test/__support__/server-mocks/metabot.ts
+++ b/frontend/test/__support__/server-mocks/metabot.ts
@@ -12,6 +12,7 @@ import type {
MetabotSettingsResponse,
MetabotTenantLimit,
PurchaseCloudAddOnRequest,
+ RegenerateSuggestedMetabotPromptsResponse,
SuggestedMetabotPrompt,
SuggestedMetabotPromptsResponse,
UpdateMetabotSettingsRequest,
@@ -106,10 +107,14 @@ export function setupRemoveMetabotPromptSuggestionEndpoint(
export function setupRegenerateMetabotPromptSuggestionsEndpoint(
metabotId: MetabotId,
options?: UserRouteConfig,
+ body: RegenerateSuggestedMetabotPromptsResponse = {
+ status: "generated",
+ prompt_count: 1,
+ },
) {
fetchMock.post(
`path:/api/metabot/metabot/${metabotId}/prompt-suggestions/regenerate`,
- { status: 204 },
+ { status: 200, body },
options,
);
}
diff --git a/resources/openapi/openapi.json b/resources/openapi/openapi.json
index e5d94f117ae..881fde9953b 100644
--- a/resources/openapi/openapi.json
+++ b/resources/openapi/openapi.json
@@ -36112,7 +36112,7 @@
},
"/api/metabot/metabot/{id}/prompt-suggestions/regenerate" : {
"post" : {
- "description" : "Remove any existing prompt suggestions for the Metabot instance with `id` and generate new ones.",
+ "description" : "Remove any existing prompt suggestions for the Metabot with `id` and generate new ones.\n The response `:status` is `:generated` (with a `:prompt_count`) when prompts were created,\n `:no-library-content` when the Metabot has no models or metrics to summarize, or\n `:ai-produced-no-prompts` when generation produced nothing.\n Returns a 402 if the instance has reached its managed-AI usage limit.",
"operationId" : "post-api-metabot-metabot-id-prompt-suggestions-regenerate",
"parameters" : [ {
"in" : "path",
@@ -36125,6 +36125,44 @@
} ],
"responses" : {
"2XX" : {
+ "content" : {
+ "application/json" : {
+ "schema" : {
+ "oneOf" : [ {
+ "additionalProperties" : false,
+ "properties" : {
+ "prompt_count" : {
+ "minimum" : 1,
+ "type" : "integer"
+ },
+ "status" : {
+ "const" : "generated"
+ }
+ },
+ "required" : [ "status", "prompt_count" ],
+ "type" : "object"
+ }, {
+ "additionalProperties" : false,
+ "properties" : {
+ "status" : {
+ "const" : "no-library-content"
+ }
+ },
+ "required" : [ "status" ],
+ "type" : "object"
+ }, {
+ "additionalProperties" : false,
+ "properties" : {
+ "status" : {
+ "const" : "ai-produced-no-prompts"
+ }
+ },
+ "required" : [ "status" ],
+ "type" : "object"
+ } ]
+ }
+ }
+ },
"description" : "Successful response"
},
"4XX" : {
diff --git a/src/metabase/metabot/api/metabot.clj b/src/metabase/metabot/api/metabot.clj
index 3f9d536c562..2fc6b1a665d 100644
--- a/src/metabase/metabot/api/metabot.clj
+++ b/src/metabase/metabot/api/metabot.clj
@@ -57,24 +57,40 @@
(when (not= old-vals metabot-updates)
(t2/update! :model/Metabot id metabot-updates)
(when-not (metabot.usage/managed-free-limit-reached?)
- (metabot.suggested-prompts/delete-all-metabot-prompts id)
- (metabot.suggested-prompts/generate-sample-prompts id)))
+ ;; Delete + regenerate atomically so a raced managed-AI lock (the 402 swallowed below) or
+ ;; any other failure rolls back the delete instead of leaving the Metabot with zero
+ ;; prompts. The 402 still triggers the rollback because it escapes the transaction body
+ ;; before we catch it. Swallowing it keeps a settings-only PUT from failing on a race.
+ (try
+ (t2/with-transaction [_conn]
+ (metabot.suggested-prompts/delete-all-metabot-prompts id)
+ (metabot.suggested-prompts/generate-sample-prompts id))
+ (catch clojure.lang.ExceptionInfo e
+ (when-not (= "metabase_ai_managed_locked" (:error-code (ex-data e)))
+ (throw e))))))
(t2/select-one :model/Metabot :id id))))
-;; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to
-;; use our API + we will need it when we make auto-TypeScript-signature generation happen
-;;
-#_{:clj-kondo/ignore [:metabase/validate-defendpoint-has-response-schema]}
(api.macros/defendpoint :post "/:id/prompt-suggestions/regenerate"
- "Remove any existing prompt suggestions for the Metabot instance with `id` and generate new ones."
+ :- [:multi {:dispatch :status}
+ [:generated [:map {:closed true}
+ [:status [:= :generated]]
+ ;; `:generated` is only returned when total > 0 — see
+ ;; [[metabot.suggested-prompts/generate-sample-prompts]].
+ [:prompt_count pos-int?]]]
+ [:no-library-content [:map {:closed true} [:status [:= :no-library-content]]]]
+ [:ai-produced-no-prompts [:map {:closed true} [:status [:= :ai-produced-no-prompts]]]]]
+ "Remove any existing prompt suggestions for the Metabot with `id` and generate new ones.
+ The response `:status` is `:generated` (with a `:prompt_count`) when prompts were created,
+ `:no-library-content` when the Metabot has no models or metrics to summarize, or
+ `:ai-produced-no-prompts` when generation produced nothing.
+ Returns a 402 if the instance has reached its managed-AI usage limit."
[{:keys [id]} :- [:map [:id pos-int?]]]
(api/check-superuser)
(t2/with-transaction [_conn]
(api/check-404 (t2/exists? :model/Metabot :id id))
(metabot.usage/check-metabase-managed-free-limit!)
(metabot.suggested-prompts/delete-all-metabot-prompts id)
- (metabot.suggested-prompts/generate-sample-prompts id))
- api/generic-204-no-content)
+ (metabot.suggested-prompts/generate-sample-prompts id)))
;; TODO (Cam 10/28/25) -- fix this endpoint so it uses kebab-case for query parameters for consistency with the rest
;; of the REST API
diff --git a/src/metabase/metabot/suggested_prompts.clj b/src/metabase/metabot/suggested_prompts.clj
index bad6b1e51e0..a3f2d1554ec 100644
--- a/src/metabase/metabot/suggested_prompts.clj
+++ b/src/metabase/metabot/suggested_prompts.clj
@@ -47,40 +47,56 @@
result))
(defn generate-sample-prompts
- "Generate suggested prompts for instance of Metabot."
+ "Generate suggested prompts for the Metabot with `metabot-id`. Returns one of:
+
+ {:status :generated :prompt_count N} ; happy path
+ {:status :no-library-content} ; metabot has no models/metrics to summarize
+ {:status :ai-produced-no-prompts} ; LLM returned 0 questions for the inputs
+
+ Throws a 402 via [[metabot.usage/check-metabase-managed-free-limit!]] when the managed AI cap is hit.
+ Best-effort callers (e.g. PUT /:id) pre-guard with [[metabot.usage/managed-free-limit-reached?]]
+ and catch the 402 to handle the rare TOCTOU race where the limit flips between the two checks."
[metabot-id & {:as opts}]
- (if (metabot.usage/managed-free-limit-reached?)
- (log/info "Skipping suggested prompt generation because the managed AI free limit has been reached."
- {:metabot-id metabot-id})
- (let [opts (merge default-opts opts)]
- (lib-be/with-metadata-provider-cache
- (let [{metrics :metric models :model} (->> (metabot.tools.u/get-metrics-and-models metabot-id opts)
- (sort-by :view_count >)
- (group-by :type))
- ;; Limit to 5 metrics and 5 models
- limited-cards (concat (take 5 metrics) (take 5 models))
- {metrics :metric, models :model}
- (->> (for [[[card-type database-id] group-cards] (group-by (juxt :type :database_id) limited-cards)
- detail (map (fn [detail card] (assoc detail ::origin card))
- (metabot.tools.entity-details/cards-details card-type database-id group-cards nil)
- group-cards)]
- detail)
- (group-by :type))
- metric-inputs (map metric-input metrics)
- model-inputs (map model-input models)
- {:keys [table_questions metric_questions]}
- (generate-questions-with-fallback {:metrics metric-inputs, :tables model-inputs})
- ->prompt (fn [{:keys [questions]} {::keys [origin]}]
- (let [base {:metabot_id metabot-id
- :model (:type origin)
- :card_id (:id origin)}]
- (map #(assoc base :prompt %) questions)))
- metric-prompts (mapcat ->prompt metric_questions metrics)
- model-prompts (mapcat ->prompt table_questions models)]
- (when (seq metric-prompts)
- (t2/insert! :model/MetabotPrompt metric-prompts))
- (when (seq model-prompts)
- (t2/insert! :model/MetabotPrompt model-prompts)))))))
+ (metabot.usage/check-metabase-managed-free-limit!)
+ (let [opts (merge default-opts opts)]
+ (lib-be/with-metadata-provider-cache
+ (let [{metrics :metric models :model} (->> (metabot.tools.u/get-metrics-and-models metabot-id opts)
+ (sort-by :view_count >)
+ (group-by :type))
+ ;; Limit to 5 metrics and 5 models
+ limited-cards (concat (take 5 metrics) (take 5 models))
+ {metrics :metric, models :model}
+ (->> (for [[[card-type database-id] group-cards] (group-by (juxt :type :database_id) limited-cards)
+ detail (map (fn [detail card] (assoc detail ::origin card))
+ (metabot.tools.entity-details/cards-details card-type database-id group-cards nil)
+ group-cards)]
+ detail)
+ (group-by :type))
+ metric-inputs (map metric-input metrics)
+ model-inputs (map model-input models)]
+ (if (and (empty? metric-inputs) (empty? model-inputs))
+ (do
+ (log/info "Skipping suggested prompt generation: metabot has no models or metrics to summarize."
+ {:metabot-id metabot-id})
+ {:status :no-library-content})
+ (let [{:keys [table_questions metric_questions]}
+ (generate-questions-with-fallback {:metrics metric-inputs, :tables model-inputs})
+ ->prompt (fn [{:keys [questions]} {::keys [origin]}]
+ (let [base {:metabot_id metabot-id
+ :model (:type origin)
+ :card_id (:id origin)}]
+ (map #(assoc base :prompt %) questions)))
+ ;; Realize into vectors so we don't redo `->prompt` work when counting and inserting.
+ metric-prompts (vec (mapcat ->prompt metric_questions metrics))
+ model-prompts (vec (mapcat ->prompt table_questions models))
+ total (+ (count metric-prompts) (count model-prompts))]
+ (when (seq metric-prompts)
+ (t2/insert! :model/MetabotPrompt metric-prompts))
+ (when (seq model-prompts)
+ (t2/insert! :model/MetabotPrompt model-prompts))
+ (if (zero? total)
+ {:status :ai-produced-no-prompts}
+ {:status :generated :prompt_count total})))))))
(defn delete-all-metabot-prompts
"Drop suggested prompts for instance of Metabot."
diff --git a/src/metabase/metabot/task/suggested_prompts_generator.clj b/src/metabase/metabot/task/suggested_prompts_generator.clj
index db7944c0fe2..dbb1596273d 100644
--- a/src/metabase/metabot/task/suggested_prompts_generator.clj
+++ b/src/metabase/metabot/task/suggested_prompts_generator.clj
@@ -5,6 +5,7 @@
[clojurewerkz.quartzite.triggers :as triggers]
[metabase.metabot.config :as metabot.config]
[metabase.metabot.suggested-prompts :as metabot.suggested-prompts]
+ [metabase.metabot.usage :as metabot.usage]
[metabase.request.core :as request]
[metabase.task.core :as task]
[metabase.util.log :as log]
@@ -21,8 +22,16 @@
(defn- maybe-generate-suggested-prompts! []
(try
- (if-not (metabot.config/any-metabot-enabled?)
+ (cond
+ (not (metabot.config/any-metabot-enabled?))
(log/info "Metabot is disabled. Skipping suggested prompt generation.")
+
+ ;; Pre-check so a locked managed-AI instance logs a clean info-level skip instead of bubbling
+ ;; the 402 from `generate-sample-prompts` up into the catch as a noisy startup error.
+ (metabot.usage/managed-free-limit-reached?)
+ (log/info "Managed AI free limit reached. Skipping suggested prompt generation.")
+
+ :else
;; Run as admin since this is a system task generating prompts for all content in scope.
;; Users will only see prompts for content they have access to (filtered at query time).
(request/as-admin
diff --git a/test/metabase/metabot/api/metabot_test.clj b/test/metabase/metabot/api/metabot_test.clj
index 337caa436d1..adcaaa99ce1 100644
--- a/test/metabase/metabot/api/metabot_test.clj
+++ b/test/metabase/metabot/api/metabot_test.clj
@@ -8,6 +8,7 @@
[metabase.metabot.example-question-generator :as metabot.example-question-generator]
[metabase.metabot.settings :as metabot.settings]
[metabase.metabot.suggested-prompts :as metabot.suggested-prompts]
+ [metabase.metabot.usage :as metabot.usage]
[metabase.permissions.core :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.premium-features.core :as premium-features]
@@ -67,18 +68,26 @@
:tables :table_questions})))]
;; --------------------------- Generating sample prompts ---------------------------
(testing "should generate prompt suggestions for metabot"
- (with-redefs [metabot.example-question-generator/generate-example-questions prompt-generator]
- ;; Trigger prompt generation by calling the regenerate endpoint
- (mt/user-http-request :crowberto :post 204
- (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))
- (let [added-prompts (t2/select [:model/MetabotPrompt [:card.name :model_name] :prompt]
+ (let [response (with-redefs [metabot.example-question-generator/generate-example-questions
+ prompt-generator]
+ ;; Trigger prompt generation by calling the regenerate endpoint
+ (mt/user-http-request
+ :crowberto :post 200
+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))
+ added-prompts (t2/select [:model/MetabotPrompt [:card.name :model_name] :prompt]
:metabot_id metabot-id
{:join [[:report_card :card] [:= :card.id :card_id]]
:order-by [:metabot_prompt.id]})]
+ (is (=? {:status "generated"
+ :prompt_count (reduce + (map count (vals prompts)))}
+ response))
;; Verify prompts were added to the database
(is (= prompts
(-> (group-by :model_name added-prompts)
- (update-vals #(map :prompt %)))))))
+ (update-vals #(map :prompt %)))))
+ ;; And that :prompt_count in the response matches the actual DB row count, not
+ ;; just the count the mock declared it would generate.
+ (is (= (:prompt_count response) (count added-prompts)))))
;; --------------------------- Querying sample prompts ---------------------------
(let [expected-prompts (into #{} (mapcat val) prompts)
all-prompts (mt/user-http-request :rasta :get 200
@@ -143,7 +152,8 @@
(is (= remaining-prompt-ids (current-prompt-ids))))
(testing "admin users are allowed"
(with-redefs [metabot.example-question-generator/generate-example-questions prompt-generator]
- (mt/user-http-request :crowberto :post 204 url)))))
+ (is (=? {:status "generated" :prompt_count pos-int?}
+ (mt/user-http-request :crowberto :post 200 url)))))))
(let [new-prompt-ids (current-prompt-ids)]
(is (= (count all-prompt-ids) (count new-prompt-ids)))
(is (empty? (set/intersection all-prompt-ids new-prompt-ids)))
@@ -290,6 +300,49 @@
(is (= #{prompt-id}
(t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id))))))))))
+(deftest metabot-put-swallows-managed-locked-toctou-from-generate-sample-prompts-test
+ (testing "if the managed-AI lock flips between the pre-check and `generate-sample-prompts`,
+ the PUT still succeeds (best-effort regeneration) — the 402 is swallowed, and the
+ delete is rolled back with it so existing prompts are preserved."
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Collection"}
+ :model/Metabot {metabot-id :id} {:name "Test Metabot"
+ :collection_id collection-id}
+ :model/Card {card-id :id} {:name "Test Model Card" :type :model}
+ :model/MetabotPrompt {prompt-id :id} {:metabot_id metabot-id
+ :prompt "existing prompt"
+ :model :model
+ :card_id card-id}]
+ (mt/with-dynamic-fn-redefs [metabot.usage/managed-free-limit-reached? (constantly false)
+ metabot.suggested-prompts/generate-sample-prompts
+ (fn [& _]
+ (throw (ex-info "locked" {:status-code 402
+ :error-code "metabase_ai_managed_locked"})))]
+ (let [response (mt/user-http-request :crowberto :put 200
+ (format "metabot/metabot/%d" metabot-id)
+ {:collection_id nil})]
+ (is (nil? (:collection_id response)))
+ (is (= #{prompt-id}
+ (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)))))))
+ (testing "non-locked ex-info from generate-sample-prompts still propagates, and the delete is
+ rolled back so existing prompts survive"
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Collection"}
+ :model/Metabot {metabot-id :id} {:name "Test Metabot"
+ :collection_id collection-id}
+ :model/Card {card-id :id} {:name "Test Model Card" :type :model}
+ :model/MetabotPrompt {prompt-id :id} {:metabot_id metabot-id
+ :prompt "existing prompt"
+ :model :model
+ :card_id card-id}]
+ (mt/with-dynamic-fn-redefs [metabot.usage/managed-free-limit-reached? (constantly false)
+ metabot.suggested-prompts/generate-sample-prompts
+ (fn [& _]
+ (throw (ex-info "boom" {:status-code 500})))]
+ (mt/user-http-request :crowberto :put 500
+ (format "metabot/metabot/%d" metabot-id)
+ {:collection_id nil})
+ (is (= #{prompt-id}
+ (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)))))))
+
(deftest metabot-prompt-regenerate-returns-free-trial-limit-error-when-managed-provider-is-locked-test
(mt/dataset test-data
(let [model-query {:type :query, :database (mt/id), :query {:source-table (mt/id :products)}}]
@@ -319,6 +372,39 @@
(is (= #{prompt-id}
(t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)))))))))
+(deftest metabot-prompt-regenerate-empty-states-test
+ (testing "POST /prompt-suggestions/regenerate returns a structured outcome so the UI can"
+ (testing "distinguish a metabot whose library has no models or metrics from a real error"
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Empty Library"}
+ :model/Metabot {metabot-id :id} {:name "Empty metabot"
+ :collection_id collection-id}]
+ ;; No cards in the collection — the LLM should never be called.
+ (mt/with-dynamic-fn-redefs [metabot.example-question-generator/generate-example-questions
+ (fn [& _] (throw (ex-info "LLM should not be called for an empty library" {})))]
+ (is (= {:status "no-library-content"}
+ (mt/user-http-request :crowberto :post 200
+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))))))
+ (testing "distinguish 'LLM produced nothing' from 'LLM errored'"
+ (mt/dataset test-data
+ (let [model-query {:type :query :database (mt/id) :query {:source-table (mt/id :products)}}]
+ (mt/with-temp [:model/Collection {collection-id :id} {:name "Library with a model"}
+ :model/Card {card-id :id} {:name "Products model"
+ :type :model
+ :dataset_query model-query
+ :collection_id collection-id}
+ :model/Metabot {metabot-id :id} {:name "Productive metabot"
+ :collection_id collection-id}]
+ (mt/with-dynamic-fn-redefs [metabot.example-question-generator/generate-example-questions
+ (constantly {:table_questions [{:questions []}]
+ :metric_questions []})]
+ (is (= {:status "ai-produced-no-prompts"}
+ (mt/user-http-request :crowberto :post 200
+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id))))
+ (is (empty? (t2/select :model/MetabotPrompt :metabot_id metabot-id))
+ "no prompts should be persisted when the LLM returned none")
+ ;; Reference the bound card so kondo doesn't flag it as unused.
+ (is (pos-int? card-id)))))))))
+
(deftest metabot-prompt-regeneration-on-config-change-test
(mt/dataset test-data
(testing "PUT /api/metabot/metabot/:id should regenerate prompts when config changes"
diff --git a/test/metabase/metabot/native_generation_integration_test.clj b/test/metabase/metabot/native_generation_integration_test.clj
index ba1c79d7d57..25b31b323c7 100644
--- a/test/metabase/metabot/native_generation_integration_test.clj
+++ b/test/metabase/metabot/native_generation_integration_test.clj
@@ -47,8 +47,9 @@
native-mock (make-native-prompt-generator prompts-by-name)]
(testing "regenerate endpoint works with native path"
(with-redefs [native-generator/generate-example-questions native-mock]
- (mt/user-http-request :crowberto :post 204
- (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))
+ (is (=? {:status "generated" :prompt_count 10}
+ (mt/user-http-request :crowberto :post 200
+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))))
(let [prompts (t2/select [:model/MetabotPrompt :prompt :model [:card.name :model_name]]
:metabot_id metabot-id
{:join [[:report_card :card] [:= :card.id :card_id]]
@@ -61,8 +62,9 @@
(testing "native path prompts are replaced on re-regenerate"
(let [old-ids (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)]
(with-redefs [native-generator/generate-example-questions native-mock]
- (mt/user-http-request :crowberto :post 204
- (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))
+ (is (=? {:status "generated" :prompt_count 10}
+ (mt/user-http-request :crowberto :post 200
+ (format "metabot/metabot/%d/prompt-suggestions/regenerate" metabot-id)))))
(let [new-ids (t2/select-pks-set :model/MetabotPrompt :metabot_id metabot-id)]
(is (= 10 (count new-ids)))
(is (empty? (set/intersection old-ids new-ids)))))))))))