From 7f207a7c8b24dee86cdded99f32265fb781cd508 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Wed, 31 Jul 2024 18:40:04 -0400 Subject: [PATCH] feat: add support for default model provider in the TUI Signed-off-by: Donnie Adams --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/cli/gptscript.go | 7 ++++--- pkg/sdkserver/types.go | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index de545abd..858bfa65 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86 github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379 github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d - github.com/gptscript-ai/go-gptscript v0.9.3-0.20240728044543-20d868b5baa6 - github.com/gptscript-ai/tui v0.0.0-20240728045051-19ba83cd96c1 + github.com/gptscript-ai/go-gptscript v0.9.3-0.20240731222146-b67275f3fa69 + github.com/gptscript-ai/tui v0.0.0-20240731002102-544a80108f89 github.com/hexops/autogold/v2 v2.2.1 github.com/hexops/valast v1.4.4 github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 diff --git a/go.sum b/go.sum index 5a6ce6cf..53f72056 100644 --- a/go.sum +++ b/go.sum @@ -171,10 +171,10 @@ github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf037 github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo= github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d h1:sKf7T7twhGXs6AVbvD9pKDVewykkwSAPwEpmIEQIR/4= github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d/go.mod h1:DJAo1xTht1LDkNYFNydVjTHd576TC7MlpsVRl3oloVw= -github.com/gptscript-ai/go-gptscript v0.9.3-0.20240728044543-20d868b5baa6 h1:hF9Q8KdQhuoXSGKVh4ywRvwn5RJt9rbPraigpXqbGYU= -github.com/gptscript-ai/go-gptscript v0.9.3-0.20240728044543-20d868b5baa6/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s= -github.com/gptscript-ai/tui v0.0.0-20240728045051-19ba83cd96c1 h1:gJXswjjwoiWdOS+s73mliWbN9dyJpiUkb3T+EiV7EFc= -github.com/gptscript-ai/tui v0.0.0-20240728045051-19ba83cd96c1/go.mod h1:Llh3vi87gyry6j/sgJxhkHHvgv9uQRzEiMWuQtmpW1w= +github.com/gptscript-ai/go-gptscript v0.9.3-0.20240731222146-b67275f3fa69 h1:c+Tf6I8jUg8hDgfP8jKs93UcC9dDIGxClWGZUL36Hd0= +github.com/gptscript-ai/go-gptscript v0.9.3-0.20240731222146-b67275f3fa69/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s= +github.com/gptscript-ai/tui v0.0.0-20240731002102-544a80108f89 h1:1G8OhXzCqCe/LARec8Qb7XkpQiEWoRYE/2UfohD+Do4= +github.com/gptscript-ai/tui v0.0.0-20240731002102-544a80108f89/go.mod h1:Llh3vi87gyry6j/sgJxhkHHvgv9uQRzEiMWuQtmpW1w= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go index 84d7de71..4b2fab92 100644 --- a/pkg/cli/gptscript.go +++ b/pkg/cli/gptscript.go @@ -468,9 +468,10 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) { // Don't use cmd.Context() because then sigint will cancel everything return tui.Run(context.Background(), args[0], tui.RunOptions{ ClientOpts: &gptscript2.GlobalOptions{ - OpenAIAPIKey: r.OpenAIOptions.APIKey, - OpenAIBaseURL: r.OpenAIOptions.BaseURL, - DefaultModel: r.DefaultModel, + OpenAIAPIKey: r.OpenAIOptions.APIKey, + OpenAIBaseURL: r.OpenAIOptions.BaseURL, + DefaultModel: r.DefaultModel, + DefaultModelProvider: r.DefaultModelProvider, }, TrustedRepoPrefixes: []string{"github.com/gptscript-ai"}, DisableCache: r.DisableCache, diff --git a/pkg/sdkserver/types.go b/pkg/sdkserver/types.go index a07cfb9e..9736f045 100644 --- a/pkg/sdkserver/types.go +++ b/pkg/sdkserver/types.go @@ -63,7 +63,7 @@ type toolOrFileRequest struct { Confirm bool `json:"confirm"` Location string `json:"location,omitempty"` ForceSequential bool `json:"forceSequential"` - DefaultModelProvider string `json:"defaultModelProvider,omitempty"` + DefaultModelProvider string `json:"DefaultModelProvider,omitempty"` } type content struct {