Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions example_workflows/nested/get_jobflow.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from python_workflow_definition.jobflow import load_workflow_json

flow=load_workflow_json("main2.pwd.json")

from jobflow import run_locally
flow.draw_graph(figsize=(3, 3)).show()
print(flow.as_dict())
print(run_locally(flow))
97 changes: 97 additions & 0 deletions example_workflows/nested/jobflow.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions example_workflows/nested/main.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "null", "source": 0, "sourcePort": "result" }
]
}
21 changes: 21 additions & 0 deletions example_workflows/nested/main2.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "value": 3, "type": "input", "name": "a" },
{ "id": 1, "value": 2, "type": "input", "name": "b" },
{ "id": 2, "value": 4, "type": "input", "name": "c" },
{ "id": 3, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 4, "type": "workflow", "value": "prod_div.json" },
{ "id": 5, "type": "function", "value": "workflow.get_sum" },
{ "id": 6, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": null },
{ "target": 3, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 4, "targetPort": "x", "source": 3, "sourcePort": "prod" },
{ "target": 4, "targetPort": "y", "source": 3, "sourcePort": "div" },
{ "target": 5, "targetPort": "x", "source": 4, "sourcePort": "result" },
{ "target": 5, "targetPort": "y", "source": 1, "sourcePort": null },
{ "target": 6, "targetPort": null, "source": 5, "sourcePort": null }
]
}
16 changes: 16 additions & 0 deletions example_workflows/nested/main_two_wf.pwd.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "workflow", "value": "prod_div.json" },
{ "id": 1, "value": 4, "type": "input", "name": "a" },
{ "id": 2, "value": 3, "type": "input", "name": "b" },
{ "id": 3, "type": "workflow", "value": "prod.json" },
{ "id": 4, "type": "output", "name": "final_result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 2, "sourcePort": null },
{ "target": 3, "targetPort": "x", "source": 0, "sourcePort": "result" },
{ "target": 4, "targetPort": "null", "source": 3, "sourcePort": "result" }
]
}
12 changes: 12 additions & 0 deletions example_workflows/nested/prod.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_square" },
{ "id": 1, "type": "input", "value": 1, "name": "x" },
{ "id": 2, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 2, "targetPort": null, "source": 1, "sourcePort": null }
]
}
19 changes: 19 additions & 0 deletions example_workflows/nested/prod_div.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
{
"version": "0.1.1",
"nodes": [
{ "id": 0, "type": "function", "value": "workflow.get_prod_and_div" },
{ "id": 1, "type": "function", "value": "workflow.get_sum" },
{ "id": 2, "type": "function", "value": "workflow.get_square" },
{ "id": 3, "type": "input", "value": 1, "name": "x" },
{ "id": 4, "type": "input", "value": 2, "name": "y" },
{ "id": 5, "type": "output", "name": "result" }
],
"edges": [
{ "target": 0, "targetPort": "x", "source": 3, "sourcePort": null },
{ "target": 0, "targetPort": "y", "source": 4, "sourcePort": null },
{ "target": 1, "targetPort": "x", "source": 0, "sourcePort": "prod" },
{ "target": 1, "targetPort": "y", "source": 0, "sourcePort": "div" },
{ "target": 2, "targetPort": "x", "source": 1, "sourcePort": null },
{ "target": 5, "targetPort": null, "source": 2, "sourcePort": null }
]
}
119 changes: 99 additions & 20 deletions src/python_workflow_definition/jobflow.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,34 +235,101 @@ def _get_workflow(
nodes_dict: dict, input_dict: dict, total_dict: dict, source_handles_dict: dict
) -> list:
def get_attr_helper(obj, source_handle):
if source_handle is None:
return getattr(obj, "output")
print("here2")
print(obj)
if type(obj) is not list:
if source_handle is None:
return getattr(obj, "output")
else:
return getattr(getattr(obj, "output"), source_handle)
else:
return getattr(getattr(obj, "output"), source_handle)
if source_handle is None:
return getattr(obj[-1], "output")
else:
return getattr(getattr(obj[-1], "output"), source_handle)

memory_dict = {}

output_reference=None
for k in total_dict.keys():
v = nodes_dict[k]
if type(v) is list:
# i need to export the uuid and output references
# from workflows and jobs
fn=v
job1_dict=v[0].as_dict()
uuid=job1_dict["uuid"]
mod = import_module(job1_dict["function"]["@module"])
method=getattr(mod, job1_dict["function"]["@callable"])

if k in source_handles_dict.keys():
new_job1 = job(
method=method,
data=[el for el in source_handles_dict[k] if el is not None],
uuid=uuid,
)
else:
new_job1 = job(method=method, uuid=uuid)
kwargs = {}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference = None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw] = input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw] = get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
output_reference=v[-1].output


memory_stuff = new_job1(**kwargs)

fn = [memory_stuff]+v[1:]

memory_dict[k] =Flow(fn)

if isfunction(v):
#if output_reference is None:

# output_reference=None

if k in source_handles_dict.keys():
fn = job(
method=v,
data=[el for el in source_handles_dict[k] if el is not None],
)
else:
fn = job(method=v)
kwargs = {
kw: (
input_dict[vw[SOURCE_LABEL]]
if vw[SOURCE_LABEL] in input_dict
else get_attr_helper(

kwargs={}

for kw, vw in total_dict[k].items():
if output_reference is not None:
# not sure this works?
kwargs[kw] = output_reference
output_reference=None
else:
if vw[SOURCE_LABEL] in input_dict:
kwargs[kw]=input_dict[vw[SOURCE_LABEL]]
else:
kwargs[kw]= get_attr_helper(
obj=memory_dict[vw[SOURCE_LABEL]],
source_handle=vw[SOURCE_PORT_LABEL],
)
)
for kw, vw in total_dict[k].items()
}
)

print("here")
print(kwargs)



memory_dict[k] = fn(**kwargs)

return list(memory_dict.values())


Expand All@@ -274,6 +341,18 @@ def _get_item_from_tuple(input_obj, index, index_lst):


def load_workflow_json(file_name: str) -> Flow:
nodes_new_dict, input_dict, new_total_dict, source_handles_dict = recursive_load_workflow_json(file_name)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
print(task_lst)
return Flow(task_lst, output=task_lst[-1].output)


def recursive_load_workflow_json(file_name: str) -> list:
content = remove_result(
workflow_dict=PythonWorkflowDefinitionWorkflow.load_json_file(
file_name=file_name
Expand All@@ -296,7 +375,10 @@ def load_workflow_json(file_name: str) -> Flow:

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 isinstance(v, str) and ".json" in v:
nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here = recursive_load_workflow_json(file_name=v)
nodes_new_dict[int(k)] = _get_workflow(nodes_new_dict_here, input_dict_here, new_total_dict_here, sources_handles_dict_here)
elif isinstance(v, str) and "." in v:
p, m = v.rsplit(".", 1)
mod = import_module(p)
nodes_new_dict[int(k)] = getattr(mod, m)
Expand All@@ -307,13 +389,10 @@ def load_workflow_json(file_name: str) -> Flow:
total_dict = _group_edges(edges_lst=edges_new_lst)
input_dict = _get_input_dict(nodes_dict=nodes_new_dict)
new_total_dict = _resort_total_lst(total_dict=total_dict, nodes_dict=nodes_new_dict)
task_lst = _get_workflow(
nodes_dict=nodes_new_dict,
input_dict=input_dict,
total_dict=new_total_dict,
source_handles_dict=source_handles_dict,
)
return Flow(task_lst)

# go through the whole list again and update the dicts with the inputs from the outer workflwos

return nodes_new_dict, input_dict, new_total_dict, source_handles_dict


def write_workflow_json(flow: Flow, file_name: str = "workflow.json"):
Expand Down
21 changes: 21 additions & 0 deletions src/python_workflow_definition/models.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,13 +63,34 @@ def check_value_format(cls, v: str):
raise ValueError(msg)
return v

class PythonWorkflowDefinitionWorklowNode(PythonWorkflowDefinitionBaseNode):
"""
Model for function execution nodes.
The 'name' attribute is computed automatically from 'value'.
"""

type: Literal["workflow"]
value: str # Expected format: 'module.function'

@field_validator("value")
@classmethod
def check_value_format(cls, v: str):
if not v or "." not in v or v.startswith(".") or v.endswith("."):
msg = (
"FunctionNode 'value' must be a non-empty string ",
"in 'module.function' format with at least one period.",
)
raise ValueError(msg)
return v


# Discriminated Union for Nodes
PythonWorkflowDefinitionNode = Annotated[
Union[
PythonWorkflowDefinitionInputNode,
PythonWorkflowDefinitionOutputNode,
PythonWorkflowDefinitionFunctionNode,
PythonWorkflowDefinitionWorklowNode
],
Field(discriminator="type"),
]
Expand Down
Loading