From 76b4c1fef954f03724932d397c9a147c23dcf20c Mon Sep 17 00:00:00 2001 From: Nicolay Rusnachenko Date: Mon, 20 Nov 2023 14:20:53 +0000 Subject: [PATCH] #536 Removed OpinionsIO, removed `-O` in filenames for samples --- arekit/contrib/utils/io_utils/opinions.py | 37 ----------------------- arekit/contrib/utils/io_utils/samples.py | 5 ++- arekit/contrib/utils/io_utils/utils.py | 7 ----- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 arekit/contrib/utils/io_utils/opinions.py diff --git a/arekit/contrib/utils/io_utils/opinions.py b/arekit/contrib/utils/io_utils/opinions.py deleted file mode 100644 index 163fbf05..00000000 --- a/arekit/contrib/utils/io_utils/opinions.py +++ /dev/null @@ -1,37 +0,0 @@ -from os.path import join - -from arekit.contrib.utils.data.readers.base import BaseReader -from arekit.common.experiment.api.base_samples_io import BaseSamplesIO -from arekit.contrib.utils.io_utils.utils import filename_template - - -class OpinionsIO(BaseSamplesIO): - - def __init__(self, target_dir, reader=None, prefix="opinion"): - assert(isinstance(reader, BaseReader)) - self.__target_dir = target_dir - self.__prefix = prefix - self.__reader = reader - self.__target_extension = reader.extension() - - @property - def Reader(self): - return self.__reader - - def create_target(self, data_type): - return self.__get_input_opinions_target(data_type) - - 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, - extension=self.__target_extension) - - @staticmethod - def __get_filepath(out_dir, template, prefix, extension): - assert(isinstance(template, str)) - assert(isinstance(prefix, str)) - assert(isinstance(extension, str)) - return join(out_dir, "{prefix}-{template}{extension}".format( - prefix=prefix, template=template, extension=extension)) diff --git a/arekit/contrib/utils/io_utils/samples.py b/arekit/contrib/utils/io_utils/samples.py index 28ebc524..58a6e75b 100644 --- a/arekit/contrib/utils/io_utils/samples.py +++ b/arekit/contrib/utils/io_utils/samples.py @@ -4,7 +4,7 @@ from arekit.contrib.utils.data.readers.base import BaseReader from arekit.common.experiment.api.base_samples_io import BaseSamplesIO from arekit.contrib.utils.data.writers.base import BaseWriter -from arekit.contrib.utils.io_utils.utils import filename_template, check_targets_existence +from arekit.contrib.utils.io_utils.utils import check_targets_existence logger = logging.getLogger(__name__) logging.basicConfig(level=logging.INFO) @@ -64,9 +64,8 @@ def check_targets_existed(self, data_types_iter): # endregion 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, + template=f"{data_type.name.lower()}", prefix=self.__prefix, extension=self.__target_extension) diff --git a/arekit/contrib/utils/io_utils/utils.py b/arekit/contrib/utils/io_utils/utils.py index e6cb3b0a..ad3d5448 100644 --- a/arekit/contrib/utils/io_utils/utils.py +++ b/arekit/contrib/utils/io_utils/utils.py @@ -2,8 +2,6 @@ import logging from os.path import join, exists -from arekit.common.experiment.data_type import DataType - logger = logging.getLogger(__name__) logging.basicConfig(level=logging.INFO) @@ -19,11 +17,6 @@ def join_dir_with_subfolder_name(subfolder_name, dir): return target_dir -def filename_template(data_type): - assert(isinstance(data_type, DataType)) - return "{data_type}-0".format(data_type=data_type.name.lower()) - - def check_targets_existence(targets): assert (isinstance(targets, Iterable))