Skip to content

Commit d407717

Browse files
authored
chore: remove workspace data home option (#74)
Signed-off-by: Donnie Adams <[email protected]>
1 parent 82a0de4 commit d407717

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

opts.go

+10-15
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ package gptscript
33
// GlobalOptions allows specification of settings that are used for every call made.
44
// These options can be overridden by the corresponding Options.
55
type GlobalOptions struct {
6-
URL string `json:"url"`
7-
Token string `json:"token"`
8-
OpenAIAPIKey string `json:"APIKey"`
9-
OpenAIBaseURL string `json:"BaseURL"`
10-
DefaultModel string `json:"DefaultModel"`
11-
DefaultModelProvider string `json:"DefaultModelProvider"`
12-
CacheDir string `json:"CacheDir"`
13-
Env []string `json:"env"`
14-
DatasetToolRepo string `json:"DatasetToolRepo"`
15-
WorkspaceTool string `json:"WorkspaceTool"`
16-
WorkspaceDirectoryDataHome string `json:"WorkspaceDirectoryDataHome"`
6+
URL string `json:"url"`
7+
Token string `json:"token"`
8+
OpenAIAPIKey string `json:"APIKey"`
9+
OpenAIBaseURL string `json:"BaseURL"`
10+
DefaultModel string `json:"DefaultModel"`
11+
DefaultModelProvider string `json:"DefaultModelProvider"`
12+
CacheDir string `json:"CacheDir"`
13+
Env []string `json:"env"`
14+
DatasetToolRepo string `json:"DatasetToolRepo"`
15+
WorkspaceTool string `json:"WorkspaceTool"`
1716
}
1817

1918
func (g GlobalOptions) toEnv() []string {
@@ -30,9 +29,6 @@ func (g GlobalOptions) toEnv() []string {
3029
if g.DefaultModelProvider != "" {
3130
args = append(args, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL_PROVIDER="+g.DefaultModelProvider)
3231
}
33-
if g.WorkspaceDirectoryDataHome != "" {
34-
args = append(args, "GPTSCRIPT_WORKSPACE_DIR="+g.WorkspaceDirectoryDataHome)
35-
}
3632

3733
return args
3834
}
@@ -49,7 +45,6 @@ func completeGlobalOptions(opts ...GlobalOptions) GlobalOptions {
4945
result.DefaultModelProvider = firstSet(opt.DefaultModelProvider, result.DefaultModelProvider)
5046
result.DatasetToolRepo = firstSet(opt.DatasetToolRepo, result.DatasetToolRepo)
5147
result.WorkspaceTool = firstSet(opt.WorkspaceTool, result.WorkspaceTool)
52-
result.WorkspaceDirectoryDataHome = firstSet(opt.WorkspaceDirectoryDataHome, result.WorkspaceDirectoryDataHome)
5348
result.Env = append(result.Env, opt.Env...)
5449
}
5550
return result

workspace.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ import (
88

99
func (g *GPTScript) CreateWorkspace(ctx context.Context, providerType string, fromWorkspaces ...string) (string, error) {
1010
out, err := g.runBasicCommand(ctx, "workspaces/create", map[string]any{
11-
"providerType": providerType,
12-
"fromWorkspaceIDs": fromWorkspaces,
13-
"workspaceTool": g.globalOpts.WorkspaceTool,
14-
"directoryDataHome": g.globalOpts.WorkspaceDirectoryDataHome,
15-
"env": g.globalOpts.Env,
11+
"providerType": providerType,
12+
"fromWorkspaceIDs": fromWorkspaces,
13+
"workspaceTool": g.globalOpts.WorkspaceTool,
14+
"env": g.globalOpts.Env,
1615
})
1716
if err != nil {
1817
return "", err

0 commit comments

Comments
 (0)