chore: move cache options to GlobalOptions

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

README.md

@@ -24,6 +24,8 @@ The GPTScript instance allows the caller to run gptscript files, tools, and othe
 
 When creating a `GTPScript` instance, you can pass the following global options. These options are also available as run `Options`. Anything specified as a run option will take precedence over the global option.
 
+- `DisableCache`: Enable or disable caching. Default (false).
+- `CacheDir`: The directory to use for caching. Default (""), which uses the default cache directory.
 - `APIKey`: Specify an OpenAI API key for authenticating requests
 - `BaseURL`: A base URL for an OpenAI compatible API (the default is `https://api.openai.com/v1`)
 - `DefaultModel`: The default model to use for chat completion requests
@@ -36,7 +38,6 @@ These are optional options that can be passed to the various `exec` functions.
 None of the options is required, and the defaults will reduce the number of calls made to the Model API.
 As noted above, the Global Options are also available to specify here. These options would take precedence.
 
-- `disableCache`: Enable or disable caching. Default (false).
 - `subTool`: Use tool of this name, not the first tool
 - `input`: Input arguments for the tool run
 - `workspace`: Directory to use for the workspace, if specified it will not be deleted on exit

gptscript_test.go

@@ -133,7 +133,7 @@ func TestListModelsWithDefaultProvider(t *testing.T) {
 func TestAbortRun(t *testing.T) {
 	tool := ToolDef{Instructions: "What is the capital of the united states?"}
 
-	run, err := g.Evaluate(context.Background(), Options{DisableCache: true, IncludeEvents: true}, tool)
+	run, err := g.Evaluate(context.Background(), Options{GlobalOptions: GlobalOptions{DisableCache: true}, IncludeEvents: true}, tool)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -234,7 +234,7 @@ the response should be in JSON and match the format:
 `,
 	}
 
-	run, err := g.Evaluate(context.Background(), Options{DisableCache: true}, tool)
+	run, err := g.Evaluate(context.Background(), Options{GlobalOptions: GlobalOptions{DisableCache: true}}, tool)
 	if err != nil {
 		t.Errorf("Error executing tool: %v", err)
 	}
@@ -414,7 +414,7 @@ func TestRestartFailedRun(t *testing.T) {
 			Instructions: instructions,
 		},
 	}
-	run, err := g.Evaluate(context.Background(), Options{DisableCache: true, GlobalOptions: GlobalOptions{Env: []string{"EXIT_CODE=1"}}}, tools...)
+	run, err := g.Evaluate(context.Background(), Options{GlobalOptions: GlobalOptions{DisableCache: true, Env: []string{"EXIT_CODE=1"}}}, tools...)
 	if err != nil {
 		t.Fatalf("Error executing tool: %v", err)
 	}
@@ -448,7 +448,7 @@ func TestCredentialOverride(t *testing.T) {
 	}
 
 	run, err := g.Run(context.Background(), filepath.Join(wd, "test", gptscriptFile), Options{
-		DisableCache: true,
+		GlobalOptions: GlobalOptions{DisableCache: true},
 		CredentialOverrides: []string{
 			"test.ts.credential_override:TEST_CRED=foo",
 		},
@@ -733,7 +733,7 @@ func TestToolChat(t *testing.T) {
 		Tools:        []string{"sys.chat.finish"},
 	}
 
-	run, err := g.Evaluate(context.Background(), Options{DisableCache: true}, tool)
+	run, err := g.Evaluate(context.Background(), Options{GlobalOptions: GlobalOptions{DisableCache: true}}, tool)
 	if err != nil {
 		t.Fatalf("Error executing tool: %v", err)
 	}
@@ -828,7 +828,7 @@ func TestToolWithGlobalTools(t *testing.T) {
 
 	var eventContent string
 
-	run, err := g.Run(context.Background(), wd+"/test/global-tools.gpt", Options{DisableCache: true, IncludeEvents: true})
+	run, err := g.Run(context.Background(), wd+"/test/global-tools.gpt", Options{GlobalOptions: GlobalOptions{DisableCache: true}, IncludeEvents: true})
 	if err != nil {
 		t.Fatalf("Error executing tool: %v", err)
 	}

opts.go

@@ -7,6 +7,8 @@ type GlobalOptions struct {
 	OpenAIBaseURL        string   `json:"BaseURL"`
 	DefaultModel         string   `json:"DefaultModel"`
 	DefaultModelProvider string   `json:"DefaultModelProvider"`
+	DisableCache         bool     `json:"DisableCache"`
+	CacheDir             string   `json:"CacheDir"`
 	Env                  []string `json:"env"`
 }
 
@@ -31,6 +33,8 @@ func (g GlobalOptions) toEnv() []string {
 func completeGlobalOptions(opts ...GlobalOptions) GlobalOptions {
 	var result GlobalOptions
 	for _, opt := range opts {
+		result.DisableCache = firstSet(opt.DisableCache, result.DisableCache)
+		result.CacheDir = firstSet(opt.CacheDir, result.CacheDir)
 		result.OpenAIAPIKey = firstSet(opt.OpenAIAPIKey, result.OpenAIAPIKey)
 		result.OpenAIBaseURL = firstSet(opt.OpenAIBaseURL, result.OpenAIBaseURL)
 		result.DefaultModel = firstSet(opt.DefaultModel, result.DefaultModel)
@@ -57,8 +61,6 @@ type Options struct {
 
 	Confirm             bool     `json:"confirm"`
 	Input               string   `json:"input"`
-	DisableCache        bool     `json:"disableCache"`
-	CacheDir            string   `json:"cacheDir"`
 	SubTool             string   `json:"subTool"`
 	Workspace           string   `json:"workspace"`
 	ChatState           string   `json:"chatState"`