CU-8699qzfdk Improve optional part checks (#113)

* CU-8699qzfdk: Fix issue with MetaCAT local imports happening before ensurance of optional parts having been installed

* CU-8699qzfdk: Fix issue with dcti-based NER - avoid doing local imports before knowing they are available

Author: mart-r

medcat-v2/medcat/components/addons/meta_cat/__init__.py

@@ -1,15 +1,17 @@
 from medcat.utils.import_utils import ensure_optional_extras_installed
 import medcat
 
-from .meta_cat import (MetaCAT, MetaCATAddon,
+_EXTRA_NAME = "meta-cat"
+ensure_optional_extras_installed(medcat.__name__, _EXTRA_NAME)
+
+# NOTE: need to check above before local imports, otherwise there's no
+#       point since the imports below will have already failed
+
+from .meta_cat import (MetaCAT, MetaCATAddon,  # noqa
                        get_meta_annotations, MetaAnnotationValue)
 
 
 __all__ = ["MetaCAT", "MetaCATAddon",
            "get_meta_annotations", "MetaAnnotationValue"]
 
 # NOTE: the _ is converted to - automatically
-_EXTRA_NAME = "meta-cat"
-
-
-ensure_optional_extras_installed(medcat.__name__, _EXTRA_NAME)

medcat-v2/medcat/components/ner/dict_based_ner.py

@@ -9,17 +9,17 @@
 from medcat.vocab import Vocab
 from medcat.cdb import CDB
 from medcat.config.config import ComponentConfig
-
-from ahocorasick import Automaton
 import medcat
 
 
 # NOTE: the _ is converted to - automatically
 _EXTRA_NAME = "dict-ner"
 
-
+# NOTE: need to do this before below import for more useful error
 ensure_optional_extras_installed(medcat.__name__, _EXTRA_NAME)
 
+from ahocorasick import Automaton # noqa
+
 
 logger = logging.getLogger(__name__)