Skip to content

Commit 7570f6b

Browse files
authored
fix: re-export symbols in __init__.py files (#9521)
* chore: re-export symbols in __init__.py files * release note
1 parent a1484cb commit 7570f6b

32 files changed

Lines changed: 170 additions & 142 deletions

File tree

haystack/components/agents/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
_import_structure = {"agent": ["Agent"], "state": ["State"]}
1111

1212
if TYPE_CHECKING:
13-
from .agent import Agent
14-
from .state import State
13+
from .agent import Agent as Agent
14+
from .state import State as State
1515

1616
else:
1717
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/audio/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
_import_structure = {"whisper_local": ["LocalWhisperTranscriber"], "whisper_remote": ["RemoteWhisperTranscriber"]}
1111

1212
if TYPE_CHECKING:
13-
from .whisper_local import LocalWhisperTranscriber
14-
from .whisper_remote import RemoteWhisperTranscriber
13+
from .whisper_local import LocalWhisperTranscriber as LocalWhisperTranscriber
14+
from .whisper_remote import RemoteWhisperTranscriber as RemoteWhisperTranscriber
1515

1616
else:
1717
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/builders/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
}
1515

1616
if TYPE_CHECKING:
17-
from .answer_builder import AnswerBuilder
18-
from .chat_prompt_builder import ChatPromptBuilder
19-
from .prompt_builder import PromptBuilder
17+
from .answer_builder import AnswerBuilder as AnswerBuilder
18+
from .chat_prompt_builder import ChatPromptBuilder as ChatPromptBuilder
19+
from .prompt_builder import PromptBuilder as PromptBuilder
2020

2121
else:
2222
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/caching/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
_import_structure = {"cache_checker": ["CacheChecker"]}
1111

1212
if TYPE_CHECKING:
13-
from .cache_checker import CacheChecker
13+
from .cache_checker import CacheChecker as CacheChecker
1414

1515
else:
1616
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/classifiers/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
}
1414

1515
if TYPE_CHECKING:
16-
from .document_language_classifier import DocumentLanguageClassifier
17-
from .zero_shot_document_classifier import TransformersZeroShotDocumentClassifier
16+
from .document_language_classifier import DocumentLanguageClassifier as DocumentLanguageClassifier
17+
from .zero_shot_document_classifier import (
18+
TransformersZeroShotDocumentClassifier as TransformersZeroShotDocumentClassifier,
19+
)
1820

1921
else:
2022
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/connectors/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
_import_structure = {"openapi": ["OpenAPIConnector"], "openapi_service": ["OpenAPIServiceConnector"]}
1111

1212
if TYPE_CHECKING:
13-
from .openapi import OpenAPIConnector
14-
from .openapi_service import OpenAPIServiceConnector
13+
from .openapi import OpenAPIConnector as OpenAPIConnector
14+
from .openapi_service import OpenAPIServiceConnector as OpenAPIServiceConnector
1515

1616
else:
1717
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/converters/__init__.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@
2727
}
2828

2929
if TYPE_CHECKING:
30-
from .azure import AzureOCRDocumentConverter
31-
from .csv import CSVToDocument
32-
from .docx import DOCXToDocument
33-
from .html import HTMLToDocument
34-
from .json import JSONConverter
35-
from .markdown import MarkdownToDocument
36-
from .msg import MSGToDocument
37-
from .multi_file_converter import MultiFileConverter
38-
from .openapi_functions import OpenAPIServiceToFunctions
39-
from .output_adapter import OutputAdapter
40-
from .pdfminer import PDFMinerToDocument
41-
from .pptx import PPTXToDocument
42-
from .pypdf import PyPDFToDocument
43-
from .tika import TikaDocumentConverter
44-
from .txt import TextFileToDocument
45-
from .xlsx import XLSXToDocument
30+
from .azure import AzureOCRDocumentConverter as AzureOCRDocumentConverter
31+
from .csv import CSVToDocument as CSVToDocument
32+
from .docx import DOCXToDocument as DOCXToDocument
33+
from .html import HTMLToDocument as HTMLToDocument
34+
from .json import JSONConverter as JSONConverter
35+
from .markdown import MarkdownToDocument as MarkdownToDocument
36+
from .msg import MSGToDocument as MSGToDocument
37+
from .multi_file_converter import MultiFileConverter as MultiFileConverter
38+
from .openapi_functions import OpenAPIServiceToFunctions as OpenAPIServiceToFunctions
39+
from .output_adapter import OutputAdapter as OutputAdapter
40+
from .pdfminer import PDFMinerToDocument as PDFMinerToDocument
41+
from .pptx import PPTXToDocument as PPTXToDocument
42+
from .pypdf import PyPDFToDocument as PyPDFToDocument
43+
from .tika import TikaDocumentConverter as TikaDocumentConverter
44+
from .txt import TextFileToDocument as TextFileToDocument
45+
from .xlsx import XLSXToDocument as XLSXToDocument
4646

4747
else:
4848
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/embedders/__init__.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@
1919
}
2020

2121
if TYPE_CHECKING:
22-
from .azure_document_embedder import AzureOpenAIDocumentEmbedder
23-
from .azure_text_embedder import AzureOpenAITextEmbedder
24-
from .hugging_face_api_document_embedder import HuggingFaceAPIDocumentEmbedder
25-
from .hugging_face_api_text_embedder import HuggingFaceAPITextEmbedder
26-
from .openai_document_embedder import OpenAIDocumentEmbedder
27-
from .openai_text_embedder import OpenAITextEmbedder
28-
from .sentence_transformers_document_embedder import SentenceTransformersDocumentEmbedder
29-
from .sentence_transformers_text_embedder import SentenceTransformersTextEmbedder
22+
from .azure_document_embedder import AzureOpenAIDocumentEmbedder as AzureOpenAIDocumentEmbedder
23+
from .azure_text_embedder import AzureOpenAITextEmbedder as AzureOpenAITextEmbedder
24+
from .hugging_face_api_document_embedder import HuggingFaceAPIDocumentEmbedder as HuggingFaceAPIDocumentEmbedder
25+
from .hugging_face_api_text_embedder import HuggingFaceAPITextEmbedder as HuggingFaceAPITextEmbedder
26+
from .openai_document_embedder import OpenAIDocumentEmbedder as OpenAIDocumentEmbedder
27+
from .openai_text_embedder import OpenAITextEmbedder as OpenAITextEmbedder
28+
from .sentence_transformers_document_embedder import (
29+
SentenceTransformersDocumentEmbedder as SentenceTransformersDocumentEmbedder,
30+
)
31+
from .sentence_transformers_text_embedder import (
32+
SentenceTransformersTextEmbedder as SentenceTransformersTextEmbedder,
33+
)
3034

3135
else:
3236
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/evaluators/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
}
2121

2222
if TYPE_CHECKING:
23-
from .answer_exact_match import AnswerExactMatchEvaluator
24-
from .context_relevance import ContextRelevanceEvaluator
25-
from .document_map import DocumentMAPEvaluator
26-
from .document_mrr import DocumentMRREvaluator
27-
from .document_ndcg import DocumentNDCGEvaluator
28-
from .document_recall import DocumentRecallEvaluator
29-
from .faithfulness import FaithfulnessEvaluator
30-
from .llm_evaluator import LLMEvaluator
31-
from .sas_evaluator import SASEvaluator
23+
from .answer_exact_match import AnswerExactMatchEvaluator as AnswerExactMatchEvaluator
24+
from .context_relevance import ContextRelevanceEvaluator as ContextRelevanceEvaluator
25+
from .document_map import DocumentMAPEvaluator as DocumentMAPEvaluator
26+
from .document_mrr import DocumentMRREvaluator as DocumentMRREvaluator
27+
from .document_ndcg import DocumentNDCGEvaluator as DocumentNDCGEvaluator
28+
from .document_recall import DocumentRecallEvaluator as DocumentRecallEvaluator
29+
from .faithfulness import FaithfulnessEvaluator as FaithfulnessEvaluator
30+
from .llm_evaluator import LLMEvaluator as LLMEvaluator
31+
from .sas_evaluator import SASEvaluator as SASEvaluator
3232

3333
else:
3434
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

haystack/components/extractors/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
}
1414

1515
if TYPE_CHECKING:
16-
from .llm_metadata_extractor import LLMMetadataExtractor
17-
from .named_entity_extractor import NamedEntityAnnotation, NamedEntityExtractor, NamedEntityExtractorBackend
16+
from .llm_metadata_extractor import LLMMetadataExtractor as LLMMetadataExtractor
17+
from .named_entity_extractor import NamedEntityAnnotation as NamedEntityAnnotation
18+
from .named_entity_extractor import NamedEntityExtractor as NamedEntityExtractor
19+
from .named_entity_extractor import NamedEntityExtractorBackend as NamedEntityExtractorBackend
1820

1921
else:
2022
sys.modules[__name__] = LazyImporter(name=__name__, module_file=__file__, import_structure=_import_structure)

0 commit comments

Comments
 (0)