Merge pull request #575 from thedadams/workspace-env-prec

thedadams · web-flow · commit a356d099c808 · 2024-06-27T21:07:20.000-04:00
fix: make the WorkspacePath take absolute precedence for setting env var
diff --git a/pkg/gptscript/gptscript.go b/pkg/gptscript/gptscript.go
@@ -175,10 +175,10 @@ func (g *GPTScript) getEnv(env []string) ([]string, error) {
 	if err := os.MkdirAll(g.WorkspacePath, 0700); err != nil {
 		return nil, err
 	}
-	return slices.Concat(g.ExtraEnv, []string{
+	return slices.Concat(g.ExtraEnv, env, []string{
 		fmt.Sprintf("GPTSCRIPT_WORKSPACE_DIR=%s", g.WorkspacePath),
 		fmt.Sprintf("GPTSCRIPT_WORKSPACE_ID=%s", hash.ID(g.WorkspacePath)),
-	}, env), nil
+	}), nil
 }
 
 func (g *GPTScript) Chat(ctx context.Context, prevState runner.ChatState, prg types.Program, envs []string, input string) (runner.ChatResponse, error) {

Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,10 @@ func (g *GPTScript) getEnv(env []string) ([]string, error) {`
`175`	`175`	`if err := os.MkdirAll(g.WorkspacePath, 0700); err != nil {`
`176`	`176`	`return nil, err`
`177`	`177`	`}`
`178`		`- return slices.Concat(g.ExtraEnv, []string{`
	`178`	`+ return slices.Concat(g.ExtraEnv, env, []string{`
`179`	`179`	`fmt.Sprintf("GPTSCRIPT_WORKSPACE_DIR=%s", g.WorkspacePath),`
`180`	`180`	`fmt.Sprintf("GPTSCRIPT_WORKSPACE_ID=%s", hash.ID(g.WorkspacePath)),`
`181`		`- }, env), nil`
	`181`	`+ }), nil`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`func (g *GPTScript) Chat(ctx context.Context, prevState runner.ChatState, prg types.Program, envs []string, input string) (runner.ChatResponse, error) {`