pass cls thru to structure call

Author: wpbonelli

flopy4/mf6/__init__.py

@@ -28,19 +28,19 @@ class WriteError(Exception):
 def _load_mf6(cls, path: Path) -> Component:
     """Load MF6 format file into a component instance."""
     with open(path, "r") as fp:
-        return structure(load_mf6(fp), path)
+        return structure(load_mf6(fp), path, component_type=cls)
 
 
 def _load_json(cls, path: Path) -> Component:
     """Load JSON format file into a component instance."""
     with open(path, "r") as fp:
-        return structure(load_json(fp), path)
+        return structure(load_json(fp), path, component_type=cls)
 
 
 def _load_toml(cls, path: Path) -> Component:
     """Load TOML format file into a component instance."""
     with open(path, "rb") as fp:
-        return structure(load_toml(fp), path)
+        return structure(load_toml(fp), path, component_type=cls)
 
 
 def _write_mf6(component: Component, context=None, **kwargs) -> None:

flopy4/mf6/converter/__init__.py

@@ -40,8 +40,30 @@ def _make_converter() -> Converter:
 COMPONENT_CONVERTER = _make_converter()
 
 
-def structure(data: dict[str, Any], path: Path) -> Component:
-    component = COMPONENT_CONVERTER.structure(data, Component)
+def structure(
+    data: dict[str, Any], path: Path, component_type: type[Component] | None = None
+) -> Component:
+    """
+    Structure parsed data into a Component instance.
+
+    Parameters
+    ----------
+    data : dict
+        Parsed component data
+    path : Path
+        Path to the component file (for setting workspace/filename)
+    component_type : type[Component], optional
+        Concrete component class to instantiate. If not provided, uses Component base class.
+
+    Returns
+    -------
+    Component
+        Structured component instance
+    """
+    # Use provided type or fall back to Component base class
+    target_type = component_type if component_type is not None else Component
+
+    component = COMPONENT_CONVERTER.structure(data, target_type)
     if isinstance(component, Context):
         component.workspace = path.parent
     component.filename = path.name