diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-06 09:36:51 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-06 09:36:51 +0200 |
commit | 3344c999c2721b75666e2e49f7fd6f15c9fe1353 (patch) | |
tree | 1d0084ff7c5037774d8740ce9dd5a7777c9367f7 /model-evaluation | |
parent | 3e1ef49b358ef027311d1d44d846695ea46125b8 (diff) |
Expression file references in Vespa models
Diffstat (limited to 'model-evaluation')
-rw-r--r-- | model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java index ea2ce087bd8..4ae96bfd62f 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java +++ b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java @@ -45,15 +45,13 @@ public class ModelsEvaluationHandler extends ThreadedHttpRequestHandler { Optional<String> modelName = path.segment(2); try { - if ( ! apiName.isPresent() || ! apiName.get().equalsIgnoreCase(API_ROOT)) { + if ( apiName.isEmpty() || ! apiName.get().equalsIgnoreCase(API_ROOT)) throw new IllegalArgumentException("unknown API"); - } - if ( ! version.isPresent() || ! version.get().equalsIgnoreCase(VERSION_V1)) { + if ( version.isEmpty() || ! version.get().equalsIgnoreCase(VERSION_V1)) throw new IllegalArgumentException("unknown API version"); - } - if ( ! modelName.isPresent()) { + if ( modelName.isEmpty()) return listAllModels(request); - } + Model model = modelsEvaluator.requireModel(modelName.get()); Optional<Integer> evalSegment = path.lastIndexOf(EVALUATE); |