apply some review comments, fix merge left over

Signed-off-by: fishbell <[email protected]>

Author: songbell

src/cpp/src/continuous_batching/pipeline.cpp

@@ -28,14 +28,15 @@ struct Eagle3RTInfo {
 };
 
 Eagle3RTInfo
-extract_eagle_mode_from_config(ov::AnyMap& config, const std::filesystem::path& models_path) {
+extract_eagle3_mode_from_config(ov::AnyMap& config, const std::filesystem::path& models_path) {
     Eagle3RTInfo eagle_rt_info;
     if (config.find("eagle3_mode") != config.end()) {
         eagle_rt_info.eagle3_mode = config.at("eagle3_mode").as<bool>();
         config.erase("eagle3_mode");
-        if (config.find("hidden_layers_list") != config.end()) {
+        auto it = config.find("hidden_layers_list");
+        if (it != config.end()) {
             try {
-                eagle_rt_info.hidden_layers_list = config.at("hidden_layers_list").as<std::vector<int>>();
+                eagle_rt_info.hidden_layers_list = it->second.as<std::vector<int>>();
                 config.erase("hidden_layers_list");
             } catch (const std::exception&) {
                 OPENVINO_THROW("please check the hidden layers input");

tests/python_tests/utils/hugging_face.py

@@ -232,16 +232,10 @@ def convert_models(
     opt_model.config.save_pretrained(str(models_path))
 
     # to store tokenizer config jsons with special tokens
-<<<<<<< HEAD
     if hf_tokenizer:
         hf_tokenizer.save_pretrained(models_path)
         # convert tokenizers as well
-        convert_and_save_tokenizer(hf_tokenizer, models_path, **tokenizer_kwargs)
-=======
-    hf_tokenizer.save_pretrained(str(models_path))
-    # convert tokenizers as well
-    convert_and_save_tokenizer(hf_tokenizer, models_path)
->>>>>>> eb64c87ebc885499f7fafb38e576dce4b7010495
+        convert_and_save_tokenizer(hf_tokenizer, models_path)
 
 
 def download_and_convert_model(model_id: str, **tokenizer_kwargs) -> OVConvertedModelSchema: