fix

Author: michalkulakowski

src/cli_parser.cpp

@@ -470,16 +470,10 @@ void CLIParser::prepareGraph(ServerSettingsImpl& serverSettings, HFSettingsImpl&
 
         if (result->count("overwrite_models"))
             hfSettings.overwriteModels = result->operator[]("overwrite_models").as<bool>();
-        if (result->count("source_model")){
+        if (result->count("source_model"))
             hfSettings.sourceModel = result->operator[]("source_model").as<std::string>();
-        } else {
-            throw std::logic_error("source_model parameter is required for pull mode");
-        }
-        if (result->count("model_repository_path")){
+        if (result->count("model_repository_path"))
             hfSettings.downloadPath = result->operator[]("model_repository_path").as<std::string>();
-        } else {
-             throw std::logic_error("model_repository_path parameter is required for pull mode");
-        }
         if (result->count("task")) {
             hfSettings.task = stringToEnum(result->operator[]("task").as<std::string>());
             switch (hfSettings.task) {

src/config.cpp

@@ -87,6 +87,14 @@ bool Config::check_hostname_or_ip(const std::string& input) {
 
 bool Config::validate() {
     if (this->serverSettings.serverMode == HF_PULL_MODE) {
+        if (!serverSettings.hfSettings.sourceModel.size()){
+            std::cerr << "source_model parameter is required for pull mode";
+            return false;
+        }
+        if (!serverSettings.hfSettings.downloadPath.size()){
+            std::cerr << "model_repository_path parameter is required for pull mode";
+            return false;
+        }
         if (this->serverSettings.hfSettings.task == UNKNOWN_GRAPH) {
             std::cerr << "Error: --task parameter not set." << std::endl;
             return false;

src/test/ovmsconfig_test.cpp

@@ -604,29 +604,31 @@ TEST_F(OvmsConfigDeathTest, modifyModelConfigDisableMissingModelNameWithPath) {
 TEST_F(OvmsConfigDeathTest, hfPullNoSourceModel) {
     char* n_argv[] = {
         "ovms",
+        "--pull",
         "--model_repository_path",
         "/some/path",
         "--task",
         "embeddings",
         "--normalize",
         "true",
     };
-    int arg_count = 7;
-    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "port and rest_port cannot both be unset");
+    int arg_count = 8;
+    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "source_model parameter is required for pull mode");
 }
 
-TEST_F(OvmsConfigDeathTest, hfPullNoSourceModelRepositoryPath) {
+TEST_F(OvmsConfigDeathTest, hfPullNoRepositoryPath) {
     char* n_argv[] = {
         "ovms",
+        "--pull",
         "--source_model",
         "some/model",
         "--task",
         "embeddings",
         "--normalize",
         "true",
     };
-    int arg_count = 7;
-    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "port and rest_port cannot both be unset");
+    int arg_count = 8;
+    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "model_repository_path parameter is required for pull mode");
 }
 
 TEST(OvmsGraphConfigTest, positiveAllChanged) {
@@ -948,7 +950,7 @@ TEST(OvmsGraphConfigTest, negativeSourceModel) {
     };
 
     int arg_count = 6;
-    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "For now only OpenVINO models are supported");
+    EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "or now OVMS version without python supports pulling OpenVINO models only");
 }
 
 TEST(OvmsGraphConfigTest, positiveAllChangedRerank) {