Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions modflow_devtools/dfn.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,20 +229,22 @@ def _load_variable(var: dict[str, Any]) -> Var:
for a separate context will be given a reference to it.
"""

var = var.copy()

# parse booleans from strings. everything else can
# stay a string except default values, which we'll
# try to parse as arbitrary literals below, and at
# some point types, once we introduce type hinting
var = {k: _try_parse_bool(v) for k, v in var.items()}

_name = var["name"]
_type = var.get("type", None)
shape = var.get("shape", None)
_name = var.pop("name")
_type = var.pop("type", None)
shape = var.pop("shape", None)
shape = None if shape == "" else shape
block = var.get("block", None)
default = var.get("default", None)
block = var.pop("block", None)
default = var.pop("default", None)
default = _try_literal_eval(default) if _type != "string" else default
description = var.get("description", "")
description = var.pop("description", "")
ref = refs.get(_name, None)

# if var is a foreign key, register it
Expand Down Expand Up @@ -288,6 +290,7 @@ def _items() -> Vars:
description=description.replace(
"is the list of", "is the record of"
),
**var,
)
}
else:
Expand All @@ -312,6 +315,7 @@ def _items() -> Vars:
description=description.replace(
"is the list of", f"is the {child_type} of"
),
**var,
)
}

Expand Down Expand Up @@ -345,6 +349,7 @@ def _fields() -> Vars:
block=block,
description=description,
default=default,
**var,
)

if _type.startswith("recarray"):
Expand Down Expand Up @@ -385,6 +390,7 @@ def _fields() -> Vars:
),
default=None,
subpackage=ref,
**var,
)

return var_
Expand Down