@@ -387,7 +387,10 @@ def check_all_types(
387
387
)
388
388
)
389
389
if is_all_output_method_loop_step (param_to_step , parm_id ):
390
- src_dict [parm_id ]['type' ] = {'type' : 'array' , 'items' : src_dict [parm_id ]['type' ]}
390
+ src_dict [parm_id ]["type" ] = {
391
+ "type" : "array" ,
392
+ "items" : src_dict [parm_id ]["type" ],
393
+ }
391
394
else :
392
395
parm_id = cast (str , sink [sourceField ])
393
396
if parm_id not in src_dict :
@@ -430,7 +433,10 @@ def check_all_types(
430
433
srcs_of_sink [0 ]["type" ] = src_typ
431
434
432
435
if is_all_output_method_loop_step (param_to_step , parm_id ):
433
- src_dict [parm_id ]['type' ] = {'type' : 'array' , 'items' : src_dict [parm_id ]['type' ]}
436
+ src_dict [parm_id ]["type" ] = {
437
+ "type" : "array" ,
438
+ "items" : src_dict [parm_id ]["type" ],
439
+ }
434
440
435
441
for src in srcs_of_sink :
436
442
check_result = check_types (src , sink , linkMerge , valueFrom )
@@ -521,14 +527,19 @@ def is_conditional_step(param_to_step: Dict[str, CWLObjectType], parm_id: str) -
521
527
return False
522
528
523
529
524
- def is_all_output_method_loop_step (param_to_step : Dict [str , CWLObjectType ], parm_id : str ) -> bool :
530
+ def is_all_output_method_loop_step (
531
+ param_to_step : Dict [str , CWLObjectType ], parm_id : str
532
+ ) -> bool :
525
533
source_step = param_to_step .get (parm_id )
526
534
if source_step is not None :
527
535
requirements = {
528
- ** {h ['class' ]: h for h in source_step .get ('hints' , [])},
529
- ** {r ['class' ]: r for r in source_step .get ('requirements' , [])}}
530
- if 'http://commonwl.org/cwltool#Loop' in requirements :
531
- output_method = requirements ['http://commonwl.org/cwltool#Loop' ].get ('outputMethod' , 'last' )
532
- if output_method == 'all' :
536
+ ** {h ["class" ]: h for h in source_step .get ("hints" , [])},
537
+ ** {r ["class" ]: r for r in source_step .get ("requirements" , [])},
538
+ }
539
+ if "http://commonwl.org/cwltool#Loop" in requirements :
540
+ output_method = requirements ["http://commonwl.org/cwltool#Loop" ].get (
541
+ "outputMethod" , "last"
542
+ )
543
+ if output_method == "all" :
533
544
return True
534
545
return False
0 commit comments