Skip to content

Commit 4c021fa

Browse files
authored
chore!: remove NamedEntityExtractor + spacy-related code (#11614)
1 parent 828acdd commit 4c021fa

9 files changed

Lines changed: 48 additions & 904 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
pip install hatch==${{ env.HATCH_VERSION }} --uploaded-prior-to=P1D
4242
4343
- name: Run tests
44-
run: hatch run e2e:test
44+
run: hatch run test:e2e
4545

4646
- name: Notify Slack on nightly failure
4747
if: failure() && github.event_name == 'schedule'

MIGRATION.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ pip install <new-package>
9999
| `from haystack.components.routers import TransformersTextRouter` | `transformers-haystack` | `from haystack_integrations.components.routers.transformers import TransformersTextRouter` |
100100
| `from haystack.components.routers import TransformersZeroShotTextRouter` | `transformers-haystack` | `from haystack_integrations.components.routers.transformers import TransformersZeroShotTextRouter` |
101101
| `from haystack.components.websearch import SerperDevWebSearch` | `serperdev-haystack` | `from haystack_integrations.components.websearch.serperdev import SerperDevWebSearch` |
102-
| `from haystack.components.websearch import SearchApiWebSearch` | `searchapi-haystack` | `from haystack_integrations.components.websearch.searchapi import SearchApiWebSearch` |
102+
| `from haystack.components.websearch import SearchApiWebSearch` | `searchapi-haystack` | `from haystack_integrations.components.websearch.searchapi import SearchApiWebSearch` || `from haystack.components.extractors import NamedEntityExtractor` (Hugging Face backend) | `transformers-haystack` | `from haystack_integrations.components.extractors.transformers import TransformersNamedEntityExtractor` |
103+
| `from haystack.components.extractors import NamedEntityExtractor` (spaCy backend) | `spacy-haystack` | `from haystack_integrations.components.extractors.spacy import SpacyNamedEntityExtractor` |
103104

104105
### `TransformersSimilarityRanker` removed
105106

e2e/pipelines/test_named_entity_extractor.py

Lines changed: 0 additions & 165 deletions
This file was deleted.

haystack/components/extractors/__init__.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,10 @@
77

88
from lazy_imports import LazyImporter
99

10-
_import_structure = {
11-
"llm_metadata_extractor": ["LLMMetadataExtractor"],
12-
"regex_text_extractor": ["RegexTextExtractor"],
13-
"named_entity_extractor": ["NamedEntityAnnotation", "NamedEntityExtractor", "NamedEntityExtractorBackend"],
14-
}
10+
_import_structure = {"llm_metadata_extractor": ["LLMMetadataExtractor"], "regex_text_extractor": ["RegexTextExtractor"]}
1511

1612
if TYPE_CHECKING:
1713
from .llm_metadata_extractor import LLMMetadataExtractor as LLMMetadataExtractor
18-
from .named_entity_extractor import NamedEntityAnnotation as NamedEntityAnnotation
19-
from .named_entity_extractor import NamedEntityExtractor as NamedEntityExtractor
20-
from .named_entity_extractor import NamedEntityExtractorBackend as NamedEntityExtractorBackend
2114
from .regex_text_extractor import RegexTextExtractor as RegexTextExtractor
2215

2316
else:

0 commit comments

Comments
 (0)