Merge pull request #963 from vespa-engine/thomasht86/add-colpalidemo-…

…notebook (notebook) add colpalidemo notebook
vespa-engine · Nov 1, 2024 · 1697ba2 · 1697ba2
2 parents cef9799 + 95b6f05
commit 1697ba2
Show file tree

Hide file tree

Showing 8 changed files with 11,073 additions and 8,616 deletions.
diff --git a/.github/scripts/replace_pip_install_notebooks.sh b/.github/scripts/replace_pip_install_notebooks.sh
@@ -29,8 +29,11 @@ extract_and_modify_pip_installation() {
             # Strip the leading "!" and remove 'pip(3) install' and '-U' flags
             modified_line=$(echo "$line" | sed 's/^!pip[3]* install -U //;s/^!pip[3]* install //')
 
-            # Remove 'pyvespa' and 'vespacli' from the line
-            modified_line=$(echo "$modified_line" | sed 's/pyvespa//g' | sed 's/vespacli//g' | sed 's/  / /g')
+            # Remove 'pyvespa' and 'vespacli' along with any following characters until a space
+            modified_line=$(echo "$modified_line" | sed 's/\bpyvespa[^ ]*//g; s/\bvespacli[^ ]*//g; s/  / /g')
+
+            # Trim leading and trailing whitespace
+            modified_line=$(echo "$modified_line" | sed 's/^[ \t]*//;s/[ \t]*$//')
 
             # Write each package to additional_requirements.txt without adding extra new lines
             echo "$modified_line" | tr ' ' '\n' | sed '/^$/d' >> additional_requirements.txt

diff --git a/docs/sphinx/source/_static/colpalidemo_1.png b/docs/sphinx/source/_static/colpalidemo_1.png
diff --git a/docs/sphinx/source/_static/colpalidemo_2.png b/docs/sphinx/source/_static/colpalidemo_2.png
diff --git a/.../sphinx/source/examples/chat_with_your_pdfs_using_colbert_langchain_and_Vespa-cloud.ipynb b/.../sphinx/source/examples/chat_with_your_pdfs_using_colbert_langchain_and_Vespa-cloud.ipynb
diff --git a/docs/sphinx/source/examples/colpali-document-retrieval-vision-language-models-cloud.ipynb b/docs/sphinx/source/examples/colpali-document-retrieval-vision-language-models-cloud.ipynb
diff --git a/docs/sphinx/source/examples/simplified-retrieval-with-colpali-vlm_Vespa-cloud.ipynb b/docs/sphinx/source/examples/simplified-retrieval-with-colpali-vlm_Vespa-cloud.ipynb
@@ -80,7 +80,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip3 install colpali-engine==0.2.2 pdf2image pypdf pyvespa vespacli requests numpy"
+    "!pip3 install colpali-engine==0.2.2 pdf2image pypdf==5.0.1 pyvespa vespacli requests numpy"
    ]
   },
   {
@@ -6456,4 +6456,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/...phinx/source/examples/turbocharge-rag-with-langchain-and-vespa-streaming-mode-cloud.ipynb b/...phinx/source/examples/turbocharge-rag-with-langchain-and-vespa-streaming-mode-cloud.ipynb