Merge pull request #487 from thedadams/set-openai-options-from-sdk

thedadams · web-flow · commit ac679cd0f7ad · 2024-06-12T16:18:20.000-04:00
feat: add ability to pass OpenAI config in the SDK
diff --git a/pkg/cli/eval.go b/pkg/cli/eval.go
@@ -56,7 +56,7 @@ func (e *Eval) Run(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	runner, err := gptscript.New(&opts)
+	runner, err := gptscript.New(opts)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go
@@ -378,7 +378,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 		return s.Start(ctx)
 	}
 
-	gptScript, err := gptscript.New(&gptOpt)
+	gptScript, err := gptscript.New(gptOpt)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/gptscript/gptscript.go b/pkg/gptscript/gptscript.go
@@ -48,10 +48,25 @@ type Options struct {
 	Env               []string
 }
 
-func complete(opts *Options) (result *Options) {
-	result = opts
-	if result == nil {
-		result = &Options{}
+func complete(opts ...Options) (Options, error) {
+	var (
+		result Options
+		err    error
+	)
+
+	for _, opt := range opts {
+		result.Cache = cache.Complete(result.Cache, opt.Cache)
+		result.Monitor = monitor.Complete(result.Monitor, opt.Monitor)
+		result.Runner = runner.Complete(result.Runner, opt.Runner)
+		result.OpenAI, err = openai.Complete(result.OpenAI, opt.OpenAI)
+		if err != nil {
+			return Options{}, err
+		}
+
+		result.CredentialContext = types.FirstSet(opt.CredentialContext, result.CredentialContext)
+		result.Quiet = types.FirstSet(opt.Quiet, result.Quiet)
+		result.Workspace = types.FirstSet(opt.Workspace, result.Workspace)
+		result.Env = append(result.Env, opt.Env...)
 	}
 	if result.Quiet == nil {
 		result.Quiet = new(bool)
@@ -60,13 +75,17 @@ func complete(opts *Options) (result *Options) {
 		result.Env = os.Environ()
 	}
 	if result.CredentialContext == "" {
-		opts.CredentialContext = "default"
+		result.CredentialContext = "default"
 	}
-	return
+
+	return result, nil
 }
 
-func New(opts *Options) (*GPTScript, error) {
-	opts = complete(opts)
+func New(o ...Options) (*GPTScript, error) {
+	opts, err := complete(o...)
+	if err != nil {
+		return nil, err
+	}
 
 	registry := llm.NewRegistry()
 
diff --git a/pkg/monitor/display.go b/pkg/monitor/display.go
@@ -25,7 +25,7 @@ type Options struct {
 	DebugMessages   bool   `usage:"Enable logging of chat completion calls"`
 }
 
-func complete(opts ...Options) (result Options) {
+func Complete(opts ...Options) (result Options) {
 	for _, opt := range opts {
 		result.DumpState = types.FirstSet(opt.DumpState, result.DumpState)
 		result.DisplayProgress = types.FirstSet(opt.DisplayProgress, result.DisplayProgress)
@@ -313,7 +313,7 @@ func (d *display) Stop(output string, err error) {
 }
 
 func NewConsole(opts ...Options) *Console {
-	opt := complete(opts...)
+	opt := Complete(opts...)
 	return &Console{
 		dumpState:       opt.DumpState,
 		displayProgress: opt.DisplayProgress,
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
@@ -58,7 +58,7 @@ type Options struct {
 	Cache        *cache.Client
 }
 
-func complete(opts ...Options) (result Options, err error) {
+func Complete(opts ...Options) (result Options, err error) {
 	for _, opt := range opts {
 		result.BaseURL = types.FirstSet(opt.BaseURL, result.BaseURL)
 		result.APIKey = types.FirstSet(opt.APIKey, result.APIKey)
@@ -87,7 +87,7 @@ func complete(opts ...Options) (result Options, err error) {
 }
 
 func NewClient(credStore credentials.CredentialStore, opts ...Options) (*Client, error) {
-	opt, err := complete(opts...)
+	opt, err := Complete(opts...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -52,7 +52,7 @@ func DefaultAuthorizer(engine.Context, string) (AuthorizerResponse, error) {
 	}, nil
 }
 
-func complete(opts ...Options) (result Options) {
+func Complete(opts ...Options) (result Options) {
 	for _, opt := range opts {
 		result.MonitorFactory = types.FirstSet(opt.MonitorFactory, result.MonitorFactory)
 		result.RuntimeManager = types.FirstSet(opt.RuntimeManager, result.RuntimeManager)
@@ -91,7 +91,7 @@ type Runner struct {
 }
 
 func New(client engine.Model, credStore credentials.CredentialStore, opts ...Options) (*Runner, error) {
-	opt := complete(opts...)
+	opt := Complete(opts...)
 
 	runner := &Runner{
 		c:              client,
diff --git a/pkg/sdkserver/routes.go b/pkg/sdkserver/routes.go
@@ -13,10 +13,12 @@ import (
 	"time"
 
 	"github.com/acorn-io/broadcaster"
+	"github.com/gptscript-ai/gptscript/pkg/cache"
 	gcontext "github.com/gptscript-ai/gptscript/pkg/context"
 	"github.com/gptscript-ai/gptscript/pkg/gptscript"
 	"github.com/gptscript-ai/gptscript/pkg/input"
 	"github.com/gptscript-ai/gptscript/pkg/loader"
+	"github.com/gptscript-ai/gptscript/pkg/openai"
 	"github.com/gptscript-ai/gptscript/pkg/parser"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
 	gserver "github.com/gptscript-ai/gptscript/pkg/server"
@@ -27,6 +29,7 @@ import (
 const toolRunTimeout = 15 * time.Minute
 
 type server struct {
+	gptscriptOpts  gptscript.Options
 	address, token string
 	client         *gptscript.GPTScript
 	events         *broadcaster.Broadcaster[event]
@@ -189,8 +192,9 @@ func (s *server) execHandler(w http.ResponseWriter, r *http.Request) {
 		programLoader = loader.Program
 	}
 
-	opts := &gptscript.Options{
-		Cache:             reqObject.Options,
+	opts := gptscript.Options{
+		Cache:             cache.Options(reqObject.cacheOptions),
+		OpenAI:            openai.Options(reqObject.openAIOptions),
 		Env:               reqObject.Env,
 		Workspace:         reqObject.Workspace,
 		CredentialContext: reqObject.CredentialContext,
diff --git a/pkg/sdkserver/run.go b/pkg/sdkserver/run.go
@@ -16,8 +16,8 @@ import (
 
 type loaderFunc func(context.Context, string, string, ...loader.Options) (types.Program, error)
 
-func (s *server) execAndStream(ctx context.Context, programLoader loaderFunc, logger mvl.Logger, w http.ResponseWriter, opts *gptscript.Options, chatState, input, subTool string, toolDef fmt.Stringer) {
-	g, err := gptscript.New(opts)
+func (s *server) execAndStream(ctx context.Context, programLoader loaderFunc, logger mvl.Logger, w http.ResponseWriter, opts gptscript.Options, chatState, input, subTool string, toolDef fmt.Stringer) {
+	g, err := gptscript.New(s.gptscriptOpts, opts)
 	if err != nil {
 		writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to initialize gptscript: %w", err))
 		return
diff --git a/pkg/sdkserver/server.go b/pkg/sdkserver/server.go
@@ -53,7 +53,7 @@ func Start(ctx context.Context, opts Options) error {
 	// prompt server because it is only used for fmt, parse, etc.
 	opts.Env = append(opts.Env, fmt.Sprintf("%s=%s", types.PromptTokenEnvVar, token))
 
-	g, err := gptscript.New(&opts.Options)
+	g, err := gptscript.New(opts.Options)
 	if err != nil {
 		return err
 	}
@@ -64,6 +64,7 @@ func Start(ctx context.Context, opts Options) error {
 	}
 
 	s := &server{
+		gptscriptOpts:    opts.Options,
 		address:          listener.Addr().String(),
 		token:            token,
 		client:           g,
diff --git a/pkg/sdkserver/types.go b/pkg/sdkserver/types.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/gptscript-ai/gptscript/pkg/cache"
 	"github.com/gptscript-ai/gptscript/pkg/engine"
+	"github.com/gptscript-ai/gptscript/pkg/openai"
 	"github.com/gptscript-ai/gptscript/pkg/parser"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
 	gserver "github.com/gptscript-ai/gptscript/pkg/server"
@@ -40,10 +41,16 @@ func (t toolDefs) String() string {
 	return s.String()
 }
 
+type (
+	cacheOptions  cache.Options
+	openAIOptions openai.Options
+)
+
 type toolOrFileRequest struct {
 	content       `json:",inline"`
 	file          `json:",inline"`
-	cache.Options `json:",inline"`
+	cacheOptions  `json:",inline"`
+	openAIOptions `json:",inline"`
 
 	ToolDefs          toolDefs `json:"toolDefs,inline"`
 	SubTool           string   `json:"subTool"`
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -54,7 +54,7 @@ func New(opts *Options) (*Server, error) {
 	opts = complete(opts)
 	opts.GPTScript.Runner.MonitorFactory = NewSessionFactory(events)
 
-	g, err := gptscript.New(&opts.GPTScript)
+	g, err := gptscript.New(opts.GPTScript)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (e Eval) Run(cmd cobra.Command, args []string) error {`
`56`	`56`	`return err`
`57`	`57`	`}`
`58`	`58`
`59`		`- runner, err := gptscript.New(&opts)`
	`59`	`+ runner, err := gptscript.New(opts)`
`60`	`60`	`if err != nil {`
`61`	`61`	`return err`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ func (r GPTScript) Run(cmd cobra.Command, args []string) (retErr error) {`
`378`	`378`	`return s.Start(ctx)`
`379`	`379`	`}`
`380`	`380`
`381`		`- gptScript, err := gptscript.New(&gptOpt)`
	`381`	`+ gptScript, err := gptscript.New(gptOpt)`
`382`	`382`	`if err != nil {`
`383`	`383`	`return err`
`384`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ type Options struct {`
`58`	`58`	`Cache *cache.Client`
`59`	`59`	`}`
`60`	`60`
`61`		`-func complete(opts ...Options) (result Options, err error) {`
	`61`	`+func Complete(opts ...Options) (result Options, err error) {`
`62`	`62`	`for _, opt := range opts {`
`63`	`63`	`result.BaseURL = types.FirstSet(opt.BaseURL, result.BaseURL)`
`64`	`64`	`result.APIKey = types.FirstSet(opt.APIKey, result.APIKey)`
`@@ -87,7 +87,7 @@ func complete(opts ...Options) (result Options, err error) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`func NewClient(credStore credentials.CredentialStore, opts ...Options) (*Client, error) {`
`90`		`- opt, err := complete(opts...)`
	`90`	`+ opt, err := Complete(opts...)`
`91`	`91`	`if err != nil {`
`92`	`92`	`return nil, err`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func DefaultAuthorizer(engine.Context, string) (AuthorizerResponse, error) {`
`52`	`52`	`}, nil`
`53`	`53`	`}`
`54`	`54`
`55`		`-func complete(opts ...Options) (result Options) {`
	`55`	`+func Complete(opts ...Options) (result Options) {`
`56`	`56`	`for _, opt := range opts {`
`57`	`57`	`result.MonitorFactory = types.FirstSet(opt.MonitorFactory, result.MonitorFactory)`
`58`	`58`	`result.RuntimeManager = types.FirstSet(opt.RuntimeManager, result.RuntimeManager)`
`@@ -91,7 +91,7 @@ type Runner struct {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func New(client engine.Model, credStore credentials.CredentialStore, opts ...Options) (*Runner, error) {`
`94`		`- opt := complete(opts...)`
	`94`	`+ opt := Complete(opts...)`
`95`	`95`
`96`	`96`	`runner := &Runner{`
`97`	`97`	`c: client,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func Start(ctx context.Context, opts Options) error {`
`53`	`53`	`// prompt server because it is only used for fmt, parse, etc.`
`54`	`54`	`opts.Env = append(opts.Env, fmt.Sprintf("%s=%s", types.PromptTokenEnvVar, token))`
`55`	`55`
`56`		`- g, err := gptscript.New(&opts.Options)`
	`56`	`+ g, err := gptscript.New(opts.Options)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return err`
`59`	`59`	`}`
`@@ -64,6 +64,7 @@ func Start(ctx context.Context, opts Options) error {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`s := &server{`
	`67`	`+ gptscriptOpts: opts.Options,`
`67`	`68`	`address: listener.Addr().String(),`
`68`	`69`	`token: token,`
`69`	`70`	`client: g,`