diff --git a/.gitignore b/.gitignore index 7fbd40daeccd72196299492d9fb5e7c36caa93a4..29202f106970e997b61f5094408351b84b34c580 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ __pycache__ .volumes/ .pytest_cache/ .coverage +try.http \ No newline at end of file diff --git a/nomad/processing/data.py b/nomad/processing/data.py index bc8a9b81ce9847d235a5d172831d6095b66aaad6..eecfeeb19cb49f49e3429710a9b045a68a2491fb 100644 --- a/nomad/processing/data.py +++ b/nomad/processing/data.py @@ -116,7 +116,8 @@ class Calc(Proc): logger = super().get_logger() logger = logger.bind( upload_id=self.upload_id, mainfile=self.mainfile, - upload_hash=upload_hash, calc_hash=calc_hash, **kwargs) + upload_hash=upload_hash, calc_hash=calc_hash, + archive_id='%s/%s' % (upload_hash, calc_hash), **kwargs) return logger @@ -182,12 +183,10 @@ class Calc(Proc): @task def parsing(self): - logger = self.get_calc_logger(parser=self.parser) + logger = self.get_calc_logger(parser=self.parser, step=self.parser) parser = parser_dict[self.parser] - with utils.timer( - logger, 'parser executed', step=self.parser, - input_size=self.mainfile_file.size): + with utils.timer(logger, 'parser executed', input_size=self.mainfile_file.size): self._parser_backend = parser.run(self.mainfile_tmp_path, logger=logger) if self._parser_backend.status[0] != 'ParseSuccess': @@ -199,11 +198,10 @@ class Calc(Proc): def normalizing(self): for normalizer in normalizers: normalizer_name = normalizer.__name__ - logger = self.get_calc_logger(normalizer=normalizer_name) + logger = self.get_calc_logger(normalizer=normalizer_name, step=normalizer_name) with utils.timer( - logger, 'normalizer executed', step=normalizer_name, - input_size=self.mainfile_file.size): + logger, 'normalizer executed', input_size=self.mainfile_file.size): normalizer(self._parser_backend).normalize(logger=logger) if self._parser_backend.status[0] != 'ParseSuccess':