rashdf 0.8.0__tar.gz → 0.8.2__tar.gz

{rashdf-0.8.0 → rashdf-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rashdf
-Version: 0.8.0
+Version: 0.8.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -16,7 +16,7 @@ License-File: LICENSE
 Requires-Dist: h5py
 Requires-Dist: geopandas<2.0,>=1.0
 Requires-Dist: pyarrow
-Requires-Dist: xarray
+Requires-Dist: xarray<=2025.4.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"

{rashdf-0.8.0 → rashdf-0.8.2}/pyproject.toml

@@ -12,8 +12,8 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-version = "0.8.0"
-dependencies = ["h5py", "geopandas>=1.0,<2.0", "pyarrow", "xarray"]
+version = "0.8.2"
+dependencies = ["h5py", "geopandas>=1.0,<2.0", "pyarrow", "xarray<=2025.4.0"]
 
 [project.optional-dependencies]
 dev = [

{rashdf-0.8.0 → rashdf-0.8.2}/src/rashdf/geom.py

@@ -17,6 +17,8 @@ from shapely import (
 )
 
 from typing import Dict, List, Optional, Union
+from warnings import warn
+from pathlib import Path
 
 
 from .base import RasHdf
@@ -29,7 +31,7 @@ from .utils import (
 
 
 class RasGeomHdfError(Exception):
-    """HEC-RAS Plan HDF error class."""
+    """HEC-RAS Geometry HDF error class."""
 
     pass
 
@@ -43,6 +45,7 @@ class RasGeomHdf(RasHdf):
     BC_LINES_PATH = f"{GEOM_PATH}/Boundary Condition Lines"
     IC_POINTS_PATH = f"{GEOM_PATH}/IC Points"
     BREAKLINES_PATH = f"{GEOM_PATH}/2D Flow Area Break Lines"
+    REFINEMENT_REGIONS_PATH = f"{GEOM_PATH}/2D Flow Area Refinement Regions"
     REFERENCE_LINES_PATH = f"{GEOM_PATH}/Reference Lines"
     REFERENCE_POINTS_PATH = f"{GEOM_PATH}/Reference Points"
     CROSS_SECTIONS = f"{GEOM_PATH}/Cross Sections"
@@ -103,10 +106,15 @@ class RasGeomHdf(RasHdf):
         mesh_area_names = self.mesh_area_names()
         if not mesh_area_names:
             return GeoDataFrame()
-        mesh_area_polygons = [
-            Polygon(self[f"{self.FLOW_AREA_2D_PATH}/{n}/Perimeter"][()])
-            for n in mesh_area_names
-        ]
+
+        mesh_area_polygons = []
+        for n in mesh_area_names:
+            try:
+                mesh_area_polygons.append(
+                    Polygon(self[f"{self.FLOW_AREA_2D_PATH}/{n}/Perimeter"][()])
+                )
+            except KeyError as e:
+                raise RasGeomHdfError(f"Data for mesh '{n}' not found.") from e
         return GeoDataFrame(
             {"mesh_name": mesh_area_names, "geometry": mesh_area_polygons},
             geometry="geometry",
@@ -295,19 +303,28 @@ class RasGeomHdf(RasHdf):
         polyline_points = self[polyline_points_path][()]
 
         geoms = []
-        for pnt_start, pnt_cnt, part_start, part_cnt in polyline_info:
-            points = polyline_points[pnt_start : pnt_start + pnt_cnt]
-            if part_cnt == 1:
-                geoms.append(LineString(points))
-            else:
-                parts = polyline_parts[part_start : part_start + part_cnt]
-                geoms.append(
-                    MultiLineString(
-                        list(
-                            points[part_pnt_start : part_pnt_start + part_pnt_cnt]
-                            for part_pnt_start, part_pnt_cnt in parts
+        for i, (pnt_start, pnt_cnt, part_start, part_cnt) in enumerate(polyline_info):
+            try:
+                points = polyline_points[pnt_start : pnt_start + pnt_cnt]
+                if part_cnt == 1:
+                    geoms.append(LineString(points))
+                else:  # pragma: no cover | TODO: add test coverage for this
+                    parts = polyline_parts[part_start : part_start + part_cnt]
+                    geoms.append(
+                        MultiLineString(
+                            list(
+                                points[part_pnt_start : part_pnt_start + part_pnt_cnt]
+                                for part_pnt_start, part_pnt_cnt in parts
+                            )
                         )
                     )
+            except (
+                Exception
+            ) as e:  # pragma: no cover | TODO: add test coverage for this
+                geoms.append(None)
+                warn(
+                    f"Feature ID {i} within '{Path(path).name}' layer set to null due to invalid geometry. {e}",
+                    UserWarning,
                 )
         return geoms
 
@@ -370,25 +387,38 @@ class RasGeomHdf(RasHdf):
         GeoDataFrame
             A GeoDataFrame containing the 2D mesh area refinement regions if they exist.
         """
-        if "/Geometry/2D Flow Area Refinement Regions" not in self:
+        if self.REFINEMENT_REGIONS_PATH not in self:
             return GeoDataFrame()
-        rr_data = self["/Geometry/2D Flow Area Refinement Regions"]
+        rr_data = self[self.REFINEMENT_REGIONS_PATH]
         rr_ids = range(rr_data["Attributes"][()].shape[0])
         names = np.vectorize(convert_ras_hdf_string)(rr_data["Attributes"][()]["Name"])
         geoms = list()
-        for pnt_start, pnt_cnt, part_start, part_cnt in rr_data["Polygon Info"][()]:
-            points = rr_data["Polygon Points"][()][pnt_start : pnt_start + pnt_cnt]
-            if part_cnt == 1:
-                geoms.append(Polygon(points))
-            else:
-                parts = rr_data["Polygon Parts"][()][part_start : part_start + part_cnt]
-                geoms.append(
-                    MultiPolygon(
-                        list(
-                            points[part_pnt_start : part_pnt_start + part_pnt_cnt]
-                            for part_pnt_start, part_pnt_cnt in parts
+        for i, (pnt_start, pnt_cnt, part_start, part_cnt) in enumerate(
+            rr_data["Polygon Info"][()]
+        ):
+            try:
+                points = rr_data["Polygon Points"][()][pnt_start : pnt_start + pnt_cnt]
+                if part_cnt == 1:
+                    geoms.append(Polygon(points))
+                else:  # pragma: no cover | TODO: add test coverage for this
+                    parts = rr_data["Polygon Parts"][()][
+                        part_start : part_start + part_cnt
+                    ]
+                    geoms.append(
+                        MultiPolygon(
+                            list(
+                                points[part_pnt_start : part_pnt_start + part_pnt_cnt]
+                                for part_pnt_start, part_pnt_cnt in parts
+                            )
                         )
                     )
+            except (
+                Exception
+            ) as e:  # pragma: no cover | TODO: add test coverage for this
+                geoms.append(None)
+                warn(
+                    f"Feature ID {i} within '{Path(self.REFINEMENT_REGIONS_PATH).name}' layer set to null due to invalid geometry. {e}",
+                    UserWarning,
                 )
         return GeoDataFrame(
             {"rr_id": rr_ids, "name": names, "geometry": geoms},

{rashdf-0.8.0 → rashdf-0.8.2}/src/rashdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rashdf
-Version: 0.8.0
+Version: 0.8.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -16,7 +16,7 @@ License-File: LICENSE
 Requires-Dist: h5py
 Requires-Dist: geopandas<2.0,>=1.0
 Requires-Dist: pyarrow
-Requires-Dist: xarray
+Requires-Dist: xarray<=2025.4.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"

{rashdf-0.8.0 → rashdf-0.8.2}/src/rashdf.egg-info/requires.txt

@@ -1,7 +1,7 @@
 h5py
 geopandas<2.0,>=1.0
 pyarrow
-xarray
+xarray<=2025.4.0
 
 [dev]
 pre-commit

{rashdf-0.8.0 → rashdf-0.8.2}/tests/test_geom.py

@@ -2,8 +2,10 @@ import geopandas as gpd
 from pathlib import Path
 import h5py
 from pyproj import CRS
-from src.rashdf import RasGeomHdf
+from src.rashdf.geom import RasGeomHdf, RasGeomHdfError
 from pandas.testing import assert_frame_equal
+import pytest
+import numpy as np
 
 from . import _create_hdf_with_group_attrs, _gdf_matches_json, _gdf_matches_json_alt
 
@@ -35,30 +37,85 @@ def test_mesh_area_names():
         assert ghdf.mesh_area_names() == ["2D Interior Area", "Perimeter_NW"]
 
 
+def test_invalid_mesh_area_names(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    # Test the empty Mesh Area names
+    with RasGeomHdf(test_hdf) as ghdf:
+        assert ghdf.mesh_area_names() == []
+
+
+def test_missing_mesh_in_mesh_area(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    mesh_name = "blw-west-fork"
+    with h5py.File(test_hdf, "w") as f:
+        dtype = np.dtype([("Name", h5py.string_dtype("utf-8"))])
+        data = np.array([(mesh_name,)], dtype=dtype)
+        f.create_dataset(f"{RasGeomHdf.FLOW_AREA_2D_PATH}/Attributes", data=data)
+
+    ras_hdf = RasGeomHdf(test_hdf)
+    expected_error_message = f"Data for mesh '{mesh_name}' not found."
+    with pytest.raises(RasGeomHdfError, match=expected_error_message):
+        ras_hdf.mesh_areas()
+
+
 def test_mesh_areas():
     mesh_areas_json = TEST_JSON / "mesh_areas.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf:
         assert _gdf_matches_json(ghdf.mesh_areas(), mesh_areas_json)
 
 
+def test_invalid_mesh_areas(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    # Test the empty Mesh Areas
+    with RasGeomHdf(test_hdf) as ghdf:
+        assert ghdf.mesh_areas().empty
+
+
 def test_mesh_cell_faces():
     mesh_cell_faces_json = TEST_JSON / "mesh_cell_faces.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf:
         assert _gdf_matches_json(ghdf.mesh_cell_faces(), mesh_cell_faces_json)
 
 
+def test_invalid_mesh_faces(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    # Test the empty Mesh Faces
+    with RasGeomHdf(test_hdf) as ghdf:
+        assert ghdf.mesh_cell_faces().empty
+
+
 def test_mesh_cell_points():
     mesh_cell_points_json = TEST_JSON / "mesh_cell_points.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf:
         assert _gdf_matches_json(ghdf.mesh_cell_points(), mesh_cell_points_json)
 
 
+def test_invalid_mesh_cell_points(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    # Test the empty Mesh Cell Points
+    with RasGeomHdf(test_hdf) as ghdf:
+        assert ghdf.mesh_cell_points().empty
+
+
 def test_mesh_cell_polygons():
     mesh_cell_polygons_json = TEST_JSON / "mesh_cell_polygons.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf:
         assert _gdf_matches_json(ghdf.mesh_cell_polygons(), mesh_cell_polygons_json)
 
 
+def test_invalid_mesh_cell_polygons(tmp_path):
+    # Create a dummy HDF file
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    # Test the empty Mesh Cell Polygons
+    with RasGeomHdf(test_hdf) as ghdf:
+        assert ghdf.mesh_cell_polygons().empty
+
+
 def test_mesh_cell_polygons_coal():
     """Test with the mesh from the Coal River model.
 
@@ -118,6 +175,18 @@ def test_get_geom_2d_flow_area_attrs(tmp_path):
     assert ras_hdf.get_geom_2d_flow_area_attrs() == TEST_ATTRS
 
 
+def test_invalid_get_geom_2d_flow_area_attrs(tmp_path):
+    test_hdf = tmp_path / "test.hdf"
+    _create_hdf_with_group_attrs(test_hdf, RasGeomHdf.GEOM_PATH, TEST_ATTRS)
+    ras_hdf = RasGeomHdf(test_hdf)
+
+    with pytest.raises(
+        AttributeError,
+        match=f"Unable to get 2D Flow Area; {RasGeomHdf.FLOW_AREA_2D_PATH} group not found in HDF5 file.",
+    ):
+        ras_hdf.get_geom_2d_flow_area_attrs()
+
+
 def test_structs():
     structs_json = TEST_JSON / "structures.json"
     with RasGeomHdf(MUNCIE_G05) as ghdf: