Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3bdaee6
Implement Python Workflow Definition in pyiron_workflow
jan-janssen May 23, 2025
fbbcc08
black formatting
jan-janssen May 23, 2025
1df9b19
bug fix
jan-janssen May 23, 2025
2bc578b
add function to load workflow from JSOn - not working
jan-janssen May 23, 2025
55a0764
black formatting
jan-janssen May 23, 2025
9830048
Add json-to-Workfow function
liamhuber May 23, 2025
038bc85
Update python_workflow_definition/src/python_workflow_definition/pyir…
liamhuber May 23, 2025
9739b47
merge Liam's changes
jan-janssen May 24, 2025
602fa70
black formatting
jan-janssen May 24, 2025
aed419c
Merge remote-tracking branch 'origin/main' into pyiron_workflow
jan-janssen May 24, 2025
d743bea
update notebooks
jan-janssen May 24, 2025
81b7df7
fix file name
jan-janssen May 24, 2025
78ae48b
Add pyiron_workflow to all universal notebooks
jan-janssen May 24, 2025
4188e24
update notebooks for other workflow frameworks
jan-janssen May 24, 2025
264b43d
fix reuse of functions
jan-janssen May 24, 2025
0fd2a9a
black formatting
jan-janssen May 24, 2025
09a5db0
Add NFDI example
jan-janssen May 24, 2025
f72e7f1
dynamic get_dict() function
jan-janssen May 25, 2025
f0894f1
dynamic get_list() function
jan-janssen May 25, 2025
c027262
add s_ to input parameters
jan-janssen May 25, 2025
39b9d56
uniquue child names
jan-janssen May 25, 2025
1b245ae
silence validation
jan-janssen May 25, 2025
613db09
handle special case of get_list()
jan-janssen May 25, 2025
e80d591
black formatting
jan-janssen May 25, 2025
a127e65
test quantum espresso export
jan-janssen May 25, 2025
68e145f
Add files via upload
jan-janssen May 25, 2025
373df59
update write_workflow_json()
jan-janssen May 26, 2025
560fa19
black formatting
jan-janssen May 26, 2025
9e541a6
update notebook
jan-janssen May 26, 2025
9636be6
Add files via upload
jan-janssen May 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
papermill cwl.ipynb cwl_out.ipynb -k "python3"
papermill jobflow.ipynb jobflow_out.ipynb -k "python3"
papermill pyiron_base.ipynb pyiron_base_out.ipynb -k "python3"
papermill pyiron_workflow.ipynb pyiron_workflow_out.ipynb -k "python3"
papermill universal_workflow.ipynb universal_workflow_out.ipynb -k "python3"

quantumespresso:
Expand Down Expand Up @@ -105,6 +106,7 @@ jobs:
papermill cwl.ipynb cwl_out.ipynb -k "python3"
papermill jobflow.ipynb jobflow_out.ipynb -k "python3"
papermill pyiron_base.ipynb pyiron_base_out.ipynb -k "python3"
papermill pyiron_workflow.ipynb pyiron_workflow_out.ipynb -k "python3"
papermill universal_workflow.ipynb universal_workflow_out.ipynb -k "python3"

arithmetic:
Expand Down Expand Up @@ -133,6 +135,7 @@ jobs:
papermill cwl.ipynb cwl_out.ipynb -k "python3"
papermill jobflow.ipynb jobflow_out.ipynb -k "python3"
papermill pyiron_base.ipynb pyiron_base_out.ipynb -k "python3"
papermill pyiron_workflow.ipynb pyiron_workflow_out.ipynb -k "python3"
papermill universal_workflow.ipynb universal_workflow_out.ipynb -k "python3"

documentation:
Expand Down
1 change: 1 addition & 0 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- httpcore =1.0.7
- jobflow =0.1.19
- pyiron_base =0.12.0
- pyiron_workflow =0.13.0
- pygraphviz =1.14
- aiida-workgraph =0.5.2
- conda_subprocess =0.0.7
Expand Down
33 changes: 33 additions & 0 deletions example_workflows/arithmetic/aiida.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,39 @@
}
],
"execution_count": 15
},
{
"metadata": {},
"cell_type": "markdown",
"source": "## Load Workflow with pyiron_workflow"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "from python_workflow_definition.pyiron_workflow import load_workflow_json"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf = load_workflow_json(file_name=workflow_json_filename)"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf.draw(size=(10,10))"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf.run()"
}
]
}
44 changes: 34 additions & 10 deletions example_workflows/arithmetic/jobflow.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -369,18 +369,42 @@
}
},
{
"id": "c199b28f3c0399cc",
"metadata": {},
"cell_type": "markdown",
"source": "## Load Workflow with pyiron_workflow",
"id": "7da4733bfeffee63"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "from python_workflow_definition.pyiron_workflow import load_workflow_json",
"id": "6c87661996ff840b"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf = load_workflow_json(file_name=workflow_json_filename)",
"id": "33b1e9408924f9c0"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf.draw(size=(10,10))",
"id": "df63b2963a0d90a5"
},
{
"metadata": {},
"cell_type": "code",
"source": "",
"metadata": {
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
"trusted": true
},
"outputs": [],
"execution_count": null
"execution_count": null,
"source": "wf.run()",
"id": "bf110395454bd694"
}
]
}
38 changes: 36 additions & 2 deletions example_workflows/arithmetic/pyiron_base.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,49 @@
],
"execution_count": 18
},
{
"metadata": {},
"cell_type": "markdown",
"source": "## Load Workflow with pyiron_workflow",
"id": "406fd07dd4bd8006"
},
{
"id": "cf76f305-24de-45a7-be8e-cfe45cd6458e",
"cell_type": "code",
"source": "",
"source": "from python_workflow_definition.pyiron_workflow import load_workflow_json",
"metadata": {
"trusted": true
"trusted": true,
"ExecuteTime": {
"end_time": "2025-05-24T08:25:33.797570Z",
"start_time": "2025-05-24T08:25:33.771214Z"
}
},
"outputs": [],
"execution_count": null
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf = load_workflow_json(file_name=workflow_json_filename)",
"id": "5b442611457aa5a8"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf.draw(size=(10,10))",
"id": "2ca33c8590a54866"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": "wf.run()",
"id": "d36522a1c315b7f5"
}
]
}
Loading
Loading