Revert "Revert "Unify access to assets needed during rank-setup.""

1 files changed, 27 insertions, 17 deletions

diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index dcfbc34653d..43d0b709a1b 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
@@ -18,6 +18,7 @@
 #include <vespa/searchcore/config/config-onnx-models.h>
 #include <vespa/searchcore/proton/matching/indexenvironment.h>
 #include <vespa/searchcore/proton/matching/ranking_expressions.h>
+#include <vespa/searchcore/proton/matching/onnx_models.h>
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/fef/test/plugin/setup.h>
@@ -32,7 +33,7 @@ using config::ConfigRuntimeException;
 using config::ConfigSubscriber;
 using config::IConfigContext;
 using config::InvalidConfigException;
-using proton::matching::IConstantValueRepo;
+using proton::matching::IRankingAssetsRepo;
 using proton::matching::RankingExpressions;
 using proton::matching::OnnxModels;
 using vespa::config::search::AttributesConfig;
@@ -91,7 +92,7 @@ make_models(const OnnxModelsConfig &modelsCfg, const VerifyRanksetupConfig &myCf
                                       entry.name.c_str(), entry.fileref.c_str()));
         }
     }
-    return OnnxModels(model_list);
+    return OnnxModels(std::move(model_list));
 }
 
 class VerifyRankSetup
@@ -100,9 +101,7 @@ private:
     std::vector<search::fef::Message> _messages;
     bool verify(const search::index::Schema &schema,
                 const search::fef::Properties &props,
-                const IConstantValueRepo &repo,
-                const RankingExpressions &expressions,
-                const OnnxModels &models);
+                const IRankingAssetsRepo &repo);
 
     bool verifyConfig(const VerifyRanksetupConfig &myCfg,
                       const RankProfilesConfig &rankCfg,
@@ -119,14 +118,28 @@ public:
     bool verify(const std::string & configId);
 };
 
-struct DummyConstantValueRepo : IConstantValueRepo {
+struct DummyRankingAssetsRepo : IRankingAssetsRepo {
     const RankingConstantsConfig &cfg;
-    DummyConstantValueRepo(const RankingConstantsConfig &cfg_in) : cfg(cfg_in) {}
+    RankingExpressions _expressions;
+    OnnxModels _onnxModels;
+    DummyRankingAssetsRepo(const RankingConstantsConfig &cfg_in, RankingExpressions expressions, OnnxModels onnxModels)
+        : cfg(cfg_in),
+          _expressions(std::move(expressions)),
+          _onnxModels(std::move(onnxModels))
+    {}
     vespalib::eval::ConstantValue::UP getConstant(const vespalib::string &name) const override;
+
+    vespalib::string getExpression(const vespalib::string & name) const override {
+        return _expressions.loadExpression(name);
+    }
+
+    const search::fef::OnnxModel *getOnnxModel(const vespalib::string & name) const override {
+        return _onnxModels.getModel(name);
+    }
 };
 
 vespalib::eval::ConstantValue::UP
-DummyConstantValueRepo::getConstant(const vespalib::string &name) const {
+DummyRankingAssetsRepo::getConstant(const vespalib::string &name) const {
     for (const auto &entry: cfg.constant) {
         if (entry.name == name) {
             try {
@@ -137,7 +150,7 @@ DummyConstantValueRepo::getConstant(const vespalib::string &name) const {
             }
         }
     }
-    return vespalib::eval::ConstantValue::UP(nullptr);
+    return {};
 }
 
 VerifyRankSetup::VerifyRankSetup()
@@ -149,11 +162,9 @@ VerifyRankSetup::~VerifyRankSetup() = default;
 bool
 VerifyRankSetup::verify(const search::index::Schema &schema,
             const search::fef::Properties &props,
-            const IConstantValueRepo &repo,
-            const RankingExpressions &expressions,
-            const OnnxModels &models)
+            const IRankingAssetsRepo &repo)
 {
-    proton::matching::IndexEnvironment indexEnv(0, schema, props, repo, expressions, models);
+    proton::matching::IndexEnvironment indexEnv(0, schema, props, repo);
     search::fef::BlueprintFactory factory;
     search::features::setup_search_features(factory);
     search::fef::test::setup_fef_test_plugin(factory);
@@ -192,9 +203,8 @@ VerifyRankSetup::verifyConfig(const VerifyRanksetupConfig &myCfg,
     search::index::Schema schema;
     search::index::SchemaBuilder::build(schemaCfg, schema);
     search::index::SchemaBuilder::build(attributeCfg, schema);
-    DummyConstantValueRepo repo(constantsCfg);
-    auto expressions = make_expressions(expressionsCfg, myCfg, _messages);
-    auto models = make_models(modelsCfg, myCfg, _messages);
+    DummyRankingAssetsRepo repo(constantsCfg, make_expressions(expressionsCfg, myCfg, _messages),
+                                make_models(modelsCfg, myCfg, _messages));
     for(size_t i = 0; i < rankCfg.rankprofile.size(); i++) {
         search::fef::Properties properties;
         const RankProfilesConfig::Rankprofile &profile = rankCfg.rankprofile[i];
@@ -202,7 +212,7 @@ VerifyRankSetup::verifyConfig(const VerifyRanksetupConfig &myCfg,
             properties.add(profile.fef.property[j].name,
                            profile.fef.property[j].value);
         }
-        if (verify(schema, properties, repo, expressions, models)) {
+        if (verify(schema, properties, repo)) {
             _messages.emplace_back(search::fef::Level::INFO,
                                    fmt("rank profile '%s': pass", profile.name.c_str()));
         } else {