Skip to content
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.

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

chore: pass files bytes for workspace API instead of base64 encoding #75

Merged
merged 1 commit into from
Oct 18, 2024
Merged
Changes from all commits
Commits
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
26 changes: 11 additions & 15 deletions workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package gptscript

import (
"context"
"encoding/base64"
"strings"
)

Expand Down Expand Up @@ -52,8 +51,7 @@ func (g *GPTScript) ListFilesInWorkspace(ctx context.Context, workspaceID string
return nil, err
}

// The first line of the output is the workspace ID, ignore it.
return strings.Split(strings.TrimSpace(out), "\n")[1:], nil
return strings.Split(strings.TrimSpace(out), "\n"), nil
}

func (g *GPTScript) RemoveAllWithPrefix(ctx context.Context, workspaceID, prefix string) error {
Expand All @@ -69,12 +67,11 @@ func (g *GPTScript) RemoveAllWithPrefix(ctx context.Context, workspaceID, prefix

func (g *GPTScript) WriteFileInWorkspace(ctx context.Context, workspaceID, filePath string, contents []byte) error {
_, err := g.runBasicCommand(ctx, "workspaces/write-file", map[string]any{
"id": workspaceID,
"contents": base64.StdEncoding.EncodeToString(contents),
"filePath": filePath,
"workspaceTool": g.globalOpts.WorkspaceTool,
"base64EncodedInput": true,
"env": g.globalOpts.Env,
"id": workspaceID,
"contents": contents,
"filePath": filePath,
"workspaceTool": g.globalOpts.WorkspaceTool,
"env": g.globalOpts.Env,
})

return err
Expand All @@ -93,15 +90,14 @@ func (g *GPTScript) DeleteFileInWorkspace(ctx context.Context, workspaceID, file

func (g *GPTScript) ReadFileInWorkspace(ctx context.Context, workspaceID, filePath string) ([]byte, error) {
out, err := g.runBasicCommand(ctx, "workspaces/read-file", map[string]any{
"id": workspaceID,
"filePath": filePath,
"workspaceTool": g.globalOpts.WorkspaceTool,
"base64EncodeOutput": true,
"env": g.globalOpts.Env,
"id": workspaceID,
"filePath": filePath,
"workspaceTool": g.globalOpts.WorkspaceTool,
"env": g.globalOpts.Env,
})
if err != nil {
return nil, err
}

return base64.StdEncoding.DecodeString(out)
return []byte(out), nil
}