Small script tweaks

Author: ibuildthecloud

examples/fib.gpt

@@ -3,13 +3,29 @@ What's the myfunction of 3
 
 ---
 name: myfunction
+tools: sub, mul
 description: A function taking an integer as argument and returns an integer
 args: number: An integer
 tools: myfunction
 
-Do the following steps in strict sequence:
-Step 1. If ${number} is 0, skip the remaining steps and return 1
-Step 2. Calculate ${number} minus 1
-Step 3. Calculate myfunction of the result of Step 2
-Step 4. Multiply result of Step 3 with ${number}
-Step 5. Return the result of Step 4
+If ${number} is 0 return 1. Otherwise return myfunction(${number}-1) * ${number}
+
+---
+name: sub
+description: Subtract two numbers
+args: left: a number
+args: right: a number
+
+#!/bin/bash
+
+echo $((${LEFT} - ${RIGHT}))
+
+---
+name: mul
+description: Multiply two numbers
+args: left: a number
+args: right: a number
+
+#!/bin/bash
+
+echo $((${LEFT} * ${RIGHT}))

pkg/monitor/display.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"sort"
+	"slices"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -87,18 +87,18 @@ func (d *display) Event(event runner.Event) {
 	case runner.EventTypeCallStart:
 		currentCall.Start = event.Time
 		currentCall.Input = event.Content
-		log.Fields("input", event.Content).Infof("%s started", callName)
+		log.Fields("input", event.Content).Infof("started             [%s]", callName)
 	case runner.EventTypeCallProgress:
 	case runner.EventTypeCallContinue:
-		log.Fields("toolResults", event.ToolResults).Infof("%s continue", callName)
+		log.Fields("toolResults", event.ToolResults).Infof("continue            [%s]", callName)
 	case runner.EventTypeChat:
 		if event.ChatRequest == nil {
 			log = log.Fields(
 				"response", toJSON(event.ChatResponse),
 				"cached", event.ChatResponseCached,
 			)
 		} else {
-			log.Infof("%s openai request sent", callName)
+			log.Infof("openai request sent [%s]", callName)
 			log = log.Fields(
 				"request", toJSON(event.ChatRequest),
 			)
@@ -112,7 +112,7 @@ func (d *display) Event(event runner.Event) {
 	case runner.EventTypeCallFinish:
 		currentCall.End = event.Time
 		currentCall.Output = event.Content
-		log.Fields("output", event.Content).Infof("%s ended", callName)
+		log.Fields("output", event.Content).Infof("ended               [%s]", callName)
 	}
 
 	d.dump.Calls[currentIndex] = currentCall
@@ -158,6 +158,10 @@ type jsonDump struct {
 	obj any
 }
 
+func (j jsonDump) MarshalJSON() ([]byte, error) {
+	return json.Marshal(j.obj)
+}
+
 func (j jsonDump) String() string {
 	d, err := json.Marshal(j.obj)
 	if err != nil {
@@ -184,6 +188,9 @@ func (c callName) String() string {
 		if name == "" {
 			name = tool.Source.File
 		}
+		if currentCall.ID != "1" {
+			name += "(" + currentCall.ID + ")"
+		}
 		msg = append(msg, name)
 		found := false
 		for _, parent := range c.calls {
@@ -198,7 +205,7 @@ func (c callName) String() string {
 		}
 	}
 
-	sort.Sort(sort.Reverse(sort.StringSlice(msg)))
+	slices.Reverse(msg)
 	return strings.Join(msg, "->")
 }
 
@@ -227,3 +234,7 @@ type call struct {
 	Input    string    `json:"input,omitempty"`
 	Output   string    `json:"output,omitempty"`
 }
+
+func (c call) String() string {
+	return c.ID
+}

pkg/mvl/log.go

@@ -1,7 +1,9 @@
 package mvl
 
 import (
+	"encoding/json"
 	"fmt"
+	"os"
 	"runtime"
 	"strings"
 	"time"
@@ -23,13 +25,37 @@ type formatter struct {
 }
 
 func (f formatter) Format(entry *logrus.Entry) ([]byte, error) {
-	return []byte(fmt.Sprintf("%s %s %s\n",
+	msg := entry.Message
+	if i, ok := entry.Data["input"].(string); ok && i != "" {
+		msg += fmt.Sprintf(" [input=%s]", i)
+	}
+	return []byte(fmt.Sprintf("%s %s\n",
 		entry.Time.Format(time.RFC3339),
-		entry.Level,
-		entry.Message)), nil
+		msg)), nil
+}
+
+type verbose struct {
+}
+
+func (f verbose) Format(entry *logrus.Entry) ([]byte, error) {
+	buf, err := json.MarshalIndent(struct {
+		Time    time.Time `json:"time,omitempty"`
+		Level   string    `json:"level,omitempty"`
+		Message string    `json:"message,omitempty"`
+		Data    any       `json:"data,omitempty"`
+	}{
+		Time:    entry.Time,
+		Level:   entry.Level.String(),
+		Message: entry.Message,
+		Data:    entry.Data,
+	}, "", "  ")
+	return append(buf, []byte("\n")...), err
 }
 
 func SetDebug() {
+	logrus.SetFormatter(&logrus.JSONFormatter{
+		PrettyPrint: os.Getenv("GPTSCRIPT_JSON_LOG_SINGLE_LINE") != "true",
+	})
 	logrus.SetLevel(logrus.DebugLevel)
 }