chore: add location option to loading scripts

Author: ibuildthecloud

pkg/loader/loader.go

@@ -373,12 +373,20 @@ func ProgramFromSource(ctx context.Context, content, subToolName string, opts ..
 	}
 	opt := complete(opts...)
 
+	var locationPath, locationName string
+	if opt.Location != "" {
+		locationPath = path.Dir(opt.Location)
+		locationName = path.Base(opt.Location)
+	}
+
 	prg := types.Program{
 		ToolSet: types.ToolSet{},
 	}
 	tools, err := readTool(ctx, opt.Cache, &prg, &source{
 		Content:  []byte(content),
-		Location: "inline",
+		Path:     locationPath,
+		Name:     locationName,
+		Location: opt.Location,
 	}, subToolName)
 	if err != nil {
 		return types.Program{}, err
@@ -388,12 +396,18 @@ func ProgramFromSource(ctx context.Context, content, subToolName string, opts ..
 }
 
 type Options struct {
-	Cache *cache.Client
+	Cache    *cache.Client
+	Location string
 }
 
 func complete(opts ...Options) (result Options) {
 	for _, opt := range opts {
 		result.Cache = types.FirstSet(opt.Cache, result.Cache)
+		result.Location = types.FirstSet(opt.Location, result.Location)
+	}
+
+	if result.Location == "" {
+		result.Location = "inline"
 	}
 
 	return

pkg/sdkserver/routes.go

@@ -183,7 +183,7 @@ func (s *server) execHandler(w http.ResponseWriter, r *http.Request) {
 	logger.Debugf("executing tool: %+v", reqObject)
 	var (
 		def           fmt.Stringer = &reqObject.ToolDefs
-		programLoader loaderFunc   = loader.ProgramFromSource
+		programLoader              = loaderWithLocation(loader.ProgramFromSource, reqObject.Location)
 	)
 	if reqObject.Content != "" {
 		def = &reqObject.content

pkg/sdkserver/run.go

@@ -16,6 +16,14 @@ import (
 
 type loaderFunc func(context.Context, string, string, ...loader.Options) (types.Program, error)
 
+func loaderWithLocation(f loaderFunc, loc string) loaderFunc {
+	return func(ctx context.Context, s string, s2 string, options ...loader.Options) (types.Program, error) {
+		return f(ctx, s, s2, append(options, loader.Options{
+			Location: loc,
+		})...)
+	}
+}
+
 func (s *server) execAndStream(ctx context.Context, programLoader loaderFunc, logger mvl.Logger, w http.ResponseWriter, opts gptscript.Options, chatState, input, subTool string, toolDef fmt.Stringer) {
 	g, err := gptscript.New(ctx, s.gptscriptOpts, opts)
 	if err != nil {

pkg/sdkserver/types.go

@@ -61,6 +61,7 @@ type toolOrFileRequest struct {
 	CredentialContext   string   `json:"credentialContext"`
 	CredentialOverrides []string `json:"credentialOverrides"`
 	Confirm             bool     `json:"confirm"`
+	Location            string   `json:"location,omitempty"`
 }
 
 type content struct {