Merge branch 'ml-inference-unified-api-elastic' of github.com:elastic/elasticsearch into ml-inference-unified-api-elastic

Author: jonathan-buttner

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/results/StreamingUnifiedChatCompletionResultsTests.java

@@ -101,83 +101,6 @@ public void testResults_toXContentChunked() throws IOException {
         assertEquals(expected.replaceAll("\\s+", ""), Strings.toString(builder.prettyPrint()).trim());
     }
 
-    public void testChatCompletionChunkToXContentChunked() throws IOException {
-        String expected = """
-            {
-              "id": "chunk1",
-              "choices": [
-                {
-                  "delta": {
-                    "content": "example_content",
-                    "refusal": "example_refusal",
-                    "role": "assistant",
-                    "tool_calls": [
-                      {
-                        "index": 1,
-                        "id": "tool1",
-                        "function": {
-                          "arguments": "example_arguments",
-                          "name": "example_function"
-                        },
-                        "type": "function"
-                      }
-                    ]
-                  },
-                  "finish_reason": "example_reason",
-                  "index": 0
-                }
-              ],
-              "model": "example_model",
-              "object": "example_object",
-              "usage": {
-                "completion_tokens": 10,
-                "prompt_tokens": 5,
-                "total_tokens": 15
-              }
-            }
-            """;
-
-        StreamingUnifiedChatCompletionResults.ChatCompletionChunk chunk = new StreamingUnifiedChatCompletionResults.ChatCompletionChunk(
-            "chunk1",
-            List.of(
-                new StreamingUnifiedChatCompletionResults.ChatCompletionChunk.Choice(
-                    new StreamingUnifiedChatCompletionResults.ChatCompletionChunk.Choice.Delta(
-                        "example_content",
-                        "example_refusal",
-                        "assistant",
-                        List.of(
-                            new StreamingUnifiedChatCompletionResults.ChatCompletionChunk.Choice.Delta.ToolCall(
-                                1,
-                                "tool1",
-                                new StreamingUnifiedChatCompletionResults.ChatCompletionChunk.Choice.Delta.ToolCall.Function(
-                                    "example_arguments",
-                                    "example_function"
-                                ),
-                                "function"
-                            )
-                        )
-                    ),
-                    "example_reason",
-                    0
-                )
-            ),
-            "example_model",
-            "example_object",
-            new StreamingUnifiedChatCompletionResults.ChatCompletionChunk.Usage(10, 5, 15)
-        );
-
-        XContentBuilder builder = JsonXContent.contentBuilder();
-        chunk.toXContentChunked(null).forEachRemaining(xContent -> {
-            try {
-                xContent.toXContent(builder, null);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        assertEquals(expected.replaceAll("\\s+", ""), Strings.toString(builder.prettyPrint()).trim());
-    }
-
     public void testChoiceToXContentChunked() throws IOException {
         String expected = """
             {

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiUnifiedChatCompletionRequestEntityTests.java

@@ -269,10 +269,10 @@ public void testSerializationWithEmptyLists() throws IOException {
             messageList,
             null, // model
             null, // maxCompletionTokens
-            Collections.emptyList(), // empty stop list TODO when passing an empty stop-list, should it be converted to null?
+            Collections.emptyList(), // empty stop list
             null, // temperature
             null, // toolChoice
-            Collections.emptyList(), // empty tools list TODO when passing an empty tools-list, should it be converted to null?
+            Collections.emptyList(), // empty tools list
             null  // topP
         );