From 11afa0a442f6dbd133e59aef869ca62c81d32ff5 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Thu, 31 Aug 2023 13:33:29 +0200 Subject: [PATCH] fix: Improve imports for new rankers (#5696) * Proper imports for new rankers * Small fix --- examples/talk_to_website.py | 2 +- examples/web_lfqa_with_rankers.py | 5 ++--- haystack/nodes/ranker/__init__.py | 3 +++ haystack/nodes/ranker/diversity.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/talk_to_website.py b/examples/talk_to_website.py index f4a957583c..83de457c5c 100644 --- a/examples/talk_to_website.py +++ b/examples/talk_to_website.py @@ -5,7 +5,7 @@ from haystack import Pipeline from haystack.document_stores import InMemoryDocumentStore from haystack.nodes import PromptNode, PromptTemplate, TopPSampler -from haystack.nodes.ranker.lost_in_the_middle import LostInTheMiddleRanker +from haystack.nodes.ranker import LostInTheMiddleRanker from haystack.nodes.retriever.web import WebRetriever search_key = os.environ.get("SERPERDEV_API_KEY") diff --git a/examples/web_lfqa_with_rankers.py b/examples/web_lfqa_with_rankers.py index 2d6cd51c7c..b175042b49 100644 --- a/examples/web_lfqa_with_rankers.py +++ b/examples/web_lfqa_with_rankers.py @@ -4,9 +4,8 @@ from haystack import Pipeline from haystack.nodes import PromptNode, PromptTemplate, TopPSampler -from haystack.nodes.ranker.diversity import DiversityRanker -from haystack.nodes.ranker.lost_in_the_middle import LostInTheMiddleRanker -from haystack.nodes.retriever.web import WebRetriever +from haystack.nodes.ranker import DiversityRanker, LostInTheMiddleRanker +from haystack.nodes.retriever import WebRetriever search_key = os.environ.get("SERPERDEV_API_KEY") if not search_key: diff --git a/haystack/nodes/ranker/__init__.py b/haystack/nodes/ranker/__init__.py index 9cfb72933e..1c3b7dbcee 100644 --- a/haystack/nodes/ranker/__init__.py +++ b/haystack/nodes/ranker/__init__.py @@ -1,3 +1,6 @@ from haystack.nodes.ranker.base import BaseRanker from haystack.nodes.ranker.sentence_transformers import SentenceTransformersRanker from haystack.nodes.ranker.cohere import CohereRanker +from haystack.nodes.ranker.lost_in_the_middle import LostInTheMiddleRanker +from haystack.nodes.ranker.diversity import DiversityRanker +from haystack.nodes.ranker.recentness_ranker import RecentnessRanker diff --git a/haystack/nodes/ranker/diversity.py b/haystack/nodes/ranker/diversity.py index dd89c757eb..bd684d17de 100644 --- a/haystack/nodes/ranker/diversity.py +++ b/haystack/nodes/ranker/diversity.py @@ -2,7 +2,7 @@ from pathlib import Path from typing import List, Literal, Optional, Union -from haystack.nodes import BaseRanker +from haystack.nodes.ranker.base import BaseRanker from haystack.schema import Document from haystack.lazy_imports import LazyImport