Merge pull request #604 from njhale/enhance/ui-cred-override

njhale · web-flow · commit a0013e458f2c · 2024-07-02T17:41:10.000-04:00
enhance: set sdk cred override env var for ui
diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go
@@ -363,10 +363,13 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 				gptOpt.Env = append(gptOpt.Env, system.BinEnvVar+"="+system.Bin())
 			}
 
-			// If the DefaultModel is set, then pass the correct environment variable.
+			// Pass the corrected environment variables for SDK server options
 			if r.DefaultModel != "" {
 				gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL="+r.DefaultModel)
 			}
+			if len(r.CredentialOverride) > 0 {
+				gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_CREDENTIAL_OVERRIDE="+strings.Join(r.CredentialOverride, ","))
+			}
 
 			args = append([]string{args[0]}, "--file="+file)
 

Original file line number	Diff line number	Diff line change
`@@ -363,10 +363,13 @@ func (r GPTScript) Run(cmd cobra.Command, args []string) (retErr error) {`
`363`	`363`	`gptOpt.Env = append(gptOpt.Env, system.BinEnvVar+"="+system.Bin())`
`364`	`364`	`}`
`365`	`365`
`366`		`- // If the DefaultModel is set, then pass the correct environment variable.`
	`366`	`+ // Pass the corrected environment variables for SDK server options`
`367`	`367`	`if r.DefaultModel != "" {`
`368`	`368`	`gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL="+r.DefaultModel)`
`369`	`369`	`}`
	`370`	`+ if len(r.CredentialOverride) > 0 {`
	`371`	`+ gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_CREDENTIAL_OVERRIDE="+strings.Join(r.CredentialOverride, ","))`
	`372`	`+ }`
`370`	`373`
`371`	`374`	`args = append([]string{args[0]}, "--file="+file)`
`372`	`375`