From 651e480308e087944aed7e5fc6740ac0cad561e2 Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Thu, 23 Jun 2022 13:52:09 +0800 Subject: [PATCH 1/2] Added ports to File component --- daliuge-engine/dlg/drop.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/daliuge-engine/dlg/drop.py b/daliuge-engine/dlg/drop.py index 4a743f9e1..220f515c8 100644 --- a/daliuge-engine/dlg/drop.py +++ b/daliuge-engine/dlg/drop.py @@ -1701,6 +1701,10 @@ def generate_reproduce_data(self): # \~English Mime-type to be used for archiving # @param[in] cparam/ngasTimeout NGAS timeout/2/Integer/readwrite/False//False/ # \~English Timeout for receiving responses for NGAS +# @param[in] port/dummy dummy/Complex/ +# \~English Dummy input port +# @param[out] port/dummy dummy/Complex/ +# \~English Dummy output port # @par EAGLE_END class NgasDROP(DataDROP): """ From 9f1f50e331c98e8598de03ef0121207db322036d Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Thu, 23 Jun 2022 14:05:25 +0800 Subject: [PATCH 2/2] Added default ports to all the other data components --- daliuge-engine/dlg/drop.py | 20 ++++++++++++++++---- daliuge-engine/dlg/environmentvar_drop.py | 1 + daliuge-engine/dlg/s3_drop.py | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/daliuge-engine/dlg/drop.py b/daliuge-engine/dlg/drop.py index 220f515c8..205547a07 100644 --- a/daliuge-engine/dlg/drop.py +++ b/daliuge-engine/dlg/drop.py @@ -1501,6 +1501,8 @@ def dataURL(self) -> str: # \~English Path to the file for this node # @param[in] cparam/dirname Directory name//String/readwrite/False//False/ # \~English Path to the file for this node +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class FileDROP(DataDROP, PathBasedDrop): """ @@ -1701,10 +1703,8 @@ def generate_reproduce_data(self): # \~English Mime-type to be used for archiving # @param[in] cparam/ngasTimeout NGAS timeout/2/Integer/readwrite/False//False/ # \~English Timeout for receiving responses for NGAS -# @param[in] port/dummy dummy/Complex/ -# \~English Dummy input port -# @param[out] port/dummy dummy/Complex/ -# \~English Dummy output port +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class NgasDROP(DataDROP): """ @@ -1823,6 +1823,8 @@ def generate_reproduce_data(self): # \~English Estimated size of the data contained in this node # @param[in] cparam/group_end Group end/False/Boolean/readwrite/False//False/ # \~English Is this node the end of a group? +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class InMemoryDROP(DataDROP): """ @@ -1879,6 +1881,8 @@ def generate_reproduce_data(self): # \~English Estimated size of the data contained in this node # @param[in] cparam/group_end Group end/False/Boolean/readwrite/False//False/ # \~English Is this node the end of a group? +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class SharedMemoryDROP(DataDROP): """ @@ -1929,6 +1933,8 @@ def dataURL(self) -> str: # \~English This never stores any data # @param[in] cparam/group_end Group end/False/Boolean/readwrite/False//False/ # \~English Is this node the end of a group? +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class NullDROP(DataDROP): """ @@ -1969,6 +1975,8 @@ class EndDROP(NullDROP): # \~English Condition for SELECT. For this the WHERE statement must be written using the "{X}" or "{}" placeholders # @param[in] cparam/selectVals values for WHERE//Json/readwrite/False//False/ # \~English Values for the WHERE statement +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class RDBMSDrop(DataDROP): """ @@ -2196,6 +2204,8 @@ def exists(self): # \~English PlasmaId of the object for all compute nodes # @param[in] cparam/use_staging Use Staging/False/Boolean/readwrite/False//False/ # \~English Enables writing to a dynamically resizeable staging buffer +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class PlasmaDROP(DataDROP): """ @@ -2246,6 +2256,8 @@ def dataURL(self) -> str: # \~English PlasmaId of the object for all compute nodes # @param[in] cparam/flight_path Flight Path//String/readwrite/False//False/ # \~English IP and flight port of the drop owner +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class PlasmaFlightDROP(DataDROP): """ diff --git a/daliuge-engine/dlg/environmentvar_drop.py b/daliuge-engine/dlg/environmentvar_drop.py index d0f5948c8..14ce09e2d 100644 --- a/daliuge-engine/dlg/environmentvar_drop.py +++ b/daliuge-engine/dlg/environmentvar_drop.py @@ -66,6 +66,7 @@ def _filter_parameters(parameters: dict): # @par EAGLE_START # @param category EnvironmentVariables # @param tag daliuge +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class EnvironmentVarDROP(AbstractDROP, KeyValueDROP): """ diff --git a/daliuge-engine/dlg/s3_drop.py b/daliuge-engine/dlg/s3_drop.py index b2052746b..d0ebb4145 100644 --- a/daliuge-engine/dlg/s3_drop.py +++ b/daliuge-engine/dlg/s3_drop.py @@ -46,6 +46,8 @@ # \~English The S3 Object # @param[in] cparam/profile_name Profile Name//String/readwrite/False//False/ # \~English The S3 Profile +# @param[in] port/dummy dummy/Complex/Dummy input port +# @param[out] port/dummy dummy/Complex/Dummy output port # @par EAGLE_END class S3DROP(AbstractDROP): """