feat(chat): fix ExtraBody embedding and add comprehensive tests

Author: ArtdragonXoX

chat.go

@@ -482,12 +482,28 @@ func (c *Client) CreateChatCompletion(
 		return
 	}
 
+	// The body map is used to dynamically construct the request payload for the chat completion API.
+	// Instead of relying on a fixed struct, the body map allows for flexible inclusion of fields
+	// based on their presence, avoiding unnecessary or empty fields in the request.
+	extraBody := request.ExtraBody
+	request.ExtraBody = nil
+
+	// Serialize request to JSON
+	jsonData, err := json.Marshal(request)
+	if err != nil {
+		return
+	}
+
+	// Deserialize JSON to map[string]any
+	var body map[string]any
+	_ = json.Unmarshal(jsonData, &body)
+
 	req, err := c.newRequest(
 		ctx,
 		http.MethodPost,
 		c.fullURL(urlSuffix, withModel(request.Model)),
-		withBody(request),
-		withExtraBody(request.ExtraBody),
+		withBody(body),           // Main request body.
+		withExtraBody(extraBody), // Merge ExtraBody fields.
 	)
 	if err != nil {
 		return

chat_test.go

@@ -756,6 +756,111 @@ func TestChatCompletionsFunctions(t *testing.T) {
 	})
 }
 
+func TestChatCompletionsWithExtraBody(t *testing.T) {
+	client, server, teardown := setupOpenAITestServer()
+	defer teardown()
+	
+	// Register a custom handler that checks if ExtraBody fields are properly embedded
+	server.RegisterHandler("/v1/chat/completions", func(w http.ResponseWriter, r *http.Request) {
+		// Read the request body
+		reqBody, err := io.ReadAll(r.Body)
+		if err != nil {
+			http.Error(w, "could not read request", http.StatusInternalServerError)
+			return
+		}
+		
+		// Parse the request body into a map to check all fields
+		var requestBody map[string]any
+		if err := json.Unmarshal(reqBody, &requestBody); err != nil {
+			http.Error(w, fmt.Sprintf("could not parse request: %v, body: %s", err, string(reqBody)), http.StatusInternalServerError)
+			return
+		}
+		
+		// Check that ExtraBody fields are present in the root level
+		if _, exists := requestBody["custom_field"]; !exists {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			json.NewEncoder(w).Encode(map[string]string{"error": "custom_field not found in request body"})
+			return
+		}
+		
+		if _, exists := requestBody["another_field"]; !exists {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			json.NewEncoder(w).Encode(map[string]string{"error": "another_field not found in request body"})
+			return
+		}
+		
+		// Check that regular fields are still present
+		if _, exists := requestBody["model"]; !exists {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			json.NewEncoder(w).Encode(map[string]string{"error": "model not found in request body"})
+			return
+		}
+		
+		if _, exists := requestBody["messages"]; !exists {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			json.NewEncoder(w).Encode(map[string]string{"error": "messages not found in request body"})
+			return
+		}
+		
+		// ExtraBody should not be present in the final request
+		if _, exists := requestBody["extra_body"]; exists {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusBadRequest)
+			json.NewEncoder(w).Encode(map[string]string{"error": "extra_body should not be present in final request"})
+			return
+		}
+		
+		// Return a success response
+		res := openai.ChatCompletionResponse{
+			ID:      "test-id",
+			Object:  "chat.completion",
+			Created: time.Now().Unix(),
+			Model:   "gpt-3.5-turbo",
+			Choices: []openai.ChatCompletionChoice{
+				{
+					Index: 0,
+					Message: openai.ChatCompletionMessage{
+						Role:    openai.ChatMessageRoleAssistant,
+						Content: "Hello!",
+					},
+					FinishReason: openai.FinishReasonStop,
+				},
+			},
+			Usage: openai.Usage{
+				PromptTokens:     5,
+				CompletionTokens: 5,
+				TotalTokens:      10,
+			},
+		}
+		
+		resBytes, _ := json.Marshal(res)
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		w.Write(resBytes)
+	})
+	
+	// Test the ExtraBody functionality
+	_, err := client.CreateChatCompletion(context.Background(), openai.ChatCompletionRequest{
+		Model: openai.GPT3Dot5Turbo,
+		Messages: []openai.ChatCompletionMessage{
+			{
+				Role:    openai.ChatMessageRoleUser,
+				Content: "Hello!",
+			},
+		},
+		ExtraBody: map[string]any{
+			"custom_field":  "custom_value",
+			"another_field": 123,
+		},
+	})
+	
+	checks.NoError(t, err, "CreateChatCompletion with ExtraBody error")
+}
+
 func TestAzureChatCompletions(t *testing.T) {
 	client, server, teardown := setupAzureTestServer()
 	defer teardown()