Merge branch 'main' of https://github.com/acorn-io/gptscript

Author: sheng-liang

examples/search.gpt

@@ -7,10 +7,13 @@ vacation spot give the name and description.
 name: search
 description: Searches the internet for content
 args: query: The query to search for
-tools: sys.http.text2html?
+tools: sys.http.html2text?
 
 First download the content of "https://html.duckduckgo.com/html/?q=${query}".
 Look for the first 5 search results. Download each search result and look for content
 that would best answer the query ${query}.
 
 With all that information try your best to provide an answer or useful context to ${query}.
+
+If you can not retrieve a referenced URL then just skip that item and make a reference that
+that URL was skipped.

go.mod

@@ -1,7 +1,9 @@
-module github.com/acorn-io/gptscript
+module github.com/gptscript-ai/gptscript
 
 go 1.21.5
 
+replace github.com/sashabaranov/go-openai => github.com/gptscript-ai/go-openai v0.0.0-20240206232711-45b6e096246a
+
 require (
 	github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d
 	github.com/acorn-io/cmd v0.0.0-20240203032901-e9e631185ddb
@@ -10,6 +12,7 @@ require (
 	github.com/hexops/autogold/v2 v2.1.0
 	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
 	github.com/olahol/melody v1.1.4
+	github.com/rs/cors v1.10.1
 	github.com/sashabaranov/go-openai v1.18.3
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
@@ -20,12 +23,6 @@ require (
 
 require (
 	github.com/acorn-io/baaah v0.0.0-20240119160309-2a58ee757bbd // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.13.0 // indirect
-	github.com/onsi/gomega v1.29.0 // indirect
-)
-
-require (
 	github.com/bombsimon/logrusr/v4 v4.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
@@ -36,11 +33,14 @@ require (
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/hexops/valast v1.4.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/nightlyone/lockfile v1.0.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/onsi/ginkgo/v2 v2.13.0 // indirect
+	github.com/onsi/gomega v1.29.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/samber/lo v1.38.1 // indirect

go.sum

@@ -37,6 +37,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 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/go-openai v0.0.0-20240206232711-45b6e096246a h1:AdBbQ1ODOYK5AwCey4VFEmKeu9gG4PCzuO80pQmgupE=
+github.com/gptscript-ai/go-openai v0.0.0-20240206232711-45b6e096246a/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY=
 github.com/hexops/autogold v1.3.1 h1:YgxF9OHWbEIUjhDbpnLhgVsjUDsiHDTyDfy2lrfdlzo=
 github.com/hexops/autogold v1.3.1/go.mod h1:sQO+mQUCVfxOKPht+ipDSkJ2SCJ7BNJVHZexsXqWMx4=
@@ -85,13 +87,13 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
 github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
 github.com/samber/slog-logrus v1.0.0 h1:SsrN0p9akjCEaYd42Q5GtisMdHm0q11UD4fp4XCZi04=
 github.com/samber/slog-logrus v1.0.0/go.mod h1:ZTdPCmVWljwlfjz6XflKNvW4TcmYlexz4HMUOO/42bI=
-github.com/sashabaranov/go-openai v1.18.3 h1:dspFGkmZbhjg1059KhqLYSV2GaCiRIn+bOu50TlXUq8=
-github.com/sashabaranov/go-openai v1.18.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=

main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/acorn-io/cmd"
-	"github.com/acorn-io/gptscript/pkg/cli"
+	"github.com/gptscript-ai/gptscript/pkg/cli"
 )
 
 func main() {

pkg/assemble/assemble.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/acorn-io/gptscript/pkg/types"
+	"github.com/gptscript-ai/gptscript/pkg/types"
 )
 
 var Header = []byte("GPTSCRIPT!")

pkg/builtin/builtin.go

@@ -13,7 +13,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/acorn-io/gptscript/pkg/types"
+	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/jaytaylor/html2text"
 )
 
@@ -82,6 +82,16 @@ var Tools = map[string]types.Tool{
 	},
 }
 
+func SysProgram() *types.Program {
+	result := &types.Program{
+		ToolSet: types.ToolSet{},
+	}
+	for _, tool := range ListTools() {
+		result.ToolSet[tool.ID] = tool
+	}
+	return result
+}
+
 func ListTools() (result []types.Tool) {
 	var keys []string
 	for k := range Tools {

pkg/builtin/log.go

@@ -1,5 +1,5 @@
 package builtin
 
-import "github.com/acorn-io/gptscript/pkg/mvl"
+import "github.com/gptscript-ai/gptscript/pkg/mvl"
 
 var log = mvl.Package()

pkg/cache/cache.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/acorn-io/gptscript/pkg/types"
-	"github.com/acorn-io/gptscript/pkg/version"
 	"github.com/adrg/xdg"
+	"github.com/gptscript-ai/gptscript/pkg/types"
+	"github.com/gptscript-ai/gptscript/pkg/version"
 )
 
 type Client struct {

pkg/cli/gptscript.go

@@ -8,16 +8,16 @@ import (
 	"strings"
 
 	"github.com/acorn-io/cmd"
-	"github.com/acorn-io/gptscript/pkg/assemble"
-	"github.com/acorn-io/gptscript/pkg/builtin"
-	"github.com/acorn-io/gptscript/pkg/input"
-	"github.com/acorn-io/gptscript/pkg/loader"
-	"github.com/acorn-io/gptscript/pkg/monitor"
-	"github.com/acorn-io/gptscript/pkg/mvl"
-	"github.com/acorn-io/gptscript/pkg/openai"
-	"github.com/acorn-io/gptscript/pkg/runner"
-	"github.com/acorn-io/gptscript/pkg/server"
-	"github.com/acorn-io/gptscript/pkg/version"
+	"github.com/gptscript-ai/gptscript/pkg/assemble"
+	"github.com/gptscript-ai/gptscript/pkg/builtin"
+	"github.com/gptscript-ai/gptscript/pkg/input"
+	"github.com/gptscript-ai/gptscript/pkg/loader"
+	"github.com/gptscript-ai/gptscript/pkg/monitor"
+	"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/version"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )

pkg/engine/engine.go

@@ -11,10 +11,10 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/acorn-io/gptscript/pkg/openai"
-	"github.com/acorn-io/gptscript/pkg/types"
-	"github.com/acorn-io/gptscript/pkg/version"
 	"github.com/google/shlex"
+	"github.com/gptscript-ai/gptscript/pkg/openai"
+	"github.com/gptscript-ai/gptscript/pkg/types"
+	"github.com/gptscript-ai/gptscript/pkg/version"
 )
 
 // InternalSystemPrompt is added to all threads. Changing this is very dangerous as it has a
@@ -182,17 +182,25 @@ func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string)
 			case string:
 				envMap[envName] = val
 				env = append(env, envName+"="+val)
+				envMap[k] = val
+				env = append(env, k+"="+val)
 			case json.Number:
 				envMap[envName] = string(val)
 				env = append(env, envName+"="+string(val))
+				envMap[k] = string(val)
+				env = append(env, k+"="+string(val))
 			case bool:
 				envMap[envName] = fmt.Sprint(val)
 				env = append(env, envName+"="+fmt.Sprint(val))
+				envMap[k] = fmt.Sprint(val)
+				env = append(env, k+"="+fmt.Sprint(val))
 			default:
 				data, err := json.Marshal(val)
 				if err == nil {
 					envMap[envName] = string(data)
 					env = append(env, envName+"="+string(data))
+					envMap[k] = string(data)
+					env = append(env, k+"="+string(data))
 				}
 			}
 		}
@@ -265,6 +273,7 @@ func (e *Engine) Start(ctx Context, input string) (*Return, error) {
 		MaxToken:     tool.MaxTokens,
 		JSONResponse: tool.JSONResponse,
 		Cache:        tool.Cache,
+		Temperature:  tool.Temperature,
 	}
 
 	if InternalSystemPrompt != "" {