SDK - Moved the _container_builder from kfp.compiler to kfp.containers

sdk/python/kfp/compiler/__init__.py

@@ -14,4 +14,4 @@
 
 
 from .compiler import Compiler
-from ._component_builder import build_python_component, build_docker_image, VersionedDependency
+from ..containers._component_builder import build_python_component, build_docker_image, VersionedDependency

sdk/python/kfp/containers/_build_image_api.py

@@ -25,7 +25,7 @@
 
 import requests
 
-from ..compiler._container_builder import ContainerBuilder
+from ._container_builder import ContainerBuilder
 
 
 default_base_image = 'gcr.io/deeplearning-platform-release/tf-cpu.1-14'
@@ -40,7 +40,6 @@
 def _get_default_image_builder():
     global _default_image_builder
     if _default_image_builder is None:
-        from ..compiler._container_builder import ContainerBuilder
         _default_image_builder = ContainerBuilder()
     return _default_image_builder
 

sdk/python/kfp/compiler/_container_builder.py → sdk/python/kfp/containers/_container_builder.py

@@ -181,7 +181,7 @@ def build(self, local_dir, docker_filename : str = 'Dockerfile', target_image=No
                                                docker_filename=docker_filename,
                                                target_image=target_image)
       logging.info('Start a kaniko job for build.')
-      from ._k8s_helper import K8sHelper
+      from ..compiler._k8s_helper import K8sHelper
       k8s_helper = K8sHelper()
       result_pod_obj = k8s_helper.run_job(kaniko_spec, timeout)
       logging.info('Kaniko job complete.')

sdk/python/tests/compiler/component_builder_test.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from kfp.compiler._component_builder import _generate_dockerfile
-from kfp.compiler._component_builder import _dependency_to_requirements
-from kfp.compiler._component_builder import VersionedDependency
-from kfp.compiler._component_builder import DependencyHelper
+from kfp.containers._component_builder import _generate_dockerfile, _dependency_to_requirements, VersionedDependency, DependencyHelper
 
 import os
 import unittest
@@ -113,8 +110,6 @@ def test_add_python_package(self):
 class TestGenerator(unittest.TestCase):
   def test_generate_dockerfile(self):
     """ Test generate dockerfile """
-    from kfp.compiler._component_builder import _generate_dockerfile
-
     # prepare
     test_data_dir = os.path.join(os.path.dirname(__file__), 'testdata')
     target_dockerfile = os.path.join(test_data_dir, 'component.temp.dockerfile')

sdk/python/tests/compiler/container_builder_test.py

@@ -18,12 +18,12 @@
 import yaml
 import tempfile
 import mock
-from kfp.compiler._component_builder import ContainerBuilder
+from kfp.containers._component_builder import ContainerBuilder
 
 GCS_BASE = 'gs://kfp-testing/'
 GCR_IMAGE_TAG = 'gcr.io/kfp-testing/image'
 
-@mock.patch('kfp.compiler._gcs_helper.GCSHelper')
+@mock.patch('kfp.containers._gcs_helper.GCSHelper')
 class TestContainerBuild(unittest.TestCase):
 
   def test_wrap_dir_in_tarball(self, mock_gcshelper):

test/sample-test/sample_test_launcher.py

@@ -27,7 +27,7 @@
 
 from constants import PAPERMILL_ERR_MSG, BASE_DIR, TEST_DIR, SCHEMA_CONFIG, CONFIG_DIR, DEFAULT_CONFIG
 from check_notebook_results import NoteBookChecker
-from kfp.compiler._gcs_helper import GCSHelper
+from kfp.containers._gcs_helper import GCSHelper
 from run_sample_test import PySampleChecker