Skip to content

Commit bef81ae

Browse files
GlassOfWhiskeymr-c
authored andcommitted
Resolve type issues with LoadingOptions
1 parent 5abd8df commit bef81ae

File tree

1 file changed

+28
-3
lines changed

1 file changed

+28
-3
lines changed

cwl_utils/parser/__init__.py

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,24 +294,49 @@ def load_document_by_uri(
294294
loadingOptions = cwl_v1_0.LoadingOptions(
295295
fileuri=real_uri, baseuri=base_uri, copyfrom=loadingOptions
296296
)
297+
return load_document_by_string(
298+
loadingOptions.fetcher.fetch_text(real_uri),
299+
real_uri,
300+
loadingOptions,
301+
id_,
302+
load_all,
303+
)
297304
case cwl_v1_1.LoadingOptions():
298305
loadingOptions = cwl_v1_1.LoadingOptions(
299306
fileuri=real_uri, baseuri=base_uri, copyfrom=loadingOptions
300307
)
308+
return load_document_by_string(
309+
loadingOptions.fetcher.fetch_text(real_uri),
310+
real_uri,
311+
loadingOptions,
312+
id_,
313+
load_all,
314+
)
301315
case cwl_v1_2.LoadingOptions():
302316
loadingOptions = cwl_v1_2.LoadingOptions(
303317
fileuri=real_uri, baseuri=base_uri, copyfrom=loadingOptions
304318
)
319+
return load_document_by_string(
320+
loadingOptions.fetcher.fetch_text(real_uri),
321+
real_uri,
322+
loadingOptions,
323+
id_,
324+
load_all,
325+
)
305326
case None:
306327
loadingOptions = cwl_v1_2.LoadingOptions(fileuri=real_uri, baseuri=base_uri)
328+
return load_document_by_string(
329+
loadingOptions.fetcher.fetch_text(real_uri),
330+
real_uri,
331+
None,
332+
id_,
333+
load_all,
334+
)
307335
case _:
308336
raise ValidationException(
309337
f"Unsupported loadingOptions type: {type(loadingOptions)}"
310338
)
311339

312-
doc = loadingOptions.fetcher.fetch_text(real_uri)
313-
return load_document_by_string(doc, real_uri, loadingOptions, id_, load_all)
314-
315340

316341
def load_document(
317342
doc: Any,

0 commit comments

Comments
 (0)