python-workflow-definition 0.1.3__py2.py3-none-any.whl → 0.1.5__py2.py3-none-any.whl

python_workflow_definition/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.1.5'
+__version_tuple__ = version_tuple = (0, 1, 5)
 
 __commit_id__ = commit_id = None

python_workflow_definition/aiida.py

@@ -6,7 +6,7 @@ from aiida_pythonjob.data.serializer import general_serializer
 from aiida_workgraph import WorkGraph, task, Task, namespace
 from aiida_workgraph.socket import TaskSocketNamespace
 from dataclasses import replace
-from node_graph.node_spec import SchemaSource
+from node_graph.task_spec import SchemaSource
 from python_workflow_definition.models import PythonWorkflowDefinitionWorkflow
 from python_workflow_definition.shared import (
     convert_nodes_list_to_dict,
@@ -30,10 +30,15 @@ def load_workflow_json(file_name: str) -> WorkGraph:
     wg = WorkGraph()
     task_name_mapping = {}
 
+    nodes_types_dict = {int(n["id"]): n["type"] for n in data[NODES_LABEL]}
     for id, identifier in convert_nodes_list_to_dict(
         nodes_list=data[NODES_LABEL]
     ).items():
-        if isinstance(identifier, str) and "." in identifier:
+        if (
+            nodes_types_dict[int(id)] == "function"
+            and isinstance(identifier, str)
+            and "." in identifier
+        ):
             p, m = identifier.rsplit(".", 1)
             mod = import_module(p)
             func = getattr(mod, m)
@@ -109,9 +114,9 @@ def write_workflow_json(wg: WorkGraph, file_name: str) -> dict:
         # if the from socket is the default result, we set it to None
         if link_data["from_socket"] == "result":
             link_data["from_socket"] = None
-        link_data[TARGET_LABEL] = node_name_mapping[link_data.pop("to_node")]
+        link_data[TARGET_LABEL] = node_name_mapping[link_data.pop("to_task")]
         link_data[TARGET_PORT_LABEL] = link_data.pop("to_socket")
-        link_data[SOURCE_LABEL] = node_name_mapping[link_data.pop("from_node")]
+        link_data[SOURCE_LABEL] = node_name_mapping[link_data.pop("from_task")]
         link_data[SOURCE_PORT_LABEL] = link_data.pop("from_socket")
         data[EDGES_LABEL].append(link_data)
 

python_workflow_definition/executorlib.py

@@ -47,8 +47,9 @@ def load_workflow_json(file_name: str, exe: Executor):
     edges_new_lst = content[EDGES_LABEL]
     nodes_new_dict = {}
 
+    nodes_types_dict = {int(n["id"]): n["type"] for n in content[NODES_LABEL]}
     for k, v in convert_nodes_list_to_dict(nodes_list=content[NODES_LABEL]).items():
-        if isinstance(v, str) and "." in v:
+        if nodes_types_dict[int(k)] == "function" and isinstance(v, str) and "." in v:
             p, m = v.rsplit(".", 1)
             mod = import_module(p)
             nodes_new_dict[int(k)] = getattr(mod, m)

python_workflow_definition/jobflow.py

@@ -295,8 +295,9 @@ def load_workflow_json(file_name: str) -> Flow:
             )
 
     nodes_new_dict = {}
+    nodes_types_dict = {int(n["id"]): n["type"] for n in content[NODES_LABEL]}
     for k, v in convert_nodes_list_to_dict(nodes_list=content[NODES_LABEL]).items():
-        if isinstance(v, str) and "." in v:
+        if nodes_types_dict[int(k)] == "function" and isinstance(v, str) and "." in v:
             p, m = v.rsplit(".", 1)
             mod = import_module(p)
             nodes_new_dict[int(k)] = getattr(mod, m)

python_workflow_definition/purepython.py

@@ -75,8 +75,9 @@ def load_workflow_json(file_name: str):
 
     edges_new_lst = content[EDGES_LABEL]
     nodes_new_dict = {}
+    nodes_types_dict = {int(n["id"]): n["type"] for n in content[NODES_LABEL]}
     for k, v in convert_nodes_list_to_dict(nodes_list=content[NODES_LABEL]).items():
-        if isinstance(v, str) and "." in v:
+        if nodes_types_dict[int(k)] == "function" and isinstance(v, str) and "." in v:
             p, m = v.rsplit(".", 1)
             mod = import_module(p)
             nodes_new_dict[int(k)] = getattr(mod, m)

python_workflow_definition/pyiron_base.py

@@ -239,9 +239,10 @@ def load_workflow_json(file_name: str, project: Optional[Project] = None):
     )
 
     edges_new_lst = content[EDGES_LABEL]
+    nodes_types_dict = {int(n["id"]): n["type"] for n in content[NODES_LABEL]}
     nodes_new_dict = {}
     for k, v in convert_nodes_list_to_dict(nodes_list=content[NODES_LABEL]).items():
-        if isinstance(v, str) and "." in v:
+        if nodes_types_dict[int(k)] == "function" and isinstance(v, str) and "." in v:
             p, m = v.rsplit(".", 1)
             if p == "python_workflow_definition.shared":
                 p = "python_workflow_definition.pyiron_base"

{python_workflow_definition-0.1.3.dist-info → python_workflow_definition-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_workflow_definition
-Version: 0.1.3
+Version: 0.1.5
 Summary: Python Workflow Definition - workflow interoperability for aiida, jobflow and pyiron
 Author-email: Jan Janssen <janssen@mpie.de>, Janine George <janine.geogre@bam.de>, Julian Geiger <julian.geiger@psi.ch>, Xing Wang <xing.wang@psi.ch>, Marnik Bercx <marnik.bercx@psi.ch>, Christina Ertural <christina.ertural@bam.de>
 License: BSD 3-Clause License
@@ -34,14 +34,18 @@ License: BSD 3-Clause License
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 License-File: LICENSE
 Requires-Dist: numpy>=1.21
-Requires-Dist: pydantic<=2.12.4,>=2.7.0
+Requires-Dist: pydantic<2.13.0,>=2.7.0
 Provides-Extra: aiida
-Requires-Dist: aiida-workgraph<=0.7.6,>=0.5.1; extra == 'aiida'
+Requires-Dist: aiida-workgraph<=0.8.1,>=0.5.1; extra == 'aiida'
+Provides-Extra: executorlib
+Requires-Dist: executorlib<=1.9.1,>=1.7.4; extra == 'executorlib'
 Provides-Extra: jobflow
-Requires-Dist: jobflow<=0.2.1,>=0.1.18; extra == 'jobflow'
+Requires-Dist: jobflow<=0.3.1,>=0.1.18; extra == 'jobflow'
 Provides-Extra: plot
 Requires-Dist: ipython<=9.8.0,>=7.33.0; extra == 'plot'
 Requires-Dist: networkx<=3.5,>=2.8.8; extra == 'plot'
 Requires-Dist: pygraphviz<=1.14,>=1.10; extra == 'plot'
 Provides-Extra: pyiron
 Requires-Dist: pyiron-base<=0.15.12,>=0.11.10; extra == 'pyiron'
+Provides-Extra: pyiron-workflow
+Requires-Dist: pyiron-workflow<=0.15.5,>=0.13.0; extra == 'pyiron-workflow'

python_workflow_definition-0.1.5.dist-info/RECORD

@@ -0,0 +1,17 @@
+python_workflow_definition/__init__.py,sha256=h99LG51BctvOaZSCwDOOD1-t_5dNHVNnf2aaWFOnyiQ,106
+python_workflow_definition/_version.py,sha256=rdxBMYpwzYxiWk08QbPLHSAxHoDfeKWwyaJIAM0lSic,704
+python_workflow_definition/aiida.py,sha256=QGi0vLLGh6CclJQFQWJKdFM2lNIQ50DoMUlG_AvyXO0,6283
+python_workflow_definition/executorlib.py,sha256=jJiw3RrDbHlMWjqKaIg7U2IN5Isb0HQaMfPpqEX4J5Y,2431
+python_workflow_definition/jobflow.py,sha256=e4Ho9Tx_yublC_UartvHUwphp2Z3wpEvFKcn9ufdguQ,12500
+python_workflow_definition/models.py,sha256=R9Kclp4fGlg4H--NHNohjgat1WTDDpO7pis5r-_lX8c,9049
+python_workflow_definition/plot.py,sha256=Y_X2HF2kCXaoIdi-b7ZMdySUIb6S1pjL2hwHRu3Zey8,1633
+python_workflow_definition/purepython.py,sha256=QX2MOIqfC_lP-yE4v2zb7nOBsrolsHe8yBecI4QmT9s,3443
+python_workflow_definition/pyiron_base.py,sha256=bSSohSjGzr7o8HeGjN5w8MDaUpWYJpvWndqRBG25Ro8,11730
+python_workflow_definition/pyiron_workflow.py,sha256=UuzykgWI6YkecMKcX2lZtTx-hY3wH2fOCqLvNnm0VxA,15035
+python_workflow_definition/shared.py,sha256=t0YKxpXYfPFxs6KqmjGy4oU89xcUHO1xANzxBE5oP7c,3468
+python_workflow_definition/cwl/__init__.py,sha256=GTYsSbkzsRZPQ2NW4Rxf-bLVyZlW6B00sNf9Uz0DsW4,7750
+python_workflow_definition/cwl/__main__.py,sha256=x5QHMqPt-J3EpSNKNNzE0v9GH6eiM8hVE43iNEf7y28,1584
+python_workflow_definition-0.1.5.dist-info/METADATA,sha256=-UKUx-wbQRb06u6raQ0s6mcD5EQcmIjHOakuvkRApaU,2874
+python_workflow_definition-0.1.5.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+python_workflow_definition-0.1.5.dist-info/licenses/LICENSE,sha256=weTxRQ0keMOdgE0qJlsyCAIgm3BB62Bb3mS6_4iUv7Q,1511
+python_workflow_definition-0.1.5.dist-info/RECORD,,

python_workflow_definition-0.1.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-python_workflow_definition/__init__.py,sha256=h99LG51BctvOaZSCwDOOD1-t_5dNHVNnf2aaWFOnyiQ,106
-python_workflow_definition/_version.py,sha256=q5nF98G8SoVeJqaknL0xdyxtv0egsqb0fK06_84Izu8,704
-python_workflow_definition/aiida.py,sha256=A8MYRgkFCLEenXxe6H3fhYX-At3nt1VB-AXw1xRg7mM,6115
-python_workflow_definition/executorlib.py,sha256=lRMIPznpNX5yrtybhN0Ghb13ED-LABcUXgorzuBqQ6Q,2309
-python_workflow_definition/jobflow.py,sha256=gZmtcD4JMg5qdoyDdvlpwM6MgR_mOocDEMQ4ZUvNJRk,12378
-python_workflow_definition/models.py,sha256=R9Kclp4fGlg4H--NHNohjgat1WTDDpO7pis5r-_lX8c,9049
-python_workflow_definition/plot.py,sha256=Y_X2HF2kCXaoIdi-b7ZMdySUIb6S1pjL2hwHRu3Zey8,1633
-python_workflow_definition/purepython.py,sha256=-9PcmYttKpgpcUiEwknfsLDDjL7PW0TsEu-A-57uv6Y,3321
-python_workflow_definition/pyiron_base.py,sha256=kgUaVNGqmwY4fv2fZx6ErA0THl97xIDEmHcShqNicm4,11608
-python_workflow_definition/pyiron_workflow.py,sha256=UuzykgWI6YkecMKcX2lZtTx-hY3wH2fOCqLvNnm0VxA,15035
-python_workflow_definition/shared.py,sha256=t0YKxpXYfPFxs6KqmjGy4oU89xcUHO1xANzxBE5oP7c,3468
-python_workflow_definition/cwl/__init__.py,sha256=GTYsSbkzsRZPQ2NW4Rxf-bLVyZlW6B00sNf9Uz0DsW4,7750
-python_workflow_definition/cwl/__main__.py,sha256=x5QHMqPt-J3EpSNKNNzE0v9GH6eiM8hVE43iNEf7y28,1584
-python_workflow_definition-0.1.3.dist-info/METADATA,sha256=vFJCXO4KAqWEWlblEj5nmm7L6E1lbZoO_PYqrdtgjUQ,2673
-python_workflow_definition-0.1.3.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-python_workflow_definition-0.1.3.dist-info/licenses/LICENSE,sha256=weTxRQ0keMOdgE0qJlsyCAIgm3BB62Bb3mS6_4iUv7Q,1511
-python_workflow_definition-0.1.3.dist-info/RECORD,,