-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add CodeNode #992
Merged
Merged
Add CodeNode #992
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ae1333c
Add CodeNode
proteusvacuum 914e864
Add CodeMirror to Python Node
proteusvacuum d42d5a2
Expose the 'main' function to the user
proteusvacuum 363d564
Show input errors in code modal
proteusvacuum 0e00b33
Add **kwargs to default function signature
proteusvacuum File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"description": "Runs python", | ||
"properties": { | ||
"code": { | ||
"default": "# You must define a main function, which takes the node input as a string.\n# Return a string to pass to the next node.\ndef main(input: str, **kwargs) -> str:\n return input\n", | ||
"description": "The code to run", | ||
"title": "Code", | ||
"type": "string", | ||
"ui:widget": "code" | ||
} | ||
}, | ||
"title": "CodeNode", | ||
"type": "object", | ||
"ui:flow_node_type": "pipelineNode", | ||
"ui:label": "Python Node" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
import json | ||
from unittest import mock | ||
|
||
import pytest | ||
|
||
from apps.pipelines.exceptions import PipelineNodeBuildError, PipelineNodeRunError | ||
from apps.pipelines.nodes.base import PipelineState | ||
from apps.pipelines.tests.utils import ( | ||
code_node, | ||
create_runnable, | ||
end_node, | ||
start_node, | ||
) | ||
from apps.utils.factories.pipelines import PipelineFactory | ||
from apps.utils.pytest import django_db_with_data | ||
|
||
|
||
@pytest.fixture() | ||
def pipeline(): | ||
return PipelineFactory() | ||
|
||
|
||
IMPORTS = """ | ||
import json | ||
import datetime | ||
import re | ||
import time | ||
def main(input, **kwargs): | ||
return json.loads(input) | ||
""" | ||
|
||
|
||
@django_db_with_data(available_apps=("apps.service_providers",)) | ||
@mock.patch("apps.pipelines.nodes.base.PipelineNode.logger", mock.Mock()) | ||
@pytest.mark.parametrize( | ||
("code", "input", "output"), | ||
[ | ||
("def main(input, **kwargs):\n\treturn f'Hello, {input}!'", "World", "Hello, World!"), | ||
("", "foo", "foo"), # No code just returns the input | ||
("def main(input, **kwargs):\n\t'foo'", "", "None"), # No return value will return "None" | ||
(IMPORTS, json.dumps({"a": "b"}), str(json.loads('{"a": "b"}'))), # Importing json will work | ||
], | ||
) | ||
def test_code_node(pipeline, code, input, output): | ||
nodes = [ | ||
start_node(), | ||
code_node(code), | ||
end_node(), | ||
] | ||
assert create_runnable(pipeline, nodes).invoke(PipelineState(messages=[input]))["messages"][-1] == output | ||
|
||
|
||
EXTRA_FUNCTION = """ | ||
def other(foo): | ||
return f"other {foo}" | ||
|
||
def main(input, **kwargs): | ||
return other(input) | ||
""" | ||
|
||
|
||
@django_db_with_data(available_apps=("apps.service_providers",)) | ||
@mock.patch("apps.pipelines.nodes.base.PipelineNode.logger", mock.Mock()) | ||
@pytest.mark.parametrize( | ||
("code", "input", "error"), | ||
[ | ||
("this{}", "", "SyntaxError: invalid syntax at statement: 'this{}"), | ||
( | ||
EXTRA_FUNCTION, | ||
"", | ||
( | ||
"You can only define a single function, 'main' at the top level. " | ||
"You may use nested functions inside that function if required" | ||
), | ||
), | ||
("def other(input):\n\treturn input", "", "You must define a 'main' function"), | ||
( | ||
"def main(input, others, **kwargs):\n\treturn input", | ||
"", | ||
r"The main function should have the signature main\(input, \*\*kwargs\) only\.", | ||
), | ||
], | ||
) | ||
def test_code_node_build_errors(pipeline, code, input, error): | ||
nodes = [ | ||
start_node(), | ||
code_node(code), | ||
end_node(), | ||
] | ||
with pytest.raises(PipelineNodeBuildError, match=error): | ||
create_runnable(pipeline, nodes).invoke(PipelineState(messages=[input]))["messages"][-1] | ||
|
||
|
||
@django_db_with_data(available_apps=("apps.service_providers",)) | ||
@mock.patch("apps.pipelines.nodes.base.PipelineNode.logger", mock.Mock()) | ||
@pytest.mark.parametrize( | ||
("code", "input", "error"), | ||
[ | ||
( | ||
"import collections\ndef main(input, **kwargs):\n\treturn input", | ||
"", | ||
"Importing 'collections' is not allowed", | ||
), | ||
("def main(input, **kwargs):\n\treturn f'Hello, {blah}!'", "", "name 'blah' is not defined"), | ||
], | ||
) | ||
def test_code_node_runtime_errors(pipeline, code, input, error): | ||
nodes = [ | ||
start_node(), | ||
code_node(code), | ||
end_node(), | ||
] | ||
with pytest.raises(PipelineNodeRunError, match=error): | ||
create_runnable(pipeline, nodes).invoke(PipelineState(messages=[input]))["messages"][-1] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(not for this PR) It would be nice to have some way of telling/showing the user which builtin modules and imports are available. Maybe we can utilize codemirror's autocomplete