Aska
7e39153a69
#1 工具布尔标记生效(agent-106, 安全红线): loop toolSchemas/runToolCalls 加 allow-set 安全门 restrictSchemas/applyToolSecurityGate——群聊/陌生人只暴露允许工具(默认关), 被拒not_allowed软提示+AuditEvent, owner全工具不变; 身份靠 ActorEnv(非提示词) #2 checkpoint 恢复(agent-109): run.go LoadLatest + resumableStopReason门控(只恢复in-flight工具循环,不出答案不续跑), 幂等不重放副作用, 新会话不误恢复; resume_test 4用例 #3 tool_result(agent-108, 协议层): Anthropic 原生tool_result块(tool_use_id/is_error)非user纯文本 + OpenAI tool消息补tool_call_id; Content加ToolCallID/IsError等; (loop接线层2处留待,见备注) #6 capacity_awaken推送(agent-107): onCapacity从只Debug改推WS hub(BroadcastCapacityAwaken, sessionId定向+payload对齐前端AwakenPayload) 管理面板移动端(agent-110): AdminApp 汉堡菜单+抽屉侧栏+标题truncate防换行, RBAC守卫不受影响 全仓 build/vet/test绿 + 前端build绿; 前端无涉差异已对齐 备注: #3 loop接线层2处(assistant工具轮append历史 + Message.ToolCallID/IsError)留给后续; #4代审/#5子代理触发/#7拆文件后置(主人说后三不急)
432 lines
14 KiB
Go
432 lines
14 KiB
Go
package model
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/config"
|
|
)
|
|
|
|
const okCompletion = `{
|
|
"id": "cmpl-1",
|
|
"model": "gpt-test",
|
|
"choices": [
|
|
{"index": 0, "message": {"role": "assistant", "content": "Hello!"}, "finish_reason": "stop"}
|
|
],
|
|
"usage": {"prompt_tokens": 5, "completion_tokens": 2, "total_tokens": 7}
|
|
}`
|
|
|
|
// capturedRequest records what an OpenAIChatAdapter sent to a stub server.
|
|
type capturedRequest struct {
|
|
method string
|
|
path string
|
|
contentType string
|
|
body map[string]any
|
|
}
|
|
|
|
func newCompletionServer(t *testing.T, status int, contentType, body string, ch chan<- capturedRequest) *httptest.Server {
|
|
t.Helper()
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
var reqBody map[string]any
|
|
if ch != nil {
|
|
_ = json.NewDecoder(r.Body).Decode(&reqBody)
|
|
}
|
|
if contentType != "" {
|
|
w.Header().Set("Content-Type", contentType)
|
|
}
|
|
w.WriteHeader(status)
|
|
if body != "" {
|
|
_, _ = io.WriteString(w, body)
|
|
}
|
|
if ch != nil {
|
|
ch <- capturedRequest{
|
|
method: r.Method,
|
|
path: r.URL.Path,
|
|
contentType: r.Header.Get("Content-Type"),
|
|
body: reqBody,
|
|
}
|
|
}
|
|
}))
|
|
t.Cleanup(srv.Close)
|
|
return srv
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_NonStreaming(t *testing.T) {
|
|
t.Parallel()
|
|
ch := make(chan capturedRequest, 1)
|
|
srv := newCompletionServer(t, http.StatusOK, "application/json", okCompletion, ch)
|
|
|
|
recs := make([]CallRecord, 0, 1)
|
|
temp := 1.0
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, APIKey: "sk-test", Model: "gpt-test"},
|
|
WithRecorder(func(cr CallRecord) { recs = append(recs, cr) }))
|
|
|
|
ctx := context.Background()
|
|
resp, err := ad.Chat(ctx, Request{
|
|
Messages: []Message{TextMessage(RoleUser, "hi")},
|
|
Model: "gpt-test",
|
|
Temperature: &temp,
|
|
MaxTokens: 64,
|
|
Purpose: "chat",
|
|
}, Options{})
|
|
if err != nil {
|
|
t.Fatalf("Chat error: %v", err)
|
|
}
|
|
|
|
req := <-ch
|
|
if req.method != http.MethodPost {
|
|
t.Errorf("method = %s, want POST", req.method)
|
|
}
|
|
if req.path != "/chat/completions" {
|
|
t.Errorf("path = %s, want /chat/completions", req.path)
|
|
}
|
|
if req.contentType != "application/json" {
|
|
t.Errorf("content-type = %s, want application/json", req.contentType)
|
|
}
|
|
if req.body["model"] != "gpt-test" {
|
|
t.Errorf("body.model = %v, want gpt-test", req.body["model"])
|
|
}
|
|
if req.body["stream"] != nil && req.body["stream"] != false {
|
|
t.Errorf("body.stream = %v, want omitted(false)", req.body["stream"])
|
|
}
|
|
if req.body["temperature"] != 1.0 {
|
|
t.Errorf("body.temperature = %v, want 1.0", req.body["temperature"])
|
|
}
|
|
if req.body["max_tokens"] != float64(64) {
|
|
t.Errorf("body.max_tokens = %v, want 64", req.body["max_tokens"])
|
|
}
|
|
msgs, _ := req.body["messages"].([]any)
|
|
if len(msgs) != 1 {
|
|
t.Fatalf("body.messages = %v, want 1 message", req.body["messages"])
|
|
}
|
|
|
|
if resp.Model != "gpt-test" {
|
|
t.Errorf("resp.Model = %q, want gpt-test", resp.Model)
|
|
}
|
|
if resp.Content != "Hello!" {
|
|
t.Errorf("resp.Content = %q, want Hello!", resp.Content)
|
|
}
|
|
if resp.TotalTokens != 7 || resp.PromptTokens != 5 || resp.CompletionTokens != 2 {
|
|
t.Errorf("resp usage = (%d,%d,%d), want (5,2,7)", resp.PromptTokens, resp.CompletionTokens, resp.TotalTokens)
|
|
}
|
|
if resp.Message.Role != RoleAssistant || len(resp.Message.Content) != 1 || resp.Message.Content[0].Text != "Hello!" {
|
|
t.Errorf("resp.Message = %+v", resp.Message)
|
|
}
|
|
|
|
if len(recs) != 1 {
|
|
t.Fatalf("records = %d, want 1", len(recs))
|
|
}
|
|
if recs[0].Model != "gpt-test" || recs[0].Purpose != "chat" || recs[0].Tokens != 7 || recs[0].TookMs < 0 {
|
|
t.Errorf("record = %+v, want model=gpt-test purpose=chat tokens=7 took_ms>=0", recs[0])
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_ImageContent(t *testing.T) {
|
|
t.Parallel()
|
|
ch := make(chan capturedRequest, 1)
|
|
srv := newCompletionServer(t, http.StatusOK, "application/json", okCompletion, ch)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"})
|
|
|
|
req := Request{Messages: []Message{ImageMessage(RoleUser, "what is this", "data:image/png;base64,abc")}}
|
|
if _, err := ad.Chat(context.Background(), req, Options{}); err != nil {
|
|
t.Fatalf("Chat error: %v", err)
|
|
}
|
|
|
|
got := <-ch
|
|
msgs, _ := got.body["messages"].([]any)
|
|
part0, _ := msgs[0].(map[string]any)
|
|
content, _ := part0["content"].([]any)
|
|
if len(content) != 2 {
|
|
t.Fatalf("content parts = %d, want 2 (text+image)", len(content))
|
|
}
|
|
found := false
|
|
for _, c := range content {
|
|
cp, _ := c.(map[string]any)
|
|
if cp["type"] != "image_url" {
|
|
continue
|
|
}
|
|
found = true
|
|
iu, _ := cp["image_url"].(map[string]any)
|
|
if iu["url"] != "data:image/png;base64,abc" {
|
|
t.Fatalf("image url = %v, want data:image/png;base64,abc", iu["url"])
|
|
}
|
|
}
|
|
if !found {
|
|
t.Fatalf("no image_url part found in %v", content)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_ToolsPlaceholder(t *testing.T) {
|
|
t.Parallel()
|
|
ch := make(chan capturedRequest, 1)
|
|
srv := newCompletionServer(t, http.StatusOK, "application/json", okCompletion, ch)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"})
|
|
|
|
req := Request{Messages: []Message{TextMessage(RoleUser, "hi")},
|
|
Tools: []ToolSpec{{Name: "lookup", Description: "look it up", Parameters: map[string]any{"type": "object"}}}}
|
|
if _, err := ad.Chat(context.Background(), req, Options{}); err != nil {
|
|
t.Fatalf("Chat error: %v", err)
|
|
}
|
|
|
|
got := <-ch
|
|
tools, ok := got.body["tools"].([]any)
|
|
if !ok || len(tools) != 1 {
|
|
t.Fatalf("body.tools = %v, want 1 entry", got.body["tools"])
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_ChatStream_SSE(t *testing.T) {
|
|
t.Parallel()
|
|
sse := strings.Join([]string{
|
|
`data: {"model":"gpt-test","choices":[{"index":0,"delta":{"role":"assistant","content":"Hel"}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{"content":"lo"}}]}`,
|
|
``,
|
|
`data: {"model":"gpt-test","choices":[],"usage":{"prompt_tokens":5,"completion_tokens":2,"total_tokens":7}}`,
|
|
``,
|
|
`data: [DONE]`,
|
|
``,
|
|
}, "\n")
|
|
srv := newCompletionServer(t, http.StatusOK, "text/event-stream", sse, nil)
|
|
|
|
recs := make([]CallRecord, 0, 1)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"},
|
|
WithRecorder(func(cr CallRecord) { recs = append(recs, cr) }))
|
|
|
|
var events []StreamEvent
|
|
resp, err := ad.ChatStream(context.Background(),
|
|
Request{Messages: []Message{TextMessage(RoleUser, "hi")}, Model: "gpt-test", Purpose: "chat"},
|
|
func(ev StreamEvent) { events = append(events, ev) })
|
|
if err != nil {
|
|
t.Fatalf("ChatStream error: %v", err)
|
|
}
|
|
if resp.Content != "Hello" {
|
|
t.Errorf("resp.Content = %q, want Hello", resp.Content)
|
|
}
|
|
if resp.Model != "gpt-test" {
|
|
t.Errorf("resp.Model = %q, want gpt-test", resp.Model)
|
|
}
|
|
if resp.TotalTokens != 7 {
|
|
t.Errorf("resp.TotalTokens = %d, want 7", resp.TotalTokens)
|
|
}
|
|
wantEvents := []StreamEvent{
|
|
{Kind: StreamKindTextStart},
|
|
{Kind: StreamKindTextDelta, Delta: "Hel"},
|
|
{Kind: StreamKindTextDelta, Delta: "lo"},
|
|
{Kind: StreamKindTextEnd},
|
|
}
|
|
if !reflect.DeepEqual(events, wantEvents) {
|
|
t.Errorf("events = %+v, want %+v", events, wantEvents)
|
|
}
|
|
if len(recs) != 1 || recs[0].Tokens != 7 || recs[0].Purpose != "chat" {
|
|
t.Errorf("records = %+v, want 1 record tokens=7 purpose=chat", recs)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_UpstreamError(t *testing.T) {
|
|
t.Parallel()
|
|
srv := newCompletionServer(t, http.StatusInternalServerError, "application/json", `{"error":"boom"}`, nil)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "m"})
|
|
|
|
_, err := ad.Chat(context.Background(), Request{Messages: []Message{TextMessage(RoleUser, "hi")}}, Options{})
|
|
if err == nil {
|
|
t.Fatal("want error, got nil")
|
|
}
|
|
if !errors.Is(err, ErrUpstream) {
|
|
t.Fatalf("err = %v, want ErrUpstream", err)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_NoBaseURL(t *testing.T) {
|
|
t.Parallel()
|
|
ad := NewOpenAIChat(config.LLMConfig{})
|
|
if _, err := ad.Chat(context.Background(), Request{Messages: []Message{TextMessage(RoleUser, "hi")}}, Options{}); !errors.Is(err, ErrUpstream) {
|
|
t.Fatalf("err = %v, want ErrUpstream", err)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_NoModel(t *testing.T) {
|
|
t.Parallel()
|
|
srv := newCompletionServer(t, http.StatusOK, "application/json", okCompletion, nil)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL})
|
|
if _, err := ad.Chat(context.Background(), Request{Messages: []Message{TextMessage(RoleUser, "hi")}}, Options{}); !errors.Is(err, ErrNoModel) {
|
|
t.Fatalf("err = %v, want ErrNoModel", err)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_ChatStream_ReasoningAndText(t *testing.T) {
|
|
t.Parallel()
|
|
sse := strings.Join([]string{
|
|
`data: {"model":"gpt-test","choices":[{"index":0,"delta":{"role":"assistant","reasoning_content":"Let me th"}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{"reasoning_content":"ink about it"}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{"content":"Hel"}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{"content":"lo"}}]}`,
|
|
``,
|
|
`data: {"choices":[],"usage":{"prompt_tokens":5,"completion_tokens":2,"total_tokens":7}}`,
|
|
``,
|
|
`data: [DONE]`,
|
|
``,
|
|
}, "\n")
|
|
srv := newCompletionServer(t, http.StatusOK, "text/event-stream", sse, nil)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"})
|
|
|
|
var events []StreamEvent
|
|
resp, err := ad.ChatStream(context.Background(),
|
|
Request{Messages: []Message{TextMessage(RoleUser, "hi")}, Model: "gpt-test"},
|
|
func(ev StreamEvent) { events = append(events, ev) })
|
|
if err != nil {
|
|
t.Fatalf("ChatStream error: %v", err)
|
|
}
|
|
if resp.Content != "Hello" {
|
|
t.Errorf("resp.Content = %q, want Hello (reasoning must not leak into body content)", resp.Content)
|
|
}
|
|
wantEvents := []StreamEvent{
|
|
{Kind: StreamKindThinkingStart},
|
|
{Kind: StreamKindThinkingDelta, Delta: "Let me th"},
|
|
{Kind: StreamKindThinkingDelta, Delta: "ink about it"},
|
|
{Kind: StreamKindThinkingEnd},
|
|
{Kind: StreamKindTextStart},
|
|
{Kind: StreamKindTextDelta, Delta: "Hel"},
|
|
{Kind: StreamKindTextDelta, Delta: "lo"},
|
|
{Kind: StreamKindTextEnd},
|
|
}
|
|
if !reflect.DeepEqual(events, wantEvents) {
|
|
t.Errorf("events = %+v, want %+v", events, wantEvents)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_ChatStream_ToolCall(t *testing.T) {
|
|
t.Parallel()
|
|
sse := strings.Join([]string{
|
|
`data: {"model":"gpt-test","choices":[{"index":0,"delta":{"role":"assistant","tool_calls":[{"index":0,"id":"call_1","function":{"name":"lookup","arguments":"{\"loc"}}]}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":"ation\":\"Paris\"}"}}]}}]}`,
|
|
``,
|
|
`data: {"choices":[{"delta":{},"finish_reason":"tool_calls"}]}`,
|
|
``,
|
|
`data: {"choices":[],"usage":{"prompt_tokens":5,"completion_tokens":6,"total_tokens":11}}`,
|
|
``,
|
|
`data: [DONE]`,
|
|
``,
|
|
}, "\n")
|
|
srv := newCompletionServer(t, http.StatusOK, "text/event-stream", sse, nil)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"})
|
|
|
|
var events []StreamEvent
|
|
resp, err := ad.ChatStream(context.Background(),
|
|
Request{Messages: []Message{TextMessage(RoleUser, "hi")}, Model: "gpt-test"},
|
|
func(ev StreamEvent) { events = append(events, ev) })
|
|
if err != nil {
|
|
t.Fatalf("ChatStream error: %v", err)
|
|
}
|
|
if len(resp.ToolCalls) != 1 {
|
|
t.Fatalf("resp.ToolCalls = %+v, want 1", resp.ToolCalls)
|
|
}
|
|
tc := resp.ToolCalls[0]
|
|
if tc.Name != "lookup" {
|
|
t.Errorf("tool call name = %q, want lookup", tc.Name)
|
|
}
|
|
if tc.Args["location"] != "Paris" {
|
|
t.Errorf("tool call args.location = %v, want Paris (reassembled from argument fragments)", tc.Args["location"])
|
|
}
|
|
if resp.Content != "" {
|
|
t.Errorf("resp.Content = %q, want empty (tool-only response)", resp.Content)
|
|
}
|
|
wantEvents := []StreamEvent{
|
|
{Kind: StreamKindToolCallStart, Index: 0, ID: "call_1"},
|
|
{Kind: StreamKindToolCallDelta, Index: 0, ID: "call_1", Delta: `{"loc`},
|
|
{Kind: StreamKindToolCallDelta, Index: 0, ID: "call_1", Delta: `ation":"Paris"}`},
|
|
{Kind: StreamKindToolCallEnd, Index: 0, ID: "call_1"},
|
|
}
|
|
if !reflect.DeepEqual(events, wantEvents) {
|
|
t.Errorf("events = %+v, want %+v", events, wantEvents)
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Chat_ToolRoundTrip(t *testing.T) {
|
|
t.Parallel()
|
|
ch := make(chan capturedRequest, 1)
|
|
srv := newCompletionServer(t, http.StatusOK, "application/json", okCompletion, ch)
|
|
ad := NewOpenAIChat(config.LLMConfig{BaseURL: srv.URL, Model: "gpt-test"})
|
|
|
|
req := Request{Messages: []Message{
|
|
TextMessage(RoleUser, "what's the weather in Paris?"),
|
|
AssistantToolCallMessage([]ToolCall{{ID: "call_1", Name: "weather", Args: map[string]any{"city": "Paris"}}}),
|
|
ToolResultMessage("call_1", `{"temp":22}`, true),
|
|
}, Model: "gpt-test"}
|
|
if _, err := ad.Chat(context.Background(), req, Options{}); err != nil {
|
|
t.Fatalf("Chat error: %v", err)
|
|
}
|
|
|
|
got := <-ch
|
|
msgs, _ := got.body["messages"].([]any)
|
|
if len(msgs) != 3 {
|
|
t.Fatalf("body.messages = %v, want 3 messages", got.body["messages"])
|
|
}
|
|
|
|
// The assistant turn must carry tool_calls (so the tool message can be
|
|
// correlated by the provider) — this was previously dropped entirely.
|
|
assistant, _ := msgs[1].(map[string]any)
|
|
if assistant["role"] != "assistant" {
|
|
t.Errorf("assistant role = %v, want assistant", assistant["role"])
|
|
}
|
|
tcs, _ := assistant["tool_calls"].([]any)
|
|
if len(tcs) != 1 {
|
|
t.Fatalf("assistant tool_calls = %v, want 1 entry", assistant["tool_calls"])
|
|
}
|
|
tc := tcs[0].(map[string]any)
|
|
if tc["id"] != "call_1" || tc["type"] != "function" {
|
|
t.Errorf("tool_call = %v, want id=call_1 type=function", tc)
|
|
}
|
|
fn, _ := tc["function"].(map[string]any)
|
|
if fn["name"] != "weather" || fn["arguments"] != `{"city":"Paris"}` {
|
|
t.Errorf("function = %#v, want name=weather arguments={\"city\":\"Paris\"}", fn)
|
|
}
|
|
|
|
// The tool message must carry tool_call_id (the audit's gap) and the result.
|
|
tool, _ := msgs[2].(map[string]any)
|
|
if tool["role"] != "tool" {
|
|
t.Errorf("tool role = %v, want tool", tool["role"])
|
|
}
|
|
if tool["tool_call_id"] != "call_1" {
|
|
t.Errorf("tool_call_id = %v, want call_1", tool["tool_call_id"])
|
|
}
|
|
if tool["content"] != `{"temp":22}` {
|
|
t.Errorf("tool content = %v, want the raw result", tool["content"])
|
|
}
|
|
}
|
|
|
|
func TestOpenAIChat_Build_ToolMessageLegacy(t *testing.T) {
|
|
t.Parallel()
|
|
// The loop's current form: a RoleTool message carrying a plain text part and
|
|
// Message.ToolCallID. buildMessages must emit a tool message with tool_call_id.
|
|
m := Message{Role: RoleTool, ToolCallID: "call_9",
|
|
Content: []Content{{Type: ContentTypeText, Text: "tool weather result: 22"}}}
|
|
msgs, err := buildMessages([]Message{m})
|
|
if err != nil {
|
|
t.Fatalf("buildMessages error: %v", err)
|
|
}
|
|
if len(msgs) != 1 {
|
|
t.Fatalf("messages = %d, want 1", len(msgs))
|
|
}
|
|
if msgs[0].Role != "tool" {
|
|
t.Errorf("role = %q, want tool", msgs[0].Role)
|
|
}
|
|
if msgs[0].ToolCallID != "call_9" {
|
|
t.Errorf("tool_call_id = %q, want call_9", msgs[0].ToolCallID)
|
|
}
|
|
if msgs[0].Content != "tool weather result: 22" {
|
|
t.Errorf("content = %v, want the text", msgs[0].Content)
|
|
}
|
|
}
|