Skip to content

Commit c3a8716

Browse files
Fix tests and typos
1 parent 0aa8da8 commit c3a8716

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* This class encapsulates the model ID and rate limit settings for the Mistral chat completion service.
3434
*/
3535
public class MistralChatCompletionServiceSettings extends FilteredXContentObject implements ServiceSettings {
36-
public static final String NAME = "mistral_embeddings_service_settings";
36+
public static final String NAME = "mistral_completions_service_settings";
3737

3838
private final String modelId;
3939
private final RateLimitSettings rateLimitSettings;

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekServiceTests.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import static org.elasticsearch.xcontent.ToXContent.EMPTY_PARAMS;
5555
import static org.elasticsearch.xpack.inference.Utils.inferenceUtilityPool;
5656
import static org.elasticsearch.xpack.inference.Utils.mockClusterServiceEmpty;
57+
import static org.elasticsearch.xpack.inference.external.http.Utils.getUrl;
5758
import static org.elasticsearch.xpack.inference.services.ServiceComponentsTests.createWithEmptySettings;
5859
import static org.hamcrest.CoreMatchers.is;
5960
import static org.hamcrest.Matchers.equalTo;
@@ -276,8 +277,10 @@ public void testUnifiedCompletionError() {
276277
assertThat(
277278
e.getMessage(),
278279
equalTo(
279-
"Received an unsuccessful status code for request from inference entity id [inference-id] status"
280-
+ " [404]. Error message: [The model `deepseek-not-chat` does not exist or you do not have access to it.]"
280+
"Resource not found at ["
281+
+ getUrl(webServer)
282+
+ "] for request from inference entity id [inference-id]"
283+
+ " status [404]. Error message: [The model `deepseek-not-chat` does not exist or you do not have access to it.]"
281284
)
282285
);
283286
}

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import java.util.EnumSet;
6767
import java.util.HashMap;
6868
import java.util.List;
69+
import java.util.Locale;
6970
import java.util.Map;
7071
import java.util.concurrent.CountDownLatch;
7172
import java.util.concurrent.TimeUnit;
@@ -377,15 +378,14 @@ public void testUnifiedCompletionNonStreamingError() throws Exception {
377378
}
378379
});
379380
var json = XContentHelper.convertToJson(BytesReference.bytes(builder), false, builder.contentType());
380-
381-
assertThat(json, is("""
381+
assertThat(json, is(String.format(Locale.ROOT, """
382382
{\
383383
"error":{\
384384
"code":"not_found",\
385-
"message":"Received an unsuccessful status code for request from inference entity id [id] status \
385+
"message":"Resource not found at [%s] for request from inference entity id [id] status \
386386
[404]. Error message: [Model not found.]",\
387387
"type":"hugging_face_error"\
388-
}}"""));
388+
}}""", getUrl(webServer))));
389389
} catch (IOException ex) {
390390
throw new RuntimeException(ex);
391391
}

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/OpenAiResponseHandlerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void testCheckForFailureStatusCode() {
100100
assertFalse(retryException.shouldRetry());
101101
assertThat(
102102
retryException.getCause().getMessage(),
103-
containsString("Received an unsuccessful status code for request from inference entity id [id] status [400]")
103+
containsString("Received a bad request status code for request from inference entity id [id] status [400]")
104104
);
105105
assertThat(((ElasticsearchStatusException) retryException.getCause()).status(), is(RestStatus.BAD_REQUEST));
106106
// 400 is not flagged as a content too large when the error message is different
@@ -112,7 +112,7 @@ public void testCheckForFailureStatusCode() {
112112
assertFalse(retryException.shouldRetry());
113113
assertThat(
114114
retryException.getCause().getMessage(),
115-
containsString("Received an unsuccessful status code for request from inference entity id [id] status [400]")
115+
containsString("Received a bad request status code for request from inference entity id [id] status [400]")
116116
);
117117
assertThat(((ElasticsearchStatusException) retryException.getCause()).status(), is(RestStatus.BAD_REQUEST));
118118
// 401

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/OpenAiServiceTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import java.util.EnumSet;
6666
import java.util.HashMap;
6767
import java.util.List;
68+
import java.util.Locale;
6869
import java.util.concurrent.CountDownLatch;
6970
import java.util.concurrent.TimeUnit;
7071

@@ -1153,14 +1154,14 @@ public void testUnifiedCompletionError() throws Exception {
11531154
});
11541155
var json = XContentHelper.convertToJson(BytesReference.bytes(builder), false, builder.contentType());
11551156

1156-
assertThat(json, is("""
1157+
assertThat(json, is(String.format(Locale.ROOT, """
11571158
{\
11581159
"error":{\
11591160
"code":"model_not_found",\
1160-
"message":"Received an unsuccessful status code for request from inference entity id [id] status \
1161+
"message":"Resource not found at [%s] for request from inference entity id [id] status \
11611162
[404]. Error message: [The model `gpt-4awero` does not exist or you do not have access to it.]",\
11621163
"type":"invalid_request_error"\
1163-
}}"""));
1164+
}}""", getUrl(webServer))));
11641165
} catch (IOException ex) {
11651166
throw new RuntimeException(ex);
11661167
}

0 commit comments

Comments
 (0)