Add ?tool param

Author: ibuildthecloud

pkg/loader/loader.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/gptscript-ai/gptscript/pkg/assemble"
 	"github.com/gptscript-ai/gptscript/pkg/builtin"
+	"github.com/gptscript-ai/gptscript/pkg/engine"
 	"github.com/gptscript-ai/gptscript/pkg/parser"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 )
@@ -137,7 +138,7 @@ func loadURL(ctx context.Context, base *Source, name string) (*Source, bool, err
 	}, true, nil
 }
 
-func loadProgram(data []byte, into *types.Program) (types.Tool, error) {
+func loadProgram(data []byte, into *types.Program, targetToolName string) (types.Tool, error) {
 	var (
 		ext types.Program
 		id  string
@@ -158,7 +159,19 @@ func loadProgram(data []byte, into *types.Program) (types.Tool, error) {
 		into.ToolSet[v.ID] = v
 	}
 
-	return into.ToolSet[ext.EntryToolID+id], nil
+	tool := into.ToolSet[ext.EntryToolID+id]
+	if targetToolName == "" {
+		return tool, nil
+	}
+
+	tool, ok := into.ToolSet[tool.LocalTools[targetToolName]]
+	if !ok {
+		return tool, &engine.ErrToolNotFound{
+			ToolName: targetToolName,
+		}
+	}
+
+	return tool, nil
 }
 
 func ReadTool(ctx context.Context, prg *types.Program, base *Source, targetToolName string) (types.Tool, error) {
@@ -169,7 +182,7 @@ func ReadTool(ctx context.Context, prg *types.Program, base *Source, targetToolN
 	_ = base.Content.Close()
 
 	if bytes.HasPrefix(data, assemble.Header) {
-		return loadProgram(data, prg)
+		return loadProgram(data, prg, targetToolName)
 	}
 
 	tools, err := parser.Parse(bytes.NewReader(data))
@@ -263,6 +276,7 @@ func link(ctx context.Context, prg *types.Program, base *Source, tool types.Tool
 	}
 
 	tool.ToolMapping = map[string]string{}
+	tool.LocalTools = map[string]string{}
 	toolNames := map[string]struct{}{}
 
 	// Add now to break circular loops, but later we will update this tool and copy the new
@@ -315,6 +329,10 @@ func link(ctx context.Context, prg *types.Program, base *Source, tool types.Tool
 		tool.Tools[i] = newToolName
 	}
 
+	for _, localTool := range localTools {
+		tool.LocalTools[localTool.Name] = localTool.ID
+	}
+
 	tool = builtin.SetDefaults(tool)
 	prg.ToolSet[tool.ID] = tool
 

pkg/server/server.go

@@ -108,7 +108,7 @@ func (s *Server) list(rw http.ResponseWriter, req *http.Request) {
 		_ = enc.Encode(builtin.SysProgram())
 		return
 	} else if strings.HasSuffix(path, ".gpt") {
-		prg, err := loader.Program(req.Context(), path, "")
+		prg, err := loader.Program(req.Context(), path, req.URL.Query().Get("tool"))
 		if err != nil {
 			http.Error(rw, err.Error(), http.StatusInternalServerError)
 			return
@@ -149,7 +149,7 @@ func (s *Server) run(rw http.ResponseWriter, req *http.Request) {
 		path += ".gpt"
 	}
 
-	prg, err := loader.Program(req.Context(), path, "")
+	prg, err := loader.Program(req.Context(), path, req.URL.Query().Get("tool"))
 	if errors.Is(err, fs.ErrNotExist) {
 		http.NotFound(rw, req)
 		return

pkg/types/tool.go

@@ -15,8 +15,9 @@ const (
 type ToolSet map[string]Tool
 
 type Program struct {
-	EntryToolID string  `json:"entryToolId,omitempty"`
-	ToolSet     ToolSet `json:"toolSet,omitempty"`
+	EntryToolID string            `json:"entryToolId,omitempty"`
+	ToolSet     ToolSet           `json:"toolSet,omitempty"`
+	Exports     map[string]string `json:"exports,omitempty"`
 }
 
 type BuiltinFunc func(ctx context.Context, env []string, input string) (string, error)
@@ -29,6 +30,7 @@ type Tool struct {
 	Instructions string            `json:"instructions,omitempty"`
 	Tools        []string          `json:"tools,omitempty"`
 	ToolMapping  map[string]string `json:"toolMapping,omitempty"`
+	LocalTools   map[string]string `json:"localTools,omitempty"`
 	BuiltinFunc  BuiltinFunc       `json:"-"`
 
 	Vision       bool     `json:"vision,omitempty"`