feat: Add better language support presidio

integrations/presidio/src/haystack_integrations/components/common/presidio/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2022-present deepset GmbH <info@deepset.ai>
+#
+# SPDX-License-Identifier: Apache-2.0

integrations/presidio/src/haystack_integrations/components/common/presidio/utils.py

@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2022-present deepset GmbH <info@deepset.ai>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Maps ISO 639-1 language codes to the largest available spaCy model for that language.
+# Used to automatically configure the NLP engine when only `language` is specified.
+# See https://spacy.io/models for the full list of available models.
+SPACY_DEFAULT_MODELS: dict[str, str] = {
+    "ca": "ca_core_news_lg",
+    "zh": "zh_core_web_lg",
+    "hr": "hr_core_news_lg",
+    "da": "da_core_news_lg",
+    "nl": "nl_core_news_lg",
+    "en": "en_core_web_lg",
+    "fi": "fi_core_news_lg",
+    "fr": "fr_core_news_lg",
+    "de": "de_core_news_lg",
+    "el": "el_core_news_lg",
+    "it": "it_core_news_lg",
+    "ja": "ja_core_news_lg",
+    "ko": "ko_core_news_lg",
+    "lt": "lt_core_news_lg",
+    "mk": "mk_core_news_lg",
+    "nb": "nb_core_news_lg",
+    "pl": "pl_core_news_lg",
+    "pt": "pt_core_news_lg",
+    "ro": "ro_core_news_lg",
+    "ru": "ru_core_news_lg",
+    "sl": "sl_core_news_lg",
+    "es": "es_core_news_lg",
+    "sv": "sv_core_news_lg",
+    "uk": "uk_core_news_lg",
+}

integrations/presidio/src/haystack_integrations/components/extractors/presidio/presidio_entity_extractor.py

@@ -3,9 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import replace
+from typing import ClassVar
 
 from haystack import Document, component, logging
 from presidio_analyzer import AnalyzerEngine
+from presidio_analyzer.nlp_engine import NlpEngineProvider
+
+from haystack_integrations.components.common.presidio.utils import SPACY_DEFAULT_MODELS as _SPACY_DEFAULT_MODELS
 
 logger = logging.getLogger(__name__)
 
@@ -40,18 +44,29 @@ class PresidioEntityExtractor:
     ```
     """
 
+    SPACY_DEFAULT_MODELS: ClassVar[dict[str, str]] = _SPACY_DEFAULT_MODELS
+    """Mapping from ISO 639-1 language code to the largest available spaCy model for that language.
+
+    Used to automatically select an NLP model when `models` is not specified.
+    See [spaCy documentation](https://spacy.io/models) for the full list of available spaCy models.
+    """
+
     def __init__(
         self,
         *,
         language: str = "en",
         entities: list[str] | None = None,
         score_threshold: float = 0.35,
+        models: list[dict[str, str]] | None = None,
     ) -> None:
         """
         Initializes the PresidioEntityExtractor.
 
         :param language:
-            Language code for PII detection. Defaults to `"en"`.
+            ISO 639-1 language code for PII detection. Defaults to `"en"`.
+            For languages in the built-in mapping (e.g. `"de"`, `"fr"`, `"es"`), the appropriate
+            spaCy model is loaded automatically at warm-up time — no need to set `models`.
+            For unsupported languages, use the `models` parameter to configure a custom model.
             See [Presidio supported languages](https://microsoft.github.io/presidio/analyzer/languages/).
         :param entities:
             List of PII entity types to detect (e.g. `["PERSON", "EMAIL_ADDRESS"]`).
@@ -60,10 +75,18 @@ def __init__(
         :param score_threshold:
             Minimum confidence score (0-1) for a detected entity to be included. Defaults to `0.35`.
             See [Presidio analyzer documentation](https://microsoft.github.io/presidio/analyzer/).
+        :param models:
+            Advanced override: list of spaCy model configurations.
+            Each entry must contain `"lang_code"` and `"model_name"` keys,
+            e.g. `[{"lang_code": "fr", "model_name": "fr_core_news_md"}]`.
+            Use this only when you need a specific model variant or a language not covered by the
+            built-in mapping. If `None`, the model is selected automatically from `SPACY_DEFAULT_MODELS`
+            based on `language`.
         """
         self.language = language
         self.entities = entities
         self.score_threshold = score_threshold
+        self.models = models
         self._analyzer: AnalyzerEngine | None = None
         self._is_warmed_up = False
 
@@ -77,7 +100,21 @@ def warm_up(self) -> None:
         if self._is_warmed_up:
             return
 
-        self._analyzer = AnalyzerEngine()
+        models = self.models
+        if models is None:
+            if self.language not in self.SPACY_DEFAULT_MODELS:
+                supported = ", ".join(sorted(self.SPACY_DEFAULT_MODELS))
+                msg = (
+                    f"No default spaCy model is available for language '{self.language}'. "
+                    f"Use the `models` parameter to specify a custom model. "
+                    f"Languages with built-in support: {supported}."
+                )
+                raise ValueError(msg)
+            models = [{"lang_code": self.language, "model_name": self.SPACY_DEFAULT_MODELS[self.language]}]
+
+        nlp_engine = NlpEngineProvider(nlp_configuration={"nlp_engine_name": "spacy", "models": models}).create_engine()
+        supported_languages = [m["lang_code"] for m in models]
+        self._analyzer = AnalyzerEngine(nlp_engine=nlp_engine, supported_languages=supported_languages)
 
         self._is_warmed_up = True
 

integrations/presidio/src/haystack_integrations/components/preprocessors/presidio/presidio_document_cleaner.py

@@ -2,10 +2,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from typing import ClassVar
+
 from haystack import Document, component, logging
 from presidio_analyzer import AnalyzerEngine
+from presidio_analyzer.nlp_engine import NlpEngineProvider
 from presidio_anonymizer import AnonymizerEngine
 
+from haystack_integrations.components.common.presidio.utils import SPACY_DEFAULT_MODELS as _SPACY_DEFAULT_MODELS
+
 logger = logging.getLogger(__name__)
 
 
@@ -36,18 +41,29 @@ class PresidioDocumentCleaner:
     ```
     """
 
+    SPACY_DEFAULT_MODELS: ClassVar[dict[str, str]] = _SPACY_DEFAULT_MODELS
+    """Mapping from ISO 639-1 language code to the largest available spaCy model for that language.
+
+    Used to automatically select an NLP model when `models` is not specified.
+    See [spaCy documentation](https://spacy.io/models) for the full list of available spaCy models.
+    """
+
     def __init__(
         self,
         *,
         language: str = "en",
         entities: list[str] | None = None,
         score_threshold: float = 0.35,
+        models: list[dict[str, str]] | None = None,
     ) -> None:
         """
         Initializes the PresidioDocumentCleaner.
 
         :param language:
-            Language code for PII detection. Defaults to `"en"`.
+            ISO 639-1 language code for PII detection. Defaults to `"en"`.
+            For languages in the built-in mapping (e.g. `"de"`, `"fr"`, `"es"`), the appropriate
+            spaCy model is loaded automatically at warm-up time — no need to set `models`.
+            For unsupported languages, use the `models` parameter to configure a custom model.
             See [Presidio supported languages](https://microsoft.github.io/presidio/analyzer/languages/).
         :param entities:
             List of PII entity types to detect and anonymize (e.g. `["PERSON", "EMAIL_ADDRESS"]`).
@@ -56,10 +72,18 @@ def __init__(
         :param score_threshold:
             Minimum confidence score (0-1) for a detected entity to be anonymized. Defaults to `0.35`.
             See [Presidio analyzer documentation](https://microsoft.github.io/presidio/analyzer/).
+        :param models:
+            Advanced override: list of spaCy model configurations.
+            Each entry must contain `"lang_code"` and `"model_name"` keys,
+            e.g. `[{"lang_code": "fr", "model_name": "fr_core_news_md"}]`.
+            Use this only when you need a specific model variant or a language not covered by the
+            built-in mapping. If `None`, the model is selected automatically from `SPACY_DEFAULT_MODELS`
+            based on `language`.
         """
         self.language = language
         self.entities = entities
         self.score_threshold = score_threshold
+        self.models = models
         self._analyzer: AnalyzerEngine | None = None
         self._anonymizer: AnonymizerEngine | None = None
         self._is_warmed_up = False
@@ -74,7 +98,21 @@ def warm_up(self) -> None:
         if self._is_warmed_up:
             return
 
-        self._analyzer = AnalyzerEngine()
+        models = self.models
+        if models is None:
+            if self.language not in self.SPACY_DEFAULT_MODELS:
+                supported = ", ".join(sorted(self.SPACY_DEFAULT_MODELS))
+                msg = (
+                    f"No default spaCy model is available for language '{self.language}'. "
+                    f"Use the `models` parameter to specify a custom model. "
+                    f"Languages with built-in support: {supported}."
+                )
+                raise ValueError(msg)
+            models = [{"lang_code": self.language, "model_name": self.SPACY_DEFAULT_MODELS[self.language]}]
+
+        nlp_engine = NlpEngineProvider(nlp_configuration={"nlp_engine_name": "spacy", "models": models}).create_engine()
+        supported_languages = [m["lang_code"] for m in models]
+        self._analyzer = AnalyzerEngine(nlp_engine=nlp_engine, supported_languages=supported_languages)
         self._anonymizer = AnonymizerEngine()
 
         self._is_warmed_up = True

integrations/presidio/src/haystack_integrations/components/preprocessors/presidio/presidio_text_cleaner.py

@@ -2,10 +2,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from typing import ClassVar
+
 from haystack import component, logging
 from presidio_analyzer import AnalyzerEngine
+from presidio_analyzer.nlp_engine import NlpEngineProvider
 from presidio_anonymizer import AnonymizerEngine
 
+from haystack_integrations.components.common.presidio.utils import SPACY_DEFAULT_MODELS as _SPACY_DEFAULT_MODELS
+
 logger = logging.getLogger(__name__)
 
 
@@ -33,18 +38,29 @@ class PresidioTextCleaner:
     ```
     """
 
+    SPACY_DEFAULT_MODELS: ClassVar[dict[str, str]] = _SPACY_DEFAULT_MODELS
+    """Mapping from ISO 639-1 language code to the largest available spaCy model for that language.
+
+    Used to automatically select an NLP model when `models` is not specified.
+    See [spaCy documentation](https://spacy.io/models) for the full list of available spaCy models.
+    """
+
     def __init__(
         self,
         *,
         language: str = "en",
         entities: list[str] | None = None,
         score_threshold: float = 0.35,
+        models: list[dict[str, str]] | None = None,
     ) -> None:
         """
         Initializes the PresidioTextCleaner.
 
         :param language:
-            Language code for PII detection. Defaults to `"en"`.
+            ISO 639-1 language code for PII detection. Defaults to `"en"`.
+            For languages in the built-in mapping (e.g. `"de"`, `"fr"`, `"es"`), the appropriate
+            spaCy model is loaded automatically at warm-up time — no need to set `models`.
+            For unsupported languages, use the `models` parameter to configure a custom model.
             See [Presidio supported languages](https://microsoft.github.io/presidio/analyzer/languages/).
         :param entities:
             List of PII entity types to detect and anonymize (e.g. `["PERSON", "PHONE_NUMBER"]`).
@@ -53,10 +69,18 @@ def __init__(
         :param score_threshold:
             Minimum confidence score (0-1) for a detected entity to be anonymized. Defaults to `0.35`.
             See [Presidio analyzer documentation](https://microsoft.github.io/presidio/analyzer/).
+        :param models:
+            Advanced override: list of spaCy model configurations.
+            Each entry must contain `"lang_code"` and `"model_name"` keys,
+            e.g. `[{"lang_code": "fr", "model_name": "fr_core_news_md"}]`.
+            Use this only when you need a specific model variant or a language not covered by the
+            built-in mapping. If `None`, the model is selected automatically from `SPACY_DEFAULT_MODELS`
+            based on `language`.
         """
         self.language = language
         self.entities = entities
         self.score_threshold = score_threshold
+        self.models = models
         self._analyzer: AnalyzerEngine | None = None
         self._anonymizer: AnonymizerEngine | None = None
         self._is_warmed_up = False
@@ -71,7 +95,21 @@ def warm_up(self) -> None:
         if self._is_warmed_up:
             return
 
-        self._analyzer = AnalyzerEngine()
+        models = self.models
+        if models is None:
+            if self.language not in self.SPACY_DEFAULT_MODELS:
+                supported = ", ".join(sorted(self.SPACY_DEFAULT_MODELS))
+                msg = (
+                    f"No default spaCy model is available for language '{self.language}'. "
+                    f"Use the `models` parameter to specify a custom model. "
+                    f"Languages with built-in support: {supported}."
+                )
+                raise ValueError(msg)
+            models = [{"lang_code": self.language, "model_name": self.SPACY_DEFAULT_MODELS[self.language]}]
+
+        nlp_engine = NlpEngineProvider(nlp_configuration={"nlp_engine_name": "spacy", "models": models}).create_engine()
+        supported_languages = [m["lang_code"] for m in models]
+        self._analyzer = AnalyzerEngine(nlp_engine=nlp_engine, supported_languages=supported_languages)
         self._anonymizer = AnonymizerEngine()
 
         self._is_warmed_up = True