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:
+33
-11
@@ -99,6 +99,8 @@ type Config struct {
|
||||
Monitor MonitorProvider
|
||||
InternalRoutingKnowledgeBaseID string
|
||||
ExternalRoutingKnowledgeBaseID string
|
||||
RoutingBindings RoutingBindingStore
|
||||
KnowledgeBases KnowledgeBaseLister
|
||||
Now func() time.Time
|
||||
RequireWeKnoraReady bool
|
||||
ProductionReleaseRequestsEnabled bool
|
||||
@@ -202,8 +204,26 @@ func NewHandler(config Config) (http.Handler, error) {
|
||||
mux.HandleFunc("GET /api/v1/source-catalog/change-sets/latest", func(w http.ResponseWriter, r *http.Request) {
|
||||
getLatestCatalogChangeSet(w, r, config.Store)
|
||||
})
|
||||
mux.HandleFunc("GET /api/v1/source-catalog/routing-capabilities", func(w http.ResponseWriter, _ *http.Request) {
|
||||
writeJSON(w, http.StatusOK, map[string]any{"data": map[string]bool{"internal_enabled": config.InternalRoutingKnowledgeBaseID != "", "external_enabled": config.ExternalRoutingKnowledgeBaseID != ""}})
|
||||
mux.HandleFunc("GET /api/v1/source-catalog/routing-capabilities", func(w http.ResponseWriter, r *http.Request) {
|
||||
internal, external := config.effectiveRoutingTargets(r.Context())
|
||||
writeJSON(w, http.StatusOK, map[string]any{"data": map[string]bool{"internal_enabled": internal != "", "external_enabled": external != ""}})
|
||||
})
|
||||
mux.HandleFunc("GET /api/v1/routing-bindings", func(w http.ResponseWriter, r *http.Request) {
|
||||
if config.RoutingBindings == nil {
|
||||
writeJSON(w, http.StatusServiceUnavailable, map[string]string{"error": "routing bindings storage unavailable"})
|
||||
return
|
||||
}
|
||||
config.handleRoutingBindings(w, r)
|
||||
})
|
||||
mux.HandleFunc("GET /api/v1/routing-bindings/options", func(w http.ResponseWriter, r *http.Request) {
|
||||
config.handleRoutingKnowledgeBaseOptions(w, r)
|
||||
})
|
||||
mux.HandleFunc("PUT /api/v1/routing-bindings", func(w http.ResponseWriter, r *http.Request) {
|
||||
if config.RoutingBindings == nil {
|
||||
writeJSON(w, http.StatusServiceUnavailable, map[string]string{"error": "routing bindings storage unavailable"})
|
||||
return
|
||||
}
|
||||
config.handleSaveRoutingBindings(w, r)
|
||||
})
|
||||
mux.HandleFunc("POST /api/v1/source-catalog/route", func(w http.ResponseWriter, r *http.Request) {
|
||||
routeCatalogFiles(w, r, config)
|
||||
@@ -651,22 +671,23 @@ func routeCatalogFiles(w http.ResponseWriter, r *http.Request, config Config) {
|
||||
policy = strings.TrimSpace(input.Visibility)
|
||||
}
|
||||
visibility := governance.Visibility(policy)
|
||||
effectiveInternal, effectiveExternal := config.effectiveRoutingTargets(r.Context())
|
||||
targetKnowledgeBaseIDs := make([]string, 0, 2)
|
||||
switch visibility {
|
||||
case governance.VisibilityInternal:
|
||||
if config.InternalRoutingKnowledgeBaseID != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, config.InternalRoutingKnowledgeBaseID)
|
||||
if effectiveInternal != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, effectiveInternal)
|
||||
}
|
||||
case governance.VisibilityExternal:
|
||||
if config.ExternalRoutingKnowledgeBaseID != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, config.ExternalRoutingKnowledgeBaseID)
|
||||
if effectiveExternal != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, effectiveExternal)
|
||||
}
|
||||
case governance.VisibilityBoth:
|
||||
if config.InternalRoutingKnowledgeBaseID != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, config.InternalRoutingKnowledgeBaseID)
|
||||
if effectiveInternal != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, effectiveInternal)
|
||||
}
|
||||
if config.ExternalRoutingKnowledgeBaseID != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, config.ExternalRoutingKnowledgeBaseID)
|
||||
if effectiveExternal != "" {
|
||||
targetKnowledgeBaseIDs = append(targetKnowledgeBaseIDs, effectiveExternal)
|
||||
}
|
||||
case governance.VisibilityBlocked:
|
||||
default:
|
||||
@@ -1728,10 +1749,11 @@ func confirmCatalogChangeSet(w http.ResponseWriter, r *http.Request, config Conf
|
||||
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid change set confirmation"})
|
||||
return
|
||||
}
|
||||
internalTarget, externalTarget := config.effectiveRoutingTargets(r.Context())
|
||||
result, replayed, err := config.Store.ConfirmCatalogChangeSetWithOperation(r.Context(), governance.ConfirmCatalogChangeSetRequest{
|
||||
ChangeSetID: r.PathValue("id"), ItemSeqs: input.ItemSeqs,
|
||||
OperatorRef: actorFor(r), Reason: input.Reason,
|
||||
InternalTargetKBID: config.InternalRoutingKnowledgeBaseID, ExternalTargetKBID: config.ExternalRoutingKnowledgeBaseID,
|
||||
InternalTargetKBID: internalTarget, ExternalTargetKBID: externalTarget,
|
||||
Now: config.Now().UTC(),
|
||||
}, operationID)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user