chore: allow easy embedding on gptscript

Author: ibuildthecloud

internal/fs.go

@@ -0,0 +1,14 @@
+package internal
+
+import (
+	"io/fs"
+	"os"
+)
+
+var FS fs.FS = defaultFS{}
+
+type defaultFS struct{}
+
+func (d defaultFS) Open(name string) (fs.File, error) {
+	return os.Open(name)
+}

main.go

@@ -1,28 +1,11 @@
 package main
 
 import (
-	"os"
-
-	"github.com/acorn-io/cmd"
 	"github.com/gptscript-ai/gptscript/pkg/cli"
-	"github.com/gptscript-ai/gptscript/pkg/daemon"
-	"github.com/gptscript-ai/gptscript/pkg/mvl"
-
 	// Load all VCS
 	_ "github.com/gptscript-ai/gptscript/pkg/loader/vcs"
 )
 
-var log = mvl.Package()
-
 func main() {
-	if len(os.Args) > 2 && os.Args[1] == "sys.daemon" {
-		if os.Getenv("GPTSCRIPT_DEBUG") == "true" {
-			mvl.SetDebug()
-		}
-		if err := daemon.SysDaemon(); err != nil {
-			log.Debugf("failed running daemon: %v", err)
-		}
-		os.Exit(0)
-	}
-	cmd.Main(cli.New())
+	cli.Main()
 }

pkg/cli/gptscript.go

@@ -218,7 +218,7 @@ func (r *GPTScript) PersistentPre(*cobra.Command, []string) error {
 		}
 	}
 
-	_ = os.Setenv(system.BinEnvVar, system.Bin())
+	system.SetBinToSelf()
 
 	if r.DefaultModel != "" {
 		builtin.SetDefaultModel(r.DefaultModel)

pkg/cli/main.go

@@ -0,0 +1,22 @@
+package cli
+
+import (
+	"os"
+
+	"github.com/acorn-io/cmd"
+	"github.com/gptscript-ai/gptscript/pkg/daemon"
+	"github.com/gptscript-ai/gptscript/pkg/mvl"
+)
+
+func Main() {
+	if len(os.Args) > 2 && os.Args[1] == "sys.daemon" {
+		if os.Getenv("GPTSCRIPT_DEBUG") == "true" {
+			mvl.SetDebug()
+		}
+		if err := daemon.SysDaemon(); err != nil {
+			log.Debugf("failed running daemon: %v", err)
+		}
+		os.Exit(0)
+	}
+	cmd.Main(New())
+}

pkg/embedded/embed.go

@@ -0,0 +1,31 @@
+package embedded
+
+import (
+	"io/fs"
+	"os"
+	"strings"
+
+	"github.com/gptscript-ai/gptscript/internal"
+	"github.com/gptscript-ai/gptscript/pkg/cli"
+	"github.com/gptscript-ai/gptscript/pkg/system"
+)
+
+type Options struct {
+	FS fs.FS
+}
+
+func Run(opts ...Options) bool {
+	for _, opt := range opts {
+		if opt.FS == nil {
+			internal.FS = opt.FS
+		}
+	}
+
+	system.SetBinToSelf()
+	if len(os.Args) > 1 && strings.HasPrefix(os.Args[1], "sys.") {
+		cli.Main()
+		return true
+	}
+
+	return false
+}

pkg/loader/loader.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"os"
 	"path"
 	"path/filepath"
 	"strconv"
@@ -19,6 +18,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi2"
 	"github.com/getkin/kin-openapi/openapi2conv"
 	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/gptscript-ai/gptscript/internal"
 	"github.com/gptscript-ai/gptscript/pkg/assemble"
 	"github.com/gptscript-ai/gptscript/pkg/builtin"
 	"github.com/gptscript-ai/gptscript/pkg/cache"
@@ -61,7 +61,7 @@ func (s *source) String() string {
 }
 
 func openFile(path string) (io.ReadCloser, bool, error) {
-	f, err := os.Open(path)
+	f, err := internal.FS.Open(path)
 	if errors.Is(err, fs.ErrNotExist) {
 		return nil, false, nil
 	} else if err != nil {
@@ -74,10 +74,10 @@ func loadLocal(base *source, name string) (*source, bool, error) {
 	// We want to keep all strings in / format, and only convert to platform specific when reading
 	filePath := path.Join(base.Path, name)
 
-	if s, err := os.Stat(filepath.Clean(filePath)); err == nil && s.IsDir() {
+	if s, err := fs.Stat(internal.FS, filepath.Clean(filePath)); err == nil && s.IsDir() {
 		for _, def := range types.DefaultFiles {
 			toolPath := path.Join(filePath, def)
-			if s, err := os.Stat(filepath.Clean(toolPath)); err == nil && !s.IsDir() {
+			if s, err := fs.Stat(internal.FS, filepath.Clean(toolPath)); err == nil && !s.IsDir() {
 				filePath = toolPath
 				break
 			}

pkg/parser/parser.go

@@ -24,7 +24,8 @@ func normalize(key string) string {
 }
 
 func toBool(line string) (bool, error) {
-	if line == "true" {
+	line = normalize(line)
+	if line == "true" || line == "t" {
 		return true, nil
 	} else if line != "false" {
 		return false, fmt.Errorf("invalid boolean parameter, must be \"true\" or \"false\", got [%s]", line)

pkg/system/bin.go

@@ -4,6 +4,12 @@ import "os"
 
 const BinEnvVar = "GPTSCRIPT_BIN"
 
+func SetBinToSelf() {
+	if err := os.Setenv(BinEnvVar, Bin()); err != nil {
+		panic(err)
+	}
+}
+
 func Bin() string {
 	bin := os.Getenv(BinEnvVar)
 	if bin != "" {