#323 related. Moving enitiy formatters into utils contrib

nicolay-r · Jun 17, 2022 · ddc11f6 · ddc11f6
1 parent f753f93
commit ddc11f6
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 11 deletions.
diff --git a/arekit/contrib/experiment_rusentrel/entities/factory.py b/arekit/contrib/experiment_rusentrel/entities/factory.py
@@ -1,10 +1,9 @@
-from arekit.contrib.experiment_rusentrel.entities.str_rus_cased_fmt import RussianEntitiesCasedFormatter
-from arekit.contrib.experiment_rusentrel.entities.str_rus_nocased_fmt import RussianEntitiesFormatter
-from arekit.contrib.experiment_rusentrel.entities.str_simple_fmt import StringEntitiesSimpleFormatter
-from arekit.contrib.experiment_rusentrel.entities.str_simple_sharp_prefixed_fmt import \
-    SharpPrefixedEntitiesSimpleFormatter
-from arekit.contrib.experiment_rusentrel.entities.str_simple_uppercase_fmt import SimpleUppercasedEntityFormatter
 from arekit.contrib.experiment_rusentrel.entities.types import EntityFormatterTypes
+from arekit.contrib.utils.entities.formatters.str_rus_cased_fmt import RussianEntitiesCasedFormatter
+from arekit.contrib.utils.entities.formatters.str_rus_nocased_fmt import RussianEntitiesFormatter
+from arekit.contrib.utils.entities.formatters.str_simple_fmt import StringEntitiesSimpleFormatter
+from arekit.contrib.utils.entities.formatters.str_simple_sharp_prefixed_fmt import SharpPrefixedEntitiesSimpleFormatter
+from arekit.contrib.utils.entities.formatters.str_simple_uppercase_fmt import SimpleUppercasedEntityFormatter
 
 
 def create_entity_formatter(fmt_type, create_russian_pos_tagger_func=None):

diff --git a/arekit/contrib/utils/entities/__init__.py b/arekit/contrib/utils/entities/__init__.py
diff --git a/arekit/contrib/utils/entities/formatters/__init__.py b/arekit/contrib/utils/entities/formatters/__init__.py
diff --git a/...t_rusentrel/entities/str_rus_cased_fmt.py → .../entities/formatters/str_rus_cased_fmt.py b/...t_rusentrel/entities/str_rus_cased_fmt.py → .../entities/formatters/str_rus_cased_fmt.py
diff --git a/...rusentrel/entities/str_rus_nocased_fmt.py → ...ntities/formatters/str_rus_nocased_fmt.py b/...rusentrel/entities/str_rus_nocased_fmt.py → ...ntities/formatters/str_rus_nocased_fmt.py
diff --git a/...ment_rusentrel/entities/str_simple_fmt.py → ...ils/entities/formatters/str_simple_fmt.py b/...ment_rusentrel/entities/str_simple_fmt.py → ...ils/entities/formatters/str_simple_fmt.py
diff --git a/...entities/str_simple_sharp_prefixed_fmt.py → ...rmatters/str_simple_sharp_prefixed_fmt.py b/...entities/str_simple_sharp_prefixed_fmt.py → ...rmatters/str_simple_sharp_prefixed_fmt.py
diff --git a/...trel/entities/str_simple_uppercase_fmt.py → ...es/formatters/str_simple_uppercase_fmt.py b/...trel/entities/str_simple_uppercase_fmt.py → ...es/formatters/str_simple_uppercase_fmt.py
diff --git a/tests/contrib/experiment_rusentrel/test_input_balancing.py b/tests/contrib/experiment_rusentrel/test_input_balancing.py
@@ -1,7 +1,6 @@
 import sys
 import unittest
 
-
 sys.path.append('../')
 
 from arekit.common.data.input.providers.columns.sample import SampleColumnsProvider
@@ -10,8 +9,8 @@
 from arekit.common.data.input.repositories.sample import BaseInputSamplesRepository
 from arekit.common.data.input.terms_mapper import OpinionContainingTextTermsMapper
 from arekit.common.data.storages.base import BaseRowsStorage
+from arekit.contrib.utils.entities.formatters.str_simple_fmt import StringEntitiesSimpleFormatter
 from arekit.contrib.bert.input.providers.label_binary import BinaryLabelProvider
-from arekit.contrib.experiment_rusentrel.entities.str_simple_fmt import StringEntitiesSimpleFormatter
 from arekit.contrib.experiment_rusentrel.labels.scalers.three import ThreeLabelScaler
 
 

diff --git a/tests/contrib/experiment_rusentrel/test_rusentrel_opinions_iter.py b/tests/contrib/experiment_rusentrel/test_rusentrel_opinions_iter.py
@@ -3,15 +3,14 @@
 import unittest
 from pymystem3 import Mystem
 
-
 from tests.text.utils import terms_to_str
 from tests.text.linked_opinions import iter_same_sentence_linked_text_opinions
 
 from tests.contrib.source.text.news import init_rusentrel_doc
 from arekit.contrib.source.brat.entities.parser import BratTextEntitiesParser
 from arekit.contrib.source.rusentiframes.collection import RuSentiFramesCollection
 from arekit.contrib.source.rusentiframes.types import RuSentiFramesVersions
-from arekit.contrib.experiment_rusentrel.entities.str_rus_cased_fmt import RussianEntitiesCasedFormatter
+from arekit.contrib.utils.entities.formatters.str_rus_cased_fmt import RussianEntitiesCasedFormatter
 from arekit.contrib.experiment_rusentrel.frame_variants import ExperimentFrameVariantsCollection
 from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
 from arekit.contrib.experiment_rusentrel.labels.formatters.rusentiframes import \

diff --git a/tests/contrib/networks/test_tf_input_features.py b/tests/contrib/networks/test_tf_input_features.py
@@ -24,7 +24,7 @@
 from arekit.contrib.source.rusentiframes.collection import RuSentiFramesCollection
 from arekit.contrib.source.rusentiframes.types import RuSentiFramesVersions
 from arekit.contrib.experiment_rusentrel.synonyms.provider import RuSentRelSynonymsCollectionProvider
-from arekit.contrib.experiment_rusentrel.entities.str_rus_cased_fmt import RussianEntitiesCasedFormatter
+from arekit.contrib.utils.entities.formatters.str_rus_cased_fmt import RussianEntitiesCasedFormatter
 
 from arekit.processing.lemmatization.mystem import MystemWrapper
 from arekit.processing.pos.mystem_wrap import POSMystemWrapper