remove interface "EmbeddingInt"

Author: jan-elastic

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/EmbeddingInt.java

@@ -55,7 +55,10 @@ public TextEmbeddingBitResults(StreamInput in) throws IOException {
 
     @Override
     public int getFirstEmbeddingSize() {
-        return TextEmbeddingUtils.getFirstEmbeddingSize(new ArrayList<>(embeddings));
+        if (embeddings.isEmpty()) {
+            throw new IllegalStateException("Embeddings list is empty");
+        }
+        return embeddings.getFirst().values().length;
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingBitResults.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.core.ml.inference.results.MlTextEmbeddingResults;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -62,7 +61,10 @@ public TextEmbeddingByteResults(StreamInput in) throws IOException {
 
     @Override
     public int getFirstEmbeddingSize() {
-        return TextEmbeddingUtils.getFirstEmbeddingSize(new ArrayList<>(embeddings));
+        if (embeddings.isEmpty()) {
+            throw new IllegalStateException("Embeddings list is empty");
+        }
+        return embeddings.getFirst().values().length;
     }
 
     @Override
@@ -117,7 +119,7 @@ public int hashCode() {
         return Objects.hash(embeddings);
     }
 
-    public record Embedding(byte[] values) implements Writeable, ToXContentObject, EmbeddingInt, EmbeddingResults.Embedding<Chunk> {
+    public record Embedding(byte[] values) implements Writeable, ToXContentObject, EmbeddingResults.Embedding<Chunk> {
         public static final String EMBEDDING = "embedding";
 
         public Embedding(StreamInput in) throws IOException {
@@ -172,11 +174,6 @@ float[] toFloatArray() {
             return doubleArray;
         }
 
-        @Override
-        public int getSize() {
-            return values().length;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingByteResults.java

@@ -100,7 +100,10 @@ public static TextEmbeddingFloatResults of(List<? extends InferenceResults> resu
 
     @Override
     public int getFirstEmbeddingSize() {
-        return TextEmbeddingUtils.getFirstEmbeddingSize(new ArrayList<>(embeddings));
+        if (embeddings.isEmpty()) {
+            throw new IllegalStateException("Embeddings list is empty");
+        }
+        return embeddings.getFirst().values().length;
     }
 
     @Override
@@ -153,7 +156,7 @@ public int hashCode() {
         return Objects.hash(embeddings);
     }
 
-    public record Embedding(float[] values) implements Writeable, ToXContentObject, EmbeddingInt, EmbeddingResults.Embedding<Chunk> {
+    public record Embedding(float[] values) implements Writeable, ToXContentObject, EmbeddingResults.Embedding<Chunk> {
         public static final String EMBEDDING = "embedding";
 
         public Embedding(StreamInput in) throws IOException {
@@ -173,11 +176,6 @@ public static Embedding of(List<Float> embeddingValuesList) {
             return new Embedding(embeddingValues);
         }
 
-        @Override
-        public int getSize() {
-            return values.length;
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeFloatArray(values);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingFloatResults.java

@@ -13,20 +13,6 @@
 
 public class TextEmbeddingUtils {
 
-    /**
-     * Returns the first text embedding entry's array size.
-     * @param embeddings the list of embeddings
-     * @return the size of the text embedding
-     * @throws IllegalStateException if the list of embeddings is empty
-     */
-    public static int getFirstEmbeddingSize(List<EmbeddingInt> embeddings) throws IllegalStateException {
-        if (embeddings.isEmpty()) {
-            throw new IllegalStateException("Embeddings list is empty");
-        }
-
-        return embeddings.get(0).getSize();
-    }
-
     /**
      * Throws an exception if the number of elements in the input text list is different than the results in text embedding
      * response.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/results/TextEmbeddingUtils.java

@@ -967,7 +967,7 @@ public void testGetEmbeddingSize_ReturnsSize_ForTextEmbeddingResults() {
 
         var size = listener.actionGet(TIMEOUT);
 
-        assertThat(size, is(textEmbedding.embeddings().get(0).getSize()));
+        assertThat(size, is(textEmbedding.embeddings().get(0).values().length));
     }
 
     public void testGetEmbeddingSize_ReturnsSize_ForTextEmbeddingByteResults() {
@@ -990,7 +990,7 @@ public void testGetEmbeddingSize_ReturnsSize_ForTextEmbeddingByteResults() {
 
         var size = listener.actionGet(TIMEOUT);
 
-        assertThat(size, is(textEmbedding.embeddings().get(0).getSize()));
+        assertThat(size, is(textEmbedding.embeddings().get(0).values().length));
     }
 
     private static <K, V> Map<K, V> modifiableMap(Map<K, V> aMap) {