Skip to content

Commit 8685ddd

Browse files
Addressing feedback for validation exception
1 parent 90d2320 commit 8685ddd

File tree

6 files changed

+5
-9
lines changed

6 files changed

+5
-9
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/CompletionResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class CompletionResponseParser extends BaseCustomResponseParser<ChatCompl
3333
public static CompletionResponseParser fromMap(Map<String, Object> responseParserMap, ValidationException validationException) {
3434
var path = extractRequiredString(responseParserMap, COMPLETION_PARSER_RESULT, JSON_PARSER, validationException);
3535

36-
if (path == null) {
36+
if (validationException.validationErrors().isEmpty() == false) {
3737
throw validationException;
3838
}
3939

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/ErrorResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class ErrorResponseParser implements ToXContentFragment, Function<HttpRes
3838
public static ErrorResponseParser fromMap(Map<String, Object> responseParserMap, ValidationException validationException) {
3939
var path = extractRequiredString(responseParserMap, MESSAGE_PATH, ERROR_PARSER, validationException);
4040

41-
if (path == null) {
41+
if (validationException.validationErrors().isEmpty() == false) {
4242
throw validationException;
4343
}
4444

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/NoopResponseParser.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ public static NoopResponseParser fromMap() {
2424
return new NoopResponseParser();
2525
}
2626

27-
public NoopResponseParser() {
28-
29-
}
30-
3127
public NoopResponseParser(StreamInput in) {
3228
this();
3329
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/RerankResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static RerankResponseParser fromMap(Map<String, Object> responseParserMap
4343
var rerankIndex = extractOptionalString(responseParserMap, RERANK_PARSER_INDEX, JSON_PARSER, validationException);
4444
var documentText = extractOptionalString(responseParserMap, RERANK_PARSER_DOCUMENT_TEXT, JSON_PARSER, validationException);
4545

46-
if (relevanceScore == null) {
46+
if (validationException.validationErrors().isEmpty() == false) {
4747
throw validationException;
4848
}
4949

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/SparseEmbeddingResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static SparseEmbeddingResponseParser fromMap(Map<String, Object> response
4040

4141
var weightPath = extractRequiredString(responseParserMap, SPARSE_EMBEDDING_WEIGHT_PATH, JSON_PARSER, validationException);
4242

43-
if (tokenPath == null || weightPath == null) {
43+
if (validationException.validationErrors().isEmpty() == false) {
4444
throw validationException;
4545
}
4646

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/TextEmbeddingResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class TextEmbeddingResponseParser extends BaseCustomResponseParser<TextEm
3333
public static TextEmbeddingResponseParser fromMap(Map<String, Object> responseParserMap, ValidationException validationException) {
3434
var path = extractRequiredString(responseParserMap, TEXT_EMBEDDING_PARSER_EMBEDDINGS, JSON_PARSER, validationException);
3535

36-
if (path == null) {
36+
if (validationException.validationErrors().isEmpty() == false) {
3737
throw validationException;
3838
}
3939

0 commit comments

Comments
 (0)