configurable timeout and namespace in docker magic (#1550)

* configurable timeout and namespace in docker magic

* debug

* remove debug code

Author: gaoning777

sdk/python/kfp/dsl/_pipeline_volume.py

@@ -68,7 +68,6 @@ def __init__(self,
                 )
                 init_volume["persistent_volume_claim"] = pvc_volume_source
         super().__init__(**init_volume, **kwargs)
-
         if not name_provided:
             self.name = "pvolume-%s" % hashlib.sha256(
                 bytes(json.dumps(self.to_dict(), sort_keys=True), "utf-8")

sdk/python/kfp/notebook/_magic.py

@@ -21,18 +21,21 @@
 def docker(line, cell):
   """cell magic for %%docker"""
 
-  if len(line.split()) != 2:
-    raise ValueError("usage: %%docker [gcr.io/project/image:tag] [gs://staging-bucket]")
+  if len(line.split()) < 2:
+    raise ValueError("usage: %%docker [gcr.io/project/image:tag] [gs://staging-bucket] [600] [kubeflow]\n\
+                      arg1(required): target image tag\n\
+                      arg2(required): staging gcs bucket\n\
+                      arg3(optional): timeout in seconds, default(600)\n\
+                      arg4(optional): namespace, default(kubeflow)")
   if not cell.strip():
     raise ValueError("Please fill in a dockerfile content in the cell.")
 
-  target, staging = line.split()
-  
+  fields = line.split()
 
   with tempfile.NamedTemporaryFile(mode='wt', delete=False) as f:
     f.write(cell)
 
-  build_docker_image(staging, target, f.name)
+  build_docker_image(fields[1], fields[0], f.name, timeout=int(fields[2]) if len(fields)>=3 else 600, namespace=fields[3] if len(fields)>=4 else 'kubeflow')
   os.remove(f.name)
 
 try:

sdk/python/tests/dsl/pipeline_volume_tests.py

@@ -68,6 +68,5 @@ def test_omitting_name(self):
         name1 = ("pvolume-127ac63cf2013e9b95c192eb6a2c7d5a023ebeb51f6a114486e3"
                  "1216e083a563")
         name2 = "provided"
-
         self.assertEqual(vol1.name, name1)
         self.assertEqual(vol2.name, name2)