- Updated the completion request parsing logic to make the model field optional, allowing for better flexibility in handling requests. - Enhanced the stream end handling by adding JSON parsing for stream end data and sending a structured message to the frontend. - Modified the output writer to format data as Server-Sent Events (SSE) and ensured immediate flushing for real-time streaming in both CUI and OpenAI adapters.
123 lines
3.5 KiB
Go
123 lines
3.5 KiB
Go
package cui
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/yaoapp/yao/agent/context"
|
|
"github.com/yaoapp/yao/agent/i18n"
|
|
"github.com/yaoapp/yao/agent/output/message"
|
|
)
|
|
|
|
// Writer implements the message.Writer interface for CUI clients
|
|
type Writer struct {
|
|
ctx *context.Context
|
|
adapter *Adapter
|
|
}
|
|
|
|
// NewWriter creates a new CUI writer
|
|
func NewWriter(ctx *context.Context) (*Writer, error) {
|
|
return &Writer{
|
|
ctx: ctx,
|
|
adapter: NewAdapter(),
|
|
}, nil
|
|
}
|
|
|
|
// Write writes a single message to the output stream
|
|
func (w *Writer) Write(msg *message.Message) error {
|
|
// CUI adapter passes messages through as-is
|
|
chunks, err := w.adapter.Adapt(msg)
|
|
if err != nil {
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Error(i18n.T(w.ctx.Locale, "output.cui.writer.adapt_error"), map[string]any{ // "CUI Writer: Failed to adapt message"
|
|
"error": err.Error(),
|
|
"message_type": msg.Type,
|
|
})
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Send each chunk
|
|
for _, chunk := range chunks {
|
|
if err := w.sendChunk(chunk); err != nil {
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Error(i18n.T(w.ctx.Locale, "output.cui.writer.chunk_error"), map[string]any{"error": err.Error()}) // "CUI Writer: Failed to send chunk"
|
|
}
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// WriteGroup writes a message group to the output stream
|
|
func (w *Writer) WriteGroup(group *message.Group) error {
|
|
// For CUI, we send a group start message, all messages, then a group end message
|
|
// The group structure itself is also sent for clients that want it
|
|
|
|
// Send the group
|
|
if err := w.sendChunk(group); err != nil {
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Error(i18n.T(w.ctx.Locale, "output.cui.writer.group_error"), map[string]any{ // "CUI Writer: Failed to send message group"
|
|
"error": err.Error(),
|
|
"group_id": group.ID,
|
|
})
|
|
}
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Flush flushes any buffered data to the output stream
|
|
func (w *Writer) Flush() error {
|
|
// For SSE, we don't need explicit flushing
|
|
// The underlying connection handles it
|
|
return nil
|
|
}
|
|
|
|
// Close closes the writer and cleans up resources
|
|
func (w *Writer) Close() error {
|
|
// Nothing to clean up for CUI writer
|
|
return nil
|
|
}
|
|
|
|
// sendChunk sends a chunk to the output stream
|
|
func (w *Writer) sendChunk(chunk interface{}) error {
|
|
// Convert chunk to JSON
|
|
data, err := json.Marshal(chunk)
|
|
if err != nil {
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Error(i18n.T(w.ctx.Locale, "output.cui.writer.marshal_error"), map[string]any{"error": err.Error()}) // "CUI Writer: Failed to marshal chunk"
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Log outgoing data to trace for debugging
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Debug("CUI Writer: Sending chunk to client", map[string]any{
|
|
"data": string(data),
|
|
})
|
|
}
|
|
|
|
// Format as SSE (Server-Sent Events) format: "data: {json}\n\n"
|
|
sseData := []byte("data: ")
|
|
sseData = append(sseData, data...)
|
|
sseData = append(sseData, '\n', '\n')
|
|
|
|
// Send via context's writer
|
|
// The context knows how to send data based on the connection type (SSE, WebSocket, etc.)
|
|
if err := w.ctx.Send(sseData); err != nil {
|
|
if trace, _ := w.ctx.Trace(); trace != nil {
|
|
trace.Error(i18n.T(w.ctx.Locale, "output.cui.writer.send_error"), map[string]any{"error": err.Error()}) // "CUI Writer: Failed to send data to client"
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Flush immediately to ensure real-time streaming
|
|
// Cast to http.ResponseWriter and call Flush if available
|
|
if flusher, ok := w.ctx.Writer.(interface{ Flush() }); ok {
|
|
flusher.Flush()
|
|
}
|
|
|
|
return nil
|
|
}
|