opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #916 from trheyi/main

Browse source 
fix: Enhance message role handling in Assistant API and object
This commit is contained in:
Max 2025-04-02 09:14:50 +08:00 • committed by GitHub
commit 8ace21a617
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/assistant/api.go
View file

@ -1086,6 +1086,11 @@ func (ast *Assistant) requestMessages(ctx context.Context, messages []chatMessag
role := message.Role role := message.Role
if role == "" { if role == "" {
if os.Getenv("YAO_AGENT_PRINT_REQUEST_MESSAGES") == "true" {
raw, _ := jsoniter.MarshalToString(message)
color.Red("Request Message Error, role is empty:")
fmt.Println(raw)
}
return nil, fmt.Errorf("role must be string") return nil, fmt.Errorf("role must be string")
} }

14
neo/assistant/object.go
View file

@ -290,6 +290,11 @@ func jsSend(info *v8go.FunctionCallbackInfo) *v8go.Value {
return bridge.JsException(info.Context(), err.Error()) return bridge.JsException(info.Context(), err.Error())
} }
// Set the role to assistant
if msg.Role == "" {
msg.Role = "assistant"
}
// Append the message to the contents // Append the message to the contents
if saveHistory { if saveHistory {
msg.AppendTo(global.Contents) msg.AppendTo(global.Contents)
@ -299,6 +304,11 @@ func jsSend(info *v8go.FunctionCallbackInfo) *v8go.Value {
case map[string]interface{}: case map[string]interface{}:
msg := message.New().Map(v) msg := message.New().Map(v)
if msg.Role == "" {
msg.Role = "assistant"
}
// Append the message to the contents
if saveHistory { if saveHistory {
msg.AppendTo(global.Contents) msg.AppendTo(global.Contents)
} }
@ -332,10 +342,6 @@ func jsReplace(info *v8go.FunctionCallbackInfo) *v8go.Value {
} }
replaced, _ := sui.Data(data).Replace(tmpl) replaced, _ := sui.Data(data).Replace(tmpl)
if err != nil {
return bridge.JsException(info.Context(), err.Error())
}
jsReplaced, err := bridge.JsValue(info.Context(), replaced) jsReplaced, err := bridge.JsValue(info.Context(), replaced)
if err != nil { if err != nil {
return bridge.JsException(info.Context(), err.Error()) return bridge.JsException(info.Context(), err.Error())