Skip to content

chore: seperate out env for dataset/workspace tools #931

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
Jan 14, 2025
Merged

chore: seperate out env for dataset/workspace tools #931

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions pkg/sdkserver/datasets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (s *server) listDatasets(w http.ResponseWriter, r *http.Request) {
return
}

result, err := g.Run(r.Context(), prg, req.Env, req.Input)
result, err := g.Run(r.Context(), prg, s.getServerToolsEnv(req.Env), req.Input)
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to run program: %w", err))
return
Expand Down Expand Up @@ -147,7 +147,7 @@ func (s *server) addDatasetElements(w http.ResponseWriter, r *http.Request) {
return
}

result, err := g.Run(r.Context(), prg, req.Env, req.Input)
result, err := g.Run(r.Context(), prg, s.getServerToolsEnv(req.Env), req.Input)
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to run program: %w", err))
return
Expand Down Expand Up @@ -207,7 +207,7 @@ func (s *server) listDatasetElements(w http.ResponseWriter, r *http.Request) {
return
}

result, err := g.Run(r.Context(), prg, req.Env, req.Input)
result, err := g.Run(r.Context(), prg, s.getServerToolsEnv(req.Env), req.Input)
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to run program: %w", err))
return
Expand Down Expand Up @@ -270,7 +270,7 @@ func (s *server) getDatasetElement(w http.ResponseWriter, r *http.Request) {
return
}

result, err := g.Run(r.Context(), prg, req.Env, req.Input)
result, err := g.Run(r.Context(), prg, s.getServerToolsEnv(req.Env), req.Input)
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to run program: %w", err))
return
Expand Down
1 change: 1 addition & 0 deletions pkg/sdkserver/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type server struct {
gptscriptOpts gptscript.Options
address, token string
datasetTool, workspaceTool string
serverToolsEnv []string
client *gptscript.GPTScript
events *broadcaster.Broadcaster[event]

Expand Down
16 changes: 11 additions & 5 deletions pkg/sdkserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type Options struct {

ListenAddress string
DatasetTool, WorkspaceTool string
ServerToolsEnv []string
Debug bool
DisableServerErrorLogging bool
}
Expand Down Expand Up @@ -105,11 +106,13 @@ func run(ctx context.Context, listener net.Listener, opts Options) error {
}

s := &server{
gptscriptOpts: opts.Options,
address: listener.Addr().String(),
token: token,
datasetTool: opts.DatasetTool,
workspaceTool: opts.WorkspaceTool,
gptscriptOpts: opts.Options,
address: listener.Addr().String(),
token: token,
datasetTool: opts.DatasetTool,
workspaceTool: opts.WorkspaceTool,
serverToolsEnv: opts.ServerToolsEnv,

client: g,
events: events,
runtimeManager: runtimes.Default(opts.Options.Cache.CacheDir, opts.SystemToolsDir),
Expand Down Expand Up @@ -176,6 +179,9 @@ func complete(opts ...Options) Options {
if result.DatasetTool == "" {
result.DatasetTool = "github.com/gptscript-ai/datasets"
}
if len(result.ServerToolsEnv) == 0 {
result.ServerToolsEnv = os.Environ()
}

return result
}
20 changes: 12 additions & 8 deletions pkg/sdkserver/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ type createWorkspaceRequest struct {
FromWorkspaceIDs []string `json:"fromWorkspaceIDs"`
}

func (s *server) getServerToolsEnv(env []string) []string {
return append(s.serverToolsEnv, env...)
}

func (s *server) createWorkspace(w http.ResponseWriter, r *http.Request) {
logger := gcontext.GetLogger(r.Context())
var reqObject createWorkspaceRequest
Expand All @@ -51,7 +55,7 @@ func (s *server) createWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"provider": "%s", "workspace_ids": "%s"}`,
reqObject.ProviderType, strings.Join(reqObject.FromWorkspaceIDs, ","),
Expand Down Expand Up @@ -86,7 +90,7 @@ func (s *server) deleteWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s"}`,
reqObject.ID,
Expand Down Expand Up @@ -123,7 +127,7 @@ func (s *server) listWorkspaceContents(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "ls_prefix": "%s"}`,
reqObject.ID, reqObject.Prefix,
Expand Down Expand Up @@ -159,7 +163,7 @@ func (s *server) removeAllWithPrefixInWorkspace(w http.ResponseWriter, r *http.R
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "prefix": "%s"}`,
reqObject.ID, reqObject.Prefix,
Expand Down Expand Up @@ -196,7 +200,7 @@ func (s *server) writeFileInWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s", "body": "%s"}`,
reqObject.ID, reqObject.FilePath, reqObject.Contents,
Expand Down Expand Up @@ -232,7 +236,7 @@ func (s *server) removeFileInWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s"}`,
reqObject.ID, reqObject.FilePath,
Expand Down Expand Up @@ -268,7 +272,7 @@ func (s *server) readFileInWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s"}`,
reqObject.ID, reqObject.FilePath,
Expand Down Expand Up @@ -304,7 +308,7 @@ func (s *server) statFileInWorkspace(w http.ResponseWriter, r *http.Request) {
out, err := s.client.Run(
r.Context(),
prg,
reqObject.Env,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s"}`,
reqObject.ID, reqObject.FilePath,
Expand Down
Loading