chore: drop --server now that --ui is there

Author: ibuildthecloud

.github/workflows/test.yaml

@@ -30,10 +30,6 @@ jobs:
         with:
           cache: false
           go-version: "1.22"
-      - name: Build UI
-        if: matrix.os == 'ubuntu-22.04'
-        run: make build-ui
-        shell: bash
       - name: Validate
         if: matrix.os == 'ubuntu-22.04'
         run: make validate

.goreleaser.yml

@@ -2,11 +2,6 @@ dist: releases
 snapshot:
   name_template: '{{ trimprefix .Summary "v" }}'
 
-before:
-  hooks:
-    # Generate UI assets to embedded in binaries
-    - make build-ui
-
 builds:
   - id: default
     binary: gptscript

Makefile

@@ -1,13 +1,6 @@
 .DEFAULT_GOAL := build
 
-all: build-ui build
-
-build-ui:
-	$(MAKE) -C ui
-	rm -rf static/ui
-	mkdir -p static/ui/_nuxt
-	touch static/ui/placeholder static/ui/_nuxt/_placeholder
-	cp -rp ui/.output/public/* static/ui/
+all: build
 
 build-exe:
 	GOOS=windows go build -o bin/gptscript.exe -tags "${GO_TAGS}" .

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/hexops/valast v1.4.4
 	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8
-	github.com/olahol/melody v1.1.4
 	github.com/rs/cors v1.11.0
 	github.com/samber/lo v1.38.1
 	github.com/sirupsen/logrus v1.9.3
@@ -62,7 +61,6 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gptscript-ai/go-gptscript v0.0.0-20240604231423-7a845df843b1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect

go.sum

@@ -169,8 +169,6 @@ 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/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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/go-gptscript v0.0.0-20240604231423-7a845df843b1 h1:SHoqsU8Ne2V4zfrFve9kQn4vcv4N4TItD6Oju+pzKV8=
@@ -268,8 +266,6 @@ github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAm
 github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
 github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q0rDaRO0MPaOk=
 github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY=
-github.com/olahol/melody v1.1.4 h1:RQHfKZkQmDxI0+SLZRNBCn4LiXdqxLKRGSkT8Dyoe/E=
-github.com/olahol/melody v1.1.4/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
 github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77 h1:3bMMZ1f+GPXFQ1uNaYbO/uECWvSfqEA+ZEXn1rFAT88=
 github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77/go.mod h1:8Hf+pH6thup1sPZPD+NLg7d6vbpsdilu9CPIeikvgMQ=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=

pkg/cli/gptscript.go

@@ -26,7 +26,6 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/mvl"
 	"github.com/gptscript-ai/gptscript/pkg/openai"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
-	"github.com/gptscript-ai/gptscript/pkg/server"
 	"github.com/gptscript-ai/gptscript/pkg/system"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/gptscript-ai/gptscript/pkg/version"
@@ -58,7 +57,6 @@ type GPTScript struct {
 	Assemble           bool   `usage:"Assemble tool to a single artifact, saved to --output" hidden:"true" local:"true"`
 	ListModels         bool   `usage:"List the models available and exit" local:"true"`
 	ListTools          bool   `usage:"List built-in tools and exit" local:"true"`
-	Server             bool   `usage:"Start server" local:"true"`
 	ListenAddress      string `usage:"Server listen address" default:"127.0.0.1:0"`
 	Chdir              string `usage:"Change current working directory" short:"C"`
 	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) {
 
 	ctx := cmd.Context()
 
-	if r.Server {
-		s, err := server.New(&server.Options{
-			ListenAddress: r.ListenAddress,
-			GPTScript:     gptOpt,
-		})
-		if err != nil {
-			return err
-		}
-		defer s.Close(true)
-		return s.Start(ctx)
-	}
-
 	gptScript, err := gptscript.New(gptOpt)
 	if err != nil {
 		return err