Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move DocumentJoiner to new joiners package #6692

Merged
merged 7 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e2e/pipelines/test_dense_doc_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from haystack.components.embedders import SentenceTransformersDocumentEmbedder, SentenceTransformersTextEmbedder
from haystack.components.converters import PyPDFToDocument, TextFileToDocument
from haystack.components.preprocessors import DocumentCleaner, DocumentSplitter
from haystack.components.routers import FileTypeRouter, DocumentJoiner
from haystack.components.routers import FileTypeRouter
from haystack.components.joiners import DocumentJoiner
from haystack.components.writers import DocumentWriter
from haystack.document_stores import InMemoryDocumentStore
from haystack.components.retrievers import InMemoryEmbeddingRetriever
Expand Down
3 changes: 2 additions & 1 deletion e2e/pipelines/test_eval_dense_doc_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from haystack.components.embedders import SentenceTransformersDocumentEmbedder, SentenceTransformersTextEmbedder
from haystack.components.preprocessors import DocumentCleaner, DocumentSplitter
from haystack.components.retrievers import InMemoryEmbeddingRetriever
from haystack.components.routers import DocumentJoiner, FileTypeRouter
from haystack.components.routers import FileTypeRouter
from haystack.components.joiners import DocumentJoiner
from haystack.components.writers import DocumentWriter
from haystack.dataclasses import Document
from haystack.document_stores import InMemoryDocumentStore
Expand Down
2 changes: 1 addition & 1 deletion e2e/pipelines/test_eval_hybrid_doc_search_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from haystack.components.embedders import SentenceTransformersTextEmbedder
from haystack.components.rankers import TransformersSimilarityRanker
from haystack.components.retrievers import InMemoryBM25Retriever, InMemoryEmbeddingRetriever
from haystack.components.routers.document_joiner import DocumentJoiner
from haystack.components.joiners.document_joiner import DocumentJoiner
from haystack.document_stores import InMemoryDocumentStore
from haystack.evaluation.eval import eval

Expand Down
2 changes: 1 addition & 1 deletion e2e/pipelines/test_hybrid_doc_search_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from haystack import Pipeline, Document
from haystack.components.embedders import SentenceTransformersTextEmbedder
from haystack.components.rankers import TransformersSimilarityRanker
from haystack.components.routers.document_joiner import DocumentJoiner
from haystack.components.joiners.document_joiner import DocumentJoiner
from haystack.document_stores import InMemoryDocumentStore
from haystack.components.retrievers import InMemoryBM25Retriever, InMemoryEmbeddingRetriever

Expand Down
3 changes: 2 additions & 1 deletion examples/pipelines/indexing_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from haystack.components.embedders import SentenceTransformersDocumentEmbedder
from haystack.components.converters import PyPDFToDocument, TextFileToDocument
from haystack.components.preprocessors import DocumentCleaner, DocumentSplitter
from haystack.components.routers import FileTypeRouter, DocumentJoiner
from haystack.components.routers import FileTypeRouter
from haystack.components.joiners import DocumentJoiner
from haystack.components.writers import DocumentWriter
from haystack.document_stores import InMemoryDocumentStore

Expand Down
3 changes: 3 additions & 0 deletions haystack/components/joiners/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from haystack.components.joiners.document_joiner import DocumentJoiner

__all__ = ["DocumentJoiner"]
3 changes: 1 addition & 2 deletions haystack/components/routers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from haystack.components.routers.document_joiner import DocumentJoiner
from haystack.components.routers.file_type_router import FileTypeRouter
from haystack.components.routers.metadata_router import MetadataRouter
from haystack.components.routers.conditional_router import ConditionalRouter
from haystack.components.routers.text_language_router import TextLanguageRouter

__all__ = ["DocumentJoiner", "FileTypeRouter", "MetadataRouter", "TextLanguageRouter", "ConditionalRouter"]
__all__ = ["FileTypeRouter", "MetadataRouter", "TextLanguageRouter", "ConditionalRouter"]
3 changes: 2 additions & 1 deletion haystack/pipeline_utils/indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
from haystack.components.embedders import SentenceTransformersDocumentEmbedder, OpenAIDocumentEmbedder
from haystack.components.fetchers import LinkContentFetcher
from haystack.components.preprocessors import DocumentCleaner, DocumentSplitter
from haystack.components.routers import FileTypeRouter, DocumentJoiner
from haystack.components.routers import FileTypeRouter
from haystack.components.joiners import DocumentJoiner
from haystack.components.writers import DocumentWriter
from haystack.document_stores.protocol import DocumentStore

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
upgrade:
- |
Change any occurrence of:
from haystack.components.routers.document_joiner import DocumentJoiner
to:
from haystack.components.joiners.document_joiner import DocumentJoiner
enhancements:
- |
Create a new package called `joiners` and move `DocumentJoiner` there for clarity.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest

from haystack import Document
from haystack.components.routers.document_joiner import DocumentJoiner
from haystack.components.joiners.document_joiner import DocumentJoiner


class TestDocumentJoiner:
Expand Down