Merge pull request #176 from pyiron/copy_and_update

Copy and update __dict__

pyiron_workflow/channels.py

@@ -729,11 +729,9 @@ def __round__(self):
 
     # Because we override __getattr__ we need to get and set state for serialization
     def __getstate__(self):
-        return self.__dict__
+        return dict(self.__dict__)
 
     def __setstate__(self, state):
-        # Update instead of overriding in case some other attributes were added on the
-        # main process while a remote process was working away
         self.__dict__.update(**state)
 
 

pyiron_workflow/composite.py

@@ -192,6 +192,10 @@ def process_run_result(self, run_output):
         return DotDict(self.outputs.to_value_dict())
 
     def _parse_remotely_executed_self(self, other_self):
+        # Un-parent existing nodes before ditching them
+        for node in self:
+            node._parent = None
+        other_self.running = False  # It's done now
         self.__setstate__(other_self.__getstate__())
 
     def disconnect_run(self) -> list[tuple[Channel, Channel]]:

pyiron_workflow/interfaces.py

@@ -147,10 +147,10 @@ def __getitem__(self, item):
             ) from e
 
     def __getstate__(self):
-        return self.__dict__
+        return dict(self.__dict__)
 
     def __setstate__(self, state):
-        self.__dict__ = state
+        self.__dict__.update(**state)
 
     def register(self, package_identifier: str, domain: Optional[str] = None) -> None:
         """

pyiron_workflow/io.py

@@ -157,7 +157,7 @@ def to_dict(self):
 
     def __getstate__(self):
         # Compatibility with python <3.11
-        return self.__dict__
+        return dict(self.__dict__)
 
     def __setstate__(self, state):
         # Because we override getattr, we need to use __dict__ assignment directly in

pyiron_workflow/node.py

@@ -1040,7 +1040,7 @@ def replace_with(self, other: Node | type[Node]):
             warnings.warn(f"Could not replace_node {self.label}, as it has no parent.")
 
     def __getstate__(self):
-        state = self.__dict__
+        state = dict(self.__dict__)
         state["_parent"] = None
         # I am not at all confident that removing the parent here is the _right_
         # solution.

tests/unit/test_macro.py

@@ -238,6 +238,10 @@ def test_with_executor(self):
 
         returned_nodes = result.result(timeout=120)  # Wait for the process to finish
         sleep(1)
+        self.assertFalse(
+            macro.running,
+            msg="Macro should be done running"
+        )
         self.assertIsNot(
             original_one,
             returned_nodes.one,