Skip to content

Refactor Nodes to individual files; Add/execute Custom Nodes #70

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.

Sign up for GitHub

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

Merged
reddigari merged 21 commits into from
Apr 26, 2020
Merged

Refactor Nodes to individual files; Add/execute Custom Nodes #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
23f1c40
feat: Upload custom node file
hcat-pge Apr 19, 2020
3e77c5a
feat: Retrieve available custom nodes
hcat-pge Apr 19, 2020
8e27268
feat: Add custom node creation to `node_factory`
hcat-pge Apr 19, 2020
896d3e6
refactor: Merge node listings to one endpoint
hcat-pge Apr 21, 2020
6746f61
feat: Add missing package check on upload
hcat-pge Apr 21, 2020
5f53d5a
refactor: Prep sub-dirs for Node classes
hcat-pge Apr 24, 2020
671c726
refactor: Move /nodes endpoint to /workflow views
hcat-pge Apr 24, 2020
930158c
refactor: Move Node import methods to Workflow
hcat-pge Apr 24, 2020
1eeabfa
Merge branch 'master' into feature/custom-nodes
hcat-pge Apr 24, 2020
a198a05
refactor: Move Node subclasses to individual files
hcat-pge Apr 24, 2020
9c81d52
fix: Re-add intermediate Node classes to inherit color
hcat-pge Apr 24, 2020
316af59
test: Update test to use new 'node_type' value
hcat-pge Apr 24, 2020
071d4a4
refactor: Generalize `upload` endpoint to accept Node and data files
hcat-pge Apr 24, 2020
551f8c2
refactor: Clean up Node parsing; remove print statements
hcat-pge Apr 24, 2020
8202042
chore: Update Pipfile.lock after pipenv install
hcat-pge Apr 24, 2020
e54b897
doc: Add information about Node-parsing methods
hcat-pge Apr 24, 2020
d6eb934
fix: Change Workflow accessors from private->public attributes
hcat-pge Apr 24, 2020
d64d9a3
fix: Use filename attribute for all Nodes
hcat-pge Apr 24, 2020
4961eb0
test: Update Postman runner with new `node_type` IDs
hcat-pge Apr 24, 2020
3b970af
refactor: unified `set_dir()` to make dirs; catch OSError on init
hcat-pge Apr 25, 2020
983a3ae
fix: Typo in 'custom_nodes'
hcat-pge Apr 25, 2020
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
123 changes: 59 additions & 64 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Postman/PyWorkflow-runner.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"name\": null,\n \"node_id\": \"1\",\n \"node_type\": \"IONode\",\n \"node_key\": \"ReadCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample.csv\"\n }\n}",
"raw": "{\n \"name\": null,\n \"node_id\": \"1\",\n \"node_type\": \"io\",\n \"node_key\": \"ReadCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample.csv\",\n \t\"sep\": \",\"\n }\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -132,7 +132,7 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"name\": null,\n \"node_id\": \"2\",\n \"node_type\": \"IONode\",\n \"node_key\": \"ReadCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample2.csv\"\n }\n}",
"raw": "{\n \"name\": null,\n \"node_id\": \"2\",\n \"node_type\": \"io\",\n \"node_key\": \"ReadCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample2.csv\"\n }\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -180,7 +180,7 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"name\": null,\n \"node_id\": \"3\",\n \"node_type\": \"ManipulationNode\",\n \"node_key\": \"JoinNode\",\n \"options\": {\n \t\"on\": \"key\"\n }\n}",
"raw": "{\n \"name\": null,\n \"node_id\": \"3\",\n \"node_type\": \"manipulation\",\n \"node_key\": \"JoinNode\",\n \"options\": {\n \t\"on\": \"key\"\n }\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -228,7 +228,7 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"name\": null,\n \"node_id\": \"4\",\n \"node_type\": \"IONode\",\n \"node_key\": \"WriteCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample_out.csv\"\n }\n}",
"raw": "{\n \"name\": null,\n \"node_id\": \"4\",\n \"node_type\": \"io\",\n \"node_key\": \"WriteCsvNode\",\n \"options\": {\n \t\"file\": \"/tmp/sample_out.csv\"\n }\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -276,7 +276,7 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"name\": null,\n \"node_id\": \"4\",\n \"node_type\": \"IONode\",\n \"node_key\": \"WriteCsvNode\",\n \"options\": {\n \t\"path_or_buf\": \"/tmp/sample_out.csv\"\n }\n}",
"raw": "{\n \"name\": null,\n \"node_id\": \"4\",\n \"node_type\": \"io\",\n \"node_key\": \"WriteCsvNode\",\n \"options\": {\n \t\"path_or_buf\": \"/tmp/sample_out.csv\"\n }\n}",
"options": {
"raw": {
"language": "json"
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/API.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export async function save(diagramData) {
* @returns {Promise<Object>} - server response (node menu items)
*/
export async function getNodes() {
return fetchWrapper("/nodes");
return fetchWrapper("/workflow/nodes");
}


Expand Down
Loading