rename model name for in memory graph

Author: dtrawins

src/capi_frontend/server_settings.hpp

@@ -90,7 +90,7 @@ enum OvmsServerMode : int {
     HF_PULL_AND_START_MODE,
     LIST_MODELS_MODE,
     MODIFY_CONFIG_MODE,
-    GENAI_CONFIGURE_AND_START,
+    IN_MEMORY_GRAPH_MODE,
     UNKNOWN_MODE
 };
 

src/cli_parser.cpp

@@ -711,7 +711,7 @@ void CLIParser::prepareGraph(ServerSettingsImpl& serverSettings, HFSettingsImpl&
     // Ovms Pull models mode || pull and start models mode
     if (isHFPullOrPullAndStart(this->result) || isGenAIConfigureAndStart(this->result)) {
         if (isGenAIConfigureAndStart(this->result)) {
-            serverSettings.serverMode = GENAI_CONFIGURE_AND_START;
+            serverSettings.serverMode = IN_MEMORY_GRAPH_MODE;
         } else if (result->count("pull")) {
             serverSettings.serverMode = HF_PULL_MODE;
         } else {

src/config.cpp

@@ -152,9 +152,9 @@ bool Config::validate() {
         std::cerr << "--source_model should be used combined with --task" << std::endl;
         return false;
     }
-    if (this->serverSettings.serverMode == HF_PULL_MODE || this->serverSettings.serverMode == HF_PULL_AND_START_MODE || this->serverSettings.serverMode == GENAI_CONFIGURE_AND_START) {
+    if (this->serverSettings.serverMode == HF_PULL_MODE || this->serverSettings.serverMode == HF_PULL_AND_START_MODE || this->serverSettings.serverMode == IN_MEMORY_GRAPH_MODE) {
         // When --task is used with --model_path (no HF pulling), sourceModel and downloadPath are not required
-        bool taskWithModelPath = this->serverSettings.serverMode == GENAI_CONFIGURE_AND_START && !this->modelsSettings.modelPath.empty();
+        bool taskWithModelPath = this->serverSettings.serverMode == IN_MEMORY_GRAPH_MODE && !this->modelsSettings.modelPath.empty();
         if (!taskWithModelPath) {
             if (!serverSettings.hfSettings.sourceModel.size()) {
                 std::cerr << "source_model parameter is required for pull mode";

src/mediapipe_internal/mediapipegraphdefinition.cpp

@@ -62,7 +62,7 @@ const tensor_map_t MediapipeGraphDefinition::getOutputsInfo() const {
 }
 
 Status MediapipeGraphDefinition::validateForConfigFileExistence() {
-    if (GraphExport::hasInMemoryGraphContent() && ovms::Config::instance().getServerSettings().serverMode == GENAI_CONFIGURE_AND_START) {
+    if (GraphExport::hasInMemoryGraphContent() && ovms::Config::instance().getServerSettings().serverMode == IN_MEMORY_GRAPH_MODE) {
         const std::string& content = GraphExport::getInMemoryGraphContent();
         this->chosenConfig = content;
         this->mgconfig.setCurrentGraphPbTxtMD5(ovms::FileSystem::getStringMD5(content));

src/modelmanager.cpp

@@ -229,7 +229,7 @@ Status ModelManager::startFromConfig() {
 
     std::vector<MediapipeGraphConfig> mediapipesInConfigFile;
     std::ifstream ifs(mpConfig.getGraphPath());
-    bool graphAvailable = ifs.is_open() || (GraphExport::hasInMemoryGraphContent() && config.getServerSettings().serverMode == GENAI_CONFIGURE_AND_START);
+    bool graphAvailable = ifs.is_open() || (GraphExport::hasInMemoryGraphContent() && config.getServerSettings().serverMode == IN_MEMORY_GRAPH_MODE);
     if (graphAvailable) {
         // Single model with graph.pbtxt, check if user passed model unsupported model parameters in cmd arguments
         status = ModelManager::validateUserSettingsInSingleModelCliGraphStart(config.getModelSettings());
@@ -408,7 +408,7 @@ bool ModelManager::CheckStartFromGraph(std::string inputPath, MediapipeGraphConf
         SPDLOG_LOGGER_DEBUG(modelmanager_logger, "Graph: {} path: {} exists", mpConfig.getGraphName(), mpConfig.getGraphPath());
         return true;
     }
-    if (GraphExport::hasInMemoryGraphContent() && Config::instance().getServerSettings().serverMode == GENAI_CONFIGURE_AND_START) {
+    if (GraphExport::hasInMemoryGraphContent() && Config::instance().getServerSettings().serverMode == IN_MEMORY_GRAPH_MODE) {
         SPDLOG_LOGGER_DEBUG(modelmanager_logger, "Graph: {} using in-memory graph content", mpConfig.getGraphName());
         return true;
     }

src/server.cpp

@@ -424,7 +424,7 @@ Status Server::startModules(ovms::Config& config) {
         if (!status.ok())
             return status;
     }
-    if (config.getServerSettings().serverMode == GENAI_CONFIGURE_AND_START) {
+    if (config.getServerSettings().serverMode == IN_MEMORY_GRAPH_MODE) {
         // --task with --model_path: create graph in memory without HF download
         GraphExport graphExporter;
         const auto& hfSettings = config.getServerSettings().hfSettings;
@@ -546,7 +546,7 @@ int Server::startServerFromSettings(ServerSettingsImpl& serverSettings, ModelsSe
             return statusToExitCode(ret);
         }
         while (!getShutdownStatus() &&
-               (serverSettings.serverMode == HF_PULL_AND_START_MODE || serverSettings.serverMode == SERVING_MODELS_MODE || serverSettings.serverMode == GENAI_CONFIGURE_AND_START)) {
+               (serverSettings.serverMode == HF_PULL_AND_START_MODE || serverSettings.serverMode == SERVING_MODELS_MODE || serverSettings.serverMode == IN_MEMORY_GRAPH_MODE)) {
             std::this_thread::sleep_for(std::chrono::milliseconds(200));
         }
     } catch (const std::exception& e) {