Accept a simulation or report kind given as text

NewSimulation and NewReport typed kind as an enum but neither checked nor
converted it, so a kind given as plain text (as a mapping of v1 records
easily does) passed their checks and then failed with AttributeError when
the store read kind.value. Both now convert the kind to its enum member
when they are created, and reject an unknown kind with a ValueError that
names the field.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: anth-volk

libs/policyengine-simulation-persistence/src/policyengine_simulation_persistence/reports.py

@@ -42,6 +42,7 @@
     check_country,
     check_legacy_id,
     insert_or_get_existing,
+    parse_kind,
     simulations,
 )
 
@@ -129,6 +130,8 @@ class NewReport:
 
     def __post_init__(self) -> None:
         """Reject malformed fields without touching the database."""
+        # A frozen dataclass sets its own field through object.__setattr__.
+        object.__setattr__(self, "kind", parse_kind(self.kind, ReportKind))
         check_country(self.country)
         if not FIRST_YEAR <= self.year <= LAST_YEAR:
             msg = f"year must be between {FIRST_YEAR} and {LAST_YEAR}"

libs/policyengine-simulation-persistence/src/policyengine_simulation_persistence/simulations.py

@@ -145,6 +145,18 @@ def check_legacy_id(field_name: str, value: int | None) -> None:
         raise ValueError(msg)
 
 
+def parse_kind[KindT: StrEnum](value: object, kind_type: type[KindT]) -> KindT:
+    """Return the ``kind_type`` member for ``value``, which may be its text.
+
+    Raise ValueError naming ``kind`` when the value is not one of its members.
+    """
+    try:
+        return kind_type(value)
+    except ValueError:
+        msg = f"kind must be one of {', '.join(kind_type)}"
+        raise ValueError(msg) from None
+
+
 def check_country(country: str) -> None:
     """Reject a country that is not a lowercase two-letter code."""
     if not COUNTRY_PATTERN.fullmatch(country):
@@ -200,6 +212,8 @@ class NewSimulation:
 
     def __post_init__(self) -> None:
         """Reject malformed fields without touching the database."""
+        # A frozen dataclass sets its own field through object.__setattr__.
+        object.__setattr__(self, "kind", parse_kind(self.kind, SimulationKind))
         check_country(self.country)
         _check_catalog_key("region_code", self.region_code)
         _check_catalog_key("dataset_name", self.dataset_name)

libs/policyengine-simulation-persistence/tests/test_definitions.py

@@ -70,3 +70,31 @@ def test_report_options_must_be_a_json_object() -> None:
             year=2026,
             options=["not", "an", "object"],  # type: ignore[arg-type]
         )
+
+
+def test_a_kind_given_as_text_becomes_the_enum() -> None:
+    simulation = NewSimulation(kind="economy", country="us", region_code="state/ca")  # type: ignore[arg-type]
+    report = NewReport(
+        kind="household",  # type: ignore[arg-type]
+        country="us",
+        baseline_simulation_id=uuid4(),
+        year=2026,
+    )
+
+    assert simulation.kind is SimulationKind.ECONOMY
+    assert report.kind is ReportKind.HOUSEHOLD
+
+
+def test_an_unknown_simulation_kind_is_rejected() -> None:
+    with pytest.raises(ValueError, match="kind"):
+        NewSimulation(kind="microsimulation", country="us", region_code="state/ca")  # type: ignore[arg-type]
+
+
+def test_an_unknown_report_kind_is_rejected() -> None:
+    with pytest.raises(ValueError, match="kind"):
+        NewReport(
+            kind="microsimulation",  # type: ignore[arg-type]
+            country="us",
+            baseline_simulation_id=uuid4(),
+            year=2026,
+        )