Change response_format type to string to match OpenAI Spec

Author: prajwalnayak7

core/http/endpoints/openai/chat.go

@@ -181,7 +181,7 @@ func ChatEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoader, startup
 			noActionDescription = config.FunctionsConfig.NoActionDescriptionName
 		}
 
-		if input.ResponseFormat.Type == "json_object" {
+		if input.ResponseFormat == "json_object" {
 			input.Grammar = functions.JSONBNF
 		}
 

core/http/endpoints/openai/completion.go

@@ -69,7 +69,7 @@ func CompletionEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoader, a
 			return fmt.Errorf("failed reading parameters from request:%w", err)
 		}
 
-		if input.ResponseFormat.Type == "json_object" {
+		if input.ResponseFormat == "json_object" {
 			input.Grammar = functions.JSONBNF
 		}
 

core/http/endpoints/openai/image.go

@@ -150,7 +150,7 @@ func ImageEndpoint(cl *config.BackendConfigLoader, ml *model.ModelLoader, appCon
 		}
 
 		b64JSON := false
-		if input.ResponseFormat.Type == "b64_json" {
+		if input.ResponseFormat == "b64_json" {
 			b64JSON = true
 		}
 		// src and clip_skip

core/schema/openai.go

@@ -101,10 +101,6 @@ type OpenAIModel struct {
 
 type ChatCompletionResponseFormatType string
 
-type ChatCompletionResponseFormat struct {
-	Type ChatCompletionResponseFormatType `json:"type,omitempty"`
-}
-
 type OpenAIRequest struct {
 	PredictionOptions
 
@@ -114,7 +110,7 @@ type OpenAIRequest struct {
 	// whisper
 	File string `json:"file" validate:"required"`
 	//whisper/image
-	ResponseFormat ChatCompletionResponseFormat `json:"response_format"`
+	ResponseFormat ChatCompletionResponseFormatType `json:"response_format,omitempty"`
 	// image
 	Size string `json:"size"`
 	// Prompt is read only by completion/image API calls

swagger/docs.go

@@ -477,12 +477,7 @@ const docTemplate = `{
             ]
         },
         "schema.ChatCompletionResponseFormat": {
-            "type": "object",
-            "properties": {
-                "type": {
-                    "type": "string"
-                }
-            }
+            "type": "string"
         },
         "schema.Choice": {
             "type": "object",
@@ -678,11 +673,7 @@ const docTemplate = `{
                 },
                 "response_format": {
                     "description": "whisper/image",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/schema.ChatCompletionResponseFormat"
-                        }
-                    ]
+                    "type": "string"
                 },
                 "rope_freq_base": {
                     "type": "number"

swagger/swagger.json

@@ -470,12 +470,7 @@
             ]
         },
         "schema.ChatCompletionResponseFormat": {
-            "type": "object",
-            "properties": {
-                "type": {
-                    "type": "string"
-                }
-            }
+            "type": "string"
         },
         "schema.Choice": {
             "type": "object",
@@ -671,11 +666,7 @@
                 },
                 "response_format": {
                     "description": "whisper/image",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/schema.ChatCompletionResponseFormat"
-                        }
-                    ]
+                    "type": "string"
                 },
                 "rope_freq_base": {
                     "type": "number"

swagger/swagger.yaml

@@ -164,10 +164,7 @@ definitions:
     - Retrieval
     - Function
   schema.ChatCompletionResponseFormat:
-    properties:
-      type:
-        type: string
-    type: object
+    type: string
   schema.Choice:
     properties:
       delta:
@@ -300,8 +297,7 @@ definitions:
       repeat_penalty:
         type: number
       response_format:
-        allOf:
-        - $ref: '#/definitions/schema.ChatCompletionResponseFormat'
+        type: string
         description: whisper/image
       rope_freq_base:
         type: number

tests/e2e-aio/e2e_test.go

@@ -93,7 +93,7 @@ var _ = Describe("E2E test", func() {
 				model := "gpt-4"
 
 				req := openai.ChatCompletionRequest{
-					ResponseFormat: &openai.ChatCompletionResponseFormat{Type: openai.ChatCompletionResponseFormatTypeJSONObject},
+					ResponseFormat: "b64_json",
 					Model:          model,
 					Messages: []openai.ChatCompletionMessage{
 						{