feat(settings): bind internal/external knowledge bases from the UI
Routing targets move from env-only to a UI-managed binding (migration 000034 routing_kb_bindings, single active row): - GET/PUT /api/v1/routing-bindings + /options: env defaults act as the bootstrap fallback; a UI binding wins and takes effect immediately (per-request resolution, no restart), and clearing falls back to env - PUT validates against the connected WeKnora instance (real knowledge base list via the scoped API key) and rejects same-KB bindings; saves require the admin role - route/catalog capabilities now resolve through the binding so both annotation paths share one source of truth - system settings > 服务配置 gains a 知识库绑定 panel: dropdown picker (or raw ID when WeKnora is unreachable) showing bound name, origin (UI vs env default) and last author - contract tests: OpenAPI, handler matrix (fallback, validation, same-KB rejection, capability resolution), frontend fetch/save layer
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
import { useCallback, useEffect, useState } from 'react'
|
||||
|
||||
import { useOptionalAuth } from './auth'
|
||||
import { fetchRoutingBindingOptions, fetchRoutingBindings, saveRoutingBindings } from './routingBindings'
|
||||
import type { KnowledgeBaseOption, RoutingBindings } from './routingBindings'
|
||||
|
||||
export function RoutingBindingsSection() {
|
||||
const auth = useOptionalAuth()
|
||||
const isAdmin = auth?.identity?.role === 'admin'
|
||||
const [bindings, setBindings] = useState<RoutingBindings | null>(null)
|
||||
const [options, setOptions] = useState<KnowledgeBaseOption[]>([])
|
||||
const [internalDraft, setInternalDraft] = useState('')
|
||||
const [externalDraft, setExternalDraft] = useState('')
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [message, setMessage] = useState('')
|
||||
|
||||
const load = useCallback(async () => {
|
||||
setLoading(true); setError(null)
|
||||
try {
|
||||
const next = await fetchRoutingBindings()
|
||||
setBindings(next)
|
||||
setInternalDraft(next.internal_bound_by_ui ? next.internal_kb_id : '')
|
||||
setExternalDraft(next.external_bound_by_ui ? next.external_kb_id : '')
|
||||
try { setOptions(await fetchRoutingBindingOptions()) } catch { setOptions([]) }
|
||||
} catch (cause) { setError(cause instanceof Error ? cause.message : '读取知识库绑定失败') }
|
||||
finally { setLoading(false) }
|
||||
}, [])
|
||||
useEffect(() => { void load() }, [load])
|
||||
|
||||
const dirty = bindings !== null && (internalDraft !== (bindings.internal_bound_by_ui ? bindings.internal_kb_id : '') || externalDraft !== (bindings.external_bound_by_ui ? bindings.external_kb_id : ''))
|
||||
const sameSelection = internalDraft !== '' && internalDraft === externalDraft
|
||||
|
||||
const save = async () => {
|
||||
setSaving(true); setError(null); setMessage('')
|
||||
try {
|
||||
const next = await saveRoutingBindings({ internal_kb_id: internalDraft, external_kb_id: externalDraft })
|
||||
setBindings(next)
|
||||
setMessage(`绑定已生效:对内 ${next.internal_kb_name || next.internal_kb_id.slice(0, 8) || '未绑定'} · 对外 ${next.external_kb_name || next.external_kb_id.slice(0, 8) || '未绑定'}。此后“来源与目录”的标记按新绑定路由。`)
|
||||
} catch (cause) { setError(cause instanceof Error ? cause.message : '保存知识库绑定失败') }
|
||||
finally { setSaving(false) }
|
||||
}
|
||||
|
||||
const optionLabel = (base: KnowledgeBaseOption) => `${base.name}(${base.knowledge_count} 文档 · ${base.id.slice(0, 8)}…)`
|
||||
const renderSide = (label: string, boundID: string, boundName: string, fromEnv: boolean, boundByUI: boolean) => (
|
||||
<div className={`kb-binding-side ${boundID ? 'bound' : 'warn'}`}>
|
||||
<b>{label}</b>
|
||||
<span>{boundID ? (boundName || `${boundID.slice(0, 8)}…`) : '未绑定 · 该方向的标记会被拒绝'}</span>
|
||||
<small>{boundID ? (boundByUI ? (boundName ? `UI 绑定 · ${boundID.slice(0, 8)}…` : 'UI 绑定') : fromEnv ? '来自部署默认值(env)' : '') : '请绑定一个测试知识库'}</small>
|
||||
</div>
|
||||
)
|
||||
const editorFor = (value: string, onChange: (next: string) => void, placeholder: string) => (
|
||||
options.length > 0
|
||||
? <select value={value} onChange={(event) => onChange(event.target.value)} aria-label={placeholder}>
|
||||
<option value="">{placeholder}</option>
|
||||
{options.map((base) => <option key={base.id} value={base.id}>{optionLabel(base)}</option>)}
|
||||
</select>
|
||||
: <input value={value} onChange={(event) => onChange(event.target.value.trim())} placeholder={`${placeholder}(输入知识库 ID)`} aria-label={placeholder} />
|
||||
)
|
||||
|
||||
return <section className="settings-panel wide" id="settings-routing-bindings">
|
||||
<div className="settings-section-heading"><div><h2>知识库绑定</h2><p>“来源与目录”里的对内 / 对外标记按这里的绑定分发到对应 WeKnora 知识库;保存后立即生效,无需重启。</p></div><button onClick={() => void load()} disabled={loading}>{loading ? '读取中…' : '重新读取'}</button></div>
|
||||
{error ? <p className="error-message" role="alert">{error}</p> : null}
|
||||
{bindings ? <div className="kb-binding-grid">
|
||||
{renderSide('对内知识库', bindings.internal_kb_id, bindings.internal_kb_name, bindings.internal_env_fallback, bindings.internal_bound_by_ui)}
|
||||
{renderSide('对外知识库', bindings.external_kb_id, bindings.external_kb_name, bindings.external_env_fallback, bindings.external_bound_by_ui)}
|
||||
</div> : null}
|
||||
{bindings && !bindings.weknora_connected ? <p className="hint">当前读不到 WeKnora 的库列表,只能按 ID 填写;连接恢复后可改为下拉选择。</p> : null}
|
||||
{isAdmin && bindings ? <div className="kb-binding-editor">
|
||||
<label>对内绑定 {editorFor(internalDraft, setInternalDraft, '选择对内知识库')}</label>
|
||||
<label>对外绑定 {editorFor(externalDraft, setExternalDraft, '选择对外知识库')}</label>
|
||||
<p className="hint">留空 = 取消 UI 绑定,回退到部署默认值;对内与对外必须是不同的库。</p>
|
||||
{sameSelection ? <p className="error-message">对内与对外必须绑定不同的知识库</p> : null}
|
||||
<button onClick={() => void save()} disabled={saving || !dirty || sameSelection}>{saving ? '正在校验并保存…' : '保存绑定'}</button>
|
||||
{message ? <p className="success-message" role="status">{message}</p> : null}
|
||||
</div> : null}
|
||||
{!isAdmin ? <p className="hint">仅管理员可修改知识库绑定。</p> : null}
|
||||
</section>
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useCallback, useEffect, useState } from 'react'
|
||||
|
||||
import { MembersSection } from './MembersSection'
|
||||
import { RoutingBindingsSection } from './RoutingBindingsSection'
|
||||
import { useOptionalAuth } from './auth'
|
||||
import { fetchMonitorOverview } from './monitor'
|
||||
import type { MonitorOverview } from './monitor'
|
||||
@@ -171,6 +172,7 @@ export function SystemSettingsView({ sources, connections, monitor, settings, pr
|
||||
<div className="settings-section-heading"><div><h2>服务配置</h2><p>测试、生产必须独立配置端点、凭据引用和知识库 ID;凭据只写不读。</p></div></div>
|
||||
<div className="environment-cards"><article><b>测试 WeKnora</b><span>本地真实连接</span><small>端点 / 凭据 / 知识库 ID:管理员受限配置,页面上不可回读</small></article><article className="production"><b>生产 WeKnora</b><span>未连接</span><small>生产写入:关闭;凭据不可回读</small></article></div>
|
||||
<div className="mapping-row"><span>测试知识库映射</span><b>对内解析队列:{routingCapabilities.internal_enabled ? '已配置' : '未配置'}</b><b>对外解析队列:{routingCapabilities.external_enabled ? '已配置' : '未配置'}</b><b>生产映射:未配置</b></div>
|
||||
<RoutingBindingsSection />
|
||||
<div className="dependency-grid">{['PostgreSQL', 'MinerU', 'Embedding', 'LLM API', 'Redis / MQ', 'OSS'].map((name) => { const health = (monitor.health || []).find((item) => item.name === name || item.name.startsWith(name)); const service = monitor.services.find((item) => item.name === name || item.name.startsWith(name)); const liveLabel = !health ? (service ? (service.state === 'healthy' ? '正常' : service.state === 'unknown' ? '未接入' : '需关注') : '待配置') : health.readiness === 'ready' ? '可达 · 可接单' : health.readiness === 'not_configured' ? '状态未知 · 未配置' : health.readiness === 'not_applicable' ? '未部署' : (health.liveness === 'up' ? '可达 · 不可接单' : '不可达 · 不可接单'); return <article key={name} className={health && health.readiness !== 'ready' && health.readiness !== 'not_applicable' ? 'warn' : ''}><span>{name}</span><b>{liveLabel}</b><small>{health ? [health.reason, health.last_success_at ? `最近成功 ${new Date(health.last_success_at).toLocaleTimeString('zh-CN', { hour12: false })}` : '', health.consecutive_failures ? `连续失败${health.consecutive_failures}次` : ''].filter(Boolean).join(';') || (health.readiness === 'ready' ? `延迟 ${health.latency_ms}ms` : '') : service?.detail || '真实 Provider 未接入'}</small></article> })}</div>
|
||||
</section> : null}
|
||||
{section === 'storage' ? <section className="settings-panel wide storage-settings-panel" id="settings-storage">
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { fetchRoutingBindingOptions, fetchRoutingBindings, saveRoutingBindings } from './routingBindings'
|
||||
|
||||
const binding = {
|
||||
internal_kb_id: '1b52c140-2e18-4676-afc5-4c7d8d190a8c', external_kb_id: 'fd7db6aa-763a-46f1-84d2-ecc7c952a5ea',
|
||||
internal_env_fallback: true, external_env_fallback: false, internal_bound_by_ui: false, external_bound_by_ui: true,
|
||||
internal_kb_name: '', external_kb_name: 'governance-external-local', updated_by: 'yao', weknora_connected: true,
|
||||
}
|
||||
|
||||
describe('routing bindings API', () => {
|
||||
it('reads the active binding projection', async () => {
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(JSON.stringify({ data: { ...binding, secret: 'drop' } }), { status: 200 })))
|
||||
const result = await fetchRoutingBindings()
|
||||
expect(result.internal_env_fallback).toBe(true)
|
||||
expect(result.external_bound_by_ui).toBe(true)
|
||||
expect(result).not.toHaveProperty('secret')
|
||||
vi.unstubAllGlobals()
|
||||
})
|
||||
it('lists knowledge base options for the picker', async () => {
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(JSON.stringify({ data: [{ id: 'kb-1', name: '对内', knowledge_count: 4 }, { id: '', name: '坏行' }] }), { status: 200 })))
|
||||
expect(await fetchRoutingBindingOptions()).toEqual([{ id: 'kb-1', name: '对内', knowledge_count: 4 }])
|
||||
vi.unstubAllGlobals()
|
||||
})
|
||||
it('saves bindings with an idempotency key and surfaces the server reason', async () => {
|
||||
const fetchMock = vi.fn()
|
||||
.mockResolvedValueOnce(new Response(JSON.stringify({ data: binding }), { status: 200 }))
|
||||
.mockResolvedValueOnce(new Response(JSON.stringify({ error: '对内与对外必须绑定不同的知识库' }), { status: 400 }))
|
||||
vi.stubGlobal('fetch', fetchMock)
|
||||
await expect(saveRoutingBindings({ internal_kb_id: 'kb-1', external_kb_id: '' })).resolves.toMatchObject({ internal_bound_by_ui: false })
|
||||
const [, init] = fetchMock.mock.calls[0]
|
||||
expect(init.method).toBe('PUT')
|
||||
expect(init.headers['Idempotency-Key']).toBeTruthy()
|
||||
await expect(saveRoutingBindings({ internal_kb_id: 'kb-1', external_kb_id: 'kb-1' })).rejects.toThrow('对内与对外必须绑定不同的知识库')
|
||||
vi.unstubAllGlobals()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,73 @@
|
||||
import { newOperationID } from './operationKey'
|
||||
|
||||
export interface RoutingBindings {
|
||||
internal_kb_id: string
|
||||
external_kb_id: string
|
||||
internal_env_fallback: boolean
|
||||
external_env_fallback: boolean
|
||||
internal_bound_by_ui: boolean
|
||||
external_bound_by_ui: boolean
|
||||
internal_kb_name: string
|
||||
external_kb_name: string
|
||||
updated_by: string
|
||||
weknora_connected: boolean
|
||||
}
|
||||
|
||||
export interface KnowledgeBaseOption {
|
||||
id: string
|
||||
name: string
|
||||
knowledge_count: number
|
||||
}
|
||||
|
||||
const record = (value: unknown): value is Record<string, unknown> => Boolean(value) && typeof value === 'object' && !Array.isArray(value)
|
||||
|
||||
function bindingProjection(item: Record<string, unknown>): RoutingBindings {
|
||||
return {
|
||||
internal_kb_id: typeof item.internal_kb_id === 'string' ? item.internal_kb_id : '',
|
||||
external_kb_id: typeof item.external_kb_id === 'string' ? item.external_kb_id : '',
|
||||
internal_env_fallback: item.internal_env_fallback === true,
|
||||
external_env_fallback: item.external_env_fallback === true,
|
||||
internal_bound_by_ui: item.internal_bound_by_ui === true,
|
||||
external_bound_by_ui: item.external_bound_by_ui === true,
|
||||
internal_kb_name: typeof item.internal_kb_name === 'string' ? item.internal_kb_name : '',
|
||||
external_kb_name: typeof item.external_kb_name === 'string' ? item.external_kb_name : '',
|
||||
updated_by: typeof item.updated_by === 'string' ? item.updated_by : '',
|
||||
weknora_connected: item.weknora_connected === true,
|
||||
}
|
||||
}
|
||||
|
||||
export async function fetchRoutingBindings(signal?: AbortSignal): Promise<RoutingBindings> {
|
||||
const response = await fetch('/api/v1/routing-bindings', { signal, headers: { Accept: 'application/json' } })
|
||||
if (!response.ok) throw new Error(`读取知识库绑定失败(HTTP ${response.status})`)
|
||||
const value = await response.json() as unknown
|
||||
if (!record(value) || !record(value.data)) throw new Error('知识库绑定响应无效')
|
||||
return bindingProjection(value.data)
|
||||
}
|
||||
|
||||
export async function fetchRoutingBindingOptions(signal?: AbortSignal): Promise<KnowledgeBaseOption[]> {
|
||||
const response = await fetch('/api/v1/routing-bindings/options', { signal, headers: { Accept: 'application/json' } })
|
||||
if (!response.ok) throw new Error(`读取可绑定知识库失败(HTTP ${response.status})`)
|
||||
const value = await response.json() as unknown
|
||||
if (!record(value) || !Array.isArray(value.data)) throw new Error('知识库列表响应无效')
|
||||
return value.data.filter(record).map((item) => ({
|
||||
id: typeof item.id === 'string' ? item.id : '',
|
||||
name: typeof item.name === 'string' ? item.name : '',
|
||||
knowledge_count: typeof item.knowledge_count === 'number' ? item.knowledge_count : 0,
|
||||
})).filter((item) => item.id)
|
||||
}
|
||||
|
||||
export async function saveRoutingBindings(input: { internal_kb_id: string; external_kb_id: string }, signal?: AbortSignal): Promise<RoutingBindings> {
|
||||
const response = await fetch('/api/v1/routing-bindings', {
|
||||
method: 'PUT', signal,
|
||||
headers: { 'Content-Type': 'application/json', Accept: 'application/json', 'Idempotency-Key': newOperationID() },
|
||||
body: JSON.stringify(input),
|
||||
})
|
||||
if (!response.ok) {
|
||||
let reason = `保存知识库绑定失败(HTTP ${response.status})`
|
||||
try { const body = await response.json() as unknown; if (record(body) && typeof body.error === 'string') reason = body.error } catch { /* keep status text */ }
|
||||
throw new Error(reason)
|
||||
}
|
||||
const value = await response.json() as unknown
|
||||
if (!record(value) || !record(value.data)) throw new Error('知识库绑定响应无效')
|
||||
return bindingProjection(value.data)
|
||||
}
|
||||
@@ -26,3 +26,4 @@ button.link{background:none;border:none;color:var(--c-run);cursor:pointer;text-d
|
||||
.modal-card p{color:var(--ink-base);font-size:14px;line-height:1.6}
|
||||
.modal-actions{display:flex;gap:10px;justify-content:flex-end;margin-top:14px}
|
||||
@media (max-width:900px){.settings-layout{grid-template-columns:1fr}.settings-nav{position:static;flex-direction:row;flex-wrap:wrap}}
|
||||
.kb-binding-grid{display:grid;grid-template-columns:1fr 1fr;gap:10px;margin:12px 0}.kb-binding-side{display:grid;gap:4px;border:1px solid var(--border-base);border-radius:9px;padding:11px;background:var(--bg-soft)}.kb-binding-side.bound{border-color:var(--c-done)}.kb-binding-side.warn{border-color:var(--c-fail)}.kb-binding-side b{color:var(--ink-base);font-size:11px}.kb-binding-side span{color:var(--c-done);font-size:11px;word-break:break-all}.kb-binding-side.warn span{color:var(--c-fail)}.kb-binding-side small{color:var(--ink-mute);font-size:9px}.kb-binding-editor{display:grid;gap:10px;border-top:1px dashed var(--border-base);margin-top:8px;padding-top:12px}.kb-binding-editor label{display:grid;gap:6px;color:var(--ink-mute);font-size:10px}.kb-binding-editor select,.kb-binding-editor input{border:1px solid var(--border-strong);border-radius:7px;padding:8px;background:var(--bg-panel);color:var(--ink-base)}.kb-binding-editor button{justify-self:start;padding:7px 10px}@media(max-width:650px){.kb-binding-grid{grid-template-columns:1fr}}.hint{color:var(--ink-mute);font-size:10px;margin:4px 0}
|
||||
|
||||
Reference in New Issue
Block a user