rashdf 0.1.1__tar.gz → 0.2.1__tar.gz

{rashdf-0.1.1/src/rashdf.egg-info → rashdf-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rashdf
-Version: 0.1.1
+Version: 0.2.1
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: h5py
 Requires-Dist: geopandas
+Requires-Dist: pyarrow
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
@@ -77,6 +78,48 @@ datetime.datetime(2024, 3, 27, 9, 32, 15)],
 'Time Stamp Solution Went Unstable': 'Not Applicable'}
 ```
 
+## CLI
+The `rashdf` command-line interface allows export directly to a variety of formats, enabled
+by GeoPandas.
+```
+$ rashdf <sub-command> <hdf-file> [<output-path>] [<options>]
+```
+
+CLI help:
+```
+$ rashdf --help
+```
+
+Print the output formats supported by Fiona:
+```
+$ rashdf --fiona-drivers
+```
+
+Help for a specific subcommand:
+```
+$ rashdf mesh_cell_polygons --help
+```
+
+Example: export mesh cell faces to an ESRI Shapefile
+```
+$ rashdf mesh_cell_faces BigRiver.g01.hdf big-river-mesh-cell-faces.shp
+```
+
+Example: export mesh cell points to GeoParquet
+```
+$ rashdf mesh_cell_points LittleCreek.g01.hdf --parquet little-creek-mesh-cell-points.parquet
+```
+
+Example: export breaklines to OGC GeoPackage and reproject to a different CRS
+```
+$ rashdf breaklines Whitemarsh.p01.hdf whitemarsh-breaklines.gpkg --to-crs EPSG:4326
+```
+
+Example: write structures GeoJSON to `stdout`:
+```
+$ rashdf structures Potomac.p01.hdf
+```
+
 ## Documentation
 Coming soon.
 

{rashdf-0.1.1 → rashdf-0.2.1}/README.md

@@ -55,6 +55,48 @@ datetime.datetime(2024, 3, 27, 9, 32, 15)],
 'Time Stamp Solution Went Unstable': 'Not Applicable'}
 ```
 
+## CLI
+The `rashdf` command-line interface allows export directly to a variety of formats, enabled
+by GeoPandas.
+```
+$ rashdf <sub-command> <hdf-file> [<output-path>] [<options>]
+```
+
+CLI help:
+```
+$ rashdf --help
+```
+
+Print the output formats supported by Fiona:
+```
+$ rashdf --fiona-drivers
+```
+
+Help for a specific subcommand:
+```
+$ rashdf mesh_cell_polygons --help
+```
+
+Example: export mesh cell faces to an ESRI Shapefile
+```
+$ rashdf mesh_cell_faces BigRiver.g01.hdf big-river-mesh-cell-faces.shp
+```
+
+Example: export mesh cell points to GeoParquet
+```
+$ rashdf mesh_cell_points LittleCreek.g01.hdf --parquet little-creek-mesh-cell-points.parquet
+```
+
+Example: export breaklines to OGC GeoPackage and reproject to a different CRS
+```
+$ rashdf breaklines Whitemarsh.p01.hdf whitemarsh-breaklines.gpkg --to-crs EPSG:4326
+```
+
+Example: write structures GeoJSON to `stdout`:
+```
+$ rashdf structures Potomac.p01.hdf
+```
+
 ## Documentation
 Coming soon.
 

{rashdf-0.1.1 → rashdf-0.2.1}/pyproject.toml

@@ -12,8 +12,8 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-version = "0.1.1"
-dependencies = ["h5py", "geopandas"]
+version = "0.2.1"
+dependencies = ["h5py", "geopandas", "pyarrow"]
 
 [project.optional-dependencies]
 dev = ["pre-commit", "ruff", "pytest"]
@@ -21,6 +21,9 @@ dev = ["pre-commit", "ruff", "pytest"]
 [project.urls]
 repository = "https://github.com/fema-ffrd/rashdf"
 
+[project.scripts]
+rashdf = "cli:main"
+
 [tool.pytest.ini_options]
 pythonpath = "src"
 testpaths = "tests"

rashdf-0.2.1/src/cli.py

@@ -0,0 +1,155 @@
+from rashdf import RasGeomHdf
+from rashdf.utils import df_datetimes_to_str
+
+import fiona
+from geopandas import GeoDataFrame
+
+import argparse
+from ast import literal_eval
+from pathlib import Path
+import sys
+from typing import List, Optional
+import warnings
+
+
+COMMANDS = [
+    "mesh_areas",
+    "mesh_cell_points",
+    "mesh_cell_polygons",
+    "mesh_cell_faces",
+    "refinement_regions",
+    "bc_lines",
+    "breaklines",
+    "structures",
+]
+
+
+def docstring_to_help(docstring: Optional[str]) -> str:
+    """Extract the first line of a docstring to use as help text for the rashdf CLI.
+
+    Note that this function replaces 'Return' with 'Export' in the help text.
+
+    Parameters
+    ----------
+    docstring : Optional[str]
+        The docstring to extract the first line from.
+
+    Returns
+    -------
+    str
+        The first line of the docstring with 'Return' replaced by 'Export'.
+        If the docstring is None, an empty string is returned.
+    """
+    if docstring is None:
+        return ""
+    help_text = docstring.split("\n")[0]
+    help_text = help_text.replace("Return", "Export")
+    return help_text
+
+
+def fiona_supported_drivers() -> List[str]:
+    """Return a list of drivers supported by Fiona for writing output files.
+
+    Returns
+    -------
+    list
+        A list of drivers supported by Fiona for writing output files.
+    """
+    drivers = [d for d, s in fiona.supported_drivers.items() if "w" in s]
+    return drivers
+
+
+def parse_args(args: str) -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description="Extract data from HEC-RAS HDF files.")
+    parser.add_argument(
+        "--fiona-drivers",
+        action="store_true",
+        help="List the drivers supported by Fiona for writing output files.",
+    )
+    subparsers = parser.add_subparsers(help="Sub-command help")
+    for command in COMMANDS:
+        f = getattr(RasGeomHdf, command)
+        subparser = subparsers.add_parser(
+            command, description=docstring_to_help(f.__doc__)
+        )
+        subparser.set_defaults(func=command)
+        subparser.add_argument("hdf_file", type=str, help="Path to HEC-RAS HDF file.")
+        subparser.add_argument(
+            "output_file", type=str, help="Path to output file.", nargs="?"
+        )
+        subparser.add_argument(
+            "--to-crs", type=str, help='Output CRS. (e.g., "EPSG:4326")'
+        )
+        output_group = subparser.add_mutually_exclusive_group()
+        output_group.add_argument(
+            "--parquet", action="store_true", help="Output as Parquet."
+        )
+        output_group.add_argument(
+            "--feather", action="store_true", help="Output as Feather."
+        )
+        subparser.add_argument(
+            "--kwargs",
+            type=str,
+            help=(
+                "Keyword arguments as a Python dictionary literal"
+                " passed to the corresponding GeoPandas output method."
+            ),
+        )
+    args = parser.parse_args(args)
+    return args
+
+
+def export(args: argparse.Namespace) -> Optional[str]:
+    if args.fiona_drivers:
+        for driver in fiona_supported_drivers():
+            print(driver)
+        return
+    if "://" in args.hdf_file:
+        geom_hdf = RasGeomHdf.open_uri(args.hdf_file)
+    else:
+        geom_hdf = RasGeomHdf(args.hdf_file)
+    func = getattr(geom_hdf, args.func)
+    gdf: GeoDataFrame = func()
+    kwargs = literal_eval(args.kwargs) if args.kwargs else {}
+    if args.to_crs:
+        gdf = gdf.to_crs(args.to_crs)
+    if not args.output_file:
+        # convert any datetime columns to strings
+        gdf = df_datetimes_to_str(gdf)
+        with warnings.catch_warnings():
+            # Squash warnings about converting the CRS to OGC URN format.
+            # Likely to come up since USACE's Albers projection is a custom CRS.
+            # A warning written to stdout might cause issues with downstream processing.
+            warnings.filterwarnings(
+                "ignore",
+                (
+                    "GeoDataFrame's CRS is not representable in URN OGC format."
+                    " Resulting JSON will contain no CRS information."
+                ),
+            )
+            result = gdf.to_json(**kwargs)
+        print(result)
+        return result
+    elif args.parquet:
+        gdf.to_parquet(args.output_file, **kwargs)
+        return
+    elif args.feather:
+        gdf.to_feather(args.output_file, **kwargs)
+        return
+    output_file_path = Path(args.output_file)
+    output_file_ext = output_file_path.suffix
+    if output_file_ext not in [".gpkg"]:
+        # unless the user specifies a format that supports datetime,
+        # convert any datetime columns to string
+        # TODO: besides Geopackage, which of the standard Fiona formats allow datetime?
+        gdf = df_datetimes_to_str(gdf)
+    gdf.to_file(args.output_file, **kwargs)
+
+
+def main():
+    args = parse_args(sys.argv[1:])
+    export(args)
+
+
+if __name__ == "__main__":
+    main()

{rashdf-0.1.1 → rashdf-0.2.1}/src/rashdf/geom.py

@@ -1,7 +1,13 @@
 from .base import RasHdf
-from .utils import convert_ras_hdf_string, get_first_hdf_group, hdf5_attrs_to_dict
+from .utils import (
+    convert_ras_hdf_string,
+    get_first_hdf_group,
+    hdf5_attrs_to_dict,
+    convert_ras_hdf_value,
+)
 
 import numpy as np
+import pandas as pd
 from geopandas import GeoDataFrame
 from pyproj import CRS
 from shapely import (
@@ -80,7 +86,7 @@ class RasGeomHdf(RasHdf):
         )
 
     def mesh_cell_polygons(self) -> GeoDataFrame:
-        """Return the 2D flow mesh cell polygons.
+        """Return 2D flow mesh cell polygons.
 
         Returns
         -------
@@ -134,7 +140,7 @@ class RasGeomHdf(RasHdf):
         return GeoDataFrame(cell_dict, geometry="geometry", crs=self.projection())
 
     def mesh_cell_points(self) -> GeoDataFrame:
-        """Return the 2D flow mesh cell points.
+        """Return 2D flow mesh cell points.
 
         Returns
         -------
@@ -160,7 +166,7 @@ class RasGeomHdf(RasHdf):
         return GeoDataFrame(pnt_dict, geometry="geometry", crs=self.projection())
 
     def mesh_cell_faces(self) -> GeoDataFrame:
-        """Return the 2D flow mesh cell faces.
+        """Return 2D flow mesh cell faces.
 
         Returns
         -------
@@ -240,7 +246,7 @@ class RasGeomHdf(RasHdf):
         return d2_flow_area_attrs
 
     def bc_lines(self) -> GeoDataFrame:
-        """Return the 2D mesh area boundary condition lines.
+        """Return 2D mesh area boundary condition lines.
 
         Returns
         -------
@@ -289,7 +295,7 @@ class RasGeomHdf(RasHdf):
         )
 
     def breaklines(self) -> GeoDataFrame:
-        """Return the 2D mesh area breaklines.
+        """Return 2D mesh area breaklines.
 
         Returns
         -------
@@ -331,7 +337,7 @@ class RasGeomHdf(RasHdf):
         )
 
     def refinement_regions(self) -> GeoDataFrame:
-        """Return the 2D mesh area refinement regions.
+        """Return 2D mesh area refinement regions.
 
         Returns
         -------
@@ -364,6 +370,55 @@ class RasGeomHdf(RasHdf):
             crs=self.projection(),
         )
 
+    def structures(self, datetime_to_str: bool = False) -> GeoDataFrame:
+        """Return the model structures.
+
+        Returns
+        -------
+        GeoDataFrame
+            A GeoDataFrame containing the model structures if they exist.
+        """
+        if "/Geometry/Structures" not in self:
+            return GeoDataFrame()
+        struct_data = self["/Geometry/Structures"]
+        v_conv_val = np.vectorize(convert_ras_hdf_value)
+        sd_attrs = struct_data["Attributes"][()]
+        struct_dict = {"struct_id": range(sd_attrs.shape[0])}
+        struct_dict.update(
+            {name: v_conv_val(sd_attrs[name]) for name in sd_attrs.dtype.names}
+        )
+        geoms = list()
+        for pnt_start, pnt_cnt, part_start, part_cnt in struct_data["Centerline Info"][
+            ()
+        ]:
+            points = struct_data["Centerline Points"][()][
+                pnt_start : pnt_start + pnt_cnt
+            ]
+            if part_cnt == 1:
+                geoms.append(LineString(points))
+            else:
+                parts = struct_data["Centerline 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
+                        )
+                    )
+                )
+        struct_gdf = GeoDataFrame(
+            struct_dict,
+            geometry=geoms,
+            crs=self.projection(),
+        )
+        if datetime_to_str:
+            struct_gdf["Last Edited"] = struct_gdf["Last Edited"].apply(
+                lambda x: pd.Timestamp.isoformat(x)
+            )
+        return struct_gdf
+
     def connections(self) -> GeoDataFrame:
         raise NotImplementedError
 
@@ -376,9 +431,6 @@ class RasGeomHdf(RasHdf):
     def reference_points(self) -> GeoDataFrame:
         raise NotImplementedError
 
-    def structures(self) -> GeoDataFrame:
-        raise NotImplementedError
-
     def pump_stations(self) -> GeoDataFrame:
         raise NotImplementedError
 

{rashdf-0.1.1 → rashdf-0.2.1}/src/rashdf/utils.py

@@ -1,29 +1,41 @@
-import numpy as np
 import h5py
-from typing import Any, List, Tuple, Union, Optional
+import numpy as np
+import pandas as pd
 
 from datetime import datetime, timedelta
 import re
+from typing import Any, List, Tuple, Union, Optional
 
 
 def parse_ras_datetime(datetime_str: str) -> datetime:
-    """Parse a datetime string from a RAS file into a datetime object.
+    """
+    Parse a datetime string from a RAS file into a datetime object. If the datetime has
+    a time of 2400, then it is converted to midnight of the next day.
 
     Parameters
     ----------
-        datetime_str (str): The datetime string to be parsed. The string should be in the format "ddMMMyyyy HHmm".
+        datetime_str (str): The datetime string to be parsed. The string should be in the format "ddMMMyyyy HH:mm:ss".
 
     Returns
     -------
         datetime: A datetime object representing the parsed datetime.
     """
     format = "%d%b%Y %H:%M:%S"
-    return datetime.strptime(datetime_str, format)
+
+    if datetime_str.endswith("24:00:00"):
+        datetime_str = datetime_str.replace("24:00:00", "00:00:00")
+        parsed_dt = datetime.strptime(datetime_str, format)
+        parsed_dt += timedelta(days=1)
+    else:
+        parsed_dt = datetime.strptime(datetime_str, format)
+
+    return parsed_dt
 
 
 def parse_ras_simulation_window_datetime(datetime_str) -> datetime:
     """
-    Parse a datetime string from a RAS simulation window into a datetime object.
+    Parse a datetime string from a RAS simulation window into a datetime object.If the datetime has a
+    time of 2400, then it is converted to midnight of the next day.
 
     Parameters
     ----------
@@ -34,7 +46,15 @@ def parse_ras_simulation_window_datetime(datetime_str) -> datetime:
         datetime: A datetime object representing the parsed datetime.
     """
     format = "%d%b%Y %H%M"
-    return datetime.strptime(datetime_str, format)
+
+    if datetime_str.endswith("2400"):
+        datetime_str = datetime_str.replace("2400", "0000")
+        parsed_dt = datetime.strptime(datetime_str, format)
+        parsed_dt += timedelta(days=1)
+    else:
+        parsed_dt = datetime.strptime(datetime_str, format)
+
+    return parsed_dt
 
 
 def parse_run_time_window(window: str) -> Tuple[datetime, datetime]:
@@ -221,3 +241,24 @@ def get_first_hdf_group(parent_group: h5py.Group) -> Optional[h5py.Group]:
         if isinstance(item, h5py.Group):
             return item
     return None
+
+
+def df_datetimes_to_str(df: pd.DataFrame) -> pd.DataFrame:
+    """Convert any datetime64 columns in a DataFrame to strings.
+
+    Parameters
+    ----------
+    df : DataFrame
+        The DataFrame to convert.
+
+    Returns
+    -------
+    DataFrame
+        The DataFrame with any datetime64 columns converted to strings.
+    """
+    df_result = df.copy()
+    for col in df.select_dtypes(include=["datetime64"]).columns:
+        df_result[col] = df[col].apply(
+            lambda x: pd.Timestamp(x).isoformat() if pd.notnull(x) else None
+        )
+    return df_result

{rashdf-0.1.1 → rashdf-0.2.1/src/rashdf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rashdf
-Version: 0.1.1
+Version: 0.2.1
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: h5py
 Requires-Dist: geopandas
+Requires-Dist: pyarrow
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
@@ -77,6 +78,48 @@ datetime.datetime(2024, 3, 27, 9, 32, 15)],
 'Time Stamp Solution Went Unstable': 'Not Applicable'}
 ```
 
+## CLI
+The `rashdf` command-line interface allows export directly to a variety of formats, enabled
+by GeoPandas.
+```
+$ rashdf <sub-command> <hdf-file> [<output-path>] [<options>]
+```
+
+CLI help:
+```
+$ rashdf --help
+```
+
+Print the output formats supported by Fiona:
+```
+$ rashdf --fiona-drivers
+```
+
+Help for a specific subcommand:
+```
+$ rashdf mesh_cell_polygons --help
+```
+
+Example: export mesh cell faces to an ESRI Shapefile
+```
+$ rashdf mesh_cell_faces BigRiver.g01.hdf big-river-mesh-cell-faces.shp
+```
+
+Example: export mesh cell points to GeoParquet
+```
+$ rashdf mesh_cell_points LittleCreek.g01.hdf --parquet little-creek-mesh-cell-points.parquet
+```
+
+Example: export breaklines to OGC GeoPackage and reproject to a different CRS
+```
+$ rashdf breaklines Whitemarsh.p01.hdf whitemarsh-breaklines.gpkg --to-crs EPSG:4326
+```
+
+Example: write structures GeoJSON to `stdout`:
+```
+$ rashdf structures Potomac.p01.hdf
+```
+
 ## Documentation
 Coming soon.
 

{rashdf-0.1.1 → rashdf-0.2.1}/src/rashdf.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+src/cli.py
 src/rashdf/__init__.py
 src/rashdf/base.py
 src/rashdf/geom.py
@@ -9,8 +10,10 @@ src/rashdf/utils.py
 src/rashdf.egg-info/PKG-INFO
 src/rashdf.egg-info/SOURCES.txt
 src/rashdf.egg-info/dependency_links.txt
+src/rashdf.egg-info/entry_points.txt
 src/rashdf.egg-info/requires.txt
 src/rashdf.egg-info/top_level.txt
+tests/test_cli.py
 tests/test_geom.py
 tests/test_plan.py
 tests/test_utils.py

rashdf-0.2.1/src/rashdf.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+rashdf = cli:main

{rashdf-0.1.1 → rashdf-0.2.1}/src/rashdf.egg-info/requires.txt

@@ -1,5 +1,6 @@
 h5py
 geopandas
+pyarrow
 
 [dev]
 pre-commit

{rashdf-0.1.1 → rashdf-0.2.1}/src/rashdf.egg-info/top_level.txt

@@ -1 +1,2 @@
+cli
 rashdf

rashdf-0.2.1/tests/test_cli.py

@@ -0,0 +1,108 @@
+from src.cli import parse_args, export, docstring_to_help, fiona_supported_drivers
+
+import geopandas as gpd
+from pyproj import CRS
+
+import json
+from pathlib import Path
+
+TEST_DATA = Path("./tests/data")
+MUNCIE_G05 = TEST_DATA / "ras/Muncie.g05.hdf"
+
+
+def test_docstring_to_help():
+    docstring = """This is a test docstring.
+    This is not part of the help message.
+    """
+    assert docstring_to_help(docstring) == "This is a test docstring."
+
+    docstring = """Return the something or other.
+    Blah blah blah."""
+    assert docstring_to_help(docstring) == "Export the something or other."
+
+    docstring = None
+    assert docstring_to_help(docstring) == ""
+
+
+def test_fiona_supported_drivers():
+    drivers = fiona_supported_drivers()
+    assert "ESRI Shapefile" in drivers
+    assert "GeoJSON" in drivers
+    assert "GPKG" in drivers
+
+
+def test_parse_args():
+    args = parse_args(["structures", "test.hdf"])
+    assert args.func == "structures"
+    assert args.hdf_file == "test.hdf"
+    assert args.output_file is None
+    assert args.to_crs is None
+    assert not args.parquet
+    assert not args.feather
+    assert args.kwargs is None
+
+    args = parse_args(["mesh_areas", "test.hdf", "test.json"])
+    assert args.func == "mesh_areas"
+    assert args.hdf_file == "test.hdf"
+    assert args.output_file == "test.json"
+    assert args.to_crs is None
+    assert not args.parquet
+    assert not args.feather
+    assert args.kwargs is None
+
+    args = parse_args(
+        [
+            "mesh_areas",
+            "test.hdf",
+            "test.json",
+            "--to-crs",
+            "EPSG:4326",
+            "--parquet",
+            "--kwargs",
+            '{"compression": "gzip"}',
+        ]
+    )
+    assert args.func == "mesh_areas"
+    assert args.hdf_file == "test.hdf"
+    assert args.output_file == "test.json"
+    assert args.to_crs == "EPSG:4326"
+    assert args.parquet
+    assert not args.feather
+    assert args.kwargs == '{"compression": "gzip"}'
+
+    args = parse_args(["--fiona-drivers"])
+    assert args.fiona_drivers
+
+
+def test_export(tmp_path: Path):
+    args = parse_args(["structures", str(MUNCIE_G05)])
+    exported = json.loads(export(args))
+    gdf = gpd.GeoDataFrame.from_features(exported)
+    assert len(gdf) == 3
+    assert gdf["Last Edited"].to_list() == [
+        "2024-04-15T15:21:34",
+        "2024-04-15T15:21:48",
+        "2024-04-15T15:26:15",
+    ]
+
+    test_json_path = tmp_path / "test.json"
+    args = parse_args(["mesh_areas", str(MUNCIE_G05), str(test_json_path)])
+    export(args)
+    gdf = gpd.read_file(test_json_path)
+    assert len(gdf) == 2
+
+    test_parquet_path = tmp_path / "test.parquet"
+    args = parse_args(
+        [
+            "mesh_cell_points",
+            str(MUNCIE_G05),
+            str(test_parquet_path),
+            "--parquet",
+            "--to-crs",
+            "EPSG:4326",
+        ]
+    )
+    export(args)
+    gdf = gpd.read_parquet(test_parquet_path)
+    assert len(gdf) == 5790
+    assert gdf.crs == CRS.from_epsg(4326)

{rashdf-0.1.1 → rashdf-0.2.1}/tests/test_geom.py

@@ -98,3 +98,9 @@ def test_get_geom_2d_flow_area_attrs(tmp_path):
     )
     ras_hdf = RasGeomHdf(test_hdf)
     assert ras_hdf.get_geom_2d_flow_area_attrs() == TEST_ATTRS
+
+
+def test_structs():
+    structs_json = TEST_JSON / "structures.json"
+    with RasGeomHdf(MUNCIE_G05) as ghdf:
+        assert _gdf_matches_json(ghdf.structures(datetime_to_str=True), structs_json)

rashdf-0.2.1/tests/test_utils.py

@@ -0,0 +1,66 @@
+from src.rashdf import utils
+
+import numpy as np
+import pandas as pd
+import pytest
+
+from datetime import datetime, timedelta
+
+
+def test_convert_ras_hdf_value():
+    assert utils.convert_ras_hdf_value(b"True") is True
+    assert utils.convert_ras_hdf_value(b"False") is False
+    assert utils.convert_ras_hdf_value(np.float32(1.23)) == pytest.approx(1.23)
+    assert utils.convert_ras_hdf_value(np.int32(123)) == 123
+    assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01") == datetime(
+        2024, 3, 15, 16, 39, 1
+    )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 24:00:00") == datetime(
+        2024, 3, 16, 0, 0, 0
+    )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01 to 16Mar2024 16:39:01") == [
+        datetime(2024, 3, 15, 16, 39, 1),
+        datetime(2024, 3, 16, 16, 39, 1),
+    ]
+    assert utils.convert_ras_hdf_value(b"18Mar2024 24:00:00 to 19Mar2024 24:00:00") == [
+        datetime(2024, 3, 19, 0, 0, 0),
+        datetime(2024, 3, 20, 0, 0, 0),
+    ]
+    assert utils.convert_ras_hdf_value(b"01:23:45") == timedelta(
+        hours=1, minutes=23, seconds=45
+    )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 2400") == datetime(
+        2024, 3, 16, 0, 0, 0
+    )
+    assert utils.convert_ras_hdf_value(b"15Mar2024 2315") == datetime(
+        2024, 3, 15, 23, 15, 0
+    )
+
+    assert utils.convert_ras_hdf_value(b"15Mar2024 1639 to 16Mar2024 1639") == [
+        datetime(2024, 3, 15, 16, 39, 0),
+        datetime(2024, 3, 16, 16, 39, 0),
+    ]
+    assert utils.convert_ras_hdf_value(b"18Mar2024 2400 to 19Mar2024 2400") == [
+        datetime(2024, 3, 19, 0, 0, 0),
+        datetime(2024, 3, 20, 0, 0, 0),
+    ]
+
+
+def test_df_datetimes_to_str():
+    df = pd.DataFrame(
+        {
+            "datetime": [
+                datetime(2024, 3, 15, 16, 39, 1),
+                datetime(2024, 3, 16, 16, 39, 1),
+            ],
+            "asdf": [
+                0.123,
+                0.456,
+            ],
+        }
+    )
+    assert df["datetime"].dtype.name == "datetime64[ns]"
+    df = utils.df_datetimes_to_str(df)
+    assert df["datetime"].dtype.name == "object"
+    assert df["datetime"].tolist() == ["2024-03-15T16:39:01", "2024-03-16T16:39:01"]
+    assert df["asdf"].tolist() == [0.123, 0.456]

rashdf-0.1.1/tests/test_utils.py

@@ -1,23 +0,0 @@
-from src.rashdf import utils
-
-import numpy as np
-import pytest
-
-from datetime import datetime, timedelta
-
-
-def test_convert_ras_hdf_value():
-    assert utils.convert_ras_hdf_value(b"True") is True
-    assert utils.convert_ras_hdf_value(b"False") is False
-    assert utils.convert_ras_hdf_value(np.float32(1.23)) == pytest.approx(1.23)
-    assert utils.convert_ras_hdf_value(np.int32(123)) == 123
-    assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01") == datetime(
-        2024, 3, 15, 16, 39, 1
-    )
-    assert utils.convert_ras_hdf_value(b"15Mar2024 16:39:01 to 16Mar2024 16:39:01") == [
-        datetime(2024, 3, 15, 16, 39, 1),
-        datetime(2024, 3, 16, 16, 39, 1),
-    ]
-    assert utils.convert_ras_hdf_value(b"01:23:45") == timedelta(
-        hours=1, minutes=23, seconds=45
-    )