ras-commander 0.52.0__py3-none-any.whl → 0.53.0__py3-none-any.whl

ras_commander/Decorators.py

@@ -1,128 +1,138 @@
-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__)
-            
-            # Check if the function expects an hdf_path parameter
-            sig = inspect.signature(func)
-            param_names = list(sig.parameters.keys())
-            
-            # If first parameter is 'hdf_file', skip path processing
-            if param_names and param_names[0] == 'hdf_file':
-                return func(*args, **kwargs)
-                
-            # 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)
-
-            # If no hdf_input provided, return the function unmodified
-            if hdf_input is None:
-                return func(*args, **kwargs)
-
-            # NEW: If input is already a Path and exists, use it directly regardless of file_type
-            if isinstance(hdf_input, Path) and hdf_input.is_file():
-                logger.info(f"Using existing HDF file: {hdf_input}")
-                new_args = (hdf_input,) + args[1:]
-                return func(*new_args, **kwargs)
-
-            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
+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.debug(f"Calling {func.__name__}")
+        result = func(*args, **kwargs)
+        logger.debug(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__)
+            
+            # Check if the function expects an hdf_path parameter
+            sig = inspect.signature(func)
+            param_names = list(sig.parameters.keys())
+            
+            # If first parameter is 'hdf_file', skip path processing
+            if param_names and param_names[0] == 'hdf_file':
+                return func(*args, **kwargs)
+                
+            # 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)
+            
+            # Import ras here to ensure we get the most current instance
+            from .RasPrj import ras as ras
+            ras_object = kwargs.pop('ras_object', None) or (args[1] if len(args) > 1 else None)
+            ras_obj = ras_object or ras
+
+            # If no hdf_input provided, return the function unmodified
+            if hdf_input is None:
+                return func(*args, **kwargs)
+
+            # NEW: If input is already a Path and exists, use it directly regardless of file_type
+            if isinstance(hdf_input, Path) and hdf_input.is_file():
+                logger.info(f"Using existing HDF file: {hdf_input}")
+                new_args = (hdf_input,) + args[1:]
+                return func(*new_args, **kwargs)
+
+            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()):
+                    try:
+                        ras_obj.check_initialized()
+                    except Exception as e:
+                        raise ValueError(f"RAS object is not initialized: {str(e)}")
+                        
+                    number = hdf_input if hdf_input.isdigit() else hdf_input[1:]
+                    
+                    if file_type == 'plan_hdf':
+                        plan_info = ras_obj.plan_df[ras_obj.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_obj.geom_df[ras_obj.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):
+                try:
+                    ras_obj.check_initialized()
+                except Exception as e:
+                    raise ValueError(f"RAS object is not initialized: {str(e)}")
+                    
+                number = f"{hdf_input:02d}"
+                
+                if file_type == 'plan_hdf':
+                    plan_info = ras_obj.plan_df[ras_obj.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_obj.geom_df[ras_obj.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/HdfBase.py

@@ -158,6 +158,7 @@ class HdfBase:
 
         project_folder = hdf_path.parent
         wkt = None
+        proj_file = None  # Initialize proj_file variable
         
         # Try HDF file
         try:
@@ -170,6 +171,7 @@ class HdfBase:
                         return wkt
         except Exception as e:
             logger.error(f"Error reading projection from HDF file {hdf_path}: {str(e)}")
+
         # Try RASMapper file if no HDF projection
         if not wkt:
             try:
@@ -189,16 +191,29 @@ class HdfBase:
             except Exception as e:
                 logger.error(f"Error reading RASMapper projection file: {str(e)}")
         
-        logger.critical(
-            "No valid projection found. Checked:\n"
-            f"1. HDF file projection attribute: {hdf_path}\n"
-            f"2. RASMapper projection file {proj_file} found in RASMapper file, but was invalid\n"
-            "To fix this:\n"
+        # Customize error message based on whether proj_file was found
+        if proj_file:
+            error_msg = (
+                "No valid projection found. Checked:\n"
+                f"1. HDF file projection attribute: {hdf_path}\n"
+                f"2. RASMapper projection file {proj_file} found in RASMapper file, but was invalid"
+            )
+        else:
+            error_msg = (
+                "No valid projection found. Checked:\n"
+                f"1. HDF file projection attribute: {hdf_path}\n was checked and no projection attribute found"
+                "2. No RASMapper projection file found"
+            )
+
+        error_msg += (
+            "\nTo fix this:\n"
             "1. Open RASMapper\n"
             "2. Click Map > Set Projection\n" 
             "3. Select an appropriate projection file or coordinate system\n"
             "4. Save the RASMapper project"
         )
+        
+        logger.critical(error_msg)
         return None
 
     @staticmethod
@@ -219,7 +234,7 @@ class HdfBase:
                 logger.warning(f"Path {attr_path} not found in HDF file")
                 return {}
             
-            return HdfUtils.hdf5_attrs_to_dict(hdf_file[attr_path].attrs)
+            return HdfUtils.convert_hdf5_attrs_to_dict(hdf_file[attr_path].attrs)
         except Exception as e:
             logger.error(f"Error getting attributes from {attr_path}: {str(e)}")
             return {}