From be9d19afa5d5fa9a8d3e53c86a87ef24e0f65ca0 Mon Sep 17 00:00:00 2001 From: Malte Pietsch Date: Tue, 10 Aug 2021 11:50:59 +0200 Subject: [PATCH] Remove Finder from tutorials (#1329) --- tutorials/Tutorial1_Basic_QA_Pipeline.ipynb | 13 ++----------- ...l3_Basic_QA_Pipeline_without_Elasticsearch.ipynb | 12 +----------- ...rial3_Basic_QA_Pipeline_without_Elasticsearch.py | 3 +-- tutorials/Tutorial4_FAQ_style_QA.ipynb | 10 ---------- tutorials/Tutorial4_FAQ_style_QA.py | 1 - tutorials/Tutorial6_Better_Retrieval_via_DPR.ipynb | 3 +-- tutorials/Tutorial6_Better_Retrieval_via_DPR.py | 1 - 7 files changed, 5 insertions(+), 38 deletions(-) diff --git a/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb b/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb index 2418ceb50..80aae195c 100644 --- a/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb +++ b/tutorials/Tutorial1_Basic_QA_Pipeline.ipynb @@ -228,7 +228,7 @@ "# 'meta': {'name': \"\", ...}\n", "#}\n", "# (Optionally: you can also add more key-value-pairs here, that will be indexed as fields in Elasticsearch and\n", - "# can be accessed later for filtering or shown in the responses of the Finder)\n", + "# can be accessed later for filtering or shown in the responses of the Pipeline)\n", "\n", "# Let's have a look at the first 3 entries:\n", "print(dicts[:3])\n", @@ -241,7 +241,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Initalize Retriever, Reader, & Finder\n", + "## Initalize Retriever, Reader, & Pipeline\n", "\n", "### Retriever\n", "\n", @@ -512,15 +512,6 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.6" - }, - "pycharm": { - "stem_cell": { - "cell_type": "raw", - "source": [], - "metadata": { - "collapsed": false - } - } } }, "nbformat": 4, diff --git a/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.ipynb b/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.ipynb index 54a46b9f4..4a52bec76 100644 --- a/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.ipynb +++ b/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.ipynb @@ -69,7 +69,6 @@ }, "outputs": [], "source": [ - "from haystack import Finder\n", "from haystack.preprocessor.cleaning import clean_wiki_text\n", "from haystack.preprocessor.utils import convert_files_to_dicts, fetch_archive_from_http\n", "from haystack.reader.farm import FARMReader\n", @@ -169,7 +168,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Initalize Retriever, Reader, & Finder\n", + "## Initalize Retriever, Reader & Pipeline\n", "\n", "### Retriever\n", "\n", @@ -443,15 +442,6 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.6" - }, - "pycharm": { - "stem_cell": { - "cell_type": "raw", - "source": [], - "metadata": { - "collapsed": false - } - } } }, "nbformat": 4, diff --git a/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.py b/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.py index f647518dc..575214b95 100644 --- a/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.py +++ b/tutorials/Tutorial3_Basic_QA_Pipeline_without_Elasticsearch.py @@ -6,7 +6,6 @@ # # If you are interested in more feature-rich Elasticsearch, then please refer to the Tutorial 1. -from haystack import Finder from haystack.document_store.memory import InMemoryDocumentStore from haystack.document_store.sql import SQLDocumentStore from haystack.preprocessor.cleaning import clean_wiki_text @@ -50,7 +49,7 @@ def tutorial3_basic_qa_pipeline_without_elasticsearch(): document_store.write_documents(dicts) - # ## Initalize Retriever, Reader, & Finder + # ## Initalize Retriever, Reader & Pipeline # # ### Retriever # diff --git a/tutorials/Tutorial4_FAQ_style_QA.ipynb b/tutorials/Tutorial4_FAQ_style_QA.ipynb index 0e8433b5a..20b89bc1b 100644 --- a/tutorials/Tutorial4_FAQ_style_QA.ipynb +++ b/tutorials/Tutorial4_FAQ_style_QA.ipynb @@ -77,7 +77,6 @@ }, "outputs": [], "source": [ - "from haystack import Finder\n", "from haystack.document_store.elasticsearch import ElasticsearchDocumentStore\n", "\n", "from haystack.retriever.dense import EmbeddingRetriever\n", @@ -317,15 +316,6 @@ "nbconvert_exporter": "python", "pygments_lexer": "ipython3", "version": "3.7.6" - }, - "pycharm": { - "stem_cell": { - "cell_type": "raw", - "source": [], - "metadata": { - "collapsed": false - } - } } }, "nbformat": 4, diff --git a/tutorials/Tutorial4_FAQ_style_QA.py b/tutorials/Tutorial4_FAQ_style_QA.py index 3ff6e9fef..7edab6736 100755 --- a/tutorials/Tutorial4_FAQ_style_QA.py +++ b/tutorials/Tutorial4_FAQ_style_QA.py @@ -1,4 +1,3 @@ -from haystack import Finder from haystack.document_store.elasticsearch import ElasticsearchDocumentStore from haystack.retriever.dense import EmbeddingRetriever diff --git a/tutorials/Tutorial6_Better_Retrieval_via_DPR.ipynb b/tutorials/Tutorial6_Better_Retrieval_via_DPR.ipynb index 4c175ce66..836bf6c2f 100644 --- a/tutorials/Tutorial6_Better_Retrieval_via_DPR.ipynb +++ b/tutorials/Tutorial6_Better_Retrieval_via_DPR.ipynb @@ -299,7 +299,6 @@ }, "outputs": [], "source": [ - "from haystack import Finder\n", "from haystack.preprocessor.cleaning import clean_wiki_text\n", "from haystack.preprocessor.utils import convert_files_to_dicts, fetch_archive_from_http\n", "from haystack.reader.farm import FARMReader\n", @@ -452,7 +451,7 @@ "id": "wgjedxx_A6N6" }, "source": [ - "### Initalize Retriever, Reader, & Finder\n", + "### Initalize Retriever, Reader & Pipeline\n", "\n", "#### Retriever\n", "\n", diff --git a/tutorials/Tutorial6_Better_Retrieval_via_DPR.py b/tutorials/Tutorial6_Better_Retrieval_via_DPR.py index 019b9d64b..3f704de8f 100755 --- a/tutorials/Tutorial6_Better_Retrieval_via_DPR.py +++ b/tutorials/Tutorial6_Better_Retrieval_via_DPR.py @@ -1,4 +1,3 @@ -from haystack import Finder from haystack.document_store import FAISSDocumentStore, MilvusDocumentStore from haystack.preprocessor.cleaning import clean_wiki_text from haystack.preprocessor.utils import convert_files_to_dicts, fetch_archive_from_http