fix: better error reporting

This change also includes change to Text nodes when parsing files for
parity with other SDKs.

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

gptscript.go

@@ -49,7 +49,7 @@ func NewGPTScript(opts GlobalOptions) (GPTScript, error) {
 	defer lock.Unlock()
 	gptscriptCount++
 
-	disableServer := os.Getenv("GPT_SCRIPT_DISABLE_SERVER") == "true"
+	disableServer := os.Getenv("GPTSCRIPT_DISABLE_SERVER") == "true"
 
 	if serverURL == "" && disableServer {
 		serverURL = os.Getenv("GPTSCRIPT_URL")
@@ -165,6 +165,10 @@ func (g *gptscript) Parse(ctx context.Context, fileName string) ([]Node, error)
 		return nil, err
 	}
 
+	for _, node := range doc.Nodes {
+		node.TextNode.process()
+	}
+
 	return doc.Nodes, nil
 }
 
@@ -180,11 +184,19 @@ func (g *gptscript) ParseTool(ctx context.Context, toolDef string) ([]Node, erro
 		return nil, err
 	}
 
+	for _, node := range doc.Nodes {
+		node.TextNode.process()
+	}
+
 	return doc.Nodes, nil
 }
 
 // Fmt will format the given nodes into a string.
 func (g *gptscript) Fmt(ctx context.Context, nodes []Node) (string, error) {
+	for _, node := range nodes {
+		node.TextNode.combine()
+	}
+
 	out, err := g.runBasicCommand(ctx, "fmt", Document{Nodes: nodes})
 	if err != nil {
 		return "", err

gptscript_test.go

@@ -151,7 +151,7 @@ func TestEvaluateWithContext(t *testing.T) {
 		},
 	}
 
-	run, err := g.Evaluate(context.Background(), Options{DisableCache: true, IncludeEvents: true}, tool)
+	run, err := g.Evaluate(context.Background(), Options{}, tool)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -214,7 +214,7 @@ func TestEvaluateWithToolList(t *testing.T) {
 			Tools:        []string{"sys.exec"},
 			Description:  "Echoes the input",
 			Arguments:    ObjectSchema("input", "The string input to echo"),
-			Instructions: shebang + "\n echo ${input}",
+			Instructions: shebang + "\necho ${input}",
 		},
 	}
 
@@ -410,9 +410,12 @@ func TestParseToolWithTextNode(t *testing.T) {
 		t.Fatalf("No text node found")
 	}
 
-	if tools[1].TextNode.Text != "!markdown\nhello\n" {
+	if tools[1].TextNode.Text != "hello\n" {
 		t.Errorf("Unexpected text: %s", tools[1].TextNode.Text)
 	}
+	if tools[1].TextNode.Fmt != "markdown" {
+		t.Errorf("Unexpected fmt: %s", tools[1].TextNode.Fmt)
+	}
 }
 
 func TestFmt(t *testing.T) {
@@ -484,7 +487,8 @@ func TestFmtWithTextNode(t *testing.T) {
 		},
 		{
 			TextNode: &TextNode{
-				Text: "!markdown\nWe now echo hello there\n",
+				Fmt:  "markdown",
+				Text: "We now echo hello there\n",
 			},
 		},
 		{
@@ -686,14 +690,12 @@ func TestToolWithGlobalTools(t *testing.T) {
 
 func TestConfirm(t *testing.T) {
 	var eventContent string
-	tools := []ToolDef{
-		{
-			Instructions: "List the files in the current directory",
-			Tools:        []string{"sys.exec"},
-		},
+	tools := ToolDef{
+		Instructions: "List the files in the current directory",
+		Tools:        []string{"sys.exec"},
 	}
 
-	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Confirm: true}, tools...)
+	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Confirm: true}, tools)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -771,14 +773,12 @@ func TestConfirm(t *testing.T) {
 
 func TestConfirmDeny(t *testing.T) {
 	var eventContent string
-	tools := []ToolDef{
-		{
-			Instructions: "List the files in the current directory",
-			Tools:        []string{"sys.exec"},
-		},
+	tools := ToolDef{
+		Instructions: "List the files in the current directory",
+		Tools:        []string{"sys.exec"},
 	}
 
-	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Confirm: true}, tools...)
+	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Confirm: true}, tools)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -843,14 +843,12 @@ func TestConfirmDeny(t *testing.T) {
 
 func TestPrompt(t *testing.T) {
 	var eventContent string
-	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"},
-		},
+	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, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Prompt: true}, tools...)
+	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true, Prompt: true}, tools)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -926,14 +924,12 @@ func TestPrompt(t *testing.T) {
 }
 
 func TestPromptWithoutPromptAllowed(t *testing.T) {
-	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"},
-		},
+	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, err := g.Evaluate(context.Background(), Options{IncludeEvents: true}, tools...)
+	run, err := g.Evaluate(context.Background(), Options{IncludeEvents: true}, tools)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}

run.go

@@ -43,7 +43,7 @@ func (r *Run) Text() (string, error) {
 	r.lock.Lock()
 	defer r.lock.Unlock()
 	if r.err != nil {
-		return "", r.err
+		return "", fmt.Errorf("run encounterd an error: %w with error output: %s", r.err, r.errput)
 	}
 
 	return r.output, nil
@@ -237,11 +237,11 @@ func (r *Run) request(ctx context.Context, payload any) (err error) {
 
 	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusBadRequest {
 		r.state = Error
-		r.err = fmt.Errorf("unexpected response status: %s", resp.Status)
-		return r.err
+		r.err = fmt.Errorf("run encountered an error")
+	} else {
+		r.state = Running
 	}
 
-	r.state = Running
 	r.events = make(chan Frame, 100)
 	r.lock.Lock()
 	go func() {

tool.go

@@ -1,6 +1,9 @@
 package gptscript
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/getkin/kin-openapi/openapi3"
 )
 
@@ -56,11 +59,26 @@ type Node struct {
 }
 
 type TextNode struct {
+	Fmt  string `json:"fmt,omitempty"`
 	Text string `json:"text,omitempty"`
 }
 
+func (n *TextNode) combine() {
+	if n != nil && n.Fmt != "" {
+		n.Text = fmt.Sprintf("!%s\n%s", n.Fmt, n.Text)
+		n.Fmt = ""
+	}
+}
+
+func (n *TextNode) process() {
+	if n != nil && strings.HasPrefix(n.Text, "!") {
+		n.Fmt, n.Text, _ = strings.Cut(strings.TrimPrefix(n.Text, "!"), "\n")
+	}
+}
+
 type ToolNode struct {
-	Tool Tool `json:"tool,omitempty"`
+	Fmt  string `json:"fmt,omitempty"`
+	Tool Tool   `json:"tool,omitempty"`
 }
 
 type Tool struct {