#376 related comment. #374 done

nicolay-r · Jul 25, 2022 · bd6dd0e · bd6dd0e
1 parent f04f0bc
commit bd6dd0e
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 10 deletions.
diff --git a/...trib/bert/input/providers/label_binary.py → ...mmon/data/input/providers/label/binary.py b/...trib/bert/input/providers/label_binary.py → ...mmon/data/input/providers/label/binary.py
diff --git a/arekit/common/data/input/providers/rows/samples.py b/arekit/common/data/input/providers/rows/samples.py
@@ -4,9 +4,11 @@
 from arekit.common.data.input.providers.instances.multiple import MultipleLinkedTextOpinionsInstancesProvider
 from arekit.common.data.input.providers.instances.single import SingleInstanceTextOpinionsLinkageProvider
 from arekit.common.data.input.providers.label.base import LabelProvider
+from arekit.common.data.input.providers.label.binary import BinaryLabelProvider
 from arekit.common.data.input.providers.label.multiple import MultipleLabelProvider
 from arekit.common.data.input.providers.rows.base import BaseRowProvider
 from arekit.common.data.input.providers.text.single import BaseSingleTextProvider
+from arekit.common.data.row_ids.binary import BinaryIDProvider
 from arekit.common.data.row_ids.multiple import MultipleIDProvider
 from arekit.common.entities.base import Entity
 from arekit.common.labels.base import Label
@@ -16,8 +18,6 @@
 from arekit.common.news.parsed.providers.entity_service import EntityEndType, EntityServiceProvider
 from arekit.common.news.parsed.term_position import TermPositionTypes
 from arekit.common.text_opinions.base import TextOpinion
-from arekit.contrib.bert.input.providers.label_binary import BinaryLabelProvider
-from arekit.contrib.bert.input.providers.row_ids_binary import BinaryIDProvider
 
 
 class BaseSampleRowProvider(BaseRowProvider):
@@ -119,6 +119,8 @@ def _provide_rows(self, parsed_news, entity_service, text_opinion_linkage, idle_
 
     @staticmethod
     def __create_row_ids_provider(label_provider):
+        # TODO. #376 related. This should be removed after refactoring, because
+        # TODO. we consider an ordinary IDs, that not based on the other data.
         if isinstance(label_provider, BinaryLabelProvider):
             return BinaryIDProvider()
         if isinstance(label_provider, MultipleLabelProvider):

diff --git a/...ib/bert/input/providers/row_ids_binary.py → arekit/common/data/row_ids/binary.py b/...ib/bert/input/providers/row_ids_binary.py → arekit/common/data/row_ids/binary.py
diff --git a/arekit/contrib/bert/samplers/qa_m.py b/arekit/contrib/bert/samplers/qa_m.py
@@ -21,6 +21,7 @@ def __init__(self, label_scaler, text_b_labels_fmt, text_terms_mapper):
         assert(isinstance(text_terms_mapper, OpinionContainingTextTermsMapper))
 
         text_b_template = 'Что вы думаете по поводу отношения {subject} к {object} в контексте : << {context} >> ?'
+        label_scaler
         super(QaMultipleSampleProvider, self).__init__(
             text_provider=PairTextProvider(
                 text_b_template=text_b_template,

diff --git a/arekit/contrib/bert/views/__init__.py b/arekit/contrib/bert/views/__init__.py
diff --git a/arekit/contrib/bert/views/binary.py → .../experiment_rusentrel/bert/binary_view.py b/arekit/contrib/bert/views/binary.py → .../experiment_rusentrel/bert/binary_view.py
@@ -2,8 +2,8 @@
 
 from arekit.common.data import const
 from arekit.common.data.row_ids.base import BaseIDProvider
+from arekit.common.data.row_ids.binary import BinaryIDProvider
 from arekit.common.labels.scaler.base import BaseLabelScaler
-from arekit.contrib.bert.input.providers.row_ids_binary import BinaryIDProvider
 from arekit.contrib.utils.data.views.linkages import utils
 from arekit.contrib.utils.data.views.linkages.base import BaseOpinionLinkagesView
 from arekit.contrib.utils.data.views.opinions import BaseOpinionStorageView

diff --git a/arekit/contrib/bert/samplers/nli_b.py → ...ontrib/experiment_rusentrel/bert/nli_b.py b/arekit/contrib/bert/samplers/nli_b.py → ...ontrib/experiment_rusentrel/bert/nli_b.py
@@ -1,7 +1,7 @@
+from arekit.common.data.input.providers.label.binary import BinaryLabelProvider
 from arekit.common.data.input.providers.rows.samples import BaseSampleRowProvider
 from arekit.common.data.input.terms_mapper import OpinionContainingTextTermsMapper
 from arekit.common.labels.str_fmt import StringLabelsFormatter
-from arekit.contrib.bert.input.providers.label_binary import BinaryLabelProvider
 from arekit.contrib.bert.input.providers.text_pair import PairTextProvider
 
 

diff --git a/arekit/contrib/bert/samplers/qa_b.py → ...contrib/experiment_rusentrel/bert/qa_b.py b/arekit/contrib/bert/samplers/qa_b.py → ...contrib/experiment_rusentrel/bert/qa_b.py
@@ -1,7 +1,7 @@
+from arekit.common.data.input.providers.label.binary import BinaryLabelProvider
 from arekit.common.data.input.providers.rows.samples import BaseSampleRowProvider
 from arekit.common.data.input.terms_mapper import OpinionContainingTextTermsMapper
 from arekit.common.labels.str_fmt import StringLabelsFormatter
-from arekit.contrib.bert.input.providers.label_binary import BinaryLabelProvider
 from arekit.contrib.bert.input.providers.text_pair import PairTextProvider
 
 

diff --git a/arekit/contrib/experiment_rusentrel/samplers/bert.py b/arekit/contrib/experiment_rusentrel/samplers/bert.py
@@ -1,11 +1,11 @@
 from arekit.common.entities.str_fmt import StringEntitiesFormatter
 from arekit.common.labels.str_fmt import StringLabelsFormatter
 from arekit.contrib.bert.samplers.base import create_simple_sample_provider
-from arekit.contrib.bert.samplers.nli_b import NliBinarySampleProvider
 from arekit.contrib.bert.samplers.nli_m import NliMultipleSampleProvider
-from arekit.contrib.bert.samplers.qa_b import QaBinarySampleProvider
 from arekit.contrib.bert.samplers.qa_m import QaMultipleSampleProvider
 from arekit.contrib.bert.terms.mapper import BertDefaultStringTextTermsMapper
+from arekit.contrib.experiment_rusentrel.bert.nli_b import NliBinarySampleProvider
+from arekit.contrib.experiment_rusentrel.bert.qa_b import QaBinarySampleProvider
 from arekit.contrib.experiment_rusentrel.samplers.types import BertSampleProviderTypes
 
 

diff --git a/arekit/contrib/utils/data/views/linkages/multilabel.py b/arekit/contrib/utils/data/views/linkages/multilabel.py
@@ -4,11 +4,13 @@
 from arekit.common.data import const
 from arekit.common.data.row_ids.multiple import MultipleIDProvider
 from arekit.common.labels.scaler.base import BaseLabelScaler
+from arekit.contrib.utils.data.views.linkages import utils
 from arekit.contrib.utils.data.views.linkages.base import BaseOpinionLinkagesView
+from arekit.contrib.utils.data.views.opinions import BaseOpinionStorageView
 
 
 class MultilableOpinionLinkagesView(BaseOpinionLinkagesView):
-    """ View onto sorce, where each row, related to opinion, has multiple labels.
+    """ View onto source, where each row, related to opinion, has multiple labels.
     """
 
     def __init__(self, labels_scaler, storage):

diff --git a/tests/contrib/experiment_rusentrel/test_input_balancing.py b/tests/contrib/experiment_rusentrel/test_input_balancing.py
@@ -1,16 +1,16 @@
 import sys
 import unittest
 
-sys.path.append('../')
+sys.path.append('../../')
 
 from arekit.common.data.input.providers.columns.sample import SampleColumnsProvider
 from arekit.common.data.input.providers.rows.samples import BaseSampleRowProvider
 from arekit.common.data.input.providers.text.single import BaseSingleTextProvider
 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.common.data.input.providers.label.binary import BinaryLabelProvider
 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.labels.scalers.three import ThreeLabelScaler