From 9f9368943fe71b2bffd3df7266f5932e449656de Mon Sep 17 00:00:00 2001 From: Ghislain Vaillant Date: Thu, 16 May 2024 14:06:13 +0200 Subject: [PATCH] WIP: Fix edsnlp and spacy optional imports --- medkit/text/ner/edsnlp_date_matcher.py | 4 ++-- medkit/text/ner/edsnlp_tnm_matcher.py | 4 ++-- medkit/text/ner/tnm_attribute.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/medkit/text/ner/edsnlp_date_matcher.py b/medkit/text/ner/edsnlp_date_matcher.py index 3f35b1f7..3bfaad5d 100644 --- a/medkit/text/ner/edsnlp_date_matcher.py +++ b/medkit/text/ner/edsnlp_date_matcher.py @@ -4,8 +4,6 @@ from typing import Iterator -import spacy - from medkit.core.text import Entity, Segment, span_utils from medkit.core.text.operation import NEROperation from medkit.text.spacy.edsnlp import build_date_attribute, build_duration_attribute @@ -47,6 +45,8 @@ def __init__( attrs_to_copy: list[str] | None = None, uid: str | None = None, ): + import spacy + super().__init__(output_label=output_label, attrs_to_copy=attrs_to_copy, uid=uid) if attrs_to_copy is None: diff --git a/medkit/text/ner/edsnlp_tnm_matcher.py b/medkit/text/ner/edsnlp_tnm_matcher.py index ec65d641..f0dc4220 100644 --- a/medkit/text/ner/edsnlp_tnm_matcher.py +++ b/medkit/text/ner/edsnlp_tnm_matcher.py @@ -4,8 +4,6 @@ from typing import Iterator -import spacy - from medkit.core.text import Entity, Segment, span_utils from medkit.core.text.operation import NEROperation from medkit.text.ner.tnm_attribute import TNMAttribute @@ -40,6 +38,8 @@ def __init__( attrs_to_copy: list[str] | None = None, uid: str | None = None, ): + import spacy + super().__init__(output_label=output_label, attrs_to_copy=attrs_to_copy, uid=uid) if attrs_to_copy is None: diff --git a/medkit/text/ner/tnm_attribute.py b/medkit/text/ner/tnm_attribute.py index ce755f7c..828a055f 100644 --- a/medkit/text/ner/tnm_attribute.py +++ b/medkit/text/ner/tnm_attribute.py @@ -10,7 +10,7 @@ from medkit._import import import_optional from medkit.core import Attribute, dict_conv -_ = import_optional("edsnlp", extra="") +_ = import_optional("edsnlp", extra="edsnlp") from edsnlp.pipelines.ner.tnm.model import ( # noqa: E402 TNM,