fix test

Author: sbalandi

src/cpp/src/visual_language/inputs_embedder.cpp

@@ -21,7 +21,6 @@ namespace ov::genai {
 
 // Base InputsEmbedder class
 
-
 std::pair<ov::Tensor, std::optional<int64_t>> InputsEmbedder::IInputsEmbedder::get_position_ids(const size_t inputs_embeds_size, const size_t history_size) {
     ov::Tensor position_ids = ov::Tensor{ov::element::i64, { 1, inputs_embeds_size }};
     std::iota(position_ids.data<int64_t>(), position_ids.data<int64_t>() + position_ids.get_size(), history_size);

tests/python_tests/test_vlm_pipeline.py

@@ -222,7 +222,10 @@ def test_vlm_with_scheduler_vs_default(config, cache):
 @pytest.mark.nightly
 @pytest.mark.parametrize("model_id", model_ids)
 @pytest.mark.parametrize("system_message", ["", "You are a helpful assistant."])
-def test_vlm_pipeline_chat(model_id, system_message, cache):
+@pytest.mark.parametrize("iteration_images", [[image_links_for_testing[0], image_links_for_testing[0]], [image_links_for_testing[0], image_links_for_testing[2], image_links_for_testing[0]],
+                                              [image_links_for_testing[1], image_links_for_testing[1]], [image_links_for_testing[1], image_links_for_testing[1], image_links_for_testing[1]],
+                                              [image_links_for_testing[2], image_links_for_testing[1]], [image_links_for_testing[2], image_links_for_testing[0], image_links_for_testing[1]]])
+def test_vlm_pipeline_chat(model_id, system_message, iteration_images, cache):
     def streamer(word: str) -> bool:
         nonlocal result_from_streamer
         result_from_streamer.append(word)
@@ -234,23 +237,26 @@ def streamer(word: str) -> bool:
     generation_config.max_new_tokens = 30
     generation_config.set_eos_token_id(ov_pipe.get_tokenizer().get_eos_token_id())
 
-    for links in image_links_for_testing:
+    ov_pipe.start_chat(system_message)
+
+    images = []
+    for link in iteration_images[0]:
+        images.append(get_image_by_link(link))
+
+    result_from_streamer = []
+    res = ov_pipe.generate(prompts[0], images=images, generation_config=generation_config, streamer=streamer)
+    assert res.texts[0] == ''.join(result_from_streamer)
+
+    for image_set in iteration_images[1:]:
         images = []
-        for link in links:
+        for link in image_set:
             images.append(get_image_by_link(link))
 
-        ov_pipe.start_chat(system_message)
-
         result_from_streamer = []
-        res = ov_pipe.generate(prompts[0], images=images, generation_config=generation_config, streamer=streamer)
+        res = ov_pipe.generate(prompts[1], images=images, generation_config=generation_config, streamer=streamer)
         assert res.texts[0] == ''.join(result_from_streamer)
 
-        for prompt in prompts[1:]:
-            result_from_streamer = []
-            res = ov_pipe.generate(prompt, generation_config=generation_config, streamer=streamer)
-            assert res.texts[0] == ''.join(result_from_streamer)
-
-        ov_pipe.finish_chat()
+    ov_pipe.finish_chat()
 
 
 @pytest.mark.precommit
@@ -354,6 +360,7 @@ def streamer(subword):
     generation_config = ov_pipe.get_generation_config()
     generation_config.max_new_tokens = 30
     generation_config.set_eos_token_id(ov_pipe.get_tokenizer().get_eos_token_id())
+    generation_config.ignore_eos = True
 
     images = []
     for link in iteration_images:
@@ -362,21 +369,18 @@ def streamer(subword):
     results_with_cancel = ""
     ov_pipe.start_chat()
     results_with_cancel += ov_pipe.generate(callback_questions[0], images=images, generation_config=generation_config).texts[0]
-
-    generation_config.ignore_eos = True
+    # doesn't add to results_with_cancel as it should be complitely removed from the history
     ov_pipe.generate(callback_questions[1], images=images, generation_config=generation_config, streamer=streamer)
     results_with_cancel += ov_pipe.generate(callback_questions[2], images=images, generation_config=generation_config).texts[0]
     ov_pipe.finish_chat()
-    
+
     results = ""
     ov_pipe.start_chat()
     results += ov_pipe.generate(callback_questions[0], images=images, generation_config=generation_config).texts[0]
-
-    generation_config.ignore_eos = True
     results += ov_pipe.generate(callback_questions[2], images=images, generation_config=generation_config).texts[0]
     ov_pipe.finish_chat()
 
-    assert(results_with_cancel == results)
+    assert results_with_cancel == results
 
 
 @pytest.mark.precommit
@@ -413,34 +417,4 @@ def streamer(subword):
     res_second = ov_pipe.generate(callback_questions[0], images=images, generation_config=generation_config, streamer=streamer).texts[0]
     ov_pipe.finish_chat()
 
-    assert(res_first == res_second)
-
-
-@pytest.mark.precommit
-@pytest.mark.nightly
-@pytest.mark.parametrize("model_id", model_ids)
-@pytest.mark.parametrize("iteration_images", [[[], image_links_for_testing[1]], [image_links_for_testing[1], image_links_for_testing[1]], [[], image_links_for_testing[1], []]])
-def test_vlm_pipeline_chat_image_combination(model_id, iteration_images, cache):
-    def streamer(word: str) -> bool:
-        nonlocal result_from_streamer
-        result_from_streamer.append(word)
-        return False
-
-    models_path = get_ov_model(model_id, cache)
-    ov_pipe = VLMPipeline(models_path, "CPU")
-    generation_config = ov_pipe.get_generation_config()
-    generation_config.max_new_tokens = 30
-    generation_config.set_eos_token_id(ov_pipe.get_tokenizer().get_eos_token_id())
-
-    for images_links in iteration_images:
-        ov_pipe.start_chat()
-
-        images = []
-        for link in images_links:
-            images.append(get_image_by_link(link))
-
-        result_from_streamer = []
-        res = ov_pipe.generate(prompts[0], images=images, generation_config=generation_config, streamer=streamer)
-        assert res.texts[0] == ''.join(result_from_streamer)
-
-        ov_pipe.finish_chat()
+    assert res_first == res_second