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

Merge pull request #872 from trheyi/main

Browse source 
Rename Context to GinContext in GlobalVariables struct
This commit is contained in:
Max 2025-02-22 14:07:37 +08:00 • committed by GitHub
commit f18c4c94cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
neo/assistant/object.go
View file

@ -23,7 +23,7 @@ import (
type GlobalVariables struct { type GlobalVariables struct {
Assistant *Assistant Assistant *Assistant
Contents *chatMessage.Contents Contents *chatMessage.Contents
Context *gin.Context GinContext *gin.Context
ChatContext chatctx.Context ChatContext chatctx.Context
} }
@ -39,7 +39,7 @@ func (ast *Assistant) InitObject(v8ctx *v8.Context, c *gin.Context, context chat
v8ctx.WithGlobal("__yao_agent_global", &GlobalVariables{ v8ctx.WithGlobal("__yao_agent_global", &GlobalVariables{
Assistant: ast, Assistant: ast,
Contents: contents, Contents: contents,
Context: c, GinContext: c,
ChatContext: context, ChatContext: context,
}) })
@ -89,7 +89,7 @@ func jsSend(info *v8go.FunctionCallbackInfo) *v8go.Value {
if saveHistory { if saveHistory {
msg.AppendTo(global.Contents) msg.AppendTo(global.Contents)
} }
msg.Write(global.Context.Writer) msg.Write(global.GinContext.Writer)
return nil return nil
case map[string]interface{}: case map[string]interface{}:
@ -97,7 +97,7 @@ func jsSend(info *v8go.FunctionCallbackInfo) *v8go.Value {
if saveHistory { if saveHistory {
msg.AppendTo(global.Contents) msg.AppendTo(global.Contents)
} }
msg.Write(global.Context.Writer) msg.Write(global.GinContext.Writer)
return nil return nil
default: default:
@ -180,7 +180,7 @@ func jsCall(info *v8go.FunctionCallbackInfo) *v8go.Value {
} }
defer ctx.Close() defer ctx.Close()
global.Assistant.InitObject(ctx, global.Context, chatContext, global.Contents) global.Assistant.InitObject(ctx, global.GinContext, chatContext, global.Contents)
_, err = ctx.CallAnonymousWith(context.Background(), source, cbArgs...) _, err = ctx.CallAnonymousWith(context.Background(), source, cbArgs...)
if err != nil { if err != nil {
log.Error("Failed to call the method: %s", err.Error()) log.Error("Failed to call the method: %s", err.Error())
@ -223,7 +223,7 @@ func jsCall(info *v8go.FunctionCallbackInfo) *v8go.Value {
} }
defer ctx.Close() defer ctx.Close()
global.Assistant.InitObject(ctx, global.Context, global.ChatContext, global.Contents) global.Assistant.InitObject(ctx, global.GinContext, global.ChatContext, global.Contents)
_, err = ctx.CallWith(context.Background(), name, cbArgs...) _, err = ctx.CallWith(context.Background(), name, cbArgs...)
if err != nil { if err != nil {
log.Error("Failed to call the method: %s", err.Error()) log.Error("Failed to call the method: %s", err.Error())
@ -259,7 +259,7 @@ func jsCall(info *v8go.FunctionCallbackInfo) *v8go.Value {
} }
} }
err = newAst.Execute(global.Context, chatContext, input, options, cb) // Execute the assistant err = newAst.Execute(global.GinContext, chatContext, input, options, cb) // Execute the assistant
if err != nil { if err != nil {
return bridge.JsException(info.Context(), err.Error()) return bridge.JsException(info.Context(), err.Error())
} }