X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6c43be47cb3756a0e6ffc924572259d1a1c8f2c3..210889a5400ac6ef247078af14c0766f3639b988:/sdk/cwl/arvados_cwl/runner.py?ds=sidebyside diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py index 0cc23ab459..2e52b63ed6 100644 --- a/sdk/cwl/arvados_cwl/runner.py +++ b/sdk/cwl/arvados_cwl/runner.py @@ -1,15 +1,110 @@ import os import urlparse from functools import partial +import logging +import json +import re +from cStringIO import StringIO +import cwltool.draft2tool from cwltool.draft2tool import CommandLineTool import cwltool.workflow -from cwltool.process import get_feature, scandeps, adjustFiles +from cwltool.process import get_feature, scandeps, UnsupportedRequirement, normalizeFilesDirs from cwltool.load_tool import fetch_document +from cwltool.pathmapper import adjustFileObjs, adjustDirObjs + +import arvados.collection +import ruamel.yaml as yaml from .arvdocker import arv_docker_get_image from .pathmapper import ArvPathMapper +logger = logging.getLogger('arvados.cwl-runner') + +cwltool.draft2tool.ACCEPTLIST_RE = re.compile(r"^[a-zA-Z0-9._+-]+$") + +def upload_dependencies(arvrunner, name, document_loader, + workflowobj, uri, loadref_run): + """Upload the dependencies of the workflowobj document to Keep. + + Returns a pathmapper object mapping local paths to keep references. Also + does an in-place update of references in "workflowobj". + + Use scandeps to find $import, $include, $schemas, run, File and Directory + fields that represent external references. + + If workflowobj has an "id" field, this will reload the document to ensure + it is scanning the raw document prior to preprocessing. + """ + + loaded = set() + def loadref(b, u): + joined = urlparse.urljoin(b, u) + defrg, _ = urlparse.urldefrag(joined) + if defrg not in loaded: + loaded.add(defrg) + # Use fetch_text to get raw file (before preprocessing). + text = document_loader.fetch_text(defrg) + if isinstance(text, bytes): + textIO = StringIO(text.decode('utf-8')) + else: + textIO = StringIO(text) + return yaml.safe_load(textIO) + else: + return {} + + if loadref_run: + loadref_fields = set(("$import", "run")) + else: + loadref_fields = set(("$import",)) + + scanobj = workflowobj + if "id" in workflowobj: + # Need raw file content (before preprocessing) to ensure + # that external references in $include and $mixin are captured. + scanobj = loadref("", workflowobj["id"]) + + sc = scandeps(uri, scanobj, + loadref_fields, + set(("$include", "$schemas", "location")), + loadref) + + files = [] + def visitFiles(path): + files.append(path) + + adjustFileObjs(sc, visitFiles) + adjustDirObjs(sc, visitFiles) + + normalizeFilesDirs(files) + + if "id" in workflowobj: + files.append({"class": "File", "location": workflowobj["id"]}) + + mapper = ArvPathMapper(arvrunner, files, "", + "keep:%s", + "keep:%s/%s", + name=name) + + def setloc(p): + if not p["location"].startswith("keep:"): + p["location"] = mapper.mapper(p["location"]).resolved + adjustFileObjs(workflowobj, setloc) + adjustDirObjs(workflowobj, setloc) + + return mapper + + +def upload_docker(arvrunner, tool): + if isinstance(tool, CommandLineTool): + (docker_req, docker_is_req) = get_feature(tool, "DockerRequirement") + if docker_req: + arv_docker_get_image(arvrunner.api, docker_req, True, arvrunner.project_uuid) + elif isinstance(tool, cwltool.workflow.Workflow): + for s in tool.steps: + upload_docker(arvrunner, s.embedded_tool) + + class Runner(object): def __init__(self, runner, tool, job_order, enable_reuse): self.arvrunner = runner @@ -17,57 +112,29 @@ class Runner(object): self.job_order = job_order self.running = False self.enable_reuse = enable_reuse + self.uuid = None def update_pipeline_component(self, record): pass - def upload_docker(self, tool): - if isinstance(tool, CommandLineTool): - (docker_req, docker_is_req) = get_feature(tool, "DockerRequirement") - if docker_req: - arv_docker_get_image(self.arvrunner.api, docker_req, True, self.arvrunner.project_uuid) - elif isinstance(tool, cwltool.workflow.Workflow): - for s in tool.steps: - self.upload_docker(s.embedded_tool) - - def arvados_job_spec(self, *args, **kwargs): - self.upload_docker(self.tool) - - workflowfiles = set() - jobfiles = set() - workflowfiles.add(self.tool.tool["id"]) + upload_docker(self.arvrunner, self.tool) self.name = os.path.basename(self.tool.tool["id"]) - def visitFiles(files, path): - files.add(path) - return path - - document_loader, workflowobj, uri = fetch_document(self.tool.tool["id"]) - def loadref(b, u): - return document_loader.fetch(urlparse.urljoin(b, u)) - - sc = scandeps(uri, workflowobj, - set(("$import", "run")), - set(("$include", "$schemas", "path")), - loadref) - adjustFiles(sc, partial(visitFiles, workflowfiles)) - adjustFiles(self.job_order, partial(visitFiles, jobfiles)) - - workflowmapper = ArvPathMapper(self.arvrunner, workflowfiles, "", - "%s", - "%s/%s", - name=self.name, - **kwargs) - - jobmapper = ArvPathMapper(self.arvrunner, jobfiles, "", - "%s", - "%s/%s", - name=os.path.basename(self.job_order.get("id", "#")), - **kwargs) + workflowmapper = upload_dependencies(self.arvrunner, + self.name, + self.tool.doc_loader, + self.tool.tool, + self.tool.tool["id"], + True) - adjustFiles(self.job_order, lambda p: jobmapper.mapper(p)[1]) + jobmapper = upload_dependencies(self.arvrunner, + os.path.basename(self.job_order.get("id", "#")), + self.tool.doc_loader, + self.job_order, + self.job_order.get("id", "#"), + False) if "id" in self.job_order: del self.job_order["id"] @@ -77,7 +144,15 @@ class Runner(object): def done(self, record): if record["state"] == "Complete": - processStatus = "success" + if record.get("exit_code") is not None: + if record["exit_code"] == 33: + processStatus = "UnsupportedRequirement" + elif record["exit_code"] == 0: + processStatus = "success" + else: + processStatus = "permanentFail" + else: + processStatus = "success" else: processStatus = "permanentFail" @@ -87,12 +162,14 @@ class Runner(object): outc = arvados.collection.Collection(record["output"]) with outc.open("cwl.output.json") as f: outputs = json.load(f) - def keepify(path): + def keepify(fileobj): + path = fileobj["location"] if not path.startswith("keep:"): - return "keep:%s/%s" % (record["output"], path) - adjustFiles(outputs, keepify) + fileobj["location"] = "keep:%s/%s" % (record["output"], path) + adjustFileObjs(outputs, keepify) + adjustDirObjs(outputs, keepify) except Exception as e: logger.error("While getting final output object: %s", e) self.arvrunner.output_callback(outputs, processStatus) finally: - del self.arvrunner.jobs[record["uuid"]] + del self.arvrunner.processes[record["uuid"]]