feat(web): 角色群像按定位配比生成(role_mix 缩减版)
- 契约: CharacterGenerateRequest 加 role_mix{定位:数量},model_validator 归一
count=各值之和(每项≥1、总和≤12),缺省退回单一 role+count
- @llm: build_character_gen_context/run_character_gen 加 role_mix 参并注入配比块
(确定性、无时间戳,守 assemble 纯函数);router 穿参
- character-gen.md 加"按配比严格分配 role"纪律 + regen prompt_hashes 金标准
- 前端: sanitizeRoleMix/roleMixTotal + buildCharacterGenerateRequest 第4参 +
useCharacterGen 穿参 + RoleMixEditor + CharacterGenerator 单一/配比双模
This commit is contained in:
@@ -7,6 +7,7 @@ import { ThinkingIndicator } from "@/components/ThinkingIndicator";
|
||||
import { Button } from "@/components/ui/Button";
|
||||
import { Field } from "@/components/ui/Field";
|
||||
import { SectionHeader } from "@/components/ui/SectionHeader";
|
||||
import { SegmentedControl } from "@/components/ui/SegmentedControl";
|
||||
import { StatusNote } from "@/components/ui/StatusNote";
|
||||
import { TextInput } from "@/components/ui/TextInput";
|
||||
import type { CharacterCardView } from "@/lib/api/types";
|
||||
@@ -14,11 +15,26 @@ import {
|
||||
clampCharacterCount,
|
||||
MAX_CHARACTER_COUNT,
|
||||
MIN_CHARACTER_COUNT,
|
||||
roleMixTotal,
|
||||
sanitizeRoleMix,
|
||||
updateCard,
|
||||
} from "@/lib/generation/cards";
|
||||
import { useCharacterGen } from "@/lib/generation/useCharacterGen";
|
||||
import { CharacterCardItem } from "./CharacterCardItem";
|
||||
import { ConflictAdjudication } from "./ConflictAdjudication";
|
||||
import { RoleMixEditor, type RoleMixRow } from "./RoleMixEditor";
|
||||
|
||||
type GenMode = "single" | "mix";
|
||||
|
||||
const MODE_OPTIONS: Array<{ value: GenMode; label: string }> = [
|
||||
{ value: "single", label: "单一定位" },
|
||||
{ value: "mix", label: "按定位配比" },
|
||||
];
|
||||
|
||||
const DEFAULT_MIX_ROWS: RoleMixRow[] = [
|
||||
{ role: "主角", count: 1 },
|
||||
{ role: "对手", count: 1 },
|
||||
];
|
||||
|
||||
interface CharacterGeneratorProps {
|
||||
projectId: string;
|
||||
@@ -35,6 +51,10 @@ export function CharacterGenerator({
|
||||
const [brief, setBrief] = useState("");
|
||||
const [count, setCount] = useState(MIN_CHARACTER_COUNT);
|
||||
const [role, setRole] = useState("");
|
||||
const [mode, setMode] = useState<GenMode>("single");
|
||||
const [mixRows, setMixRows] = useState<RoleMixRow[]>(DEFAULT_MIX_ROWS);
|
||||
// 配比模式下的有效合计(sanitize 后,已按 MAX 截断)——门控生成按钮。
|
||||
const mixTotal = roleMixTotal(sanitizeRoleMix(mixRows));
|
||||
// 编辑态卡片(预览返回后拷贝进本地,允许就地改)。
|
||||
const [drafts, setDrafts] = useState<CharacterCardView[]>([]);
|
||||
const [selected, setSelected] = useState<Set<number>>(new Set());
|
||||
@@ -46,8 +66,17 @@ export function CharacterGenerator({
|
||||
}, []);
|
||||
|
||||
const onGenerate = useCallback(async () => {
|
||||
if (mode === "mix") {
|
||||
await gen.generate({
|
||||
projectId,
|
||||
brief,
|
||||
count,
|
||||
roleMix: sanitizeRoleMix(mixRows),
|
||||
});
|
||||
return;
|
||||
}
|
||||
await gen.generate({ projectId, brief, count, role });
|
||||
}, [gen, projectId, brief, count, role]);
|
||||
}, [gen, projectId, brief, count, role, mode, mixRows]);
|
||||
|
||||
// gen.cards 变化(新预览)→ 重新同步本地草稿。
|
||||
const previewKey = gen.cards.map((c) => c.name).join("|");
|
||||
@@ -96,43 +125,64 @@ export function CharacterGenerator({
|
||||
placeholder="如:一个亦正亦邪的剑修,背负灭门血仇"
|
||||
/>
|
||||
</Field>
|
||||
<div className="flex flex-wrap items-end gap-3">
|
||||
<Field
|
||||
label="数量"
|
||||
className="w-28"
|
||||
help={`${MIN_CHARACTER_COUNT}–${MAX_CHARACTER_COUNT} 张`}
|
||||
>
|
||||
<TextInput
|
||||
type="number"
|
||||
min={MIN_CHARACTER_COUNT}
|
||||
max={MAX_CHARACTER_COUNT}
|
||||
value={count}
|
||||
onChange={(e) =>
|
||||
setCount(clampCharacterCount(Number(e.target.value)))
|
||||
}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="定位(可选)" className="min-w-[12rem] flex-1">
|
||||
<TextInput
|
||||
value={role}
|
||||
onChange={(e) => setRole(e.target.value)}
|
||||
placeholder="主角 / CP / 对手 / 导师 / 工具人"
|
||||
/>
|
||||
</Field>
|
||||
<Button
|
||||
onClick={() => void onGenerate()}
|
||||
disabled={
|
||||
generating ||
|
||||
brief.trim().length === 0 ||
|
||||
count < MIN_CHARACTER_COUNT ||
|
||||
count > MAX_CHARACTER_COUNT
|
||||
}
|
||||
variant="primary"
|
||||
>
|
||||
<Sparkles className="h-4 w-4" aria-hidden="true" />
|
||||
{generating ? "生成中…" : "生成"}
|
||||
</Button>
|
||||
<div className="mb-3">
|
||||
<SegmentedControl
|
||||
options={MODE_OPTIONS}
|
||||
value={mode}
|
||||
onChange={setMode}
|
||||
ariaLabel="生成模式"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{mode === "mix" ? (
|
||||
<Field
|
||||
label="角色定位配比"
|
||||
className="mb-3"
|
||||
help="每个定位产出对应数量,合计即总张数"
|
||||
>
|
||||
<RoleMixEditor rows={mixRows} onChange={setMixRows} />
|
||||
</Field>
|
||||
) : (
|
||||
<div className="mb-3 flex flex-wrap items-end gap-3">
|
||||
<Field
|
||||
label="数量"
|
||||
className="w-28"
|
||||
help={`${MIN_CHARACTER_COUNT}–${MAX_CHARACTER_COUNT} 张`}
|
||||
>
|
||||
<TextInput
|
||||
type="number"
|
||||
min={MIN_CHARACTER_COUNT}
|
||||
max={MAX_CHARACTER_COUNT}
|
||||
value={count}
|
||||
onChange={(e) =>
|
||||
setCount(clampCharacterCount(Number(e.target.value)))
|
||||
}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="定位(可选)" className="min-w-[12rem] flex-1">
|
||||
<TextInput
|
||||
value={role}
|
||||
onChange={(e) => setRole(e.target.value)}
|
||||
placeholder="主角 / CP / 对手 / 导师 / 工具人"
|
||||
/>
|
||||
</Field>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Button
|
||||
onClick={() => void onGenerate()}
|
||||
disabled={
|
||||
generating ||
|
||||
brief.trim().length === 0 ||
|
||||
(mode === "mix"
|
||||
? mixTotal < MIN_CHARACTER_COUNT
|
||||
: count < MIN_CHARACTER_COUNT || count > MAX_CHARACTER_COUNT)
|
||||
}
|
||||
variant="primary"
|
||||
>
|
||||
<Sparkles className="h-4 w-4" aria-hidden="true" />
|
||||
{generating ? "生成中…" : "生成"}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{generating ? (
|
||||
|
||||
82
apps/web/components/generation/RoleMixEditor.tsx
Normal file
82
apps/web/components/generation/RoleMixEditor.tsx
Normal file
@@ -0,0 +1,82 @@
|
||||
"use client";
|
||||
|
||||
import { Plus, X } from "lucide-react";
|
||||
|
||||
import { Button } from "@/components/ui/Button";
|
||||
import { TextInput } from "@/components/ui/TextInput";
|
||||
import {
|
||||
MAX_CHARACTER_COUNT,
|
||||
MIN_CHARACTER_COUNT,
|
||||
roleMixTotal,
|
||||
sanitizeRoleMix,
|
||||
} from "@/lib/generation/cards";
|
||||
|
||||
// 单行配比:某定位 + 该定位要生成的数量。
|
||||
export interface RoleMixRow {
|
||||
role: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
interface RoleMixEditorProps {
|
||||
rows: RoleMixRow[];
|
||||
onChange: (rows: RoleMixRow[]) => void;
|
||||
}
|
||||
|
||||
// 群像按定位配比编辑器(⑦):一组「定位 + 数量」行;合计封顶 MAX_CHARACTER_COUNT。
|
||||
// 不可变更新——每次编辑返回新数组,不改入参。
|
||||
export function RoleMixEditor({ rows, onChange }: RoleMixEditorProps) {
|
||||
// 有效合计 = sanitize 后的总数(已按 MAX 截断),即实际会生成的张数。
|
||||
const effectiveTotal = roleMixTotal(sanitizeRoleMix(rows));
|
||||
|
||||
const updateRow = (index: number, patch: Partial<RoleMixRow>): void => {
|
||||
onChange(rows.map((r, i) => (i === index ? { ...r, ...patch } : r)));
|
||||
};
|
||||
const addRow = (): void => onChange([...rows, { role: "", count: 1 }]);
|
||||
const removeRow = (index: number): void =>
|
||||
onChange(rows.filter((_, i) => i !== index));
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-2" aria-label="角色定位配比">
|
||||
{rows.map((row, i) => (
|
||||
<div key={i} className="flex items-center gap-2">
|
||||
<TextInput
|
||||
value={row.role}
|
||||
onChange={(e) => updateRow(i, { role: e.target.value })}
|
||||
placeholder="定位:主角 / 对手 / 配角"
|
||||
aria-label={`第 ${i + 1} 行定位`}
|
||||
className="min-w-[10rem] flex-1"
|
||||
/>
|
||||
<TextInput
|
||||
type="number"
|
||||
min={MIN_CHARACTER_COUNT}
|
||||
max={MAX_CHARACTER_COUNT}
|
||||
value={row.count}
|
||||
onChange={(e) =>
|
||||
updateRow(i, { count: Math.round(Number(e.target.value)) })
|
||||
}
|
||||
aria-label={`第 ${i + 1} 行数量`}
|
||||
className="w-20"
|
||||
/>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
onClick={() => removeRow(i)}
|
||||
disabled={rows.length <= 1}
|
||||
aria-label={`删除第 ${i + 1} 行`}
|
||||
>
|
||||
<X className="h-4 w-4" aria-hidden="true" />
|
||||
</Button>
|
||||
</div>
|
||||
))}
|
||||
<div className="flex items-center justify-between">
|
||||
<Button variant="outline" size="sm" onClick={addRow}>
|
||||
<Plus className="h-4 w-4" aria-hidden="true" />
|
||||
添加定位
|
||||
</Button>
|
||||
<span className="text-xs text-ink-soft">
|
||||
合计 {effectiveTotal} / {MAX_CHARACTER_COUNT} 张
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user