Skip to content

chore: delete sys.workspace* methods #379

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
May 20, 2024
Merged

chore: delete sys.workspace* methods #379

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
68 changes: 2 additions & 66 deletions pkg/builtin/builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,6 @@ import (
)

var tools = map[string]types.Tool{
"sys.workspace.ls": {
Parameters: types.Parameters{
Description: "Lists the contents of a directory relative to the current workspace",
Arguments: types.ObjectSchema(
"dir", "The directory to list"),
},
BuiltinFunc: SysWorkspaceLs,
},
"sys.workspace.write": {
Parameters: types.Parameters{
Description: "Write the contents to a file relative to the current workspace",
Arguments: types.ObjectSchema(
"filename", "The name of the file to write to",
"content", "The content to write"),
},
BuiltinFunc: SysWorkspaceWrite,
},
"sys.workspace.read": {
Parameters: types.Parameters{
Description: "Reads the contents of a file relative to the current workspace",
Arguments: types.ObjectSchema(
"filename", "The name of the file to read"),
},
BuiltinFunc: SysWorkspaceRead,
},
"sys.ls": {
Parameters: types.Parameters{
Description: "Lists the contents of a directory",
Expand Down Expand Up @@ -332,14 +307,6 @@ func getWorkspaceDir(envs []string) (string, error) {
return "", fmt.Errorf("no workspace directory found in env")
}

func SysWorkspaceLs(_ context.Context, env []string, input string) (string, error) {
dir, err := getWorkspaceDir(env)
if err != nil {
return "", err
}
return sysLs(dir, input)
}

func SysLs(_ context.Context, _ []string, input string) (string, error) {
return sysLs("", input)
}
Expand Down Expand Up @@ -380,20 +347,7 @@ func sysLs(base, input string) (string, error) {
return strings.Join(result, "\n"), nil
}

func SysWorkspaceRead(ctx context.Context, env []string, input string) (string, error) {
dir, err := getWorkspaceDir(env)
if err != nil {
return "", err
}

return sysRead(ctx, dir, env, input)
}

func SysRead(ctx context.Context, env []string, input string) (string, error) {
return sysRead(ctx, "", env, input)
}

func sysRead(ctx context.Context, base string, env []string, input string) (string, error) {
func SysRead(_ context.Context, _ []string, input string) (string, error) {
var params struct {
Filename string `json:"filename,omitempty"`
}
Expand All @@ -402,9 +356,6 @@ func sysRead(ctx context.Context, base string, env []string, input string) (stri
}

file := params.Filename
if base != "" {
file = filepath.Join(base, file)
}

// Lock the file to prevent concurrent writes from other tool calls.
locker.RLock(file)
Expand All @@ -424,19 +375,7 @@ func sysRead(ctx context.Context, base string, env []string, input string) (stri
return string(data), nil
}

func SysWorkspaceWrite(ctx context.Context, env []string, input string) (string, error) {
dir, err := getWorkspaceDir(env)
if err != nil {
return "", err
}
return sysWrite(ctx, dir, env, input)
}

func SysWrite(ctx context.Context, env []string, input string) (string, error) {
return sysWrite(ctx, "", env, input)
}

func sysWrite(ctx context.Context, base string, env []string, input string) (string, error) {
func SysWrite(ctx context.Context, _ []string, input string) (string, error) {
var params struct {
Filename string `json:"filename,omitempty"`
Content string `json:"content,omitempty"`
Expand All @@ -446,9 +385,6 @@ func sysWrite(ctx context.Context, base string, env []string, input string) (str
}

file := params.Filename
if base != "" {
file = filepath.Join(base, file)
}

// Lock the file to prevent concurrent writes from other tool calls.
locker.Lock(file)
Expand Down