chore: print runtimemanager progress to callProgress

ibuildthecloud · ibuildthecloud · commit 7ffe6429bb11 · 2024-06-18T16:16:48.000-07:00
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379
-	github.com/gptscript-ai/tui v0.0.0-20240614062633-985091711b0a
+	github.com/gptscript-ai/tui v0.0.0-20240618175050-a1d627a00cff
 	github.com/hexops/autogold/v2 v2.2.1
 	github.com/hexops/valast v1.4.4
 	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
diff --git a/go.sum b/go.sum
@@ -173,8 +173,8 @@ github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf037
 github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=
 github.com/gptscript-ai/go-gptscript v0.0.0-20240613214812-8111c2b02d71 h1:WehkkausLuXI91ePpIVrzZ6eBmfFIU/HfNsSA1CHiwo=
 github.com/gptscript-ai/go-gptscript v0.0.0-20240613214812-8111c2b02d71/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s=
-github.com/gptscript-ai/tui v0.0.0-20240614062633-985091711b0a h1:LFsEDiIAx0Rq0V6aOMlRjXMMIfkA3uEhqqqjoggLlDQ=
-github.com/gptscript-ai/tui v0.0.0-20240614062633-985091711b0a/go.mod h1:ZlyM+BRiD6mV04w+Xw2mXP1VKGEUbn8BvwrosWlplUo=
+github.com/gptscript-ai/tui v0.0.0-20240618175050-a1d627a00cff h1:mjcUKZ4hHVpT8EkyIsxGpU608BTNko0EovpsY0fGfvU=
+github.com/gptscript-ai/tui v0.0.0-20240618175050-a1d627a00cff/go.mod h1:ZlyM+BRiD6mV04w+Xw2mXP1VKGEUbn8BvwrosWlplUo=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -21,6 +21,7 @@ type Model interface {
 
 type RuntimeManager interface {
 	GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error)
+	EnsureCredentialHelpers(ctx context.Context) error
 	SetUpCredentialHelpers(ctx context.Context, cliCfg *config.CLIConfig, env []string) error
 }
 
diff --git a/pkg/monitor/display.go b/pkg/monitor/display.go
@@ -20,25 +20,22 @@ import (
 )
 
 type Options struct {
-	DisplayProgress bool   `usage:"-"`
-	DumpState       string `usage:"Dump the internal execution state to a file"`
-	DebugMessages   bool   `usage:"Enable logging of chat completion calls"`
+	DumpState     string `usage:"Dump the internal execution state to a file"`
+	DebugMessages bool   `usage:"Enable logging of chat completion calls"`
 }
 
 func Complete(opts ...Options) (result Options) {
 	for _, opt := range opts {
 		result.DumpState = types.FirstSet(opt.DumpState, result.DumpState)
-		result.DisplayProgress = types.FirstSet(opt.DisplayProgress, result.DisplayProgress)
 		result.DebugMessages = types.FirstSet(opt.DebugMessages, result.DebugMessages)
 	}
 	return
 }
 
 type Console struct {
-	dumpState       string
-	displayProgress bool
-	printMessages   bool
-	callLock        sync.Mutex
+	dumpState     string
+	printMessages bool
+	callLock      sync.Mutex
 }
 
 var (
@@ -47,7 +44,7 @@ var (
 
 func (c *Console) Start(_ context.Context, prg *types.Program, _ []string, input string) (runner.Monitor, error) {
 	id := counter.Next()
-	mon := newDisplay(c.dumpState, c.displayProgress, c.printMessages)
+	mon := newDisplay(c.dumpState, c.printMessages)
 	mon.callLock = &c.callLock
 	mon.dump.ID = fmt.Sprint(id)
 	mon.dump.Program = prg
@@ -315,23 +312,20 @@ func (d *display) Stop(output string, err error) {
 func NewConsole(opts ...Options) *Console {
 	opt := Complete(opts...)
 	return &Console{
-		dumpState:       opt.DumpState,
-		displayProgress: opt.DisplayProgress,
-		printMessages:   opt.DebugMessages,
+		dumpState:     opt.DumpState,
+		printMessages: opt.DebugMessages,
 	}
 }
 
-func newDisplay(dumpState string, progress, printMessages bool) *display {
+func newDisplay(dumpState string, printMessages bool) *display {
 	display := &display{
 		dumpState:     dumpState,
 		callIDMap:     make(map[string]string),
 		printMessages: printMessages,
 	}
-	if progress {
-		display.livePrinter = &livePrinter{
-			lastContent: map[string]string{},
-			callIDMap:   display.callIDMap,
-		}
+	display.livePrinter = &livePrinter{
+		lastContent: map[string]string{},
+		callIDMap:   display.callIDMap,
 	}
 	return display
 }
diff --git a/pkg/mvl/log.go b/pkg/mvl/log.go
@@ -1,6 +1,7 @@
 package mvl
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -156,6 +157,25 @@ func (l *Logger) Fields(kv ...any) *Logger {
 	}
 }
 
+type InfoLogger interface {
+	Infof(msg string, args ...any)
+}
+
+type infoKey struct{}
+
+func WithInfo(ctx context.Context, logger InfoLogger) context.Context {
+	return context.WithValue(ctx, infoKey{}, logger)
+}
+
+func (l *Logger) InfofCtx(ctx context.Context, msg string, args ...any) {
+	il, ok := ctx.Value(infoKey{}).(InfoLogger)
+	if ok {
+		il.Infof(msg, args...)
+		return
+	}
+	l.log.WithFields(l.fields).Infof(msg, args...)
+}
+
 func (l *Logger) Infof(msg string, args ...any) {
 	l.log.WithFields(l.fields).Infof(msg, args...)
 }
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
@@ -437,6 +437,8 @@ func appendMessage(msg types.CompletionMessage, response openai.ChatCompletionSt
 		if tc.ToolCall.Function.Name != tool.Function.Name {
 			tc.ToolCall.Function.Name += tool.Function.Name
 		}
+		// OpenAI like to sometimes add this prefix for no good reason
+		tc.ToolCall.Function.Name = strings.TrimPrefix(tc.ToolCall.Function.Name, "namespace.")
 		tc.ToolCall.Function.Arguments += tool.Function.Arguments
 
 		msg.Content[idx] = tc
diff --git a/pkg/repos/get.go b/pkg/repos/get.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 
 	"github.com/BurntSushi/locker"
 	"github.com/gptscript-ai/gptscript/pkg/config"
@@ -43,11 +44,19 @@ func (n noopRuntime) Setup(_ context.Context, _, _ string, _ []string) ([]string
 }
 
 type Manager struct {
-	storageDir     string
-	gitDir         string
-	runtimeDir     string
-	credHelperDirs credentials.CredentialHelperDirs
-	runtimes       []Runtime
+	storageDir       string
+	gitDir           string
+	runtimeDir       string
+	credHelperDirs   credentials.CredentialHelperDirs
+	runtimes         []Runtime
+	credHelperConfig *credHelperConfig
+}
+
+type credHelperConfig struct {
+	lock        sync.Mutex
+	initialized bool
+	cliCfg      *config.CLIConfig
+	env         []string
 }
 
 func New(cacheDir string, runtimes ...Runtime) *Manager {
@@ -61,7 +70,32 @@ func New(cacheDir string, runtimes ...Runtime) *Manager {
 	}
 }
 
-func (m *Manager) SetUpCredentialHelpers(ctx context.Context, cliCfg *config.CLIConfig, env []string) error {
+func (m *Manager) EnsureCredentialHelpers(ctx context.Context) error {
+	if m.credHelperConfig == nil {
+		return nil
+	}
+	m.credHelperConfig.lock.Lock()
+	defer m.credHelperConfig.lock.Unlock()
+
+	if !m.credHelperConfig.initialized {
+		if err := m.deferredSetUpCredentialHelpers(ctx, m.credHelperConfig.cliCfg, m.credHelperConfig.env); err != nil {
+			return err
+		}
+		m.credHelperConfig.initialized = true
+	}
+
+	return nil
+}
+
+func (m *Manager) SetUpCredentialHelpers(_ context.Context, cliCfg *config.CLIConfig, env []string) error {
+	m.credHelperConfig = &credHelperConfig{
+		cliCfg: cliCfg,
+		env:    env,
+	}
+	return nil
+}
+
+func (m *Manager) deferredSetUpCredentialHelpers(ctx context.Context, cliCfg *config.CLIConfig, env []string) error {
 	var (
 		helperName = cliCfg.CredentialsStore
 		suffix     string
diff --git a/pkg/repos/git/git.go b/pkg/repos/git/git.go
@@ -33,7 +33,7 @@ func Checkout(ctx context.Context, base, repo, commit, toDir string) error {
 		return err
 	}
 
-	log.Infof("Checking out %s to %s", commit, toDir)
+	log.InfofCtx(ctx, "Checking out %s to %s", commit, toDir)
 	return gitWorktreeAdd(ctx, gitDir(base, repo), toDir, commit)
 }
 
@@ -46,11 +46,11 @@ func Fetch(ctx context.Context, base, repo, commit string) error {
 	if found, err := exists(gitDir); err != nil {
 		return err
 	} else if !found {
-		log.Infof("Cloning %s", repo)
+		log.InfofCtx(ctx, "Cloning %s", repo)
 		if err := cloneBare(ctx, repo, gitDir); err != nil {
 			return err
 		}
 	}
-	log.Infof("Fetching %s at %s", commit, repo)
+	log.InfofCtx(ctx, "Fetching %s at %s", commit, repo)
 	return fetchCommit(ctx, gitDir, commit)
 }
diff --git a/pkg/repos/runtimes/golang/golang.go b/pkg/repos/runtimes/golang/golang.go
@@ -68,7 +68,7 @@ func (r *Runtime) BuildCredentialHelper(ctx context.Context, helperName string,
 	}
 	newEnv := runtimeEnv.AppendPath(env, binPath)
 
-	log.Infof("Building credential helper %s", helperName)
+	log.InfofCtx(ctx, "Building credential helper %s", helperName)
 	cmd := debugcmd.New(ctx, filepath.Join(binPath, "go"),
 		"build", "-buildvcs=false", "-o",
 		filepath.Join(credHelperDirs.BinDir, "gptscript-credential-"+helperName+suffix),
@@ -103,7 +103,7 @@ func stripGo(env []string) (result []string) {
 }
 
 func (r *Runtime) runBuild(ctx context.Context, toolSource, binDir string, env []string) error {
-	log.Infof("Running go build in %s", toolSource)
+	log.InfofCtx(ctx, "Running go build in %s", toolSource)
 	cmd := debugcmd.New(ctx, filepath.Join(binDir, "go"), "build", "-buildvcs=false", "-o", artifactName())
 	cmd.Env = stripGo(env)
 	cmd.Dir = toolSource
@@ -134,7 +134,7 @@ func (r *Runtime) getRuntime(ctx context.Context, cwd string) (string, error) {
 		return "", err
 	}
 
-	log.Infof("Downloading Go %s", r.Version)
+	log.InfofCtx(ctx, "Downloading Go %s", r.Version)
 	tmp := target + ".download"
 	defer os.RemoveAll(tmp)
 
diff --git a/pkg/repos/runtimes/node/node.go b/pkg/repos/runtimes/node/node.go
@@ -101,7 +101,7 @@ func (r *Runtime) getReleaseAndDigest() (string, string, error) {
 }
 
 func (r *Runtime) runNPM(ctx context.Context, toolSource, binDir string, env []string) error {
-	log.Infof("Running npm in %s", toolSource)
+	log.InfofCtx(ctx, "Running npm in %s", toolSource)
 	cmd := debugcmd.New(ctx, filepath.Join(binDir, "npm"), "install")
 	cmd.Env = env
 	cmd.Dir = toolSource
@@ -141,7 +141,7 @@ func (r *Runtime) getRuntime(ctx context.Context, cwd string) (string, error) {
 		return "", err
 	}
 
-	log.Infof("Downloading Node %s.x", r.Version)
+	log.InfofCtx(ctx, "Downloading Node %s.x", r.Version)
 	tmp := target + ".download"
 	defer os.RemoveAll(tmp)
 
diff --git a/pkg/repos/runtimes/python/python.go b/pkg/repos/runtimes/python/python.go
@@ -76,7 +76,7 @@ func uvBin(binDir string) string {
 }
 
 func (r *Runtime) installVenv(ctx context.Context, binDir, venvPath string) error {
-	log.Infof("Creating virtualenv in %s", venvPath)
+	log.InfofCtx(ctx, "Creating virtualenv in %s", venvPath)
 	cmd := debugcmd.New(ctx, uvBin(binDir), "venv", "-p", pythonCmd(binDir), venvPath)
 	return cmd.Run()
 }
@@ -171,7 +171,7 @@ func (r *Runtime) getReleaseAndDigest() (string, string, error) {
 }
 
 func (r *Runtime) runPip(ctx context.Context, toolSource, binDir string, env []string) error {
-	log.Infof("Running pip in %s", toolSource)
+	log.InfofCtx(ctx, "Running pip in %s", toolSource)
 	for _, req := range []string{"requirements-gptscript.txt", "requirements.txt"} {
 		reqFile := filepath.Join(toolSource, req)
 		if s, err := os.Stat(reqFile); err == nil && !s.IsDir() {
@@ -203,7 +203,7 @@ func (r *Runtime) getRuntime(ctx context.Context, cwd string) (string, error) {
 		return "", err
 	}
 
-	log.Infof("Downloading Python %s.x", r.Version)
+	log.InfofCtx(ctx, "Downloading Python %s.x", r.Version)
 	tmp := target + ".download"
 	defer os.RemoveAll(tmp)
 
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -421,7 +421,7 @@ func (r *Runner) start(callCtx engine.Context, state *State, monitor Monitor, en
 
 	e := engine.Engine{
 		Model:          r.c,
-		RuntimeManager: r.runtimeManager,
+		RuntimeManager: runtimeWithLogger(callCtx, monitor, r.runtimeManager),
 		Progress:       progress,
 		Env:            env,
 	}
@@ -602,7 +602,7 @@ func (r *Runner) resume(callCtx engine.Context, monitor Monitor, env []string, s
 
 		e := engine.Engine{
 			Model:          r.c,
-			RuntimeManager: r.runtimeManager,
+			RuntimeManager: runtimeWithLogger(callCtx, monitor, r.runtimeManager),
 			Progress:       progress,
 			Env:            env,
 		}
@@ -836,6 +836,11 @@ func (r *Runner) handleCredentials(callCtx engine.Context, monitor Monitor, env
 			exists bool
 		)
 
+		rm := runtimeWithLogger(callCtx, monitor, r.runtimeManager)
+		if err := rm.EnsureCredentialHelpers(callCtx.Ctx); err != nil {
+			return nil, fmt.Errorf("failed to setup credential helpers: %w", err)
+		}
+
 		// Only try to look up the cred if the tool is on GitHub or has an alias.
 		// If it is a GitHub tool and has an alias, the alias overrides the tool name, so we use it as the credential name.
 		if isGitHubTool(toolName) && credentialAlias == "" {
diff --git a/pkg/runner/runtimemanager.go b/pkg/runner/runtimemanager.go
@@ -0,0 +1,54 @@
+package runner
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/gptscript-ai/gptscript/pkg/config"
+	"github.com/gptscript-ai/gptscript/pkg/engine"
+	"github.com/gptscript-ai/gptscript/pkg/mvl"
+	"github.com/gptscript-ai/gptscript/pkg/types"
+)
+
+func runtimeWithLogger(callCtx engine.Context, monitor Monitor, rm engine.RuntimeManager) engine.RuntimeManager {
+	return runtimeManagerLogger{
+		callCtx: callCtx,
+		monitor: monitor,
+		rm:      rm,
+	}
+}
+
+type runtimeManagerLogger struct {
+	callCtx engine.Context
+	monitor Monitor
+	rm      engine.RuntimeManager
+}
+
+func (r runtimeManagerLogger) Infof(msg string, args ...any) {
+	r.monitor.Event(Event{
+		Time:        time.Now(),
+		Type:        EventTypeCallProgress,
+		CallContext: r.callCtx.GetCallContext(),
+		Content:     fmt.Sprintf(msg, args...),
+	})
+}
+
+func (r runtimeManagerLogger) GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error) {
+	if r.rm == nil {
+		return "", nil, nil
+	}
+
+	return r.rm.GetContext(mvl.WithInfo(ctx, r), tool, cmd, env)
+}
+
+func (r runtimeManagerLogger) EnsureCredentialHelpers(ctx context.Context) error {
+	if r.rm == nil {
+		return nil
+	}
+	return r.rm.EnsureCredentialHelpers(mvl.WithInfo(ctx, r))
+}
+
+func (r runtimeManagerLogger) SetUpCredentialHelpers(_ context.Context, _ *config.CLIConfig, _ []string) error {
+	panic("not implemented")
+}

-Original file line number
+Diff line change
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379
 -	github.com/gptscript-ai/tui v0.0.0-20240614062633-985091711b0a
 +	github.com/gptscript-ai/tui v0.0.0-20240618175050-a1d627a00cff
 	github.com/hexops/autogold/v2 v2.2.1
 	github.com/hexops/valast v1.4.4
 	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ type Model interface {`
`21`	`21`
`22`	`22`	`type RuntimeManager interface {`
`23`	`23`	`GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error)`
	`24`	`+ EnsureCredentialHelpers(ctx context.Context) error`
`24`	`25`	`SetUpCredentialHelpers(ctx context.Context, cliCfg *config.CLIConfig, env []string) error`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,8 @@ func appendMessage(msg types.CompletionMessage, response openai.ChatCompletionSt`
`437`	`437`	`if tc.ToolCall.Function.Name != tool.Function.Name {`
`438`	`438`	`tc.ToolCall.Function.Name += tool.Function.Name`
`439`	`439`	`}`
	`440`	`+ // OpenAI like to sometimes add this prefix for no good reason`
	`441`	`+ tc.ToolCall.Function.Name = strings.TrimPrefix(tc.ToolCall.Function.Name, "namespace.")`
`440`	`442`	`tc.ToolCall.Function.Arguments += tool.Function.Arguments`
`441`	`443`
`442`	`444`	`msg.Content[idx] = tc`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func Checkout(ctx context.Context, base, repo, commit, toDir string) error {`
`33`	`33`	`return err`
`34`	`34`	`}`
`35`	`35`
`36`		`- log.Infof("Checking out %s to %s", commit, toDir)`
	`36`	`+ log.InfofCtx(ctx, "Checking out %s to %s", commit, toDir)`
`37`	`37`	`return gitWorktreeAdd(ctx, gitDir(base, repo), toDir, commit)`
`38`	`38`	`}`
`39`	`39`
`@@ -46,11 +46,11 @@ func Fetch(ctx context.Context, base, repo, commit string) error {`
`46`	`46`	`if found, err := exists(gitDir); err != nil {`
`47`	`47`	`return err`
`48`	`48`	`} else if !found {`
`49`		`- log.Infof("Cloning %s", repo)`
	`49`	`+ log.InfofCtx(ctx, "Cloning %s", repo)`
`50`	`50`	`if err := cloneBare(ctx, repo, gitDir); err != nil {`
`51`	`51`	`return err`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- log.Infof("Fetching %s at %s", commit, repo)`
	`54`	`+ log.InfofCtx(ctx, "Fetching %s at %s", commit, repo)`
`55`	`55`	`return fetchCommit(ctx, gitDir, commit)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (r *Runtime) getReleaseAndDigest() (string, string, error) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (r *Runtime) runNPM(ctx context.Context, toolSource, binDir string, env []string) error {`
`104`		`- log.Infof("Running npm in %s", toolSource)`
	`104`	`+ log.InfofCtx(ctx, "Running npm in %s", toolSource)`
`105`	`105`	`cmd := debugcmd.New(ctx, filepath.Join(binDir, "npm"), "install")`
`106`	`106`	`cmd.Env = env`
`107`	`107`	`cmd.Dir = toolSource`
`@@ -141,7 +141,7 @@ func (r *Runtime) getRuntime(ctx context.Context, cwd string) (string, error) {`
`141`	`141`	`return "", err`
`142`	`142`	`}`
`143`	`143`
`144`		`- log.Infof("Downloading Node %s.x", r.Version)`
	`144`	`+ log.InfofCtx(ctx, "Downloading Node %s.x", r.Version)`
`145`	`145`	`tmp := target + ".download"`
`146`	`146`	`defer os.RemoveAll(tmp)`
`147`	`147`