10081: Upload dependencies. Fix keep paths. Ensure correct quoting.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 0c56c8665e8b7bffc8e0cd1cea609800c5057364..f52c4a50907b6f6129a2cb8d1fafc872385f2acf 100644 (file)
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -23,9 +23,8 @@ import arvados.config
 from .arvcontainer import ArvadosContainer, RunnerContainer
 from .arvjob import ArvadosJob, RunnerJob, RunnerTemplate
 from .arvtool import ArvadosCommandTool
-from .arvworkflow import ArvadosWorkflow
+from .arvworkflow import ArvadosWorkflow, upload_workflow
 from .fsaccess import CollectionFsAccess
-from .arvworkflow import upload_workflow
 from .perf import Perf
 from cwltool.pack import pack
 

diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index 3bf62ad8d46d82feffb4627cff3385bca3a3750d..ab3940998bd669c3f5bc389866b19effb9a708d3 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -7,7 +7,7 @@ from cwltool.pack import pack
 from cwltool.load_tool import fetch_document
 from cwltool.process import shortname
 from cwltool.workflow import Workflow
-from cwltool.pathmapper import adjustDirObjs
+from cwltool.pathmapper import adjustFileObjs, adjustDirObjs
 
 import ruamel.yaml as yaml
 
@@ -59,14 +59,38 @@ class ArvadosWorkflow(Workflow):
         req, _ = self.get_requirement("http://arvados.org/cwl#RunInSingleContainer")
         if req:
             document_loader, workflowobj, uri = (self.doc_loader, self.doc_loader.fetch(self.tool["id"]), self.tool["id"])
+
             workflowobj["requirements"] = self.requirements + workflowobj.get("requirements", [])
             workflowobj["hints"] = self.hints + workflowobj.get("hints", [])
             packed = pack(document_loader, workflowobj, uri, self.metadata)
 
-            def prune_directories(obj):
-                if obj["location"].startswith("keep:") and "listing" in obj:
+            upload_dependencies(self.arvrunner,
+                                kwargs.get("name", ""),
+                                document_loader,
+                                packed,
+                                uri,
+                                False)
+
+            upload_dependencies(self.arvrunner,
+                                os.path.basename(joborder.get("id", "#")),
+                                document_loader,
+                                joborder,
+                                joborder.get("id", "#"),
+                                False)
+
+            joborder_keepmount = copy.deepcopy(joborder)
+
+            def keepmount(obj):
+                if obj["location"].startswith("keep:"):
+                    obj["location"] = "/keep/" + obj["location"][5:]
+                else:
+                    raise Exception("Uh oh %s" % obj["location"])
+                if "listing" in obj:
                     del obj["listing"]
-            adjustDirObjs(joborder, prune_directories)
+            adjustFileObjs(joborder_keepmount, keepmount)
+            adjustDirObjs(joborder_keepmount, keepmount)
+            adjustFileObjs(packed, keepmount)
+            adjustDirObjs(packed, keepmount)
 
             wf_runner = {
                 "class": "CommandLineTool",
@@ -83,11 +107,11 @@ class ArvadosWorkflow(Workflow):
                             "entry": yaml.safe_dump(packed).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${')
                         }, {
                             "entryname": "cwl.input.json",
-                            "entry": yaml.safe_dump(joborder).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${')
+                            "entry": yaml.safe_dump(joborder_keepmount).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${')
                         }]
                 }],
                 "hints": workflowobj["hints"],
-                "arguments": ["--no-container", "--move-outputs", "workflow.cwl", "cwl.input.json"]
+                "arguments": ["--no-container", "--move-outputs", "workflow.cwl#main", "cwl.input.json"]
             }
             kwargs["loader"] = self.doc_loader
             kwargs["avsc_names"] = self.doc_schema

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 155c6a05039ec65649975d038073185fbc5c4338..2e52b63ed695d36b9e9d28efc49547c9875e6c53 100644 (file)
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -87,7 +87,8 @@ def upload_dependencies(arvrunner, name, document_loader,
                            name=name)
 
     def setloc(p):
-        p["location"] = mapper.mapper(p["location"]).target
+        if not p["location"].startswith("keep:"):
+            p["location"] = mapper.mapper(p["location"]).resolved
     adjustFileObjs(workflowobj, setloc)
     adjustDirObjs(workflowobj, setloc)