remove dimensions_set_by_user

Author: brendan-jugan-elastic

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

@@ -197,7 +197,6 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints(
                         defaultDenseTextEmbeddingsSimilarity(),
                         null,
                         null,
-                        false,
                         ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.DEFAULT_RATE_LIMIT_SETTINGS
                     ),
                     EmptyTaskSettings.INSTANCE,
@@ -572,14 +571,12 @@ public Model updateModelWithEmbeddingDetails(Model model, int embeddingSize) {
             var similarityFromModel = serviceSettings.similarity();
             var similarityToUse = similarityFromModel == null ? defaultDenseTextEmbeddingsSimilarity() : similarityFromModel;
             var maxInputTokens = serviceSettings.maxInputTokens();
-            var dimensionsSetByUser = serviceSettings.dimensionsSetByUser();
 
             var updateServiceSettings = new ElasticInferenceServiceDenseTextEmbeddingsServiceSettings(
                 modelId,
                 similarityToUse,
                 embeddingSize,
                 maxInputTokens,
-                dimensionsSetByUser,
                 serviceSettings.rateLimitSettings()
             );
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.java

@@ -39,15 +39,13 @@ public class ElasticInferenceServiceDenseTextEmbeddingsServiceSettings extends F
         ElasticInferenceServiceRateLimitServiceSettings {
 
     public static final String NAME = "elastic_inference_service_dense_embeddings_service_settings";
-    static final String DIMENSIONS_SET_BY_USER = "dimensions_set_by_user";
 
     public static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(10_000);
 
     private final String modelId;
     private final SimilarityMeasure similarity;
     private final Integer dimensions;
     private final Integer maxInputTokens;
-    private final boolean dimensionsSetByUser;
     private final RateLimitSettings rateLimitSettings;
 
     public static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings fromMap(
@@ -83,14 +81,11 @@ private static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings fromReq
             throw validationException;
         }
 
-        var dimensionsSetByUser = dims != null;
-
         return new ElasticInferenceServiceDenseTextEmbeddingsServiceSettings(
             modelId,
             similarity,
             dims,
             maxInputTokens,
-            dimensionsSetByUser,
             rateLimitSettings
         );
     }
@@ -113,11 +108,6 @@ private static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings fromPer
         SimilarityMeasure similarity = extractSimilarity(map, ModelConfigurations.SERVICE_SETTINGS, validationException);
         Integer dims = removeAsType(map, DIMENSIONS, Integer.class);
         Integer maxInputTokens = removeAsType(map, MAX_INPUT_TOKENS, Integer.class);
-        Boolean dimensionsSetByUser = removeAsType(map, DIMENSIONS_SET_BY_USER, Boolean.class);
-
-        if (dimensionsSetByUser == null) {
-            dimensionsSetByUser = Boolean.FALSE;
-        }
 
         if (validationException.validationErrors().isEmpty() == false) {
             throw validationException;
@@ -128,7 +118,6 @@ private static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings fromPer
             similarity,
             dims,
             maxInputTokens,
-            dimensionsSetByUser,
             rateLimitSettings
         );
     }
@@ -138,14 +127,12 @@ public ElasticInferenceServiceDenseTextEmbeddingsServiceSettings(
         @Nullable SimilarityMeasure similarity,
         @Nullable Integer dimensions,
         @Nullable Integer maxInputTokens,
-        boolean dimensionsSetByUser,
         RateLimitSettings rateLimitSettings
     ) {
         this.modelId = modelId;
         this.similarity = similarity;
         this.dimensions = dimensions;
         this.maxInputTokens = maxInputTokens;
-        this.dimensionsSetByUser = dimensionsSetByUser;
         this.rateLimitSettings = Objects.requireNonNullElse(rateLimitSettings, DEFAULT_RATE_LIMIT_SETTINGS);
     }
 
@@ -154,7 +141,6 @@ public ElasticInferenceServiceDenseTextEmbeddingsServiceSettings(StreamInput in)
         this.similarity = in.readOptionalEnum(SimilarityMeasure.class);
         this.dimensions = in.readOptionalVInt();
         this.maxInputTokens = in.readOptionalVInt();
-        this.dimensionsSetByUser = in.readBoolean();
         this.rateLimitSettings = new RateLimitSettings(in);
     }
 
@@ -182,11 +168,6 @@ public RateLimitSettings rateLimitSettings() {
         return rateLimitSettings;
     }
 
-    @Override
-    public Boolean dimensionsSetByUser() {
-        return dimensionsSetByUser;
-    }
-
     @Override
     public DenseVectorFieldMapper.ElementType elementType() {
         return DenseVectorFieldMapper.ElementType.FLOAT;
@@ -226,7 +207,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
 
         toXContentFragmentOfExposedFields(builder, params);
-        builder.field(DIMENSIONS_SET_BY_USER, dimensionsSetByUser);
 
         builder.endObject();
         return builder;
@@ -243,7 +223,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalEnum(SimilarityMeasure.translateSimilarity(similarity, out.getTransportVersion()));
         out.writeOptionalVInt(dimensions);
         out.writeOptionalVInt(maxInputTokens);
-        out.writeBoolean(dimensionsSetByUser);
         rateLimitSettings.writeTo(out);
     }
 
@@ -252,8 +231,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ElasticInferenceServiceDenseTextEmbeddingsServiceSettings that = (ElasticInferenceServiceDenseTextEmbeddingsServiceSettings) o;
-        return dimensionsSetByUser == that.dimensionsSetByUser
-            && Objects.equals(modelId, that.modelId)
+        return Objects.equals(modelId, that.modelId)
             && similarity == that.similarity
             && Objects.equals(dimensions, that.dimensions)
             && Objects.equals(maxInputTokens, that.maxInputTokens)
@@ -262,6 +240,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(modelId, similarity, dimensions, maxInputTokens, dimensionsSetByUser, rateLimitSettings);
+        return Objects.hash(modelId, similarity, dimensions, maxInputTokens, rateLimitSettings);
     }
 }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsModelTests.java

@@ -31,7 +31,6 @@ public static ElasticInferenceServiceDenseTextEmbeddingsModel createModel(
                 SimilarityMeasure.COSINE,
                 null,
                 null,
-                false,
                 new RateLimitSettings(1000L)
             ),
             EmptyTaskSettings.INSTANCE,

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/densetextembeddings/ElasticInferenceServiceDenseTextEmbeddingsServiceSettingsTests.java

@@ -70,62 +70,20 @@ public void testFromMap_Request_WithAllSettings() {
         assertThat(serviceSettings.similarity(), is(similarity));
         assertThat(serviceSettings.dimensions(), is(dimensions));
         assertThat(serviceSettings.maxInputTokens(), is(maxInputTokens));
-        assertThat(serviceSettings.dimensionsSetByUser(), is(true)); // dimensions were provided
-    }
-
-    public void testFromMap_Persistent_WithDimensionsSetByUser() {
-        var modelId = "my-dense-model-id";
-        var similarity = SimilarityMeasure.DOT_PRODUCT;
-        var dimensions = 768;
-        var dimensionsSetByUser = true;
-
-        var serviceSettings = ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.fromMap(
-            new HashMap<>(
-                Map.of(
-                    ServiceFields.MODEL_ID,
-                    modelId,
-                    ServiceFields.SIMILARITY,
-                    similarity.toString(),
-                    ServiceFields.DIMENSIONS,
-                    dimensions,
-                    ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.DIMENSIONS_SET_BY_USER,
-                    dimensionsSetByUser
-                )
-            ),
-            ConfigurationParseContext.PERSISTENT
-        );
-
-        assertThat(serviceSettings.modelId(), is(modelId));
-        assertThat(serviceSettings.similarity(), is(similarity));
-        assertThat(serviceSettings.dimensions(), is(dimensions));
-        assertThat(serviceSettings.dimensionsSetByUser(), is(dimensionsSetByUser));
-    }
-
-    public void testFromMap_Persistent_WithoutDimensionsSetByUser_DefaultsToFalse() {
-        var modelId = "my-dense-model-id";
-
-        var serviceSettings = ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.fromMap(
-            new HashMap<>(Map.of(ServiceFields.MODEL_ID, modelId)),
-            ConfigurationParseContext.PERSISTENT
-        );
-
-        assertThat(serviceSettings.dimensionsSetByUser(), is(false));
     }
 
     public void testToXContent_WritesAllFields() throws IOException {
         var modelId = "my-dense-model";
         var similarity = SimilarityMeasure.DOT_PRODUCT;
         var dimensions = 1024;
         var maxInputTokens = 256;
-        var dimensionsSetByUser = true;
         var rateLimitSettings = new RateLimitSettings(5000);
 
         var serviceSettings = new ElasticInferenceServiceDenseTextEmbeddingsServiceSettings(
             modelId,
             similarity,
             dimensions,
             maxInputTokens,
-            dimensionsSetByUser,
             rateLimitSettings
         );
 
@@ -138,13 +96,12 @@ public void testToXContent_WritesAllFields() throws IOException {
             is(
                 Strings.format(
                     """
-                        {"similarity":"%s","dimensions":%d,"max_input_tokens":%d,"model_id":"%s","rate_limit":{"requests_per_minute":%d},"dimensions_set_by_user":%s}""",
+                    {"similarity":"%s","dimensions":%d,"max_input_tokens":%d,"model_id":"%s","rate_limit":{"requests_per_minute":%d}}""",
                     similarity,
                     dimensions,
                     maxInputTokens,
                     modelId,
-                    rateLimitSettings.requestsPerTimeUnit(),
-                    dimensionsSetByUser
+                    rateLimitSettings.requestsPerTimeUnit()
                 )
             )
         );
@@ -159,7 +116,6 @@ public void testToXContent_WritesOnlyNonNullFields() throws IOException {
             null, // similarity
             null, // dimensions
             null, // maxInputTokens
-            false, // dimensionsSetByUser
             rateLimitSettings
         );
 
@@ -172,7 +128,7 @@ public void testToXContent_WritesOnlyNonNullFields() throws IOException {
             is(
                 Strings.format(
                     """
-                        {"model_id":"%s","rate_limit":{"requests_per_minute":%d},"dimensions_set_by_user":false}""",
+                        {"model_id":"%s","rate_limit":{"requests_per_minute":%d}}""",
                     modelId,
                     rateLimitSettings.requestsPerTimeUnit()
                 )
@@ -189,7 +145,6 @@ public void testToXContentFragmentOfExposedFields() throws IOException {
             SimilarityMeasure.COSINE,
             512,
             128,
-            true,
             rateLimitSettings
         );
 
@@ -217,7 +172,6 @@ public static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings createRa
             similarity,
             dimensions,
             maxInputTokens,
-            dimensionsSetByUser,
             rateLimitSettings
         );
     }