mypy fixes

Author: wpbonelli

flopy4/mf6/converter.py

@@ -2,13 +2,10 @@
 from pathlib import Path
 from typing import Any
 
-import numpy as np
-import xarray as xr
 import xattree
 from cattrs import Converter
 
 from flopy4.mf6.component import Component
-from flopy4.mf6.constants import FILL_DNODATA
 from flopy4.mf6.spec import get_blocks
 
 
@@ -26,7 +23,7 @@ def _transform_path_to_record(field_name: str, path_value: Path) -> tuple:
 def unstructure_component(value: Component) -> dict[str, Any]:
     data = xattree.asdict(value)
     blockspec = get_blocks(value.dfn)
-    blocks = {}
+    blocks: dict[str, dict[str, Any]] = {}
     for block_name, block in blockspec.items():
         blocks[block_name] = {}
         for field_name in block.keys():

flopy4/mf6/filters.py

@@ -241,7 +241,7 @@ def keystring2list_multifield(field_arrays: dict, period_idx: int):
         return
 
     # get period slice
-    period_slices = {}
+    period_slices: dict[str, Any] = {}
     for field_name, field_array in field_arrays.items():
         if isinstance(field_array, xr.DataArray):
             period_data = field_array.isel(nper=period_idx)
@@ -250,7 +250,7 @@ def keystring2list_multifield(field_arrays: dict, period_idx: int):
             period_slices[field_name] = field_array[period_idx]
 
     # Find all locations where at least one field has meaningful data
-    combined_mask = None
+    combined_mask: Any = None
     for field_name, period_data in period_slices.items():
         meaningful_mask = (
             (period_data != 0) & (period_data != FILL_DNODATA) & ~np.isnan(period_data)

flopy4/mf6/gwf/chd.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter, setters
+from attrs import Converter
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -14,38 +14,48 @@
 
 def _update_maxbound(instance, attribute, new_value):
     """Update maxbound when period block arrays change."""
-    if hasattr(instance, '_updating_maxbound'):
+    if hasattr(instance, "_updating_maxbound"):
         return new_value
-    
+
     # Calculate maxbound from all relevant arrays
     maxbound_values = []
-    
+
     # Check head array
-    head_val = new_value if attribute and attribute.name == 'head' else getattr(instance, 'head', None)
+    head_val = (
+        new_value if attribute and attribute.name == "head" else getattr(instance, "head", None)
+    )
     if head_val is not None:
         head = head_val if head_val.data.shape == head_val.shape else head_val.todense()
         maxbound_values.append(len(np.where(head != FILL_DNODATA)[0]))
-    
-    # Check aux array  
-    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+
+    # Check aux array
+    aux_val = new_value if attribute and attribute.name == "aux" else getattr(instance, "aux", None)
     if aux_val is not None:
         aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
         maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
-    
+
     # Check boundname array
-    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    boundname_val = (
+        new_value
+        if attribute and attribute.name == "boundname"
+        else getattr(instance, "boundname", None)
+    )
     if boundname_val is not None:
-        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        boundname = (
+            boundname_val
+            if boundname_val.data.shape == boundname_val.shape
+            else boundname_val.todense()
+        )
         maxbound_values.append(len(np.where(boundname != "")[0]))
-    
+
     # Update maxbound if we have values
     if maxbound_values:
         instance._updating_maxbound = True
         try:
             instance.maxbound = max(maxbound_values)
         finally:
-            delattr(instance, '_updating_maxbound')
-    
+            delattr(instance, "_updating_maxbound")
+
     return new_value
 
 

flopy4/mf6/gwf/drn.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter, setters
+from attrs import Converter
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -14,44 +14,56 @@
 
 def _update_maxbound(instance, attribute, new_value):
     """Update maxbound when period block arrays change."""
-    if hasattr(instance, '_updating_maxbound'):
+    if hasattr(instance, "_updating_maxbound"):
         return new_value
-    
+
     # Calculate maxbound from all relevant arrays
     maxbound_values = []
-    
+
     # Check elev array
-    elev_val = new_value if attribute and attribute.name == 'elev' else getattr(instance, 'elev', None)
+    elev_val = (
+        new_value if attribute and attribute.name == "elev" else getattr(instance, "elev", None)
+    )
     if elev_val is not None:
         elev = elev_val if elev_val.data.shape == elev_val.shape else elev_val.todense()
         maxbound_values.append(len(np.where(elev != FILL_DNODATA)[0]))
-    
+
     # Check cond array
-    cond_val = new_value if attribute and attribute.name == 'cond' else getattr(instance, 'cond', None)
+    cond_val = (
+        new_value if attribute and attribute.name == "cond" else getattr(instance, "cond", None)
+    )
     if cond_val is not None:
         cond = cond_val if cond_val.data.shape == cond_val.shape else cond_val.todense()
         maxbound_values.append(len(np.where(cond != FILL_DNODATA)[0]))
-    
-    # Check aux array  
-    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+
+    # Check aux array
+    aux_val = new_value if attribute and attribute.name == "aux" else getattr(instance, "aux", None)
     if aux_val is not None:
         aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
         maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
-    
+
     # Check boundname array
-    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    boundname_val = (
+        new_value
+        if attribute and attribute.name == "boundname"
+        else getattr(instance, "boundname", None)
+    )
     if boundname_val is not None:
-        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        boundname = (
+            boundname_val
+            if boundname_val.data.shape == boundname_val.shape
+            else boundname_val.todense()
+        )
         maxbound_values.append(len(np.where(boundname != "")[0]))
-    
+
     # Update maxbound if we have values
     if maxbound_values:
         instance._updating_maxbound = True
         try:
             instance.maxbound = max(maxbound_values)
         finally:
-            delattr(instance, '_updating_maxbound')
-    
+            delattr(instance, "_updating_maxbound")
+
     return new_value
 
 
@@ -111,5 +123,10 @@ class Drn(Package):
 
     def __attrs_post_init__(self):
         # Trigger maxbound calculation on initialization
-        if self.elev is not None or self.cond is not None or self.aux is not None or self.boundname is not None:
+        if (
+            self.elev is not None
+            or self.cond is not None
+            or self.aux is not None
+            or self.boundname is not None
+        ):
             _update_maxbound(self, None, None)

flopy4/mf6/gwf/rch.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter, setters
+from attrs import Converter
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -14,38 +14,54 @@
 
 def _update_maxbound(instance, attribute, new_value):
     """Update maxbound when period block arrays change."""
-    if hasattr(instance, '_updating_maxbound'):
+    if hasattr(instance, "_updating_maxbound"):
         return new_value
-    
+
     # Calculate maxbound from all relevant arrays
     maxbound_values = []
-    
+
     # Check recharge array
-    recharge_val = new_value if attribute and attribute.name == 'recharge' else getattr(instance, 'recharge', None)
+    recharge_val = (
+        new_value
+        if attribute and attribute.name == "recharge"
+        else getattr(instance, "recharge", None)
+    )
     if recharge_val is not None:
-        recharge = recharge_val if recharge_val.data.shape == recharge_val.shape else recharge_val.todense()
+        recharge = (
+            recharge_val
+            if recharge_val.data.shape == recharge_val.shape
+            else recharge_val.todense()
+        )
         maxbound_values.append(len(np.where(recharge != FILL_DNODATA)[0]))
-    
-    # Check aux array  
-    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+
+    # Check aux array
+    aux_val = new_value if attribute and attribute.name == "aux" else getattr(instance, "aux", None)
     if aux_val is not None:
         aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
         maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
-    
+
     # Check boundname array
-    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    boundname_val = (
+        new_value
+        if attribute and attribute.name == "boundname"
+        else getattr(instance, "boundname", None)
+    )
     if boundname_val is not None:
-        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        boundname = (
+            boundname_val
+            if boundname_val.data.shape == boundname_val.shape
+            else boundname_val.todense()
+        )
         maxbound_values.append(len(np.where(boundname != "")[0]))
-    
+
     # Update maxbound if we have values
     if maxbound_values:
         instance._updating_maxbound = True
         try:
             instance.maxbound = max(maxbound_values)
         finally:
-            delattr(instance, '_updating_maxbound')
-    
+            delattr(instance, "_updating_maxbound")
+
     return new_value
 
 

flopy4/mf6/gwf/wel.py

@@ -14,38 +14,46 @@
 
 def _update_maxbound(instance, attribute, new_value):
     """Update maxbound when period block arrays change."""
-    if hasattr(instance, '_updating_maxbound'):
+    if hasattr(instance, "_updating_maxbound"):
         return new_value
-    
+
     # Calculate maxbound from all relevant arrays
     maxbound_values = []
-    
+
     # Check q array
-    q_val = new_value if attribute and attribute.name == 'q' else getattr(instance, 'q', None)
+    q_val = new_value if attribute and attribute.name == "q" else getattr(instance, "q", None)
     if q_val is not None:
         q = q_val if q_val.data.shape == q_val.shape else q_val.todense()
         maxbound_values.append(len(np.where(q != FILL_DNODATA)[0]))
-    
-    # Check aux array  
-    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+
+    # Check aux array
+    aux_val = new_value if attribute and attribute.name == "aux" else getattr(instance, "aux", None)
     if aux_val is not None:
         aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
         maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
-    
+
     # Check boundname array
-    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    boundname_val = (
+        new_value
+        if attribute and attribute.name == "boundname"
+        else getattr(instance, "boundname", None)
+    )
     if boundname_val is not None:
-        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        boundname = (
+            boundname_val
+            if boundname_val.data.shape == boundname_val.shape
+            else boundname_val.todense()
+        )
         maxbound_values.append(len(np.where(boundname != "")[0]))
-    
+
     # Update maxbound if we have values
     if maxbound_values:
         instance._updating_maxbound = True
         try:
             instance.maxbound = max(maxbound_values)
         finally:
-            delattr(instance, '_updating_maxbound')
-    
+            delattr(instance, "_updating_maxbound")
+
     return new_value
 
 

flopy4/mf6/spec.py

@@ -290,6 +290,11 @@ def is_list_field(field: Field) -> bool:
 def is_list_block(block: Block) -> bool:
     return (
         len(block) == 1
-        and (field := next(iter(block.values())))["type"] == "recarray"
-        and field["reader"] != "readarray"
-    ) or (all(f["type"] == "recarray" and f["reader"] != "readarray" for f in block.values()))
+        and (field := next(iter(block.values()))).metadata.get("type") == "recarray"
+        and field.metadata.get("reader") != "readarray"
+    ) or (
+        all(
+            f.metadata.get("type") == "recarray" and f.metadata.get("reader") != "readarray"
+            for f in block.values()
+        )
+    )