replace nested normal with nested. see if ci passes

Author: GeigerJ2

example_workflows/nested/load_aiida.py

@@ -1,146 +1,12 @@
-from python_workflow_definition.aiida import write_workflow_json, load_workflow_json, load_workflow_json_nested
+from python_workflow_definition.aiida import load_workflow_json
 
-from aiida_workgraph import WorkGraph, task
-from aiida import orm, load_profile
+from aiida import load_profile
 
 load_profile()
 
 workflow_json_filename = "main.pwd.json"
 
+wg = load_workflow_json(workflow_json_filename)
 
-# In[2]:
-
-
-from workflow import (
-    get_sum as _get_sum,
-    get_prod_and_div as _get_prod_and_div,
-    get_square as _get_square,
-)
-
-
-# wg = WorkGraph("nested")
-
-
-# In[4]:
-
-wg = load_workflow_json_nested(workflow_json_filename)
 wg.to_html()
-
-breakpoint()
-
-pass
-
 wg.run()
-
-#
-#
-# get_prod_and_div_task = wg.add_task(
-#     task(outputs=["prod", "div"])(_get_prod_and_div),
-#     x=orm.Float(1),
-#     y=orm.Float(2),
-# )
-#
-#
-# # In[5]:
-#
-#
-# get_sum_task = wg.add_task(
-#     _get_sum,
-#     x=get_prod_and_div_task.outputs.prod,
-#     y=get_prod_and_div_task.outputs.div,
-# )
-#
-#
-# # In[6]:
-#
-#
-# get_square_task = wg.add_task(
-#     _get_square,
-#     x=get_sum_task.outputs.result,
-# )
-#
-#
-# # In[7]:
-#
-#
-# write_workflow_json(wg=wg, file_name=workflow_json_filename)
-#
-#
-# # In[8]:
-#
-#
-# get_ipython().system("cat {workflow_json_filename}")
-#
-#
-# # ## Load Workflow with jobflow
-#
-# # In[9]:
-#
-#
-# from python_workflow_definition.jobflow import load_workflow_json
-#
-#
-# # In[10]:
-#
-#
-# from jobflow.managers.local import run_locally
-#
-#
-# # In[11]:
-#
-#
-# flow = load_workflow_json(file_name=workflow_json_filename)
-#
-#
-# # In[12]:
-#
-#
-# result = run_locally(flow)
-# result
-#
-#
-# # ## Load Workflow with pyiron_base
-#
-# # In[13]:
-#
-#
-# from python_workflow_definition.pyiron_base import load_workflow_json
-#
-#
-# # In[14]:
-#
-#
-# delayed_object_lst = load_workflow_json(file_name=workflow_json_filename)
-# delayed_object_lst[-1].draw()
-#
-#
-# # In[15]:
-#
-#
-# delayed_object_lst[-1].pull()
-#
-#
-# # ## Load Workflow with pyiron_workflow
-#
-# # In[ ]:
-#
-#
-# from python_workflow_definition.pyiron_workflow import load_workflow_json
-#
-#
-# # In[ ]:
-#
-#
-# wf = load_workflow_json(file_name=workflow_json_filename)
-#
-#
-# # In[ ]:
-#
-#
-# wf.draw(size=(10, 10))
-#
-#
-# # In[ ]:
-#
-#
-# wf.run()

src/python_workflow_definition/aiida.py

@@ -25,7 +25,7 @@
 )
 
 
-def load_workflow_json_nested(file_name: str) -> WorkGraph:
+def load_workflow_json(file_name: str) -> WorkGraph:
     """Load a workflow from JSON with support for nested workflows.
 
     This function recursively loads workflows, properly exposing inputs/outputs
@@ -86,7 +86,7 @@ def load_workflow_json_nested(file_name: str) -> WorkGraph:
             workflow_path = parent_dir / workflow_file
 
             # Recursively load the sub-workflow with proper input/output exposure
-            sub_wg = load_workflow_json_nested(file_name=str(workflow_path))
+            sub_wg = load_workflow_json(file_name=str(workflow_path))
 
             # Add the sub-workflow as a task - it will automatically have the right inputs/outputs
             workflow_task = wg.add_task(sub_wg)
@@ -203,66 +203,6 @@ def load_workflow_json_nested(file_name: str) -> WorkGraph:
     return wg
 
 
-def load_workflow_json(file_name: str) -> WorkGraph:
-
-    data = PythonWorkflowDefinitionWorkflow.load_json_file(file_name=file_name)
-
-    wg = WorkGraph()
-    task_name_mapping = {}
-
-    for id, identifier in convert_nodes_list_to_dict(
-        nodes_list=data[NODES_LABEL]
-    ).items():
-        if isinstance(identifier, str) and "." in identifier:
-            p, m = identifier.rsplit(".", 1)
-            mod = import_module(p)
-            func = getattr(mod, m)
-            decorated_func = task(outputs=namespace())(func)
-            new_task = wg.add_task(decorated_func)
-            new_task.spec = replace(new_task.spec, schema_source=SchemaSource.EMBEDDED)
-            task_name_mapping[id] = new_task
-        else:
-            # data task
-            data_node = general_serializer(identifier)
-            task_name_mapping[id] = data_node
-
-    # add links
-    for link in data[EDGES_LABEL]:
-        # TODO: continue here
-        to_task = task_name_mapping[str(link[TARGET_LABEL])]
-        # if the input is not exit, it means we pass the data into to the kwargs
-        # in this case, we add the input socket
-        if isinstance(to_task, Task):
-            if link[TARGET_PORT_LABEL] not in to_task.inputs:
-                to_socket = to_task.add_input_spec(
-                    "workgraph.any", name=link[TARGET_PORT_LABEL]
-                )
-            else:
-                to_socket = to_task.inputs[link[TARGET_PORT_LABEL]]
-        from_task = task_name_mapping[str(link[SOURCE_LABEL])]
-        if isinstance(from_task, orm.Data):
-            to_socket.value = from_task
-        else:
-            try:
-                if link[SOURCE_PORT_LABEL] is None:
-                    link[SOURCE_PORT_LABEL] = "result"
-                # because we are not define the outputs explicitly during the pythonjob creation
-                # we add it here, and assume the output exit
-                if link[SOURCE_PORT_LABEL] not in from_task.outputs:
-                    # if str(link["sourcePort"]) not in from_task.outputs:
-                    from_socket = from_task.add_output_spec(
-                        "workgraph.any",
-                        name=link[SOURCE_PORT_LABEL],
-                    )
-                else:
-                    from_socket = from_task.outputs[link[SOURCE_PORT_LABEL]]
-                if isinstance(to_task, Task):
-                    wg.add_link(from_socket, to_socket)
-            except Exception as e:
-                traceback.print_exc()
-                print("Failed to link", link, "with error:", e)
-    return wg
-
 
 def write_workflow_json(wg: WorkGraph, file_name: str) -> dict:
     data = {NODES_LABEL: [], EDGES_LABEL: []}