more tests passing

Author: wpbonelli

autotest/test_dfn.py

@@ -43,7 +43,7 @@ def test_load_v1(dfn_name):
         (DFN_DIR / "common.dfn").open() as common_file,
         (DFN_DIR / f"{dfn_name}.dfn").open() as dfn_file,
     ):
-        common, _ = _load_common(common_file)
+        common = _load_common(common_file)
         dfn = load(dfn_file, name=dfn_name, format="dfn", common=common)
         assert any(dfn.fields)
 

modflow_devtools/dfn/__init__.py

@@ -340,9 +340,10 @@ def map(
     raise ValueError(f"Unsupported schema version: {schema_version}. Expected 1 or 2.")
 
 
-def load(f, name: str, format: str = "dfn", **kwargs) -> Dfn:
+def load(f, format: str = "dfn", **kwargs) -> Dfn:
     """Load a MODFLOW 6 definition file."""
     if format == "dfn":
+        name = kwargs.pop("name")
         fields, meta = parse_dfn(f, **kwargs)
         blocks = {
             block_name: {field["name"]: FieldV1.from_dict(field) for field in block}
@@ -359,7 +360,11 @@ def load(f, name: str, format: str = "dfn", **kwargs) -> Dfn:
             blocks=blocks,
         )
     elif format == "toml":
-        return Dfn(name=name, **tomli.load(f))
+        if (name := kwargs.pop("name", None)) is not None:
+            if name != (data := tomli.load(f)).pop("name", name):
+                raise ValueError(f"DFN name mismatch: {name} != {data.get('name')}")
+            return Dfn(name=name, **data)
+        return Dfn(**data)
     raise ValueError(f"Unsupported format: {format}. Expected 'dfn' or 'toml'.")
 
 
@@ -383,7 +388,7 @@ def load_all(path: str | PathLike) -> Dfns:
                 dfns[dfn_name] = load(f, name=dfn_name, common=common, format="dfn")
     if toml_paths:
         for toml_name, toml_path in toml_paths.items():
-            with toml_path.open() as f:
+            with toml_path.open("rb") as f:
                 dfns[toml_name] = load(f, name=toml_name, format="toml")
     return dfns
 

modflow_devtools/dfn2toml.py

@@ -8,7 +8,7 @@
 import tomli_w as tomli
 from boltons.iterutils import remap
 
-from modflow_devtools.dfn import flatten, load_tree, map
+from modflow_devtools.dfn import flatten, map
 from modflow_devtools.misc import drop_none_or_empty
 
 # mypy: ignore-errors
@@ -18,10 +18,18 @@ def convert(indir: PathLike, outdir: PathLike, schema_version: str = "2") -> Non
     indir = Path(indir).expanduser().absolute()
     outdir = Path(outdir).expanduser().absolute()
     outdir.mkdir(exist_ok=True, parents=True)
-    dfns_in = flatten(load_tree(indir))
-    dfns = {
-        name: map(dfn, schema_version=schema_version) for name, dfn in dfns_in.items()
+
+    # Load all DFNs individually first, then map to target schema
+    from modflow_devtools.dfn import infer_tree, load_all
+
+    dfns_raw = load_all(indir)
+    dfns_mapped = {
+        name: map(dfn, schema_version=schema_version) for name, dfn in dfns_raw.items()
     }
+
+    # Now infer tree structure with mapped DFNs and flatten
+    tree = infer_tree(dfns_mapped)
+    dfns = flatten(tree)
     for dfn_name, dfn in dfns.items():
         with Path.open(outdir / f"{dfn_name}.toml", "wb") as f:
             dfn_dict = asdict(dfn)