feat: chatbot model setting + tool-calling toggle, simplify admin AI config (v0.59.0)
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 <noreply@anthropic.com>
This commit is contained in:
@@ -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.
|
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
|
## 0.58.0 — 2026-07-20 21:00
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -1,25 +1,16 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { Badge } from "@/components/ui/badge";
|
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 { getAllSiteSettings } from "@/lib/site-settings";
|
||||||
import { AdminSettingsForm } from "@/components/admin/admin-settings-form";
|
import { AdminSettingsForm } from "@/components/admin/admin-settings-form";
|
||||||
import { AdminDefaultModelForm } from "@/components/admin/admin-default-model-form";
|
import { AdminDefaultModelForm } from "@/components/admin/admin-default-model-form";
|
||||||
|
|
||||||
export const metadata: Metadata = {};
|
export const metadata: Metadata = {};
|
||||||
|
|
||||||
const SETTING_GROUPS = [
|
const SETTING_GROUP = {
|
||||||
{
|
title: "Provider Keys & Routing",
|
||||||
title: "AI Provider Keys",
|
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.",
|
||||||
description: "Override the environment variable API keys at runtime. Values are encrypted at rest.",
|
keys: ["OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENROUTER_API_KEY", "OPENROUTER_DEFAULT_MODEL", "OLLAMA_BASE_URL"] as const,
|
||||||
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,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
function resolveProvider(settings: Record<string, { value: string | null }>) {
|
function resolveProvider(settings: Record<string, { value: string | null }>) {
|
||||||
if (settings["OPENROUTER_API_KEY"]?.value) return { provider: "OpenRouter", description: "Routes to many models via openrouter.ai" };
|
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 settings = await getAllSiteSettings();
|
||||||
const active = resolveProvider(settings);
|
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 (
|
return (
|
||||||
<div className="space-y-8">
|
<div className="space-y-8">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-2xl font-bold tracking-tight">AI Configuration</h1>
|
<h1 className="text-2xl font-bold tracking-tight">AI Configuration</h1>
|
||||||
<p className="text-muted-foreground text-sm mt-1">
|
<p className="text-muted-foreground text-sm mt-1">
|
||||||
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.
|
||||||
</p>
|
</p>
|
||||||
|
<div className="flex items-center gap-2 mt-3">
|
||||||
|
<span className="text-xs text-muted-foreground">Fallback provider (no default set below):</span>
|
||||||
|
<Badge variant="secondary" className="text-xs">{active.provider}</Badge>
|
||||||
|
<span className="text-xs text-muted-foreground">— {active.description}</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Card>
|
<AdminSettingsForm group={SETTING_GROUP} settings={settings} />
|
||||||
<CardHeader>
|
|
||||||
<CardTitle className="text-base">Active Provider (fallback, no default set below)</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent>
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<Badge className="text-sm px-3 py-1">{active.provider}</Badge>
|
|
||||||
<span className="text-muted-foreground text-sm">{active.description}</span>
|
|
||||||
</div>
|
|
||||||
<p className="text-xs text-muted-foreground mt-3">
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle className="text-base">API Keys</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent>
|
|
||||||
{keyRows.map(({ key, label }) => {
|
|
||||||
const meta = settings[key];
|
|
||||||
const present = !!meta?.value;
|
|
||||||
return (
|
|
||||||
<div key={key} className="flex items-center justify-between py-2 border-b last:border-0">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{present ? (
|
|
||||||
<CheckCircle className="h-4 w-4 text-green-500" />
|
|
||||||
) : (
|
|
||||||
<XCircle className="h-4 w-4 text-muted-foreground" />
|
|
||||||
)}
|
|
||||||
<span className="font-mono text-sm">{label}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{present && meta?.fromDb && (
|
|
||||||
<span className="flex items-center gap-1 text-xs text-muted-foreground">
|
|
||||||
<Database className="h-3 w-3" /> DB override
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{present && !meta?.fromDb && (
|
|
||||||
<span className="flex items-center gap-1 text-xs text-muted-foreground">
|
|
||||||
<Cpu className="h-3 w-3" /> from .env
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<Badge variant={present ? "default" : "secondary"}>
|
|
||||||
{present ? "Configured" : "Not set"}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
<div className="flex items-center justify-between py-2 border-b">
|
|
||||||
<span className="font-mono text-sm text-muted-foreground">OLLAMA_BASE_URL</span>
|
|
||||||
<span className="text-sm text-muted-foreground font-mono">
|
|
||||||
{settings["OLLAMA_BASE_URL"]?.value || "http://localhost:11434 (default)"}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center justify-between py-2">
|
|
||||||
<span className="font-mono text-sm text-muted-foreground">OPENROUTER_DEFAULT_MODEL</span>
|
|
||||||
<span className="text-sm text-muted-foreground font-mono">
|
|
||||||
{settings["OPENROUTER_DEFAULT_MODEL"]?.value || "google/gemini-flash-1.5 (default)"}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
{SETTING_GROUPS.map((group) => (
|
|
||||||
<AdminSettingsForm key={group.title} group={group} settings={settings} />
|
|
||||||
))}
|
|
||||||
|
|
||||||
<AdminDefaultModelForm
|
<AdminDefaultModelForm
|
||||||
initialValues={{
|
initialValues={{
|
||||||
DEFAULT_TEXT_PROVIDER: settings["DEFAULT_TEXT_PROVIDER"]?.value ?? null,
|
DEFAULT_TEXT_PROVIDER: settings["DEFAULT_TEXT_PROVIDER"]?.value ?? null,
|
||||||
DEFAULT_TEXT_MODEL: settings["DEFAULT_TEXT_MODEL"]?.value ?? null,
|
DEFAULT_TEXT_MODEL: settings["DEFAULT_TEXT_MODEL"]?.value ?? null,
|
||||||
|
DEFAULT_CHAT_PROVIDER: settings["DEFAULT_CHAT_PROVIDER"]?.value ?? null,
|
||||||
|
DEFAULT_CHAT_MODEL: settings["DEFAULT_CHAT_MODEL"]?.value ?? null,
|
||||||
DEFAULT_VISION_PROVIDER: settings["DEFAULT_VISION_PROVIDER"]?.value ?? null,
|
DEFAULT_VISION_PROVIDER: settings["DEFAULT_VISION_PROVIDER"]?.value ?? null,
|
||||||
DEFAULT_VISION_MODEL: settings["DEFAULT_VISION_MODEL"]?.value ?? null,
|
DEFAULT_VISION_MODEL: settings["DEFAULT_VISION_MODEL"]?.value ?? null,
|
||||||
DEFAULT_MEAL_PLAN_PROVIDER: settings["DEFAULT_MEAL_PLAN_PROVIDER"]?.value ?? null,
|
DEFAULT_MEAL_PLAN_PROVIDER: settings["DEFAULT_MEAL_PLAN_PROVIDER"]?.value ?? null,
|
||||||
DEFAULT_MEAL_PLAN_MODEL: settings["DEFAULT_MEAL_PLAN_MODEL"]?.value ?? null,
|
DEFAULT_MEAL_PLAN_MODEL: settings["DEFAULT_MEAL_PLAN_MODEL"]?.value ?? null,
|
||||||
}}
|
}}
|
||||||
|
initialToolCallingEnabled={settings["AI_TOOL_CALLING_ENABLED"]?.value !== "false"}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ const ALLOWED_KEYS: SiteSettingKey[] = [
|
|||||||
"DEFAULT_VISION_MODEL",
|
"DEFAULT_VISION_MODEL",
|
||||||
"DEFAULT_MEAL_PLAN_PROVIDER",
|
"DEFAULT_MEAL_PLAN_PROVIDER",
|
||||||
"DEFAULT_MEAL_PLAN_MODEL",
|
"DEFAULT_MEAL_PLAN_MODEL",
|
||||||
|
"DEFAULT_CHAT_PROVIDER",
|
||||||
|
"DEFAULT_CHAT_MODEL",
|
||||||
|
"AI_TOOL_CALLING_ENABLED",
|
||||||
"GITEA_URL",
|
"GITEA_URL",
|
||||||
"GITEA_TOKEN",
|
"GITEA_TOKEN",
|
||||||
"GITEA_REPO",
|
"GITEA_REPO",
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { applyRateLimit } from "@/lib/rate-limit";
|
|||||||
import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
|
import { withAiQuota, resolveAiConfigOrError } from "@/lib/ai/ai-error";
|
||||||
import { getModelConfigForUseCase } from "@/lib/ai/resolve-user-key";
|
import { getModelConfigForUseCase } from "@/lib/ai/resolve-user-key";
|
||||||
import { resolveModel } from "@/lib/ai/factory";
|
import { resolveModel } from "@/lib/ai/factory";
|
||||||
|
import { isAiToolCallingEnabled } from "@/lib/site-settings";
|
||||||
import { getUserPrivateBio, buildUserBioContext } from "@/lib/ai/user-bio";
|
import { getUserPrivateBio, buildUserBioContext } from "@/lib/ai/user-bio";
|
||||||
import { createRecipeTool } from "@/lib/ai/tools/create-recipe-tool";
|
import { createRecipeTool } from "@/lib/ai/tools/create-recipe-tool";
|
||||||
import { addToShoppingListTool } from "@/lib/ai/tools/add-to-shopping-list-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);
|
const limited = await applyRateLimit(`rl:ai:${session!.user.id}`, 30, 60);
|
||||||
if (limited) return limited;
|
if (limited) return limited;
|
||||||
|
|
||||||
const [configResult, privateBio] = await Promise.all([
|
const [configResult, privateBio, toolCallingEnabled] = await Promise.all([
|
||||||
resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "text")),
|
resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "chat")),
|
||||||
getUserPrivateBio(session!.user.id),
|
getUserPrivateBio(session!.user.id),
|
||||||
|
isAiToolCallingEnabled(),
|
||||||
]);
|
]);
|
||||||
if (!configResult.ok) return configResult.response;
|
if (!configResult.ok) return configResult.response;
|
||||||
const aiConfig = configResult.data;
|
const aiConfig = configResult.data;
|
||||||
@@ -79,16 +81,23 @@ export async function POST(req: NextRequest) {
|
|||||||
const locale = (session!.user as { locale?: string }).locale ?? "en";
|
const locale = (session!.user as { locale?: string }).locale ?? "en";
|
||||||
const lang = LANG[locale] ?? "English";
|
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", () =>
|
const result = await withAiQuota(session!.user.id, session!.user.tier as "free" | "pro" | "family", () =>
|
||||||
generateText({
|
generateText(
|
||||||
model,
|
toolCallingEnabled
|
||||||
system,
|
? {
|
||||||
prompt: parsed.data.question,
|
model,
|
||||||
tools: { createRecipe: createRecipeTool, addToShoppingList: addToShoppingListTool },
|
system,
|
||||||
stopWhen: stepCountIs(3),
|
prompt: parsed.data.question,
|
||||||
}), { skipQuota: aiConfig.isByok }
|
tools: { createRecipe: createRecipeTool, addToShoppingList: addToShoppingListTool },
|
||||||
|
stopWhen: stepCountIs(3),
|
||||||
|
}
|
||||||
|
: { model, system, prompt: parsed.data.question }
|
||||||
|
), { skipQuota: aiConfig.isByok }
|
||||||
);
|
);
|
||||||
if (!result.ok) return result.response;
|
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
|
// 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
|
// asking for a recipe in the first place. Rather than surface either
|
||||||
// failure, force the tool call on one extra pass — same system+prompt,
|
// failure, force the tool call on one extra pass — same system+prompt,
|
||||||
// just no longer letting the model opt out.
|
// just no longer letting the model opt out. Skipped entirely when tool
|
||||||
if (final.toolCalls.length === 0 && (looksLikeUnstructuredRecipe(final.text) || looksLikeRecipeCreationRequest(parsed.data.question, locale))) {
|
// 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 {
|
try {
|
||||||
const forced = await generateText({
|
const forced = await generateText({
|
||||||
model,
|
model,
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ ${stepList || "None listed"}
|
|||||||
`.trim();
|
`.trim();
|
||||||
|
|
||||||
const [configResult, privateBio] = await Promise.all([
|
const [configResult, privateBio] = await Promise.all([
|
||||||
resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "text")),
|
resolveAiConfigOrError(() => getModelConfigForUseCase(session!.user.id, "chat")),
|
||||||
getUserPrivateBio(session!.user.id),
|
getUserPrivateBio(session!.user.id),
|
||||||
]);
|
]);
|
||||||
if (!configResult.ok) return configResult.response;
|
if (!configResult.ok) return configResult.response;
|
||||||
|
|||||||
@@ -13,14 +13,15 @@ import {
|
|||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
|
|
||||||
type Provider = "openai" | "anthropic" | "openrouter" | "ollama" | "";
|
type Provider = "openai" | "anthropic" | "openrouter" | "ollama" | "";
|
||||||
|
|
||||||
type UseCase = {
|
type UseCase = {
|
||||||
key: "text" | "vision" | "mealPlan";
|
key: "text" | "chat" | "vision" | "mealPlan";
|
||||||
providerSetting: "DEFAULT_TEXT_PROVIDER" | "DEFAULT_VISION_PROVIDER" | "DEFAULT_MEAL_PLAN_PROVIDER";
|
providerSetting: "DEFAULT_TEXT_PROVIDER" | "DEFAULT_CHAT_PROVIDER" | "DEFAULT_VISION_PROVIDER" | "DEFAULT_MEAL_PLAN_PROVIDER";
|
||||||
modelSetting: "DEFAULT_TEXT_MODEL" | "DEFAULT_VISION_MODEL" | "DEFAULT_MEAL_PLAN_MODEL";
|
modelSetting: "DEFAULT_TEXT_MODEL" | "DEFAULT_CHAT_MODEL" | "DEFAULT_VISION_MODEL" | "DEFAULT_MEAL_PLAN_MODEL";
|
||||||
label: string;
|
label: string;
|
||||||
description: string;
|
description: string;
|
||||||
};
|
};
|
||||||
@@ -31,7 +32,14 @@ const USE_CASES: UseCase[] = [
|
|||||||
providerSetting: "DEFAULT_TEXT_PROVIDER",
|
providerSetting: "DEFAULT_TEXT_PROVIDER",
|
||||||
modelSetting: "DEFAULT_TEXT_MODEL",
|
modelSetting: "DEFAULT_TEXT_MODEL",
|
||||||
label: "Text generation",
|
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",
|
key: "vision",
|
||||||
@@ -71,8 +79,15 @@ const PRESET_MODELS: Record<string, { label: string; models: { value: string; la
|
|||||||
|
|
||||||
type Values = Partial<Record<UseCase["providerSetting"] | UseCase["modelSetting"], string | null>>;
|
type Values = Partial<Record<UseCase["providerSetting"] | UseCase["modelSetting"], string | null>>;
|
||||||
|
|
||||||
export function AdminDefaultModelForm({ initialValues }: { initialValues: Values }) {
|
export function AdminDefaultModelForm({
|
||||||
|
initialValues,
|
||||||
|
initialToolCallingEnabled,
|
||||||
|
}: {
|
||||||
|
initialValues: Values;
|
||||||
|
initialToolCallingEnabled: boolean;
|
||||||
|
}) {
|
||||||
const [values, setValues] = useState<Values>(initialValues);
|
const [values, setValues] = useState<Values>(initialValues);
|
||||||
|
const [toolCallingEnabled, setToolCallingEnabled] = useState(initialToolCallingEnabled);
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
|
|
||||||
function setField(key: UseCase["providerSetting"] | UseCase["modelSetting"], value: string | null) {
|
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", {
|
const res = await fetch("/api/v1/admin/settings", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: { "Content-Type": "application/json" },
|
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");
|
if (!res.ok) throw new Error("Save failed");
|
||||||
toast.success("Default AI providers saved");
|
toast.success("Default AI providers saved");
|
||||||
@@ -99,7 +114,7 @@ export function AdminDefaultModelForm({ initialValues }: { initialValues: Values
|
|||||||
return (
|
return (
|
||||||
<section className="rounded-xl border p-6 space-y-4">
|
<section className="rounded-xl border p-6 space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="font-semibold text-lg">Default AI Providers</h2>
|
<h2 className="font-semibold text-lg">Default Models</h2>
|
||||||
<p className="text-sm text-muted-foreground mt-1">
|
<p className="text-sm text-muted-foreground mt-1">
|
||||||
What to use for a given feature when a user hasn't set their own model preference and has no personal API key.
|
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.
|
Leave a provider unset to fall back to whichever provider key is configured above.
|
||||||
@@ -177,6 +192,22 @@ export function AdminDefaultModelForm({ initialValues }: { initialValues: Values
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{key === "chat" && (
|
||||||
|
<div className="flex items-center justify-between border-t pt-3">
|
||||||
|
<div>
|
||||||
|
<Label className="text-xs">Tool calling</Label>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
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.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
checked={toolCallingEnabled}
|
||||||
|
onCheckedChange={setToolCallingEnabled}
|
||||||
|
className="shrink-0"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -3,12 +3,13 @@ import { decrypt } from "@/lib/encrypt";
|
|||||||
import { getSiteSetting, type SiteSettingKey } from "@/lib/site-settings";
|
import { getSiteSetting, type SiteSettingKey } from "@/lib/site-settings";
|
||||||
import type { AiConfig, AiProvider } from "./factory";
|
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<ModelUseCase, { provider: SiteSettingKey; model: SiteSettingKey }> = {
|
const USE_CASE_SITE_DEFAULTS: Record<ModelUseCase, { provider: SiteSettingKey; model: SiteSettingKey }> = {
|
||||||
text: { provider: "DEFAULT_TEXT_PROVIDER", model: "DEFAULT_TEXT_MODEL" },
|
text: { provider: "DEFAULT_TEXT_PROVIDER", model: "DEFAULT_TEXT_MODEL" },
|
||||||
vision: { provider: "DEFAULT_VISION_PROVIDER", model: "DEFAULT_VISION_MODEL" },
|
vision: { provider: "DEFAULT_VISION_PROVIDER", model: "DEFAULT_VISION_MODEL" },
|
||||||
mealPlan: { provider: "DEFAULT_MEAL_PLAN_PROVIDER", model: "DEFAULT_MEAL_PLAN_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<AiProvider, SiteSettingKey | null> = {
|
const PROVIDER_API_KEY_SETTING: Record<AiProvider, SiteSettingKey | null> = {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// Mirrors CHANGELOG.md at the repo root — update both together.
|
// 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 = {
|
export type ChangelogEntry = {
|
||||||
version: string;
|
version: string;
|
||||||
@@ -11,6 +11,17 @@ export type ChangelogEntry = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const CHANGELOG: 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",
|
version: "0.58.0",
|
||||||
date: "2026-07-20 21:00",
|
date: "2026-07-20 21:00",
|
||||||
|
|||||||
@@ -778,12 +778,15 @@ export function generateOpenApiSpec(): object {
|
|||||||
NEXT_PUBLIC_VAPID_PUBLIC_KEY: z.string().nullable().optional(),
|
NEXT_PUBLIC_VAPID_PUBLIC_KEY: z.string().nullable().optional(),
|
||||||
VAPID_PRIVATE_KEY: z.string().nullable().optional().describe("secret — write-only, never returned"),
|
VAPID_PRIVATE_KEY: z.string().nullable().optional().describe("secret — write-only, never returned"),
|
||||||
SIGNUPS_DISABLED: z.string().nullable().optional(),
|
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_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_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_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_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(),
|
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)."));
|
}).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) }));
|
const TestEmailBodyRef = registry.register("TestEmailBody", z.object({ to: z.string().min(1) }));
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ export type SiteSettingKey =
|
|||||||
| "DEFAULT_VISION_MODEL"
|
| "DEFAULT_VISION_MODEL"
|
||||||
| "DEFAULT_MEAL_PLAN_PROVIDER"
|
| "DEFAULT_MEAL_PLAN_PROVIDER"
|
||||||
| "DEFAULT_MEAL_PLAN_MODEL"
|
| "DEFAULT_MEAL_PLAN_MODEL"
|
||||||
|
| "DEFAULT_CHAT_PROVIDER"
|
||||||
|
| "DEFAULT_CHAT_MODEL"
|
||||||
|
| "AI_TOOL_CALLING_ENABLED"
|
||||||
| "GITEA_URL"
|
| "GITEA_URL"
|
||||||
| "GITEA_TOKEN"
|
| "GITEA_TOKEN"
|
||||||
| "GITEA_REPO";
|
| "GITEA_REPO";
|
||||||
@@ -62,6 +65,9 @@ export async function getAllSiteSettings(): Promise<Record<string, { value: stri
|
|||||||
"DEFAULT_VISION_MODEL",
|
"DEFAULT_VISION_MODEL",
|
||||||
"DEFAULT_MEAL_PLAN_PROVIDER",
|
"DEFAULT_MEAL_PLAN_PROVIDER",
|
||||||
"DEFAULT_MEAL_PLAN_MODEL",
|
"DEFAULT_MEAL_PLAN_MODEL",
|
||||||
|
"DEFAULT_CHAT_PROVIDER",
|
||||||
|
"DEFAULT_CHAT_MODEL",
|
||||||
|
"AI_TOOL_CALLING_ENABLED",
|
||||||
"GITEA_URL",
|
"GITEA_URL",
|
||||||
"GITEA_TOKEN",
|
"GITEA_TOKEN",
|
||||||
"GITEA_REPO",
|
"GITEA_REPO",
|
||||||
@@ -93,6 +99,13 @@ export async function isSignupsDisabled(): Promise<boolean> {
|
|||||||
return (await getSiteSetting("SIGNUPS_DISABLED")) === "true";
|
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<boolean> {
|
||||||
|
return (await getSiteSetting("AI_TOOL_CALLING_ENABLED")) !== "false";
|
||||||
|
}
|
||||||
|
|
||||||
export async function setSiteSetting(
|
export async function setSiteSetting(
|
||||||
key: SiteSettingKey,
|
key: SiteSettingKey,
|
||||||
value: string | null,
|
value: string | null,
|
||||||
|
|||||||
Reference in New Issue
Block a user