From eb4b96e897b28a63be2ed8f7133cfd3d62b72fc0 Mon Sep 17 00:00:00 2001 From: Nick Hale <4175918+njhale@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:53:42 -0400 Subject: [PATCH] fix: bump cmd module to allow anonymous struct pointers to propagate args Fixes a regression caused by switching from an embedded config pointer to a struct value. Also update acorn-io modules to their new gptscript-ai org names and bump the tui. Signed-off-by: Nick Hale <4175918+njhale@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ pkg/cli/credential.go | 2 +- pkg/cli/gptscript.go | 4 ++-- pkg/cli/main.go | 2 +- pkg/cli/sdk_server.go | 2 +- pkg/sdkserver/monitor.go | 2 +- pkg/sdkserver/routes.go | 2 +- pkg/sdkserver/server.go | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 020e5607..c5eba627 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,6 @@ go 1.22.3 require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 - github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d - github.com/acorn-io/cmd v0.0.0-20240404013709-34f690bde37b github.com/adrg/xdg v0.4.0 github.com/chzyer/readline v1.5.1 github.com/docker/cli v26.0.0+incompatible @@ -15,8 +13,10 @@ require ( github.com/getkin/kin-openapi v0.124.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.6.0 + 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/tui v0.0.0-20240618230843-2b5961f3341b + github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d + github.com/gptscript-ai/tui v0.0.0-20240625175717-1e6eca7a66c1 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 65b6b8de..c61794f1 100644 --- a/go.sum +++ b/go.sum @@ -40,10 +40,6 @@ github.com/MarvinJWendt/testza v0.5.2 h1:53KDo64C1z/h/d/stCYCPY69bt/OSwjq5KpFNwi github.com/MarvinJWendt/testza v0.5.2/go.mod h1:xu53QFE5sCdjtMCKk8YMQ2MnymimEctc4n3EjyIYvEY= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= -github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d h1:hfpNQkJ4I2b8+DbMr8m97gG67ku0uPsMzUfskVu3cHU= -github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d/go.mod h1:WF6FYrEqW0+ZtY5OKb21JhSL0aeL5VJoVrm+u0d4gOE= -github.com/acorn-io/cmd v0.0.0-20240404013709-34f690bde37b h1:VzGEGrJn54UcsEvTqcpJj9USv7vc6TIxQGZVS0Ff304= -github.com/acorn-io/cmd v0.0.0-20240404013709-34f690bde37b/go.mod h1:9jrYuzTJCv6QgGKl5gbhKqhG3kke31PmUE2KruBHzpg= github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink= @@ -169,12 +165,16 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= +github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86 h1:m9yLtIEd0z1ia8qFjq3u0Ozb6QKwidyL856JLJp6nbA= +github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86/go.mod h1:lK3K5EZx4dyT24UG3yCt0wmspkYqrj4D/8kxdN3relk= github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379 h1:vYnXoIyCXzaCEw0sYifQ4bDpsv3/fO/dZ2suEsTwCIo= 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.0.0-20240625134437-4b83849794cc h1:ABV7VAK65YBkqL7VlNp5ryVXnRqkKQ+U/NZfUO3ypqA= github.com/gptscript-ai/go-gptscript v0.0.0-20240625134437-4b83849794cc/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s= -github.com/gptscript-ai/tui v0.0.0-20240618230843-2b5961f3341b h1:OJfmpDQ/6ffz5P4UdJJEd5xeqo2dfWnsg1YZLDqJWYo= -github.com/gptscript-ai/tui v0.0.0-20240618230843-2b5961f3341b/go.mod h1:ZlyM+BRiD6mV04w+Xw2mXP1VKGEUbn8BvwrosWlplUo= +github.com/gptscript-ai/tui v0.0.0-20240625175717-1e6eca7a66c1 h1:sx/dJ0IRh3P9Ehr1g1TQ/jEw83KISmQyjrssVgPGUbE= +github.com/gptscript-ai/tui v0.0.0-20240625175717-1e6eca7a66c1/go.mod h1:R33cfOnNaqsEn9es5jLKR39wvDyHvsIVgeTMNqtzCb8= 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/credential.go b/pkg/cli/credential.go index 6bfb1ed6..14f832eb 100644 --- a/pkg/cli/credential.go +++ b/pkg/cli/credential.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "time" - cmd2 "github.com/acorn-io/cmd" + cmd2 "github.com/gptscript-ai/cmd" "github.com/gptscript-ai/gptscript/pkg/cache" "github.com/gptscript-ai/gptscript/pkg/config" "github.com/gptscript-ai/gptscript/pkg/credentials" diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go index 8e644779..a724b0a2 100644 --- a/pkg/cli/gptscript.go +++ b/pkg/cli/gptscript.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/acorn-io/cmd" "github.com/fatih/color" + "github.com/gptscript-ai/cmd" "github.com/gptscript-ai/gptscript/pkg/assemble" "github.com/gptscript-ai/gptscript/pkg/auth" "github.com/gptscript-ai/gptscript/pkg/builtin" @@ -84,7 +84,7 @@ func New() *cobra.Command { &Parse{}, &Fmt{}, &SDKServer{ - GPTScript: *root, + GPTScript: root, }, ) diff --git a/pkg/cli/main.go b/pkg/cli/main.go index b4b55928..d06f614f 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -3,7 +3,7 @@ package cli import ( "os" - "github.com/acorn-io/cmd" + "github.com/gptscript-ai/cmd" "github.com/gptscript-ai/gptscript/pkg/daemon" "github.com/gptscript-ai/gptscript/pkg/mvl" ) diff --git a/pkg/cli/sdk_server.go b/pkg/cli/sdk_server.go index 2c484693..a2ac8488 100644 --- a/pkg/cli/sdk_server.go +++ b/pkg/cli/sdk_server.go @@ -10,7 +10,7 @@ import ( ) type SDKServer struct { - GPTScript + *GPTScript } func (c *SDKServer) Customize(cmd *cobra.Command) { diff --git a/pkg/sdkserver/monitor.go b/pkg/sdkserver/monitor.go index 5b06771c..3a9a1014 100644 --- a/pkg/sdkserver/monitor.go +++ b/pkg/sdkserver/monitor.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/acorn-io/broadcaster" + "github.com/gptscript-ai/broadcaster" "github.com/gptscript-ai/gptscript/pkg/runner" gserver "github.com/gptscript-ai/gptscript/pkg/server" "github.com/gptscript-ai/gptscript/pkg/types" diff --git a/pkg/sdkserver/routes.go b/pkg/sdkserver/routes.go index d6205ece..0380cff4 100644 --- a/pkg/sdkserver/routes.go +++ b/pkg/sdkserver/routes.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/acorn-io/broadcaster" + "github.com/gptscript-ai/broadcaster" "github.com/gptscript-ai/gptscript/pkg/cache" gcontext "github.com/gptscript-ai/gptscript/pkg/context" "github.com/gptscript-ai/gptscript/pkg/gptscript" diff --git a/pkg/sdkserver/server.go b/pkg/sdkserver/server.go index 297a6e92..c51e21e4 100644 --- a/pkg/sdkserver/server.go +++ b/pkg/sdkserver/server.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/acorn-io/broadcaster" "github.com/google/uuid" + "github.com/gptscript-ai/broadcaster" "github.com/gptscript-ai/gptscript/pkg/gptscript" "github.com/gptscript-ai/gptscript/pkg/mvl" "github.com/gptscript-ai/gptscript/pkg/runner"