moved annotators to annotation package (#162)

elifesciences · Oct 20, 2020 · f963bee · f963bee
1 parent e7f6baf
commit f963bee
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/sciencebeam_trainer_grobid_tools/annotation/__init__.py b/sciencebeam_trainer_grobid_tools/annotation/__init__.py
diff --git a/...document/affiliation_address_annotator.py → ...notation/affiliation_address_annotator.py b/...document/affiliation_address_annotator.py → ...notation/affiliation_address_annotator.py
diff --git a/...id_tools/structured_document/annotator.py → ...iner_grobid_tools/annotation/annotator.py b/...id_tools/structured_document/annotator.py → ...iner_grobid_tools/annotation/annotator.py
@@ -7,7 +7,7 @@
     strip_tag_prefix
 )
 
-from .grobid_training_tei import (
+from ..structured_document.grobid_training_tei import (
     SUB_LEVEL,
     load_grobid_training_tei_structured_document,
     save_grobid_training_tei_structured_document,

diff --git a/...uctured_document/line_number_annotator.py → ...tools/annotation/line_number_annotator.py b/...uctured_document/line_number_annotator.py → ...tools/annotation/line_number_annotator.py
diff --git a/...ols/structured_document/matching_utils.py → ...grobid_tools/annotation/matching_utils.py b/...ols/structured_document/matching_utils.py → ...grobid_tools/annotation/matching_utils.py
diff --git a/...tructured_document/reference_annotator.py → ...d_tools/annotation/reference_annotator.py b/...tructured_document/reference_annotator.py → ...d_tools/annotation/reference_annotator.py
@@ -20,12 +20,12 @@
     GrobidTrainingTeiStructuredDocument
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.simple_matching_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.simple_matching_annotator import (
     get_extended_line_token_tags,
     to_inside_tag
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.matching_utils import (
+from sciencebeam_trainer_grobid_tools.annotation.matching_utils import (
     JoinedText
 )
 

diff --git a/...ctured_document/segmentation_annotator.py → ...ools/annotation/segmentation_annotator.py b/...ctured_document/segmentation_annotator.py → ...ools/annotation/segmentation_annotator.py
diff --git a/...red_document/simple_matching_annotator.py → ...s/annotation/simple_matching_annotator.py b/...red_document/simple_matching_annotator.py → ...s/annotation/simple_matching_annotator.py
@@ -31,7 +31,7 @@
     iter_fuzzy_search_all_index_ranges
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.matching_utils import (
+from sciencebeam_trainer_grobid_tools.annotation.matching_utils import (
     SequenceWrapper,
     PendingSequences,
     SequencesText,

diff --git a/sciencebeam_trainer_grobid_tools/annotation/sub_tag_annotator.py b/sciencebeam_trainer_grobid_tools/annotation/sub_tag_annotator.py
@@ -9,7 +9,7 @@
     GrobidTrainingTeiStructuredDocument
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.simple_matching_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.simple_matching_annotator import (
     SimpleMatchingAnnotator
 )
 

diff --git a/sciencebeam_trainer_grobid_tools/auto_annotate_affiliation_address.py b/sciencebeam_trainer_grobid_tools/auto_annotate_affiliation_address.py
@@ -30,11 +30,11 @@
     AnnotatorConfig
 )
 
-from .structured_document.simple_matching_annotator import (
+from .annotation.simple_matching_annotator import (
     SimpleMatchingAnnotator
 )
 
-from .structured_document.affiliation_address_annotator import (
+from .annotation.affiliation_address_annotator import (
     AffiliationAddressAnnotatorConfig,
     AffiliationAddressPostProcessingAnnotator
 )

diff --git a/sciencebeam_trainer_grobid_tools/auto_annotate_reference.py b/sciencebeam_trainer_grobid_tools/auto_annotate_reference.py
@@ -30,11 +30,11 @@
     AnnotatorConfig
 )
 
-from .structured_document.simple_matching_annotator import (
+from .annotation.simple_matching_annotator import (
     SimpleMatchingAnnotator
 )
 
-from .structured_document.reference_annotator import (
+from .annotation.reference_annotator import (
     DEFAULT_IDNO_PREFIX_REGEX,
     ReferenceAnnotatorConfig,
     ReferencePostProcessingAnnotator

diff --git a/sciencebeam_trainer_grobid_tools/auto_annotate_segmentation.py b/sciencebeam_trainer_grobid_tools/auto_annotate_segmentation.py
@@ -21,7 +21,7 @@
     ContainerNodePaths,
     DEFAULT_TAG_KEY
 )
-from .structured_document.segmentation_annotator import (
+from .annotation.segmentation_annotator import (
     SegmentationAnnotator,
     SegmentationConfig,
     parse_segmentation_config

diff --git a/sciencebeam_trainer_grobid_tools/auto_annotate_utils.py b/sciencebeam_trainer_grobid_tools/auto_annotate_utils.py
@@ -42,17 +42,17 @@
 from .utils.string import comma_separated_str_to_list, parse_dict
 from .utils.regex import regex_change_name
 from .utils.xml import parse_xml
-from .structured_document.annotator import annotate_structured_document
+from .annotation.annotator import annotate_structured_document
 
-from .structured_document.line_number_annotator import (
+from .annotation.line_number_annotator import (
     DEFAULT_MIN_LINE_NUMBER_COUNT,
     DEFAULT_MAX_LINE_NUMBER_GAP,
     DEFAULT_LINE_NUMBER_RATIO_THRESHOLD,
     TextLineNumberAnnotatorConfig,
     TextLineNumberAnnotator
 )
 
-from .structured_document.simple_matching_annotator import (
+from .annotation.simple_matching_annotator import (
     SimpleMatchingAnnotator,
     SimpleSimpleMatchingConfig,
     get_simple_tag_config_map

diff --git a/tests/structured_document/annotator_test.py → tests/annotation/annotator_test.py b/tests/structured_document/annotator_test.py → tests/annotation/annotator_test.py
@@ -14,11 +14,11 @@
     DEFAULT_TAG_TO_TEI_PATH_MAPPING as _DEFAULT_TAG_TO_TEI_PATH_MAPPING
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.annotator import (
     annotate_structured_document_inplace
 )
 
-from .grobid_training_tei_test import _tei
+from ..structured_document.grobid_training_tei_test import _tei
 
 
 LOGGER = logging.getLogger(__name__)

diff --git a/...ed_document/line_number_annotator_test.py → .../annotation/line_number_annotator_test.py b/...ed_document/line_number_annotator_test.py → .../annotation/line_number_annotator_test.py
@@ -8,7 +8,7 @@
     ContainerNodePaths
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.line_number_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.line_number_annotator import (
     TextLineNumberAnnotatorConfig,
     TextLineNumberAnnotator,
     DEFAULT_LINE_NO_TAG as LINE_NO_TAG

diff --git a/...tructured_document/matching_utils_test.py → tests/annotation/matching_utils_test.py b/...tructured_document/matching_utils_test.py → tests/annotation/matching_utils_test.py
@@ -4,7 +4,7 @@
     SimpleToken
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.matching_utils import (
+from sciencebeam_trainer_grobid_tools.annotation.matching_utils import (
     join_with_index_ranges,
     SequenceWrapper
 )

diff --git a/...ured_document/reference_annotator_test.py → tests/annotation/reference_annotator_test.py b/...ured_document/reference_annotator_test.py → tests/annotation/reference_annotator_test.py
@@ -1,4 +1,4 @@
-from sciencebeam_trainer_grobid_tools.structured_document.reference_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.reference_annotator import (
     DEFAULT_IDNO_PREFIX_REGEX,
     get_prefix_extended_token_tags,
     get_suffix_extended_token_tags,

diff --git a/...d_document/segmentation_annotator_test.py → ...annotation/segmentation_annotator_test.py b/...d_document/segmentation_annotator_test.py → ...annotation/segmentation_annotator_test.py
@@ -12,7 +12,7 @@
     I_TAG_PREFIX
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.segmentation_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.segmentation_annotator import (
     parse_segmentation_config,
     SegmentationConfig,
     SegmentationAnnotator,

diff --git a/...ocument/simple_matching_annotator_test.py → ...otation/simple_matching_annotator_test.py b/...ocument/simple_matching_annotator_test.py → ...otation/simple_matching_annotator_test.py
@@ -20,7 +20,7 @@
     TargetAnnotation
 )
 
-from sciencebeam_trainer_grobid_tools.structured_document.simple_matching_annotator import (
+from sciencebeam_trainer_grobid_tools.annotation.simple_matching_annotator import (
     SimpleTagConfig,
     SimpleMatchingAnnotator,
     get_extended_line_token_tags,