import functools
from arvados.api import OrderedJsonModel
-from cwltool.process import shortname, adjustFileObjs, adjustDirObjs, getListing, normalizeFilesDirs
+from cwltool.process import shortname, adjustFileObjs, adjustDirObjs, normalizeFilesDirs
from cwltool.load_tool import load_tool
from cwltool.errors import WorkflowException
+from .fsaccess import CollectionFetcher
+
logger = logging.getLogger('arvados.cwl-runner')
def run():
adjustFileObjs(job_order_object, keeppathObj)
adjustDirObjs(job_order_object, keeppathObj)
normalizeFilesDirs(job_order_object)
- adjustDirObjs(job_order_object, functools.partial(getListing, arvados_cwl.fsaccess.CollectionFsAccess("", api_client=api)))
output_name = None
output_tags = None
enable_reuse = True
+ on_error = "continue"
if "arv:output_name" in job_order_object:
output_name = job_order_object["arv:output_name"]
del job_order_object["arv:output_name"]
runner = arvados_cwl.ArvCwlRunner(api_client=arvados.api('v1', model=OrderedJsonModel()),
output_name=output_name, output_tags=output_tags)
- t = load_tool(toolpath, runner.arv_make_tool)
+ t = load_tool(toolpath, runner.arv_make_tool,
+ fetcher_constructor=functools.partial(CollectionFetcher,
+ api_client=api,
+ keep_client=arvados.keep.KeepClient(api_client=api, num_retries=4)))
args = argparse.Namespace()
args.project_uuid = arvados.current_job()["owner_uuid"]