diff --git a/docs/source/anatomy_manifest.rst b/docs/source/anatomy_manifest.rst index c59fb59..d261169 100644 --- a/docs/source/anatomy_manifest.rst +++ b/docs/source/anatomy_manifest.rst @@ -103,7 +103,7 @@ for examples. .. accordion-row:: Show twine containing this strand - .. literalinclude:: ../../examples/met_mast_scada_service/strands/input_manifest_filters.json + .. literalinclude:: ../../examples/met_mast_scada_service/strands/input_manifest.json :language: javascript .. accordion-row:: Show a matching file manifest @@ -120,7 +120,7 @@ for examples. .. accordion-row:: Show twine containing this strand - .. literalinclude:: ../../examples/met_mast_scada_service/strands/output_manifest_filters.json + .. literalinclude:: ../../examples/met_mast_scada_service/strands/output_manifest.json :language: javascript .. accordion-row:: Show a matching file manifest diff --git a/docs/source/examples.rst b/docs/source/examples.rst index 060902f..108da7a 100644 --- a/docs/source/examples.rst +++ b/docs/source/examples.rst @@ -81,8 +81,9 @@ copied straight from the unit test cases, so you can always check there to see h } } }, - "output_manifest": [ - ], + "output_manifest": { + "datasets": [] + }, "output_values_schema": { "title": "Output Values schema for the foundation cost twin", "description": "The response supplied to a change in input values will always conform to this schema.", @@ -125,12 +126,14 @@ copied straight from the unit test cases, so you can always check there to see h "purpose": "Token for accessing a 3rd party weather API service" } ], - "input_manifest": [ - { - "key": "wind_resource_data", - "purpose": "A dataset containing Wind Resource Grid files" - } - ], + "input_manifest": { + "datasets": [ + { + "key": "wind_resource_data", + "purpose": "A dataset containing Wind Resource Grid files" + } + ] + }, "input_values_schema": { "$schema": "http://json-schema.org/2019-09/schema#", "title": "Input Values for the weather service twin", @@ -160,14 +163,16 @@ copied straight from the unit test cases, so you can always check there to see h } } }, - "output_manifest": [ - { - "key": "production_data", - "purpose": "A dataset containing production data", - "tags": {"cleaned": True}, - "labels": ["production", "wind"] - } - ], + "output_manifest": { + "datasets": [ + { + "key": "production_data", + "purpose": "A dataset containing production data", + "tags": {"cleaned": true}, + "labels": ["production", "wind"] + } + ] + }, "output_values_schema": { "$schema": "http://json-schema.org/2019-09/schema#", "title": "Output Values for the metocean service twin", diff --git a/examples/damage_classifier_service/twine.json b/examples/damage_classifier_service/twine.json index 3788728..49ff280 100644 --- a/examples/damage_classifier_service/twine.json +++ b/examples/damage_classifier_service/twine.json @@ -1,11 +1,13 @@ { // Manifest strands contain lists, with one entry for each required dataset - "configuration_manifest": [ - { - // Once the inputs are validated, your analysis program can use this key to access the dataset - "key": "trained_model", - // General notes, which are helpful as a reminder to users of the service - "purpose": "The trained classifier" - } - ] + "configuration_manifest": { + "datasets": [ + { + // Once the inputs are validated, your analysis program can use this key to access the dataset + "key": "trained_model", + // General notes, which are helpful as a reminder to users of the service + "purpose": "The trained classifier" + } + ] + } } diff --git a/examples/met_mast_scada_service/strands/input_manifest.json b/examples/met_mast_scada_service/strands/input_manifest.json new file mode 100644 index 0000000..402202d --- /dev/null +++ b/examples/met_mast_scada_service/strands/input_manifest.json @@ -0,0 +1,17 @@ +{ + // Manifest strands contain lists, with one entry for each required dataset + "input_manifest": { + "datasets": [ + { + // Once the inputs are validated, your analysis program can use this key to access the dataset + "key": "met_mast_data", + // General notes, which are helpful as a reminder to users of the service + "purpose": "A dataset containing meteorological mast data" + }, + { + "key": "scada_data", + "purpose": "A dataset containing scada data" + } + ] + } +} diff --git a/examples/met_mast_scada_service/strands/input_manifest_filters.json b/examples/met_mast_scada_service/strands/input_manifest_filters.json deleted file mode 100644 index 9f1dd5f..0000000 --- a/examples/met_mast_scada_service/strands/input_manifest_filters.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - // Manifest strands contain lists, with one entry for each required dataset - "input_manifest_filters": [ - { - // Once the inputs are validated, your analysis program can use this key to access the dataset - "key": "met_mast_data", - // General notes, which are helpful as a reminder to users of the service - "purpose": "A dataset containing meteorological mast data" - }, - { - "key": "scada_data", - "purpose": "A dataset containing scada data" - } - ] -} diff --git a/examples/met_mast_scada_service/strands/output_manifest.json b/examples/met_mast_scada_service/strands/output_manifest.json new file mode 100644 index 0000000..86a43cd --- /dev/null +++ b/examples/met_mast_scada_service/strands/output_manifest.json @@ -0,0 +1,12 @@ +{ + "output_manifest": { + "datasets": [ + { + // Twined will prepare a manifest with this key, which you can add to during the analysis or once its complete + "key": "met_scada_checks", + // General notes, which are helpful as a reminder to users of the service + "purpose": "A dataset containing figures showing correlations between mast and scada data" + } + ] + } +} diff --git a/examples/met_mast_scada_service/strands/output_manifest_filters.json b/examples/met_mast_scada_service/strands/output_manifest_filters.json deleted file mode 100644 index e08fa91..0000000 --- a/examples/met_mast_scada_service/strands/output_manifest_filters.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "output_manifest_filters": [ - { - // Twined will prepare a manifest with this key, which you can add to during the analysis or once its complete - "key": "met_scada_checks", - // General notes, which are helpful as a reminder to users of the service - "purpose": "A dataset containing figures showing correlations between mast and scada data" - } - ] -} diff --git a/examples/wind_tunnel_datalogger_service/strands/output_manifest.json b/examples/wind_tunnel_datalogger_service/strands/output_manifest.json new file mode 100644 index 0000000..86a43cd --- /dev/null +++ b/examples/wind_tunnel_datalogger_service/strands/output_manifest.json @@ -0,0 +1,12 @@ +{ + "output_manifest": { + "datasets": [ + { + // Twined will prepare a manifest with this key, which you can add to during the analysis or once its complete + "key": "met_scada_checks", + // General notes, which are helpful as a reminder to users of the service + "purpose": "A dataset containing figures showing correlations between mast and scada data" + } + ] + } +} diff --git a/examples/wind_tunnel_datalogger_service/strands/output_manifest_filters.json b/examples/wind_tunnel_datalogger_service/strands/output_manifest_filters.json deleted file mode 100644 index e08fa91..0000000 --- a/examples/wind_tunnel_datalogger_service/strands/output_manifest_filters.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "output_manifest_filters": [ - { - // Twined will prepare a manifest with this key, which you can add to during the analysis or once its complete - "key": "met_scada_checks", - // General notes, which are helpful as a reminder to users of the service - "purpose": "A dataset containing figures showing correlations between mast and scada data" - } - ] -} diff --git a/tests/data/apps/empty_app/twine.json b/tests/data/apps/empty_app/twine.json index c83fb06..8c410a5 100644 --- a/tests/data/apps/empty_app/twine.json +++ b/tests/data/apps/empty_app/twine.json @@ -11,8 +11,9 @@ }, "credentials": [ ], - "input_manifest": [ - ], + "input_manifest": { + "datasets": [] + }, "input_values_schema": { "$schema": "http://json-schema.org/2019-09/schema#", "title": "Input Values", @@ -21,8 +22,9 @@ "properties": { } }, - "output_manifest": [ - ], + "output_manifest": { + "datasets": [] + }, "output_values_schema": { "title": "Output Values", "description": "The output values strand of an example twine",