black without mortimer

This commit is contained in:
Noe Brucy
2022-11-28 18:01:18 +01:00
parent 7548ef7e0a
commit fa396178c6
14 changed files with 371 additions and 304 deletions
+20 -18
View File
@@ -29,9 +29,8 @@ class Rule:
kind="snapshot",
unit=U.none,
name="",
):
self.name=name
self.name = name
self.process_fn = process
self.dependencies = dependencies
self.group = group
@@ -45,6 +44,7 @@ class Rule:
else:
return self.process_fn(**kwargs)
class BaseProcessor:
"""
Base class for processors, should not be instanciated
@@ -56,7 +56,6 @@ class BaseProcessor:
rules = {}
solve_self_dep = True
def __init__(self, path, path_out=".", params=None, tag=None):
if params is None:
self.params = default_params()
@@ -77,8 +76,8 @@ class BaseProcessor:
# Initialize logger
self.logger = logging.getLogger(self.log_id)
self.logger.propagate = False
logging_format = '%(levelname)s | %(asctime)s | %(name)s.%(funcName)s:%(lineno)d | %(message)s'
formatter = logging.Formatter(logging_format, datefmt = '%H:%M:%S')
logging_format = "%(levelname)s | %(asctime)s | %(name)s.%(funcName)s:%(lineno)d | %(message)s"
formatter = logging.Formatter(logging_format, datefmt="%H:%M:%S")
if not self.logger.hasHandlers():
stream = logging.StreamHandler(sys.stdout)
@@ -95,7 +94,7 @@ class BaseProcessor:
self.logger.setLevel(logging.WARNING)
for handler in self.logger.handlers:
handler.setFormatter(formatter)
handler.setFormatter(formatter)
def process(
self,
@@ -106,7 +105,7 @@ class BaseProcessor:
skip_dep=False,
select=None,
**kwargs,
):
):
self.overwrite_dep = overwrite_dep
self.just_done = []
""" Process the rule 'to_process'
@@ -126,7 +125,7 @@ class BaseProcessor:
select : dict, optional
Select object (see RunSelector) to only select some run/snapshot
"""
if to_process in self.rules:
rule = self.rules[to_process]
return self._solve_and_process_rule(
@@ -166,7 +165,7 @@ class BaseProcessor:
-------
The outbut of self._process_rule
"""
updated = False
updated = False
if not skip_dep:
updated = self._solve_dependencies(name, rule, arg, overwrite, select)
overwrite_rule = overwrite or updated
@@ -221,9 +220,7 @@ class BaseProcessor:
self.just_done.append(name_full)
return data
else:
self.logger.info(
"Data for {} is already computed.".format(name_full)
)
self.logger.info("Data for {} is already computed.".format(name_full))
def def_rules(self):
for rule in self.rules:
@@ -302,7 +299,9 @@ class HDF5Container(BaseProcessor):
if not (unit is None or unit_old is None or unit_old == U.none):
value = value * unit_old.express(unit)
except NoSuchNodeError:
self.logger.error(f"The value {node_name} is node available", stack_info=True)
self.logger.error(
f"The value {node_name} is node available", stack_info=True
)
raise
finally:
if not open_before:
@@ -441,11 +440,13 @@ class HDF5Container(BaseProcessor):
except TypeError:
data = np.array([data])
group_name = os.path.dirname(name_full)
group_name = os.path.dirname(name_full)
if group_name in self.save:
group = self.save.get_node(group_name)
if not isinstance(group, class_name_dict['Group']):
self.logger.warning(f"{group_name} already there and no a group, deleting")
if not isinstance(group, class_name_dict["Group"]):
self.logger.warning(
f"{group_name} already there and no a group, deleting"
)
self.save.remove_node(group)
self.save.create_array(
group_name,
@@ -552,7 +553,8 @@ def oct_vect_getter(name, i, dset):
def norm_getter(name, dset):
return np.sqrt(np.sum(dset[name] ** 2, axis=1))
return np.sqrt(np.sum(dset[name] ** 2, axis=1))
def oct_norm_getter(name, dset):
return np.sqrt(np.sum(dset[name] ** 2, axis=2))
return np.sqrt(np.sum(dset[name] ** 2, axis=2))