Skip to content
Snippets Groups Projects

Resolve "REFAC: split overwriting of lazy data and raw data"

1 file
+ 3
2
Compare changes
  • Side-by-side
  • Inline
@@ -63,7 +63,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
@@ -63,7 +63,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
interpolation_method: Union[str, Tuple[str]] = DEFAULT_INTERPOLATION_METHOD,
interpolation_method: Union[str, Tuple[str]] = DEFAULT_INTERPOLATION_METHOD,
overwrite_local_data: bool = False, transformation=None, store_data_locally: bool = True,
overwrite_local_data: bool = False, transformation=None, store_data_locally: bool = True,
min_length: int = 0, start=None, end=None, variables=None, data_origin: Dict = None,
min_length: int = 0, start=None, end=None, variables=None, data_origin: Dict = None,
lazy_preprocessing: bool = False, **kwargs):
lazy_preprocessing: bool = False, overwrite_lazy_data=False, **kwargs):
super().__init__()
super().__init__()
self.station = helpers.to_list(station)
self.station = helpers.to_list(station)
self.path = self.setup_data_path(data_path, sampling)
self.path = self.setup_data_path(data_path, sampling)
@@ -94,6 +94,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
@@ -94,6 +94,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
self.interpolation_method = interpolation_method
self.interpolation_method = interpolation_method
self.overwrite_local_data = overwrite_local_data
self.overwrite_local_data = overwrite_local_data
 
self.overwrite_lazy_data = True if self.overwrite_local_data is True else overwrite_lazy_data
self.store_data_locally = store_data_locally
self.store_data_locally = store_data_locally
self.min_length = min_length
self.min_length = min_length
self.start = start
self.start = start
@@ -271,7 +272,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
@@ -271,7 +272,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
hash = self._get_hash()
hash = self._get_hash()
filename = os.path.join(self.lazy_path, hash + ".pickle")
filename = os.path.join(self.lazy_path, hash + ".pickle")
try:
try:
if self.overwrite_local_data is True:
if self.overwrite_lazy_data is True:
raise FileNotFoundError
raise FileNotFoundError
with open(filename, "rb") as pickle_file:
with open(filename, "rb") as pickle_file:
lazy_data = dill.load(pickle_file)
lazy_data = dill.load(pickle_file)
Loading