Merge pull request #26 from thedadams/remove-to-string

chore: remove ToString method for tools

Author: thedadams

frame.go

@@ -84,13 +84,14 @@ type Call struct {
 }
 
 type CallContext struct {
-	ID           string         `json:"id"`
-	Tool         Tool           `json:"tool"`
-	DisplayText  string         `json:"displayText"`
-	InputContext []InputContext `json:"inputContext"`
-	ToolCategory ToolCategory   `json:"toolCategory,omitempty"`
-	ToolName     string         `json:"toolName,omitempty"`
-	ParentID     string         `json:"parentID,omitempty"`
+	ID           string          `json:"id"`
+	Tool         Tool            `json:"tool"`
+	AgentGroup   []ToolReference `json:"agentGroup,omitempty"`
+	DisplayText  string          `json:"displayText"`
+	InputContext []InputContext  `json:"inputContext"`
+	ToolCategory ToolCategory    `json:"toolCategory,omitempty"`
+	ToolName     string          `json:"toolName,omitempty"`
+	ParentID     string          `json:"parentID,omitempty"`
 }
 
 type InputContext struct {

gptscript.go

@@ -28,7 +28,7 @@ const relativeToBinaryPath = "<me>"
 
 type GPTScript interface {
 	Run(context.Context, string, Options) (*Run, error)
-	Evaluate(context.Context, Options, ...fmt.Stringer) (*Run, error)
+	Evaluate(context.Context, Options, ...ToolDef) (*Run, error)
 	Parse(context.Context, string) ([]Node, error)
 	ParseTool(context.Context, string) ([]Node, error)
 	Version(context.Context) (string, error)
@@ -124,13 +124,13 @@ func (g *gptscript) Close() {
 	}
 }
 
-func (g *gptscript) Evaluate(ctx context.Context, opts Options, tools ...fmt.Stringer) (*Run, error) {
+func (g *gptscript) Evaluate(ctx context.Context, opts Options, tools ...ToolDef) (*Run, error) {
 	return (&Run{
 		url:         g.url,
 		requestPath: "evaluate",
 		state:       Creating,
 		opts:        opts,
-		content:     concatTools(tools),
+		tools:       tools,
 	}).NextChat(ctx, opts.Input)
 }
 

gptscript_test.go

@@ -81,7 +81,7 @@ func TestListModels(t *testing.T) {
 }
 
 func TestAbortRun(t *testing.T) {
-	tool := &ToolDef{Instructions: "What is the capital of the united states?"}
+	tool := ToolDef{Instructions: "What is the capital of the united states?"}
 
 	run, err := g.Evaluate(context.Background(), Options{DisableCache: true, IncludeEvents: true}, tool)
 	if err != nil {
@@ -105,7 +105,7 @@ func TestAbortRun(t *testing.T) {
 }
 
 func TestSimpleEvaluate(t *testing.T) {
-	tool := &ToolDef{Instructions: "What is the capital of the united states?"}
+	tool := ToolDef{Instructions: "What is the capital of the united states?"}
 
 	run, err := g.Evaluate(context.Background(), Options{}, tool)
 	if err != nil {
@@ -142,7 +142,7 @@ func TestEvaluateWithContext(t *testing.T) {
 		t.Fatalf("Error getting current working directory: %v", err)
 	}
 
-	tool := &ToolDef{
+	tool := ToolDef{
 		Instructions: "What is the capital of the united states?",
 		Context: []string{
 			wd + "/test/acorn-labs-context.gpt",
@@ -165,7 +165,7 @@ func TestEvaluateWithContext(t *testing.T) {
 }
 
 func TestEvaluateComplexTool(t *testing.T) {
-	tool := &ToolDef{
+	tool := ToolDef{
 		JSONResponse: true,
 		Instructions: `
 Create three short graphic artist descriptions and their muses.
@@ -202,18 +202,16 @@ func TestEvaluateWithToolList(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		shebang = "#!/usr/bin/env powershell.exe"
 	}
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Tools:        []string{"echo"},
 			Instructions: "echo hello there",
 		},
-		&ToolDef{
-			Name:        "echo",
-			Tools:       []string{"sys.exec"},
-			Description: "Echoes the input",
-			Args: map[string]string{
-				"input": "The string input to echo",
-			},
+		{
+			Name:         "echo",
+			Tools:        []string{"sys.exec"},
+			Description:  "Echoes the input",
+			Arguments:    ObjectSchema("input", "The string input to echo"),
 			Instructions: shebang + "\n echo ${input}",
 		},
 	}
@@ -238,23 +236,21 @@ func TestEvaluateWithToolListAndSubTool(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		shebang = "#!/usr/bin/env powershell.exe"
 	}
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Tools:        []string{"echo"},
 			Instructions: "echo 'hello there'",
 		},
-		&ToolDef{
+		{
 			Name:         "other",
 			Tools:        []string{"echo"},
 			Instructions: "echo 'hello somewhere else'",
 		},
-		&ToolDef{
-			Name:        "echo",
-			Tools:       []string{"sys.exec"},
-			Description: "Echoes the input",
-			Args: map[string]string{
-				"input": "The string input to echo",
-			},
+		{
+			Name:         "echo",
+			Tools:        []string{"sys.exec"},
+			Description:  "Echoes the input",
+			Arguments:    ObjectSchema("input", "The string input to echo"),
 			Instructions: shebang + "\n echo ${input}",
 		},
 	}
@@ -276,7 +272,7 @@ func TestEvaluateWithToolListAndSubTool(t *testing.T) {
 
 func TestStreamEvaluate(t *testing.T) {
 	var eventContent string
-	tool := &ToolDef{Instructions: "What is the capital of the united states?"}
+	tool := ToolDef{Instructions: "What is the capital of the united states?"}
 
 	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true}, tool)
 	if err != nil {
@@ -536,7 +532,7 @@ echo hello there
 }
 
 func TestToolChat(t *testing.T) {
-	tool := &ToolDef{
+	tool := ToolDef{
 		Chat:         true,
 		Instructions: "You are a chat bot. Don't finish the conversation until I say 'bye'.",
 		Tools:        []string{"sys.chat.finish"},
@@ -688,8 +684,8 @@ func TestToolWithGlobalTools(t *testing.T) {
 
 func TestConfirm(t *testing.T) {
 	var eventContent string
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Instructions: "List the files in the current directory",
 			Tools:        []string{"sys.exec"},
 		},
@@ -759,8 +755,8 @@ func TestConfirm(t *testing.T) {
 
 func TestConfirmDeny(t *testing.T) {
 	var eventContent string
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Instructions: "List the files in the current directory",
 			Tools:        []string{"sys.exec"},
 		},
@@ -831,8 +827,8 @@ func TestConfirmDeny(t *testing.T) {
 
 func TestPrompt(t *testing.T) {
 	var eventContent string
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Instructions: "Use the sys.prompt user to ask the user for 'first name' which is not sensitive. After you get their first name, say hello.",
 			Tools:        []string{"sys.prompt"},
 		},
@@ -914,8 +910,8 @@ func TestPrompt(t *testing.T) {
 }
 
 func TestPromptWithoutPromptAllowed(t *testing.T) {
-	tools := []fmt.Stringer{
-		&ToolDef{
+	tools := []ToolDef{
+		{
 			Instructions: "Use the sys.prompt user to ask the user for 'first name' which is not sensitive. After you get their first name, say hello.",
 			Tools:        []string{"sys.prompt"},
 		},

run.go

@@ -18,14 +18,15 @@ import (
 var errAbortRun = errors.New("run aborted")
 
 type Run struct {
-	url, requestPath, toolPath, content string
-	opts                                Options
-	state                               RunState
-	chatState                           string
-	cancel                              context.CancelCauseFunc
-	err                                 error
-	wait                                func()
-	basicCommand                        bool
+	url, requestPath, toolPath string
+	tools                      []ToolDef
+	opts                       Options
+	state                      RunState
+	chatState                  string
+	cancel                     context.CancelCauseFunc
+	err                        error
+	wait                       func()
+	basicCommand               bool
 
 	program           *Program
 	callsLock         sync.RWMutex
@@ -163,7 +164,7 @@ func (r *Run) NextChat(ctx context.Context, input string) (*Run, error) {
 		requestPath: r.requestPath,
 		state:       Creating,
 		toolPath:    r.toolPath,
-		content:     r.content,
+		tools:       r.tools,
 		opts:        r.opts,
 	}
 
@@ -175,11 +176,11 @@ func (r *Run) NextChat(ctx context.Context, input string) (*Run, error) {
 	}
 
 	var payload any
-	if r.content != "" {
+	if len(r.tools) != 0 {
 		payload = requestPayload{
-			Content: run.content,
-			Input:   input,
-			Options: run.opts,
+			ToolDefs: r.tools,
+			Input:    input,
+			Options:  run.opts,
 		}
 	} else if run.toolPath != "" {
 		payload = requestPayload{
@@ -412,8 +413,8 @@ const (
 )
 
 type requestPayload struct {
-	Content string `json:"content"`
-	File    string `json:"file"`
-	Input   string `json:"input"`
-	Options `json:",inline"`
+	Options  `json:",inline"`
+	File     string    `json:"file"`
+	Input    string    `json:"input"`
+	ToolDefs []ToolDef `json:"toolDefs,inline"`
 }

run_test.go

@@ -11,11 +11,11 @@ func TestRestartingErrorRun(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		instructions = "#!/usr/bin/env powershell.exe\n\n$e = $env:EXIT_CODE;\nif ($e) { Exit 1; }"
 	}
-	tool := &ToolDef{
+	tool := ToolDef{
 		Context:      []string{"my-context"},
 		Instructions: "Say hello",
 	}
-	contextTool := &ToolDef{
+	contextTool := ToolDef{
 		Name:         "my-context",
 		Instructions: instructions,
 	}