fix: re-export symbols in __init__.py files

haystack/components/agents/__init__.py

@@ -10,8 +10,8 @@
 _import_structure = {"agent": ["Agent"], "state": ["State"]}
 
 if TYPE_CHECKING:
-    from .agent import Agent
-    from .state import State
+    from .agent import Agent as Agent
+    from .state import State as State
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/audio/__init__.py

@@ -10,8 +10,8 @@
 _import_structure = {"whisper_local": ["LocalWhisperTranscriber"], "whisper_remote": ["RemoteWhisperTranscriber"]}
 
 if TYPE_CHECKING:
-    from .whisper_local import LocalWhisperTranscriber
-    from .whisper_remote import RemoteWhisperTranscriber
+    from .whisper_local import LocalWhisperTranscriber as LocalWhisperTranscriber
+    from .whisper_remote import RemoteWhisperTranscriber as RemoteWhisperTranscriber
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/builders/__init__.py

@@ -14,9 +14,9 @@
 }
 
 if TYPE_CHECKING:
-    from .answer_builder import AnswerBuilder
-    from .chat_prompt_builder import ChatPromptBuilder
-    from .prompt_builder import PromptBuilder
+    from .answer_builder import AnswerBuilder as AnswerBuilder
+    from .chat_prompt_builder import ChatPromptBuilder as ChatPromptBuilder
+    from .prompt_builder import PromptBuilder as PromptBuilder
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/caching/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"cache_checker": ["CacheChecker"]}
 
 if TYPE_CHECKING:
-    from .cache_checker import CacheChecker
+    from .cache_checker import CacheChecker as CacheChecker
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/classifiers/__init__.py

@@ -13,8 +13,10 @@
 }
 
 if TYPE_CHECKING:
-    from .document_language_classifier import DocumentLanguageClassifier
-    from .zero_shot_document_classifier import TransformersZeroShotDocumentClassifier
+    from .document_language_classifier import DocumentLanguageClassifier as DocumentLanguageClassifier
+    from .zero_shot_document_classifier import (
+        TransformersZeroShotDocumentClassifier as TransformersZeroShotDocumentClassifier,
+    )
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/connectors/__init__.py

@@ -10,8 +10,8 @@
 _import_structure = {"openapi": ["OpenAPIConnector"], "openapi_service": ["OpenAPIServiceConnector"]}
 
 if TYPE_CHECKING:
-    from .openapi import OpenAPIConnector
-    from .openapi_service import OpenAPIServiceConnector
+    from .openapi import OpenAPIConnector as OpenAPIConnector
+    from .openapi_service import OpenAPIServiceConnector as OpenAPIServiceConnector
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/converters/__init__.py

@@ -27,22 +27,22 @@
 }
 
 if TYPE_CHECKING:
-    from .azure import AzureOCRDocumentConverter
-    from .csv import CSVToDocument
-    from .docx import DOCXToDocument
-    from .html import HTMLToDocument
-    from .json import JSONConverter
-    from .markdown import MarkdownToDocument
-    from .msg import MSGToDocument
-    from .multi_file_converter import MultiFileConverter
-    from .openapi_functions import OpenAPIServiceToFunctions
-    from .output_adapter import OutputAdapter
-    from .pdfminer import PDFMinerToDocument
-    from .pptx import PPTXToDocument
-    from .pypdf import PyPDFToDocument
-    from .tika import TikaDocumentConverter
-    from .txt import TextFileToDocument
-    from .xlsx import XLSXToDocument
+    from .azure import AzureOCRDocumentConverter as AzureOCRDocumentConverter
+    from .csv import CSVToDocument as CSVToDocument
+    from .docx import DOCXToDocument as DOCXToDocument
+    from .html import HTMLToDocument as HTMLToDocument
+    from .json import JSONConverter as JSONConverter
+    from .markdown import MarkdownToDocument as MarkdownToDocument
+    from .msg import MSGToDocument as MSGToDocument
+    from .multi_file_converter import MultiFileConverter as MultiFileConverter
+    from .openapi_functions import OpenAPIServiceToFunctions as OpenAPIServiceToFunctions
+    from .output_adapter import OutputAdapter as OutputAdapter
+    from .pdfminer import PDFMinerToDocument as PDFMinerToDocument
+    from .pptx import PPTXToDocument as PPTXToDocument
+    from .pypdf import PyPDFToDocument as PyPDFToDocument
+    from .tika import TikaDocumentConverter as TikaDocumentConverter
+    from .txt import TextFileToDocument as TextFileToDocument
+    from .xlsx import XLSXToDocument as XLSXToDocument
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/embedders/__init__.py

@@ -19,14 +19,18 @@
 }
 
 if TYPE_CHECKING:
-    from .azure_document_embedder import AzureOpenAIDocumentEmbedder
-    from .azure_text_embedder import AzureOpenAITextEmbedder
-    from .hugging_face_api_document_embedder import HuggingFaceAPIDocumentEmbedder
-    from .hugging_face_api_text_embedder import HuggingFaceAPITextEmbedder
-    from .openai_document_embedder import OpenAIDocumentEmbedder
-    from .openai_text_embedder import OpenAITextEmbedder
-    from .sentence_transformers_document_embedder import SentenceTransformersDocumentEmbedder
-    from .sentence_transformers_text_embedder import SentenceTransformersTextEmbedder
+    from .azure_document_embedder import AzureOpenAIDocumentEmbedder as AzureOpenAIDocumentEmbedder
+    from .azure_text_embedder import AzureOpenAITextEmbedder as AzureOpenAITextEmbedder
+    from .hugging_face_api_document_embedder import HuggingFaceAPIDocumentEmbedder as HuggingFaceAPIDocumentEmbedder
+    from .hugging_face_api_text_embedder import HuggingFaceAPITextEmbedder as HuggingFaceAPITextEmbedder
+    from .openai_document_embedder import OpenAIDocumentEmbedder as OpenAIDocumentEmbedder
+    from .openai_text_embedder import OpenAITextEmbedder as OpenAITextEmbedder
+    from .sentence_transformers_document_embedder import (
+        SentenceTransformersDocumentEmbedder as SentenceTransformersDocumentEmbedder,
+    )
+    from .sentence_transformers_text_embedder import (
+        SentenceTransformersTextEmbedder as SentenceTransformersTextEmbedder,
+    )
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/evaluators/__init__.py

@@ -20,15 +20,15 @@
 }
 
 if TYPE_CHECKING:
-    from .answer_exact_match import AnswerExactMatchEvaluator
-    from .context_relevance import ContextRelevanceEvaluator
-    from .document_map import DocumentMAPEvaluator
-    from .document_mrr import DocumentMRREvaluator
-    from .document_ndcg import DocumentNDCGEvaluator
-    from .document_recall import DocumentRecallEvaluator
-    from .faithfulness import FaithfulnessEvaluator
-    from .llm_evaluator import LLMEvaluator
-    from .sas_evaluator import SASEvaluator
+    from .answer_exact_match import AnswerExactMatchEvaluator as AnswerExactMatchEvaluator
+    from .context_relevance import ContextRelevanceEvaluator as ContextRelevanceEvaluator
+    from .document_map import DocumentMAPEvaluator as DocumentMAPEvaluator
+    from .document_mrr import DocumentMRREvaluator as DocumentMRREvaluator
+    from .document_ndcg import DocumentNDCGEvaluator as DocumentNDCGEvaluator
+    from .document_recall import DocumentRecallEvaluator as DocumentRecallEvaluator
+    from .faithfulness import FaithfulnessEvaluator as FaithfulnessEvaluator
+    from .llm_evaluator import LLMEvaluator as LLMEvaluator
+    from .sas_evaluator import SASEvaluator as SASEvaluator
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/extractors/__init__.py

@@ -13,8 +13,10 @@
 }
 
 if TYPE_CHECKING:
-    from .llm_metadata_extractor import LLMMetadataExtractor
-    from .named_entity_extractor import NamedEntityAnnotation, NamedEntityExtractor, NamedEntityExtractorBackend
+    from .llm_metadata_extractor import LLMMetadataExtractor as LLMMetadataExtractor
+    from .named_entity_extractor import NamedEntityAnnotation as NamedEntityAnnotation
+    from .named_entity_extractor import NamedEntityExtractor as NamedEntityExtractor
+    from .named_entity_extractor import NamedEntityExtractorBackend as NamedEntityExtractorBackend
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/fetchers/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"link_content": ["LinkContentFetcher"]}
 
 if TYPE_CHECKING:
-    from .link_content import LinkContentFetcher
+    from .link_content import LinkContentFetcher as LinkContentFetcher
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/generators/__init__.py

@@ -16,11 +16,11 @@
 }
 
 if TYPE_CHECKING:
-    from .azure import AzureOpenAIGenerator
-    from .hugging_face_api import HuggingFaceAPIGenerator
-    from .hugging_face_local import HuggingFaceLocalGenerator
-    from .openai import OpenAIGenerator
-    from .openai_dalle import DALLEImageGenerator
+    from .azure import AzureOpenAIGenerator as AzureOpenAIGenerator
+    from .hugging_face_api import HuggingFaceAPIGenerator as HuggingFaceAPIGenerator
+    from .hugging_face_local import HuggingFaceLocalGenerator as HuggingFaceLocalGenerator
+    from .openai import OpenAIGenerator as OpenAIGenerator
+    from .openai_dalle import DALLEImageGenerator as DALLEImageGenerator
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/generators/chat/__init__.py

@@ -15,10 +15,10 @@
 }
 
 if TYPE_CHECKING:
-    from .azure import AzureOpenAIChatGenerator
-    from .hugging_face_api import HuggingFaceAPIChatGenerator
-    from .hugging_face_local import HuggingFaceLocalChatGenerator
-    from .openai import OpenAIChatGenerator
+    from .azure import AzureOpenAIChatGenerator as AzureOpenAIChatGenerator
+    from .hugging_face_api import HuggingFaceAPIChatGenerator as HuggingFaceAPIChatGenerator
+    from .hugging_face_local import HuggingFaceLocalChatGenerator as HuggingFaceLocalChatGenerator
+    from .openai import OpenAIChatGenerator as OpenAIChatGenerator
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/joiners/__init__.py

@@ -16,11 +16,11 @@
 }
 
 if TYPE_CHECKING:
-    from .answer_joiner import AnswerJoiner
-    from .branch import BranchJoiner
-    from .document_joiner import DocumentJoiner
-    from .list_joiner import ListJoiner
-    from .string_joiner import StringJoiner
+    from .answer_joiner import AnswerJoiner as AnswerJoiner
+    from .branch import BranchJoiner as BranchJoiner
+    from .document_joiner import DocumentJoiner as DocumentJoiner
+    from .list_joiner import ListJoiner as ListJoiner
+    from .string_joiner import StringJoiner as StringJoiner
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/preprocessors/__init__.py

@@ -19,14 +19,14 @@
 }
 
 if TYPE_CHECKING:
-    from .csv_document_cleaner import CSVDocumentCleaner
-    from .csv_document_splitter import CSVDocumentSplitter
-    from .document_cleaner import DocumentCleaner
-    from .document_preprocessor import DocumentPreprocessor
-    from .document_splitter import DocumentSplitter
-    from .hierarchical_document_splitter import HierarchicalDocumentSplitter
-    from .recursive_splitter import RecursiveDocumentSplitter
-    from .text_cleaner import TextCleaner
+    from .csv_document_cleaner import CSVDocumentCleaner as CSVDocumentCleaner
+    from .csv_document_splitter import CSVDocumentSplitter as CSVDocumentSplitter
+    from .document_cleaner import DocumentCleaner as DocumentCleaner
+    from .document_preprocessor import DocumentPreprocessor as DocumentPreprocessor
+    from .document_splitter import DocumentSplitter as DocumentSplitter
+    from .hierarchical_document_splitter import HierarchicalDocumentSplitter as HierarchicalDocumentSplitter
+    from .recursive_splitter import RecursiveDocumentSplitter as RecursiveDocumentSplitter
+    from .text_cleaner import TextCleaner as TextCleaner
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/rankers/__init__.py

@@ -18,13 +18,17 @@
 }
 
 if TYPE_CHECKING:
-    from .hugging_face_tei import HuggingFaceTEIRanker
-    from .lost_in_the_middle import LostInTheMiddleRanker
-    from .meta_field import MetaFieldRanker
-    from .meta_field_grouping_ranker import MetaFieldGroupingRanker
-    from .sentence_transformers_diversity import SentenceTransformersDiversityRanker
-    from .sentence_transformers_similarity import SentenceTransformersSimilarityRanker
-    from .transformers_similarity import TransformersSimilarityRanker
+    from .hugging_face_tei import HuggingFaceTEIRanker as HuggingFaceTEIRanker
+    from .lost_in_the_middle import LostInTheMiddleRanker as LostInTheMiddleRanker
+    from .meta_field import MetaFieldRanker as MetaFieldRanker
+    from .meta_field_grouping_ranker import MetaFieldGroupingRanker as MetaFieldGroupingRanker
+    from .sentence_transformers_diversity import (
+        SentenceTransformersDiversityRanker as SentenceTransformersDiversityRanker,
+    )
+    from .sentence_transformers_similarity import (
+        SentenceTransformersSimilarityRanker as SentenceTransformersSimilarityRanker,
+    )
+    from .transformers_similarity import TransformersSimilarityRanker as TransformersSimilarityRanker
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/readers/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"extractive": ["ExtractiveReader"]}
 
 if TYPE_CHECKING:
-    from .extractive import ExtractiveReader
+    from .extractive import ExtractiveReader as ExtractiveReader
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/retrievers/__init__.py

@@ -15,10 +15,11 @@
 }
 
 if TYPE_CHECKING:
-    from .auto_merging_retriever import AutoMergingRetriever
-    from .filter_retriever import FilterRetriever
-    from .in_memory import InMemoryBM25Retriever, InMemoryEmbeddingRetriever
-    from .sentence_window_retriever import SentenceWindowRetriever
+    from .auto_merging_retriever import AutoMergingRetriever as AutoMergingRetriever
+    from .filter_retriever import FilterRetriever as FilterRetriever
+    from .in_memory import InMemoryBM25Retriever as InMemoryBM25Retriever
+    from .in_memory import InMemoryEmbeddingRetriever as InMemoryEmbeddingRetriever
+    from .sentence_window_retriever import SentenceWindowRetriever as SentenceWindowRetriever
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/retrievers/in_memory/__init__.py

@@ -10,8 +10,8 @@
 _import_structure = {"bm25_retriever": ["InMemoryBM25Retriever"], "embedding_retriever": ["InMemoryEmbeddingRetriever"]}
 
 if TYPE_CHECKING:
-    from .bm25_retriever import InMemoryBM25Retriever
-    from .embedding_retriever import InMemoryEmbeddingRetriever
+    from .bm25_retriever import InMemoryBM25Retriever as InMemoryBM25Retriever
+    from .embedding_retriever import InMemoryEmbeddingRetriever as InMemoryEmbeddingRetriever
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/routers/__init__.py

@@ -17,11 +17,11 @@
 }
 
 if TYPE_CHECKING:
-    from .conditional_router import ConditionalRouter
-    from .file_type_router import FileTypeRouter
-    from .metadata_router import MetadataRouter
-    from .text_language_router import TextLanguageRouter
-    from .transformers_text_router import TransformersTextRouter
-    from .zero_shot_text_router import TransformersZeroShotTextRouter
+    from .conditional_router import ConditionalRouter as ConditionalRouter
+    from .file_type_router import FileTypeRouter as FileTypeRouter
+    from .metadata_router import MetadataRouter as MetadataRouter
+    from .text_language_router import TextLanguageRouter as TextLanguageRouter
+    from .transformers_text_router import TransformersTextRouter as TransformersTextRouter
+    from .zero_shot_text_router import TransformersZeroShotTextRouter as TransformersZeroShotTextRouter
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/samplers/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"top_p": ["TopPSampler"]}
 
 if TYPE_CHECKING:
-    from .top_p import TopPSampler
+    from .top_p import TopPSampler as TopPSampler
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/tools/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"tool_invoker": ["ToolInvoker"]}
 
 if TYPE_CHECKING:
-    from .tool_invoker import ToolInvoker
+    from .tool_invoker import ToolInvoker as ToolInvoker
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/validators/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"json_schema": ["JsonSchemaValidator"]}
 
 if TYPE_CHECKING:
-    from .json_schema import JsonSchemaValidator
+    from .json_schema import JsonSchemaValidator as JsonSchemaValidator
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/websearch/__init__.py

@@ -10,8 +10,8 @@
 _import_structure = {"searchapi": ["SearchApiWebSearch"], "serper_dev": ["SerperDevWebSearch"]}
 
 if TYPE_CHECKING:
-    from .searchapi import SearchApiWebSearch
-    from .serper_dev import SerperDevWebSearch
+    from .searchapi import SearchApiWebSearch as SearchApiWebSearch
+    from .serper_dev import SerperDevWebSearch as SerperDevWebSearch
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/writers/__init__.py

@@ -10,7 +10,7 @@
 _import_structure = {"document_writer": ["DocumentWriter"]}
 
 if TYPE_CHECKING:
-    from .document_writer import DocumentWriter
+    from .document_writer import DocumentWriter as DocumentWriter
 
 else:
     sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)