feat: make GlobalOptions option by using variadic approach

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

Author: thedadams

gptscript.go

@@ -29,7 +29,8 @@ type GPTScript struct {
 	globalEnv []string
 }
 
-func NewGPTScript(opts GlobalOptions) (*GPTScript, error) {
+func NewGPTScript(opts ...GlobalOptions) (*GPTScript, error) {
+	opt := completeGlobalOptions(opts...)
 	lock.Lock()
 	defer lock.Unlock()
 	gptscriptCount++
@@ -40,18 +41,18 @@ func NewGPTScript(opts GlobalOptions) (*GPTScript, error) {
 		serverURL = os.Getenv("GPTSCRIPT_URL")
 	}
 
-	if opts.Env == nil {
-		opts.Env = os.Environ()
+	if opt.Env == nil {
+		opt.Env = os.Environ()
 	}
 
-	opts.Env = append(opts.Env, opts.toEnv()...)
+	opt.Env = append(opt.Env, opt.toEnv()...)
 
 	if serverProcessCancel == nil && !disableServer {
 		ctx, cancel := context.WithCancel(context.Background())
 		in, _ := io.Pipe()
 
 		serverProcess = exec.CommandContext(ctx, getCommand(), "sys.sdkserver", "--listen-address", serverURL)
-		serverProcess.Env = opts.Env[:]
+		serverProcess.Env = opt.Env[:]
 
 		serverProcess.Stdin = in
 		stdErr, err := serverProcess.StderrPipe()
@@ -96,7 +97,7 @@ func NewGPTScript(opts GlobalOptions) (*GPTScript, error) {
 	}
 
 	if disableServer {
-		g.globalEnv = opts.Env[:]
+		g.globalEnv = opt.Env[:]
 	}
 
 	return g, nil

opts.go

@@ -28,6 +28,29 @@ func (g GlobalOptions) toEnv() []string {
 	return args
 }
 
+func completeGlobalOptions(opts ...GlobalOptions) GlobalOptions {
+	result := GlobalOptions{}
+	for _, opt := range opts {
+		result.OpenAIAPIKey = firstSet(opt.OpenAIAPIKey, result.OpenAIAPIKey)
+		result.OpenAIBaseURL = firstSet(opt.OpenAIBaseURL, result.OpenAIBaseURL)
+		result.DefaultModel = firstSet(opt.DefaultModel, result.DefaultModel)
+		result.DefaultModelProvider = firstSet(opt.DefaultModelProvider, result.DefaultModelProvider)
+		result.Env = append(result.Env, opt.Env...)
+	}
+	return opts[0]
+}
+
+func firstSet[T comparable](in ...T) T {
+	var result T
+	for _, i := range in {
+		if i != result {
+			return i
+		}
+	}
+
+	return result
+}
+
 // Options represents options for the gptscript tool or file.
 type Options struct {
 	GlobalOptions `json:",inline"`