Skip to content

Commit fb65574

Browse files
authored
Merge pull request #35893 from vespa-engine/arnej/locale-model-evaluation
Make model-evaluation locale-independent
2 parents 1f30224 + 0c6810c commit fb65574

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private HttpResponse evaluateModel(HttpRequest request, Model model, String[] fu
103103
}
104104
}
105105
Tensor result = evaluator.evaluate();
106-
return switch (property(request, "format.tensors").orElse("short").toLowerCase()) {
106+
return switch (property(request, "format.tensors").orElse("short").toLowerCase(java.util.Locale.ROOT)) {
107107
case "short" -> new Response(200, JsonFormat.encode(result, true, false));
108108
case "long" -> new Response(200, JsonFormat.encode(result, false, false));
109109
case "short-value" -> new Response(200, JsonFormat.encode(result, true, true));
@@ -205,7 +205,7 @@ public String[] range(int start, Optional<Integer> end) {
205205
}
206206

207207
private static String[] splitPath(HttpRequest request) {
208-
String path = request.getUri().getPath().toLowerCase();
208+
String path = request.getUri().getPath().toLowerCase(java.util.Locale.ROOT);
209209
if (path.startsWith("/")) {
210210
path = path.substring("/".length());
211211
}

model-evaluation/src/test/java/ai/vespa/models/handler/HandlerTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void assertResponse(HttpRequest request, int expectedCode, Tensor expectedResult
130130
private String getContents(HttpResponse response) {
131131
try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
132132
response.render(stream);
133-
return stream.toString();
133+
return stream.toString(StandardCharsets.UTF_8);
134134
} catch (IOException e) {
135135
throw new Error(e);
136136
}

0 commit comments

Comments
 (0)