diff options
| author | Lester Solbakken <lesters@users.noreply.github.com> | 2018-09-20 15:25:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 15:25:51 +0200 |
| commit | 75aec1d370b592e68c8003f2504ba604375ea1d4 (patch) | |
| tree | 4d2d97b2406ac29474e1faef32c160b36d66ff3c /config-model | |
| parent | 4f512ac0ce3b1086eed80ad3f0d237781a18c70d (diff) | |
| parent | 561814bd8d3e374fbdfc22823cb87a178d6e5838 (diff) | |
Merge pull request #7014 from vespa-engine/lesters/model-eval-throw-on-error
Lesters/model eval throw on error
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java index 11736256d1b..812c38db2fd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.container; import ai.vespa.models.evaluation.ModelsEvaluator; -import ai.vespa.models.handler.ModelsEvaluationHandler; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.searchdefinition.derived.RankProfileList; import com.yahoo.vespa.config.search.RankProfilesConfig; @@ -19,9 +18,10 @@ import java.util.Objects; */ public class ContainerModelEvaluation implements RankProfilesConfig.Producer, RankingConstantsConfig.Producer { - private final static String EVALUATOR_NAME = ModelsEvaluator.class.getName(); - private final static String REST_HANDLER_NAME = ModelsEvaluationHandler.class.getName(); private final static String BUNDLE_NAME = "model-evaluation"; + private final static String EVALUATOR_NAME = ModelsEvaluator.class.getName(); + private final static String REST_HANDLER_NAME = "ai.vespa.models.handler.ModelsEvaluationHandler"; + private final static String REST_BINDING = "model-evaluation/v1"; /** Global rank profiles, aka models */ private final RankProfileList rankProfileList; @@ -48,11 +48,10 @@ public class ContainerModelEvaluation implements RankProfilesConfig.Producer, Ra public static Handler<?> getHandler() { Handler<?> handler = new Handler<>(new ComponentModel(REST_HANDLER_NAME, null, BUNDLE_NAME)); - String binding = ModelsEvaluationHandler.API_ROOT + "/" + ModelsEvaluationHandler.VERSION_V1; - handler.addServerBindings("http://*/" + binding, - "https://*/" + binding, - "http://*/" + binding + "/*", - "https://*/" + binding + "/*"); + handler.addServerBindings("http://*/" + REST_BINDING, + "https://*/" + REST_BINDING, + "http://*/" + REST_BINDING + "/*", + "https://*/" + REST_BINDING + "/*"); return handler; } |