toil 8.1.0b1__py3-none-any.whl → 8.2.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- toil/__init__.py +0 -35
- toil/batchSystems/abstractBatchSystem.py +1 -1
- toil/batchSystems/abstractGridEngineBatchSystem.py +1 -1
- toil/batchSystems/awsBatch.py +1 -1
- toil/batchSystems/cleanup_support.py +1 -1
- toil/batchSystems/kubernetes.py +53 -7
- toil/batchSystems/local_support.py +1 -1
- toil/batchSystems/mesos/batchSystem.py +13 -8
- toil/batchSystems/mesos/test/__init__.py +3 -2
- toil/batchSystems/singleMachine.py +1 -1
- toil/batchSystems/slurm.py +27 -26
- toil/bus.py +5 -3
- toil/common.py +39 -11
- toil/cwl/cwltoil.py +1 -1
- toil/job.py +64 -49
- toil/jobStores/abstractJobStore.py +24 -3
- toil/jobStores/fileJobStore.py +25 -1
- toil/jobStores/googleJobStore.py +104 -30
- toil/leader.py +9 -0
- toil/lib/accelerators.py +3 -1
- toil/lib/aws/utils.py.orig +504 -0
- toil/lib/bioio.py +1 -1
- toil/lib/docker.py +252 -91
- toil/lib/dockstore.py +11 -3
- toil/lib/exceptions.py +5 -3
- toil/lib/history.py +87 -13
- toil/lib/history_submission.py +23 -9
- toil/lib/io.py +34 -22
- toil/lib/misc.py +7 -1
- toil/lib/resources.py +2 -1
- toil/lib/threading.py +11 -10
- toil/options/common.py +8 -0
- toil/options/wdl.py +11 -0
- toil/server/api_spec/LICENSE +201 -0
- toil/server/api_spec/README.rst +5 -0
- toil/server/cli/wes_cwl_runner.py +2 -1
- toil/test/__init__.py +275 -115
- toil/test/batchSystems/batchSystemTest.py +227 -205
- toil/test/batchSystems/test_slurm.py +27 -0
- toil/test/cactus/pestis.tar.gz +0 -0
- toil/test/conftest.py +7 -0
- toil/test/cwl/2.fasta +11 -0
- toil/test/cwl/2.fastq +12 -0
- toil/test/cwl/conftest.py +1 -1
- toil/test/cwl/cwlTest.py +999 -867
- toil/test/cwl/directory/directory/file.txt +15 -0
- toil/test/cwl/download_directory_file.json +4 -0
- toil/test/cwl/download_directory_s3.json +4 -0
- toil/test/cwl/download_file.json +6 -0
- toil/test/cwl/download_http.json +6 -0
- toil/test/cwl/download_https.json +6 -0
- toil/test/cwl/download_s3.json +6 -0
- toil/test/cwl/download_subdirectory_file.json +5 -0
- toil/test/cwl/download_subdirectory_s3.json +5 -0
- toil/test/cwl/empty.json +1 -0
- toil/test/cwl/mock_mpi/fake_mpi.yml +8 -0
- toil/test/cwl/mock_mpi/fake_mpi_run.py +42 -0
- toil/test/cwl/optional-file-exists.json +6 -0
- toil/test/cwl/optional-file-missing.json +6 -0
- toil/test/cwl/preemptible_expression.json +1 -0
- toil/test/cwl/revsort-job-missing.json +6 -0
- toil/test/cwl/revsort-job.json +6 -0
- toil/test/cwl/s3_secondary_file.json +16 -0
- toil/test/cwl/seqtk_seq_job.json +6 -0
- toil/test/cwl/stream.json +6 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.dat +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f0 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f1 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f1i +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f2 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f2_TSM0 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f3 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f3_TSM0 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f4 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f4_TSM0 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.f5 +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.info +0 -0
- toil/test/cwl/test_filename_conflict_resolution.ms/table.lock +0 -0
- toil/test/cwl/whale.txt +16 -0
- toil/test/docs/scripts/example_alwaysfail.py +38 -0
- toil/test/docs/scripts/example_alwaysfail_with_files.wdl +33 -0
- toil/test/docs/scripts/example_cachingbenchmark.py +117 -0
- toil/test/docs/scripts/stagingExampleFiles/in.txt +1 -0
- toil/test/docs/scripts/stagingExampleFiles/out.txt +2 -0
- toil/test/docs/scripts/tutorial_arguments.py +23 -0
- toil/test/docs/scripts/tutorial_debugging.patch +12 -0
- toil/test/docs/scripts/tutorial_debugging_hangs.wdl +126 -0
- toil/test/docs/scripts/tutorial_debugging_works.wdl +129 -0
- toil/test/docs/scripts/tutorial_docker.py +20 -0
- toil/test/docs/scripts/tutorial_dynamic.py +24 -0
- toil/test/docs/scripts/tutorial_encapsulation.py +28 -0
- toil/test/docs/scripts/tutorial_encapsulation2.py +29 -0
- toil/test/docs/scripts/tutorial_helloworld.py +15 -0
- toil/test/docs/scripts/tutorial_invokeworkflow.py +27 -0
- toil/test/docs/scripts/tutorial_invokeworkflow2.py +30 -0
- toil/test/docs/scripts/tutorial_jobfunctions.py +22 -0
- toil/test/docs/scripts/tutorial_managing.py +29 -0
- toil/test/docs/scripts/tutorial_managing2.py +56 -0
- toil/test/docs/scripts/tutorial_multiplejobs.py +25 -0
- toil/test/docs/scripts/tutorial_multiplejobs2.py +21 -0
- toil/test/docs/scripts/tutorial_multiplejobs3.py +22 -0
- toil/test/docs/scripts/tutorial_promises.py +25 -0
- toil/test/docs/scripts/tutorial_promises2.py +30 -0
- toil/test/docs/scripts/tutorial_quickstart.py +22 -0
- toil/test/docs/scripts/tutorial_requirements.py +44 -0
- toil/test/docs/scripts/tutorial_services.py +45 -0
- toil/test/docs/scripts/tutorial_staging.py +45 -0
- toil/test/docs/scripts/tutorial_stats.py +64 -0
- toil/test/lib/aws/test_iam.py +3 -1
- toil/test/lib/dockerTest.py +205 -122
- toil/test/lib/test_history.py +101 -77
- toil/test/provisioners/aws/awsProvisionerTest.py +12 -9
- toil/test/provisioners/clusterTest.py +4 -4
- toil/test/provisioners/gceProvisionerTest.py +16 -14
- toil/test/sort/sort.py +4 -1
- toil/test/src/busTest.py +17 -17
- toil/test/src/deferredFunctionTest.py +145 -132
- toil/test/src/importExportFileTest.py +71 -63
- toil/test/src/jobEncapsulationTest.py +27 -28
- toil/test/src/jobServiceTest.py +149 -133
- toil/test/src/jobTest.py +219 -211
- toil/test/src/miscTests.py +66 -60
- toil/test/src/promisedRequirementTest.py +163 -169
- toil/test/src/regularLogTest.py +24 -24
- toil/test/src/resourceTest.py +82 -76
- toil/test/src/restartDAGTest.py +51 -47
- toil/test/src/resumabilityTest.py +24 -19
- toil/test/src/retainTempDirTest.py +60 -57
- toil/test/src/systemTest.py +17 -13
- toil/test/src/threadingTest.py +29 -32
- toil/test/utils/ABCWorkflowDebug/B_file.txt +1 -0
- toil/test/utils/ABCWorkflowDebug/debugWorkflow.py +204 -0
- toil/test/utils/ABCWorkflowDebug/mkFile.py +16 -0
- toil/test/utils/ABCWorkflowDebug/sleep.cwl +12 -0
- toil/test/utils/ABCWorkflowDebug/sleep.yaml +1 -0
- toil/test/utils/toilDebugTest.py +117 -102
- toil/test/utils/toilKillTest.py +54 -53
- toil/test/utils/utilsTest.py +303 -229
- toil/test/wdl/lint_error.wdl +9 -0
- toil/test/wdl/md5sum/empty_file.json +1 -0
- toil/test/wdl/md5sum/md5sum-gs.json +1 -0
- toil/test/wdl/md5sum/md5sum.1.0.wdl +32 -0
- toil/test/wdl/md5sum/md5sum.input +1 -0
- toil/test/wdl/md5sum/md5sum.json +1 -0
- toil/test/wdl/md5sum/md5sum.wdl +25 -0
- toil/test/wdl/miniwdl_self_test/inputs-namespaced.json +1 -0
- toil/test/wdl/miniwdl_self_test/inputs.json +1 -0
- toil/test/wdl/miniwdl_self_test/self_test.wdl +40 -0
- toil/test/wdl/standard_library/as_map.json +16 -0
- toil/test/wdl/standard_library/as_map_as_input.wdl +23 -0
- toil/test/wdl/standard_library/as_pairs.json +7 -0
- toil/test/wdl/standard_library/as_pairs_as_input.wdl +23 -0
- toil/test/wdl/standard_library/ceil.json +3 -0
- toil/test/wdl/standard_library/ceil_as_command.wdl +16 -0
- toil/test/wdl/standard_library/ceil_as_input.wdl +16 -0
- toil/test/wdl/standard_library/collect_by_key.json +1 -0
- toil/test/wdl/standard_library/collect_by_key_as_input.wdl +23 -0
- toil/test/wdl/standard_library/cross.json +11 -0
- toil/test/wdl/standard_library/cross_as_input.wdl +19 -0
- toil/test/wdl/standard_library/flatten.json +7 -0
- toil/test/wdl/standard_library/flatten_as_input.wdl +18 -0
- toil/test/wdl/standard_library/floor.json +3 -0
- toil/test/wdl/standard_library/floor_as_command.wdl +16 -0
- toil/test/wdl/standard_library/floor_as_input.wdl +16 -0
- toil/test/wdl/standard_library/keys.json +8 -0
- toil/test/wdl/standard_library/keys_as_input.wdl +24 -0
- toil/test/wdl/standard_library/length.json +7 -0
- toil/test/wdl/standard_library/length_as_input.wdl +16 -0
- toil/test/wdl/standard_library/length_as_input_with_map.json +7 -0
- toil/test/wdl/standard_library/length_as_input_with_map.wdl +17 -0
- toil/test/wdl/standard_library/length_invalid.json +3 -0
- toil/test/wdl/standard_library/range.json +3 -0
- toil/test/wdl/standard_library/range_0.json +3 -0
- toil/test/wdl/standard_library/range_as_input.wdl +17 -0
- toil/test/wdl/standard_library/range_invalid.json +3 -0
- toil/test/wdl/standard_library/read_boolean.json +3 -0
- toil/test/wdl/standard_library/read_boolean_as_command.wdl +17 -0
- toil/test/wdl/standard_library/read_float.json +3 -0
- toil/test/wdl/standard_library/read_float_as_command.wdl +17 -0
- toil/test/wdl/standard_library/read_int.json +3 -0
- toil/test/wdl/standard_library/read_int_as_command.wdl +17 -0
- toil/test/wdl/standard_library/read_json.json +3 -0
- toil/test/wdl/standard_library/read_json_as_output.wdl +31 -0
- toil/test/wdl/standard_library/read_lines.json +3 -0
- toil/test/wdl/standard_library/read_lines_as_output.wdl +31 -0
- toil/test/wdl/standard_library/read_map.json +3 -0
- toil/test/wdl/standard_library/read_map_as_output.wdl +31 -0
- toil/test/wdl/standard_library/read_string.json +3 -0
- toil/test/wdl/standard_library/read_string_as_command.wdl +17 -0
- toil/test/wdl/standard_library/read_tsv.json +3 -0
- toil/test/wdl/standard_library/read_tsv_as_output.wdl +31 -0
- toil/test/wdl/standard_library/round.json +3 -0
- toil/test/wdl/standard_library/round_as_command.wdl +16 -0
- toil/test/wdl/standard_library/round_as_input.wdl +16 -0
- toil/test/wdl/standard_library/size.json +3 -0
- toil/test/wdl/standard_library/size_as_command.wdl +17 -0
- toil/test/wdl/standard_library/size_as_output.wdl +36 -0
- toil/test/wdl/standard_library/stderr.json +3 -0
- toil/test/wdl/standard_library/stderr_as_output.wdl +30 -0
- toil/test/wdl/standard_library/stdout.json +3 -0
- toil/test/wdl/standard_library/stdout_as_output.wdl +30 -0
- toil/test/wdl/standard_library/sub.json +3 -0
- toil/test/wdl/standard_library/sub_as_input.wdl +17 -0
- toil/test/wdl/standard_library/sub_as_input_with_file.wdl +17 -0
- toil/test/wdl/standard_library/transpose.json +6 -0
- toil/test/wdl/standard_library/transpose_as_input.wdl +18 -0
- toil/test/wdl/standard_library/write_json.json +6 -0
- toil/test/wdl/standard_library/write_json_as_command.wdl +17 -0
- toil/test/wdl/standard_library/write_lines.json +7 -0
- toil/test/wdl/standard_library/write_lines_as_command.wdl +17 -0
- toil/test/wdl/standard_library/write_map.json +6 -0
- toil/test/wdl/standard_library/write_map_as_command.wdl +17 -0
- toil/test/wdl/standard_library/write_tsv.json +6 -0
- toil/test/wdl/standard_library/write_tsv_as_command.wdl +17 -0
- toil/test/wdl/standard_library/zip.json +12 -0
- toil/test/wdl/standard_library/zip_as_input.wdl +19 -0
- toil/test/wdl/test.csv +3 -0
- toil/test/wdl/test.tsv +3 -0
- toil/test/wdl/testfiles/croo.wdl +38 -0
- toil/test/wdl/testfiles/drop_files.wdl +62 -0
- toil/test/wdl/testfiles/drop_files_subworkflow.wdl +13 -0
- toil/test/wdl/testfiles/empty.txt +0 -0
- toil/test/wdl/testfiles/not_enough_outputs.wdl +33 -0
- toil/test/wdl/testfiles/random.wdl +66 -0
- toil/test/wdl/testfiles/string_file_coercion.json +1 -0
- toil/test/wdl/testfiles/string_file_coercion.wdl +35 -0
- toil/test/wdl/testfiles/test.json +4 -0
- toil/test/wdl/testfiles/test_boolean.txt +1 -0
- toil/test/wdl/testfiles/test_float.txt +1 -0
- toil/test/wdl/testfiles/test_int.txt +1 -0
- toil/test/wdl/testfiles/test_lines.txt +5 -0
- toil/test/wdl/testfiles/test_map.txt +2 -0
- toil/test/wdl/testfiles/test_string.txt +1 -0
- toil/test/wdl/testfiles/url_to_file.wdl +13 -0
- toil/test/wdl/testfiles/url_to_optional_file.wdl +13 -0
- toil/test/wdl/testfiles/vocab.json +1 -0
- toil/test/wdl/testfiles/vocab.wdl +66 -0
- toil/test/wdl/testfiles/wait.wdl +34 -0
- toil/test/wdl/wdl_specification/type_pair.json +23 -0
- toil/test/wdl/wdl_specification/type_pair_basic.wdl +36 -0
- toil/test/wdl/wdl_specification/type_pair_with_files.wdl +36 -0
- toil/test/wdl/wdl_specification/v1_spec.json +1 -0
- toil/test/wdl/wdl_specification/v1_spec_declaration.wdl +39 -0
- toil/test/wdl/wdltoil_test.py +680 -407
- toil/test/wdl/wdltoil_test_kubernetes.py +2 -2
- toil/version.py +9 -9
- toil/wdl/wdltoil.py +336 -123
- {toil-8.1.0b1.dist-info → toil-8.2.0.dist-info}/METADATA +5 -4
- toil-8.2.0.dist-info/RECORD +439 -0
- {toil-8.1.0b1.dist-info → toil-8.2.0.dist-info}/WHEEL +1 -1
- toil-8.1.0b1.dist-info/RECORD +0 -259
- {toil-8.1.0b1.dist-info → toil-8.2.0.dist-info}/entry_points.txt +0 -0
- {toil-8.1.0b1.dist-info → toil-8.2.0.dist-info/licenses}/LICENSE +0 -0
- {toil-8.1.0b1.dist-info → toil-8.2.0.dist-info}/top_level.txt +0 -0
toil/jobStores/googleJobStore.py
CHANGED
|
@@ -20,8 +20,8 @@ import uuid
|
|
|
20
20
|
from contextlib import contextmanager
|
|
21
21
|
from functools import wraps
|
|
22
22
|
from io import BytesIO
|
|
23
|
-
from typing import IO, Optional
|
|
24
|
-
from urllib.parse import ParseResult
|
|
23
|
+
from typing import Any, IO, Iterator, Optional
|
|
24
|
+
from urllib.parse import ParseResult, urlunparse
|
|
25
25
|
|
|
26
26
|
from google.api_core.exceptions import (
|
|
27
27
|
GoogleAPICallError,
|
|
@@ -90,6 +90,46 @@ def google_retry(f):
|
|
|
90
90
|
|
|
91
91
|
return wrapper
|
|
92
92
|
|
|
93
|
+
@contextmanager
|
|
94
|
+
def permission_error_reporter(url: ParseResult, notes: str) -> Iterator[None]:
|
|
95
|
+
"""
|
|
96
|
+
Detect and usefully report permission errors.
|
|
97
|
+
|
|
98
|
+
If we fall back to anonymous credentials, but they don't have permission
|
|
99
|
+
for something, the Google Cloud Storage module will try to refresh them
|
|
100
|
+
behind the scenes. Then it will complain::
|
|
101
|
+
|
|
102
|
+
<class 'google.auth.exceptions.InvalidOperation'>: Anonymous credentials cannot be refreshed.
|
|
103
|
+
|
|
104
|
+
We need to detect this and report that the real problem is that the user
|
|
105
|
+
has not set up any credentials. When you try to make the client
|
|
106
|
+
non-anonymously and don't have credentials set up, you get a nice error
|
|
107
|
+
from Google::
|
|
108
|
+
|
|
109
|
+
google.auth.exceptions.DefaultCredentialsError: Your default credentials were not found. To set up Application Default Credentials, see https://cloud.google.com/docs/authentication/external/set-up-adc for more information.
|
|
110
|
+
|
|
111
|
+
But we swallow that when we fall back to anonymous access.
|
|
112
|
+
|
|
113
|
+
So we take the URL and any notes from client setup here, and if something
|
|
114
|
+
goes wrong that looks like a permission problem we complain with the notes
|
|
115
|
+
attached.
|
|
116
|
+
"""
|
|
117
|
+
try:
|
|
118
|
+
yield
|
|
119
|
+
except exceptions.InvalidOperation as e:
|
|
120
|
+
if "Anonymous credentials cannot be refreshed" in str(e):
|
|
121
|
+
raise RuntimeError(
|
|
122
|
+
"Google Storage tried to refresh anonymous credentials. "
|
|
123
|
+
"Are you sure you have set up your Google Account login "
|
|
124
|
+
"for applications with permission to access "
|
|
125
|
+
f"{urlunparse(url)}? "
|
|
126
|
+
"Maybe try `gcloud auth application-default login`? "
|
|
127
|
+
f"Client setup said: {notes}"
|
|
128
|
+
) from e
|
|
129
|
+
else:
|
|
130
|
+
raise
|
|
131
|
+
|
|
132
|
+
|
|
93
133
|
|
|
94
134
|
class GoogleJobStore(AbstractJobStore):
|
|
95
135
|
|
|
@@ -117,10 +157,10 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
117
157
|
self.readStatsBaseID = self.statsReadPrefix + self.statsBaseID
|
|
118
158
|
|
|
119
159
|
self.sseKey = None
|
|
120
|
-
self.storageClient = self.create_client()
|
|
160
|
+
self.storageClient, self.auth_notes = self.create_client()
|
|
121
161
|
|
|
122
162
|
@classmethod
|
|
123
|
-
def create_client(cls) -> storage.Client:
|
|
163
|
+
def create_client(cls) -> tuple[storage.Client, str]:
|
|
124
164
|
"""
|
|
125
165
|
Produce a client for Google Sotrage with the highest level of access we can get.
|
|
126
166
|
|
|
@@ -128,8 +168,28 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
128
168
|
Google Storage module's behavior.
|
|
129
169
|
|
|
130
170
|
Warn if GOOGLE_APPLICATION_CREDENTIALS is set but not actually present.
|
|
171
|
+
|
|
172
|
+
:returns: the client, and any notes about why it might not have permissions.
|
|
131
173
|
"""
|
|
132
174
|
|
|
175
|
+
notes: list[str] = []
|
|
176
|
+
def add_note(message: str, *args: Any, warn: bool = False) -> None:
|
|
177
|
+
"""
|
|
178
|
+
Add and possibly warn with a note about the client permissions.
|
|
179
|
+
"""
|
|
180
|
+
note = message % args
|
|
181
|
+
if warn:
|
|
182
|
+
log.warning(note)
|
|
183
|
+
notes.append(note)
|
|
184
|
+
def compile_notes() -> str:
|
|
185
|
+
"""
|
|
186
|
+
Make one string explainign why we might not have expected permissions.
|
|
187
|
+
"""
|
|
188
|
+
if notes:
|
|
189
|
+
return f"Google authentication had {len(notes)} potential issues: {'; '.join(notes)}"
|
|
190
|
+
else:
|
|
191
|
+
return "Google authentication appeared successful."
|
|
192
|
+
|
|
133
193
|
# Determine if we have an override environment variable for our credentials.
|
|
134
194
|
# We get the path to check existence, but Google Storage works out what
|
|
135
195
|
# to use later by looking at the environment again.
|
|
@@ -139,38 +199,42 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
139
199
|
if credentials_path is not None and not os.path.exists(credentials_path):
|
|
140
200
|
# If the file is missing, complain.
|
|
141
201
|
# This variable holds a file name and not any sensitive data itself.
|
|
142
|
-
|
|
202
|
+
add_note(
|
|
143
203
|
"File '%s' from GOOGLE_APPLICATION_CREDENTIALS is unavailable! "
|
|
144
204
|
"We may not be able to authenticate!",
|
|
145
205
|
credentials_path,
|
|
206
|
+
warn=True
|
|
146
207
|
)
|
|
147
208
|
|
|
148
209
|
if credentials_path is None and os.path.exists(cls.nodeServiceAccountJson):
|
|
149
210
|
try:
|
|
150
|
-
# load credentials from a particular file on GCE nodes if an
|
|
211
|
+
# load credentials from a particular file on GCE nodes if an
|
|
212
|
+
# override path is not set
|
|
151
213
|
return storage.Client.from_service_account_json(
|
|
152
214
|
cls.nodeServiceAccountJson
|
|
153
|
-
)
|
|
215
|
+
), compile_notes()
|
|
154
216
|
except OSError:
|
|
155
217
|
# Probably we don't have permission to use the file.
|
|
156
|
-
|
|
218
|
+
add_note(
|
|
157
219
|
"File '%s' exists but didn't work to authenticate!",
|
|
158
220
|
cls.nodeServiceAccountJson,
|
|
221
|
+
warn=True
|
|
159
222
|
)
|
|
160
223
|
|
|
161
224
|
# Either a filename is specified, or our fallback file isn't there.
|
|
162
225
|
try:
|
|
163
226
|
# See if Google can work out how to authenticate.
|
|
164
|
-
return storage.Client()
|
|
165
|
-
except (DefaultCredentialsError, OSError):
|
|
227
|
+
return storage.Client(), compile_notes()
|
|
228
|
+
except (DefaultCredentialsError, OSError) as e:
|
|
166
229
|
# Depending on which Google codepath or module version (???)
|
|
167
230
|
# realizes we have no credentials, we can get an EnvironemntError,
|
|
168
231
|
# or the new DefaultCredentialsError we are supposedly specced to
|
|
169
232
|
# get.
|
|
233
|
+
add_note("Could not make authenticated client: %s", e)
|
|
170
234
|
|
|
171
235
|
# Google can't find credentials, fall back to being anonymous.
|
|
172
236
|
# This is likely to happen all the time so don't warn.
|
|
173
|
-
return storage.Client.create_anonymous_client()
|
|
237
|
+
return storage.Client.create_anonymous_client(), compile_notes()
|
|
174
238
|
|
|
175
239
|
@google_retry
|
|
176
240
|
def initialize(self, config=None):
|
|
@@ -406,19 +470,20 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
406
470
|
|
|
407
471
|
@classmethod
|
|
408
472
|
@google_retry
|
|
409
|
-
def _get_blob_from_url(cls, url, exists=False):
|
|
473
|
+
def _get_blob_from_url(cls, client: storage.Client, url: ParseResult, exists: bool = False) -> storage.blob.Blob:
|
|
410
474
|
"""
|
|
411
475
|
Gets the blob specified by the url.
|
|
412
476
|
|
|
413
477
|
caution: makes no api request. blob may not ACTUALLY exist
|
|
414
478
|
|
|
415
|
-
:param
|
|
479
|
+
:param client: The Google Sotrage client to use to connect with.
|
|
416
480
|
|
|
417
|
-
:param
|
|
481
|
+
:param url: the URL
|
|
482
|
+
|
|
483
|
+
:param exists: if True, then syncs local blob object with cloud
|
|
418
484
|
and raises exceptions if it doesn't exist remotely
|
|
419
485
|
|
|
420
486
|
:return: the blob requested
|
|
421
|
-
:rtype: :class:`~google.cloud.storage.blob.Blob`
|
|
422
487
|
"""
|
|
423
488
|
bucketName = url.netloc
|
|
424
489
|
fileName = url.path
|
|
@@ -427,8 +492,7 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
427
492
|
if fileName.startswith("/"):
|
|
428
493
|
fileName = fileName[1:]
|
|
429
494
|
|
|
430
|
-
|
|
431
|
-
bucket = storageClient.bucket(bucket_name=bucketName)
|
|
495
|
+
bucket = client.bucket(bucket_name=bucketName)
|
|
432
496
|
blob = bucket.blob(compat_bytes(fileName))
|
|
433
497
|
|
|
434
498
|
if exists:
|
|
@@ -440,26 +504,34 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
440
504
|
|
|
441
505
|
@classmethod
|
|
442
506
|
def _url_exists(cls, url: ParseResult) -> bool:
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
507
|
+
client, auth_notes = cls.create_client()
|
|
508
|
+
with permission_error_reporter(url, auth_notes):
|
|
509
|
+
try:
|
|
510
|
+
cls._get_blob_from_url(client, url, exists=True)
|
|
511
|
+
return True
|
|
512
|
+
except NoSuchFileException:
|
|
513
|
+
return False
|
|
448
514
|
|
|
449
515
|
@classmethod
|
|
450
516
|
def _get_size(cls, url):
|
|
451
|
-
|
|
517
|
+
client, auth_notes = cls.create_client()
|
|
518
|
+
with permission_error_reporter(url, auth_notes):
|
|
519
|
+
return cls._get_blob_from_url(client, url, exists=True).size
|
|
452
520
|
|
|
453
521
|
@classmethod
|
|
454
522
|
def _read_from_url(cls, url, writable):
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
523
|
+
client, auth_notes = cls.create_client()
|
|
524
|
+
with permission_error_reporter(url, auth_notes):
|
|
525
|
+
blob = cls._get_blob_from_url(client, url, exists=True)
|
|
526
|
+
blob.download_to_file(writable)
|
|
527
|
+
return blob.size, False
|
|
458
528
|
|
|
459
529
|
@classmethod
|
|
460
530
|
def _open_url(cls, url: ParseResult) -> IO[bytes]:
|
|
461
|
-
|
|
462
|
-
|
|
531
|
+
client, auth_notes = cls.create_client()
|
|
532
|
+
with permission_error_reporter(url, auth_notes):
|
|
533
|
+
blob = cls._get_blob_from_url(client, url, exists=True)
|
|
534
|
+
return blob.open("rb")
|
|
463
535
|
|
|
464
536
|
@classmethod
|
|
465
537
|
def _supports_url(cls, url, export=False):
|
|
@@ -467,8 +539,10 @@ class GoogleJobStore(AbstractJobStore):
|
|
|
467
539
|
|
|
468
540
|
@classmethod
|
|
469
541
|
def _write_to_url(cls, readable: bytes, url: str, executable: bool = False) -> None:
|
|
470
|
-
|
|
471
|
-
|
|
542
|
+
client, auth_notes = cls.create_client()
|
|
543
|
+
with permission_error_reporter(url, auth_notes):
|
|
544
|
+
blob = cls._get_blob_from_url(client, url)
|
|
545
|
+
blob.upload_from_file(readable)
|
|
472
546
|
|
|
473
547
|
@classmethod
|
|
474
548
|
def _list_url(cls, url: ParseResult) -> list[str]:
|
toil/leader.py
CHANGED
|
@@ -1780,6 +1780,15 @@ class Leader:
|
|
|
1780
1780
|
|
|
1781
1781
|
self._updatePredecessorStatus(job_id)
|
|
1782
1782
|
|
|
1783
|
+
if self.config.stop_on_first_failure:
|
|
1784
|
+
# We want to stop the workflow on the first complete failure of a job.
|
|
1785
|
+
logger.error("Stopping workflow on first failure, which was: %s", job_desc)
|
|
1786
|
+
raise FailedJobsException(
|
|
1787
|
+
self.jobStore,
|
|
1788
|
+
[self.toilState.get_job(job_id)],
|
|
1789
|
+
exit_code=self.recommended_fail_exit_code,
|
|
1790
|
+
)
|
|
1791
|
+
|
|
1783
1792
|
def _updatePredecessorStatus(self, jobStoreID: str) -> None:
|
|
1784
1793
|
"""Update status of predecessors for finished (possibly failed) successor job."""
|
|
1785
1794
|
if jobStoreID in self.toilState.service_to_client:
|