lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-18 23:25:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 新增 thinking 注入配置支持，扩展设置管理与前端交互

Browse Source 
新增 promptcompat 和 OpenAI shared 层的 thinking 注入逻辑，
完善配置系统的编解码与校验，更新设置管理 API 与前端 UI。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
CJACK
2026-04-26 13:35:20 +08:00
parent 3627c7366d
commit c09a4b51a5
34 changed files with 1038 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webui/src/features/settings/BehaviorSection.jsx
View File

@@ -28,6 +28,24 @@ export default function BehaviorSection({ t, form, setForm }) {
className="w-full bg-background border border-border rounded-lg px-3 py-2"
/>
</label>
<label className="flex items-start gap-3 rounded-lg border border-border bg-background/60 p-4">
<input
type="checkbox"
checked={Boolean(form.thinking_injection?.enabled ?? true)}
onChange={(e) => setForm((prev) => ({
...prev,
thinking_injection: {
...prev.thinking_injection,
enabled: e.target.checked,
},
}))}
className="mt-1 h-4 w-4 rounded border-border"
/>
<div className="space-y-1">
<span className="text-sm font-medium block">{t('settings.thinkingInjectionEnabled')}</span>
<span className="text-xs text-muted-foreground block">{t('settings.thinkingInjectionDesc')}</span>
</div>
</label>
</div>
</div>
)

62
webui/src/features/settings/HistorySplitSection.jsx
View File

@@ -9,10 +9,19 @@ export default function HistorySplitSection({ t, form, setForm }) {
<label className="flex items-start gap-3 rounded-lg border border-border bg-background/60 p-4">
<input
type="checkbox"
checked
disabled
readOnly
className="mt-1 h-4 w-4 rounded border-border disabled:opacity-70"
checked={Boolean(form.history_split?.enabled)}
onChange={(e) => setForm((prev) => ({
...prev,
history_split: {
...prev.history_split,
enabled: e.target.checked,
},
current_input_file: {
...prev.current_input_file,
enabled: e.target.checked ? false : Boolean(prev.current_input_file?.enabled),
},
}))}
className="mt-1 h-4 w-4 rounded border-border"
/>
<div className="space-y-1">
<span className="text-sm font-medium block">{t('settings.historySplitEnabled')}</span>
@@ -25,7 +34,7 @@ export default function HistorySplitSection({ t, form, setForm }) {
type="number"
min={1}
max={1000}
value={form.history_split.trigger_after_turns}
value={form.history_split?.trigger_after_turns || 1}
onChange={(e) => setForm((prev) => ({
...prev,
history_split: {
@@ -38,6 +47,49 @@ export default function HistorySplitSection({ t, form, setForm }) {
<p className="text-xs text-muted-foreground">{t('settings.historySplitTriggerHelp')}</p>
</label>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<label className="flex items-start gap-3 rounded-lg border border-border bg-background/60 p-4">
<input
type="checkbox"
checked={Boolean(form.current_input_file?.enabled)}
onChange={(e) => setForm((prev) => ({
...prev,
history_split: {
...prev.history_split,
enabled: e.target.checked ? false : Boolean(prev.history_split?.enabled),
},
current_input_file: {
...prev.current_input_file,
enabled: e.target.checked,
},
}))}
className="mt-1 h-4 w-4 rounded border-border"
/>
<div className="space-y-1">
<span className="text-sm font-medium block">{t('settings.currentInputFileEnabled')}</span>
<span className="text-xs text-muted-foreground block">{t('settings.currentInputFileDesc')}</span>
</div>
</label>
<label className="text-sm space-y-2">
<span className="text-muted-foreground">{t('settings.currentInputFileMinChars')}</span>
<input
type="number"
min={0}
max={100000000}
value={form.current_input_file?.min_chars ?? 0}
onChange={(e) => setForm((prev) => ({
...prev,
current_input_file: {
...prev.current_input_file,
min_chars: Number(e.target.value || 0),
},
}))}
className="w-full bg-background border border-border rounded-lg px-3 py-2"
/>
<p className="text-xs text-muted-foreground">{t('settings.currentInputFileHelp')}</p>
</label>
</div>
<p className="text-xs text-muted-foreground">{t('settings.splitPassThroughHelp')}</p>
</div>
)
}

26
webui/src/features/settings/useSettingsForm.js
View File

@@ -17,7 +17,9 @@ const DEFAULT_FORM = {
responses: { store_ttl_seconds: 900 },
embeddings: { provider: '' },
auto_delete: { mode: 'none' },
history_split: { enabled: true, trigger_after_turns: 1 },
history_split: { enabled: false, trigger_after_turns: 1 },
current_input_file: { enabled: true, min_chars: 0 },
thinking_injection: { enabled: true },
model_aliases_text: '{}',
}
@@ -50,6 +52,8 @@ function normalizeAutoDeleteMode(raw) {
}
function fromServerForm(data) {
const historySplitEnabled = Boolean(data.history_split?.enabled)
const currentInputFileEnabled = historySplitEnabled ? false : (data.current_input_file?.enabled ?? true)
return {
admin: { jwt_expire_hours: Number(data.admin?.jwt_expire_hours || 24) },
runtime: {
@@ -71,14 +75,23 @@ function fromServerForm(data) {
mode: normalizeAutoDeleteMode(data.auto_delete),
},
history_split: {
enabled: true,
enabled: historySplitEnabled,
trigger_after_turns: Number(data.history_split?.trigger_after_turns || 1),
},
current_input_file: {
enabled: currentInputFileEnabled,
min_chars: Number(data.current_input_file?.min_chars ?? 0),
},
thinking_injection: {
enabled: data.thinking_injection?.enabled ?? true,
},
model_aliases_text: JSON.stringify(data.model_aliases || {}, null, 2),
}
}
function toServerPayload(form) {
const historySplitEnabled = Boolean(form.history_split?.enabled)
const currentInputFileEnabled = historySplitEnabled ? false : Boolean(form.current_input_file?.enabled)
return {
admin: { jwt_expire_hours: Number(form.admin.jwt_expire_hours) },
runtime: {
@@ -94,9 +107,16 @@ function toServerPayload(form) {
embeddings: { provider: String(form.embeddings.provider || '').trim() },
auto_delete: { mode: normalizeAutoDeleteMode(form.auto_delete) },
history_split: {
enabled: true,
enabled: historySplitEnabled,
trigger_after_turns: Number(form.history_split?.trigger_after_turns || 1),
},
current_input_file: {
enabled: currentInputFileEnabled,
min_chars: Number(form.current_input_file?.min_chars ?? 0),
},
thinking_injection: {
enabled: Boolean(form.thinking_injection?.enabled ?? true),
},
}
}