ras-commander 0.42.0__tar.gz → 0.44.0__tar.gz

{ras_commander-0.42.0/ras_commander.egg-info → ras_commander-0.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ras-commander
-Version: 0.42.0
+Version: 0.44.0
 Summary: A Python library for automating HEC-RAS operations
 Home-page: https://github.com/billk-FM/ras-commander
 Author: William M. Katzenmeyer
@@ -62,7 +62,7 @@ Create a virtual environment with conda or venv (ask ChatGPT if you need help)
 In your virtual environment, install ras-commander using pip:
 ```
 pip install h5py numpy pandas requests tqdm scipy
-pip install ras-commander
+pip install --upgrade ras-commander
 ```
 
 If you have dependency issues with pip (especially if you have errors with numpy), try clearing your local pip packages 'C:\Users\your_username\AppData\Roaming\Python\' and then creating a new virtual environment.  
@@ -299,6 +299,13 @@ These acknowledgments recognize the contributions and inspirations that have hel
 4. [HEC-Commander Tools](https://github.com/billk-FM/HEC-Commander) - Inspiration and initial code base for the development of RAS Commander.
 
 
+## Official RAS Commander AI-Generated Songs:
+
+[No More Wait and See (Bluegrass)](https://suno.com/song/16889f3e-50f1-4afe-b779-a41738d7617a)  
+
+[No More Wait and See (Cajun Zydeco)](https://suno.com/song/4441c45d-f6cd-47b9-8fbc-1f7b277ee8ed)  
+
+
 ## Contact
 
 For questions, suggestions, or support, please contact:

{ras_commander-0.42.0 → ras_commander-0.44.0}/README.md

@@ -51,7 +51,7 @@ Create a virtual environment with conda or venv (ask ChatGPT if you need help)
 In your virtual environment, install ras-commander using pip:
 ```
 pip install h5py numpy pandas requests tqdm scipy
-pip install ras-commander
+pip install --upgrade ras-commander
 ```
 
 If you have dependency issues with pip (especially if you have errors with numpy), try clearing your local pip packages 'C:\Users\your_username\AppData\Roaming\Python\' and then creating a new virtual environment.  
@@ -288,6 +288,13 @@ These acknowledgments recognize the contributions and inspirations that have hel
 4. [HEC-Commander Tools](https://github.com/billk-FM/HEC-Commander) - Inspiration and initial code base for the development of RAS Commander.
 
 
+## Official RAS Commander AI-Generated Songs:
+
+[No More Wait and See (Bluegrass)](https://suno.com/song/16889f3e-50f1-4afe-b779-a41738d7617a)  
+
+[No More Wait and See (Cajun Zydeco)](https://suno.com/song/4441c45d-f6cd-47b9-8fbc-1f7b277ee8ed)  
+
+
 ## Contact
 
 For questions, suggestions, or support, please contact:

ras_commander-0.44.0/ras_commander/Decorators.py

@@ -0,0 +1,111 @@
+from functools import wraps
+from pathlib import Path
+from typing import Union
+import logging
+import h5py
+import inspect
+
+
+def log_call(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        logger = logging.getLogger(func.__module__)
+        logger.info(f"Calling {func.__name__}")
+        result = func(*args, **kwargs)
+        logger.info(f"Finished {func.__name__}")
+        return result
+    return wrapper
+
+
+def standardize_input(file_type: str = 'plan_hdf'):
+    """
+    Decorator to standardize input for HDF file operations.
+    
+    This decorator processes various input types and converts them to a Path object
+    pointing to the correct HDF file. It handles the following input types:
+    - h5py.File objects
+    - pathlib.Path objects
+    - Strings (file paths or plan/geom numbers)
+    - Integers (interpreted as plan/geom numbers)
+    
+    The decorator also manages RAS object references and logging.
+    
+    Args:
+        file_type (str): Specifies whether to look for 'plan_hdf' or 'geom_hdf' files.
+    
+    Returns:
+        A decorator that wraps the function to standardize its input to a Path object.
+    """
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            logger = logging.getLogger(func.__module__)
+            
+            # Handle both static method calls and regular function calls
+            if args and isinstance(args[0], type):
+                # Static method call, remove the class argument
+                args = args[1:]
+            
+            hdf_input = kwargs.pop('hdf_path', None) or kwargs.pop('hdf_input', None) or (args[0] if args else None)
+            ras_object = kwargs.pop('ras_object', None) or (args[1] if len(args) > 1 else None)
+
+            hdf_path = None
+
+            # If hdf_input is already an h5py.File object, use its filename
+            if isinstance(hdf_input, h5py.File):
+                hdf_path = Path(hdf_input.filename)
+            # Handle Path objects
+            elif isinstance(hdf_input, Path):
+                if hdf_input.is_file():
+                    hdf_path = hdf_input
+            # Handle string inputs
+            elif isinstance(hdf_input, str):
+                # Check if it's a file path
+                if Path(hdf_input).is_file():
+                    hdf_path = Path(hdf_input)
+                # Check if it's a number (with or without 'p' prefix)
+                elif hdf_input.isdigit() or (len(hdf_input) == 3 and hdf_input[0] == 'p' and hdf_input[1:].isdigit()):
+                    if ras_object is None:
+                        raise ValueError("RAS object is required when using plan or geom numbers.")
+                    number = hdf_input if hdf_input.isdigit() else hdf_input[1:]
+                    
+                    if file_type == 'plan_hdf':
+                        plan_info = ras_object.plan_df[ras_object.plan_df['plan_number'] == number]
+                        if not plan_info.empty:
+                            hdf_path = Path(plan_info.iloc[0]['HDF_Results_Path'])
+                    elif file_type == 'geom_hdf':
+                        geom_info = ras_object.geom_df[ras_object.geom_df['geom_number'] == number]
+                        if not geom_info.empty:
+                            hdf_path = Path(geom_info.iloc[0]['HDF_Path'])
+                    else:
+                        raise ValueError(f"Invalid file type: {file_type}")
+            # Handle integer inputs (assuming they're plan or geom numbers)
+            elif isinstance(hdf_input, int):
+                if ras_object is None:
+                    raise ValueError("RAS object is required when using plan or geom numbers.")
+                number = f"{hdf_input:02d}"
+                
+                if file_type == 'plan_hdf':
+                    plan_info = ras_object.plan_df[ras_object.plan_df['plan_number'] == number]
+                    if not plan_info.empty:
+                        hdf_path = Path(plan_info.iloc[0]['HDF_Results_Path'])
+                elif file_type == 'geom_hdf':
+                    geom_info = ras_object.geom_df[ras_object.geom_df['geom_number'] == number]
+                    if not geom_info.empty:
+                        hdf_path = Path(geom_info.iloc[0]['HDF_Path'])
+                else:
+                    raise ValueError(f"Invalid file type: {file_type}")
+
+            if hdf_path is None or not hdf_path.is_file():
+                error_msg = f"HDF file not found: {hdf_input}"
+                logger.error(error_msg)
+                raise FileNotFoundError(error_msg)
+
+            logger.info(f"Using HDF file: {hdf_path}")
+            
+            # Pass all original arguments and keywords, replacing hdf_input with standardized hdf_path
+            new_args = (hdf_path,) + args[1:]
+            return func(*new_args, **kwargs)
+
+        return wrapper
+    return decorator

ras_commander-0.44.0/ras_commander/HdfBase.py

@@ -0,0 +1,197 @@
+"""
+Class: HdfBase
+
+Attribution: A substantial amount of code in this file is sourced or derived 
+from the https://github.com/fema-ffrd/rashdf library, 
+released under MIT license and Copyright (c) 2024 fema-ffrd
+
+The file has been forked and modified for use in RAS Commander.
+"""
+import re
+from datetime import datetime, timedelta
+import h5py
+import numpy as np
+import pandas as pd
+import xarray as xr  # Added import for xarray
+from typing import List, Tuple, Union, Optional, Dict
+from pathlib import Path
+import logging
+
+from .HdfUtils import HdfUtils
+from .Decorators import standardize_input, log_call
+from .LoggingConfig import setup_logging, get_logger
+
+logger = get_logger(__name__)
+
+class HdfBase:
+    """
+    Base class for HEC-RAS HDF file operations.
+
+    This class provides fundamental methods for interacting with HEC-RAS HDF files,
+    including time-related operations and mesh data retrieval. It serves as a foundation
+    for more specialized HDF classes.
+
+    The methods in this class are designed to work with both plan and geometry HDF files,
+    providing low-level access to file structure and content.
+
+    Note:
+    - All methods in this class are static, allowing for use without instantiation.
+    - This class is not meant to be used directly in most cases, but rather as a base
+      for more specialized HDF classes.
+    """
+
+    @staticmethod
+    def _get_simulation_start_time(hdf_file: h5py.File) -> datetime:
+        """
+        Get the simulation start time from the HDF file.
+
+        Args:
+            hdf_file (h5py.File): Open HDF file object.
+
+        Returns:
+            datetime: The simulation start time.
+
+        Raises:
+            ValueError: If Plan Information is not found in the HDF file.
+        """
+        plan_info = hdf_file.get("Plan Data/Plan Information")
+        if plan_info is None:
+            raise ValueError("Plan Information not found in HDF file")
+        time_str = plan_info.attrs.get('Simulation Start Time')
+        return datetime.strptime(time_str.decode('utf-8'), "%d%b%Y %H:%M:%S")
+
+    @staticmethod
+    def _get_unsteady_datetimes(hdf_file: h5py.File) -> List[datetime]:
+        """
+        Get the list of unsteady datetimes from the HDF file.
+
+        Args:
+            hdf_file (h5py.File): Open HDF file object.
+
+        Returns:
+            List[datetime]: A list of datetime objects representing the unsteady timestamps.
+        """
+        group_path = "Results/Unsteady/Output/Output Blocks/Base Output/Unsteady Time Series/Time Date Stamp (ms)"
+        raw_datetimes = hdf_file[group_path][:]
+        return [HdfBase._parse_ras_datetime_ms(x.decode("utf-8")) for x in raw_datetimes]
+    
+
+    @staticmethod
+    def _get_2d_flow_area_names_and_counts(hdf_file: h5py.File) -> List[Tuple[str, int]]:
+        """
+        Get the names and cell counts of 2D flow areas from the HDF file.
+
+        Args:
+            hdf_file (h5py.File): Open HDF file object.
+
+        Returns:
+            List[Tuple[str, int]]: A list of tuples containing the name and cell count of each 2D flow area.
+        """
+        d2_flow_areas = hdf_file.get("Geometry/2D Flow Areas/Attributes")
+        if d2_flow_areas is None:
+            return []
+        return [(HdfBase._convert_ras_hdf_string(d2_flow_area[0]), d2_flow_area[-1]) for d2_flow_area in d2_flow_areas[:]]
+
+    @staticmethod
+    def _parse_ras_datetime(datetime_str: str) -> datetime:
+        """
+        Parse a datetime string from a RAS file into a datetime object.
+
+        Args:
+            datetime_str (str): The datetime string to parse.
+
+        Returns:
+            datetime: The parsed datetime object.
+        """
+        return datetime.strptime(datetime_str, "%d%b%Y %H:%M:%S")
+
+    @staticmethod
+    def _parse_ras_simulation_window_datetime(datetime_str: str) -> datetime:
+        """
+        Parse a datetime string from a RAS simulation window into a datetime object.
+
+        Args:
+            datetime_str (str): The datetime string to parse.
+
+        Returns:
+            datetime: The parsed datetime object.
+        """
+        return datetime.strptime(datetime_str, "%d%b%Y %H%M")
+
+    @staticmethod
+    def _parse_duration(duration_str: str) -> timedelta:
+        """
+        Parse a duration string into a timedelta object.
+
+        Args:
+            duration_str (str): The duration string to parse.
+
+        Returns:
+            timedelta: The parsed duration as a timedelta object.
+        """
+        hours, minutes, seconds = map(int, duration_str.split(':'))
+        return timedelta(hours=hours, minutes=minutes, seconds=seconds)
+
+    @staticmethod
+    def _parse_ras_datetime_ms(datetime_str: str) -> datetime:
+        """
+        Parse a datetime string with milliseconds from a RAS file.
+
+        Args:
+            datetime_str (str): The datetime string to parse.
+
+        Returns:
+            datetime: The parsed datetime object.
+        """
+        milliseconds = int(datetime_str[-3:])
+        microseconds = milliseconds * 1000
+        parsed_dt = HdfBase._parse_ras_datetime(datetime_str[:-4]).replace(microsecond=microseconds)
+        return parsed_dt
+
+    @staticmethod
+    def _convert_ras_hdf_string(value: Union[str, bytes]) -> Union[bool, datetime, List[datetime], timedelta, str]:
+        """
+        Convert a string value from an HEC-RAS HDF file into a Python object.
+
+        Args:
+            value (Union[str, bytes]): The value to convert.
+
+        Returns:
+            Union[bool, datetime, List[datetime], timedelta, str]: The converted value.
+        """
+        if isinstance(value, bytes):
+            s = value.decode("utf-8")
+        else:
+            s = value
+
+        if s == "True":
+            return True
+        elif s == "False":
+            return False
+        
+        ras_datetime_format1_re = r"\d{2}\w{3}\d{4} \d{2}:\d{2}:\d{2}"
+        ras_datetime_format2_re = r"\d{2}\w{3}\d{4} \d{2}\d{2}"
+        ras_duration_format_re = r"\d{2}:\d{2}:\d{2}"
+
+        if re.match(rf"^{ras_datetime_format1_re}", s):
+            if re.match(rf"^{ras_datetime_format1_re} to {ras_datetime_format1_re}$", s):
+                split = s.split(" to ")
+                return [
+                    HdfBase._parse_ras_datetime(split[0]),
+                    HdfBase._parse_ras_datetime(split[1]),
+                ]
+            return HdfBase._parse_ras_datetime(s)
+        elif re.match(rf"^{ras_datetime_format2_re}", s):
+            if re.match(rf"^{ras_datetime_format2_re} to {ras_datetime_format2_re}$", s):
+                split = s.split(" to ")
+                return [
+                    HdfBase._parse_ras_simulation_window_datetime(split[0]),
+                    HdfBase._parse_ras_simulation_window_datetime(split[1]),
+                ]
+            return HdfBase._parse_ras_simulation_window_datetime(s)
+        elif re.match(rf"^{ras_duration_format_re}$", s):
+            return HdfBase._parse_duration(s)
+        return s
+
+
+