Skip to content

Commit 15be94a

Browse files
timgreintimgrein
authored
[Inference API] Rename getRequestTaskSettingsMap to createRequestTaskSettingsMap (#108354)
1 parent 6f17735 commit 15be94a

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/action/azureopenai/AzureOpenAiActionCreatorTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import static org.elasticsearch.xpack.inference.results.TextEmbeddingResultsTests.buildExpectation;
4747
import static org.elasticsearch.xpack.inference.services.ServiceComponentsTests.createWithEmptySettings;
4848
import static org.elasticsearch.xpack.inference.services.azureopenai.embeddings.AzureOpenAiEmbeddingsModelTests.createModel;
49-
import static org.elasticsearch.xpack.inference.services.azureopenai.embeddings.AzureOpenAiEmbeddingsRequestTaskSettingsTests.getRequestTaskSettingsMap;
49+
import static org.elasticsearch.xpack.inference.services.azureopenai.embeddings.AzureOpenAiEmbeddingsRequestTaskSettingsTests.createRequestTaskSettingsMap;
5050
import static org.hamcrest.Matchers.equalTo;
5151
import static org.hamcrest.Matchers.hasSize;
5252
import static org.hamcrest.Matchers.is;
@@ -103,7 +103,7 @@ public void testCreate_AzureOpenAiEmbeddingsModel() throws IOException {
103103
var model = createModel("resource", "deployment", "apiversion", "orig_user", "apikey", null, "id");
104104
model.setUri(new URI(getUrl(webServer)));
105105
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
106-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
106+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
107107
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
108108

109109
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -153,7 +153,7 @@ public void testCreate_AzureOpenAiEmbeddingsModel_WithoutUser() throws IOExcepti
153153
var model = createModel("resource", "deployment", "apiversion", null, "apikey", null, "id");
154154
model.setUri(new URI(getUrl(webServer)));
155155
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
156-
var overriddenTaskSettings = getRequestTaskSettingsMap(null);
156+
var overriddenTaskSettings = createRequestTaskSettingsMap(null);
157157
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
158158

159159
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -209,7 +209,7 @@ public void testCreate_AzureOpenAiEmbeddingsModel_FailsFromInvalidResponseFormat
209209
var model = createModel("resource", "deployment", "apiversion", null, "apikey", null, "id");
210210
model.setUri(new URI(getUrl(webServer)));
211211
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
212-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
212+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
213213
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
214214

215215
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -281,7 +281,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From413StatusC
281281
var model = createModel("resource", "deployment", "apiversion", null, "apikey", null, "id");
282282
model.setUri(new URI(getUrl(webServer)));
283283
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
284-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
284+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
285285
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
286286

287287
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -357,7 +357,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From400StatusC
357357
var model = createModel("resource", "deployment", "apiversion", null, "apikey", null, "id");
358358
model.setUri(new URI(getUrl(webServer)));
359359
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
360-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
360+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
361361
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
362362

363363
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -416,7 +416,7 @@ public void testExecute_TruncatesInputBeforeSending() throws IOException {
416416
var model = createModel("resource", "deployment", "apiversion", null, false, 1, null, null, "apikey", null, "id");
417417
model.setUri(new URI(getUrl(webServer)));
418418
var actionCreator = new AzureOpenAiActionCreator(sender, createWithEmptySettings(threadPool));
419-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
419+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
420420
var action = (AzureOpenAiEmbeddingsAction) actionCreator.create(model, overriddenTaskSettings);
421421

422422
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/action/openai/OpenAiActionCreatorTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import static org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionModelTests.createChatCompletionModel;
4646
import static org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionRequestTaskSettingsTests.getChatCompletionRequestTaskSettingsMap;
4747
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsModelTests.createModel;
48-
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsRequestTaskSettingsTests.getRequestTaskSettingsMap;
48+
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsRequestTaskSettingsTests.createRequestTaskSettingsMap;
4949
import static org.hamcrest.Matchers.equalTo;
5050
import static org.hamcrest.Matchers.hasSize;
5151
import static org.hamcrest.Matchers.is;
@@ -101,7 +101,7 @@ public void testCreate_OpenAiEmbeddingsModel() throws IOException {
101101

102102
var model = createModel(getUrl(webServer), "org", "secret", "model", "user");
103103
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
104-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
104+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
105105
var action = actionCreator.create(model, overriddenTaskSettings);
106106

107107
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -154,7 +154,7 @@ public void testCreate_OpenAiEmbeddingsModel_WithoutUser() throws IOException {
154154

155155
var model = createModel(getUrl(webServer), "org", "secret", "model", null);
156156
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
157-
var overriddenTaskSettings = getRequestTaskSettingsMap(null);
157+
var overriddenTaskSettings = createRequestTaskSettingsMap(null);
158158
var action = actionCreator.create(model, overriddenTaskSettings);
159159

160160
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -206,7 +206,7 @@ public void testCreate_OpenAiEmbeddingsModel_WithoutOrganization() throws IOExce
206206

207207
var model = createModel(getUrl(webServer), null, "secret", "model", null);
208208
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
209-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
209+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
210210
var action = actionCreator.create(model, overriddenTaskSettings);
211211

212212
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -265,7 +265,7 @@ public void testCreate_OpenAiEmbeddingsModel_FailsFromInvalidResponseFormat() th
265265

266266
var model = createModel(getUrl(webServer), null, "secret", "model", null);
267267
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
268-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
268+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
269269
var action = actionCreator.create(model, overriddenTaskSettings);
270270

271271
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -595,7 +595,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From413StatusC
595595

596596
var model = createModel(getUrl(webServer), "org", "secret", "model", "user");
597597
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
598-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
598+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
599599
var action = actionCreator.create(model, overriddenTaskSettings);
600600

601601
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -678,7 +678,7 @@ public void testExecute_ReturnsSuccessfulResponse_AfterTruncating_From400StatusC
678678

679679
var model = createModel(getUrl(webServer), "org", "secret", "model", "user");
680680
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
681-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
681+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
682682
var action = actionCreator.create(model, overriddenTaskSettings);
683683

684684
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
@@ -746,7 +746,7 @@ public void testExecute_TruncatesInputBeforeSending() throws IOException {
746746
// truncated to 1 token = 3 characters
747747
var model = createModel(getUrl(webServer), "org", "secret", "model", "user", 1);
748748
var actionCreator = new OpenAiActionCreator(sender, createWithEmptySettings(threadPool));
749-
var overriddenTaskSettings = getRequestTaskSettingsMap("overridden_user");
749+
var overriddenTaskSettings = createRequestTaskSettingsMap("overridden_user");
750750
var action = actionCreator.create(model, overriddenTaskSettings);
751751

752752
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureopenai/embeddings/AzureOpenAiEmbeddingsRequestTaskSettingsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testFromMap_WhenUserIsEmpty_ThrowsValidationException() {
4343
assertThat(exception.getMessage(), containsString("[user] must be a non-empty string"));
4444
}
4545

46-
public static Map<String, Object> getRequestTaskSettingsMap(@Nullable String user) {
46+
public static Map<String, Object> createRequestTaskSettingsMap(@Nullable String user) {
4747
var map = new HashMap<String, Object>();
4848

4949
if (user != null) {

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsModelTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
import java.util.Map;
1818

19-
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsRequestTaskSettingsTests.getRequestTaskSettingsMap;
19+
import static org.elasticsearch.xpack.inference.services.openai.embeddings.OpenAiEmbeddingsRequestTaskSettingsTests.createRequestTaskSettingsMap;
2020
import static org.hamcrest.Matchers.is;
2121
import static org.hamcrest.Matchers.sameInstance;
2222

2323
public class OpenAiEmbeddingsModelTests extends ESTestCase {
2424

2525
public void testOverrideWith_OverridesUser() {
2626
var model = createModel("url", "org", "api_key", "model_name", null);
27-
var requestTaskSettingsMap = getRequestTaskSettingsMap("user_override");
27+
var requestTaskSettingsMap = createRequestTaskSettingsMap("user_override");
2828

2929
var overriddenModel = OpenAiEmbeddingsModel.of(model, requestTaskSettingsMap);
3030

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsRequestTaskSettingsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void testFromMap_ReturnsUser() {
3232
assertThat(settings.user(), is("user"));
3333
}
3434

35-
public static Map<String, Object> getRequestTaskSettingsMap(@Nullable String user) {
35+
public static Map<String, Object> createRequestTaskSettingsMap(@Nullable String user) {
3636
var map = new HashMap<String, Object>();
3737

3838
if (user != null) {

0 commit comments

Comments
 (0)