test: update tests coverage for new cases

Author: mvelasqu

docs/source/conf.py

@@ -34,13 +34,13 @@
 html_title = "r2x-sienna"
 html_theme_options = {
     "navigation_with_keys": True,
-    "source_repository": "https://github.nrel.gov/PCM/r2x-sienna/",
+    "source_repository": "https://github.com/NatLabRockies/r2x-sienna/",
     "source_branch": "main",
     "source_directory": "docs/",
     "footer_icons": [
         {
             "name": "GitHub",
-            "url": "https://github.nrel.gov/PCM/r2x-sienna",
+            "url": "https://github.com/NatLabRockies/r2x-sienna",
             "html": """
                 <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
                     <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>

src/r2x_sienna/models/costs.py

@@ -88,7 +88,7 @@ class ThermalGenerationCost(OperationalCost):
     References
     ----------
     .. [1] National Renewable Energy Laboratory. "Thermal Generation Cost Model Library."
-       Available: https://nrel-sienna.github.io/PowerSystems.jl/stable/model_library/thermal_generation_cost/
+       Available: https://github.com/Sienna-Platform/PowerSystems.jl/blob/main/docs/src/model_library/thermal_generation_cost.md
     """
 
     fixed: Annotated[NonNegativeFloat, Field(description="Cost of using fuel in $ or $/hr.")] = 0.0

tests/test_data_upgrader.py

@@ -12,7 +12,7 @@
 
 from types import SimpleNamespace
 
-from rust_ok import Ok
+from rust_ok import Err, Ok
 
 import r2x_sienna.plugins as plugins
 import r2x_sienna.upgrader.data_upgrader as data_upgrader
@@ -383,3 +383,107 @@ def test_version_detector_and_run_sienna_upgrades_paths(tmp_path: Path, monkeypa
     monkeypatch.setattr(data_upgrader, "_resolve_json_path", lambda path: None)
     result_ok = run_sienna_upgrades(json_path=tmp_path, ctx=SimpleNamespace())
     assert result_ok.is_ok()
+
+
+def test_upgrader_upgrade_error_paths(tmp_path: Path, monkeypatch) -> None:
+    upgrader = SiennaUpgrader(tmp_path)
+
+    # current_version autodetection fails
+    monkeypatch.setattr(upgrader.version_reader, "read_version", lambda _path: None)
+    result = upgrader.upgrade(current_version=None)
+    assert result.is_err()
+    assert "Could not determine Sienna version" in str(result.err())
+
+    # SYSTEM upgrade with no JSON files in directory
+    empty_dir = tmp_path / "empty_system_dir"
+    empty_dir.mkdir()
+    empty_upgrader = SiennaUpgrader(empty_dir)
+    result = empty_upgrader.upgrade(current_version="1.0.0", upgrade_type=UpgradeType.SYSTEM)
+    assert result.is_err()
+    assert "No JSON file found" in str(result.err())
+
+    # SYSTEM upgrade with invalid JSON file
+    bad_json = tmp_path / "bad_system.json"
+    bad_json.write_text("{invalid", encoding="utf-8")
+    bad_upgrader = SiennaUpgrader(bad_json)
+    result = bad_upgrader.upgrade(current_version="1.0.0", upgrade_type=UpgradeType.SYSTEM)
+    assert result.is_err()
+    assert "Failed to load JSON" in str(result.err())
+
+
+def test_upgrader_upgrade_step_failure_and_file_mode_error(tmp_path: Path, monkeypatch) -> None:
+    system_json = tmp_path / "system.json"
+    system_json.write_text(json.dumps({"data": {"components": []}}), encoding="utf-8")
+
+    def broken_upgrade(_data: dict[str, Any]) -> dict[str, Any]:
+        raise RuntimeError("step failed")
+
+    failing_system_step = UpgradeStep(
+        name="broken_upgrade",
+        func=broken_upgrade,
+        target_version="2.0.0",
+        upgrade_type=UpgradeType.SYSTEM,
+    )
+    upgrader = SiennaUpgrader(system_json, steps=[failing_system_step])
+    result = upgrader.upgrade(current_version="1.0.0", upgrade_type=UpgradeType.SYSTEM)
+    assert result.is_err()
+    assert "Failed broken_upgrade" in str(result.err())
+
+    file_step = UpgradeStep(
+        name="file_step",
+        func=lambda path: path,
+        target_version="2.0.0",
+        upgrade_type=UpgradeType.FILE,
+    )
+    file_upgrader = SiennaUpgrader(system_json, steps=[file_step])
+    monkeypatch.setattr(data_upgrader, "run_upgrade_step", lambda path, step: Err("file step failed"))
+    result = file_upgrader.upgrade(current_version="1.0.0", upgrade_type=UpgradeType.FILE)
+    assert result.is_err()
+    assert "file step failed" in str(result.err())
+
+
+def test_run_sienna_upgrades_store_and_h5_error_paths(tmp_path: Path, monkeypatch) -> None:
+    system_json = tmp_path / "sys.json"
+    system_json.write_text(
+        json.dumps({"data_format_version": "5.0.0", "data": {"time_series_storage_file": "ts.h5"}}),
+        encoding="utf-8",
+    )
+    h5_path = tmp_path / "ts.h5"
+    h5_path.write_bytes(b"dummy")
+
+    class Store:
+        folder = tmp_path
+
+    # Cover store.folder branch and "could not detect version" skip.
+    monkeypatch.setattr(data_upgrader.SiennaUpgrader.version_reader, "read_version", lambda path: None)
+    monkeypatch.setattr(data_upgrader, "_resolve_json_path", lambda path: None)
+    result_skip = run_sienna_upgrades(store=Store(), ctx=SimpleNamespace())
+    assert result_skip.is_ok()
+
+    # Cover upgrade result error branch.
+    monkeypatch.setattr(data_upgrader.SiennaUpgrader.version_reader, "read_version", lambda path: "5.0.0")
+    monkeypatch.setattr(data_upgrader.SiennaUpgrader, "upgrade", lambda self, **kwargs: Err("upgrade failed"))
+    result_upgrade_err = run_sienna_upgrades(store=Store(), ctx=SimpleNamespace())
+    assert result_upgrade_err.is_err()
+    assert "upgrade failed" in str(result_upgrade_err.err())
+
+    # Cover JSON/H5 inspection error branch.
+    monkeypatch.setattr(data_upgrader.SiennaUpgrader, "upgrade", lambda self, **kwargs: Ok(self.path))
+    monkeypatch.setattr(data_upgrader, "_resolve_json_path", lambda path: system_json)
+    monkeypatch.setattr(
+        data_upgrader,
+        "_resolve_time_series_h5_path",
+        lambda path: (_ for _ in ()).throw(RuntimeError("inspect failed")),
+    )
+    result_inspect_err = run_sienna_upgrades(store=Store(), ctx=SimpleNamespace())
+    assert result_inspect_err.is_err()
+    assert "Failed to inspect JSON" in str(result_inspect_err.err())
+
+    # Cover H5 upgrade error branch.
+    monkeypatch.setattr(data_upgrader, "_resolve_time_series_h5_path", lambda path: h5_path)
+    monkeypatch.setattr(
+        data_upgrader, "_upgrade_h5_time_series_metadata", lambda path: Err("h5 upgrade failed")
+    )
+    result_h5_err = run_sienna_upgrades(store=Store(), ctx=SimpleNamespace())
+    assert result_h5_err.is_err()
+    assert "h5 upgrade failed" in str(result_h5_err.err())

tests/test_exporter.py

@@ -1,13 +1,18 @@
 import json
+from pathlib import Path
+from types import SimpleNamespace
+from uuid import uuid4
 
 import pytest
 from r2x_core import DataStore, PluginContext
+from rust_ok import Err, Ok
 
 from r2x_sienna import (
     SiennaConfig,
     SiennaExporter,
     SiennaParser,
 )
+import r2x_sienna.exporter as exporter_mod
 from r2x_sienna.models import (
     ACBus,
     MinMax,
@@ -582,3 +587,124 @@ def test_pjm_time_series_files_exist(data_folder):
 
     assert json_file.exists(), f"PJM JSON file not found: {json_file}"
     assert h5_file.exists(), f"PJM H5 file not found: {h5_file}"
+
+
+def test_iter_supplemental_attributes_fallback_and_empty():
+    class WithMethod:
+        def iter_supplemental_attributes(self):
+            return [1, 2]
+
+    class Empty:
+        pass
+
+    assert list(exporter_mod.iter_supplemental_attributes(WithMethod())) == [1, 2]
+    assert tuple(exporter_mod.iter_supplemental_attributes(Empty())) == ()
+
+
+def test_serialize_supplemental_attributes_skips_unsupported_type():
+    class UnsupportedAttr:
+        def __init__(self):
+            self.uuid = uuid4()
+
+    class Component:
+        def __init__(self):
+            self.uuid = uuid4()
+
+    attr = UnsupportedAttr()
+    component = Component()
+
+    class ComponentMgr:
+        def iter_all(self):
+            return [component]
+
+    class FakeSystem:
+        _component_mgr = ComponentMgr()
+
+        @staticmethod
+        def iter_supplemental_attributes():
+            return [attr]
+
+        @staticmethod
+        def has_supplemental_attribute(_component):
+            return True
+
+        @staticmethod
+        def get_supplemental_attributes_with_component(_component):
+            return [attr]
+
+    assert exporter_mod.serialize_single_supplemental_attribute(attr) is None
+    result = exporter_mod.serialize_supplemental_attributes(FakeSystem())
+    assert result == {"attributes": [], "associations": []}
+
+
+def test_exporter_on_validate_returns_err_when_mkdir_fails(simple_test_system, tmp_path, monkeypatch):
+    cfg = SiennaConfig(output_path=str(tmp_path / "nested" / "out.json"), model_year=2010)
+    ctx = PluginContext(config=cfg, system=simple_test_system, store=DataStore(path=tmp_path))
+    exporter = SiennaExporter.from_context(ctx)
+
+    def _raise_mkdir(self, parents=False, exist_ok=False):
+        raise OSError("mkdir failed")
+
+    monkeypatch.setattr(Path, "mkdir", _raise_mkdir)
+    result = exporter.on_validate()
+    assert result.is_err()
+    assert "Failed to create output directory" in str(result.err())
+
+
+def test_exporter_on_export_returns_err_when_component_serialization_raises(
+    simple_test_system, tmp_path, monkeypatch
+):
+    cfg = SiennaConfig(output_path=str(tmp_path / "out.json"), model_year=2010)
+    ctx = PluginContext(config=cfg, system=simple_test_system, store=DataStore(path=tmp_path))
+    exporter = SiennaExporter.from_context(ctx)
+    exporter.should_export_time_series = False
+    exporter.system_data = {"data_information": {}, "system_information": {}}
+
+    def _boom(_component):
+        raise RuntimeError("serialize boom")
+
+    monkeypatch.setattr(exporter_mod, "serialize_component_to_psy", _boom)
+    result = exporter.on_export()
+    assert result.is_err()
+    assert "Export failed" in str(result.err())
+
+
+def test_normalize_time_series_metadata_raises_on_upgrade_error(simple_test_system, tmp_path, monkeypatch):
+    cfg = SiennaConfig(output_path=str(tmp_path / "out.json"), model_year=2010)
+    ctx = PluginContext(config=cfg, system=simple_test_system, store=DataStore(path=tmp_path))
+    exporter = SiennaExporter.from_context(ctx)
+
+    import r2x_sienna.upgrader.data_upgrader as du
+
+    monkeypatch.setattr(du, "_upgrade_h5_time_series_metadata", lambda _path: Err("bad metadata"))
+    with pytest.raises(RuntimeError, match="bad metadata"):
+        exporter._normalize_time_series_metadata(tmp_path / "dummy.h5")
+
+
+def test_patch_time_series_owner_types_no_metadata_dataset(simple_test_system, tmp_path):
+    import h5py
+
+    cfg = SiennaConfig(output_path=str(tmp_path / "out.json"), model_year=2010)
+    ctx = PluginContext(config=cfg, system=simple_test_system, store=DataStore(path=tmp_path))
+    exporter = SiennaExporter.from_context(ctx)
+
+    h5_path = tmp_path / "no_meta.h5"
+    with h5py.File(h5_path, "w") as f:
+        f.create_dataset("not_time_series_metadata", data=[1, 2, 3])
+
+    exporter._patch_time_series_owner_types(h5_path)
+
+
+def test_to_psy_raises_on_validate_and_export_errors(simple_test_system, tmp_path, monkeypatch):
+    output_file = tmp_path / "legacy.json"
+    config = SimpleNamespace(system_base_power=100.0, scenario="base")
+    system_data = {"data_information": {}, "system_information": {}}
+
+    monkeypatch.setattr(SiennaExporter, "on_validate", lambda self: Err("validation failed"))
+    with pytest.raises(Exception, match="Validation failed"):
+        exporter_mod.to_psy(config, simple_test_system, system_data, str(output_file))
+
+    monkeypatch.setattr(SiennaExporter, "on_validate", lambda self: Ok(None))
+    monkeypatch.setattr(SiennaExporter, "on_export", lambda self: Err("export failed"))
+    with pytest.raises(Exception, match="Export failed"):
+        exporter_mod.to_psy(config, simple_test_system, system_data, str(output_file))