Merge pull request #453 from njhale/chore/bump-openapi

njhale · web-flow · commit 65136eea12c4 · 2024-06-06T15:10:18.000-04:00
chore: bump kin-openapi dependency
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/docker/cli v26.0.0+incompatible
 	github.com/docker/docker-credential-helpers v0.8.1
 	github.com/fatih/color v1.17.0
-	github.com/getkin/kin-openapi v0.123.0
+	github.com/getkin/kin-openapi v0.124.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379
diff --git a/go.sum b/go.sum
@@ -114,8 +114,8 @@ github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUork
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/getkin/kin-openapi v0.123.0 h1:zIik0mRwFNLyvtXK274Q6ut+dPh6nlxBp0x7mNrPhs8=
-github.com/getkin/kin-openapi v0.123.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
+github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
+github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
diff --git a/pkg/loader/openapi.go b/pkg/loader/openapi.go
@@ -136,7 +136,7 @@ func getOpenAPITools(t *openapi3.T, defaultHost string) ([]types.Tool, error) {
 						Name:        operation.OperationID,
 						Description: toolDesc,
 						Arguments: &openapi3.Schema{
-							Type:       "object",
+							Type:       &openapi3.Types{"object"},
 							Properties: openapi3.Schemas{},
 							Required:   []string{},
 						},
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -51,7 +51,7 @@ func csv(line string) (result []string) {
 func addArg(line string, tool *types.Tool) error {
 	if tool.Parameters.Arguments == nil {
 		tool.Parameters.Arguments = &openapi3.Schema{
-			Type:       "object",
+			Type:       &openapi3.Types{"object"},
 			Properties: openapi3.Schemas{},
 		}
 	}
@@ -64,7 +64,7 @@ func addArg(line string, tool *types.Tool) error {
 	tool.Parameters.Arguments.Properties[key] = &openapi3.SchemaRef{
 		Value: &openapi3.Schema{
 			Description: strings.TrimSpace(value),
-			Type:        "string",
+			Type:        &openapi3.Types{"string"},
 		},
 	}
 
diff --git a/pkg/system/prompt.go b/pkg/system/prompt.go
@@ -27,12 +27,12 @@ You don't move to the next step until you have a result.
 var DefaultPromptParameter = "defaultPromptParameter"
 
 var DefaultToolSchema = openapi3.Schema{
-	Type: "object",
+	Type: &openapi3.Types{"object"},
 	Properties: openapi3.Schemas{
 		DefaultPromptParameter: &openapi3.SchemaRef{
 			Value: &openapi3.Schema{
 				Description: "Prompt to send to the tool or assistant. This may be instructions or question.",
-				Type:        "string",
+				Type:        &openapi3.Types{"string"},
 			},
 		},
 	},
diff --git a/pkg/types/jsonschema.go b/pkg/types/jsonschema.go
@@ -6,15 +6,15 @@ import (
 
 func ObjectSchema(kv ...string) *openapi3.Schema {
 	s := &openapi3.Schema{
-		Type:       "object",
+		Type:       &openapi3.Types{"object"},
 		Properties: openapi3.Schemas{},
 	}
 	for i, v := range kv {
 		if i%2 == 1 {
 			s.Properties[kv[i-1]] = &openapi3.SchemaRef{
 				Value: &openapi3.Schema{
 					Description: v,
-					Type:        "string",
+					Type:        &openapi3.Types{"string"},
 				},
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func csv(line string) (result []string) {`
`51`	`51`	`func addArg(line string, tool *types.Tool) error {`
`52`	`52`	`if tool.Parameters.Arguments == nil {`
`53`	`53`	`tool.Parameters.Arguments = &openapi3.Schema{`
`54`		`- Type: "object",`
	`54`	`+ Type: &openapi3.Types{"object"},`
`55`	`55`	`Properties: openapi3.Schemas{},`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -64,7 +64,7 @@ func addArg(line string, tool *types.Tool) error {`
`64`	`64`	`tool.Parameters.Arguments.Properties[key] = &openapi3.SchemaRef{`
`65`	`65`	`Value: &openapi3.Schema{`
`66`	`66`	`Description: strings.TrimSpace(value),`
`67`		`- Type: "string",`
	`67`	`+ Type: &openapi3.Types{"string"},`
`68`	`68`	`},`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@ import (`
`6`	`6`
`7`	`7`	`func ObjectSchema(kv ...string) *openapi3.Schema {`
`8`	`8`	`s := &openapi3.Schema{`
`9`		`- Type: "object",`
	`9`	`+ Type: &openapi3.Types{"object"},`
`10`	`10`	`Properties: openapi3.Schemas{},`
`11`	`11`	`}`
`12`	`12`	`for i, v := range kv {`
`13`	`13`	`if i%2 == 1 {`
`14`	`14`	`s.Properties[kv[i-1]] = &openapi3.SchemaRef{`
`15`	`15`	`Value: &openapi3.Schema{`
`16`	`16`	`Description: v,`
`17`		`- Type: "string",`
	`17`	`+ Type: &openapi3.Types{"string"},`
`18`	`18`	`},`
`19`	`19`	`}`
`20`	`20`	`}`