fix test

davidkyle · Dec 13, 2024 · baf0373 · baf0373
1 parent 430ae9d
commit baf0373
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/.../main/java/org/elasticsearch/xpack/inference/mock/TestDenseInferenceServiceExtension.java b/.../main/java/org/elasticsearch/xpack/inference/mock/TestDenseInferenceServiceExtension.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
-import org.elasticsearch.inference.ChunkedInferenceServiceResults;
 import org.elasticsearch.inference.EmptySettingsConfiguration;
 import org.elasticsearch.inference.InferenceChunks;
 import org.elasticsearch.inference.InferenceServiceConfiguration;
@@ -39,7 +38,6 @@
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbeddingFloat;
-import org.elasticsearch.xpack.core.inference.results.InferenceChunkedTextEmbeddingFloatResults;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingFloatResults;
 
 import java.io.IOException;

diff --git a/...n/src/main/java/org/elasticsearch/xpack/inference/mock/TestRerankingServiceExtension.java b/...n/src/main/java/org/elasticsearch/xpack/inference/mock/TestRerankingServiceExtension.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.common.util.LazyInitializable;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.inference.ChunkedInferenceServiceResults;
 import org.elasticsearch.inference.EmptySettingsConfiguration;
 import org.elasticsearch.inference.InferenceChunks;
 import org.elasticsearch.inference.InferenceServiceConfiguration;

diff --git a/...main/java/org/elasticsearch/xpack/inference/mock/TestSparseInferenceServiceExtension.java b/...main/java/org/elasticsearch/xpack/inference/mock/TestSparseInferenceServiceExtension.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.common.util.LazyInitializable;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.inference.ChunkedInferenceServiceResults;
 import org.elasticsearch.inference.EmptySettingsConfiguration;
 import org.elasticsearch.inference.InferenceChunks;
 import org.elasticsearch.inference.InferenceServiceConfiguration;
@@ -37,9 +36,7 @@
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbeddingSparse;
-import org.elasticsearch.xpack.core.inference.results.InferenceChunkedSparseEmbeddingResults;
 import org.elasticsearch.xpack.core.inference.results.SparseEmbeddingResults;
-import org.elasticsearch.xpack.core.ml.inference.results.MlChunkedTextExpansionResults;
 import org.elasticsearch.xpack.core.ml.search.WeightedToken;
 
 import java.io.IOException;
@@ -178,8 +175,13 @@ private List<InferenceChunks> makeChunkedResults(List<String> input) {
                 }
                 results.add(
                     new ChunkedInferenceEmbeddingSparse(
-                        List.of(new ChunkedInferenceEmbeddingSparse.SparseEmbeddingChunk(tokens, input.get(i),
-                            new InferenceChunks.TextOffset(0, input.get(i).length())))
+                        List.of(
+                            new ChunkedInferenceEmbeddingSparse.SparseEmbeddingChunk(
+                                tokens,
+                                input.get(i),
+                                new InferenceChunks.TextOffset(0, input.get(i).length())
+                            )
+                        )
                     )
                 );
             }

diff --git a/.../java/org/elasticsearch/xpack/inference/mock/TestStreamingCompletionServiceExtension.java b/.../java/org/elasticsearch/xpack/inference/mock/TestStreamingCompletionServiceExtension.java
@@ -18,7 +18,6 @@
 import org.elasticsearch.common.xcontent.ChunkedToXContent;
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.inference.ChunkedInferenceServiceResults;
 import org.elasticsearch.inference.EmptySettingsConfiguration;
 import org.elasticsearch.inference.InferenceChunks;
 import org.elasticsearch.inference.InferenceServiceConfiguration;

diff --git a/.../java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java b/.../java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java
@@ -37,7 +37,7 @@
 import org.elasticsearch.inference.UnparsedModel;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.tasks.Task;
-import org.elasticsearch.xpack.core.inference.results.ErrorChunkedInferenceResults;
+import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError;
 import org.elasticsearch.xpack.inference.mapper.SemanticTextField;
 import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
@@ -282,11 +282,11 @@ public void onResponse(List<InferenceChunks> results) {
                         for (InferenceChunks result : results) {
                             var request = requestsIterator.next();
                             var acc = inferenceResults.get(request.index);
-                            if (result instanceof ErrorChunkedInferenceResults error) {
+                            if (result instanceof ChunkedInferenceError error) {
                                 acc.addFailure(
                                     new ElasticsearchException(
                                         "Exception when running inference id [{}] on field [{}]",
-                                        error.getException(),
+                                        error.exception(),
                                         inferenceProvider.model.getInferenceEntityId(),
                                         request.field
                                     )

diff --git a/...n/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextField.java b/...n/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextField.java
@@ -13,7 +13,6 @@
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
-import org.elasticsearch.inference.ChunkedInferenceServiceResults;
 import org.elasticsearch.inference.InferenceChunks;
 import org.elasticsearch.inference.Model;
 import org.elasticsearch.inference.SimilarityMeasure;
@@ -307,7 +306,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     }
 
     /**
-     * Converts the provided {@link ChunkedInferenceServiceResults} into a list of {@link Chunk}.
+     * Converts the provided {@link InferenceChunks} into a list of {@link Chunk}.
      */
     public static List<Chunk> toSemanticTextFieldChunks(List<InferenceChunks> results, XContentType contentType) throws IOException {
         List<Chunk> chunks = new ArrayList<>();

diff --git a/...rc/test/java/org/elasticsearch/xpack/inference/chunking/EmbeddingRequestChunkerTests.java b/...rc/test/java/org/elasticsearch/xpack/inference/chunking/EmbeddingRequestChunkerTests.java
@@ -12,8 +12,8 @@
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbeddingByte;
 import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbeddingFloat;
-import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError;
 import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbeddingSparse;
+import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingByteResults;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingFloatResults;
 import org.elasticsearch.xpack.core.inference.results.SparseEmbeddingResults;
@@ -504,9 +504,9 @@ public void testListenerErrorsWithWrongNumberOfResponses() {
         var listener = new ActionListener<List<InferenceChunks>>() {
 
             @Override
-            public void onResponse(List<InferenceChunks> chunkedInferenceServiceResults) {
-                assertThat(chunkedInferenceServiceResults.get(0), instanceOf(ChunkedInferenceError.class));
-                var error = (ChunkedInferenceError) chunkedInferenceServiceResults.get(0);
+            public void onResponse(List<InferenceChunks> chunkedResults) {
+                assertThat(chunkedResults.get(0), instanceOf(ChunkedInferenceError.class));
+                var error = (ChunkedInferenceError) chunkedResults.get(0);
                 failureMessage.set(error.exception().getMessage());
             }