fix JinaAI tests due to the conflict

Author: wwang500

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/jinaai/JinaAIServiceTests.java

@@ -1634,36 +1634,6 @@ public void test_Embedding_ChunkedInfer_ChunkingSettingsNotSet() throws IOExcept
         test_Embedding_ChunkedInfer_BatchesCalls(model);
     }
 
-    public void test_Embedding_ChunkedInfer_LateChunkingEnabled() throws IOException {
-        var model = JinaAIEmbeddingsModelTests.createModel(
-            getUrl(webServer),
-            "secret",
-            new JinaAIEmbeddingsTaskSettings(null, true),
-            null,
-            1024,
-            1024,
-            "jina-clip-v2",
-            JinaAIEmbeddingType.FLOAT
-        );
-
-        test_Embedding_ChunkedInfer_BatchesCalls(model);
-    }
-
-    public void test_Embedding_ChunkedInfer_LateChunkingDisabled() throws IOException {
-        var model = JinaAIEmbeddingsModelTests.createModel(
-            getUrl(webServer),
-            "secret",
-            new JinaAIEmbeddingsTaskSettings(null, false),
-            null,
-            1024,
-            1024,
-            "jina-clip-v2",
-            JinaAIEmbeddingType.FLOAT
-        );
-
-        test_Embedding_ChunkedInfer_BatchesCalls(model);
-    }
-
     public void test_Embedding_ChunkedInfer_noInputs() throws IOException {
         var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
         var model = JinaAIEmbeddingsModelTests.createModel(getUrl(webServer), "secret", 1024, "jina-clip-v2", JinaAIEmbeddingType.FLOAT);
@@ -1690,7 +1660,37 @@ private void test_Embedding_ChunkedInfer_BatchesCalls(JinaAIEmbeddingsModel mode
         var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
 
         try (var service = new JinaAIService(senderFactory, createWithEmptySettings(threadPool), mockClusterServiceEmpty())) {
-            queueResponsesForChunkedInfer(model.getTaskSettings().getLateChunking());
+
+            // Batching will call the service with 2 input
+            String responseJson = """
+                {
+                    "model": "jina-clip-v2",
+                    "object": "list",
+                    "usage": {
+                        "total_tokens": 5,
+                        "prompt_tokens": 5
+                    },
+                    "data": [
+                        {
+                            "object": "embedding",
+                            "index": 0,
+                            "embedding": [
+                                0.123,
+                                -0.123
+                            ]
+                        },
+                        {
+                            "object": "embedding",
+                            "index": 1,
+                            "embedding": [
+                                0.223,
+                                -0.223
+                            ]
+                        }
+                    ]
+                }
+                """;
+            webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
 
             PlainActionFuture<List<ChunkedInference>> listener = new PlainActionFuture<>();
             // 2 input
@@ -1730,83 +1730,20 @@ private void test_Embedding_ChunkedInfer_BatchesCalls(JinaAIEmbeddingsModel mode
                     0.0f
                 );
             }
-        }
-    }
 
-    private void queueResponsesForChunkedInfer(Boolean lateChunking) {
-        if (Boolean.TRUE.equals(lateChunking)) {
-            var responseJson = """
-                {
-                    "model": "jina-clip-v2",
-                    "object": "list",
-                    "usage": {
-                        "total_tokens": 5,
-                        "prompt_tokens": 5
-                    },
-                    "data": [
-                        {
-                            "object": "embedding",
-                            "index": 0,
-                            "embedding": [
-                                0.123,
-                                -0.123
-                            ]
-                        }
-                    ]
-                }
-                """;
-            webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
-            var responseJson2 = """
-                {
-                    "model": "jina-clip-v2",
-                    "object": "list",
-                    "usage": {
-                        "total_tokens": 5,
-                        "prompt_tokens": 5
-                    },
-                    "data": [
-                        {
-                            "object": "embedding",
-                            "index": 0,
-                            "embedding": [
-                                0.223,
-                                -0.223
-                            ]
-                        }
-                    ]
-                }
-                """;
-            webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson2));
-        } else {
-            var responseJson = """
-                {
-                    "model": "jina-clip-v2",
-                    "object": "list",
-                    "usage": {
-                        "total_tokens": 5,
-                        "prompt_tokens": 5
-                    },
-                    "data": [
-                        {
-                            "object": "embedding",
-                            "index": 0,
-                            "embedding": [
-                                0.123,
-                                -0.123
-                            ]
-                        },
-                        {
-                            "object": "embedding",
-                            "index": 1,
-                            "embedding": [
-                                0.223,
-                                -0.223
-                            ]
-                        }
-                    ]
-                }
-                """;
-            webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));
+            MatcherAssert.assertThat(webServer.requests(), hasSize(1));
+            assertNull(webServer.requests().get(0).getUri().getQuery());
+            MatcherAssert.assertThat(
+                webServer.requests().get(0).getHeader(HttpHeaders.CONTENT_TYPE),
+                equalTo(XContentType.JSON.mediaType())
+            );
+            MatcherAssert.assertThat(webServer.requests().get(0).getHeader(HttpHeaders.AUTHORIZATION), equalTo("Bearer secret"));
+
+            var requestMap = entityAsMap(webServer.requests().get(0).getBody());
+            MatcherAssert.assertThat(
+                requestMap,
+                is(Map.of("input", List.of("a", "bb"), "model", "jina-clip-v2", "embedding_type", "float"))
+            );
         }
     }