ensure sub resters get unset on reinit

Author: esoteric-ephemera

mp_api/client/core/client.py

@@ -1350,10 +1350,15 @@ class CoreRester(BaseRester):
 
     _sub_resters: dict[str, LazyImport] = {}
 
+    def __init__(self, **kwargs):
+        """Ensure that sub resters are unset on re-init."""
+        super().__init__(**kwargs)
+        self.sub_resters = {k: v.copy() for k, v in self._sub_resters.items()}
+
     def __getattr__(self, v: str):
-        if v in self._sub_resters:
-            if self._sub_resters[v]._obj is None:
-                self._sub_resters[v](
+        if v in self.sub_resters:
+            if self.sub_resters[v]._obj is None:
+                self.sub_resters[v](
                     api_key=self.api_key,
                     endpoint=self.base_endpoint,
                     include_user_agent=self._include_user_agent,
@@ -1362,7 +1367,7 @@ def __getattr__(self, v: str):
                     headers=self.headers,
                     mute_progress_bars=self.mute_progress_bars,
                 )
-            return self._sub_resters[v]
+            return self.sub_resters[v]
 
     def __dir__(self):
         return dir(self.__class__) + list(self._sub_resters)

mp_api/client/core/utils.py

@@ -160,6 +160,13 @@ def __init__(
         self._imported: Any | None = None
         self._obj: Any | None = None
 
+    def copy(self) -> LazyImport:
+        """Return a new copy of the current instance."""
+        return LazyImport(
+            f"{self._module_name}"
+            + (f".{self._class_name}" if self._class_name else "")
+        )
+
     def __str__(self) -> str:
         return f"LazyImport of {self._module_name}" + (
             f".{self._class_name}" if self._class_name else ""

tests/core/test_utils.py

@@ -77,6 +77,14 @@ def test_lazy_import_class():
 
     assert Structure.from_str(structure_str, fmt="poscar") == struct_from_str
 
+    # ensure copy yields an independent object
+    lazy_copy = lazy_class.copy()
+    lazy_class(
+        struct_from_str.lattice, struct_from_str.species, struct_from_str.frac_coords
+    )
+    assert lazy_copy._obj is None
+    assert lazy_class._obj == struct_from_str
+
 
 def test_emmet_core_version_checks(monkeypatch: pytest.MonkeyPatch):
     ref_ver = (1, 2, "3rc5")

tests/molecules/test_molecules.py

@@ -15,5 +15,6 @@ def test_molecule_rester():
         )
 
         assert all(
-            getattr(rester, k) == lazy_obj for k, lazy_obj in MOLECULES_RESTERS.items()
+            getattr(rester, k)._class_name == lazy_obj._class_name
+            for k, lazy_obj in MOLECULES_RESTERS.items()
         )