chore: move prompt to always http based

Author: ibuildthecloud

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/engine/cmd.go

@@ -14,7 +14,6 @@ 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"
@@ -73,12 +72,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

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/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/prompt/prompt.go

@@ -0,0 +1,102 @@
+package prompt
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	context2 "github.com/gptscript-ai/gptscript/pkg/context"
+	"github.com/gptscript-ai/gptscript/pkg/types"
+)
+
+func sysPromptHTTP(ctx context.Context, envs []string, 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")
+
+	for _, env := range envs {
+		if _, v, ok := strings.Cut(env, types.PromptTokenEnvVar+"="); ok && v != "" {
+			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", v))
+			break
+		}
+	}
+
+	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, envs, url, httpPrompt)
+		}
+	}
+
+	return "", fmt.Errorf("no prompt server found, can not continue")
+}
+
+func sysPrompt(ctx context.Context, req types.Prompt) (_ string, err error) {
+	defer context2.GetPauseFuncFromCtx(ctx)()()
+
+	if req.Message != "" {
+		_, _ = fmt.Fprintln(os.Stderr, req.Message)
+	}
+
+	results := map[string]string{}
+	for _, f := range req.Fields {
+		var value string
+		if req.Sensitive {
+			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
+}