Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions apps/web/src/app/api/settings/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
aiModelSetting,
getAiProvider,
getAiSettings,
setAiBaseUrl,
setAiKey,
setSetting,
} from "@/server/settings";
Expand All @@ -36,6 +37,8 @@ interface SettingsBody {
openaiKey?: string | null;
aiProvider?: AiProvider;
aiModel?: string;
/** Custom OpenAI-compatible base URL. Blank clears it back to the provider default. */
aiBaseUrl?: string;
currencyConversion?: CurrencyConversion;
}

Expand Down Expand Up @@ -73,18 +76,26 @@ export const PATCH = handler(async (request: Request) => {
if (body.aiModel !== undefined)
requireValue(
typeof body.aiModel === "string" &&
/^[a-zA-Z0-9][a-zA-Z0-9._:/-]{0,199}$/.test(body.aiModel.trim()),
/^[a-zA-Z0-9][a-zA-Z0-9._:/-]{0,199}$/.test(body.aiModel.trim()),
"Enter a valid model ID.",
);
if (body.aiBaseUrl !== undefined)
requireValue(
typeof body.aiBaseUrl === "string" &&
(body.aiBaseUrl.trim() === "" ||
(body.aiBaseUrl.trim().length <= 2048 &&
/^https?:\/\/\S+$/i.test(body.aiBaseUrl.trim()))),
"Enter a valid base URL.",
);
for (const id of AI_PROVIDERS) {
const key = body[`${id}Key`];
if (key === undefined) continue;
requireValue(
key === null ||
(typeof key === "string" &&
key.trim().length > 0 &&
key.length <= 4096 &&
!/\s/.test(key.trim())),
(typeof key === "string" &&
key.trim().length > 0 &&
key.length <= 4096 &&
!/\s/.test(key.trim())),
`Enter a valid ${AI_PROVIDER_NAMES[id]} API key.`,
);
requireValue(
Expand All @@ -101,10 +112,10 @@ export const PATCH = handler(async (request: Request) => {
if (body.multipliers !== undefined)
requireValue(
body.multipliers &&
typeof body.multipliers === "object" &&
Object.values(body.multipliers).every(
(n) => typeof n === "number" && Number.isFinite(n) && n > 0,
),
typeof body.multipliers === "object" &&
Object.values(body.multipliers).every(
(n) => typeof n === "number" && Number.isFinite(n) && n > 0,
),
"Contract multipliers must be positive numbers.",
);
db.transaction(() => {
Expand All @@ -127,6 +138,7 @@ export const PATCH = handler(async (request: Request) => {
}
if (body.aiProvider !== undefined) setSetting("aiProvider", body.aiProvider);
if (body.aiModel !== undefined) setSetting(aiModelSetting(provider), body.aiModel.trim());
if (body.aiBaseUrl !== undefined) setAiBaseUrl(provider, body.aiBaseUrl.trim() || null);
});
return ok({ saved: true });
});
35 changes: 35 additions & 0 deletions apps/web/src/components/ai-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
AI_DEFAULT_MODELS,
AI_PROVIDER_NAMES,
AI_PROVIDERS,
DEFAULT_ANTHROPIC_API_BASE_URL,
DEFAULT_OPENAI_BASE_URL,
type AiProvider,
type AiSettingsPayload,
} from "@/lib/ai-settings";
Expand All @@ -20,6 +22,7 @@ export function AiSettings() {
const [provider, setProvider] = useState<AiProvider>("anthropic");
const [model, setModel] = useState(AI_DEFAULT_MODELS.anthropic);
const [apiKey, setApiKey] = useState("");
const [baseUrl, setBaseUrl] = useState("");
const [busy, setBusy] = useState(false);
const [failure, setFailure] = useState("");
const [saved, setSaved] = useState("");
Expand All @@ -28,6 +31,7 @@ export function AiSettings() {
if (!data) return;
setProvider(data.aiProvider);
setModel(data.aiModel);
setBaseUrl(data.aiBaseUrl)
}, [data]);

const connection = data?.aiConnections[provider];
Expand All @@ -49,6 +53,7 @@ export function AiSettings() {
: {
aiProvider: provider,
aiModel: model.trim(),
aiBaseUrl: baseUrl.trim(),
...(apiKey.trim() ? { [`${provider}Key`]: apiKey.trim() } : {}),
},
"PATCH",
Expand Down Expand Up @@ -90,6 +95,7 @@ export function AiSettings() {
const next = value as AiProvider;
setProvider(next);
setModel(data?.aiConnections[next].model ?? AI_DEFAULT_MODELS[next]);
setBaseUrl(data?.aiConnections[next].baseUrl ?? "");
setApiKey("");
setSaved("");
setFailure("");
Expand Down Expand Up @@ -120,6 +126,35 @@ export function AiSettings() {
Use a text model available to your provider account. Each provider keeps its own model and
key.
</p>
<div className="space-y-1">
<Label htmlFor="ai-api-baseurl">{name} Compatible Base URL</Label>
<Input
id="ai-api-baseurl"
type="url"
value={baseUrl}
disabled={disabled || environment}
onChange={(event) => {
setBaseUrl(event.target.value);
setSaved("");
}}
placeholder={
connection?.configured
? data?.aiBaseUrl
: provider === "anthropic"
? DEFAULT_ANTHROPIC_API_BASE_URL
: DEFAULT_OPENAI_BASE_URL
}
autoComplete="off"
spellCheck={false}
/>
<p className="text-xs text-muted-foreground">
{environment
? `Using ${provider === "openai" ? "OPENAI_API_KEY" : "ANTHROPIC_API_KEY"} from the server environment. Change or remove that variable on the server to update the key.`
: connection?.configured
? "Leave blank to keep your saved key, or enter a replacement."
: "Add your Base URL (support custom provider*), then save to use this provider."}
</p>
</div>
<div className="space-y-1">
<Label htmlFor="ai-api-key">{name} API key</Label>
<Input
Expand Down
16 changes: 10 additions & 6 deletions apps/web/src/components/ask-journal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { AiNotice } from "./ai-notice";
import { useFilters } from "./filter-bar";
import { useAiRequest, type AiScope } from "@/lib/use-ai-request";
import type { AnalysisFilters } from "@luxalgo/journal-core";
import Markdown from "react-markdown";
import remarkGfm from "remark-gfm";

const SUGGESTIONS = [
"What's my most expensive mistake?",
Expand All @@ -25,23 +27,23 @@ export function AskJournal() {

function ScopedAskJournal({ filters, timeZone }: { filters: AnalysisFilters; timeZone: string }) {
const [question, setQuestion] = useState("");
const [answer, setAnswer] = useState<{ answer: string; scope: AiScope } | null>(null);
const [response, setResponse] = useState<{ answer: string; scope: AiScope } | null>(null);
const { run, busy, error, dismiss } = useAiRequest();
const [lastQuestion, setLastQuestion] = useState("");

const ask = async (q: string) => {
if (busy || !q.trim()) return;
q = q.trim();
setLastQuestion(q);
setAnswer(null);
setResponse(null);
await run(
() =>
postJson<{ answer: string; scope: AiScope }>("/api/ai/ask", {
question: q,
filters,
timeZone,
}),
setAnswer,
setResponse,
);
};

Expand Down Expand Up @@ -90,10 +92,12 @@ function ScopedAskJournal({ filters, timeZone }: { filters: AnalysisFilters; tim
{error && (
<AiNotice error={error} onRetry={() => void ask(lastQuestion)} onDismiss={dismiss} />
)}
{answer && (
{response && (
<div className="space-y-2 pt-1">
<p className="text-xs text-muted-foreground">{answer.scope.label}</p>
<p className="whitespace-pre-wrap text-sm leading-relaxed">{answer.answer}</p>
<p className="text-xs text-muted-foreground">{response.scope.label}</p>
<div className="whitespace-pre-wrap text-sm leading-relaxed">
<Markdown remarkPlugins={[remarkGfm]}>{response.answer}</Markdown>
</div>
</div>
)}
</CardContent>
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/lib/ai-settings.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
export const AI_PROVIDERS = ["anthropic", "openai"] as const;
export type AiProvider = (typeof AI_PROVIDERS)[number];

export const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
export const DEFAULT_ANTHROPIC_API_BASE_URL = "https://api.anthropic.com/v1";

export const AI_DEFAULT_MODELS: Record<AiProvider, string> = {
anthropic: "claude-opus-5",
openai: "gpt-4.1-mini",
Expand All @@ -21,6 +24,7 @@ export interface AiSettingsPayload {
aiProvider: AiProvider;
aiConfigured: boolean;
aiModel: string;
aiBaseUrl: string;
aiConnections: Record<AiProvider, AiConnection>;
}

Expand Down
7 changes: 4 additions & 3 deletions apps/web/src/server/ai.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createAnthropic } from "@ai-sdk/anthropic";
import { createOpenAI } from "@ai-sdk/openai";
import { APICallError, RetryError, generateText } from "ai";
import { getAiKey, getAiModel, getAiProvider } from "./settings";
import { getAiBaseUrl, getAiKey, getAiModel, getAiProvider } from "./settings";
import { AI_PROVIDER_NAMES } from "@/lib/ai-settings";

/**
Expand All @@ -27,12 +27,13 @@ export const runAi = async (prompt: string, maxOutputTokens = 1200): Promise<str
);
}
const model = getAiModel(provider);
const baseURL = getAiBaseUrl(provider);
try {
const result = await generateText({
model:
provider === "openai"
? createOpenAI({ apiKey }).responses(model)
: createAnthropic({ apiKey })(model),
? createOpenAI({ apiKey, baseURL }).responses(model)
: createAnthropic({ apiKey, baseURL })(model),
...(provider === "openai" ? { providerOptions: { openai: { store: false } } } : {}),
system: SYSTEM,
prompt,
Expand Down
29 changes: 29 additions & 0 deletions apps/web/src/server/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { EMPTY_DEFAULTS, type JournalDefaults } from "@/lib/journal-defaults";
import { DEFAULT_CONVERSION, parseCurrencyConversion } from "@/lib/currencies";
import {
AI_DEFAULT_MODELS,
DEFAULT_ANTHROPIC_API_BASE_URL,
DEFAULT_OPENAI_BASE_URL,
isAiProvider,
type AiProvider,
type AiSettingsPayload,
Expand Down Expand Up @@ -60,6 +62,10 @@ export const aiKeyEnvironment = (provider: AiProvider): string | null =>
(provider === "openai" ? process.env.OPENAI_API_KEY : process.env.ANTHROPIC_API_KEY)?.trim() ||
null;

export const aiBaseUrlEnvironment = (provider: AiProvider): string | null =>
(provider === "openai" ? process.env.OPENAI_API_BASE_URL : process.env.ANTHROPIC_API_BASE_URL)?.trim() ||
null;

/** Provider keys are stored separately and encrypted like broker credentials. */
export const getAiKey = (provider: AiProvider): string | null => {
const environment = aiKeyEnvironment(provider);
Expand All @@ -74,11 +80,30 @@ export const getAiKey = (provider: AiProvider): string | null => {
}
};

export const getAiBaseUrl = (provider: AiProvider): string => {
const environment = aiBaseUrlEnvironment(provider);
if (environment) return environment;
const envelope = getSetting(`${provider}_baseUrl`);

if (!envelope) {
return provider === "anthropic" ?
DEFAULT_ANTHROPIC_API_BASE_URL :
DEFAULT_OPENAI_BASE_URL;
}

return envelope;
}

export const setAiKey = (provider: AiProvider, key: string | null): void => {
if (key === null) deleteSetting(`${provider}KeyEnc`);
else setSetting(`${provider}KeyEnc`, encryptJson(key.trim()));
};

export const setAiBaseUrl = (provider: AiProvider, url: string | null): void => {
if (url === null) deleteSetting(`${provider}_baseUrl`);
else setSetting(`${provider}_baseUrl`, url);
};

export const getAnthropicKey = (): string | null => getAiKey("anthropic");
export const setAnthropicKey = (key: string | null): void => setAiKey("anthropic", key);

Expand All @@ -97,20 +122,24 @@ export const getAiModel = (provider: AiProvider): string =>

export const getAiSettings = (): AiSettingsPayload => {
const aiProvider = getAiProvider();

const connection = (provider: AiProvider) => ({
configured: Boolean(getAiKey(provider)),
source: aiKeyEnvironment(provider)
? ("environment" as const)
: getAiKey(provider)
? ("saved" as const)
: null,
baseUrl: getAiBaseUrl(provider),
model: getAiModel(provider),
});

const aiConnections = { anthropic: connection("anthropic"), openai: connection("openai") };
return {
aiProvider,
aiConfigured: aiConnections[aiProvider].configured,
aiModel: aiConnections[aiProvider].model,
aiBaseUrl: aiConnections[aiProvider].baseUrl,
aiConnections,
};
};
Loading