Don't set default prompt param anymore

Author: ibuildthecloud

pkg/builtin/builtin.go

@@ -17,7 +17,7 @@ import (
 	"github.com/jaytaylor/html2text"
 )
 
-var Tools = map[string]types.Tool{
+var tools = map[string]types.Tool{
 	"sys.read": {
 		Description: "Reads the contents of a file",
 		Arguments: types.ObjectSchema(
@@ -94,7 +94,7 @@ func SysProgram() *types.Program {
 
 func ListTools() (result []types.Tool) {
 	var keys []string
-	for k := range Tools {
+	for k := range tools {
 		keys = append(keys, k)
 	}
 
@@ -109,7 +109,7 @@ func ListTools() (result []types.Tool) {
 
 func Builtin(name string) (types.Tool, bool) {
 	name, dontFail := strings.CutSuffix(name, "?")
-	t, ok := Tools[name]
+	t, ok := tools[name]
 	t.Name = name
 	t.ID = name
 	t.Instructions = "#!" + name
@@ -123,7 +123,7 @@ func Builtin(name string) (types.Tool, bool) {
 			return s, err
 		}
 	}
-	return t, ok
+	return SetDefaults(t), ok
 }
 
 func SysFind(ctx context.Context, env []string, input string) (string, error) {

pkg/builtin/defaults.go

@@ -0,0 +1,22 @@
+package builtin
+
+import (
+	"github.com/gptscript-ai/gptscript/pkg/openai"
+	"github.com/gptscript-ai/gptscript/pkg/types"
+)
+
+var (
+	DefaultModel       = openai.DefaultModel
+	DefaultVisionModel = openai.DefaultVisionModel
+)
+
+func SetDefaults(tool types.Tool) types.Tool {
+	if tool.ModelName == "" {
+		if tool.Vision {
+			tool.ModelName = DefaultVisionModel
+		} else {
+			tool.ModelName = DefaultModel
+		}
+	}
+	return tool
+}

pkg/engine/engine.go

@@ -23,6 +23,19 @@ You do not need to explain the steps taken, only provide the result to the given
 You are referred to as a tool.
 `
 
+var DefaultToolSchema = types.JSONSchema{
+	Property: types.Property{
+		Type: "object",
+	},
+	Properties: map[string]types.Property{
+		openai.DefaultPromptParameter: {
+			Description: "Prompt to send to the tool or assistant. This may be instructions or question.",
+			Type:        "string",
+		},
+	},
+	Required: []string{openai.DefaultPromptParameter},
+}
+
 var completionID int64
 
 func init() {
@@ -185,12 +198,16 @@ func (e *Engine) Start(ctx Context, input string) (*Return, error) {
 		if err != nil {
 			return nil, err
 		}
+		args := subTool.Arguments
+		if args == nil && !subTool.IsCommand() {
+			args = &DefaultToolSchema
+		}
 		completion.Tools = append(completion.Tools, types.CompletionTool{
 			Type: types.CompletionToolTypeFunction,
 			Function: types.CompletionFunctionDefinition{
 				Name:        subToolName,
 				Description: subTool.Description,
-				Parameters:  subTool.Arguments,
+				Parameters:  args,
 			},
 		})
 	}

pkg/loader/defaults.go

@@ -154,7 +154,8 @@ func loadProgram(data []byte, into *types.Program) (types.Tool, error) {
 		for tk, tv := range v.ToolMapping {
 			v.ToolMapping[tk] = tv + id
 		}
-		into.ToolSet[k+id] = v
+		v.ID = k + id
+		into.ToolSet[v.ID] = v
 	}
 
 	return into.ToolSet[ext.EntryToolID+id], nil
@@ -314,7 +315,7 @@ func link(ctx context.Context, prg *types.Program, base *Source, tool types.Tool
 		tool.Tools[i] = newToolName
 	}
 
-	tool = SetDefaults(tool)
+	tool = builtin.SetDefaults(tool)
 	prg.ToolSet[tool.ID] = tool
 
 	return tool, nil