data-manipulation-utilities 0.2.3__tar.gz → 0.2.4__tar.gz

{data_manipulation_utilities-0.2.3 → data_manipulation_utilities-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data_manipulation_utilities
-Version: 0.2.3
+Version: 0.2.4
 Description-Content-Type: text/markdown
 Requires-Dist: logzero
 Requires-Dist: PyYAML
@@ -856,6 +856,40 @@ Trees only in file_2.root:
   - Hlt2RD_BsToPhiMuMu_MVA/DecayTree
 ```
 
+# File system
+
+## Versions
+
+The utilities below allow the user to deal with versioned files and directories
+
+```python
+from dmu.generic.version_management import get_last_version
+from dmu.generic.version_management import get_next_version
+from dmu.generic.version_management import get_latest_file
+
+# get_next_version will take a version and provide the next one, e.g.
+get_next_version('v1')           # -> 'v2'
+get_next_version('v1.1')         # -> 'v2.1'
+get_next_version('v10.1')        # -> 'v11.1'
+
+get_next_version('/a/b/c/v1')    # -> '/a/b/c/v2'
+get_next_version('/a/b/c/v1.1')  # -> '/a/b/c/v2.1'
+get_next_version('/a/b/c/v10.1') # -> '/a/b/c/v11.1'
+
+# `get_latest_file` will return the path to the file with the highest version
+# in the `dir_path` directory that matches a wildcard, e.g.:
+
+last_file = get_latest_file(dir_path = file_dir, wc='name_*.txt')
+
+# `get_last_version` will return the string with the latest version
+# of directories in `dir_path`, e.g.:
+
+oversion=get_last_version(dir_path=dir_path, version_only=True)  # This will return only the version, e.g. v3.2
+oversion=get_last_version(dir_path=dir_path, version_only=False) # This will return full path, e.g. /a/b/c/v3.2 
+```
+
+The function above should work for numeric (e.g. `v1.2`) and non-numeric (e.g. `va`, `vb`) versions.
+
 # Text manipulation
 
 ## Transformations

{data_manipulation_utilities-0.2.3 → data_manipulation_utilities-0.2.4}/README.md

@@ -836,6 +836,40 @@ Trees only in file_2.root:
   - Hlt2RD_BsToPhiMuMu_MVA/DecayTree
 ```
 
+# File system
+
+## Versions
+
+The utilities below allow the user to deal with versioned files and directories
+
+```python
+from dmu.generic.version_management import get_last_version
+from dmu.generic.version_management import get_next_version
+from dmu.generic.version_management import get_latest_file
+
+# get_next_version will take a version and provide the next one, e.g.
+get_next_version('v1')           # -> 'v2'
+get_next_version('v1.1')         # -> 'v2.1'
+get_next_version('v10.1')        # -> 'v11.1'
+
+get_next_version('/a/b/c/v1')    # -> '/a/b/c/v2'
+get_next_version('/a/b/c/v1.1')  # -> '/a/b/c/v2.1'
+get_next_version('/a/b/c/v10.1') # -> '/a/b/c/v11.1'
+
+# `get_latest_file` will return the path to the file with the highest version
+# in the `dir_path` directory that matches a wildcard, e.g.:
+
+last_file = get_latest_file(dir_path = file_dir, wc='name_*.txt')
+
+# `get_last_version` will return the string with the latest version
+# of directories in `dir_path`, e.g.:
+
+oversion=get_last_version(dir_path=dir_path, version_only=True)  # This will return only the version, e.g. v3.2
+oversion=get_last_version(dir_path=dir_path, version_only=False) # This will return full path, e.g. /a/b/c/v3.2 
+```
+
+The function above should work for numeric (e.g. `v1.2`) and non-numeric (e.g. `va`, `vb`) versions.
+
 # Text manipulation
 
 ## Transformations

{data_manipulation_utilities-0.2.3 → data_manipulation_utilities-0.2.4}/pyproject.toml

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

{data_manipulation_utilities-0.2.3 → data_manipulation_utilities-0.2.4}/src/data_manipulation_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data_manipulation_utilities
-Version: 0.2.3
+Version: 0.2.4
 Description-Content-Type: text/markdown
 Requires-Dist: logzero
 Requires-Dist: PyYAML
@@ -856,6 +856,40 @@ Trees only in file_2.root:
   - Hlt2RD_BsToPhiMuMu_MVA/DecayTree
 ```
 
+# File system
+
+## Versions
+
+The utilities below allow the user to deal with versioned files and directories
+
+```python
+from dmu.generic.version_management import get_last_version
+from dmu.generic.version_management import get_next_version
+from dmu.generic.version_management import get_latest_file
+
+# get_next_version will take a version and provide the next one, e.g.
+get_next_version('v1')           # -> 'v2'
+get_next_version('v1.1')         # -> 'v2.1'
+get_next_version('v10.1')        # -> 'v11.1'
+
+get_next_version('/a/b/c/v1')    # -> '/a/b/c/v2'
+get_next_version('/a/b/c/v1.1')  # -> '/a/b/c/v2.1'
+get_next_version('/a/b/c/v10.1') # -> '/a/b/c/v11.1'
+
+# `get_latest_file` will return the path to the file with the highest version
+# in the `dir_path` directory that matches a wildcard, e.g.:
+
+last_file = get_latest_file(dir_path = file_dir, wc='name_*.txt')
+
+# `get_last_version` will return the string with the latest version
+# of directories in `dir_path`, e.g.:
+
+oversion=get_last_version(dir_path=dir_path, version_only=True)  # This will return only the version, e.g. v3.2
+oversion=get_last_version(dir_path=dir_path, version_only=False) # This will return full path, e.g. /a/b/c/v3.2 
+```
+
+The function above should work for numeric (e.g. `v1.2`) and non-numeric (e.g. `va`, `vb`) versions.
+
 # Text manipulation
 
 ## Transformations

{data_manipulation_utilities-0.2.3 → data_manipulation_utilities-0.2.4}/src/data_manipulation_utilities.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/data_manipulation_utilities.egg-info/requires.txt
 src/data_manipulation_utilities.egg-info/top_level.txt
 src/dmu/arrays/utilities.py
 src/dmu/generic/utilities.py
+src/dmu/generic/version_management.py
 src/dmu/logging/log_store.py
 src/dmu/ml/cv_classifier.py
 src/dmu/ml/cv_predict.py

data_manipulation_utilities-0.2.4/src/dmu/generic/version_management.py

@@ -0,0 +1,132 @@
+'''
+Module containing functions used to find latest, next version, etc of a path.
+'''
+
+import glob
+import os
+import re
+
+from dmu.logging.log_store import LogStore
+
+log=LogStore.add_logger('dmu:version_management')
+#---------------------------------------
+def _get_numeric_version(version : str) -> int:
+    '''
+    Takes string with numbers at the end (padded or not)
+    Returns integer version of numbers
+    '''
+    #Skip these directories
+    if version in ['__pycache__']:
+        return -1
+
+    regex=r'[a-z]+(\d+)'
+    mtch =re.match(regex, version)
+    if not mtch:
+        log.debug(f'Cannot extract numeric version from: {version}')
+        return -1
+
+    str_val = mtch.group(1)
+    val     = int(str_val)
+
+    return val
+#---------------------------------------
+def get_last_version(dir_path : str, version_only : bool = True, main_only : bool = False):
+    '''Returns path or just version associated to latest version found in given path
+
+    Parameters
+    ---------------------
+    dir_path (str) : Path to directory where versioned subdirectories exist
+    version_only (bool): Returns only vxxxx if True, otherwise, full path to directory
+    main_only (bool): Returns vX where X is a number. Otherwise it will return vx.y in case version has subversion
+    '''
+    l_obj = glob.glob(f'{dir_path}/*')
+
+    if len(l_obj) == 0:
+        log.error(f'Nothing found in {dir_path}')
+        raise ValueError
+
+    d_dir_org = { os.path.basename(obj).replace('.', '') : obj for obj in l_obj if os.path.isdir(obj) }
+    d_dir_num = { _get_numeric_version(name) : dir_path for name, dir_path in d_dir_org.items() }
+
+    c_dir = sorted(d_dir_num.items())
+
+    try:
+        _, path = c_dir[-1]
+    except:
+        log.error(f'Cannot find path in: {dir_path}')
+        raise
+
+    name = os.path.basename(path)
+    dirn = os.path.dirname(path)
+
+    if main_only and '.' in name:
+        ind = name.index('.')
+        name= name[:ind]
+
+    if version_only:
+        return name
+
+    return f'{dirn}/{name}'
+#---------------------------------------
+def get_latest_file(dir_path : str, wc : str) -> str:
+    '''Will find latest file in a given directory
+
+    Parameters
+    --------------------
+    dir_path (str): Directory where files are found
+    wc (str): Wildcard associated to files, e.g. file_*.txt
+
+    Returns
+    --------------------
+    Path to latest file, according to version
+    '''
+    l_path = glob.glob(f'{dir_path}/{wc}')
+    if len(l_path) == 0:
+        log.error(f'Cannot find files in: {dir_path}/{wc}')
+        raise ValueError
+
+    l_path.sort()
+
+    return l_path[-1]
+#---------------------------------------
+def get_next_version(version : str) -> str:
+    '''Pick up string symbolizing version and return next version
+    Parameters
+    -------------------------
+    version (str) : Of the form vx.y or vx where x and y are integers. It can also be a full path
+
+    Returns
+    -------------------------
+    String equal to the argument, but with the main version augmented by 1, e.g. vx+1.y
+
+    Examples:
+    -------------------------
+
+    get_next_version('v1.1') = 'v2.1'
+    get_next_version('v1'  ) = 'v2'
+    '''
+    if '/' in version:
+        path    = version
+        dirname = os.path.dirname(path)
+        version = os.path.basename(path)
+    else:
+        dirname = None
+
+    rgx = r'v(\d+)(\.\d+)?'
+
+    mtch = re.match(rgx, version)
+    if not mtch:
+        log.error(f'Cannot match {version} with {rgx}')
+        raise ValueError
+
+    ver_org = mtch.group(1)
+    ver_nxt = int(ver_org) + 1
+    ver_nxt = str(ver_nxt)
+
+    version = version.replace(f'v{ver_org}', f'v{ver_nxt}')
+
+    if dirname is not None:
+        version = f'{dirname}/{version}'
+
+    return version
+#---------------------------------------