umami-preprocessing 0.0.4__tar.gz → 0.0.6__tar.gz

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/PKG-INFO

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: umami-preprocessing
-Version: 0.0.4
+Version: 0.0.6
 Summary: Preprocessing for jet tagging
 License: MIT
 Project-URL: Homepage, https://github.com/umami-hep/umami-preprocessing
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: pyyaml-include==1.3
-Requires-Dist: PyYAML==6.0
+Requires-Dist: PyYAML==6.0.1
 Requires-Dist: rich==12.6.0
-Requires-Dist: scipy==1.9.3
-Requires-Dist: puma-hep==0.2.8
-Requires-Dist: atlas-ftag-tools==0.1.9
+Requires-Dist: scipy==1.10.1
+Requires-Dist: puma-hep==0.3.0
+Requires-Dist: atlas-ftag-tools==0.1.10
 Requires-Dist: dotmap==1.3.30
 Provides-Extra: dev
 Requires-Dist: black==23.9.1; extra == "dev"

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/pyproject.toml

@@ -8,11 +8,11 @@ requires-python = ">=3.8"
 
 dependencies = [
     "pyyaml-include==1.3",
-    "PyYAML==6.0",
+    "PyYAML==6.0.1",
     "rich==12.6.0",
-    "scipy==1.9.3",
-    "puma-hep==0.2.8",
-    "atlas-ftag-tools==0.1.9",
+    "scipy==1.10.1",
+    "puma-hep==0.3.0",
+    "atlas-ftag-tools==0.1.10",
     "dotmap==1.3.30"
 ]
 

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/umami_preprocessing.egg-info/PKG-INFO

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: umami-preprocessing
-Version: 0.0.4
+Version: 0.0.6
 Summary: Preprocessing for jet tagging
 License: MIT
 Project-URL: Homepage, https://github.com/umami-hep/umami-preprocessing
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: pyyaml-include==1.3
-Requires-Dist: PyYAML==6.0
+Requires-Dist: PyYAML==6.0.1
 Requires-Dist: rich==12.6.0
-Requires-Dist: scipy==1.9.3
-Requires-Dist: puma-hep==0.2.8
-Requires-Dist: atlas-ftag-tools==0.1.9
+Requires-Dist: scipy==1.10.1
+Requires-Dist: puma-hep==0.3.0
+Requires-Dist: atlas-ftag-tools==0.1.10
 Requires-Dist: dotmap==1.3.30
 Provides-Extra: dev
 Requires-Dist: black==23.9.1; extra == "dev"

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/umami_preprocessing.egg-info/requires.txt

@@ -1,9 +1,9 @@
 pyyaml-include==1.3
-PyYAML==6.0
+PyYAML==6.0.1
 rich==12.6.0
-scipy==1.9.3
-puma-hep==0.2.8
-atlas-ftag-tools==0.1.9
+scipy==1.10.1
+puma-hep==0.3.0
+atlas-ftag-tools==0.1.10
 dotmap==1.3.30
 
 [dev]

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/upp/__init__.py

@@ -1,4 +1,4 @@
 """UPP: Umami PreProcessing."""
 from __future__ import annotations
 
-__version__ = "v0.0.4"
+__version__ = "v0.0.6"

{umami-preprocessing-0.0.4 → umami-preprocessing-0.0.6}/upp/classes/preprocessing_config.py

@@ -6,7 +6,7 @@ import logging as log
 from copy import copy
 from dataclasses import dataclass
 from pathlib import Path
-from subprocess import check_output
+from subprocess import CalledProcessError, check_output
 from typing import Literal
 
 import yaml
@@ -15,6 +15,7 @@ from ftag import Cuts
 from ftag.transform import Transform
 from yamlinclude import YamlIncludeConstructor
 
+from upp import __version__
 from upp.classes.components import Components
 from upp.classes.resampling_config import ResamplingConfig
 from upp.classes.variable_config import VariableConfig
@@ -110,9 +111,16 @@ class PreprocessingConfig:
         )
 
         # copy config
-        git_hash = check_output(["git", "rev-parse", "--short", "HEAD"], cwd=Path(__file__).parent)
-        self.git_hash = git_hash.decode("ascii").strip()
-        self.config["pp_git_hash"] = self.git_hash
+        try:
+            git_hash = check_output(
+                ["git", "rev-parse", "--short", "HEAD"], cwd=Path(__file__).parent
+            )
+            self.git_hash = git_hash.decode("ascii").strip()
+            self.config["pp_git_hash"] = self.git_hash
+        except CalledProcessError:
+            log.warning("Could not get git hash")
+            self.git_hash = __version__
+            self.config["pp_git_hash"] = self.git_hash
         self.copy_config()
 
     @classmethod
@@ -215,7 +223,14 @@ class PreprocessingConfig:
         self.general = general
         self.sampling = DotMap(self.config["umami"]["sampling"], _dynamic=False)
         self.sampling.class_labels = [flav.name for flav in self.components.flavours]
-        self.parameters = self.config["umami"]["parameters"]
+        if self.config["umami"].get("parameters", None) is not None:
+            self.parameters = self.config["umami"]["parameters"]
+        else:
+            self.parameters = {}
+            self.parameters[""] = self.out_dir
+            self.parameters[""] = self.out_dir
+        if self.config["umami"].get("convert_to_tfrecord", None) is not None:
+            self.general.convert_to_tfrecord = self.config["umami"]["convert_to_tfrecord"]
         return self
 
     def get_file_name(self, option, **_):