Skip to content

Commit b00b17e

Browse files
committed
Fix load_tool typing
1 parent a5a1b85 commit b00b17e

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

cwltool/load_tool.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ def fast_validator(
298298

299299
_fast_validator_convert_stdstreams_to_files(objects)
300300

301+
processobj: Union[MutableMapping[str, Any], MutableSequence[Any], float, str, None]
302+
301303
processobj = cwl_v1_2.save(objects, relative_uris=False)
302304

303305
metadata: Dict[str, Any] = {}
@@ -318,9 +320,10 @@ def fast_validator(
318320
if loadingContext.loader:
319321
loadingContext.loader.graph += loadopt.graph
320322

321-
return cast(Union[CommentedMap, CommentedSeq], cmap(processobj)), cast(
322-
CommentedMap, cmap(metadata)
323-
)
323+
return cast(
324+
Union[CommentedMap, CommentedSeq],
325+
cmap(cast(Union[Dict[str, Any], List[Any]], processobj)),
326+
), cast(CommentedMap, cmap(metadata))
324327

325328

326329
def resolve_and_validate_document(
@@ -354,6 +357,8 @@ def resolve_and_validate_document(
354357

355358
fileuri = urllib.parse.urldefrag(uri)[0]
356359

360+
metadata: CWLObjectType
361+
357362
cwlVersion = loadingContext.metadata.get("cwlVersion")
358363
if not cwlVersion:
359364
cwlVersion = workflowobj.get("cwlVersion")
@@ -426,7 +431,7 @@ def resolve_and_validate_document(
426431
if isinstance(avsc_names, Exception):
427432
raise avsc_names
428433

429-
processobj = None # type: Optional[ResolveType]
434+
processobj: Union[CommentedMap, CommentedSeq, int, float, str, None]
430435
document_loader = Loader(
431436
sch_document_loader.ctx,
432437
schemagraph=sch_document_loader.graph,
@@ -515,6 +520,9 @@ def make_tool(
515520
if loadingContext.loader is None:
516521
raise ValueError("loadingContext must have a loader")
517522

523+
resolveduri: Union[float, str, CommentedMap, CommentedSeq, None]
524+
metadata: CWLObjectType
525+
518526
if loadingContext.fast_validator and isinstance(uri, str):
519527
resolveduri, metadata = fast_validator(None, None, uri, loadingContext)
520528
else:

0 commit comments

Comments
 (0)