Skip to content

Commit e572bdd

Browse files
authored
CU-869a9mten Improve duplicate name imports (#119)
* CU-869a9mten: Import stats stuff at package level to avoid duplicate names * CU-869a9mten: Import pipeline at package level to avoid duplicate names * CU-869a9mten: Update usage of new path for pipeline * CU-869a9mten: Simplify some config imports
1 parent 623be37 commit e572bdd

File tree

6 files changed

+20
-5
lines changed

6 files changed

+20
-5
lines changed

medcat-v2/medcat/cat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from medcat.storage.mp_ents_save import BatchAnnotationSaver
2323
from medcat.utils.fileutils import ensure_folder_if_parent
2424
from medcat.utils.hasher import Hasher
25-
from medcat.pipeline.pipeline import Pipeline
25+
from medcat.pipeline import Pipeline
2626
from medcat.tokenizing.tokens import MutableDocument, MutableEntity
2727
from medcat.tokenizing.tokenizers import SaveableTokenizer, TOKENIZER_PREFIX
2828
from medcat.data.entities import Entity, Entities, OnlyCUIEntities

medcat-v2/medcat/config/__init__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
from .config import Config
1+
from .config import (
2+
Config, Ner, CDBMaker, Linking, LinkingFilters, ModelMeta,
3+
TrainingDescriptor, Components, AnnotationOutput, Preprocessing,
4+
UsageMonitor, NLPConfig)
25

3-
__all__ = ['Config', ]
6+
__all__ = [
7+
'Config', 'Ner', 'CDBMaker', 'Linking', 'LinkingFilters', 'ModelMeta',
8+
'TrainingDescriptor', 'Components', 'AnnotationOutput', 'Preprocessing',
9+
'UsageMonitor', 'NLPConfig']

medcat-v2/medcat/model_creation/cdb_maker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import re
66
from typing import Optional, Union, Any
77

8-
from medcat.pipeline.pipeline import Pipeline
8+
from medcat.pipeline import Pipeline
99
from medcat.cdb import CDB
1010
from medcat.config import Config
1111
from medcat.preprocessors.cleaners import prepare_name

medcat-v2/medcat/pipeline/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from .pipeline import Pipeline
2+
3+
4+
__all__ = ['Pipeline']

medcat-v2/medcat/stats/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from .stats import get_stats
2+
from .kfold import get_k_fold_stats
3+
4+
5+
__all__ = ['get_stats', 'get_k_fold_stats']

medcat-v2/medcat/trainer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from medcat.preprocessors.cleaners import prepare_name, NameDescriptor
1717
from medcat.components.types import CoreComponentType, TrainableComponent
1818
from medcat.components.addons.addons import AddonComponent
19-
from medcat.pipeline.pipeline import Pipeline
19+
from medcat.pipeline import Pipeline
2020

2121

2222
logger = logging.getLogger(__name__)

0 commit comments

Comments
 (0)