批次A admin 端点(原本 404 变 200 真实数据):
- GET /admin/llm:读 s.cfg.LLM 组 openai+anthropic 两 provider(enabled=当前 Provider、multimodal=配 VisionModel),APIKey 不进 wire 零泄露。
- GET /admin/automations:*automations.Service.List()(reminders+event rules+cron schedules,cron 加只读登记)。
- GET /admin/users:cfg.AdminUser + *auth.APIKey.List()(密钥掩码);无用户存储,恒先返回当前 admin 账号。
- GET /admin/backthink:*backthink.Backthink.List(ctx,50)。均只读、owner/admin RBAC、{data} 信封。
批次B 视觉真推理 + 语音:
- rest.go chatRequest 加 Image?;流式 publishChatStream 带 image;userChatMessages 构造 ImageMessage(model.go:71)。
- loop/vision.go:ImageResolver 可注入(MVP 先看图再对话);run.go Run 开头 resolveImages,无 resolver 透传直交主模型。
- vision/resolver.go:MessageResolver 调 vision.Router.Route——KindMain 保留图片交主模型多模态、KindVisionTool/OCRTool 经 dispatcher.Invoke 折叠成 [图片内容] 文本、KindUnsupported 记日志保留原图不崩。
- gateway/voice.go:VoiceService 接口 + SetVoice 注入点 + handleVoiceInput(未注入回 error 不崩)+ runVoiceTurn 异步 STT→loop chat→TTS→定向 voice_output 帧。
- ws_hub/ws_route:voice_input 接 handleVoiceInput;前端 ws.ts decodeBase64/playVoiceAudio/case voice_output。
第3步 wire.go 收口(唯一碰 wire.go 的一步):
- Deps 补传 Automations:a.automation / Backthink:a.backthink / Users:auth.NewAPIKey(a.cfg.Auth)(*auth.APIKey 原生满足 UserStore,避免 admin 重复的复合类型)。
- gw.SetVoice(a.voice);loop.Options.Vision = vision.NewMessageResolver(router, info, dispatcher.Invoke)(router=NewRouter(WithVisionTool/WithOCRTool)、info=cfg.LLM.VisionModel)。
实机验证:四 admin 端点 200 真实数据(llm 双 provider 脱敏、users=admin,yeij0942,owner);WS 握手正常。go build/vet/test 全绿 + 前端 tsc。wire.go 557 行。
327 lines
10 KiB
Go
327 lines
10 KiB
Go
package gateway
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/auth"
|
|
capreg "git.yeij.top/AskaEth/Cyrene_v2/internal/capability/registry"
|
|
apperr "git.yeij.top/AskaEth/Cyrene_v2/internal/errors"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/pkg/plugins/sdk"
|
|
)
|
|
|
|
// backthinkListLimit is the number of most-recent think records the admin
|
|
// panel asks for when no limit is specified.
|
|
const backthinkListLimit = 50
|
|
|
|
// PluginSummary is the wire shape of a capability/plugin in the admin list.
|
|
type PluginSummary struct {
|
|
Name string `json:"name"`
|
|
Kind string `json:"kind"`
|
|
Description string `json:"description"`
|
|
AllowInGroup bool `json:"allowInGroup"`
|
|
AllowInStranger bool `json:"allowInStranger"`
|
|
}
|
|
|
|
// ChannelSummary is the wire shape of a registered channel adapter.
|
|
type ChannelSummary struct {
|
|
Name string `json:"name"`
|
|
Connected bool `json:"connected"`
|
|
}
|
|
|
|
// policyRequest is the POST /api/v1/admin/plugins/policy body.
|
|
type policyRequest struct {
|
|
Name string `json:"name"`
|
|
AllowInGroup bool `json:"allowInGroup"`
|
|
AllowInStranger bool `json:"allowInStranger"`
|
|
}
|
|
|
|
// AdminLlmProvider is the wire shape of one LLM provider in the admin config.
|
|
// The API key is deliberately absent: it is never returned to the client.
|
|
type AdminLlmProvider struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
BaseURL string `json:"baseUrl"`
|
|
Model string `json:"model"`
|
|
Multimodal bool `json:"multimodal"`
|
|
Enabled bool `json:"enabled"`
|
|
Fallback string `json:"fallback,omitempty"`
|
|
}
|
|
|
|
// AdminLlmConfig is the wire shape of GET /api/v1/admin/llm.
|
|
type AdminLlmConfig struct {
|
|
Providers []AdminLlmProvider `json:"providers"`
|
|
}
|
|
|
|
// AdminAutomationRecord is the wire shape of one automation/reminder in the
|
|
// admin list. Cron carries the cron expression for the cron kind; lastRun and
|
|
// nextRun are omitted when the value is unknown.
|
|
type AdminAutomationRecord struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
Kind string `json:"kind"`
|
|
Cron string `json:"cron,omitempty"`
|
|
Enabled bool `json:"enabled"`
|
|
LastRun string `json:"lastRun,omitempty"`
|
|
NextRun string `json:"nextRun,omitempty"`
|
|
}
|
|
|
|
// AdminUserRecord is the wire shape of one account/API key in the admin list.
|
|
type AdminUserRecord struct {
|
|
ID string `json:"id"`
|
|
Username string `json:"username"`
|
|
Role string `json:"role"`
|
|
CreatedAt string `json:"createdAt,omitempty"`
|
|
}
|
|
|
|
// AdminBackthinkItem is the wire shape of one background-think record in the
|
|
// admin monitor list.
|
|
type AdminBackthinkItem struct {
|
|
ID string `json:"id"`
|
|
Trigger string `json:"trigger"`
|
|
Conclusion string `json:"conclusion,omitempty"`
|
|
ShouldNotify bool `json:"shouldNotify"`
|
|
Pushed bool `json:"pushed"`
|
|
At int64 `json:"at"`
|
|
}
|
|
|
|
// adminListPersonas lists persona summaries (admin read).
|
|
func (s *Server) adminListPersonas(w http.ResponseWriter, r *http.Request) {
|
|
writeJSON(w, http.StatusOK, s.collectPersonas())
|
|
}
|
|
|
|
// adminListSessions lists channel sessions (admin read).
|
|
func (s *Server) adminListSessions(w http.ResponseWriter, r *http.Request) {
|
|
writeJSON(w, http.StatusOK, s.collectSessions(r.Context()))
|
|
}
|
|
|
|
// adminListMemories lists memory entries (admin read).
|
|
func (s *Server) adminListMemories(w http.ResponseWriter, r *http.Request) {
|
|
writeJSON(w, http.StatusOK, s.collectMemories(r.Context()))
|
|
}
|
|
|
|
// adminListPlugins lists every registered capability (admin read).
|
|
func (s *Server) adminListPlugins(w http.ResponseWriter, r *http.Request) {
|
|
out := make([]PluginSummary, 0)
|
|
if s.caps != nil {
|
|
for _, cap := range s.caps.List("") {
|
|
out = append(out, PluginSummary{
|
|
Name: cap.Name,
|
|
Kind: string(cap.Kind),
|
|
Description: cap.Description,
|
|
AllowInGroup: cap.Policy.AllowInGroup,
|
|
AllowInStranger: cap.Policy.AllowInStranger,
|
|
})
|
|
}
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminListChannels lists the registered channel adapters (admin read).
|
|
func (s *Server) adminListChannels(w http.ResponseWriter, r *http.Request) {
|
|
out := make([]ChannelSummary, 0)
|
|
if s.caps != nil {
|
|
for _, cap := range s.caps.List(capreg.KindChannel) {
|
|
ch, ok := cap.Value.(sdk.Channel)
|
|
if !ok {
|
|
continue
|
|
}
|
|
out = append(out, ChannelSummary{Name: ch.Name(), Connected: ch.IsConnected()})
|
|
}
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminListIoT lists IoT devices (admin read).
|
|
func (s *Server) adminListIoT(w http.ResponseWriter, r *http.Request) {
|
|
out := make([]iotDeviceSummary, 0)
|
|
if s.iot != nil {
|
|
devices, err := s.iot.List(r.Context())
|
|
if err != nil {
|
|
s.log.Error("list iot", "err", err)
|
|
writeError(w, apperr.Wrap(apperr.ErrInternal, "iot_failed", "failed to list devices"))
|
|
return
|
|
}
|
|
for _, d := range devices {
|
|
out = append(out, iotDeviceSummary{ID: d.ID, Name: d.Name, Type: d.Type, State: d.State, Online: d.Online})
|
|
}
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminGetLlm returns the LLM provider/model configuration read from the live
|
|
// config. API keys are never returned (the wire shape carries no key field), so
|
|
// the handler leaks nothing sensitive.
|
|
func (s *Server) adminGetLlm(w http.ResponseWriter, r *http.Request) {
|
|
cfg := s.cfg.LLM
|
|
writeJSON(w, http.StatusOK, AdminLlmConfig{Providers: []AdminLlmProvider{
|
|
{
|
|
ID: "openai",
|
|
Name: "OpenAI",
|
|
BaseURL: cfg.BaseURL,
|
|
Model: cfg.Model,
|
|
Multimodal: cfg.VisionModel != "",
|
|
Enabled: cfg.Provider != "anthropic",
|
|
Fallback: cfg.Fallback,
|
|
},
|
|
{
|
|
ID: "anthropic",
|
|
Name: "Anthropic",
|
|
BaseURL: cfg.AnthropicBaseURL,
|
|
Model: cfg.AnthropicModel,
|
|
Multimodal: false,
|
|
Enabled: cfg.Provider == "anthropic",
|
|
Fallback: cfg.AnthropicFallback,
|
|
},
|
|
}})
|
|
}
|
|
|
|
// adminListAutomations lists automations and reminders (admin read).
|
|
func (s *Server) adminListAutomations(w http.ResponseWriter, r *http.Request) {
|
|
out := make([]AdminAutomationRecord, 0)
|
|
if s.automations != nil {
|
|
for _, a := range s.automations.List() {
|
|
rec := AdminAutomationRecord{
|
|
ID: a.ID,
|
|
Name: a.Name,
|
|
Kind: a.Kind,
|
|
Cron: a.Cron,
|
|
Enabled: a.Enabled,
|
|
}
|
|
if !a.LastRun.IsZero() {
|
|
rec.LastRun = a.LastRun.Format(time.RFC3339)
|
|
}
|
|
if !a.NextRun.IsZero() {
|
|
rec.NextRun = a.NextRun.Format(time.RFC3339)
|
|
}
|
|
out = append(out, rec)
|
|
}
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminListUsers lists accounts and API keys (admin read). Without a wired
|
|
// UserStore it reports the single configured admin account rather than
|
|
// fabricating a column of virtual users.
|
|
func (s *Server) adminListUsers(w http.ResponseWriter, r *http.Request) {
|
|
out := []AdminUserRecord{{
|
|
ID: "admin",
|
|
Username: s.cfg.Auth.AdminUser,
|
|
Role: string(auth.RoleOwner),
|
|
}}
|
|
if s.users != nil {
|
|
for _, u := range s.users.List() {
|
|
rec := AdminUserRecord{ID: u.ID, Username: u.Username, Role: string(u.Role)}
|
|
if u.CreatedAt != nil {
|
|
rec.CreatedAt = u.CreatedAt.Format(time.RFC3339)
|
|
}
|
|
out = append(out, rec)
|
|
}
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminListBackthink lists the most recent background-think records (admin read).
|
|
func (s *Server) adminListBackthink(w http.ResponseWriter, r *http.Request) {
|
|
out := make([]AdminBackthinkItem, 0)
|
|
if s.backthink == nil {
|
|
writeJSON(w, http.StatusOK, out)
|
|
return
|
|
}
|
|
records, err := s.backthink.List(r.Context(), backthinkListLimit)
|
|
if err != nil {
|
|
s.log.Error("list backthink", "err", err)
|
|
writeError(w, apperr.Wrap(apperr.ErrInternal, "backthink_failed", "failed to list backthink records"))
|
|
return
|
|
}
|
|
for _, rec := range records {
|
|
out = append(out, AdminBackthinkItem{
|
|
ID: strconv.FormatInt(rec.ID, 10),
|
|
Trigger: rec.Trigger,
|
|
Conclusion: rec.Conclusion,
|
|
ShouldNotify: rec.ShouldPush,
|
|
Pushed: rec.PushResult.Pushed,
|
|
At: rec.At.UnixMilli(),
|
|
})
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|
|
|
|
// adminSetPolicy upserts the reachability markers for a capability. It is the
|
|
// audited admin write example (owner-only, enforced by the route registration).
|
|
func (s *Server) adminSetPolicy(w http.ResponseWriter, r *http.Request) {
|
|
var req policyRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeError(w, apperr.Wrap(apperr.ErrBadRequest, "bad_request", "invalid request body"))
|
|
return
|
|
}
|
|
if req.Name == "" {
|
|
writeError(w, apperr.Wrap(apperr.ErrBadRequest, "bad_request", "name is required"))
|
|
return
|
|
}
|
|
if s.caps == nil {
|
|
s.auditClaims(r, "policy.set", "error")
|
|
writeError(w, apperr.Wrap(apperr.ErrInternal, "policy_unavailable", "capability service is not configured"))
|
|
return
|
|
}
|
|
err := s.caps.SetPolicy(req.Name, capreg.ToolPolicy{AllowInGroup: req.AllowInGroup, AllowInStranger: req.AllowInStranger})
|
|
if err != nil {
|
|
s.auditClaims(r, "policy.set", "error")
|
|
if errors.Is(err, capreg.ErrNotFound) {
|
|
writeError(w, apperr.Wrap(apperr.ErrNotFound, "not_found", "capability %q not found", req.Name))
|
|
return
|
|
}
|
|
writeError(w, apperr.Wrap(apperr.ErrInternal, "policy_failed", "failed to set policy"))
|
|
return
|
|
}
|
|
s.auditClaims(r, "policy.set", "ok")
|
|
writeJSON(w, http.StatusOK, map[string]any{"name": req.Name, "allowInGroup": req.AllowInGroup, "allowInStranger": req.AllowInStranger})
|
|
}
|
|
|
|
// collectSessions returns a non-nil session slice from the configured store.
|
|
func (s *Server) collectSessions(ctx context.Context) []SessionSummary {
|
|
out := make([]SessionSummary, 0)
|
|
if s.sessions == nil {
|
|
return out
|
|
}
|
|
list, err := s.sessions.List(ctx)
|
|
if err != nil {
|
|
s.log.Error("list sessions", "err", err)
|
|
return out
|
|
}
|
|
for _, sess := range list {
|
|
out = append(out, summaryOfSession(sess))
|
|
}
|
|
return out
|
|
}
|
|
|
|
// collectMemories returns a non-nil memory slice from the configured store.
|
|
func (s *Server) collectMemories(ctx context.Context) []MemorySummary {
|
|
out := make([]MemorySummary, 0)
|
|
if s.memories == nil {
|
|
return out
|
|
}
|
|
list, err := s.memories.List(ctx)
|
|
if err != nil {
|
|
s.log.Error("list memories", "err", err)
|
|
return out
|
|
}
|
|
for _, it := range list {
|
|
out = append(out, MemorySummary{ID: it.ID, Scope: string(it.Scope), Text: it.Content})
|
|
}
|
|
return out
|
|
}
|
|
|
|
// iotDeviceSummary is the wire shape of an IoT device.
|
|
type iotDeviceSummary struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
Type string `json:"type"`
|
|
State map[string]any `json:"state"`
|
|
Online bool `json:"online"`
|
|
}
|