Skip to content

fix: resolve ~ in workspace path #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2024
Merged

fix: resolve ~ in workspace path #594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion pkg/gptscript/gptscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"fmt"
"os"
"os/user"
"path/filepath"
"slices"
"strings"

"github.com/gptscript-ai/gptscript/pkg/builtin"
"github.com/gptscript-ai/gptscript/pkg/cache"
Expand Down Expand Up @@ -167,7 +169,7 @@ func (g *GPTScript) getEnv(env []string) ([]string, error) {
}
} else if !filepath.IsAbs(g.WorkspacePath) {
var err error
g.WorkspacePath, err = filepath.Abs(g.WorkspacePath)
g.WorkspacePath, err = makeAbsolute(g.WorkspacePath)
if err != nil {
return nil, err
}
Expand All @@ -181,6 +183,18 @@ func (g *GPTScript) getEnv(env []string) ([]string, error) {
}), nil
}

func makeAbsolute(path string) (string, error) {
if strings.HasPrefix(path, "~"+string(filepath.Separator)) {
usr, err := user.Current()
if err != nil {
return "", err
}

return filepath.Join(usr.HomeDir, path[2:]), nil
}
return filepath.Abs(path)
}

func (g *GPTScript) Chat(ctx context.Context, prevState runner.ChatState, prg types.Program, envs []string, input string) (runner.ChatResponse, error) {
envs, err := g.getEnv(envs)
if err != nil {
Expand Down