remove Chunk generic

Author: jan-elastic

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

@@ -19,9 +19,7 @@
  * A call to the inference service may contain multiple input texts, so this results may
  * contain multiple results.
  */
-public interface EmbeddingResults<C extends EmbeddingResults.Chunk, E extends EmbeddingResults.Embedding<C, E>>
-    extends
-        InferenceServiceResults {
+public interface EmbeddingResults<E extends EmbeddingResults.Embedding<E>> extends InferenceServiceResults {
 
     /**
      * A resulting embedding together with the offset into the input text.
@@ -35,11 +33,11 @@ interface Chunk {
     /**
      * A resulting embedding for one of the input texts to the inference service.
      */
-    interface Embedding<C extends Chunk, E extends EmbeddingResults.Embedding<C, E>> {
+    interface Embedding<E extends Embedding<E>> {
         /**
          * Combines the resulting embedding with the offset into the input text into a chunk.
          */
-        C toChunk(ChunkedInference.TextOffset offset);
+        Chunk toChunk(ChunkedInference.TextOffset offset);
 
         /**
          * Merges the existing embedding and provided embedding into a new embedding.

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

@@ -37,9 +37,7 @@
 
 import static org.elasticsearch.xpack.core.ml.inference.trainedmodel.InferenceConfig.DEFAULT_RESULTS_FIELD;
 
-public record SparseEmbeddingResults(List<Embedding> embeddings)
-    implements
-        EmbeddingResults<SparseEmbeddingResults.Chunk, SparseEmbeddingResults.Embedding> {
+public record SparseEmbeddingResults(List<Embedding> embeddings) implements EmbeddingResults<SparseEmbeddingResults.Embedding> {
 
     public static final String NAME = "sparse_embedding_results";
     public static final String SPARSE_EMBEDDING = TaskType.SPARSE_EMBEDDING.toString();
@@ -126,7 +124,7 @@ public record Embedding(List<WeightedToken> tokens, boolean isTruncated)
         implements
             Writeable,
             ToXContentObject,
-            EmbeddingResults.Embedding<Chunk, Embedding> {
+            EmbeddingResults.Embedding<Embedding> {
 
         public static final String EMBEDDING = "embedding";
         public static final String IS_TRUNCATED = "is_truncated";

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

@@ -42,7 +42,7 @@
  */
 public record TextEmbeddingBitResults(List<TextEmbeddingByteResults.Embedding> embeddings)
     implements
-        TextEmbeddingResults<TextEmbeddingByteResults.Chunk, TextEmbeddingByteResults.Embedding> {
+        TextEmbeddingResults<TextEmbeddingByteResults.Embedding> {
     public static final String NAME = "text_embedding_service_bit_results";
     public static final String TEXT_EMBEDDING_BITS = "text_embedding_bits";
 

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

@@ -48,9 +48,7 @@
  *     ]
  * }
  */
-public record TextEmbeddingByteResults(List<Embedding> embeddings)
-    implements
-        TextEmbeddingResults<TextEmbeddingByteResults.Chunk, TextEmbeddingByteResults.Embedding> {
+public record TextEmbeddingByteResults(List<Embedding> embeddings) implements TextEmbeddingResults<TextEmbeddingByteResults.Embedding> {
     public static final String NAME = "text_embedding_service_byte_results";
     public static final String TEXT_EMBEDDING_BYTES = "text_embedding_bytes";
 
@@ -124,7 +122,7 @@ public record Embedding(byte[] values, int[] sumMergedValues, int numberOfMerged
         implements
             Writeable,
             ToXContentObject,
-            EmbeddingResults.Embedding<Chunk, Embedding> {
+            EmbeddingResults.Embedding<Embedding> {
 
         public static final String EMBEDDING = "embedding";
 

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

@@ -53,9 +53,7 @@
  *     ]
  * }
  */
-public record TextEmbeddingFloatResults(List<Embedding> embeddings)
-    implements
-        TextEmbeddingResults<TextEmbeddingFloatResults.Chunk, TextEmbeddingFloatResults.Embedding> {
+public record TextEmbeddingFloatResults(List<Embedding> embeddings) implements TextEmbeddingResults<TextEmbeddingFloatResults.Embedding> {
     public static final String NAME = "text_embedding_service_results";
     public static final String TEXT_EMBEDDING = TaskType.TEXT_EMBEDDING.toString();
 
@@ -161,7 +159,7 @@ public record Embedding(float[] values, int numberOfMergedEmbeddings)
         implements
             Writeable,
             ToXContentObject,
-            EmbeddingResults.Embedding<Chunk, Embedding> {
+            EmbeddingResults.Embedding<Embedding> {
         public static final String EMBEDDING = "embedding";
 
         public Embedding(float[] values) {

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

@@ -7,9 +7,7 @@
 
 package org.elasticsearch.xpack.core.inference.results;
 
-public interface TextEmbeddingResults<C extends EmbeddingResults.Chunk, E extends EmbeddingResults.Embedding<C, E>>
-    extends
-        EmbeddingResults<C, E> {
+public interface TextEmbeddingResults<E extends EmbeddingResults.Embedding<E>> extends EmbeddingResults<E> {
 
     /**
      * Returns the first text embedding entry in the result list's array size.

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/chunking/EmbeddingRequestChunker.java

@@ -36,7 +36,7 @@
  * processing and map the results back to the original element
  * in the input list.
  */
-public class EmbeddingRequestChunker<C extends EmbeddingResults.Chunk, E extends EmbeddingResults.Embedding<C, E>> {
+public class EmbeddingRequestChunker<E extends EmbeddingResults.Embedding<E>> {
 
     // Visible for testing
     record Request(int inputIndex, int chunkIndex, ChunkOffset chunk, List<String> inputs) {
@@ -150,12 +150,12 @@ private class DebatchingListener implements ActionListener<InferenceServiceResul
 
         @Override
         public void onResponse(InferenceServiceResults inferenceServiceResults) {
-            if (inferenceServiceResults instanceof EmbeddingResults<?, ?> == false) {
+            if (inferenceServiceResults instanceof EmbeddingResults<?> == false) {
                 onFailure(unexpectedResultTypeException(inferenceServiceResults.getWriteableName()));
                 return;
             }
             @SuppressWarnings("unchecked")
-            EmbeddingResults<C, E> embeddingResults = (EmbeddingResults<C, E>) inferenceServiceResults;
+            EmbeddingResults<E> embeddingResults = (EmbeddingResults<E>) inferenceServiceResults;
             if (embeddingResults.embeddings().size() != request.requests.size()) {
                 onFailure(numResultsDoesntMatchException(embeddingResults.embeddings().size(), request.requests.size()));
                 return;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java

@@ -741,7 +741,7 @@ public static void getEmbeddingSize(Model model, InferenceService service, Actio
             InputType.INGEST,
             InferenceAction.Request.DEFAULT_TIMEOUT,
             listener.delegateFailureAndWrap((delegate, r) -> {
-                if (r instanceof TextEmbeddingResults<?, ?> embeddingResults) {
+                if (r instanceof TextEmbeddingResults<?> embeddingResults) {
                     try {
                         delegate.onResponse(embeddingResults.getFirstEmbeddingSize());
                     } catch (Exception e) {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/validation/TextEmbeddingModelValidator.java

@@ -33,7 +33,7 @@ public void validate(InferenceService service, Model model, ActionListener<Model
     }
 
     private Model postValidate(InferenceService service, Model model, InferenceServiceResults results) {
-        if (results instanceof TextEmbeddingResults<?, ?> embeddingResults) {
+        if (results instanceof TextEmbeddingResults<?> embeddingResults) {
             var serviceSettings = model.getServiceSettings();
             var dimensions = serviceSettings.dimensions();
             int embeddingSize = getEmbeddingSize(embeddingResults);
@@ -67,7 +67,7 @@ private Model postValidate(InferenceService service, Model model, InferenceServi
         }
     }
 
-    private int getEmbeddingSize(TextEmbeddingResults<?, ?> embeddingResults) {
+    private int getEmbeddingSize(TextEmbeddingResults<?> embeddingResults) {
         int embeddingSize;
         try {
             embeddingSize = embeddingResults.getFirstEmbeddingSize();