fix

Author: michalkulakowski

src/cli_parser.cpp

@@ -443,10 +443,16 @@ void CLIParser::prepareGraph(HFSettingsImpl& hfSettings, const std::string& mode
             hfSettings.pullHfAndStartModelMode = true;
         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>();
-        if (result->count("model_repository_path"))
+        } else {
+            throw std::logic_error("source_model parameter is required for pull mode");
+        }
+        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

@@ -86,12 +86,17 @@ bool Config::check_hostname_or_ip(const std::string& input) {
 }
 
 bool Config::validate() {
-    // TODO: CVS-166727 Add validation of all parameters once the CLI model export flags will be implemented
     if (this->serverSettings.hfSettings.pullHfModelMode) {
         if (this->serverSettings.hfSettings.task == unknown) {
             std::cerr << "Error: --task parameter not set." << std::endl;
             return false;
         }
+#if (PYTHON_DISABLE == 1)
+        if (serverSettings.hfSettings.sourceModel.rfind("OpenVINO/", 0) != 0) {
+            std::cerr << "For now OVMS version without python supports pulling OpenVINO models only";
+            return false;
+        }
+#endif
         if (this->serverSettings.hfSettings.task == text_generation) {
             if (!std::holds_alternative<TextGenGraphSettingsImpl>(this->serverSettings.hfSettings.graphSettings)) {
                 std::cerr << "Graph options not initialized for text generation.";
@@ -127,11 +132,6 @@ bool Config::validate() {
                     return false;
                 }
             }
-
-            if (serverSettings.hfSettings.sourceModel.rfind("OpenVINO/", 0) != 0) {
-                std::cerr << "For now only OpenVINO models are supported";
-                return false;
-            }
         }
 
         if (this->serverSettings.hfSettings.task == embeddings) {

src/graph_export/graph_export.cpp

@@ -125,7 +125,7 @@ static Status createTextGenerationGraphTemplate(const std::string& directoryPath
     ::mediapipe::CalculatorGraphConfig config;
     bool success = ::google::protobuf::TextFormat::ParseFromString(oss.str(), &config);
     if (!success) {
-        SPDLOG_ERROR("Created graph config couldn't be parsed.");
+        SPDLOG_ERROR("Created graph config couldn't be parsed - some parameters values are invalid.");
         return StatusCode::MEDIAPIPE_GRAPH_CONFIG_FILE_INVALID;
     }
     // clang-format on

src/test/ovmsconfig_test.cpp

@@ -540,6 +540,34 @@ TEST_F(OvmsConfigDeathTest, hfBadEmbeddingsGraphNoPort) {
     EXPECT_EXIT(ovms::Config::instance().parse(arg_count, n_argv), ::testing::ExitedWithCode(OVMS_EX_USAGE), "port and rest_port cannot both be unset");
 }
 
+TEST_F(OvmsConfigDeathTest, hfPullNoSourceModel) {
+    char* n_argv[] = {
+        "ovms",
+        "--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");
+}
+
+TEST_F(OvmsConfigDeathTest, hfPullNoSourceModelRepositoryPath) {
+    char* n_argv[] = {
+        "ovms",
+        "--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");
+}
+
 TEST(OvmsGraphConfigTest, positiveAllChanged) {
     std::string modelName = "OpenVINO/Phi-3-mini-FastDraft-50M-int8-ov";
     std::string downloadPath = "test/repository";