diff --git a/.ci/patch_notebooks.py b/.ci/patch_notebooks.py index 7759090628b..3aebccbd7c5 100644 --- a/.ci/patch_notebooks.py +++ b/.ci/patch_notebooks.py @@ -52,20 +52,24 @@ def remove_ov_install(cell): updated_lines = [] def has_additional_deps(str_part): + if "pip_install(" in str_part: + return False if "%pip" in str_part: return False if "install" in str_part: return False - if str_part.startswith("-"): + if str_part.startswith("-") or str_part.startswith('"-'): + return False + if str_part.startswith("https://") or str_part.startswith('"https://'): return False - if str_part.startswith("https://"): + if ")" == str_part: return False return True lines = cell["source"].replace("pip_instal(", "pip_install( ").split("\n") for line in lines: if "openvino" in line: - if "optimum-cli" in line or line.startswith("#"): + if "optimum-cli" in line or line.startswith("#") or "-openvino" in line: updated_lines.append(line) continue updated_line_content = [] diff --git a/notebooks/flux.1-image-generation/flux.1-image-generation.ipynb b/notebooks/flux.1-image-generation/flux.1-image-generation.ipynb index e22b72337ba..4b762323465 100644 --- a/notebooks/flux.1-image-generation/flux.1-image-generation.ipynb +++ b/notebooks/flux.1-image-generation/flux.1-image-generation.ipynb @@ -56,7 +56,7 @@ "source": [ "%pip install -q \"gradio>=4.19\" \"torch>=2.1\" \"transformers\" \"nncf>=2.12.0\" \"diffusers>=0.30.0\" \"opencv-python\" \"pillow\" \"peft>=0.7.0\" --extra-index-url https://download.pytorch.org/whl/cpu\n", "%pip install -q \"sentencepiece\" \"protobuf\"\n", - "%pip install -qU --pre \"openvino\" --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly" + "%pip install -qU --pre \"openvino>=2024.4.0\" --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly" ] }, { diff --git a/notebooks/llm-agent-react/llm-agent-rag-llamaindex.ipynb b/notebooks/llm-agent-react/llm-agent-rag-llamaindex.ipynb index 410c98d8572..36456482115 100644 --- a/notebooks/llm-agent-react/llm-agent-rag-llamaindex.ipynb +++ b/notebooks/llm-agent-react/llm-agent-rag-llamaindex.ipynb @@ -96,9 +96,8 @@ " \"transformers>=4.43.1\",\n", ")\n", "pip_install(\"-q\", \"git+https://github.com/huggingface/optimum-intel.git\", \"git+https://github.com/openvinotoolkit/nncf.git\", \"datasets\", \"accelerate\")\n", - "pip_install(\n", - " \"--pre\", \"-Uq\", \"openvino>=2024.2.0\", \"openvino-tokenizers[transformers]\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\"\n", - ")" + "pip_install(\"--pre\", \"-Uq\", \"openvino>=2024.2.0\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")\n", + "pip_install(\"--pre\", \"-Uq\", \"openvino-tokenizers[transformers]\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")" ] }, { diff --git a/notebooks/llm-rag-langchain/llm-rag-langchain.ipynb b/notebooks/llm-rag-langchain/llm-rag-langchain.ipynb index 6e49417d1cc..23374365f17 100644 --- a/notebooks/llm-rag-langchain/llm-rag-langchain.ipynb +++ b/notebooks/llm-rag-langchain/llm-rag-langchain.ipynb @@ -92,9 +92,8 @@ "\n", "os.environ[\"GIT_CLONE_PROTECTION_ACTIVE\"] = \"false\"\n", "\n", - "pip_install(\n", - " \"--pre\", \"-Uq\", \"openvino>=2024.2.0\", \"openvino-tokenizers[transformers]\", \"--extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly\"\n", - ")\n", + "pip_install(\"--pre\", \"-U\", \"openvino>=2024.2.0\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")\n", + "pip_install(\"--pre\", \"-U\" \"openvino-tokenizers[transformers]\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")\n", "pip_install(\n", " \"-q\",\n", " \"--extra-index-url\",\n", diff --git a/notebooks/llm-rag-llamaindex/llm-rag-llamaindex.ipynb b/notebooks/llm-rag-llamaindex/llm-rag-llamaindex.ipynb index 44ce744d63c..e05da93fa7b 100644 --- a/notebooks/llm-rag-llamaindex/llm-rag-llamaindex.ipynb +++ b/notebooks/llm-rag-llamaindex/llm-rag-llamaindex.ipynb @@ -120,9 +120,8 @@ " \"llama-index-postprocessor-openvino-rerank>=0.2.0\",\n", ")\n", "pip_install(\"-q\", \"git+https://github.com/huggingface/optimum-intel.git\", \"git+https://github.com/openvinotoolkit/nncf.git\", \"datasets\", \"accelerate\", \"gradio\")\n", - "pip_install(\n", - " \"--pre\", \"-Uq\", \"openvino>=2024.2.0\", \"openvino-tokenizers[transformers]\", \"--extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly\"\n", - ")" + "pip_install(\"--pre\", \"-U\", \"openvino>=2024.2\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")\n", + "pip_install(\"--pre\", \"-U\", \"openvino-tokenizers[transformers]>=2024.2\", \"--extra-index-url\", \"https://storage.openvinotoolkit.org/simple/wheels/nightly\")" ] }, {