Skip to content

Commit fa2cfdf

Browse files
authored
MRG: Merge pull request #676 from octue/make-signing-output-datasets-optional
Make signed URLs for output datasets optional
2 parents e116143 + 42940d1 commit fa2cfdf

File tree

20 files changed

+361
-168
lines changed

20 files changed

+361
-168
lines changed

docs/source/creating_apps.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,6 @@ When the analysis has finished, it is automatically finalised. This means:
157157

158158
You can manually call :mod:`analysis.finalise <octue.resources.analysis.Analysis.finalise>` if you want to upload
159159
any output datasets to a different location to the one specified in the app configuration. If you do this, the
160-
analysis will not be finalised again - make sure you only call it when your output data is ready.
160+
analysis will not be finalised again - make sure you only call it when your output data is ready. Note that the
161+
``output_location`` and ``use_signed_urls_for_output_datasets`` settings in the app configuration are ignored if you
162+
call it manually.

docs/source/creating_services.rst

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ App configuration file (optional)
7979
- ``configuration_manifest``
8080
- ``children``
8181
- ``output_location``
82+
- ``use_signed_urls_for_output_datasets``
8283

8384
If an app configuration file is provided, its path must be specified in ``octue.yaml`` under the
8485
"app_configuration_path" key.

docs/source/inter_service_compatibility.rst

+89-87
Large diffs are not rendered by default.

octue/configuration.py

+3
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ class AppConfiguration:
109109
:param str|dict|octue.resources.Manifest|None configuration_manifest: a manifest of datasets to configure the app
110110
:param str|list(dict)|None children: details of the children the app requires
111111
:param str|None output_location: the path to a cloud directory to save output datasets at
112+
:param bool use_signed_urls_for_output_datasets: if `True`, use signed URLs instead of cloud URIs for dataset paths in the output manifest
112113
:return None:
113114
"""
114115

@@ -118,12 +119,14 @@ def __init__(
118119
configuration_manifest=None,
119120
children=None,
120121
output_location=None,
122+
use_signed_urls_for_output_datasets=True,
121123
**kwargs,
122124
):
123125
self.configuration_values = configuration_values
124126
self.configuration_manifest = configuration_manifest
125127
self.children = children
126128
self.output_location = output_location
129+
self.use_signed_urls_for_output_datasets = use_signed_urls_for_output_datasets
127130

128131
if kwargs:
129132
logger.warning(f"The following keyword arguments were not used by {type(self).__name__}: {kwargs!r}.")

0 commit comments

Comments
 (0)