override __getattr__, not __getattribute__.. fixes attr proxy

Author: wpbonelli

flopy4/__init__.py

@@ -48,7 +48,9 @@ def get(
 
     value = tree.get(key, None)
     if value is not None:
-        return value.item()
+        if value.shape == ():
+            return value.item()
+        return value
     value = tree.dims.get(key, None)
     if value is not None:
         return value
@@ -228,15 +230,12 @@ def getattribute(self: Any, name: str) -> Any:
     """
     cls = type(self)
     spec = fields_dict(cls)
-    try:
-        tree = self.data
-        if name in spec:
-            value = get(tree, name, None)
-            if value is not None:
-                return value
-    except:
-        pass
-    return super(cls, self).__getattribute__(name)
+    tree = self.data
+    if name in spec:
+        value = get(tree, name, None)
+        if value is not None:
+            return value
+    raise AttributeError
 
 
 def setattribute(self: _Component, attr: Attribute, value: Any):
@@ -253,10 +252,7 @@ def setattribute(self: _Component, attr: Attribute, value: Any):
     spec = fields_dict(cls)
     if attr.name not in spec:
         raise AttributeError(f"{cls.__name__} has no attribute {attr.name}")
-    if value is None:
-        return
-    data = getattr(self, "data", None)
-    if data is None:
+    if value is None or not hasattr(self, "data"):
         return value
     if get_origin(attr.type) in [list, np.ndarray]:
         shape = attr.metadata["dims"]
@@ -287,11 +283,7 @@ def init(self, *args, **kwargs):
         children = kwargs.pop("children", None)
         old_init(self, **kwargs)
         init_tree(self, name=name, parent=parent, children=children)
-        # `__getattribute__` now. way faster.
-        self.__getattribute__ = getattribute
+        cls.__getattr__ = getattribute
 
-    # don't update `__getattribute__` yet, because init'ing
-    # the tree involves a lot of attribute access. do it in
-    # the init method, after the tree has been set up.
     cls.__init__ = init
     return cls

test/test_component.py

@@ -13,19 +13,14 @@ def test_registry():
 
 
 def test_sim(benchmark):
-    gwf = None
+    sim = Sim()
+    tdis = Tdis(sim, nper=1, perioddata=[Tdis.PeriodData()])
+    gwf = Gwf(sim)
+    dis = Dis(gwf)
+    ic = Ic(gwf, strt=1.0)
+    oc = Oc(gwf, saverecord=[Oc.Steps_("all")])
+    npf = Npf(gwf, icelltype=0, k=1.0)
 
-    def make_sim():
-        sim = Sim()
-        tdis = Tdis(sim, nper=1, perioddata=[Tdis.PeriodData()])
-        gwf = Gwf(sim)
-        dis = Dis(gwf)
-        ic = Ic(gwf, strt=1.0)
-        oc = Oc(gwf, saverecord=[Oc.Steps_("all")])
-        npf = Npf(gwf, icelltype=0, k=1.0)
-        return sim
-
-    sim = benchmark(make_sim)
     assert isinstance(sim.data, DataTree)
     sim.data  # view the tree
 
@@ -39,6 +34,6 @@ def make_sim():
     assert np.array_equal(
         sim.data.children["gwf"].children["npf"].k, np.ones((4))
     )
-
+    assert np.array_equal(npf.k, npf.data.k)
     # TODO: figure out how to deduplicate trees. components proxy root?
     # assert gwf.parent.data.children["gwf"].children["npf"] is npf.data