Isolate providers per client: add provider targets and a Codex-side form

This commit is contained in:
kate522 committed 2026-10-18 19:22:38 +08:00
1 parent adc8234cc9
commit d759fe5e5d
13 files changed
+595 -309

No files matched your search

+30 -254
View File
@@ -1,118 +1,33 @@
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { Plus, Trash2, Pencil } from "lucide-react";
import { PRESETS } from "@/lib/types";
import type { Models, Provider } from "@/lib/types";
import type { Provider } from "@/lib/types";
import { useProviders, useProviderMutations } from "@/lib/queries";
import { useToast } from "@/components/toast";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Input, Label } from "@/components/ui/input";
import { Select } from "@/components/ui/select";
interface FormState {
id?: string;
name: string;
preset: string;
base_url: string;
api_key: string;
models: Omit<Models, "extra"> & { extra: { key: string; value: string }[] };
}
const emptyForm: FormState = {
name: "",
preset: "",
base_url: "",
api_key: "",
models: { default: "", sonnet: "", haiku: "", opus: "", extra: [] },
};
function toRows(extra: Record<string, string> | undefined): { key: string; value: string }[] {
return Object.entries(extra ?? {}).map(([key, value]) => ({ key, value }));
}
function toMap(rows: { key: string; value: string }[]): Record<string, string> {
return Object.fromEntries(
rows.filter((r) => r.key.trim() && r.value.trim()).map((r) => [r.key.trim(), r.value.trim()]),
);
}
import { ProviderForm, type ProviderSubmitInput } from "@/components/ProviderForm";
export default function Providers() {
const { t } = useTranslation();
const { data, isLoading, isError } = useProviders();
const { data, isLoading, isError } = useProviders("claude");
const mutations = useProviderMutations();
const { show } = useToast();
const [form, setForm] = useState<FormState | null>(null);
const [errors, setErrors] = useState<Partial<Record<keyof FormState, string>>>({});
const [editing, setEditing] = useState<{ provider: Provider | null } | null>(null);
const [lastAppliedEnv, setLastAppliedEnv] = useState<Record<string, string> | null>(null);
const providers = data?.items ?? [];
const openCreate = (presetKey = "") => {
const preset = PRESETS.find((p) => p.key === presetKey);
setErrors({});
setForm({
...emptyForm,
preset: presetKey,
name: presetKey ? presetKey : "",
base_url: preset?.base_url ?? "",
models: preset
? { ...preset.models, extra: toRows(preset.models.extra) }
: { ...emptyForm.models },
});
};
const openEdit = (provider: Provider) => {
setErrors({});
setForm({
id: provider.id,
name: provider.name,
preset: provider.preset ?? "",
base_url: provider.base_url,
api_key: "",
models: {
default: provider.models.default ?? "",
sonnet: provider.models.sonnet ?? "",
haiku: provider.models.haiku ?? "",
opus: provider.models.opus ?? "",
extra: toRows(provider.models.extra),
},
});
};
const validate = (): boolean => {
if (!form) return false;
const next: Partial<Record<keyof FormState, string>> = {};
if (!form.name.trim()) next.name = t("providers.validationName");
if (!/^https?:\/\/.+/.test(form.base_url.trim())) next.base_url = t("providers.validationBaseUrl");
if (!form.id && !form.api_key.trim()) next.api_key = t("providers.validationApiKey");
setErrors(next);
return Object.keys(next).length === 0;
};
const submit = () => {
if (!form || !validate()) return;
const input = {
name: form.name.trim(),
preset: form.preset,
base_url: form.base_url.trim(),
api_key: form.api_key.trim(),
models: {
default: form.models.default?.trim(),
sonnet: form.models.sonnet?.trim(),
haiku: form.models.haiku?.trim(),
opus: form.models.opus?.trim(),
extra: toMap(form.models.extra),
},
};
const submitForm = (input: ProviderSubmitInput) => {
const target = editing?.provider ?? null;
const onSuccess = () => {
show(form.id ? t("providers.updated") : t("providers.created"));
setForm(null);
show(target ? t("providers.updated") : t("providers.created"));
setEditing(null);
};
const onError = (err: Error) => show(err.message, "error");
if (form.id) {
mutations.update.mutate({ id: form.id, input }, { onSuccess, onError });
if (target) {
mutations.update.mutate({ id: target.id, input }, { onSuccess, onError });
} else {
mutations.create.mutate(input, { onSuccess, onError });
}
@@ -126,7 +41,7 @@ export default function Providers() {
setLastAppliedEnv(result.env ?? null);
show(`${t("providers.activated")}: ${provider.name}`);
},
onError: (err) => show(err.message, "error"),
onError: (err: Error) => show(err.message, "error"),
},
);
};
@@ -138,166 +53,20 @@ export default function Providers() {
<div className="flex flex-col gap-5">
<div className="flex items-center justify-between">
<h2 className="text-lg font-semibold">{t("providers.title")}</h2>
<Button size="sm" onClick={() => openCreate()}>
<Button size="sm" onClick={() => setEditing({ provider: null })}>
<Plus size={14} aria-hidden />
{t("providers.add")}
</Button>
</div>
{form && (
<Card>
<CardHeader>
<CardTitle>{form.id ? t("providers.edit") : t("providers.add")}</CardTitle>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="grid grid-cols-2 gap-3">
<label className="flex flex-col gap-1">
<Label>{t("providers.name")}</Label>
<Input
value={form.name}
onChange={(e) => setForm({ ...form, name: e.target.value })}
placeholder="DeepSeek"
/>
{errors.name && <span className="text-xs text-red-600">{errors.name}</span>}
</label>
<label className="flex flex-col gap-1">
<Label>{t("providers.preset")}</Label>
<Select
value={form.preset}
onChange={(e) => {
const key = e.target.value;
const preset = PRESETS.find((p) => p.key === key);
setForm({
...form,
preset: key,
base_url: preset?.base_url ?? form.base_url,
models: preset
? { ...preset.models, extra: toRows(preset.models.extra) }
: form.models,
});
}}
>
<option value="">{t("providers.presetCustom")}</option>
{PRESETS.map((p) => (
<option key={p.key} value={p.key}>
{p.key}
</option>
))}
</Select>
</label>
<label className="flex flex-col gap-1">
<Label>{t("providers.baseUrl")}</Label>
<Input
value={form.base_url}
onChange={(e) => setForm({ ...form, base_url: e.target.value })}
placeholder="https://api.deepseek.com/v1"
/>
{errors.base_url && <span className="text-xs text-red-600">{errors.base_url}</span>}
</label>
<label className="flex flex-col gap-1">
<Label>
{t("providers.apiKey")}
{form.id && <span className="ml-1 text-zinc-400">({t("providers.keyHint")})</span>}
</Label>
<Input
type="password"
value={form.api_key}
onChange={(e) => setForm({ ...form, api_key: e.target.value })}
placeholder="sk-..."
/>
{errors.api_key && <span className="text-xs text-red-600">{errors.api_key}</span>}
</label>
</div>
<fieldset className="flex flex-col gap-2">
<legend className="text-xs font-medium text-zinc-600">{t("providers.models")}</legend>
<div className="grid grid-cols-2 gap-3">
{(["default", "sonnet", "haiku", "opus"] as const).map((role) => (
<label key={role} className="flex flex-col gap-1">
<Label>{t(`providers.${role}Model`)}</Label>
<Input
value={form.models[role] ?? ""}
onChange={(e) =>
setForm({ ...form, models: { ...form.models, [role]: e.target.value } })
}
/>
</label>
))}
</div>
<div className="flex flex-col gap-2">
<div className="flex items-center justify-between">
<span className="text-xs font-medium text-zinc-600">{t("providers.extraMappings")}</span>
<Button
variant="ghost"
size="sm"
onClick={() =>
setForm({
...form,
models: {
...form.models,
extra: [...form.models.extra, { key: "", value: "" }],
},
})
}
>
<Plus size={12} aria-hidden />
{t("providers.addMapping")}
</Button>
</div>
{form.models.extra.map((row, index) => (
<div key={index} className="flex items-center gap-2">
<Input
value={row.key}
placeholder={t("providers.extraKey")}
onChange={(e) => {
const extra = form.models.extra.map((r, i) =>
i === index ? { ...r, key: e.target.value } : r,
);
setForm({ ...form, models: { ...form.models, extra } });
}}
/>
<Input
value={row.value}
placeholder={t("providers.extraValue")}
onChange={(e) => {
const extra = form.models.extra.map((r, i) =>
i === index ? { ...r, value: e.target.value } : r,
);
setForm({ ...form, models: { ...form.models, extra } });
}}
/>
<Button
variant="ghost"
size="icon"
aria-label={t("common.delete")}
onClick={() =>
setForm({
...form,
models: {
...form.models,
extra: form.models.extra.filter((_, i) => i !== index),
},
})
}
>
<Trash2 size={14} aria-hidden />
</Button>
</div>
))}
<p className="text-xs text-zinc-500">{t("providers.extraHint")}</p>
</div>
</fieldset>
<div className="flex justify-end gap-2">
<Button variant="ghost" size="sm" onClick={() => setForm(null)}>
{t("common.cancel")}
</Button>
<Button size="sm" onClick={submit}>
{t("common.save")}
</Button>
</div>
</CardContent>
</Card>
{editing && (
<ProviderForm
target="claude"
editing={editing.provider}
pending={mutations.create.isPending || mutations.update.isPending}
onSubmit={submitForm}
onCancel={() => setEditing(null)}
/>
)}
{lastAppliedEnv && (
@@ -334,7 +103,9 @@ export default function Providers() {
<div className="min-w-0 flex-1">
<div className="flex items-center gap-2">
<span className="text-sm font-medium">{provider.name}</span>
{provider.enabled_for_claude && <Badge tone="success">{t("providers.activated")}</Badge>}
{provider.enabled_for_claude && (
<Badge tone="success">{t("providers.activated")}</Badge>
)}
{provider.preset && <Badge>{provider.preset}</Badge>}
</div>
<div className="truncate text-xs text-zinc-500">{provider.base_url}</div>
@@ -343,7 +114,12 @@ export default function Providers() {
<Button variant="outline" size="sm" onClick={() => apply(provider)}>
{t("providers.activate")}
</Button>
<Button variant="ghost" size="icon" aria-label={t("common.edit")} onClick={() => openEdit(provider)}>
<Button
variant="ghost"
size="icon"
aria-label={t("common.edit")}
onClick={() => setEditing({ provider })}
>
<Pencil size={14} aria-hidden />
</Button>
<Button
@@ -354,7 +130,7 @@ export default function Providers() {
if (window.confirm(t("providers.deleteConfirm"))) {
mutations.remove.mutate(provider.id, {
onSuccess: () => show(t("providers.deleted")),
onError: (err) => show(err.message, "error"),
onError: (err: Error) => show(err.message, "error"),
});
}
}}