From a125c87533fb3c65469efbc7ebf510d1fb29210b Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 11:55:51 +0800 Subject: [PATCH 1/9] Add 'persist' and 'streaming' component parameters to Data drops. Remove parameters from the schema. Remove parameters from xml2palette. --- .../dlg/data/drops/dataDummy_drop.py | 2 + .../dlg/data/drops/environmentvar_drop.py | 2 + daliuge-engine/dlg/data/drops/file.py | 5 +- daliuge-engine/dlg/data/drops/memory.py | 4 + daliuge-engine/dlg/data/drops/ngas.py | 2 + daliuge-engine/dlg/data/drops/parset_drop.py | 2 + daliuge-engine/dlg/data/drops/s3_drop.py | 2 + daliuge-engine/dlg/drop.py | 2 + .../dlg/dropmake/lg.graph.schema | 115 ++++++++---------- tools/xml2palette/xml2palette.py | 3 - 10 files changed, 69 insertions(+), 70 deletions(-) diff --git a/daliuge-engine/dlg/data/drops/dataDummy_drop.py b/daliuge-engine/dlg/data/drops/dataDummy_drop.py index 9457fd5db..91e285a74 100644 --- a/daliuge-engine/dlg/data/drops/dataDummy_drop.py +++ b/daliuge-engine/dlg/data/drops/dataDummy_drop.py @@ -42,6 +42,8 @@ # @param dataclass Application Class//String/ComponentParameter/readonly//False/False/Data class # @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-engine/dlg/data/drops/environmentvar_drop.py b/daliuge-engine/dlg/data/drops/environmentvar_drop.py index 4df20fdb2..45f068f17 100644 --- a/daliuge-engine/dlg/data/drops/environmentvar_drop.py +++ b/daliuge-engine/dlg/data/drops/environmentvar_drop.py @@ -66,6 +66,8 @@ def _filter_parameters(parameters: dict): # @par EAGLE_START # @param category EnvironmentVariables # @param tag daliuge +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END class EnvironmentVarDROP(AbstractDROP, KeyValueDROP): diff --git a/daliuge-engine/dlg/data/drops/file.py b/daliuge-engine/dlg/data/drops/file.py index 596fcb34b..a558a0d87 100644 --- a/daliuge-engine/dlg/data/drops/file.py +++ b/daliuge-engine/dlg/data/drops/file.py @@ -40,9 +40,12 @@ # @param tag daliuge # @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? -# @param check_filepath_exists Check file path exists/True/Boolean/ComponentParameter/readwrite//False/False/Perform a check to make sure the file path exists before proceeding with the application +# @param delete_parent_directory Delete parent directory/False/Boolean/ComponentParameter/readwrite//False/False/Also delete the parent directory of this file when deleting the file itself +# @param check_filepath_exists Check file path exists/False/Boolean/ComponentParameter/readwrite//False/False/Perform a check to make sure the file path exists before proceeding with the application # @param filepath File Path//String/ComponentParameter/readwrite//False/False/Path to the file for this node # @param dirname Directory name//String/ComponentParameter/readwrite//False/False/Path to the file for this node +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/True/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-engine/dlg/data/drops/memory.py b/daliuge-engine/dlg/data/drops/memory.py index d0a819d28..a35bdcbde 100644 --- a/daliuge-engine/dlg/data/drops/memory.py +++ b/daliuge-engine/dlg/data/drops/memory.py @@ -39,6 +39,8 @@ # @param tag daliuge # @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END @@ -101,6 +103,8 @@ def generate_reproduce_data(self): # @param tag daliuge # @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-engine/dlg/data/drops/ngas.py b/daliuge-engine/dlg/data/drops/ngas.py index cf99056b2..4b823f942 100644 --- a/daliuge-engine/dlg/data/drops/ngas.py +++ b/daliuge-engine/dlg/data/drops/ngas.py @@ -39,6 +39,8 @@ # @param ngasConnectTimeout Connection timeout/2/Integer/ComponentParameter/readwrite//False/False/Timeout for connecting to the NGAS server # @param ngasMime NGAS mime-type/"text/ascii"/String/ComponentParameter/readwrite//False/False/Mime-type to be used for archiving # @param ngasTimeout NGAS timeout/2/Integer/ComponentParameter/readwrite//False/False/Timeout for receiving responses for NGAS +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-engine/dlg/data/drops/parset_drop.py b/daliuge-engine/dlg/data/drops/parset_drop.py index bc26ad22a..e6bf4da28 100644 --- a/daliuge-engine/dlg/data/drops/parset_drop.py +++ b/daliuge-engine/dlg/data/drops/parset_drop.py @@ -38,6 +38,8 @@ # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? # @param mode Parset mode/"YANDA"/String/ComponentParameter/readonly//False/False/To what standard DALiuGE should filter and serialize the parameters. # @param config_data ConfigData/""/String/ComponentParameter/readwrite//False/False/Additional configuration information to be mixed in with the initial data +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param Config ConfigFile//Object.File/OutputPort/readwrite//False/False/The output configuration file # @par EAGLE_END class ParameterSetDROP(DataDROP): diff --git a/daliuge-engine/dlg/data/drops/s3_drop.py b/daliuge-engine/dlg/data/drops/s3_drop.py index d55875c7f..cac7e0ad0 100644 --- a/daliuge-engine/dlg/data/drops/s3_drop.py +++ b/daliuge-engine/dlg/data/drops/s3_drop.py @@ -53,6 +53,8 @@ # @param object_name Object Name//String/ComponentParameter/readwrite//False/False/The S3 object key # @param profile_name Profile Name//String/ComponentParameter/readwrite//False/False/The S3 profile name # @param endpoint_url Endpoint URL//String/ComponentParameter/readwrite//False/False/The URL exposing the S3 REST API +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-engine/dlg/drop.py b/daliuge-engine/dlg/drop.py index 6c68fda8b..78cfd40f7 100644 --- a/daliuge-engine/dlg/drop.py +++ b/daliuge-engine/dlg/drop.py @@ -1199,6 +1199,8 @@ def path(self) -> str: # @param dataclass Data Class/my.awesome.data.Component/String/ComponentParameter/readonly//False/False/The python class that implements this data component # @param data_volume Data volume/5/Float/ComponentParameter/readwrite//False/False/Estimated size of the data contained in this node # @param group_end Group end/False/Boolean/ComponentParameter/readwrite//False/False/Is this node the end of a group? +# @param streaming Streaming/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component streams input and output data +# @param persist Persist/False/Boolean/ComponentParameter/readwrite//False/False/Specifies whether this data component contains data that should not be deleted after execution # @param dummy dummy//Object/InputPort/readwrite//False/False/Dummy input port # @param dummy dummy//Object/OutputPort/readwrite//False/False/Dummy output port # @par EAGLE_END diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema index 691ccd739..d11634288 100644 --- a/daliuge-translator/dlg/dropmake/lg.graph.schema +++ b/daliuge-translator/dlg/dropmake/lg.graph.schema @@ -5,9 +5,6 @@ "modelData": { "type": "object", "properties": { - "fileType": { - "type": "string" - }, "repoService": { "type": "string" }, @@ -23,10 +20,7 @@ "filePath": { "type": "string" }, - "sha": { - "type": "string" - }, - "gitUrl": { + "fileType": { "type": "string" }, "eagleVersion": { @@ -49,23 +43,38 @@ }, "numLGNodes": { "type": "integer" + }, + "commitHash": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "repositoryUrl": { + "type": "string" + }, + "signature": { + "type": "string" } }, "required": [ "filePath", "fileType", - "gitUrl", "readonly", "repo", "repoBranch", "repoService", - "sha", "eagleVersion", "eagleCommitHash", "schemaVersion", "lastModifiedName", "lastModifiedEmail", - "lastModifiedDatetime" + "lastModifiedDatetime", + "numLGNodes", + "commitHash", + "downloadUrl", + "repositoryUrl", + "signature" ] }, "nodeDataArray": { @@ -82,6 +91,12 @@ "color": { "type": "string" }, + "commitHash": { + "type": "string" + }, + "dataHash": { + "type": "string" + }, "drawOrderHint": { "type": "integer" }, @@ -109,22 +124,12 @@ "collapsed": { "type": "boolean" }, - "streaming": { - "type": "boolean" - }, "subject": { "type": "null" }, "expanded": { "type": "boolean" }, - "precious": { - "type": "boolean", - "deprecated": true - }, - "persist": { - "type": "boolean" - }, "inputApplicationName": { "type": "string" }, @@ -261,6 +266,12 @@ ] } }, + "paletteDownloadUrl": { + "type": "string" + }, + "repositoryUrl": { + "type": "string" + }, "fields": { "type": "array", "items": { @@ -296,58 +307,20 @@ "positional": { "type": "boolean", "default": false - } - }, - "required": [ - "description", - "name", - "text", - "value" - ] - } - }, - "applicationArgs": { - "type": "array", - "items": { - "type": "object", - "properties": { - "text": { - "type": "string" }, - "name": { - "type": "string" - }, - "value": { - "type": ["string","boolean","number", "null"] - }, - "defaultValue": { - "type": ["string","boolean","number", "null"] - }, - "description": { - "type": "string" - }, - "readonly": { + "keyAttribute": { "type": "boolean" - }, - "type": { - "type": "string" - }, - "precious": { - "type": "boolean" - }, - "options": { - "type": "array" - }, - "positional": { - "type": "boolean", - "default": false } }, "required": [ "description", "name", "text", - "value" + "value", + "type", + "precious", + "options", + "positional" ] } }, @@ -359,11 +332,12 @@ "category", "collapsed", "color", + "commitHash", + "dataHash", "description", "drawOrderHint", "expanded", "fields", - "applicationArgs", "height", "inputAppFields", "inputApplicationName", @@ -377,7 +351,8 @@ "outputApplicationType", "outputLocalPorts", "outputPorts", - "streaming", + "paletteDownloadUrl", + "repositoryUrl", "subject", "text", "width", @@ -391,6 +366,12 @@ "items": { "type": "object", "properties": { + "closesLoop": { + "type": "boolean" + }, + "dataType": { + "type": "string" + }, "from": { "type": "integer" }, @@ -408,6 +389,8 @@ } }, "required": [ + "closesLoop", + "dataType", "from", "fromPort", "to", diff --git a/tools/xml2palette/xml2palette.py b/tools/xml2palette/xml2palette.py index bf88c5af6..27819dc99 100755 --- a/tools/xml2palette/xml2palette.py +++ b/tools/xml2palette/xml2palette.py @@ -661,7 +661,6 @@ def create_palette_node_from_params(params) -> dict: "description": comp_description, "collapsed": False, "showPorts": False, - "streaming": False, "subject": None, "selected": False, "expanded": False, @@ -1213,8 +1212,6 @@ def create_construct_node(node_type:str, node:dict)-> dict: "paletteDownloadUrl": "", "dataHash": "", "key": get_next_key(), - "precious": False, - "streaming": False, "text": node_type + "/" + node["text"], } From 625c79f536b6bdbc586fb5cda4cdda15c4c84e42 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 12:24:55 +0800 Subject: [PATCH 2/9] Switch back to old schema --- .../dlg/dropmake/lg.graph.schema | 115 ++++++++++-------- 1 file changed, 66 insertions(+), 49 deletions(-) diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema index d11634288..691ccd739 100644 --- a/daliuge-translator/dlg/dropmake/lg.graph.schema +++ b/daliuge-translator/dlg/dropmake/lg.graph.schema @@ -5,6 +5,9 @@ "modelData": { "type": "object", "properties": { + "fileType": { + "type": "string" + }, "repoService": { "type": "string" }, @@ -20,7 +23,10 @@ "filePath": { "type": "string" }, - "fileType": { + "sha": { + "type": "string" + }, + "gitUrl": { "type": "string" }, "eagleVersion": { @@ -43,38 +49,23 @@ }, "numLGNodes": { "type": "integer" - }, - "commitHash": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "repositoryUrl": { - "type": "string" - }, - "signature": { - "type": "string" } }, "required": [ "filePath", "fileType", + "gitUrl", "readonly", "repo", "repoBranch", "repoService", + "sha", "eagleVersion", "eagleCommitHash", "schemaVersion", "lastModifiedName", "lastModifiedEmail", - "lastModifiedDatetime", - "numLGNodes", - "commitHash", - "downloadUrl", - "repositoryUrl", - "signature" + "lastModifiedDatetime" ] }, "nodeDataArray": { @@ -91,12 +82,6 @@ "color": { "type": "string" }, - "commitHash": { - "type": "string" - }, - "dataHash": { - "type": "string" - }, "drawOrderHint": { "type": "integer" }, @@ -124,12 +109,22 @@ "collapsed": { "type": "boolean" }, + "streaming": { + "type": "boolean" + }, "subject": { "type": "null" }, "expanded": { "type": "boolean" }, + "precious": { + "type": "boolean", + "deprecated": true + }, + "persist": { + "type": "boolean" + }, "inputApplicationName": { "type": "string" }, @@ -266,12 +261,6 @@ ] } }, - "paletteDownloadUrl": { - "type": "string" - }, - "repositoryUrl": { - "type": "string" - }, "fields": { "type": "array", "items": { @@ -307,20 +296,58 @@ "positional": { "type": "boolean", "default": false + } + }, + "required": [ + "description", + "name", + "text", + "value" + ] + } + }, + "applicationArgs": { + "type": "array", + "items": { + "type": "object", + "properties": { + "text": { + "type": "string" }, - "keyAttribute": { + "name": { + "type": "string" + }, + "value": { + "type": ["string","boolean","number", "null"] + }, + "defaultValue": { + "type": ["string","boolean","number", "null"] + }, + "description": { + "type": "string" + }, + "readonly": { "type": "boolean" + }, + "type": { + "type": "string" + }, + "precious": { + "type": "boolean" + }, + "options": { + "type": "array" + }, + "positional": { + "type": "boolean", + "default": false } }, "required": [ "description", "name", "text", - "value", - "type", - "precious", - "options", - "positional" + "value" ] } }, @@ -332,12 +359,11 @@ "category", "collapsed", "color", - "commitHash", - "dataHash", "description", "drawOrderHint", "expanded", "fields", + "applicationArgs", "height", "inputAppFields", "inputApplicationName", @@ -351,8 +377,7 @@ "outputApplicationType", "outputLocalPorts", "outputPorts", - "paletteDownloadUrl", - "repositoryUrl", + "streaming", "subject", "text", "width", @@ -366,12 +391,6 @@ "items": { "type": "object", "properties": { - "closesLoop": { - "type": "boolean" - }, - "dataType": { - "type": "string" - }, "from": { "type": "integer" }, @@ -389,8 +408,6 @@ } }, "required": [ - "closesLoop", - "dataType", "from", "fromPort", "to", From 7019fdc4bd03e8dafb4c9665e3d8ec07ef2b59f6 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 14:09:32 +0800 Subject: [PATCH 3/9] Attempt to pin pyarrow to version 9.0 to avoid issue with new version --- daliuge-engine/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daliuge-engine/setup.py b/daliuge-engine/setup.py index 5fd9fb0b7..365b42321 100644 --- a/daliuge-engine/setup.py +++ b/daliuge-engine/setup.py @@ -131,7 +131,7 @@ def run(self): "overrides", "paramiko", "psutil", - "pyarrow", + "pyarrow==9.0", "python-daemon", "pyzmq ~= 22.3.0", "scp", From 068fa91ead1556d357d66373dfbd4a33caa74bc7 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 14:19:14 +0800 Subject: [PATCH 4/9] Switch back to the new schema --- .../dlg/dropmake/lg.graph.schema | 115 ++++++++---------- 1 file changed, 49 insertions(+), 66 deletions(-) diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema index 691ccd739..d11634288 100644 --- a/daliuge-translator/dlg/dropmake/lg.graph.schema +++ b/daliuge-translator/dlg/dropmake/lg.graph.schema @@ -5,9 +5,6 @@ "modelData": { "type": "object", "properties": { - "fileType": { - "type": "string" - }, "repoService": { "type": "string" }, @@ -23,10 +20,7 @@ "filePath": { "type": "string" }, - "sha": { - "type": "string" - }, - "gitUrl": { + "fileType": { "type": "string" }, "eagleVersion": { @@ -49,23 +43,38 @@ }, "numLGNodes": { "type": "integer" + }, + "commitHash": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "repositoryUrl": { + "type": "string" + }, + "signature": { + "type": "string" } }, "required": [ "filePath", "fileType", - "gitUrl", "readonly", "repo", "repoBranch", "repoService", - "sha", "eagleVersion", "eagleCommitHash", "schemaVersion", "lastModifiedName", "lastModifiedEmail", - "lastModifiedDatetime" + "lastModifiedDatetime", + "numLGNodes", + "commitHash", + "downloadUrl", + "repositoryUrl", + "signature" ] }, "nodeDataArray": { @@ -82,6 +91,12 @@ "color": { "type": "string" }, + "commitHash": { + "type": "string" + }, + "dataHash": { + "type": "string" + }, "drawOrderHint": { "type": "integer" }, @@ -109,22 +124,12 @@ "collapsed": { "type": "boolean" }, - "streaming": { - "type": "boolean" - }, "subject": { "type": "null" }, "expanded": { "type": "boolean" }, - "precious": { - "type": "boolean", - "deprecated": true - }, - "persist": { - "type": "boolean" - }, "inputApplicationName": { "type": "string" }, @@ -261,6 +266,12 @@ ] } }, + "paletteDownloadUrl": { + "type": "string" + }, + "repositoryUrl": { + "type": "string" + }, "fields": { "type": "array", "items": { @@ -296,58 +307,20 @@ "positional": { "type": "boolean", "default": false - } - }, - "required": [ - "description", - "name", - "text", - "value" - ] - } - }, - "applicationArgs": { - "type": "array", - "items": { - "type": "object", - "properties": { - "text": { - "type": "string" }, - "name": { - "type": "string" - }, - "value": { - "type": ["string","boolean","number", "null"] - }, - "defaultValue": { - "type": ["string","boolean","number", "null"] - }, - "description": { - "type": "string" - }, - "readonly": { + "keyAttribute": { "type": "boolean" - }, - "type": { - "type": "string" - }, - "precious": { - "type": "boolean" - }, - "options": { - "type": "array" - }, - "positional": { - "type": "boolean", - "default": false } }, "required": [ "description", "name", "text", - "value" + "value", + "type", + "precious", + "options", + "positional" ] } }, @@ -359,11 +332,12 @@ "category", "collapsed", "color", + "commitHash", + "dataHash", "description", "drawOrderHint", "expanded", "fields", - "applicationArgs", "height", "inputAppFields", "inputApplicationName", @@ -377,7 +351,8 @@ "outputApplicationType", "outputLocalPorts", "outputPorts", - "streaming", + "paletteDownloadUrl", + "repositoryUrl", "subject", "text", "width", @@ -391,6 +366,12 @@ "items": { "type": "object", "properties": { + "closesLoop": { + "type": "boolean" + }, + "dataType": { + "type": "string" + }, "from": { "type": "integer" }, @@ -408,6 +389,8 @@ } }, "required": [ + "closesLoop", + "dataType", "from", "fromPort", "to", From be13189ffc0ae0c105285475c2db3000e12b3d23 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 15:29:50 +0800 Subject: [PATCH 5/9] Modified all graphs to move 'streaming' and 'persist' attribute to fields. --- OpenAPI/tests/test.graph | 32 +++++-- .../test/reproducibility/testSingle.graph | 1 - .../topoGraphs/computationSandwich.graph | 16 +++- .../reproducibility/topoGraphs/dataFan.graph | 43 ++++++++- .../topoGraphs/dataFunnel.graph | 43 ++++++++- .../topoGraphs/dataSandwich.graph | 26 ++++++ .../topoGraphs/testCycle.graph | 4 - .../topoGraphs/testSingle.graph | 1 - .../topoGraphs/testTwoEnd.graph | 3 - .../topoGraphs/testTwoLines.graph | 4 - .../topoGraphs/testTwoStart.graph | 3 - .../logical_graphs/HelloWorld_simple.graph | 13 +++ .../dropmake/logical_graphs/Plasma-test.graph | 32 +++++-- .../dropmake/logical_graphs/Plasma_test.graph | 26 ++++++ .../logical_graphs/SharedMemoryTest.graph | 16 ---- .../logical_graphs/chiles_simple.graph | 50 ---------- .../dropmake/logical_graphs/cont_img.graph | 93 +------------------ .../logical_graphs/eagle_gather.graph | 26 ++++++ .../logical_graphs/eagle_gather_empty.graph | 33 +++---- .../logical_graphs/eagle_gather_simple.graph | 67 +++++++------ .../logical_graphs/leap_cli_dir_appRef.graph | 76 ++++++++++++--- .../dropmake/logical_graphs/lofar_std.graph | 4 - .../test/dropmake/logical_graphs/nagsIo.graph | 3 - .../dropmake/logical_graphs/simpleMKN.graph | 4 - .../logical_graphs/test-20190830-110556.graph | 13 +++ .../dropmake/logical_graphs/testLoop.graph | 53 ++++++----- .../logical_graphs/test_grpby_gather.graph | 43 +-------- .../reproGraphs/HelloSBash.graph | 43 ++++++++- .../reproGraphs/HelloSPython.graph | 30 +++++- .../reproGraphs/HelloSPython2.graph | 30 +++++- .../reproGraphs/HelloWorldBash.graph | 43 ++++++++- .../reproGraphs/HelloWorldBashSplit.graph | 43 ++++++++- .../reproGraphs/HelloWorldFile.graph | 14 ++- .../reproducibility/reproGraphs/apps.graph | 10 -- .../reproducibility/reproGraphs/files.graph | 19 ++-- .../reproGraphs/groupUse.graph | 2 - .../reproducibility/reproGraphs/groups.graph | 14 --- .../reproducibility/reproGraphs/misc.graph | 6 -- .../reproGraphs/simpleNoScatter.graph | 52 +++++++++++ .../reproGraphs/simpleScatter.graph | 54 ++++++++++- 40 files changed, 694 insertions(+), 394 deletions(-) diff --git a/OpenAPI/tests/test.graph b/OpenAPI/tests/test.graph index a492b6bf2..d388c4430 100644 --- a/OpenAPI/tests/test.graph +++ b/OpenAPI/tests/test.graph @@ -33,8 +33,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -235,8 +233,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -304,6 +300,19 @@ "readonly": false, "type": "Unknown", "precious": false + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "applicationArgs": [], @@ -337,8 +346,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -386,6 +393,19 @@ "readonly": false, "type": "Unknown", "precious": false + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "applicationArgs": [], diff --git a/daliuge-engine/test/reproducibility/testSingle.graph b/daliuge-engine/test/reproducibility/testSingle.graph index 8382b4eb2..54f5fbae6 100644 --- a/daliuge-engine/test/reproducibility/testSingle.graph +++ b/daliuge-engine/test/reproducibility/testSingle.graph @@ -74,7 +74,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph b/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph index 88141cc67..40a402c71 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph @@ -104,7 +104,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -165,6 +164,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -201,7 +213,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -283,7 +294,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph index 113d1a292..197752e61 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph @@ -118,7 +118,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -179,6 +178,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -208,7 +220,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -269,6 +280,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -298,7 +322,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -359,6 +382,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -388,7 +424,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph index 1273671ff..d18a7fe26 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph @@ -90,6 +90,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -119,7 +132,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -214,7 +226,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -275,6 +286,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -304,7 +328,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -365,6 +388,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -394,7 +430,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph index b67a95c5c..bd905c98f 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph @@ -172,6 +172,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -262,6 +275,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph b/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph index ce29bd624..f46b9b136 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph @@ -99,7 +99,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -170,7 +169,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -241,7 +239,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -312,7 +309,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph b/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph index 8382b4eb2..54f5fbae6 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph @@ -74,7 +74,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph index a6f6f6b79..f09b625a4 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph @@ -91,7 +91,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -162,7 +161,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -233,7 +231,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph index 4f447002b..e472e4f5e 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph @@ -87,7 +87,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -158,7 +157,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -229,7 +227,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -300,7 +297,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph index c30ddb125..68bc34820 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph @@ -87,7 +87,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -162,7 +161,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -233,7 +231,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph index 7e0a431e1..be07d4cdd 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph @@ -187,6 +187,19 @@ "description": "", "readonly": false, "type": "Unknown" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph index 8faa1bc6d..4901bce21 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph @@ -32,7 +32,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -105,7 +104,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -194,7 +192,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -250,6 +247,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -284,7 +294,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -373,7 +382,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -436,6 +444,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -470,7 +491,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph index cd897e2a4..6ea85d12c 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph @@ -250,6 +250,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -436,6 +449,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], diff --git a/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph b/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph index b0cacc65e..b91be0b1c 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph @@ -143,10 +143,8 @@ "type": "String" } ], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Python App", "width": 200, @@ -218,10 +216,8 @@ "type": "String" } ], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Shared Memory", "width": 200, @@ -313,10 +309,8 @@ "type": "String" } ], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Python App", "width": 200, @@ -408,10 +402,8 @@ "type": "String" } ], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Python App", "width": 200, @@ -503,10 +495,8 @@ "type": "String" } ], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Python App", "width": 200, @@ -569,10 +559,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Shared Memory", "width": 200, @@ -635,10 +623,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Shared Memory", "width": 200, @@ -701,10 +687,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": false, "sha": "", - "streaming": false, "subject": null, "text": "Shared Memory", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph index c59ce2e34..ba142da35 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph @@ -270,10 +270,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Start", "width": 200, @@ -321,10 +319,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "", "width": 200, @@ -372,10 +368,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "", "width": 200, @@ -441,10 +435,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day1", "width": 200, @@ -642,10 +634,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "MST", "width": 200, @@ -711,10 +701,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day1-Split1", "width": 200, @@ -771,10 +759,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1004,10 +990,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "CLEAN", "width": 200, @@ -1073,10 +1057,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day2", "width": 200, @@ -1142,10 +1124,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day3", "width": 200, @@ -1211,10 +1191,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day4", "width": 200, @@ -1280,10 +1258,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day5", "width": 200, @@ -1481,10 +1457,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "MST", "width": 200, @@ -1682,10 +1656,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "MST", "width": 200, @@ -1883,10 +1855,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "MST", "width": 200, @@ -2084,10 +2054,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "MST", "width": 200, @@ -2153,10 +2121,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day2-Split1", "width": 200, @@ -2222,10 +2188,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day3-Split1", "width": 200, @@ -2291,10 +2255,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day4-Split1", "width": 200, @@ -2360,10 +2322,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Day5-Split1", "width": 200, @@ -2561,10 +2521,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Copy", "width": 200, @@ -2762,10 +2720,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Copy", "width": 200, @@ -2963,10 +2919,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Copy", "width": 200, @@ -3164,10 +3118,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Copy", "width": 200, @@ -3365,10 +3317,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Copy", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph index abc82b4ed..725b8940c 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph @@ -371,10 +371,8 @@ "type": "Boolean" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Self-Cal\nConverge?", "width": 200, @@ -429,10 +427,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Update GSM", "width": 200, @@ -487,10 +483,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Update LSM", "width": 200, @@ -545,10 +539,9 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, + , "subject": null, "text": "Cal. Source\nFinding", "width": 200, @@ -603,10 +596,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Image Plane\nSpectral Averaging", "width": 200, @@ -670,10 +661,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Predict 01", "width": 200, @@ -735,10 +724,8 @@ "type": "string" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Solve", "width": 200, @@ -793,10 +780,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Correct", "width": 200, @@ -867,10 +852,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Subtract", "width": 200, @@ -925,10 +908,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Flag", "width": 200, @@ -983,10 +964,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "iFFT", "width": 200, @@ -1048,10 +1027,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "deGrid", "width": 200, @@ -1122,10 +1099,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Subtract", "width": 200, @@ -1180,10 +1155,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Flag", "width": 200, @@ -1238,10 +1211,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "FFT", "width": 200, @@ -1296,10 +1267,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Subtract \ncompnt frm\nimg plane", "width": 200, @@ -1345,10 +1314,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "End", "width": 200, @@ -1412,10 +1379,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Calibration\nParameters", "width": 200, @@ -1487,10 +1452,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1562,10 +1525,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1637,10 +1598,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1712,10 +1671,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1787,10 +1744,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1862,10 +1817,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1937,10 +1890,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -1988,10 +1939,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Minor Cycle", "width": 709, @@ -2143,10 +2092,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Identify\nComponent", "width": 200, @@ -2218,10 +2165,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Model", "width": 200, @@ -2300,10 +2245,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Image", "width": 200, @@ -2351,10 +2294,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Major Cycle", "width": 1217, @@ -2426,10 +2367,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -2501,10 +2440,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Model Vis", "width": 200, @@ -2576,10 +2513,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Residul Vis", "width": 200, @@ -2643,10 +2578,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "FRV", "width": 200, @@ -2726,10 +2659,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Data", "width": 200, @@ -2881,10 +2812,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Grid", "width": 200, @@ -2956,10 +2885,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "CC", "width": 200, @@ -3030,10 +2957,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "GSM", "width": 200, @@ -3097,10 +3022,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Raw Vis", "width": 200, @@ -3147,10 +3070,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Self-Cal Cycle", "width": 1885, @@ -3222,10 +3143,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "LSM", "width": 200, @@ -3377,10 +3296,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Check Conv", "width": 200, @@ -3452,10 +3369,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "result", "width": 200, @@ -3526,10 +3441,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Start Data ", "width": 200, @@ -3575,10 +3488,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Start", "width": 200, @@ -3722,10 +3633,8 @@ "type": "" } ], - "persist": false, "readonly": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Predict 02", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph index fc9839582..c4bd1e679 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph @@ -967,6 +967,19 @@ "readonly": false, "type": "Unknown", "precious": false + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "applicationArgs": [], @@ -1352,6 +1365,19 @@ "readonly": false, "type": "Unknown", "precious": false + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "applicationArgs": [], diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph index c3e4f67ea..ca2de75d2 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph @@ -33,8 +33,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -116,8 +114,6 @@ "height": 432, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -337,8 +333,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -530,8 +524,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -613,8 +605,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -696,8 +686,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -888,8 +876,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -967,6 +953,19 @@ "readonly": false, "type": "Unknown", "precious": false + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "applicationArgs": [], @@ -1000,8 +999,6 @@ "height": 200, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1221,8 +1218,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1273,8 +1268,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph index d2671f4d8..5a95e841b 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph @@ -32,8 +32,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -107,8 +105,6 @@ "collapsed": false, "showPorts": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": true, "expanded": true, @@ -222,8 +218,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -297,8 +291,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -372,8 +364,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -429,6 +419,19 @@ "description": "", "readonly": false, "type": "Unknown" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -463,8 +466,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": true, @@ -570,8 +571,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -645,8 +644,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -720,8 +717,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": true, @@ -827,8 +822,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -885,6 +878,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -919,8 +925,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -1018,8 +1022,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -1123,8 +1125,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": true, @@ -1230,8 +1230,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, @@ -1288,6 +1286,19 @@ "description": "Name of the directory containing the file for this node", "readonly": false, "type": "String" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], diff --git a/daliuge-translator/test/dropmake/logical_graphs/leap_cli_dir_appRef.graph b/daliuge-translator/test/dropmake/logical_graphs/leap_cli_dir_appRef.graph index bb7f1254b..c74b09c95 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/leap_cli_dir_appRef.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/leap_cli_dir_appRef.graph @@ -104,7 +104,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Direction Scatter", "width": 585, @@ -144,7 +143,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Gather", "width": 200, @@ -202,6 +200,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -229,7 +240,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "IntermediateResult", "width": 200, @@ -287,6 +297,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -314,7 +337,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Phase Vector", "width": 200, @@ -353,7 +375,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "", "width": 199.58141986216643, @@ -411,6 +432,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -438,7 +472,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "ConfigFile", "width": 200, @@ -561,7 +594,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "LeapAccelerateCLI", "width": 200, @@ -619,6 +651,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -639,7 +684,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "directions.csv", "width": 200, @@ -697,6 +741,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -717,7 +774,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "MS", "width": 200, @@ -826,7 +882,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Produce Config.", "width": 200, @@ -903,7 +958,6 @@ "readonly": true, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "LEAPGather", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph b/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph index 53feebc13..e066f1033 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph @@ -33,8 +33,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -87,8 +85,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, diff --git a/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph b/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph index 2d414d576..c57718b20 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph @@ -32,7 +32,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -122,7 +121,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -204,7 +202,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph b/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph index d01a2c541..b22ed62ce 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph @@ -27,7 +27,6 @@ "height": 252.30527217275548, "collapsed": false, "showPorts": true, - "streaming": false, "subject": null, "selected": true, "expanded": true, @@ -152,7 +151,6 @@ "height": 200, "collapsed": false, "showPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -230,7 +228,6 @@ "height": 200, "collapsed": false, "showPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -284,7 +281,6 @@ "height": 200, "collapsed": false, "showPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph b/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph index fc394dacb..184d8c788 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph @@ -319,6 +319,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph b/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph index 4afbfd95b..8b55d3258 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph @@ -45,7 +45,7 @@ "defaultValue": "", "description": "", "name": "num_of_iter", - "persist": false, + "precious": false, "readonly": false, "text": "Number loops", "type": "Unknown", @@ -95,10 +95,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Loop", "width": 385.98717625064404, @@ -118,7 +116,7 @@ "defaultValue": "", "description": "", "name": "execution_time", - "persist": false, + "precious": false, "readonly": false, "text": "Execution time", "type": "Unknown", @@ -128,7 +126,7 @@ "defaultValue": "", "description": "", "name": "num_cpus", - "persist": false, + "precious": false, "readonly": false, "text": "Num CPUs", "type": "Unknown", @@ -138,7 +136,7 @@ "defaultValue": "", "description": "", "name": "group_start", - "persist": false, + "precious": false, "readonly": false, "text": "Group start", "type": "Unknown", @@ -148,7 +146,7 @@ "defaultValue": "", "description": "The command line to be executed", "name": "Arg01", - "persist": false, + "precious": false, "readonly": false, "text": "Arg01", "type": "Unknown", @@ -158,7 +156,7 @@ "defaultValue": "sleep", "description": "", "name": "command", - "persist": false, + "precious": false, "readonly": false, "text": "command", "type": "String", @@ -200,10 +198,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "SleepExternal", "width": 200, @@ -223,7 +219,7 @@ "defaultValue": "", "description": "", "name": "execution_time", - "persist": false, + "precious": false, "readonly": false, "text": "Execution time", "type": "Unknown", @@ -233,7 +229,7 @@ "defaultValue": "", "description": "", "name": "num_cpus", - "persist": false, + "precious": false, "readonly": false, "text": "Num CPUs", "type": "Unknown", @@ -243,7 +239,7 @@ "defaultValue": "false", "description": "", "name": "group_start", - "persist": false, + "precious": false, "readonly": false, "text": "Group start", "type": "Boolean", @@ -253,7 +249,7 @@ "defaultValue": "", "description": "The command line to be executed", "name": "Arg01", - "persist": false, + "precious": false, "readonly": false, "text": "Arg01", "type": "Unknown", @@ -263,7 +259,7 @@ "defaultValue": "sleep", "description": "", "name": "command", - "persist": false, + "precious": false, "readonly": false, "text": "command", "type": "String", @@ -306,10 +302,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "SleepInternal", "width": 200, @@ -329,7 +323,7 @@ "defaultValue": "5", "description": "Estimated size of the data contained in this node", "name": "data_volume", - "persist": false, + "precious": false, "readonly": false, "text": "Data volume", "type": "Float", @@ -339,7 +333,7 @@ "defaultValue": "false", "description": "Is this node the end of a group?", "name": "group_end", - "persist": false, + "precious": false, "readonly": false, "text": "Group end", "type": "Boolean", @@ -349,7 +343,7 @@ "defaultValue": "true", "description": "Perform a check to make sure the file path exists before proceeding with the application", "name": "check_filepath_exists", - "persist": false, + "precious": false, "readonly": false, "text": "Check file path exists", "type": "Boolean", @@ -359,7 +353,7 @@ "defaultValue": "", "description": "Path to the file for this node", "name": "filepath", - "persist": false, + "precious": false, "readonly": false, "text": "File path", "type": "String", @@ -369,11 +363,24 @@ "defaultValue": "", "description": "Name of the directory containing the file for this node", "name": "dirname", - "persist": false, + "precious": false, "readonly": false, "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -412,10 +419,8 @@ "type": "event" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "event", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph index b08b20849..b8cfe862b 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph @@ -33,8 +33,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -85,8 +83,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -148,8 +144,6 @@ "height": 485.9616075598674, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": true, "readonly": true, @@ -222,8 +216,6 @@ "height": 283.5907928388748, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": true, "readonly": true, @@ -297,8 +289,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -478,8 +468,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -551,8 +539,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -648,8 +634,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -812,8 +796,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -976,8 +958,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1040,8 +1020,6 @@ "height": 197.06393861892587, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": true, "readonly": true, @@ -1113,8 +1091,6 @@ "height": 160, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1165,8 +1141,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1320,8 +1294,7 @@ "height": 193.6368286445012, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, + false, "subject": null, "expanded": true, "readonly": true, @@ -1393,8 +1366,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1457,8 +1428,6 @@ "height": 200, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1518,8 +1487,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1572,8 +1539,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1626,8 +1591,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1800,8 +1763,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1854,8 +1815,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph index bf7ada046..015014d4a 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph @@ -63,6 +63,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -89,7 +102,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" }, @@ -128,6 +140,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -149,7 +174,6 @@ "outputApplication": "Unknown", "outputLocalPorts": [], "outputPorts": [], - "streaming": false, "subject": null, "text": "File" }, @@ -183,6 +207,19 @@ "name": "Arg01", "text": "Arg01", "value": "echo -en 'world' > %o0" + }, + { + "defaultValue": false, + "description": "Specifies whether this data component streams input and output data", + "keyAttribute": false, + "name": "streaming", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Streaming", + "type": "Boolean", + "value": true } ], "inputAppFields": [], @@ -204,7 +241,6 @@ "IdText": "event" } ], - "streaming": true, "subject": null, "text": "Bash Shell App" }, @@ -264,7 +300,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Bash Shell App" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph index 95ceb6301..e60cb2cb9 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph @@ -79,7 +79,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Python App" }, @@ -118,6 +117,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -144,7 +156,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" }, @@ -204,7 +215,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Python App" }, @@ -243,6 +253,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -264,7 +287,6 @@ "outputApplication": "Unknown", "outputLocalPorts": [], "outputPorts": [], - "streaming": false, "subject": null, "text": "File" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph index f0c01fa1f..1c17d0868 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph @@ -79,7 +79,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Python App" }, @@ -118,6 +117,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -144,7 +156,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" }, @@ -204,7 +215,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Python App" }, @@ -243,6 +253,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -264,7 +287,6 @@ "outputApplication": "Unknown", "outputLocalPorts": [], "outputPorts": [], - "streaming": false, "subject": null, "text": "File" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph index 2f090edfb..08bfa7339 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph @@ -63,6 +63,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -89,7 +102,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" }, @@ -128,6 +140,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -149,7 +174,6 @@ "outputApplication": "Unknown", "outputLocalPorts": [], "outputPorts": [], - "streaming": false, "subject": null, "text": "File" }, @@ -183,6 +207,19 @@ "name": "Arg01", "text": "Arg01", "value": "echo -en 'Hello world' > %o0" + }, + { + "defaultValue": false, + "description": "Specifies whether this data component streams input and output data", + "keyAttribute": false, + "name": "streaming", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Streaming", + "type": "Boolean", + "value": true } ], "inputAppFields": [], @@ -204,7 +241,6 @@ "IdText": "event" } ], - "streaming": true, "subject": null, "text": "Bash Shell App" }, @@ -264,7 +300,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Bash Shell App" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBashSplit.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBashSplit.graph index 6ca5b30aa..1bd6e04e2 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBashSplit.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBashSplit.graph @@ -63,6 +63,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -89,7 +102,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" }, @@ -128,6 +140,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -149,7 +174,6 @@ "outputApplication": "Unknown", "outputLocalPorts": [], "outputPorts": [], - "streaming": false, "subject": null, "text": "File" }, @@ -183,6 +207,19 @@ "name": "Arg01", "text": "Arg01", "value": "echo -en 'Hello world' > %o0" + }, + { + "defaultValue": false, + "description": "Specifies whether this data component streams input and output data", + "keyAttribute": false, + "name": "streaming", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Streaming", + "type": "Boolean", + "value": true } ], "inputAppFields": [], @@ -205,7 +242,6 @@ } ], "reprodata": {"rmode": 7}, - "streaming": true, "subject": null, "text": "Bash Shell App" }, @@ -265,7 +301,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Bash Shell App" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldFile.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldFile.graph index 92dc0838e..c6acedf0c 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldFile.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldFile.graph @@ -44,6 +44,19 @@ "name": "dirname", "text": "Directory name", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "inputAppFields": [], @@ -65,7 +78,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "File" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/apps.graph b/daliuge-translator/test/reproducibility/reproGraphs/apps.graph index 632b1dd3c..09ca2d27f 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/apps.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/apps.graph @@ -111,9 +111,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -213,9 +211,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Dynlib App", "width": 200, @@ -315,9 +311,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "MPI", "width": 200, @@ -477,9 +471,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Docker", "width": 200, @@ -579,9 +571,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Python App", "width": 200, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/files.graph b/daliuge-translator/test/reproducibility/reproGraphs/files.graph index 63ae85384..fff30eb18 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/files.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/files.graph @@ -79,9 +79,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Memory", "width": 200, @@ -156,6 +154,19 @@ "text": "Directory name", "type": "Unknown", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -185,9 +196,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -255,9 +264,7 @@ "text": "event" } ], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "NGAS", "width": 200, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/groupUse.graph b/daliuge-translator/test/reproducibility/reproGraphs/groupUse.graph index a128f826c..fda942e84 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/groupUse.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/groupUse.graph @@ -68,7 +68,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Group By" }, @@ -127,7 +126,6 @@ "IdText": "event" } ], - "streaming": false, "subject": null, "text": "Bash Shell App" } diff --git a/daliuge-translator/test/reproducibility/reproGraphs/groups.graph b/daliuge-translator/test/reproducibility/reproGraphs/groups.graph index 266b59b67..e2354ad00 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/groups.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/groups.graph @@ -186,9 +186,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Gather", "width": 200, @@ -330,9 +328,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Scatter", "width": 200, @@ -380,9 +376,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Loop", "width": 493.31143980063956, @@ -451,9 +445,7 @@ "type": "String" } ], - "persist": false, "sha": "63d7df9", - "streaming": false, "subject": null, "text": "Memory", "width": 200, @@ -548,9 +540,7 @@ "type": "Complex" } ], - "persist": false, "sha": "a7abe4c", - "streaming": false, "subject": null, "text": "SleepApp", "width": 200, @@ -629,9 +619,7 @@ "type": "Complex" } ], - "persist": false, "sha": "a7abe4c", - "streaming": false, "subject": null, "text": "Memory", "width": 200, @@ -725,9 +713,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "a7abe4c", - "streaming": false, "subject": null, "text": "SleepApp", "width": 200, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/misc.graph b/daliuge-translator/test/reproducibility/reproGraphs/misc.graph index 2e1913c20..0b8f3954f 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/misc.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/misc.graph @@ -46,9 +46,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Comment", "width": 200, @@ -83,9 +81,7 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "sha": "", - "streaming": false, "subject": null, "text": "Description", "width": 200, @@ -163,9 +159,7 @@ "type": "Complex" } ], - "persist": false, "sha": "63d7df9", - "streaming": false, "subject": null, "text": "Memory", "width": 200, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph b/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph index 639f8a40f..17fa3d2b0 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph @@ -111,6 +111,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -397,6 +410,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -495,6 +521,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -699,6 +738,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph b/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph index aa4d5c8f5..6a54d0d52 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph @@ -111,6 +111,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -140,7 +153,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -246,7 +258,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Scatter", "width": 461, @@ -397,6 +408,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -495,6 +519,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, @@ -699,6 +736,19 @@ "text": "Directory name", "type": "String", "value": "" + }, + { + "defaultValue": true, + "description": "Specifies whether this data component contains data that should not be deleted after execution", + "keyAttribute": false, + "name": "persist", + "options": [], + "positional": false, + "precious": false, + "readonly": false, + "text": "Persist", + "type": "Boolean", + "value": false } ], "flipPorts": false, From e1782ecc017da5c1caf14115b724fe4dcf9162c6 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 15:38:20 +0800 Subject: [PATCH 6/9] Missed some graph changes in previous commit --- .../topoGraphs/dataSandwich.graph | 3 - .../topoGraphs/testNotDAG.graph | 4 -- .../logical_graphs/HelloWorld_simple.graph | 4 -- .../dropmake/logical_graphs/Plasma_test.graph | 6 -- .../dropmake/logical_graphs/cont_img.graph | 1 - .../logical_graphs/eagle_gather.graph | 26 ------- .../dropmake/logical_graphs/lofar_std.graph | 72 ------------------- .../logical_graphs/test-20190830-110556.graph | 4 -- .../dropmake/logical_graphs/testScatter.graph | 2 - .../logical_graphs/test_grpby_gather.graph | 1 - .../reproGraphs/simpleNoScatter.graph | 7 -- .../reproGraphs/simpleScatter.graph | 5 -- 12 files changed, 135 deletions(-) diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph index bd905c98f..65df475c1 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph @@ -111,7 +111,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -214,7 +213,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -317,7 +315,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph b/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph index 90d248fee..d9a2fd0e7 100644 --- a/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph +++ b/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph @@ -93,7 +93,6 @@ ], "selected": true, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -164,7 +163,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -235,7 +233,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -306,7 +303,6 @@ ], "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph index be07d4cdd..16d23daf8 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph @@ -32,8 +32,6 @@ "collapsed": false, "showPorts": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": true, "expanded": false, @@ -123,8 +121,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph index 6ea85d12c..ad8d6dfd3 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph @@ -32,7 +32,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -105,7 +104,6 @@ "collapsed": false, "showPorts": true, "flipPorts": false, - "streaming": false, "subject": null, "selected": true, "expanded": false, @@ -194,7 +192,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -297,7 +294,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -386,7 +382,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, @@ -496,7 +491,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph index 725b8940c..503ec35f9 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph @@ -541,7 +541,6 @@ ], "readonly": true, "showPorts": false, - , "subject": null, "text": "Cal. Source\nFinding", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph index c4bd1e679..8818f15b1 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph @@ -33,8 +33,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -116,8 +114,6 @@ "height": 432, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -337,8 +333,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -530,8 +524,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -613,8 +605,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -696,8 +686,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -888,8 +876,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1013,8 +999,6 @@ "height": 381, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1234,8 +1218,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1286,8 +1268,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1411,8 +1391,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1604,8 +1582,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1687,8 +1663,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, diff --git a/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph b/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph index e066f1033..2b208e87f 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph @@ -143,8 +143,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -195,8 +193,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -255,8 +251,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -339,8 +333,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -412,8 +404,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -485,8 +475,6 @@ "height": 680, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -560,8 +548,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -633,8 +619,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -706,8 +690,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -879,8 +861,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1052,8 +1032,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1125,8 +1103,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1314,8 +1290,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1503,8 +1477,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1576,8 +1548,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1649,8 +1619,6 @@ "height": 810, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1723,8 +1691,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -1896,8 +1862,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2077,8 +2041,6 @@ "height": 200, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2159,8 +2121,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2232,8 +2192,6 @@ "height": 200, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2287,8 +2245,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2364,8 +2320,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2536,8 +2490,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2588,8 +2540,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2760,8 +2710,6 @@ "height": 520, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2833,8 +2781,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -2997,8 +2943,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3078,8 +3022,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3251,8 +3193,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3321,8 +3261,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3504,8 +3442,6 @@ "height": 446, "collapsed": false, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3559,8 +3495,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3611,8 +3545,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3685,8 +3617,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, @@ -3859,8 +3789,6 @@ "height": 72, "collapsed": true, "flipPorts": false, - "streaming": false, - "persist": false, "subject": null, "expanded": false, "readonly": true, diff --git a/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph b/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph index 184d8c788..087b57f2b 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph @@ -241,10 +241,8 @@ "type": "" } ], - "persist": false, "readonly": true, "sha": "", - "streaming": false, "subject": null, "text": "Enter label", "width": 200, @@ -362,10 +360,8 @@ "outputApplicationType": "None", "outputLocalPorts": [], "outputPorts": [], - "persist": false, "readonly": false, "sha": "0023469", - "streaming": false, "subject": null, "text": "File", "width": 200, diff --git a/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph b/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph index fce39bf46..ea221814f 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph @@ -30,7 +30,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": true, @@ -130,7 +129,6 @@ "collapsed": false, "showPorts": false, "flipPorts": false, - "streaming": false, "subject": null, "selected": false, "expanded": false, diff --git a/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph index b8cfe862b..c3a579f8e 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph @@ -1294,7 +1294,6 @@ "height": 193.6368286445012, "collapsed": false, "flipPorts": false, - false, "subject": null, "expanded": true, "readonly": true, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph b/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph index 17fa3d2b0..c6f24d997 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/simpleNoScatter.graph @@ -153,7 +153,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -259,7 +258,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Scatter", "width": 461, @@ -349,7 +347,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -460,7 +457,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "scatter", "width": 200, @@ -571,7 +567,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -677,7 +672,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Gather", "width": 286, @@ -781,7 +775,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, diff --git a/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph b/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph index 6a54d0d52..86aa76449 100644 --- a/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph +++ b/daliuge-translator/test/reproducibility/reproGraphs/simpleScatter.graph @@ -347,7 +347,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Bash Shell App", "width": 200, @@ -458,7 +457,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "scatter", "width": 200, @@ -569,7 +567,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, @@ -675,7 +672,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "Gather", "width": 286, @@ -779,7 +775,6 @@ "readonly": false, "selected": false, "showPorts": false, - "streaming": false, "subject": null, "text": "File", "width": 200, From e82c095a025b070003907311540030ded3090c16 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Fri, 28 Oct 2022 15:45:49 +0800 Subject: [PATCH 7/9] Removed 'streaming' attribute from reproducibility tests --- .../dlg/common/reproducibility/reproducibility_fields.py | 2 -- .../test/reproducibility/test_accumulatedata.py | 6 ------ 2 files changed, 8 deletions(-) diff --git a/daliuge-common/dlg/common/reproducibility/reproducibility_fields.py b/daliuge-common/dlg/common/reproducibility/reproducibility_fields.py index c62d07f8b..e304a4125 100644 --- a/daliuge-common/dlg/common/reproducibility/reproducibility_fields.py +++ b/daliuge-common/dlg/common/reproducibility/reproducibility_fields.py @@ -74,14 +74,12 @@ def lgt_block_fields(rmode: ReproducibilityFlags): "outputPorts": FieldOps.COUNT, "inputLocalPorts": FieldOps.COUNT, "outputLocalPorts": FieldOps.COUNT, # MKN Nodes - "streaming": FieldOps.STORE, } if rmode == ReproducibilityFlags.REPRODUCE: del data["inputPorts"] del data["outputPorts"] del data["inputLocalPorts"] del data["outputLocalPorts"] - del data["streaming"] return data diff --git a/daliuge-translator/test/reproducibility/test_accumulatedata.py b/daliuge-translator/test/reproducibility/test_accumulatedata.py index 8b0a65030..c8fbf5856 100644 --- a/daliuge-translator/test/reproducibility/test_accumulatedata.py +++ b/daliuge-translator/test/reproducibility/test_accumulatedata.py @@ -106,7 +106,6 @@ class AccumulateLGTRerunData(unittest.TestCase): "inputLocalPorts", "outputLocalPorts", "outputPorts", - "streaming", } ddGraph = "graphs/ddTest.graph" @@ -433,7 +432,6 @@ class AccumulateLGTRepeatData(unittest.TestCase): "inputLocalPorts", "outputPorts", "outputLocalPorts", - "streaming", } file = "reproducibility/reproGraphs/apps.graph" @@ -833,7 +831,6 @@ class AccumulateLGTRecomputeData(unittest.TestCase): "inputLocalPorts", "outputPorts", "outputLocalPorts", - "streaming", } file = "reproducibility/reproGraphs/apps.graph" @@ -1608,7 +1605,6 @@ class AccumulateLGTReplicateSciData(unittest.TestCase): "inputLocalPorts", "outputPorts", "outputLocalPorts", - "streaming", } file = "reproducibility/reproGraphs/apps.graph" @@ -1934,7 +1930,6 @@ class AccumulateLGTReplicateCompData(unittest.TestCase): "inputLocalPorts", "outputPorts", "outputLocalPorts", - "streaming", } file = "reproducibility/reproGraphs/apps.graph" @@ -2333,7 +2328,6 @@ class AccumulateLGTReplicateTotalData(unittest.TestCase): "inputLocalPorts", "outputPorts", "outputLocalPorts", - "streaming", } file = "reproducibility/reproGraphs/apps.graph" From ebc97abb8b0a3b87c54f6672883f5ef52523c933 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Tue, 1 Nov 2022 10:48:20 +0800 Subject: [PATCH 8/9] Add 'applicationArgs' attribute back to the graph schema --- .../dlg/dropmake/lg.graph.schema | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema index d11634288..2433ea15f 100644 --- a/daliuge-translator/dlg/dropmake/lg.graph.schema +++ b/daliuge-translator/dlg/dropmake/lg.graph.schema @@ -130,6 +130,7 @@ "expanded": { "type": "boolean" }, + "inputApplicationName": { "type": "string" }, @@ -324,6 +325,58 @@ ] } }, + "applicationArgs": { + "type": "array", + "items": { + "type": "object", + "properties": { + "text": { + "type": "string" + }, + "name": { + "type": "string" + }, + "value": { + "type": ["string","boolean","number", "null"] + }, + "defaultValue": { + "type": ["string","boolean","number", "null"] + }, + "description": { + "type": "string" + }, + "readonly": { + "type": "boolean", + }, + "type": { + "type": "string" + }, + "precious": { + "type": "boolean" + }, + "options": { + "type": "array" + }, + "positional": { + "type": "boolean", + "default": false + }, + "keyAttribute": { + "type": "boolean" + } + }, + "required": [ + "description", + "name", + "text", + "value" + "type", + "precious", + "options", + "positional" + ] + } + }, "group": { "type": "integer" } @@ -338,6 +391,7 @@ "drawOrderHint", "expanded", "fields", + "applicationArgs", "height", "inputAppFields", "inputApplicationName", From 3e4579ac1f775168d45995cc08da3789680fffbd Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Wed, 2 Nov 2022 16:44:03 +0800 Subject: [PATCH 9/9] Minor fixes to JSON schema --- daliuge-translator/dlg/dropmake/lg.graph.schema | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema index 2433ea15f..ff1d3bf09 100644 --- a/daliuge-translator/dlg/dropmake/lg.graph.schema +++ b/daliuge-translator/dlg/dropmake/lg.graph.schema @@ -346,7 +346,7 @@ "type": "string" }, "readonly": { - "type": "boolean", + "type": "boolean" }, "type": { "type": "string" @@ -369,7 +369,7 @@ "description", "name", "text", - "value" + "value", "type", "precious", "options",