PR feedback

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

pkg/engine/openapi.go

@@ -37,7 +37,7 @@ func (e *Engine) runOpenAPIRevamp(tool types.Tool, input string) (*Return, error
 
 	var res *Return
 	switch command {
-	case "list":
+	case openapi.ListTool:
 		t, err := openapi.Load(source)
 		if err != nil {
 			return nil, fmt.Errorf("failed to load OpenAPI file %s: %w", source, err)
@@ -56,7 +56,7 @@ func (e *Engine) runOpenAPIRevamp(tool types.Tool, input string) (*Return, error
 		res = &Return{
 			Result: ptr(string(opListJSON)),
 		}
-	case "get-schema":
+	case openapi.GetSchemaTool:
 		operation := gjson.Get(input, "operation").String()
 
 		if filter != "" && filter != openapi.NoFilter {
@@ -104,7 +104,7 @@ func (e *Engine) runOpenAPIRevamp(tool types.Tool, input string) (*Return, error
 		res = &Return{
 			Result: ptr(string(schemaJSON)),
 		}
-	case "run":
+	case openapi.RunTool:
 		operation := gjson.Get(input, "operation").String()
 		args := gjson.Get(input, "args").String()
 

pkg/loader/loader.go

@@ -15,8 +15,6 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"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"
@@ -27,7 +25,6 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/parser"
 	"github.com/gptscript-ai/gptscript/pkg/system"
 	"github.com/gptscript-ai/gptscript/pkg/types"
-	kyaml "sigs.k8s.io/yaml"
 )
 
 const CacheTimeout = time.Hour
@@ -157,33 +154,8 @@ func loadOpenAPI(prg *types.Program, data []byte) *openapi3.T {
 		prg.OpenAPICache = map[string]any{}
 	}
 
-	switch openapi.IsOpenAPI(data) {
-	case 2:
-		// Convert OpenAPI v2 to v3
-		jsondata := data
-		if !json.Valid(data) {
-			jsondata, err = kyaml.YAMLToJSON(data)
-			if err != nil {
-				return nil
-			}
-		}
-
-		doc := &openapi2.T{}
-		if err := doc.UnmarshalJSON(jsondata); err != nil {
-			return nil
-		}
-
-		openAPIDocument, err = openapi2conv.ToV3(doc)
-		if err != nil {
-			return nil
-		}
-	case 3:
-		// Use OpenAPI v3 as is
-		openAPIDocument, err = openapi3.NewLoader().LoadFromData(data)
-		if err != nil {
-			return nil
-		}
-	default:
+	openAPIDocument, err = openapi.LoadFromBytes(data)
+	if err != nil {
 		return nil
 	}
 

pkg/loader/openapi.go

@@ -385,7 +385,7 @@ func getOpenAPIToolsRevamp(t *openapi3.T, source, targetToolName string) ([]type
 				Name:        types.ToolNormalizer("list-operations-" + t.Info.Title),
 				Description: fmt.Sprintf("List available operations for %s. Each of these operations is an OpenAPI operation. Run this tool before you do anything else.", t.Info.Title),
 			},
-			Instructions: fmt.Sprintf("%s list %s %s", types.OpenAPIPrefix, source, targetToolName),
+			Instructions: fmt.Sprintf("%s %s %s %s", types.OpenAPIPrefix, openapi.ListTool, source, targetToolName),
 		},
 		Source: types.ToolSource{
 			LineNo: 0,
@@ -411,7 +411,7 @@ func getOpenAPIToolsRevamp(t *openapi3.T, source, targetToolName string) ([]type
 					},
 				},
 			},
-			Instructions: fmt.Sprintf("%s get-schema %s %s", types.OpenAPIPrefix, source, targetToolName),
+			Instructions: fmt.Sprintf("%s %s %s %s", types.OpenAPIPrefix, openapi.GetSchemaTool, source, targetToolName),
 		},
 		Source: types.ToolSource{
 			LineNo: 1,
@@ -422,7 +422,7 @@ func getOpenAPIToolsRevamp(t *openapi3.T, source, targetToolName string) ([]type
 		ToolDef: types.ToolDef{
 			Parameters: types.Parameters{
 				Name:        types.ToolNormalizer("run-operation-" + t.Info.Title),
-				Description: fmt.Sprintf("Run an operation for %s. You MUST call get-schema for the operation before you use this tool.", t.Info.Title),
+				Description: fmt.Sprintf("Run an operation for %s. You MUST call %s for the operation before you use this tool.", t.Info.Title, openapi.GetSchemaTool),
 				Arguments: &openapi3.Schema{
 					Type: &openapi3.Types{openapi3.TypeObject},
 					Properties: openapi3.Schemas{
@@ -445,7 +445,7 @@ func getOpenAPIToolsRevamp(t *openapi3.T, source, targetToolName string) ([]type
 					},
 				},
 			},
-			Instructions: fmt.Sprintf("%s run %s %s", types.OpenAPIPrefix, source, targetToolName),
+			Instructions: fmt.Sprintf("%s %s %s %s", types.OpenAPIPrefix, openapi.RunTool, source, targetToolName),
 		},
 	}
 

pkg/openapi/getschema.go

@@ -32,6 +32,8 @@ var (
 	SupportedSecurityTypes = []string{"apiKey", "http"}
 )
 
+const GetSchemaTool = "get-schema"
+
 // GetSchema returns the JSONSchema and OperationInfo for a particular OpenAPI operation.
 // Return values in order: JSONSchema (string), OperationInfo, found (bool), error.
 func GetSchema(operationID, defaultHost string, t *openapi3.T) (string, OperationInfo, bool, error) {

pkg/openapi/list.go

@@ -16,7 +16,10 @@ type Operation struct {
 	Summary     string `json:"summary,omitempty"`
 }
 
-const NoFilter = "<none>"
+const (
+	ListTool = "list"
+	NoFilter = "<none>"
+)
 
 func List(t *openapi3.T, filter string) (OperationList, error) {
 	operations := make(map[string]Operation)
@@ -28,14 +31,7 @@ func List(t *openapi3.T, filter string) (OperationList, error) {
 			)
 			if filter != "" && filter != NoFilter {
 				if strings.Contains(filter, "*") {
-					var filters []string
-					if strings.Contains(filter, "|") {
-						filters = strings.Split(filter, "|")
-					} else {
-						filters = []string{filter}
-					}
-
-					match, err = MatchFilters(filters, operation.OperationID)
+					match, err = MatchFilters(strings.Split(filter, "|"), operation.OperationID)
 					if err != nil {
 						return OperationList{}, err
 					}

pkg/openapi/load.go

@@ -35,7 +35,7 @@ func loadFromURL(source string) (*openapi3.T, error) {
 		return nil, err
 	}
 
-	return loadFromBytes(contents)
+	return LoadFromBytes(contents)
 }
 
 func loadFromFile(source string) (*openapi3.T, error) {
@@ -44,10 +44,10 @@ func loadFromFile(source string) (*openapi3.T, error) {
 		return nil, err
 	}
 
-	return loadFromBytes(contents)
+	return LoadFromBytes(contents)
 }
 
-func loadFromBytes(content []byte) (*openapi3.T, error) {
+func LoadFromBytes(content []byte) (*openapi3.T, error) {
 	var (
 		openAPIDocument *openapi3.T
 		err             error

pkg/openapi/run.go

@@ -18,6 +18,8 @@ import (
 	"golang.org/x/exp/maps"
 )
 
+const RunTool = "run"
+
 func Run(operationID, defaultHost, args string, t *openapi3.T, envs []string) (string, bool, error) {
 	envMap := map[string]string{}
 	for _, e := range envs {
@@ -145,11 +147,15 @@ func Run(operationID, defaultHost, args string, t *openapi3.T, envs []string) (s
 	if err != nil {
 		return "", false, fmt.Errorf("failed to make request: %w", err)
 	}
-	defer resp.Body.Close()
 
-	result, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", false, fmt.Errorf("failed to read response: %w", err)
+	var result []byte
+	if resp.Body != nil {
+		defer resp.Body.Close()
+
+		result, err = io.ReadAll(resp.Body)
+		if err != nil {
+			return "", false, fmt.Errorf("failed to read response: %w", err)
+		}
 	}
 
 	return string(result), true, nil