fix: add revive lint and fix related issues

thedadams · thedadams · commit 8c6394bf6b09 · 2024-02-12T10:40:40.000-05:00
Signed-off-by: Donnie Adams &lt;donnie@acorn.io&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -18,5 +18,6 @@ linters:
   - unused
   - goimports
   - whitespace
+  - revive
   fast: false
   max-same-issues: 50
diff --git a/pkg/assemble/assemble.go b/pkg/assemble/assemble.go
@@ -1,7 +1,6 @@
 package assemble
 
 import (
-	"context"
 	"encoding/json"
 	"io"
 
@@ -10,7 +9,7 @@ import (
 
 var Header = []byte("GPTSCRIPT!")
 
-func Assemble(ctx context.Context, prg types.Program, output io.Writer) error {
+func Assemble(prg types.Program, output io.Writer) error {
 	if _, err := output.Write(Header); err != nil {
 		return err
 	}
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -1,7 +1,6 @@
 package cache
 
 import (
-	"context"
 	"errors"
 	"io/fs"
 	"os"
@@ -47,14 +46,14 @@ func New(opts ...Options) (*Client, error) {
 	}, nil
 }
 
-func (c *Client) Store(ctx context.Context, key string, content []byte) error {
+func (c *Client) Store(key string, content []byte) error {
 	if c == nil || c.noop {
 		return nil
 	}
 	return os.WriteFile(filepath.Join(c.dir, key), content, 0644)
 }
 
-func (c *Client) Get(ctx context.Context, key string) ([]byte, bool, error) {
+func (c *Client) Get(key string) ([]byte, bool, error) {
 	if c == nil || c.noop {
 		return nil, false, nil
 	}
diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go
@@ -52,7 +52,7 @@ func (r *GPTScript) Customize(cmd *cobra.Command) {
 	cmd.Flags().SetInterspersed(false)
 }
 
-func (r *GPTScript) listTools(ctx context.Context) error {
+func (r *GPTScript) listTools() error {
 	var lines []string
 	for _, tool := range builtin.ListTools() {
 		lines = append(lines, tool.String())
@@ -79,7 +79,7 @@ func (r *GPTScript) listModels(ctx context.Context) error {
 	return nil
 }
 
-func (r *GPTScript) Pre(cmd *cobra.Command, args []string) error {
+func (r *GPTScript) Pre(*cobra.Command, []string) error {
 	if r.Quiet == nil {
 		if term.IsTerminal(int(os.Stdout.Fd())) {
 			r.Quiet = new(bool)
@@ -107,7 +107,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	if r.ListTools {
-		return r.listTools(cmd.Context())
+		return r.listTools()
 	}
 
 	if r.Server {
@@ -158,7 +158,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) error {
 			out = f
 		}
 
-		return assemble.Assemble(cmd.Context(), prg, out)
+		return assemble.Assemble(prg, out)
 	}
 
 	runner, err := runner.New(r.Options, runner.Options{
diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go
@@ -40,11 +40,11 @@ func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string)
 		return tool.BuiltinFunc(ctx, e.Env, input)
 	}
 
-	cmd, close, err := e.newCommand(ctx, nil, tool.Instructions, input)
+	cmd, stop, err := e.newCommand(ctx, nil, tool.Instructions, input)
 	if err != nil {
 		return "", err
 	}
-	defer close()
+	defer stop()
 
 	e.Progress <- openai.Status{
 		CompletionID: id,
@@ -130,28 +130,28 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, instructions
 
 	var (
 		cmdArgs = args[1:]
-		close   func()
+		stop    func()
 	)
 
 	if strings.TrimSpace(rest) != "" {
 		f, err := os.CreateTemp("", version.ProgramName)
 		if err != nil {
 			return nil, nil, err
 		}
-		close = func() {
-			os.Remove(f.Name())
+		stop = func() {
+			_ = os.Remove(f.Name())
 		}
 
 		_, err = f.Write([]byte(rest))
 		_ = f.Close()
 		if err != nil {
-			close()
+			stop()
 			return nil, nil, err
 		}
 		cmdArgs = append(cmdArgs, f.Name())
 	}
 
 	cmd := exec.CommandContext(ctx, args[0], cmdArgs...)
 	cmd.Env = env
-	return cmd, close, nil
+	return cmd, stop, nil
 }
diff --git a/pkg/engine/daemon.go b/pkg/engine/daemon.go
@@ -89,7 +89,7 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error)
 	port = e.getNextPort()
 	url = fmt.Sprintf("http://127.0.0.1:%d%s", port, path)
 
-	cmd, close, err := e.newCommand(ctx, []string{
+	cmd, stop, err := e.newCommand(ctx, []string{
 		fmt.Sprintf("PORT=%d", port),
 	},
 		types.CommandPrefix+instructions,
@@ -103,7 +103,7 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error)
 	cmd.Stdout = os.Stdout
 	log.Infof("launched [%s][%s] port [%d] %v", tool.Name, tool.ID, port, cmd.Args)
 	if err := cmd.Start(); err != nil {
-		close()
+		stop()
 		return url, err
 	}
 
@@ -122,7 +122,7 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error)
 		}
 
 		cancel(err)
-		close()
+		stop()
 		daemonLock.Lock()
 		defer daemonLock.Unlock()
 
@@ -140,11 +140,9 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error)
 	for i := 0; i < 20; i++ {
 		resp, err := http.Get(url)
 		if err == nil && resp.StatusCode == http.StatusOK {
-			defer func() {
-				_ = resp.Body.Close()
-			}()
 			go func() {
 				_, _ = io.ReadAll(resp.Body)
+				_ = resp.Body.Close()
 			}()
 			return url, nil
 		}
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -95,7 +95,7 @@ func (c *Context) ParentID() string {
 	return c.Parent.ID
 }
 
-func (c *Context) UnmarshalJSON(data []byte) error {
+func (c *Context) UnmarshalJSON([]byte) error {
 	panic("this data struct is circular by design and can not be read from json")
 }
 
diff --git a/pkg/loader/loader_test.go b/pkg/loader/loader_test.go
@@ -2,5 +2,5 @@ package loader
 
 import "testing"
 
-func TestLoader(t *testing.T) {
+func TestLoader(*testing.T) {
 }
diff --git a/pkg/monitor/display.go b/pkg/monitor/display.go
@@ -39,7 +39,7 @@ var (
 	prettyIDCounter int64
 )
 
-func (c *Console) Start(ctx context.Context, prg *types.Program, env []string, input string) (runner.Monitor, error) {
+func (c *Console) Start(_ context.Context, prg *types.Program, _ []string, input string) (runner.Monitor, error) {
 	id := atomic.AddInt64(&runID, 1)
 	mon := newDisplay(c.dumpState, c.displayProgress)
 	mon.dump.ID = fmt.Sprint(id)
@@ -79,7 +79,7 @@ func (l *livePrinter) end() {
 	}
 }
 
-func (l *livePrinter) progressStart(event runner.Event, c call) {
+func (l *livePrinter) progressStart(c call) {
 	if l == nil {
 		return
 	}
@@ -91,7 +91,7 @@ func (l *livePrinter) progressStart(event runner.Event, c call) {
 	})
 }
 
-func (l *livePrinter) progressEnd(event runner.Event, c call) {
+func (l *livePrinter) progressEnd(c call) {
 	if l == nil {
 		return
 	}
@@ -217,17 +217,17 @@ func (d *display) Event(event runner.Event) {
 
 	switch event.Type {
 	case runner.EventTypeCallStart:
-		d.livePrinter.progressStart(event, currentCall)
+		d.livePrinter.progressStart(currentCall)
 		d.livePrinter.end()
 		currentCall.Start = event.Time
 		currentCall.Input = event.Content
 		log.Fields("input", event.Content).Infof("started  [%s]", callName)
 	case runner.EventTypeCallSubCalls:
-		d.livePrinter.progressEnd(event, currentCall)
+		d.livePrinter.progressEnd(currentCall)
 	case runner.EventTypeCallProgress:
 		d.livePrinter.print(event, currentCall)
 	case runner.EventTypeCallContinue:
-		d.livePrinter.progressStart(event, currentCall)
+		d.livePrinter.progressStart(currentCall)
 		d.livePrinter.end()
 		log.Fields("toolResults", event.ToolResults).Infof("continue [%s]", callName)
 	case runner.EventTypeChat:
@@ -253,7 +253,7 @@ func (d *display) Event(event runner.Event) {
 			Cached:       event.ChatResponseCached,
 		})
 	case runner.EventTypeCallFinish:
-		d.livePrinter.progressEnd(event, currentCall)
+		d.livePrinter.progressEnd(currentCall)
 		d.livePrinter.end()
 		currentCall.End = event.Time
 		currentCall.Output = event.Content
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
@@ -136,12 +136,12 @@ func (c *Client) seed(request openai.ChatCompletionRequest) int {
 	return hash.Seed(newRequest)
 }
 
-func (c *Client) fromCache(ctx context.Context, messageRequest types.CompletionRequest, request openai.ChatCompletionRequest) (result []openai.ChatCompletionStreamResponse, _ bool, _ error) {
+func (c *Client) fromCache(messageRequest types.CompletionRequest, request openai.ChatCompletionRequest) (result []openai.ChatCompletionStreamResponse, _ bool, _ error) {
 	if messageRequest.Cache != nil && !*messageRequest.Cache {
 		return nil, false, nil
 	}
 
-	cache, found, err := c.cache.Get(ctx, c.cacheKey(request))
+	cache, found, err := c.cache.Get(c.cacheKey(request))
 	if err != nil {
 		return nil, false, err
 	} else if !found {
@@ -167,10 +167,10 @@ func toToolCall(call types.CompletionToolCall) openai.ToolCall {
 	}
 }
 
-func toMessages(ctx context.Context, cache *cache.Client, request types.CompletionRequest) (result []openai.ChatCompletionMessage, err error) {
+func toMessages(cache *cache.Client, request types.CompletionRequest) (result []openai.ChatCompletionMessage, err error) {
 	for _, message := range request.Messages {
 		if request.Vision {
-			message, err = vision.ToVisionMessage(ctx, cache, message)
+			message, err = vision.ToVisionMessage(cache, message)
 			if err != nil {
 				return nil, err
 			}
@@ -189,7 +189,7 @@ func toMessages(ctx context.Context, cache *cache.Client, request types.Completi
 				chatMessage.ToolCalls = append(chatMessage.ToolCalls, toToolCall(*content.ToolCall))
 			}
 			if content.Image != nil {
-				url, err := vision.ImageToURL(ctx, cache, request.Vision, *content.Image)
+				url, err := vision.ImageToURL(cache, request.Vision, *content.Image)
 				if err != nil {
 					return nil, err
 				}
@@ -247,7 +247,7 @@ type Status struct {
 }
 
 func (c *Client) Call(ctx context.Context, messageRequest types.CompletionRequest, status chan<- Status) (*types.CompletionMessage, error) {
-	msgs, err := toMessages(ctx, c.cache, messageRequest)
+	msgs, err := toMessages(c.cache, messageRequest)
 	if err != nil {
 		return nil, err
 	}
@@ -298,7 +298,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 
 	var cacheResponse bool
 	request.Seed = ptr(c.seed(request))
-	response, ok, err := c.fromCache(ctx, messageRequest, request)
+	response, ok, err := c.fromCache(messageRequest, request)
 	if err != nil {
 		return nil, err
 	} else if !ok {
@@ -390,7 +390,7 @@ func override(left, right string) string {
 	return left
 }
 
-func (c *Client) store(ctx context.Context, key string, responses []openai.ChatCompletionStreamResponse) error {
+func (c *Client) store(key string, responses []openai.ChatCompletionStreamResponse) error {
 	buf := &bytes.Buffer{}
 	gz := gzip.NewWriter(buf)
 	err := json.NewEncoder(gz).Encode(responses)
@@ -400,7 +400,7 @@ func (c *Client) store(ctx context.Context, key string, responses []openai.ChatC
 	if err := gz.Close(); err != nil {
 		return err
 	}
-	return c.cache.Store(ctx, key, buf.Bytes())
+	return c.cache.Store(key, buf.Bytes())
 }
 
 func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest, transactionID string, partial chan<- Status) (responses []openai.ChatCompletionStreamResponse, _ error) {
@@ -426,7 +426,7 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
 	for {
 		response, err := stream.Recv()
 		if err == io.EOF {
-			return responses, c.store(ctx, cacheKey, responses)
+			return responses, c.store(cacheKey, responses)
 		} else if err != nil {
 			return nil, err
 		}
diff --git a/pkg/runner/monitor.go b/pkg/runner/monitor.go
@@ -9,15 +9,14 @@ import (
 type noopFactory struct {
 }
 
-func (n noopFactory) Start(ctx context.Context, prg *types.Program, env []string, input string) (Monitor, error) {
+func (n noopFactory) Start(context.Context, *types.Program, []string, string) (Monitor, error) {
 	return noopMonitor{}, nil
 }
 
 type noopMonitor struct {
 }
 
-func (n noopMonitor) Event(event Event) {
+func (n noopMonitor) Event(Event) {
 }
 
-func (n noopMonitor) Stop(output string, err error) {
-}
+func (n noopMonitor) Stop(string, error) {}
diff --git a/pkg/vision/image.go b/pkg/vision/image.go

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package cache`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "context"`
`5`	`4`	`"errors"`
`6`	`5`	`"io/fs"`
`7`	`6`	`"os"`
`@@ -47,14 +46,14 @@ func New(opts ...Options) (*Client, error) {`
`47`	`46`	`}, nil`
`48`	`47`	`}`
`49`	`48`
`50`		`-func (c *Client) Store(ctx context.Context, key string, content []byte) error {`
	`49`	`+func (c *Client) Store(key string, content []byte) error {`
`51`	`50`	`if c == nil \|\| c.noop {`
`52`	`51`	`return nil`
`53`	`52`	`}`
`54`	`53`	`return os.WriteFile(filepath.Join(c.dir, key), content, 0644)`
`55`	`54`	`}`
`56`	`55`
`57`		`-func (c *Client) Get(ctx context.Context, key string) ([]byte, bool, error) {`
	`56`	`+func (c *Client) Get(key string) ([]byte, bool, error) {`
`58`	`57`	`if c == nil \|\| c.noop {`
`59`	`58`	`return nil, false, nil`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (r GPTScript) Customize(cmd cobra.Command) {`
`52`	`52`	`cmd.Flags().SetInterspersed(false)`
`53`	`53`	`}`
`54`	`54`
`55`		`-func (r *GPTScript) listTools(ctx context.Context) error {`
	`55`	`+func (r *GPTScript) listTools() error {`
`56`	`56`	`var lines []string`
`57`	`57`	`for _, tool := range builtin.ListTools() {`
`58`	`58`	`lines = append(lines, tool.String())`
`@@ -79,7 +79,7 @@ func (r *GPTScript) listModels(ctx context.Context) error {`
`79`	`79`	`return nil`
`80`	`80`	`}`
`81`	`81`
`82`		`-func (r GPTScript) Pre(cmd cobra.Command, args []string) error {`
	`82`	`+func (r GPTScript) Pre(cobra.Command, []string) error {`
`83`	`83`	`if r.Quiet == nil {`
`84`	`84`	`if term.IsTerminal(int(os.Stdout.Fd())) {`
`85`	`85`	`r.Quiet = new(bool)`
`@@ -107,7 +107,7 @@ func (r GPTScript) Run(cmd cobra.Command, args []string) error {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if r.ListTools {`
`110`		`- return r.listTools(cmd.Context())`
	`110`	`+ return r.listTools()`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if r.Server {`
`@@ -158,7 +158,7 @@ func (r GPTScript) Run(cmd cobra.Command, args []string) error {`
`158`	`158`	`out = f`
`159`	`159`	`}`
`160`	`160`
`161`		`- return assemble.Assemble(cmd.Context(), prg, out)`
	`161`	`+ return assemble.Assemble(prg, out)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`runner, err := runner.New(r.Options, runner.Options{`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string)`
`40`	`40`	`return tool.BuiltinFunc(ctx, e.Env, input)`
`41`	`41`	`}`
`42`	`42`
`43`		`- cmd, close, err := e.newCommand(ctx, nil, tool.Instructions, input)`
	`43`	`+ cmd, stop, err := e.newCommand(ctx, nil, tool.Instructions, input)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return "", err`
`46`	`46`	`}`
`47`		`- defer close()`
	`47`	`+ defer stop()`
`48`	`48`
`49`	`49`	`e.Progress <- openai.Status{`
`50`	`50`	`CompletionID: id,`
`@@ -130,28 +130,28 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, instructions`
`130`	`130`
`131`	`131`	`var (`
`132`	`132`	`cmdArgs = args[1:]`
`133`		`- close func()`
	`133`	`+ stop func()`
`134`	`134`	`)`
`135`	`135`
`136`	`136`	`if strings.TrimSpace(rest) != "" {`
`137`	`137`	`f, err := os.CreateTemp("", version.ProgramName)`
`138`	`138`	`if err != nil {`
`139`	`139`	`return nil, nil, err`
`140`	`140`	`}`
`141`		`- close = func() {`
`142`		`- os.Remove(f.Name())`
	`141`	`+ stop = func() {`
	`142`	`+ _ = os.Remove(f.Name())`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`_, err = f.Write([]byte(rest))`
`146`	`146`	`_ = f.Close()`
`147`	`147`	`if err != nil {`
`148`		`- close()`
	`148`	`+ stop()`
`149`	`149`	`return nil, nil, err`
`150`	`150`	`}`
`151`	`151`	`cmdArgs = append(cmdArgs, f.Name())`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`cmd := exec.CommandContext(ctx, args[0], cmdArgs...)`
`155`	`155`	`cmd.Env = env`
`156`		`- return cmd, close, nil`
	`156`	`+ return cmd, stop, nil`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (c *Context) ParentID() string {`
`95`	`95`	`return c.Parent.ID`
`96`	`96`	`}`
`97`	`97`
`98`		`-func (c *Context) UnmarshalJSON(data []byte) error {`
	`98`	`+func (c *Context) UnmarshalJSON([]byte) error {`
`99`	`99`	`panic("this data struct is circular by design and can not be read from json")`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ package loader`
`2`	`2`
`3`	`3`	`import "testing"`
`4`	`4`
`5`		`-func TestLoader(t *testing.T) {`
	`5`	`+func TestLoader(*testing.T) {`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,12 @@ func (c *Client) seed(request openai.ChatCompletionRequest) int {`
`136`	`136`	`return hash.Seed(newRequest)`
`137`	`137`	`}`
`138`	`138`
`139`		`-func (c *Client) fromCache(ctx context.Context, messageRequest types.CompletionRequest, request openai.ChatCompletionRequest) (result []openai.ChatCompletionStreamResponse, _ bool, _ error) {`
	`139`	`+func (c *Client) fromCache(messageRequest types.CompletionRequest, request openai.ChatCompletionRequest) (result []openai.ChatCompletionStreamResponse, _ bool, _ error) {`
`140`	`140`	`if messageRequest.Cache != nil && !*messageRequest.Cache {`
`141`	`141`	`return nil, false, nil`
`142`	`142`	`}`
`143`	`143`
`144`		`- cache, found, err := c.cache.Get(ctx, c.cacheKey(request))`
	`144`	`+ cache, found, err := c.cache.Get(c.cacheKey(request))`
`145`	`145`	`if err != nil {`
`146`	`146`	`return nil, false, err`
`147`	`147`	`} else if !found {`
`@@ -167,10 +167,10 @@ func toToolCall(call types.CompletionToolCall) openai.ToolCall {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`-func toMessages(ctx context.Context, cache *cache.Client, request types.CompletionRequest) (result []openai.ChatCompletionMessage, err error) {`
	`170`	`+func toMessages(cache *cache.Client, request types.CompletionRequest) (result []openai.ChatCompletionMessage, err error) {`
`171`	`171`	`for _, message := range request.Messages {`
`172`	`172`	`if request.Vision {`
`173`		`- message, err = vision.ToVisionMessage(ctx, cache, message)`
	`173`	`+ message, err = vision.ToVisionMessage(cache, message)`
`174`	`174`	`if err != nil {`
`175`	`175`	`return nil, err`
`176`	`176`	`}`
`@@ -189,7 +189,7 @@ func toMessages(ctx context.Context, cache *cache.Client, request types.Completi`
`189`	`189`	`chatMessage.ToolCalls = append(chatMessage.ToolCalls, toToolCall(*content.ToolCall))`
`190`	`190`	`}`
`191`	`191`	`if content.Image != nil {`
`192`		`- url, err := vision.ImageToURL(ctx, cache, request.Vision, *content.Image)`
	`192`	`+ url, err := vision.ImageToURL(cache, request.Vision, *content.Image)`
`193`	`193`	`if err != nil {`
`194`	`194`	`return nil, err`
`195`	`195`	`}`
`@@ -247,7 +247,7 @@ type Status struct {`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`func (c Client) Call(ctx context.Context, messageRequest types.CompletionRequest, status chan<- Status) (types.CompletionMessage, error) {`
`250`		`- msgs, err := toMessages(ctx, c.cache, messageRequest)`
	`250`	`+ msgs, err := toMessages(c.cache, messageRequest)`
`251`	`251`	`if err != nil {`
`252`	`252`	`return nil, err`
`253`	`253`	`}`
`@@ -298,7 +298,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques`
`298`	`298`
`299`	`299`	`var cacheResponse bool`
`300`	`300`	`request.Seed = ptr(c.seed(request))`
`301`		`- response, ok, err := c.fromCache(ctx, messageRequest, request)`
	`301`	`+ response, ok, err := c.fromCache(messageRequest, request)`
`302`	`302`	`if err != nil {`
`303`	`303`	`return nil, err`
`304`	`304`	`} else if !ok {`
`@@ -390,7 +390,7 @@ func override(left, right string) string {`
`390`	`390`	`return left`
`391`	`391`	`}`
`392`	`392`
`393`		`-func (c *Client) store(ctx context.Context, key string, responses []openai.ChatCompletionStreamResponse) error {`
	`393`	`+func (c *Client) store(key string, responses []openai.ChatCompletionStreamResponse) error {`
`394`	`394`	`buf := &bytes.Buffer{}`
`395`	`395`	`gz := gzip.NewWriter(buf)`
`396`	`396`	`err := json.NewEncoder(gz).Encode(responses)`
`@@ -400,7 +400,7 @@ func (c *Client) store(ctx context.Context, key string, responses []openai.ChatC`
`400`	`400`	`if err := gz.Close(); err != nil {`
`401`	`401`	`return err`
`402`	`402`	`}`
`403`		`- return c.cache.Store(ctx, key, buf.Bytes())`
	`403`	`+ return c.cache.Store(key, buf.Bytes())`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest, transactionID string, partial chan<- Status) (responses []openai.ChatCompletionStreamResponse, _ error) {`
`@@ -426,7 +426,7 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,`
`426`	`426`	`for {`
`427`	`427`	`response, err := stream.Recv()`
`428`	`428`	`if err == io.EOF {`
`429`		`- return responses, c.store(ctx, cacheKey, responses)`
	`429`	`+ return responses, c.store(cacheKey, responses)`
`430`	`430`	`} else if err != nil {`
`431`	`431`	`return nil, err`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,14 @@ import (`
`9`	`9`	`type noopFactory struct {`
`10`	`10`	`}`
`11`	`11`
`12`		`-func (n noopFactory) Start(ctx context.Context, prg *types.Program, env []string, input string) (Monitor, error) {`
	`12`	`+func (n noopFactory) Start(context.Context, *types.Program, []string, string) (Monitor, error) {`
`13`	`13`	`return noopMonitor{}, nil`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`type noopMonitor struct {`
`17`	`17`	`}`
`18`	`18`
`19`		`-func (n noopMonitor) Event(event Event) {`
	`19`	`+func (n noopMonitor) Event(Event) {`
`20`	`20`	`}`
`21`	`21`
`22`		`-func (n noopMonitor) Stop(output string, err error) {`
`23`		`-}`
	`22`	`+func (n noopMonitor) Stop(string, error) {}`