Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: dynamically update tools and other tool params on subsequent chats #824

Merged
merged 1 commit into from
Aug 27, 2024
Merged

chore: dynamically update tools and other tool params on subsequent chats #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions pkg/engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,29 @@ func (c *Context) WrappedContext(e *Engine) context.Context {
return context.WithValue(c.Ctx, engineContext{}, &cp)
}

func populateMessageParams(ctx Context, completion *types.CompletionRequest, tool types.Tool) error {
completion.Model = tool.Parameters.ModelName
completion.MaxTokens = tool.Parameters.MaxTokens
completion.JSONResponse = tool.Parameters.JSONResponse
completion.Cache = tool.Parameters.Cache
completion.Chat = tool.Parameters.Chat
completion.Temperature = tool.Parameters.Temperature
completion.InternalSystemPrompt = tool.Parameters.InternalPrompt

if tool.Chat && completion.InternalSystemPrompt == nil {
completion.InternalSystemPrompt = new(bool)
}

var err error
completion.Tools, err = tool.GetCompletionTools(*ctx.Program, ctx.AgentGroup...)
if err != nil {
return err
}

completion.Messages = addUpdateSystem(ctx, tool, completion.Messages)
return nil
}

func (e *Engine) Start(ctx Context, input string) (ret *Return, _ error) {
tool := ctx.Tool

Expand Down Expand Up @@ -290,28 +313,11 @@ func (e *Engine) Start(ctx Context, input string) (ret *Return, _ error) {
return nil, fmt.Errorf("credential tools cannot make calls to the LLM")
}

completion := types.CompletionRequest{
Model: tool.Parameters.ModelName,
MaxTokens: tool.Parameters.MaxTokens,
JSONResponse: tool.Parameters.JSONResponse,
Cache: tool.Parameters.Cache,
Chat: tool.Parameters.Chat,
Temperature: tool.Parameters.Temperature,
InternalSystemPrompt: tool.Parameters.InternalPrompt,
}

if tool.Chat && completion.InternalSystemPrompt == nil {
completion.InternalSystemPrompt = new(bool)
}

var err error
completion.Tools, err = tool.GetCompletionTools(*ctx.Program, ctx.AgentGroup...)
if err != nil {
var completion types.CompletionRequest
if err := populateMessageParams(ctx, &completion, tool); err != nil {
return nil, err
}

completion.Messages = addUpdateSystem(ctx, tool, completion.Messages)

if tool.Chat && input == "{}" {
input = ""
}
Expand Down Expand Up @@ -497,6 +503,9 @@ func (e *Engine) Continue(ctx Context, state *State, results ...CallResult) (*Re
return nil, fmt.Errorf("invalid continue call, no completion needed")
}

state.Completion.Messages = addUpdateSystem(ctx, ctx.Tool, state.Completion.Messages)
if err := populateMessageParams(ctx, &state.Completion, ctx.Tool); err != nil {
return nil, err
}

return e.complete(ctx.Ctx, state)
}
31 changes: 31 additions & 0 deletions pkg/tests/runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"testing"

"github.com/gptscript-ai/gptscript/pkg/engine"
"github.com/gptscript-ai/gptscript/pkg/loader"
"github.com/gptscript-ai/gptscript/pkg/tests/tester"
"github.com/gptscript-ai/gptscript/pkg/types"
"github.com/hexops/autogold/v2"
Expand Down Expand Up @@ -1041,3 +1042,33 @@ func TestRuntimesLocalDev(t *testing.T) {
_ = os.RemoveAll("testdata/TestRuntimesLocalDev/node_modules")
_ = os.RemoveAll("testdata/TestRuntimesLocalDev/package-lock.json")
}

func TestToolsChange(t *testing.T) {
r := tester.NewRunner(t)
prg, err := loader.ProgramFromSource(context.Background(), `
chat: true
tools: sys.ls, sys.read, sys.write
`, "")
require.NoError(t, err)

resp, err := r.Chat(context.Background(), nil, prg, nil, "input 1")
require.NoError(t, err)
r.AssertResponded(t)
assert.False(t, resp.Done)
autogold.Expect("TEST RESULT CALL: 1").Equal(t, resp.Content)
autogold.ExpectFile(t, toJSONString(t, resp), autogold.Name(t.Name()+"/step1"))

prg, err = loader.ProgramFromSource(context.Background(), `
chat: true
temperature: 0.6
tools: sys.ls, sys.write
`, "")
require.NoError(t, err)

resp, err = r.Chat(context.Background(), resp.State, prg, nil, "input 2")
require.NoError(t, err)
r.AssertResponded(t)
assert.False(t, resp.Done)
autogold.Expect("TEST RESULT CALL: 2").Equal(t, resp.Content)
autogold.ExpectFile(t, toJSONString(t, resp), autogold.Name(t.Name()+"/step2"))
}
9 changes: 9 additions & 0 deletions pkg/tests/testdata/TestToolsChange/call1-resp.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
`{
"role": "assistant",
"content": [
{
"text": "TEST RESULT CALL: 1"
}
],
"usage": {}
}`
70 changes: 70 additions & 0 deletions pkg/tests/testdata/TestToolsChange/call1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
`{
"model": "gpt-4o",
"internalSystemPrompt": false,
"tools": [
{
"function": {
"toolID": "sys.ls",
"name": "ls",
"description": "Lists the contents of a directory",
"parameters": {
"properties": {
"dir": {
"description": "The directory to list",
"type": "string"
}
},
"type": "object"
}
}
},
{
"function": {
"toolID": "sys.read",
"name": "read",
"description": "Reads the contents of a file",
"parameters": {
"properties": {
"filename": {
"description": "The name of the file to read",
"type": "string"
}
},
"type": "object"
}
}
},
{
"function": {
"toolID": "sys.write",
"name": "write",
"description": "Write the contents to a file",
"parameters": {
"properties": {
"content": {
"description": "The content to write",
"type": "string"
},
"filename": {
"description": "The name of the file to write to",
"type": "string"
}
},
"type": "object"
}
}
}
],
"messages": [
{
"role": "user",
"content": [
{
"text": "input 1"
}
],
"usage": {}
}
],
"chat": true
}`
9 changes: 9 additions & 0 deletions pkg/tests/testdata/TestToolsChange/call2-resp.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
`{
"role": "assistant",
"content": [
{
"text": "TEST RESULT CALL: 2"
}
],
"usage": {}
}`
73 changes: 73 additions & 0 deletions pkg/tests/testdata/TestToolsChange/call2.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
`{
"model": "gpt-4o",
"internalSystemPrompt": false,
"tools": [
{
"function": {
"toolID": "sys.ls",
"name": "ls",
"description": "Lists the contents of a directory",
"parameters": {
"properties": {
"dir": {
"description": "The directory to list",
"type": "string"
}
},
"type": "object"
}
}
},
{
"function": {
"toolID": "sys.write",
"name": "write",
"description": "Write the contents to a file",
"parameters": {
"properties": {
"content": {
"description": "The content to write",
"type": "string"
},
"filename": {
"description": "The name of the file to write to",
"type": "string"
}
},
"type": "object"
}
}
}
],
"messages": [
{
"role": "user",
"content": [
{
"text": "input 1"
}
],
"usage": {}
},
{
"role": "assistant",
"content": [
{
"text": "TEST RESULT CALL: 1"
}
],
"usage": {}
},
{
"role": "user",
"content": [
{
"text": "input 2"
}
],
"usage": {}
}
],
"chat": true,
"temperature": 0.6
}`
93 changes: 93 additions & 0 deletions pkg/tests/testdata/TestToolsChange/step1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
`{
"done": false,
"content": "TEST RESULT CALL: 1",
"toolID": "inline:",
"state": {
"continuation": {
"state": {
"input": "input 1",
"completion": {
"model": "gpt-4o",
"internalSystemPrompt": false,
"tools": [
{
"function": {
"toolID": "sys.ls",
"name": "ls",
"description": "Lists the contents of a directory",
"parameters": {
"properties": {
"dir": {
"description": "The directory to list",
"type": "string"
}
},
"type": "object"
}
}
},
{
"function": {
"toolID": "sys.read",
"name": "read",
"description": "Reads the contents of a file",
"parameters": {
"properties": {
"filename": {
"description": "The name of the file to read",
"type": "string"
}
},
"type": "object"
}
}
},
{
"function": {
"toolID": "sys.write",
"name": "write",
"description": "Write the contents to a file",
"parameters": {
"properties": {
"content": {
"description": "The content to write",
"type": "string"
},
"filename": {
"description": "The name of the file to write to",
"type": "string"
}
},
"type": "object"
}
}
}
],
"messages": [
{
"role": "user",
"content": [
{
"text": "input 1"
}
],
"usage": {}
},
{
"role": "assistant",
"content": [
{
"text": "TEST RESULT CALL: 1"
}
],
"usage": {}
}
],
"chat": true
}
},
"result": "TEST RESULT CALL: 1"
},
"continuationToolID": "inline:"
}
}`
Loading