From d86f6a785abfdfc7236dcdc918c34ec730b60573 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 5 Jul 2024 09:14:22 +0200 Subject: [PATCH 1/2] Rename the result() call to pull() - for consistency with pyiron_workflow --- pyiron_base/project/delayed.py | 4 ++-- tests/flex/test_executablecontainer.py | 6 +++--- tests/flex/test_pythonfunctioncontainer.py | 2 +- tests/job/test_genericJob.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyiron_base/project/delayed.py b/pyiron_base/project/delayed.py index 835cf26c4..42f6415fb 100644 --- a/pyiron_base/project/delayed.py +++ b/pyiron_base/project/delayed.py @@ -184,7 +184,7 @@ def recursive_dict_resolve(input_dict: dict) -> dict: output_dict = {} for k, v in input_dict.items(): if isinstance(v, DelayedObject): - output_dict[k] = v.result() + output_dict[k] = v.pull() elif isinstance(v, dict): output_dict[k] = recursive_dict_resolve(input_dict=v) elif isinstance(v, list): @@ -252,7 +252,7 @@ def get_python_result(self): def get_file_result(self): return getattr(self._result.files, self._output_file) - def result(self): + def pull(self): if self._result is None: self._result = evaluate_function( funct=self._function, input_dict=self._input diff --git a/tests/flex/test_executablecontainer.py b/tests/flex/test_executablecontainer.py index 7934e6fe1..d4c6a4f5b 100644 --- a/tests/flex/test_executablecontainer.py +++ b/tests/flex/test_executablecontainer.py @@ -262,12 +262,12 @@ def test_delayed_series_of_jobs(self): output_file_lst=["result.txt"], output_key_lst=["result"], ) - self.assertEqual(w.output.result.result(), 7) + self.assertEqual(w.output.result.pull(), 7) nodes_dict, edges_lst = w.get_graph() self.assertEqual(len(nodes_dict), 12) self.assertEqual(len(edges_lst), 18) - job_w = w.result() - job_z = z.result() + job_w = w.pull() + job_z = z.pull() self.assertEqual(job_w.output.result, 7) self.project.remove_job(job_z.job_name) self.project.remove_job(job_w.job_name) diff --git a/tests/flex/test_pythonfunctioncontainer.py b/tests/flex/test_pythonfunctioncontainer.py index 47ddbb66f..415b78f2e 100644 --- a/tests/flex/test_pythonfunctioncontainer.py +++ b/tests/flex/test_pythonfunctioncontainer.py @@ -214,7 +214,7 @@ def test_delayed(self): d = self.project.wrap_python_function( python_function=my_function, a=c, b=3, delayed=True ) - self.assertEqual(d.result(), 6) + self.assertEqual(d.pull(), 6) nodes_dict, edges_lst = d.get_graph() self.assertEqual(len(nodes_dict), 5) self.assertEqual(len(edges_lst), 4) diff --git a/tests/job/test_genericJob.py b/tests/job/test_genericJob.py index 1c551fafd..e719acce6 100644 --- a/tests/job/test_genericJob.py +++ b/tests/job/test_genericJob.py @@ -677,7 +677,7 @@ def test_job_executor_run(self): j.server.executor = ProcessPoolExecutor() self.assertTrue(j.server.run_mode.executor) j.run() - j.server.future.result() + j.server.future.pull() self.assertTrue(j.server.future.done()) self.assertTrue(j.status.finished) From fee6013252530592b187ad6b5a7e16187b507313 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 5 Jul 2024 09:15:51 +0200 Subject: [PATCH 2/2] revert --- tests/job/test_genericJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/job/test_genericJob.py b/tests/job/test_genericJob.py index e719acce6..1c551fafd 100644 --- a/tests/job/test_genericJob.py +++ b/tests/job/test_genericJob.py @@ -677,7 +677,7 @@ def test_job_executor_run(self): j.server.executor = ProcessPoolExecutor() self.assertTrue(j.server.run_mode.executor) j.run() - j.server.future.pull() + j.server.future.result() self.assertTrue(j.server.future.done()) self.assertTrue(j.status.finished)