Aska
24d5924cee
- 新增 model/stream.go：StreamKind(text/thinking/tool_call 各 start/delta/end + tool_execution)
+ StreamEvent{Kind,Delta,Index,ID}。
- ChatStream 签名 onChunk func(delta string)→onEvent func(StreamEvent)；loop OnStream 同改；
streamStep 转发结构化事件。
- openai：text_delta + text_start/text_end（正文三段式）；anthropic：文本块 text_*/tool_call_*
按块 Index（content_block_stop 分支）真分段；fallback：有事件即交付。
- ws_hub：wsEvent 壳补 turnId/seq；新增 broadcastStream；streamChat 每帧打 turnId+seq；
stream.go 把事件 publish 到 bus ws.stream。
- ws_bridge：streamEventData 映射 text_*→message.start/delta/end、thinking_*→thinking.*、
tool_call_*→tool_call.*、tool_execution_update→tool_execution.update，未知回退 stream_chunk。
- 前端 ws.ts：解析 message.start/delta/end、thinking.start/delta/end(pendingThinking)、
tool_call.start/end→addTool、tool_execution.update；保留旧 stream_chunk/thinking/tool_used 兼容；
types.ts 补 turnId/seq。Docs/api-client.md 增 §3.1 v0.4。
已知限制（注释/文档标注）：turnId 在 OnStream→bus→relay 路径暂为空（StreamEvent 无 turnId 字段，
bus ws.stream 载荷不带 turn）；OpenAI adapter 未解析 tool_call 段；thinking 段两 adapter 暂不发；
tool_execution.update 是保留项（随工具循环钩子后置）。go build/vet/test + 前端 tsc 全绿。
58 lines
1.9 KiB
Go
58 lines
1.9 KiB
Go
package loop
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/agent"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
)
|
|
|
|
// streamStep drives a streaming model call. It is the streaming counterpart of
|
|
// agent.RunStep: it builds the request from the agent's public surface, runs the
|
|
// loop's input guardrail, streams deltas through OnStream, runs the output
|
|
// guardrail and decodes any tool calls. Because RunStep does not expose a stream
|
|
// path, this method is owned by the loop; it mirrors the agent's semantics so the
|
|
// two behave identically apart from the delta callback.
|
|
func (l *Loop) streamStep(ctx context.Context, messages []model.Message) (*stepOutcome, error) {
|
|
adapter := l.agent.Adapter()
|
|
if adapter == nil {
|
|
return nil, fmt.Errorf("loop: stream step: %w", ErrNoAdapter)
|
|
}
|
|
req := l.buildRequest(messages)
|
|
|
|
if l.guards != nil {
|
|
verdict, err := l.guards.CheckInput(ctx, &req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: check input: %w", err)
|
|
}
|
|
if verdict != nil && !verdict.Allow {
|
|
return &stepOutcome{final: true, text: verdict.Reason, stopReason: agent.StopReasonGuardrailInput}, nil
|
|
}
|
|
}
|
|
|
|
resp, err := adapter.ChatStream(ctx, req, func(ev model.StreamEvent) {
|
|
if l.onStream != nil {
|
|
l.onStream(ev)
|
|
}
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: chat stream: %w", err)
|
|
}
|
|
|
|
if l.guards != nil {
|
|
verdict, err := l.guards.CheckOutput(ctx, &resp)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("loop: check output: %w", err)
|
|
}
|
|
if verdict != nil && !verdict.Allow {
|
|
return &stepOutcome{final: true, text: verdict.Reason, stopReason: agent.StopReasonGuardrailOutput}, nil
|
|
}
|
|
}
|
|
|
|
if calls, ok := decodeToolCalls(resp); ok {
|
|
return &stepOutcome{final: false, toolCalls: calls, stopReason: agent.StopReasonToolCalls}, nil
|
|
}
|
|
return &stepOutcome{final: true, text: resp.Content, stopReason: agent.StopReasonStop}, nil
|
|
}
|