Remove external tools from creator (#712)

Users should just import and use these from their home

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>

Author: liamhuber

notebooks/deepdive.ipynb

@@ -2727,6 +2727,8 @@
     }
    },
    "source": [
+    "from concurrent import futures\n",
+    "\n",
     "wf = pwf.Workflow(\"test\")\n",
     "wf.a = pwf.std.UserInput(1)\n",
     "wf.b = pwf.std.UserInput(\"two\")\n",
@@ -2740,7 +2742,7 @@
     "wf.starting_nodes = [wf.a]\n",
     "wf.automate_execution = False\n",
     "\n",
-    "with pwf.Workflow.create.ProcessPoolExecutor() as exe:\n",
+    "with futures.ProcessPoolExecutor() as exe:\n",
     "    wf.c_fails.executor = exe\n",
     "    wf(raise_run_exceptions=False)\n",
     "\n",

notebooks/quickstart.ipynb

@@ -1273,6 +1273,8 @@
     }
    },
    "source": [
+    "from concurrent import futures\n",
+    "\n",
     "@Workflow.wrap.as_function_node\n",
     "def Report(t1, t2, t3):\n",
     "    tmax = max(t1, t2, t3)\n",
@@ -1294,7 +1296,7 @@
     "\n",
     "t0 = time()\n",
     "\n",
-    "with Workflow.create.ThreadPoolExecutor(max_workers=3) as exe:\n",
+    "with futures.ThreadPoolExecutor(max_workers=3) as exe:\n",
     "    for n in wf:\n",
     "        if n.label not in [\"t_sleep\", \"midway\", \"finally\"]:\n",
     "            n.executor = exe\n",
@@ -1496,7 +1498,7 @@
     "\n",
     "macro_with_for_loops = InternallyIterates()\n",
     "\n",
-    "with Workflow.create.ThreadPoolExecutor(max_workers=1) as exe:\n",
+    "with futures.ThreadPoolExecutor(max_workers=1) as exe:\n",
     "    macro_with_for_loops.iter_add.body_node_executor = exe\n",
     "    out = macro_with_for_loops(data=[1, 2, 3])\n",
     "\n",

pyiron_workflow/create.py

@@ -4,9 +4,6 @@
 
 from __future__ import annotations
 
-from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor
-
-import executorlib
 from pyiron_snippets.dotdict import DotDict
 
 from pyiron_workflow.executors import CloudpickleProcessPoolExecutor
@@ -23,16 +20,11 @@ class Creator:
     """
 
     def __init__(self):
-        # Standard lib
-        self.ProcessPoolExecutor = ProcessPoolExecutor
-        self.ThreadPoolExecutor = ThreadPoolExecutor
         # Local cloudpickler
         self.CloudpickleProcessPoolExecutor = CloudpickleProcessPoolExecutor
 
         self.function_node = function_node
 
-    executorlib = executorlib
-
     @property
     def std(self):
         from pyiron_workflow.nodes import standard

tests/integration/test_parallel_speedup.py

@@ -1,4 +1,5 @@
 import unittest
+from concurrent import futures
 from time import perf_counter, sleep
 
 from pyiron_workflow import Workflow
@@ -42,7 +43,7 @@ def make_workflow(label):
         wf.d << (wf.a, wf.b, wf.c)
         wf.starting_nodes = [wf.a, wf.b, wf.c]
 
-        with wf.create.ProcessPoolExecutor(max_workers=3) as executor:
+        with futures.ProcessPoolExecutor(max_workers=3) as executor:
             wf.a.executor = executor
             wf.b.executor = executor
             wf.c.executor = executor
@@ -81,7 +82,7 @@ def test_executor_instructions(self):
         wf.sleep3 = Workflow.create.std.Sleep(t)
         wf.sleep4 = Workflow.create.std.Sleep(t)
         for n in wf:
-            n.executor = (Workflow.create.ThreadPoolExecutor, (), {})
+            n.executor = (futures.ThreadPoolExecutor, (), {})
 
         wf.save()
         reloaded = Workflow("test")

tests/integration/test_workflow.py

@@ -5,6 +5,7 @@
 import unittest
 from concurrent import futures
 
+import executorlib
 from static import demo_nodes
 
 from pyiron_workflow._tests import ensure_tests_in_python_path
@@ -147,7 +148,7 @@ def test_executor_and_creator_interaction(self):
         wf = Workflow("depickle")
 
         wf.before_pickling = demo_nodes.OptionallyAdd(1)
-        wf.before_pickling.executor = wf.create.ProcessPoolExecutor()
+        wf.before_pickling.executor = futures.ProcessPoolExecutor()
         wf()
         wf.before_pickling.future.result(timeout=120)  # Wait for it to finish
         wf.executor_shutdown()
@@ -158,10 +159,10 @@ def test_executor_and_creator_interaction(self):
 
     def test_executors(self):
         executors = [
-            Workflow.create.ProcessPoolExecutor,
-            Workflow.create.ThreadPoolExecutor,
+            futures.ProcessPoolExecutor,
+            futures.ThreadPoolExecutor,
             Workflow.create.CloudpickleProcessPoolExecutor,
-            Workflow.create.executorlib.SingleNodeExecutor,
+            executorlib.SingleNodeExecutor,
         ]
 
         wf = Workflow("executed")
@@ -272,7 +273,7 @@ def test_failure(self):
 
         with (
             self.subTest("Check completion"),
-            Workflow.create.ProcessPoolExecutor() as exe,
+            futures.ProcessPoolExecutor() as exe,
         ):
             wf.c_fails.executor = exe
             wf(raise_run_exceptions=False)

tests/unit/nodes/test_macro.py

@@ -1,6 +1,6 @@
 import pickle
 import unittest
-from concurrent.futures import Future
+from concurrent import futures
 from time import sleep
 
 from static import demo_nodes
@@ -217,7 +217,7 @@ def test_with_executor(self):
         # at the downstream output, and none of this is happening in a workflow
 
         original_one = macro.one
-        macro.executor = macro.create.ProcessPoolExecutor()
+        macro.executor = futures.ProcessPoolExecutor()
 
         self.assertIs(
             NOT_DATA,
@@ -227,7 +227,7 @@ def test_with_executor(self):
 
         result = macro.run(one__x=0)
         self.assertIsInstance(
-            result, Future, msg="Should be running as a parallel process"
+            result, futures.Future, msg="Should be running as a parallel process"
         )
         self.assertIs(
             NOT_DATA,

tests/unit/test_workflow.py

@@ -1,6 +1,6 @@
 import pickle
 import unittest
-from concurrent.futures import Future, ThreadPoolExecutor
+from concurrent import futures
 from time import sleep
 
 from bidict import ValueDuplicationError
@@ -175,7 +175,7 @@ def test_with_executor(self):
         wf.b = wf.create.function_node(plus_one, x=wf.a)
 
         original_a = wf.a
-        wf.executor = wf.create.ProcessPoolExecutor()
+        wf.executor = futures.ProcessPoolExecutor()
 
         self.assertIs(
             NOT_DATA,
@@ -185,7 +185,7 @@ def test_with_executor(self):
 
         result = wf(a__x=0)
         self.assertIsInstance(
-            result, Future, msg="Should be running as a parallel process"
+            result, futures.Future, msg="Should be running as a parallel process"
         )
 
         _ = result.result(timeout=120)  # Wait for the process to finish
@@ -215,7 +215,7 @@ def test_run_in_thread_exceptions(self):
         wf = Workflow("wf")
         wf.a = wf.create.function_node(plus_one)
 
-        wf.executor = (ThreadPoolExecutor, (), {})
+        wf.executor = (futures.ThreadPoolExecutor, (), {})
 
         with self.assertRaises(
             ValueError,
@@ -230,7 +230,7 @@ def test_parallel_execution(self):
         wf.fast = five()
         wf.sum = sum(a=wf.fast, b=wf.slow)
 
-        wf.slow.executor = wf.create.ProcessPoolExecutor()
+        wf.slow.executor = futures.ProcessPoolExecutor()
 
         wf.slow.run()
         wf.fast.run()
@@ -405,15 +405,15 @@ def add_three_macro(self, one__x):
             msg="Sanity check, pulling here should work perfectly fine",
         )
 
-        wf.m.one.executor = wf.create.ProcessPoolExecutor()
+        wf.m.one.executor = futures.ProcessPoolExecutor()
         with self.assertRaises(
             ValueError, msg="Should not be able to pull with executor in local scope"
         ):
             wf.m.two.pull()
             wf.m.one.executor_shutdown()  # Shouldn't get this far, but if so, shutdown
         wf.m.one.executor = None
 
-        wf.n1.executor = wf.create.ProcessPoolExecutor()
+        wf.n1.executor = futures.ProcessPoolExecutor()
         with self.assertRaises(
             ValueError, msg="Should not be able to pull with executor in parent scope"
         ):