Skip to content

Commit 6e1dbf5

Browse files
chore: drop --server now that --ui is there
1 parent affa1b7 commit 6e1dbf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1
-19749
lines changed

.github/workflows/test.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
with:
3131
cache: false
3232
go-version: "1.22"
33-
- name: Build UI
34-
if: matrix.os == 'ubuntu-22.04'
35-
run: make build-ui
36-
shell: bash
3733
- name: Validate
3834
if: matrix.os == 'ubuntu-22.04'
3935
run: make validate

.goreleaser.yml

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ dist: releases
22
snapshot:
33
name_template: '{{ trimprefix .Summary "v" }}'
44

5-
before:
6-
hooks:
7-
# Generate UI assets to embedded in binaries
8-
- make build-ui
9-
105
builds:
116
- id: default
127
binary: gptscript

Makefile

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
.DEFAULT_GOAL := build
22

3-
all: build-ui build
4-
5-
build-ui:
6-
$(MAKE) -C ui
7-
rm -rf static/ui
8-
mkdir -p static/ui/_nuxt
9-
touch static/ui/placeholder static/ui/_nuxt/_placeholder
10-
cp -rp ui/.output/public/* static/ui/
3+
all: build
114

125
build-exe:
136
GOOS=windows go build -o bin/gptscript.exe -tags "${GO_TAGS}" .

go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ require (
2121
github.com/hexops/valast v1.4.4
2222
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
2323
github.com/mholt/archiver/v4 v4.0.0-alpha.8
24-
github.com/olahol/melody v1.1.4
2524
github.com/rs/cors v1.11.0
2625
github.com/samber/lo v1.38.1
2726
github.com/sirupsen/logrus v1.9.3
@@ -62,7 +61,6 @@ require (
6261
github.com/google/go-cmp v0.6.0 // indirect
6362
github.com/gookit/color v1.5.4 // indirect
6463
github.com/gorilla/css v1.0.0 // indirect
65-
github.com/gorilla/websocket v1.5.0 // indirect
6664
github.com/gptscript-ai/go-gptscript v0.0.0-20240604231423-7a845df843b1 // indirect
6765
github.com/hashicorp/errwrap v1.0.0 // indirect
6866
github.com/hashicorp/go-multierror v1.1.1 // indirect

go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
169169
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
170170
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
171171
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
172-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
173-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
174172
github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379 h1:vYnXoIyCXzaCEw0sYifQ4bDpsv3/fO/dZ2suEsTwCIo=
175173
github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=
176174
github.com/gptscript-ai/go-gptscript v0.0.0-20240604231423-7a845df843b1 h1:SHoqsU8Ne2V4zfrFve9kQn4vcv4N4TItD6Oju+pzKV8=
@@ -268,8 +266,6 @@ github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAm
268266
github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
269267
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q0rDaRO0MPaOk=
270268
github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY=
271-
github.com/olahol/melody v1.1.4 h1:RQHfKZkQmDxI0+SLZRNBCn4LiXdqxLKRGSkT8Dyoe/E=
272-
github.com/olahol/melody v1.1.4/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
273269
github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77 h1:3bMMZ1f+GPXFQ1uNaYbO/uECWvSfqEA+ZEXn1rFAT88=
274270
github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77/go.mod h1:8Hf+pH6thup1sPZPD+NLg7d6vbpsdilu9CPIeikvgMQ=
275271
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=

pkg/cli/gptscript.go

-14
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/gptscript-ai/gptscript/pkg/mvl"
2727
"github.com/gptscript-ai/gptscript/pkg/openai"
2828
"github.com/gptscript-ai/gptscript/pkg/runner"
29-
"github.com/gptscript-ai/gptscript/pkg/server"
3029
"github.com/gptscript-ai/gptscript/pkg/system"
3130
"github.com/gptscript-ai/gptscript/pkg/types"
3231
"github.com/gptscript-ai/gptscript/pkg/version"
@@ -58,7 +57,6 @@ type GPTScript struct {
5857
Assemble bool `usage:"Assemble tool to a single artifact, saved to --output" hidden:"true" local:"true"`
5958
ListModels bool `usage:"List the models available and exit" local:"true"`
6059
ListTools bool `usage:"List built-in tools and exit" local:"true"`
61-
Server bool `usage:"Start server" local:"true"`
6260
ListenAddress string `usage:"Server listen address" default:"127.0.0.1:0"`
6361
Chdir string `usage:"Change current working directory" short:"C"`
6462
Daemon bool `usage:"Run tool as a daemon" local:"true" hidden:"true"`
@@ -366,18 +364,6 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
366364

367365
ctx := cmd.Context()
368366

369-
if r.Server {
370-
s, err := server.New(&server.Options{
371-
ListenAddress: r.ListenAddress,
372-
GPTScript: gptOpt,
373-
})
374-
if err != nil {
375-
return err
376-
}
377-
defer s.Close(true)
378-
return s.Start(ctx)
379-
}
380-
381367
gptScript, err := gptscript.New(gptOpt)
382368
if err != nil {
383369
return err

pkg/server/log.go

-5
This file was deleted.

0 commit comments

Comments
 (0)