Merge branch 'main' into remove-azure-builtin

Author: drpebcak

Makefile

@@ -42,8 +42,5 @@ validate: tidy lint
 ci: build
 	./bin/gptscript ./scripts/ci.gpt
 
-gen-docs: build
-	./bin/gptscript ./scripts/gen-docs.gpt
-
 serve-docs:
 	(cd docs && npm i && npm start)

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-20240515050533-bdef9f2226a9
-	github.com/gptscript-ai/tui v0.0.0-20240531161317-ce32f93ac844
+	github.com/gptscript-ai/tui v0.0.0-20240604045848-e01b0b7aab9f
 	github.com/hexops/autogold/v2 v2.2.1
 	github.com/hexops/valast v1.4.4
 	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
@@ -62,7 +62,7 @@ require (
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/gptscript-ai/go-gptscript v0.0.0-20240531155932-57eeae840062 // indirect
+	github.com/gptscript-ai/go-gptscript v0.0.0-20240604030145-39497c0575b3 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hexops/autogold v1.3.1 // indirect

go.sum

@@ -172,10 +172,10 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20240515050533-bdef9f2226a9 h1:s6nL/aokB1sJTqVXEjN0zFI5CJa66ubw9g68VTMzEw0=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20240515050533-bdef9f2226a9/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=
-github.com/gptscript-ai/go-gptscript v0.0.0-20240531155932-57eeae840062 h1:30/1iOONBhw9WeCsoo4U74B+a20lATBFHFiVlpyk5oo=
-github.com/gptscript-ai/go-gptscript v0.0.0-20240531155932-57eeae840062/go.mod h1:h1yYzC0rgB5Kk7lwdba+Xs6cWkuJfLq6sPRna45OVG0=
-github.com/gptscript-ai/tui v0.0.0-20240531161317-ce32f93ac844 h1:c8sS5fCD3TXQZj94GDlQNR0zAw+1nuT3sYSH/Qo96+A=
-github.com/gptscript-ai/tui v0.0.0-20240531161317-ce32f93ac844/go.mod h1:G51xpKSFH0g1hG1s9J8vxj7NL6x43KJxZKM+77rt79s=
+github.com/gptscript-ai/go-gptscript v0.0.0-20240604030145-39497c0575b3 h1:mXLpCzEg4DoOeFZt6w99QFh9n60UwpRGGG0c+aaT+5k=
+github.com/gptscript-ai/go-gptscript v0.0.0-20240604030145-39497c0575b3/go.mod h1:h1yYzC0rgB5Kk7lwdba+Xs6cWkuJfLq6sPRna45OVG0=
+github.com/gptscript-ai/tui v0.0.0-20240604045848-e01b0b7aab9f h1:7dCE0E/y3y3p1BPSQGQ4mtsz5cWWl0FbXfCCDCf57SI=
+github.com/gptscript-ai/tui v0.0.0-20240604045848-e01b0b7aab9f/go.mod h1:ybD/8QfwaMiK2QUSnnTxgzrIaXRgipowU4pW1qxgNJ8=
 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=

pkg/builtin/builtin.go

@@ -1,7 +1,6 @@
 package builtin
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -18,9 +17,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/AlecAivazis/survey/v2"
 	"github.com/BurntSushi/locker"
 	"github.com/gptscript-ai/gptscript/pkg/engine"
+	"github.com/gptscript-ai/gptscript/pkg/prompt"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/jaytaylor/html2text"
 )
@@ -216,7 +215,7 @@ var tools = map[string]types.Tool{
 					"sensitive", "(true or false) Whether the input should be hidden",
 				),
 			},
-			BuiltinFunc: SysPrompt,
+			BuiltinFunc: prompt.SysPrompt,
 		},
 	},
 	"sys.chat.history": {
@@ -772,79 +771,6 @@ func SysDownload(_ context.Context, env []string, input string) (_ string, err e
 	return fmt.Sprintf("Downloaded %s to %s", params.URL, params.Location), nil
 }
 
-func sysPromptHTTP(ctx context.Context, url string, prompt types.Prompt) (_ string, err error) {
-	data, err := json.Marshal(prompt)
-	if err != nil {
-		return "", err
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(data))
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return "", fmt.Errorf("invalid status code [%d], expected 200", resp.StatusCode)
-	}
-
-	data, err = io.ReadAll(resp.Body)
-	return string(data), err
-}
-
-func SysPrompt(ctx context.Context, envs []string, input string) (_ string, err error) {
-	var params struct {
-		Message   string `json:"message,omitempty"`
-		Fields    string `json:"fields,omitempty"`
-		Sensitive string `json:"sensitive,omitempty"`
-	}
-	if err := json.Unmarshal([]byte(input), &params); err != nil {
-		return "", err
-	}
-
-	for _, env := range envs {
-		if url, ok := strings.CutPrefix(env, types.PromptURLEnvVar+"="); ok {
-			httpPrompt := types.Prompt{
-				Message:   params.Message,
-				Fields:    strings.Split(params.Fields, ","),
-				Sensitive: params.Sensitive == "true",
-			}
-			return sysPromptHTTP(ctx, url, httpPrompt)
-		}
-	}
-
-	if params.Message != "" {
-		_, _ = fmt.Fprintln(os.Stderr, params.Message)
-	}
-
-	results := map[string]string{}
-	for _, f := range strings.Split(params.Fields, ",") {
-		var value string
-		if params.Sensitive == "true" {
-			err = survey.AskOne(&survey.Password{Message: f}, &value, survey.WithStdio(os.Stdin, os.Stderr, os.Stderr))
-		} else {
-			err = survey.AskOne(&survey.Input{Message: f}, &value, survey.WithStdio(os.Stdin, os.Stderr, os.Stderr))
-		}
-		if err != nil {
-			return "", err
-		}
-		results[f] = value
-	}
-
-	resultsStr, err := json.Marshal(results)
-	if err != nil {
-		return "", err
-	}
-
-	return string(resultsStr), nil
-}
-
 func SysTimeNow(context.Context, []string, string) (string, error) {
 	return time.Now().Format(time.RFC3339), nil
 }

pkg/cli/gptscript.go

@@ -70,7 +70,7 @@ type GPTScript struct {
 	ForceSequential    bool   `usage:"Force parallel calls to run sequentially"`
 	Workspace          string `usage:"Directory to use for the workspace, if specified it will not be deleted on exit"`
 	UI                 bool   `usage:"Launch the UI" local:"true" name:"ui"`
-	TUI                bool   `usage:"Launch the TUI" local:"true" name:"tui"`
+	DisableTUI         bool   `usage:"Don't use chat TUI but instead verbose output" local:"true" name:"disable-tui"`
 
 	readData []byte
 }
@@ -438,9 +438,14 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 	}
 
 	if prg.IsChat() || r.ForceChat {
-		if r.TUI {
-			return tui.Run(cmd.Context(), args[0], r.Workspace, strings.Join(args[1:], " "), tui.RunOptions{
+		if !r.DisableTUI && !r.Debug && !r.DebugMessages {
+			return tui.Run(cmd.Context(), args[0], tui.RunOptions{
 				TrustedRepoPrefixes: []string{"github.com/gptscript-ai/context"},
+				DisableCache:        r.DisableCache,
+				Input:               strings.Join(args[1:], " "),
+				CacheDir:            r.CacheDir,
+				SubTool:             r.SubTool,
+				Workspace:           r.Workspace,
 			})
 		}
 		return chat.Start(cmd.Context(), nil, gptScript, func() (types.Program, error) {

pkg/engine/cmd.go

@@ -14,13 +14,17 @@ import (
 	"strings"
 
 	"github.com/google/shlex"
-	context2 "github.com/gptscript-ai/gptscript/pkg/context"
 	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/env"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/gptscript-ai/gptscript/pkg/version"
 )
 
+var requiredFileExtensions = map[string]string{
+	"powershell.exe": "*.ps1",
+	"powershell":     "*.ps1",
+}
+
 func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCategory ToolCategory) (cmdOut string, cmdErr error) {
 	id := counter.Next()
 
@@ -73,12 +77,6 @@ func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCate
 	cmd.Stderr = io.MultiWriter(all, os.Stderr)
 	cmd.Stdout = io.MultiWriter(all, output)
 
-	if toolCategory == CredentialToolCategory {
-		pause := context2.GetPauseFuncFromCtx(ctx.Ctx)
-		unpause := pause()
-		defer unpause()
-	}
-
 	if err := cmd.Run(); err != nil {
 		if toolCategory == NoCategory {
 			return fmt.Sprintf("ERROR: got (%v) while running tool, OUTPUT: %s", err, all), nil
@@ -205,7 +203,7 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, tool types.T
 	)
 
 	if strings.TrimSpace(rest) != "" {
-		f, err := os.CreateTemp("", version.ProgramName)
+		f, err := os.CreateTemp("", version.ProgramName+requiredFileExtensions[args[0]])
 		if err != nil {
 			return nil, nil, err
 		}

pkg/gptscript/gptscript.go

@@ -5,15 +5,18 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/gptscript-ai/gptscript/pkg/builtin"
 	"github.com/gptscript-ai/gptscript/pkg/cache"
+	context2 "github.com/gptscript-ai/gptscript/pkg/context"
 	"github.com/gptscript-ai/gptscript/pkg/engine"
 	"github.com/gptscript-ai/gptscript/pkg/hash"
 	"github.com/gptscript-ai/gptscript/pkg/llm"
 	"github.com/gptscript-ai/gptscript/pkg/monitor"
 	"github.com/gptscript-ai/gptscript/pkg/mvl"
 	"github.com/gptscript-ai/gptscript/pkg/openai"
+	"github.com/gptscript-ai/gptscript/pkg/prompt"
 	"github.com/gptscript-ai/gptscript/pkg/remote"
 	"github.com/gptscript-ai/gptscript/pkg/repos/runtimes"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
@@ -28,6 +31,8 @@ type GPTScript struct {
 	Cache                  *cache.Client
 	WorkspacePath          string
 	DeleteWorkspaceOnClose bool
+	extraEnv               []string
+	close                  func()
 }
 
 type Options struct {
@@ -96,12 +101,21 @@ func New(opts *Options) (*GPTScript, error) {
 		return nil, err
 	}
 
+	ctx, closeServer := context.WithCancel(context2.AddPauseFuncToCtx(context.Background(), opts.Runner.MonitorFactory.Pause))
+	extraEnv, err := prompt.NewServer(ctx, opts.Env)
+	if err != nil {
+		closeServer()
+		return nil, err
+	}
+
 	return &GPTScript{
 		Registry:               registry,
 		Runner:                 runner,
 		Cache:                  cacheClient,
 		WorkspacePath:          opts.Workspace,
 		DeleteWorkspaceOnClose: opts.Workspace == "",
+		extraEnv:               extraEnv,
+		close:                  closeServer,
 	}, nil
 }
 
@@ -122,10 +136,10 @@ func (g *GPTScript) getEnv(env []string) ([]string, error) {
 	if err := os.MkdirAll(g.WorkspacePath, 0700); err != nil {
 		return nil, err
 	}
-	return append([]string{
+	return slices.Concat(g.extraEnv, []string{
 		fmt.Sprintf("GPTSCRIPT_WORKSPACE_DIR=%s", g.WorkspacePath),
 		fmt.Sprintf("GPTSCRIPT_WORKSPACE_ID=%s", hash.ID(g.WorkspacePath)),
-	}, env...), nil
+	}, env), nil
 }
 
 func (g *GPTScript) Chat(ctx context.Context, prevState runner.ChatState, prg types.Program, envs []string, input string) (runner.ChatResponse, error) {
@@ -153,6 +167,8 @@ func (g *GPTScript) Close(closeDaemons bool) {
 		}
 	}
 
+	g.close()
+
 	if closeDaemons {
 		engine.CloseDaemons()
 	}

pkg/loader/openapi.go

@@ -199,6 +199,12 @@ func getOpenAPITools(t *openapi3.T, defaultHost string) ([]types.Tool, error) {
 						arg.Description = content.Schema.Value.Description
 					}
 
+					// Read Only can not be sent in the request body, so we remove it
+					for key, property := range arg.Properties {
+						if property.Value.ReadOnly {
+							delete(arg.Properties, key)
+						}
+					}
 					// Unfortunately, the request body doesn't contain any good descriptor for it,
 					// so we just use "requestBodyContent" as the name of the arg.
 					tool.Parameters.Arguments.Properties["requestBodyContent"] = &openapi3.SchemaRef{Value: arg}

pkg/monitor/display.go

@@ -38,6 +38,7 @@ type Console struct {
 	dumpState       string
 	displayProgress bool
 	printMessages   bool
+	callLock        sync.Mutex
 }
 
 var (
@@ -47,6 +48,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.callLock = &c.callLock
 	mon.dump.ID = fmt.Sprint(id)
 	mon.dump.Program = prg
 	mon.dump.Input = input
@@ -55,13 +57,20 @@ func (c *Console) Start(_ context.Context, prg *types.Program, _ []string, input
 	return mon, nil
 }
 
+func (c *Console) Pause() func() {
+	c.callLock.Lock()
+	return func() {
+		c.callLock.Unlock()
+	}
+}
+
 type display struct {
 	dump          dump
 	printMessages bool
 	livePrinter   *livePrinter
 	dumpState     string
 	callIDMap     map[string]string
-	callLock      sync.Mutex
+	callLock      *sync.Mutex
 	usage         types.Usage
 }
 

pkg/monitor/fd.go

@@ -70,6 +70,10 @@ func (s *fileFactory) Start(_ context.Context, prg *types.Program, env []string,
 	return fd, nil
 }
 
+func (s *fileFactory) Pause() func() {
+	return func() {}
+}
+
 func (s *fileFactory) close() {
 	s.lock.Lock()
 	defer s.lock.Unlock()

pkg/mvl/log.go

@@ -53,6 +53,9 @@ func (f formatter) Format(entry *logrus.Entry) ([]byte, error) {
 	if i, ok := entry.Data["request"]; ok && i != "" {
 		msg += fmt.Sprintf(" [request=%s]", i)
 	}
+	if i, ok := entry.Data["cached"]; ok && i == true {
+		msg += " [cached]"
+	}
 	if i, ok := entry.Data["response"]; ok && i != "" {
 		msg += fmt.Sprintf(" [response=%s]", i)
 	}

pkg/openai/client.go

@@ -344,16 +344,15 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 		result.Role = types.CompletionMessageRoleTypeAssistant
 	}
 
-	var usage types.Usage
-	if !cacheResponse {
-		usage = result.Usage
+	if cacheResponse {
+		result.Usage = types.Usage{}
 	}
 
 	status <- types.CompletionStatus{
 		CompletionID: id,
 		Chunks:       response,
 		Response:     result,
-		Usage:        usage,
+		Usage:        result.Usage,
 		Cached:       cacheResponse,
 	}