Fixed conflicts.

Author: popovaan

.github/workflows/causal_lm_cpp.yml

@@ -682,7 +682,11 @@ jobs:
           diff pred2.txt ref.txt
           echo "Chat sample python" passed
 
+<<<<<<< HEAD
   visual_chat_sample-ubuntu:
+=======
+  py-vlm_chat_sample-ubuntu:
+>>>>>>> c67ddd58652c6ac5aab1b3c9fff0036fb9f4a692
     runs-on: ubuntu-22.04-16-cores
     defaults:
       run:
@@ -703,19 +707,33 @@ jobs:
         run: |
           source ./ov/setupvars.sh
           cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
+<<<<<<< HEAD
           cmake --build ./build/ --config Release --target visual_language_chat -j
+=======
+          cmake --build ./build/ --config Release -j
+>>>>>>> c67ddd58652c6ac5aab1b3c9fff0036fb9f4a692
       - name: Download and convert and model
         run: |
           source ./ov/setupvars.sh
           python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
           python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
           python ./samples/cpp/visual_language_chat/export_MiniCPM-V-2_6.py ./miniCPM-V-2_6/
           wget https://github.com/openvinotoolkit/openvino_notebooks/assets/29454499/d5fbbd1a-d484-415c-88cb-9986625b7b11
+<<<<<<< HEAD
 
       - name: Run chat sample
           source ./ov/setupvars.sh
           printf 'What is on the image?\nWhat is special on the image?\n' > ./input.txt
           timeout 120s python ./samples/python/vlm_chat_sample/vlm_chat_sample.py ./miniCPM-V-2_6/ d5fbbd1a-d484-415c-88cb-9986625b7b11 < input.txt > ./pred.txt || ( [[ $? -eq 124 ]] && \
+=======
+          
+      - name: Run chat sample
+        run: |
+          source ./ov/setupvars.sh
+          export PYTHONPATH=./build/:$PYTHONPATH
+          printf 'What is on the image?\n' > ./input.txt
+          timeout 300s python ./samples/python/vlm_chat_sample/vlm_chat_sample.py ./miniCPM-V-2_6/ d5fbbd1a-d484-415c-88cb-9986625b7b11 < input.txt > ./pred.txt || ( [[ $? -eq 124 ]] && \
+>>>>>>> c67ddd58652c6ac5aab1b3c9fff0036fb9f4a692
           echo "Timeout reached, but it's excpected." )
 
   cpp-continuous-batching-ubuntu:

samples/requirements.txt

@@ -5,3 +5,4 @@ transformers_stream_generator==0.0.5  # For Qwen
 diffusers==0.30.3
 pillow
 torchvision # needed for mini-CPM export script. Need to remove when we switch to exporting with optimum-intel.
+

src/python/openvino_genai/__init__.py

@@ -17,7 +17,7 @@
     EncodedResults,
     GenerationConfig,
     GenerationResult,
-    LLMPipeline, 
+    LLMPipeline,
     VLMPipeline,
     PerfMetrics,
     RawPerfMetrics,

src/python/py_vlm_pipeline.cpp

@@ -109,7 +109,7 @@ void init_vlm_pipeline(py::module_& m) {
             ScopedVar env_manager(utils::ov_tokenizers_module_path());
             return std::make_unique<ov::genai::VLMPipeline>(model_path, device, utils::properties_to_any_map(config));
         }),
-        py::arg("model_path"), "folder with exported model files", 
+        py::arg("model_path"), "folder with exported model files",
         py::arg("device") = "CPU", "device on which inference will be done",
         py::arg("config") = ov::AnyMap({}), "openvino.properties map"
         R"(