Arnaud
f0632cce95
estimateNutrition() (lib/ai/features/estimate-nutrition.ts) is now a
hybrid: for each ingredient, estimateGrams() (lib/ingredient-grams.ts)
converts its quantity+unit to grams where possible (weight units
exactly; volume units -- cup/tbsp/tsp/ml/l/etc -- via a 1ml~=1g water-
density approximation, documented as a real simplification but far
better than skipping them). Convertible ingredients get looked up in
USDA FoodData Central (lib/usda.ts, SR Legacy + Survey (FNDDS)
datasets -- the two suited to generic/raw ingredients, not Branded
packaged products or narrower Foundation) and summed. Whatever's left
(count-based units like "2 cloves", no USDA match, or USDA_API_KEY
unset entirely) goes through one AI call asking for just that
subset's total contribution, which sums directly with the USDA
totals -- no whole-recipe AI estimate to reconcile against.
Same exported signature and return shape as before
(NutritionEstimate / {perServing: {...}}), so every existing caller
(the nutrition route, meal-plan generation) gets more accurate
results automatically once USDA_API_KEY is set in Admin -> Settings,
with zero behavior change when it isn't.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
60 lines
2.5 KiB
TypeScript
60 lines
2.5 KiB
TypeScript
import type { Metadata } from "next";
|
|
import { getAllSiteSettings, isSignupsDisabled } from "@/lib/site-settings";
|
|
import { AdminSettingsForm } from "@/components/admin/admin-settings-form";
|
|
import { SignupsToggle } from "@/components/admin/signups-toggle";
|
|
import { requireFullAdminPage } from "@/lib/require-admin-page";
|
|
|
|
export const metadata: Metadata = {};
|
|
|
|
const SETTING_GROUPS = [
|
|
{
|
|
title: "Push Notifications (VAPID)",
|
|
description: "Keys for web push notifications. Generate with: npx web-push generate-vapid-keys",
|
|
keys: ["NEXT_PUBLIC_VAPID_PUBLIC_KEY", "VAPID_PRIVATE_KEY"] as const,
|
|
},
|
|
{
|
|
title: "Gitea Integration",
|
|
description:
|
|
"Support tickets submitted in-app automatically open an issue on this Gitea repo. Setup: " +
|
|
"GITEA_URL = your Gitea base URL, no trailing slash (e.g. https://git.example.com). " +
|
|
"GITEA_REPO = owner/repo (e.g. owner/my-app). " +
|
|
"GITEA_TOKEN = a personal access token — Gitea → Settings → Applications → Generate New Token — " +
|
|
"with the \"issue\" scope (read + write) only; nothing broader is needed since this integration " +
|
|
"never touches code or repo settings, just creates issues.",
|
|
keys: ["GITEA_URL", "GITEA_TOKEN", "GITEA_REPO"] as const,
|
|
},
|
|
{
|
|
title: "USDA FoodData Central",
|
|
description:
|
|
"Improves recipe nutrition estimates with real per-ingredient data instead of AI-only guesses, " +
|
|
"for ingredients whose quantity/unit can be converted to grams. Free — get a key at " +
|
|
"fdc.nal.usda.gov/api-key-signup. Unset falls back to the previous AI-only estimation for every ingredient.",
|
|
keys: ["USDA_API_KEY"] as const,
|
|
},
|
|
];
|
|
|
|
export default async function AdminSettingsPage() {
|
|
await requireFullAdminPage();
|
|
const settings = await getAllSiteSettings();
|
|
const signupsDisabled = await isSignupsDisabled();
|
|
|
|
return (
|
|
<div className="space-y-8">
|
|
<div>
|
|
<h1 className="text-2xl font-bold tracking-tight">Site Settings</h1>
|
|
<p className="text-muted-foreground text-sm mt-1">
|
|
Override .env values at runtime. DB values take precedence over environment variables.
|
|
Clear a value to fall back to the environment variable. AI provider keys and model
|
|
defaults have moved to AI Config.
|
|
</p>
|
|
</div>
|
|
|
|
<SignupsToggle initialDisabled={signupsDisabled} />
|
|
|
|
{SETTING_GROUPS.map((group) => (
|
|
<AdminSettingsForm key={group.title} group={group} settings={settings} />
|
|
))}
|
|
</div>
|
|
);
|
|
}
|