From 623e5bcd346c5251fdb62b55f9f2ef857e992c3a Mon Sep 17 00:00:00 2001 From: Arnaud Date: Mon, 20 Jul 2026 21:14:04 +0200 Subject: [PATCH] feat: chatbot model setting + tool-calling toggle, simplify admin AI config (v0.59.0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chatbot (general assistant + per-recipe Q&A) now resolves its default model from its own site setting (DEFAULT_CHAT_PROVIDER/MODEL) instead of sharing the generic "text" use case with recipe generation, so admins can point it at a different model. Added AI_TOOL_CALLING_ENABLED: turns off the chatbot's createRecipe/ addToShoppingList tools (and the forced-retry pass) for models that don't reliably support tool calling — it falls back to plain text answers. Simplified the admin AI Configuration page: it showed provider keys and routing settings twice (a read-only card, then an identical edit form). Merged into one editable section; the resolved fallback provider is now a one-line note instead of its own card. Co-Authored-By: Claude Sonnet 5 --- CHANGELOG.md | 9 ++ apps/web/app/admin/ai-config/page.tsx | 105 +++--------------- apps/web/app/api/v1/admin/settings/route.ts | 3 + apps/web/app/api/v1/ai/cooking-chat/route.ts | 35 ++++-- apps/web/app/api/v1/ai/recipe-chat/route.ts | 2 +- .../admin/admin-default-model-form.tsx | 45 ++++++-- apps/web/lib/ai/resolve-user-key.ts | 3 +- apps/web/lib/changelog.ts | 13 ++- apps/web/lib/openapi.ts | 5 +- apps/web/lib/site-settings.ts | 13 +++ 10 files changed, 120 insertions(+), 113 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2fd81b..a168c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to Epicure are documented here. This file is mirrored in-app at `/changelog` (and in the admin dashboard) via `apps/web/lib/changelog.ts` — update both together. +## 0.59.0 — 2026-07-20 21:15 + +### Added +- Admin: chatbot now has its own default-model setting, separate from generic text generation — the general assistant and per-recipe Q&A chat can be pointed at a different model than recipe generation. +- Admin: tool calling (the chatbot's inline recipe/shopping-list drafting) can be toggled off — useful for a local/Ollama model that doesn't reliably support it, so the bot falls back to plain text answers instead. + +### Fixed +- Simplified the admin AI Configuration page — it showed the same provider keys and routing settings twice (once read-only, once as an edit form). Merged into one section. + ## 0.58.0 — 2026-07-20 21:00 ### Fixed diff --git a/apps/web/app/admin/ai-config/page.tsx b/apps/web/app/admin/ai-config/page.tsx index 570b9e4..efeafc8 100644 --- a/apps/web/app/admin/ai-config/page.tsx +++ b/apps/web/app/admin/ai-config/page.tsx @@ -1,25 +1,16 @@ import type { Metadata } from "next"; import { Badge } from "@/components/ui/badge"; -import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; -import { CheckCircle, XCircle, Database, Cpu } from "lucide-react"; import { getAllSiteSettings } from "@/lib/site-settings"; import { AdminSettingsForm } from "@/components/admin/admin-settings-form"; import { AdminDefaultModelForm } from "@/components/admin/admin-default-model-form"; export const metadata: Metadata = {}; -const SETTING_GROUPS = [ - { - title: "AI Provider Keys", - description: "Override the environment variable API keys at runtime. Values are encrypted at rest.", - keys: ["OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENROUTER_API_KEY"] as const, - }, - { - title: "AI Configuration", - description: "Provider routing and model defaults.", - keys: ["OPENROUTER_DEFAULT_MODEL", "OLLAMA_BASE_URL"] as const, - }, -]; +const SETTING_GROUP = { + title: "Provider Keys & Routing", + description: "Override the environment variable API keys at runtime (encrypted at rest), and set the OpenRouter/Ollama routing defaults. DB values here take precedence over environment variables — clear a value to fall back to the env var.", + keys: ["OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENROUTER_API_KEY", "OPENROUTER_DEFAULT_MODEL", "OLLAMA_BASE_URL"] as const, +}; function resolveProvider(settings: Record) { if (settings["OPENROUTER_API_KEY"]?.value) return { provider: "OpenRouter", description: "Routes to many models via openrouter.ai" }; @@ -33,100 +24,34 @@ export default async function AdminAiConfigPage() { const settings = await getAllSiteSettings(); const active = resolveProvider(settings); - const keyRows = [ - { key: "OPENROUTER_API_KEY", label: "OPENROUTER_API_KEY" }, - { key: "OPENAI_API_KEY", label: "OPENAI_API_KEY" }, - { key: "ANTHROPIC_API_KEY", label: "ANTHROPIC_API_KEY" }, - ]; - return (

AI Configuration

- Provider keys, routing, and default models for AI generation. DB values here take precedence over environment variables — clear a value to fall back to the env var. + Provider keys, routing, and default models for AI generation.

+
+ Fallback provider (no default set below): + {active.provider} + — {active.description} +
- - - Active Provider (fallback, no default set below) - - -
- {active.provider} - {active.description} -
-

- Priority: OpenRouter → OpenAI → Anthropic → Ollama (first configured key wins) — only when a user has no personal preference, no BYOK key, and no default is set for that use case below. -

- - - - - - API Keys - - - {keyRows.map(({ key, label }) => { - const meta = settings[key]; - const present = !!meta?.value; - return ( -
-
- {present ? ( - - ) : ( - - )} - {label} -
-
- {present && meta?.fromDb && ( - - DB override - - )} - {present && !meta?.fromDb && ( - - from .env - - )} - - {present ? "Configured" : "Not set"} - -
-
- ); - })} -
- OLLAMA_BASE_URL - - {settings["OLLAMA_BASE_URL"]?.value || "http://localhost:11434 (default)"} - -
-
- OPENROUTER_DEFAULT_MODEL - - {settings["OPENROUTER_DEFAULT_MODEL"]?.value || "google/gemini-flash-1.5 (default)"} - -
- - - - {SETTING_GROUPS.map((group) => ( - - ))} +
); diff --git a/apps/web/app/api/v1/admin/settings/route.ts b/apps/web/app/api/v1/admin/settings/route.ts index f54597e..c5b52f2 100644 --- a/apps/web/app/api/v1/admin/settings/route.ts +++ b/apps/web/app/api/v1/admin/settings/route.ts @@ -20,6 +20,9 @@ const ALLOWED_KEYS: SiteSettingKey[] = [ "DEFAULT_VISION_MODEL", "DEFAULT_MEAL_PLAN_PROVIDER", "DEFAULT_MEAL_PLAN_MODEL", + "DEFAULT_CHAT_PROVIDER", + "DEFAULT_CHAT_MODEL", + "AI_TOOL_CALLING_ENABLED", "GITEA_URL", "GITEA_TOKEN", "GITEA_REPO", diff --git a/apps/web/app/api/v1/ai/cooking-chat/route.ts b/apps/web/app/api/v1/ai/cooking-chat/route.ts index 1598deb..626b622 100644 --- a/apps/web/app/api/v1/ai/cooking-chat/route.ts +++ b/apps/web/app/api/v1/ai/cooking-chat/route.ts @@ -7,6 +7,7 @@ import { applyRateLimit } from "@/lib/rate-limit"; import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error"; import { getModelConfigForUseCase } from "@/lib/ai/resolve-user-key"; import { resolveModel } from "@/lib/ai/factory"; +import { isAiToolCallingEnabled } from "@/lib/site-settings"; import { getUserPrivateBio, buildUserBioContext } from "@/lib/ai/user-bio"; import { createRecipeTool } from "@/lib/ai/tools/create-recipe-tool"; import { addToShoppingListTool } from "@/lib/ai/tools/add-to-shopping-list-tool"; @@ -68,9 +69,10 @@ export async function POST(req: NextRequest) { const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 30, 60); if (limited) return limited; - const [configResult, privateBio] = await Promise.all([ - resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "text")), + const [configResult, privateBio, toolCallingEnabled] = await Promise.all([ + resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "chat")), getUserPrivateBio(session!.user.id), + isAiToolCallingEnabled(), ]); if (!configResult.ok) return configResult.response; const aiConfig = configResult.data; @@ -79,16 +81,23 @@ export async function POST(req: NextRequest) { const locale = (session!.user as { locale?: string }).locale ?? "en"; const lang = LANG[locale] ?? "English"; - const system = `You are Epicure, a helpful culinary assistant answering general cooking questions — not tied to any specific recipe (techniques, substitutions, timing, equipment, food safety, etc). If asked who you are or what model/AI you're built on, say you're Epicure — never name the underlying model or provider. If a question has nothing to do with cooking or food, politely redirect. Keep answers under 200 words. Respond in ${lang}.\n\nYou have two tools. Using one only drafts something for the user to review — it never saves by itself.\n- createRecipe: the user is asking you to create, save, or write down a recipe (e.g. "make me a recipe for X", "give me a recipe for Y", "write that down"). This includes any request for a full recipe, not only ones that say the word "create" or "save".\n- addToShoppingList: the user is asking to add ingredients/items to a shopping list.\n\nIMPORTANT: when the user's request matches createRecipe, you MUST call that tool instead of writing the recipe's ingredients or steps directly in your text reply. Never output a full ingredient list or numbered steps as plain text — that content belongs in the tool call, not the message. Your text reply in that case should just be a short line like "Here's a draft — check it below and confirm if it looks right." Only skip the tool if the user is asking a general question (no specific recipe requested) or explicitly wants prose, not a structured recipe.${bioContext}`; + const toolsInstructions = toolCallingEnabled + ? `\n\nYou have two tools. Using one only drafts something for the user to review — it never saves by itself.\n- createRecipe: the user is asking you to create, save, or write down a recipe (e.g. "make me a recipe for X", "give me a recipe for Y", "write that down"). This includes any request for a full recipe, not only ones that say the word "create" or "save".\n- addToShoppingList: the user is asking to add ingredients/items to a shopping list.\n\nIMPORTANT: when the user's request matches createRecipe, you MUST call that tool instead of writing the recipe's ingredients or steps directly in your text reply. Never output a full ingredient list or numbered steps as plain text — that content belongs in the tool call, not the message. Your text reply in that case should just be a short line like "Here's a draft — check it below and confirm if it looks right." Only skip the tool if the user is asking a general question (no specific recipe requested) or explicitly wants prose, not a structured recipe.` + : ""; + const system = `You are Epicure, a helpful culinary assistant answering general cooking questions — not tied to any specific recipe (techniques, substitutions, timing, equipment, food safety, etc). If asked who you are or what model/AI you're built on, say you're Epicure — never name the underlying model or provider. If a question has nothing to do with cooking or food, politely redirect. Keep answers under 200 words. Respond in ${lang}.${toolsInstructions}${bioContext}`; const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "family", () => - generateText({ - model, - system, - prompt: parsed.data.question, - tools: { createRecipe: createRecipeTool, addToShoppingList: addToShoppingListTool }, - stopWhen: stepCountIs(3), - }), { skipQuota: aiConfig.isByok } + generateText( + toolCallingEnabled + ? { + model, + system, + prompt: parsed.data.question, + tools: { createRecipe: createRecipeTool, addToShoppingList: addToShoppingListTool }, + stopWhen: stepCountIs(3), + } + : { model, system, prompt: parsed.data.question } + ), { skipQuota: aiConfig.isByok } ); if (!result.ok) return result.response; @@ -101,8 +110,10 @@ export async function POST(req: NextRequest) { // Catch both: the prose-list shape, or the user's own message clearly // asking for a recipe in the first place. Rather than surface either // failure, force the tool call on one extra pass — same system+prompt, - // just no longer letting the model opt out. - if (final.toolCalls.length === 0 && (looksLikeUnstructuredRecipe(final.text) || looksLikeRecipeCreationRequest(parsed.data.question, locale))) { + // just no longer letting the model opt out. Skipped entirely when tool + // calling is turned off admin-side (e.g. a local model that can't + // reliably call tools) — there's no tool to force in that case. + if (toolCallingEnabled && final.toolCalls.length === 0 && (looksLikeUnstructuredRecipe(final.text) || looksLikeRecipeCreationRequest(parsed.data.question, locale))) { try { const forced = await generateText({ model, diff --git a/apps/web/app/api/v1/ai/recipe-chat/route.ts b/apps/web/app/api/v1/ai/recipe-chat/route.ts index b5d72bd..594dba9 100644 --- a/apps/web/app/api/v1/ai/recipe-chat/route.ts +++ b/apps/web/app/api/v1/ai/recipe-chat/route.ts @@ -64,7 +64,7 @@ ${stepList || "None listed"} `.trim(); const [configResult, privateBio] = await Promise.all([ - resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "text")), + resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "chat")), getUserPrivateBio(session!.user.id), ]); if (!configResult.ok) return configResult.response; diff --git a/apps/web/components/admin/admin-default-model-form.tsx b/apps/web/components/admin/admin-default-model-form.tsx index 6e68076..7d58376 100644 --- a/apps/web/components/admin/admin-default-model-form.tsx +++ b/apps/web/components/admin/admin-default-model-form.tsx @@ -13,14 +13,15 @@ import { SelectTrigger, SelectValue, } from "@/components/ui/select"; +import { Switch } from "@/components/ui/switch"; import { toast } from "sonner"; type Provider = "openai" | "anthropic" | "openrouter" | "ollama" | ""; type UseCase = { - key: "text" | "vision" | "mealPlan"; - providerSetting: "DEFAULT_TEXT_PROVIDER" | "DEFAULT_VISION_PROVIDER" | "DEFAULT_MEAL_PLAN_PROVIDER"; - modelSetting: "DEFAULT_TEXT_MODEL" | "DEFAULT_VISION_MODEL" | "DEFAULT_MEAL_PLAN_MODEL"; + key: "text" | "chat" | "vision" | "mealPlan"; + providerSetting: "DEFAULT_TEXT_PROVIDER" | "DEFAULT_CHAT_PROVIDER" | "DEFAULT_VISION_PROVIDER" | "DEFAULT_MEAL_PLAN_PROVIDER"; + modelSetting: "DEFAULT_TEXT_MODEL" | "DEFAULT_CHAT_MODEL" | "DEFAULT_VISION_MODEL" | "DEFAULT_MEAL_PLAN_MODEL"; label: string; description: string; }; @@ -31,7 +32,14 @@ const USE_CASES: UseCase[] = [ providerSetting: "DEFAULT_TEXT_PROVIDER", modelSetting: "DEFAULT_TEXT_MODEL", label: "Text generation", - description: "Recipe generation, chat, substitutions, pairings, and other text-based AI features.", + description: "Recipe generation, substitutions, pairings, and other text-based AI features.", + }, + { + key: "chat", + providerSetting: "DEFAULT_CHAT_PROVIDER", + modelSetting: "DEFAULT_CHAT_MODEL", + label: "Chatbot", + description: "The general cooking assistant and per-recipe Q&A chat.", }, { key: "vision", @@ -71,8 +79,15 @@ const PRESET_MODELS: Record>; -export function AdminDefaultModelForm({ initialValues }: { initialValues: Values }) { +export function AdminDefaultModelForm({ + initialValues, + initialToolCallingEnabled, +}: { + initialValues: Values; + initialToolCallingEnabled: boolean; +}) { const [values, setValues] = useState(initialValues); + const [toolCallingEnabled, setToolCallingEnabled] = useState(initialToolCallingEnabled); const [saving, setSaving] = useState(false); function setField(key: UseCase["providerSetting"] | UseCase["modelSetting"], value: string | null) { @@ -85,7 +100,7 @@ export function AdminDefaultModelForm({ initialValues }: { initialValues: Values const res = await fetch("/api/v1/admin/settings", { method: "PUT", headers: { "Content-Type": "application/json" }, - body: JSON.stringify(values), + body: JSON.stringify({ ...values, AI_TOOL_CALLING_ENABLED: toolCallingEnabled ? null : "false" }), }); if (!res.ok) throw new Error("Save failed"); toast.success("Default AI providers saved"); @@ -99,7 +114,7 @@ export function AdminDefaultModelForm({ initialValues }: { initialValues: Values return (
-

Default AI Providers

+

Default Models

What to use for a given feature when a user hasn't set their own model preference and has no personal API key. Leave a provider unset to fall back to whichever provider key is configured above. @@ -177,6 +192,22 @@ export function AdminDefaultModelForm({ initialValues }: { initialValues: Values )}

+ + {key === "chat" && ( +
+
+ +

+ Lets the chatbot draft a recipe or shopping list inline. Turn off for a model that can't reliably call tools (e.g. some local/Ollama models) — it'll fall back to plain text answers. +

+
+ +
+ )} ); })} diff --git a/apps/web/lib/ai/resolve-user-key.ts b/apps/web/lib/ai/resolve-user-key.ts index 63db0e1..fa06d8b 100644 --- a/apps/web/lib/ai/resolve-user-key.ts +++ b/apps/web/lib/ai/resolve-user-key.ts @@ -3,12 +3,13 @@ import { decrypt } from "@/lib/encrypt"; import { getSiteSetting, type SiteSettingKey } from "@/lib/site-settings"; import type { AiConfig, AiProvider } from "./factory"; -export type ModelUseCase = "text" | "vision" | "mealPlan"; +export type ModelUseCase = "text" | "vision" | "mealPlan" | "chat"; const USE_CASE_SITE_DEFAULTS: Record = { text: { provider: "DEFAULT_TEXT_PROVIDER", model: "DEFAULT_TEXT_MODEL" }, vision: { provider: "DEFAULT_VISION_PROVIDER", model: "DEFAULT_VISION_MODEL" }, mealPlan: { provider: "DEFAULT_MEAL_PLAN_PROVIDER", model: "DEFAULT_MEAL_PLAN_MODEL" }, + chat: { provider: "DEFAULT_CHAT_PROVIDER", model: "DEFAULT_CHAT_MODEL" }, }; const PROVIDER_API_KEY_SETTING: Record = { diff --git a/apps/web/lib/changelog.ts b/apps/web/lib/changelog.ts index cdc2d02..75bec71 100644 --- a/apps/web/lib/changelog.ts +++ b/apps/web/lib/changelog.ts @@ -1,5 +1,5 @@ // Mirrors CHANGELOG.md at the repo root — update both together. -export const APP_VERSION = "0.58.0"; +export const APP_VERSION = "0.59.0"; export type ChangelogEntry = { version: string; @@ -11,6 +11,17 @@ export type ChangelogEntry = { }; export const CHANGELOG: ChangelogEntry[] = [ + { + version: "0.59.0", + date: "2026-07-20 21:15", + added: [ + "Admin: chatbot now has its own default-model setting, separate from generic text generation — the general assistant and per-recipe Q&A chat can be pointed at a different model than recipe generation.", + "Admin: tool calling (the chatbot's inline recipe/shopping-list drafting) can be toggled off — useful for a local/Ollama model that doesn't reliably support it, so the bot falls back to plain text answers instead.", + ], + fixed: [ + "Simplified the admin AI Configuration page — it showed the same provider keys and routing settings twice (once read-only, once as an edit form). Merged into one section.", + ], + }, { version: "0.58.0", date: "2026-07-20 21:00", diff --git a/apps/web/lib/openapi.ts b/apps/web/lib/openapi.ts index e98501c..c4f1ade 100644 --- a/apps/web/lib/openapi.ts +++ b/apps/web/lib/openapi.ts @@ -778,12 +778,15 @@ export function generateOpenApiSpec(): object { NEXT_PUBLIC_VAPID_PUBLIC_KEY: z.string().nullable().optional(), VAPID_PRIVATE_KEY: z.string().nullable().optional().describe("secret — write-only, never returned"), SIGNUPS_DISABLED: z.string().nullable().optional(), - DEFAULT_TEXT_PROVIDER: z.enum(["openai", "anthropic", "openrouter", "ollama"]).nullable().optional().describe("Site-wide default for recipe/chat text generation when a user has no personal model preference and no BYOK key."), + DEFAULT_TEXT_PROVIDER: z.enum(["openai", "anthropic", "openrouter", "ollama"]).nullable().optional().describe("Site-wide default for recipe generation and other text use cases when a user has no personal model preference and no BYOK key."), DEFAULT_TEXT_MODEL: z.string().nullable().optional(), + DEFAULT_CHAT_PROVIDER: z.enum(["openai", "anthropic", "openrouter", "ollama"]).nullable().optional().describe("Site-wide default for the chatbot (general cooking assistant + per-recipe Q&A)."), + DEFAULT_CHAT_MODEL: z.string().nullable().optional(), DEFAULT_VISION_PROVIDER: z.enum(["openai", "anthropic", "openrouter", "ollama"]).nullable().optional().describe("Site-wide default for photo/vision use cases (pantry scan, photo import)."), DEFAULT_VISION_MODEL: z.string().nullable().optional(), DEFAULT_MEAL_PLAN_PROVIDER: z.enum(["openai", "anthropic", "openrouter", "ollama"]).nullable().optional().describe("Site-wide default for AI meal-plan generation."), DEFAULT_MEAL_PLAN_MODEL: z.string().nullable().optional(), + AI_TOOL_CALLING_ENABLED: z.string().nullable().optional().describe("\"false\" disables the chatbot's createRecipe/addToShoppingList tools (e.g. for a model that can't reliably call tools); any other value or unset means enabled."), }).describe("Unknown keys are silently ignored. Setting a key to null or \"\" deletes it (falls back to env var).")); const TestEmailBodyRef = registry.register("TestEmailBody", z.object({ to: z.string().min(1) })); diff --git a/apps/web/lib/site-settings.ts b/apps/web/lib/site-settings.ts index 16964bc..39b6c13 100644 --- a/apps/web/lib/site-settings.ts +++ b/apps/web/lib/site-settings.ts @@ -16,6 +16,9 @@ export type SiteSettingKey = | "DEFAULT_VISION_MODEL" | "DEFAULT_MEAL_PLAN_PROVIDER" | "DEFAULT_MEAL_PLAN_MODEL" + | "DEFAULT_CHAT_PROVIDER" + | "DEFAULT_CHAT_MODEL" + | "AI_TOOL_CALLING_ENABLED" | "GITEA_URL" | "GITEA_TOKEN" | "GITEA_REPO"; @@ -62,6 +65,9 @@ export async function getAllSiteSettings(): Promise { return (await getSiteSetting("SIGNUPS_DISABLED")) === "true"; } +/** Defaults to enabled — the chatbot's createRecipe/addToShoppingList tools + * only get turned off explicitly, e.g. for a local model that can't reliably + * call tools. */ +export async function isAiToolCallingEnabled(): Promise { + return (await getSiteSetting("AI_TOOL_CALLING_ENABLED")) !== "false"; +} + export async function setSiteSetting( key: SiteSettingKey, value: string | null,