#489 related. Removed data_folding from SamplesIO and the related d…

…ependencies
nicolay-r · Sep 21, 2023 · fdff30e · fdff30e
1 parent 35678cd
commit fdff30e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/arekit/common/experiment/api/base_samples_io.py b/arekit/common/experiment/api/base_samples_io.py
@@ -14,7 +14,7 @@ def Writer(self):
         """
         raise NotImplementedError()
 
-    def create_target(self, data_type, data_folding):
+    def create_target(self, data_type):
         """ Path for reaiding/viewing
         """
         raise NotImplementedError()
diff --git a/arekit/contrib/utils/io_utils/opinions.py b/arekit/contrib/utils/io_utils/opinions.py
@@ -18,11 +18,11 @@ def __init__(self, target_dir, reader=None, prefix="opinion"):
     def Reader(self):
         return self.__reader
 
-    def create_target(self, data_type, data_folding):
-        return self.__get_input_opinions_target(data_type, data_folding=data_folding)
+    def create_target(self, data_type):
+        return self.__get_input_opinions_target(data_type)
 
-    def __get_input_opinions_target(self, data_type, data_folding):
-        template = filename_template(data_type=data_type, data_folding=data_folding)
+    def __get_input_opinions_target(self, data_type):
+        template = filename_template(data_type=data_type)
         return self.__get_filepath(out_dir=self.__target_dir,
                                    template=template,
                                    prefix=self.__prefix,

diff --git a/arekit/contrib/utils/io_utils/samples.py b/arekit/contrib/utils/io_utils/samples.py
@@ -43,14 +43,14 @@ def Reader(self):
     def Writer(self):
         return self.__writer
 
-    def create_target(self, data_type, data_folding):
-        return self.__get_input_sample_target(data_type, data_folding=data_folding)
+    def create_target(self, data_type):
+        return self.__get_input_sample_target(data_type)
 
-    def check_targets_existed(self, data_types_iter, data_folding):
+    def check_targets_existed(self, data_types_iter):
         for data_type in data_types_iter:
 
             targets = [
-                self.__get_input_sample_target(data_type=data_type, data_folding=data_folding),
+                self.__get_input_sample_target(data_type=data_type),
             ]
 
             if not check_targets_existence(targets=targets):
@@ -59,8 +59,8 @@ def check_targets_existed(self, data_types_iter, data_folding):
 
     # endregion
 
-    def __get_input_sample_target(self, data_type, data_folding):
-        template = filename_template(data_type=data_type, data_folding=data_folding)
+    def __get_input_sample_target(self, data_type):
+        template = filename_template(data_type=data_type)
         return self.__get_filepath(out_dir=self.__target_dir,
                                    template=template,
                                    prefix=self.__prefix,

diff --git a/arekit/contrib/utils/io_utils/utils.py b/arekit/contrib/utils/io_utils/utils.py
@@ -19,7 +19,7 @@ def join_dir_with_subfolder_name(subfolder_name, dir):
     return target_dir
 
 
-def filename_template(data_type, data_folding):
+def filename_template(data_type):
     assert(isinstance(data_type, DataType))
     return "{data_type}-0".format(data_type=data_type.name.lower())
 

diff --git a/arekit/contrib/utils/pipelines/items/sampling/base.py b/arekit/contrib/utils/pipelines/items/sampling/base.py
@@ -45,8 +45,7 @@ def _serialize_iteration(self, data_type, pipeline, data_folding, doc_ids):
 
         writer_and_targets = {
             "sample": (self._samples_io.Writer,
-                       self._samples_io.create_target(
-                           data_type=data_type, data_folding=data_folding)),
+                       self._samples_io.create_target(data_type=data_type)),
         }
 
         for description, repo in repos.items():