Skip to content

Commit dc7f53b

Browse files
jonathan-buttnerjonathan-buttner
committed
Rejecting rate limit field
1 parent cee82cf commit dc7f53b

File tree

10 files changed

+9
-39
lines changed

10 files changed

+9
-39
lines changed

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/completion/ElasticInferenceServiceCompletionServiceSettings.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public static ElasticInferenceServiceCompletionServiceSettings fromMap(Map<Strin
3737
ValidationException validationException = new ValidationException();
3838

3939
String modelId = extractRequiredString(map, MODEL_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
40-
RateLimitSettings.disabledRateLimiting(map);
4140

4241
if (validationException.validationErrors().isEmpty() == false) {
4342
throw validationException;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ public static ElasticInferenceServiceDenseTextEmbeddingsServiceSettings fromMap(
5151
ValidationException validationException = new ValidationException();
5252

5353
String modelId = extractRequiredString(map, MODEL_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
54-
RateLimitSettings.disabledRateLimiting(map);
55-
5654
SimilarityMeasure similarity = extractSimilarity(map, ModelConfigurations.SERVICE_SETTINGS, validationException);
5755
Integer dims = removeAsType(map, DIMENSIONS, Integer.class);
5856
Integer maxInputTokens = removeAsType(map, MAX_INPUT_TOKENS, Integer.class);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettings.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public static ElasticInferenceServiceRerankServiceSettings fromMap(Map<String, O
3737
ValidationException validationException = new ValidationException();
3838

3939
String modelId = extractRequiredString(map, MODEL_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
40-
RateLimitSettings.disabledRateLimiting(map);
4140

4241
return new ElasticInferenceServiceRerankServiceSettings(modelId);
4342
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/sparseembeddings/ElasticInferenceServiceSparseEmbeddingsServiceSettings.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ public static ElasticInferenceServiceSparseEmbeddingsServiceSettings fromMap(Map
4747
validationException
4848
);
4949

50-
RateLimitSettings.disabledRateLimiting(map);
51-
5250
if (validationException.validationErrors().isEmpty() == false) {
5351
throw validationException;
5452
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/settings/RateLimitSettings.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.concurrent.TimeUnit;
2828

2929
import static org.elasticsearch.xpack.inference.services.ServiceUtils.extractOptionalPositiveLong;
30-
import static org.elasticsearch.xpack.inference.services.ServiceUtils.removeFromMap;
3130
import static org.elasticsearch.xpack.inference.services.ServiceUtils.removeFromMapOrDefaultEmpty;
3231
import static org.elasticsearch.xpack.inference.services.ServiceUtils.throwIfNotEmptyMap;
3332

@@ -53,12 +52,6 @@ public static RateLimitSettings of(
5352
return requestsPerMinute == null ? defaultValue : new RateLimitSettings(requestsPerMinute);
5453
}
5554

56-
public static RateLimitSettings disabledRateLimiting(Map<String, Object> map) {
57-
removeFromMap(map, FIELD_NAME);
58-
59-
return DISABLED_INSTANCE;
60-
}
61-
6255
public static Map<String, SettingsConfiguration> toSettingsConfigurationWithDescription(
6356
String description,
6457
EnumSet<TaskType> supportedTaskTypes

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSparseEmbeddingsServiceSettingsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Map;
2525

2626
import static org.elasticsearch.xpack.inference.services.elasticsearch.ElserModelsTests.randomElserModel;
27-
import static org.hamcrest.Matchers.anEmptyMap;
2827
import static org.hamcrest.Matchers.is;
2928
import static org.hamcrest.Matchers.sameInstance;
3029

@@ -58,7 +57,7 @@ public void testFromMap() {
5857
assertThat(serviceSettings, is(new ElasticInferenceServiceSparseEmbeddingsServiceSettings(modelId, null)));
5958
}
6059

61-
public void testFromMap_RemovesRateLimitSettings() {
60+
public void testFromMap_DoesNotRemoveRateLimitField() {
6261
var modelId = "my-model-id";
6362
var map = new HashMap<String, Object>(
6463
Map.of(
@@ -70,7 +69,7 @@ public void testFromMap_RemovesRateLimitSettings() {
7069
);
7170
var serviceSettings = ElasticInferenceServiceSparseEmbeddingsServiceSettings.fromMap(map);
7271

73-
assertThat(map, anEmptyMap());
72+
assertThat(map, is(Map.of(RateLimitSettings.FIELD_NAME, Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100))));
7473
assertThat(serviceSettings, is(new ElasticInferenceServiceSparseEmbeddingsServiceSettings(modelId, null)));
7574
assertThat(serviceSettings.rateLimitSettings(), sameInstance(RateLimitSettings.DISABLED_INSTANCE));
7675
}

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/completion/ElasticInferenceServiceCompletionServiceSettingsTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.HashMap;
2525
import java.util.Map;
2626

27-
import static org.hamcrest.Matchers.anEmptyMap;
2827
import static org.hamcrest.Matchers.containsString;
2928
import static org.hamcrest.Matchers.is;
3029
import static org.hamcrest.Matchers.sameInstance;
@@ -59,7 +58,7 @@ public void testFromMap() {
5958
assertThat(serviceSettings.rateLimitSettings(), sameInstance(RateLimitSettings.DISABLED_INSTANCE));
6059
}
6160

62-
public void testFromMap_RemovesRateLimitingField() {
61+
public void testFromMap_DoesNotRemoveRateLimitField() {
6362
var modelId = "my-model-id";
6463

6564
var map = new HashMap<String, Object>(
@@ -72,7 +71,7 @@ public void testFromMap_RemovesRateLimitingField() {
7271
);
7372
var serviceSettings = ElasticInferenceServiceRerankServiceSettings.fromMap(map);
7473

75-
assertThat(map, anEmptyMap());
74+
assertThat(map, is(Map.of(RateLimitSettings.FIELD_NAME, Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100))));
7675
assertThat(serviceSettings, is(new ElasticInferenceServiceRerankServiceSettings(modelId)));
7776
assertThat(serviceSettings.rateLimitSettings(), sameInstance(RateLimitSettings.DISABLED_INSTANCE));
7877
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.HashMap;
2424
import java.util.Map;
2525

26-
import static org.hamcrest.Matchers.anEmptyMap;
2726
import static org.hamcrest.Matchers.is;
2827
import static org.hamcrest.Matchers.sameInstance;
2928

@@ -74,7 +73,7 @@ public void testFromMap_Request_WithAllSettings() {
7473
assertThat(serviceSettings.maxInputTokens(), is(maxInputTokens));
7574
}
7675

77-
public void testFromMap_Request_WithAllSettings_RemovesRateLimitField() {
76+
public void testFromMap_Request_WithAllSettings_DoesNotRemoveRateLimitField() {
7877
var modelId = "my-dense-model-id";
7978
var similarity = SimilarityMeasure.COSINE;
8079
var dimensions = 384;
@@ -96,7 +95,7 @@ public void testFromMap_Request_WithAllSettings_RemovesRateLimitField() {
9695
);
9796
var serviceSettings = ElasticInferenceServiceDenseTextEmbeddingsServiceSettings.fromMap(map);
9897

99-
assertThat(map, anEmptyMap());
98+
assertThat(map, is(Map.of(RateLimitSettings.FIELD_NAME, Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100))));
10099
assertThat(serviceSettings.modelId(), is(modelId));
101100
assertThat(serviceSettings.similarity(), is(similarity));
102101
assertThat(serviceSettings.dimensions(), is(dimensions));

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/rerank/ElasticInferenceServiceRerankServiceSettingsTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.HashMap;
2323
import java.util.Map;
2424

25-
import static org.hamcrest.Matchers.anEmptyMap;
2625
import static org.hamcrest.Matchers.is;
2726
import static org.hamcrest.Matchers.sameInstance;
2827

@@ -54,7 +53,7 @@ public void testFromMap() {
5453
assertThat(serviceSettings.rateLimitSettings(), sameInstance(RateLimitSettings.DISABLED_INSTANCE));
5554
}
5655

57-
public void testFromMap_RemovesRateLimitingField() {
56+
public void testFromMap_DoesNotRemoveRateLimitField() {
5857
var modelId = "my-model-id";
5958

6059
var map = new HashMap<String, Object>(
@@ -65,10 +64,11 @@ public void testFromMap_RemovesRateLimitingField() {
6564
new HashMap<>(Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100))
6665
)
6766
);
67+
6868
var serviceSettings = ElasticInferenceServiceRerankServiceSettings.fromMap(map);
6969

7070
assertThat(serviceSettings, is(new ElasticInferenceServiceRerankServiceSettings(modelId)));
71-
assertThat(map, anEmptyMap());
71+
assertThat(map, is(Map.of(RateLimitSettings.FIELD_NAME, Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100))));
7272
assertThat(serviceSettings.rateLimitSettings(), sameInstance(RateLimitSettings.DISABLED_INSTANCE));
7373
}
7474

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/settings/RateLimitSettingsTests.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import java.util.Map;
2626
import java.util.concurrent.TimeUnit;
2727

28-
import static org.hamcrest.Matchers.anEmptyMap;
2928
import static org.hamcrest.Matchers.is;
30-
import static org.hamcrest.Matchers.sameInstance;
3129

3230
public class RateLimitSettingsTests extends AbstractBWCWireSerializationTestCase<RateLimitSettings> {
3331

@@ -110,18 +108,6 @@ public void testToXContent() throws IOException {
110108
{"rate_limit":{"requests_per_minute":100}}"""));
111109
}
112110

113-
public void testDisableRateLimiting() {
114-
Map<String, Object> settings = new HashMap<>(
115-
Map.of(RateLimitSettings.FIELD_NAME, new HashMap<>(Map.of(RateLimitSettings.REQUESTS_PER_MINUTE_FIELD, 100)))
116-
);
117-
var res = RateLimitSettings.disabledRateLimiting(settings);
118-
119-
assertThat(res, is(new RateLimitSettings(1, TimeUnit.MINUTES, false)));
120-
assertThat(res, sameInstance(RateLimitSettings.DISABLED_INSTANCE));
121-
assertFalse(res.isEnabled());
122-
assertThat(settings, anEmptyMap());
123-
}
124-
125111
public void testToXContent_WhenDisabled() throws IOException {
126112
var settings = new RateLimitSettings(1, TimeUnit.MINUTES, false);
127113

0 commit comments

Comments
 (0)