ras-commander 0.79.1__tar.gz → 0.80.2__tar.gz

{ras_commander-0.79.1/ras_commander.egg-info → ras_commander-0.80.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ras-commander
-Version: 0.79.1
+Version: 0.80.2
 Summary: A Python library for automating HEC-RAS 6.x operations
 Home-page: https://github.com/gpt-cmdr/ras-commander
 Author: William M. Katzenmeyer, P.E., C.F.M.

{ras_commander-0.79.1 → ras_commander-0.80.2}/ras_commander/HdfXsec.py

@@ -114,9 +114,13 @@ class HdfXsec:
                 mann_info = hdf["/Geometry/Cross Sections/Manning's n Info"][:]
                 mann_values = hdf["/Geometry/Cross Sections/Manning's n Values"][:]
                 
-                # Get ineffective blocks data
-                ineff_blocks = hdf['/Geometry/Cross Sections/Ineffective Blocks'][:]
-                ineff_info = hdf['/Geometry/Cross Sections/Ineffective Info'][:]
+                # Get ineffective blocks data if they exist
+                if '/Geometry/Cross Sections/Ineffective Blocks' in hdf:
+                    ineff_blocks = hdf['/Geometry/Cross Sections/Ineffective Blocks'][:]
+                    ineff_info = hdf['/Geometry/Cross Sections/Ineffective Info'][:]
+                else:
+                    ineff_blocks = None
+                    ineff_info = None
                 
                 # Initialize lists to store data
                 geometries = []
@@ -165,20 +169,23 @@ class HdfXsec:
                         mannings_n.append(mann_n_dict)
                         
                         # Extract ineffective blocks data
-                        ineff_start_idx = ineff_info[i][0]
-                        ineff_count = ineff_info[i][1]
-                        if ineff_count > 0:
-                            blocks = ineff_blocks[ineff_start_idx:ineff_start_idx + ineff_count]
-                            blocks_list = []
-                            for block in blocks:
-                                block_dict = {
-                                    'Left Sta': float(block['Left Sta']),
-                                    'Right Sta': float(block['Right Sta']), 
-                                    'Elevation': float(block['Elevation']),
-                                    'Permanent': bool(block['Permanent'])
-                                }
-                                blocks_list.append(block_dict)
-                            ineffective_blocks.append(blocks_list)
+                        if ineff_info is not None and ineff_blocks is not None:
+                            ineff_start_idx = ineff_info[i][0]
+                            ineff_count = ineff_info[i][1]
+                            if ineff_count > 0:
+                                blocks = ineff_blocks[ineff_start_idx:ineff_start_idx + ineff_count]
+                                blocks_list = []
+                                for block in blocks:
+                                    block_dict = {
+                                        'Left Sta': float(block['Left Sta']),
+                                        'Right Sta': float(block['Right Sta']), 
+                                        'Elevation': float(block['Elevation']),
+                                        'Permanent': bool(block['Permanent'])
+                                    }
+                                    blocks_list.append(block_dict)
+                                ineffective_blocks.append(blocks_list)
+                            else:
+                                ineffective_blocks.append([])
                         else:
                             ineffective_blocks.append([])
                 

{ras_commander-0.79.1 → ras_commander-0.80.2}/ras_commander/RasExamples.py

@@ -128,11 +128,14 @@ class RasExamples:
         self._save_to_csv()
 
     @classmethod
-    def extract_project(cls, project_names: Union[str, List[str]]) -> Union[Path, List[Path]]:
+    def extract_project(cls, project_names: Union[str, List[str]], output_path: Union[str, Path] = None) -> Union[Path, List[Path]]:
         """Extract one or more specific HEC-RAS projects from the zip file.
         
         Args:
             project_names: Single project name as string or list of project names
+            output_path: Optional path where the project folder will be placed.
+                        Can be a relative path (creates subfolder in current directory)
+                        or an absolute path. If None, uses default 'example_projects' folder.
             
         Returns:
             Path: Single Path object if one project extracted
@@ -151,13 +154,26 @@ class RasExamples:
         if isinstance(project_names, str):
             project_names = [project_names]
 
+        # Determine the output directory
+        if output_path is None:
+            # Use default 'example_projects' folder
+            base_output_path = cls.projects_dir
+        else:
+            # Convert to Path object
+            base_output_path = Path(output_path)
+            # If relative path, make it relative to current working directory
+            if not base_output_path.is_absolute():
+                base_output_path = Path.cwd() / base_output_path
+            # Create the directory if it doesn't exist
+            base_output_path.mkdir(parents=True, exist_ok=True)
+
         extracted_paths = []
 
         for project_name in project_names:
             # Check if this is a special project
             if project_name in cls.SPECIAL_PROJECTS:
                 try:
-                    special_path = cls._extract_special_project(project_name)
+                    special_path = cls._extract_special_project(project_name, base_output_path)
                     extracted_paths.append(special_path)
                     continue
                 except Exception as e:
@@ -167,7 +183,7 @@ class RasExamples:
             # Regular project extraction logic
             logger.info("----- RasExamples Extracting Project -----")
             logger.info(f"Extracting project '{project_name}'")
-            project_path = cls.projects_dir
+            project_path = base_output_path
 
             if (project_path / project_name).exists():
                 logger.info(f"Project '{project_name}' already exists. Deleting existing folder...")
@@ -447,12 +463,13 @@ class RasExamples:
         return int(number * units[unit])
 
     @classmethod
-    def _extract_special_project(cls, project_name: str) -> Path:
+    def _extract_special_project(cls, project_name: str, output_path: Path = None) -> Path:
         """
         Download and extract special projects that are not in the main zip file.
         
         Args:
             project_name: Name of the special project ('NewOrleansMetro' or 'BeaverLake')
+            output_path: Base output directory path. If None, uses cls.projects_dir
             
         Returns:
             Path: Path to the extracted project directory
@@ -466,8 +483,11 @@ class RasExamples:
         logger.info(f"----- RasExamples Extracting Special Project -----")
         logger.info(f"Extracting special project '{project_name}'")
         
+        # Use provided output_path or default
+        base_path = output_path if output_path else cls.projects_dir
+        
         # Create the project directory
-        project_path = cls.projects_dir / project_name
+        project_path = base_path / project_name
         
         # Check if already exists
         if project_path.exists():
@@ -484,7 +504,7 @@ class RasExamples:
         
         # Download the zip file
         url = cls.SPECIAL_PROJECTS[project_name]
-        zip_file_path = cls.projects_dir / f"{project_name}_temp.zip"
+        zip_file_path = base_path / f"{project_name}_temp.zip"
         
         logger.info(f"Downloading special project from: {url}")
         logger.info("This may take a few moments...")