data-manipulation-utilities 0.1.5__tar.gz → 0.1.6__tar.gz

{data_manipulation_utilities-0.1.5 → data_manipulation_utilities-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: data_manipulation_utilities
-Version: 0.1.5
+Version: 0.1.6
 Description-Content-Type: text/markdown
 Requires-Dist: logzero
 Requires-Dist: PyYAML

{data_manipulation_utilities-0.1.5 → data_manipulation_utilities-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name        = 'data_manipulation_utilities'
-version     = '0.1.5'
+version     = '0.1.6'
 readme      = 'README.md'
 dependencies= [
 'logzero',

{data_manipulation_utilities-0.1.5 → data_manipulation_utilities-0.1.6}/src/data_manipulation_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: data_manipulation_utilities
-Version: 0.1.5
+Version: 0.1.6
 Description-Content-Type: text/markdown
 Requires-Dist: logzero
 Requires-Dist: PyYAML

{data_manipulation_utilities-0.1.5 → data_manipulation_utilities-0.1.6}/src/dmu/logging/log_store.py

@@ -3,6 +3,8 @@ Module holding LogStore
 '''
 
 import logging
+from logging import Logger
+
 import logzero
 
 #------------------------------------------------------------
@@ -31,26 +33,28 @@ class LogStore:
     Class used to make loggers, set log levels, print loggers, e.g. interface to logging/logzero, etc.
     '''
     #pylint: disable = invalid-name
-    d_logger      = {}
-    d_levels      = {}
+    d_logger      : dict[str,Logger] = {}
+    d_levels      : dict[str,   int] = {}
     log_level     = logging.INFO
     is_configured = False
     backend       = 'logging'
     #--------------------------
     @staticmethod
-    def add_logger(name=None):
+    def add_logger(name : str, exists_ok : bool = False) -> Logger:
         '''
         Will use underlying logging library logzero/logging, etc to make logger
 
         name (str): Name of logger
         '''
 
-        if   name is None:
-            raise ValueError('Logger name missing')
-
-        if name in LogStore.d_logger:
+        if name in LogStore.d_logger and not exists_ok:
             raise ValueError(f'Logger name {name} already found')
 
+
+        if name in LogStore.d_logger and     exists_ok:
+            print(f'Logger {name} already found, reusing it')
+            return LogStore.d_logger[name]
+
         level  = LogStore.log_level if name not in LogStore.d_levels else LogStore.d_levels[name]
 
         if   LogStore.backend == 'logging':
@@ -65,14 +69,14 @@ class LogStore:
         return logger
     #--------------------------
     @staticmethod
-    def _get_logzero_logger(name : str, level : int):
+    def _get_logzero_logger(name : str, level : int) -> Logger:
         log = logzero.setup_logger(name=name)
         log.setLevel(level)
 
         return log
     #--------------------------
     @staticmethod
-    def _get_logging_logger(name : str, level : int):
+    def _get_logging_logger(name : str, level : int) -> Logger:
         logger = logging.getLogger(name=name)
 
         logger.setLevel(level)

{data_manipulation_utilities-0.1.5 → data_manipulation_utilities-0.1.6}/src/dmu/rfile/rfprinter.py

@@ -3,7 +3,8 @@ Module containing RFPrinter
 '''
 import os
 
-from ROOT import TFile
+from typing import Union
+from ROOT   import TFile
 
 from dmu.logging.log_store import LogStore
 
@@ -22,7 +23,6 @@ class RFPrinter:
             raise FileNotFoundError(f'Cannot find {path}')
 
         self._root_path = path
-        self._text_path = path.replace('.root', '.txt')
     #-----------------------------------------
     def _get_trees(self, ifile):
         '''
@@ -54,29 +54,38 @@ class RFPrinter:
         for branch in l_branch:
             bname = branch.GetName()
             leaf  = branch.GetLeaf(bname)
-            btype = leaf.GetTypeName()
+            try:
+                btype = leaf.GetTypeName()
+            except:
+                log.warning(f'Cannot read {bname}')
+                continue
 
             l_line.append(f'{"":4}{bname:<100}{btype:<40}')
 
         return l_line
     #-----------------------------------------
-    def _save_info(self, l_info):
+    def _get_summary_path(self, file_name : Union[str,None]) -> str:
+        if file_name is None:
+            text_path = self._root_path.replace('.root', '.txt')
+            return text_path
+
+        root_dir = os.path.dirname(self._root_path)
+
+        return f'{root_dir}/{file_name}'
+    #-----------------------------------------
+    def _save_info(self, l_info : list[str], file_name : Union[str,None]) -> None:
         '''
         Takes list of strings, saves it to text file
         '''
 
-        with open(self._text_path, 'w', encoding='utf-8') as ofile:
+        text_path = self._get_summary_path(file_name)
+        with open(text_path, 'w', encoding='utf-8') as ofile:
             for info in l_info:
                 ofile.write(f'{info}\n')
 
-        log.info(f'Saved to: {self._text_path}')
+        log.info(f'Saved to: {text_path}')
     #-----------------------------------------
-    def save(self, to_screen=False):
-        '''
-        Will save a text file with the summary of the ROOT file contents
-
-        to_screen (bool) : If true, will print to screen, default=False
-        '''
+    def _get_info(self) -> list[str]:
         l_info = []
         log.info(f'Reading from : {self._root_path}')
         with TFile.Open(self._root_path) as ifile:
@@ -84,7 +93,27 @@ class RFPrinter:
             for tree in l_tree:
                 l_info+= self._get_tree_info(tree)
 
-        self._save_info(l_info)
+        return l_info
+    #-----------------------------------------
+    def save(self, file_name : Union[str,None] = None, to_screen : bool = False, raise_on_fail : bool = True) -> None:
+        '''
+        Will save a text file with the summary of the ROOT file contents
+
+        file_name    : If used, name the file with the summary this way. Othewise, use ROOT file with .txt extension
+        to_screen    : If true, will print to screen, default=False
+        raise_on_fail: If cannot open ROOT file, will raise exeption (default), otherwise will only show warning.
+        '''
+
+        try:
+            l_info = self._get_info()
+        except OSError as exc:
+            if raise_on_fail:
+                raise OSError(f'Cannot open: {self._root_path}') from exc
+
+            log.warning(f'Cannot open: {self._root_path}')
+            return
+
+        self._save_info(l_info, file_name=file_name)
         if to_screen:
             for info in l_info:
                 log.info(info)