Aska
518bd0a230
批次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 行。
66 lines
1.7 KiB
Go
66 lines
1.7 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
func TestRun_ImageResolverFoldsToText(t *testing.T) {
|
|
t.Parallel()
|
|
ad := &mockAdapter{chat: []mgResp{{resp: model.Response{Model: "m", Content: "Done."}}}}
|
|
a := newTestAgent(t, ad, nil)
|
|
l := New(Options{
|
|
Agent: a,
|
|
MaxRounds: 8,
|
|
Vision: ImageResolveFunc(func(_ context.Context, _ model.Message) (model.Message, error) {
|
|
return model.TextMessage(model.RoleUser, "图中是一只猫"), nil
|
|
}),
|
|
})
|
|
|
|
in := []model.Message{model.ImageMessage(model.RoleUser, "", "data:image/png;base64,AAAA")}
|
|
if _, err := l.Run(context.Background(), "sess-1", in); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if len(ad.reqs) == 0 {
|
|
t.Fatalf("no model request recorded")
|
|
}
|
|
var userSeen bool
|
|
for _, m := range ad.reqs[0].Messages {
|
|
if m.Role == model.RoleUser {
|
|
userSeen = true
|
|
if messageHasImage(m) {
|
|
t.Fatalf("image still reached the model: %+v", m)
|
|
}
|
|
}
|
|
}
|
|
if !userSeen {
|
|
t.Fatalf("no user message seen by the model")
|
|
}
|
|
}
|
|
|
|
func TestRun_ImageKeptWithoutResolver(t *testing.T) {
|
|
t.Parallel()
|
|
ad := &mockAdapter{chat: []mgResp{{resp: model.Response{Model: "m", Content: "Done."}}}}
|
|
a := newTestAgent(t, ad, nil)
|
|
l := New(Options{Agent: a, MaxRounds: 8})
|
|
|
|
in := []model.Message{model.ImageMessage(model.RoleUser, "look", "data:image/png;base64,AAAA")}
|
|
if _, err := l.Run(context.Background(), "sess-1", in); err != nil {
|
|
t.Fatalf("Run: %v", err)
|
|
}
|
|
if len(ad.reqs) == 0 {
|
|
t.Fatalf("no model request recorded")
|
|
}
|
|
var sawImage bool
|
|
for _, m := range ad.reqs[0].Messages {
|
|
if m.Role == model.RoleUser && messageHasImage(m) {
|
|
sawImage = true
|
|
}
|
|
}
|
|
if !sawImage {
|
|
t.Fatalf("expected the image part to pass through without a resolver")
|
|
}
|
|
}
|