chore(sdk): partition KFP SDK source code into runtime and non-runtime code (#9710)

sdk/python/kfp/__init__.py

@@ -20,5 +20,6 @@ __version__ = '2.0.1'
 
 TYPE_CHECK = True
 
+from kfp import components
 from kfp import dsl
 from kfp.client import Client

sdk/python/kfp/cli/compile_.py

@@ -22,8 +22,8 @@ from typing import Callable, Dict, Optional
 
 import click
 from kfp import compiler
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components import graph_component
+from kfp.dsl import graph_component
 
 
 def is_pipeline_func(func: Callable) -> bool:

sdk/python/kfp/cli/component.py

@@ -31,9 +31,9 @@ except ImportError:
     _DOCKER_IS_PRESENT = False
 
 import kfp as kfp
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components import kfp_config
+from kfp.dsl import kfp_config
-from kfp.components import utils
+from kfp.dsl import utils
 
 _REQUIREMENTS_TXT = 'runtime-requirements.txt'
 

sdk/python/kfp/client/client.py

@@ -32,7 +32,7 @@ from google.protobuf import json_format
 from kfp import compiler
 from kfp.client import auth
 from kfp.client import set_volume_credentials
-from kfp.components import base_component
+from kfp.dsl import base_component
 from kfp.pipeline_spec import pipeline_spec_pb2
 import kfp_server_api
 import yaml

sdk/python/kfp/compiler/compiler.py

@@ -20,8 +20,8 @@ https://docs.google.com/document/d/1PUDuSQ8vmeKSBloli53mp7GIvzekaY7sggg6ywy35Dk/
 from typing import Any, Dict, Optional
 
 from kfp.compiler import pipeline_spec_builder as builder
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 
 class Compiler:

sdk/python/kfp/compiler/compiler_test.py

@@ -31,17 +31,17 @@ from kfp import dsl
 from kfp.cli import cli
 from kfp.compiler import compiler
 from kfp.compiler import compiler_utils
-from kfp.components import graph_component
-from kfp.components import pipeline_task
-from kfp.components import yaml_component
-from kfp.components.types import type_utils
 from kfp.dsl import Artifact
 from kfp.dsl import ContainerSpec
+from kfp.dsl import graph_component
 from kfp.dsl import Input
 from kfp.dsl import Model
 from kfp.dsl import Output
 from kfp.dsl import OutputPath
+from kfp.dsl import pipeline_task
 from kfp.dsl import PipelineTaskFinalStatus
+from kfp.dsl import yaml_component
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 
@@ -152,18 +152,6 @@ class TestCompilePipeline(parameterized.TestCase):
             with open(target_json_file, 'r') as f:
                 f.read()
 
-    def test_compile_pipeline_with_dsl_graph_component_should_raise_error(self):
-
-        with self.assertRaisesRegex(
-                AttributeError,
-                "module 'kfp.dsl' has no attribute 'graph_component'"):
-
-            @dsl.graph_component
-            def flip_coin_graph_component():
-                flip = flip_coin_op()
-                with dsl.Condition(flip.output == 'heads'):
-                    flip_coin_graph_component()
-
     def test_compile_pipeline_with_misused_inputvalue_should_raise_error(self):
 
         upstream_op = components.load_component_from_text("""

sdk/python/kfp/compiler/compiler_utils.py

@@ -17,11 +17,11 @@ import collections
 from copy import deepcopy
 from typing import DefaultDict, Dict, List, Mapping, Set, Tuple, Union
 
-from kfp.components import for_loop
+from kfp.dsl import for_loop
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import pipeline_context
+from kfp.dsl import pipeline_context
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import tasks_group
+from kfp.dsl import tasks_group
 
 GroupOrTaskType = Union[tasks_group.TasksGroup, pipeline_task.PipelineTask]
 

sdk/python/kfp/compiler/compiler_utils_test.py

@@ -16,7 +16,7 @@ import unittest
 
 from absl.testing import parameterized
 from kfp.compiler import compiler_utils
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 
 class TestAdditionalInputNameForPipelineChannel(parameterized.TestCase):

sdk/python/kfp/compiler/pipeline_spec_builder.py

@@ -24,16 +24,16 @@ from google.protobuf import json_format
 from google.protobuf import struct_pb2
 import kfp
 from kfp.compiler import compiler_utils
-from kfp.components import for_loop
+from kfp.dsl import for_loop
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import pipeline_context
+from kfp.dsl import pipeline_context
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components import tasks_group
+from kfp.dsl import tasks_group
-from kfp.components import utils
+from kfp.dsl import utils
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 

sdk/python/kfp/compiler/read_write_test.py

@@ -22,9 +22,9 @@ import unittest
 from absl.testing import parameterized
 from kfp import compiler
 from kfp import components
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import python_component
+from kfp.dsl import python_component
-from kfp.components import structures
+from kfp.dsl import structures
 import yaml
 
 _PROJECT_ROOT = os.path.abspath(os.path.join(__file__, *([os.path.pardir] * 5)))

sdk/python/kfp/components/__init__.py

@@ -24,10 +24,10 @@ __all__ = [
     'YamlComponent',
 ]
 
-from kfp.components.base_component import BaseComponent
+from kfp.components.load_yaml_utilities import load_component_from_file
-from kfp.components.container_component import ContainerComponent
+from kfp.components.load_yaml_utilities import load_component_from_text
-from kfp.components.python_component import PythonComponent
+from kfp.components.load_yaml_utilities import load_component_from_url
-from kfp.components.yaml_component import load_component_from_file
+from kfp.dsl.base_component import BaseComponent
-from kfp.components.yaml_component import load_component_from_text
+from kfp.dsl.container_component_class import ContainerComponent
-from kfp.components.yaml_component import load_component_from_url
+from kfp.dsl.python_component import PythonComponent
-from kfp.components.yaml_component import YamlComponent
+from kfp.dsl.yaml_component import YamlComponent

sdk/python/kfp/components/load_yaml_utilities.py

@@ -15,49 +15,12 @@
 
 from typing import Optional, Tuple
 
-from google.protobuf import json_format
+from kfp.dsl import structures
-from kfp import components
+from kfp.dsl import yaml_component
-from kfp.components import structures
-from kfp.pipeline_spec import pipeline_spec_pb2
 import requests
 
 
-class YamlComponent(components.BaseComponent):
+def load_component_from_text(text: str) -> yaml_component.YamlComponent:
-    """A component loaded from a YAML file.
-
-    **Note:** ``YamlComponent`` is not intended to be used to construct components directly. Use ``kfp.components.load_component_from_*()`` instead.
-
-    Attribute:
-        component_spec: Component definition.
-        component_yaml: The yaml string that this component is loaded from.
-    """
-
-    def __init__(
-        self,
-        component_spec: structures.ComponentSpec,
-        component_yaml: str,
-    ):
-        super().__init__(component_spec=component_spec)
-        self.component_yaml = component_yaml
-
-    @property
-    def pipeline_spec(self) -> pipeline_spec_pb2.PipelineSpec:
-        """Returns the pipeline spec of the component."""
-        component_dict = structures.load_documents_from_yaml(
-            self.component_yaml)[0]
-        is_v1 = 'implementation' in set(component_dict.keys())
-        if is_v1:
-            return self.component_spec.to_pipeline_spec()
-        else:
-            return json_format.ParseDict(component_dict,
-                                         pipeline_spec_pb2.PipelineSpec())
-
-    def execute(self, *args, **kwargs):
-        """Not implemented."""
-        raise NotImplementedError
-
-
-def load_component_from_text(text: str) -> YamlComponent:
     """Loads a component from text.
 
     Args:
@@ -66,12 +29,12 @@ def load_component_from_text(text: str) -> YamlComponent:
     Returns:
         Component loaded from YAML.
     """
-    return YamlComponent(
+    return yaml_component.YamlComponent(
         component_spec=structures.ComponentSpec.from_yaml_documents(text),
         component_yaml=text)
 
 
-def load_component_from_file(file_path: str) -> YamlComponent:
+def load_component_from_file(file_path: str) -> yaml_component.YamlComponent:
     """Loads a component from a file.
 
     Args:
@@ -91,9 +54,9 @@ def load_component_from_file(file_path: str) -> YamlComponent:
         return load_component_from_text(component_stream.read())
 
 
-def load_component_from_url(url: str,
+def load_component_from_url(
-                            auth: Optional[Tuple[str,
+        url: str,
-                                                 str]] = None) -> YamlComponent:
+        auth: Optional[Tuple[str, str]] = None) -> yaml_component.YamlComponent:
     """Loads a component from a URL.
 
     Args:

sdk/python/kfp/components/load_yaml_utilities_test.py

@@ -11,15 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.yaml_component."""
+"""Tests for kfp.dsl.yaml_component."""
 
 import os
 import tempfile
 import textwrap
 import unittest
 
-from kfp.components import structures
+from kfp import components
-from kfp.components import yaml_component
+from kfp.dsl import structures
 
 SAMPLE_YAML = textwrap.dedent("""\
 components:
@@ -84,10 +84,10 @@ V1_COMPONENT_YAML_TEST_CASES = [
 ]
 
 
-class YamlComponentTest(unittest.TestCase):
+class LoadYamlTests(unittest.TestCase):
 
     def test_load_component_from_text(self):
-        component = yaml_component.load_component_from_text(SAMPLE_YAML)
+        component = components.load_component_from_text(SAMPLE_YAML)
         self.assertEqual(component.component_spec.name, 'component-1')
         self.assertEqual(component.component_spec.outputs,
                          {'output1': structures.OutputSpec(type='String')})
@@ -101,7 +101,7 @@ class YamlComponentTest(unittest.TestCase):
             path = os.path.join(tmpdir, 'sample_yaml.yaml')
             with open(path, 'w') as f:
                 f.write(SAMPLE_YAML)
-            component = yaml_component.load_component_from_file(path)
+            component = components.load_component_from_file(path)
         self.assertEqual(component.component_spec.name, 'component-1')
         self.assertEqual(component.component_spec.outputs,
                          {'output1': structures.OutputSpec(type='String')})
@@ -112,7 +112,7 @@ class YamlComponentTest(unittest.TestCase):
 
     def test_load_component_from_url(self):
         component_url = 'https://raw.githubusercontent.com/kubeflow/pipelines/7b49eadf621a9054e1f1315c86f95fb8cf8c17c3/sdk/python/kfp/compiler/test_data/components/identity.yaml'
-        component = yaml_component.load_component_from_url(component_url)
+        component = components.load_component_from_url(component_url)
 
         self.assertEqual(component.component_spec.name, 'identity')
         self.assertEqual(component.component_spec.outputs,

sdk/python/kfp/components/test_data/simple_yaml.yaml

@@ -1,16 +0,0 @@
-name: component_1
-inputs:
-  input1: {type: String}
-outputs:
-  output1: {type: String}
-implementation:
-  container:
-    image: alpine
-    command:
-    - sh
-    - -c
-    - 'set -ex
-
-    echo "$0" > "$1"'
-    - {inputValue: input1}
-    - {outputPath: output1}

sdk/python/kfp/dsl/__init__.py

@@ -57,31 +57,31 @@ except ImportError:
 
 from typing import TypeVar
 
-from kfp.components.component_decorator import component
+from kfp.dsl.component_decorator import component
-from kfp.components.container_component_decorator import container_component
+from kfp.dsl.container_component_decorator import container_component
-from kfp.components.for_loop import Collected
+from kfp.dsl.for_loop import Collected
-from kfp.components.importer_node import importer
+from kfp.dsl.importer_node import importer
-from kfp.components.pipeline_context import pipeline
+from kfp.dsl.pipeline_context import pipeline
-from kfp.components.pipeline_task import PipelineTask
+from kfp.dsl.pipeline_task import PipelineTask
-from kfp.components.placeholders import ConcatPlaceholder
+from kfp.dsl.placeholders import ConcatPlaceholder
-from kfp.components.placeholders import IfPresentPlaceholder
+from kfp.dsl.placeholders import IfPresentPlaceholder
-from kfp.components.structures import ContainerSpec
+from kfp.dsl.structures import ContainerSpec
-from kfp.components.task_final_status import PipelineTaskFinalStatus
+from kfp.dsl.task_final_status import PipelineTaskFinalStatus
-from kfp.components.tasks_group import Condition
+from kfp.dsl.tasks_group import Condition
-from kfp.components.tasks_group import ExitHandler
+from kfp.dsl.tasks_group import ExitHandler
-from kfp.components.tasks_group import ParallelFor
+from kfp.dsl.tasks_group import ParallelFor
-from kfp.components.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import ClassificationMetrics
+from kfp.dsl.types.artifact_types import ClassificationMetrics
-from kfp.components.types.artifact_types import Dataset
+from kfp.dsl.types.artifact_types import Dataset
-from kfp.components.types.artifact_types import HTML
+from kfp.dsl.types.artifact_types import HTML
-from kfp.components.types.artifact_types import Markdown
+from kfp.dsl.types.artifact_types import Markdown
-from kfp.components.types.artifact_types import Metrics
+from kfp.dsl.types.artifact_types import Metrics
-from kfp.components.types.artifact_types import Model
+from kfp.dsl.types.artifact_types import Model
-from kfp.components.types.artifact_types import SlicedClassificationMetrics
+from kfp.dsl.types.artifact_types import SlicedClassificationMetrics
-from kfp.components.types.type_annotations import InputAnnotation
+from kfp.dsl.types.type_annotations import InputAnnotation
-from kfp.components.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputAnnotation
+from kfp.dsl.types.type_annotations import OutputAnnotation
-from kfp.components.types.type_annotations import OutputPath
+from kfp.dsl.types.type_annotations import OutputPath
 
 # hack: constants and custom type generics have to be defined here to be captured by autodoc and autodocsumm used in ./docs/conf.py
 

sdk/python/kfp/dsl/base_component.py

@@ -16,9 +16,9 @@
 import abc
 from typing import List
 
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 

sdk/python/kfp/dsl/base_component_test.py

@@ -11,18 +11,18 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.base_component."""
+"""Tests for kfp.dsl.base_component."""
 
 import unittest
 from unittest.mock import patch
 
 from kfp import dsl
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import PythonComponent
+from kfp.dsl import python_component
-from kfp.components import structures
+from kfp.dsl import structures
 
-component_op = PythonComponent(
+component_op = python_component.PythonComponent(
     # dummy python_func not used in behavior that is being tested
     python_func=lambda: None,
     component_spec=structures.ComponentSpec(

sdk/python/kfp/dsl/component_decorator.py

@@ -16,7 +16,7 @@ import functools
 from typing import Callable, List, Optional
 import warnings
 
-from kfp.components import component_factory
+from kfp.dsl import component_factory
 
 
 def component(func: Optional[Callable] = None,

sdk/python/kfp/dsl/component_decorator_test.py

@@ -17,9 +17,9 @@ import tempfile
 from typing import Dict, List, NamedTuple
 import unittest
 
-from kfp.components import python_component
+from kfp.dsl import python_component
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components.component_decorator import component
+from kfp.dsl.component_decorator import component
 
 
 class TestComponentDecorator(unittest.TestCase):

sdk/python/kfp/dsl/component_factory.py

@@ -21,17 +21,17 @@ from typing import Callable, List, Mapping, Optional, Tuple, Type, Union
 import warnings
 
 import docstring_parser
-from kfp.components import container_component
+from kfp.dsl import container_component_artifact_channel
-from kfp.components import container_component_artifact_channel
+from kfp.dsl import container_component_class
-from kfp.components import graph_component
+from kfp.dsl import graph_component
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import python_component
+from kfp.dsl import python_component
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components import task_final_status
+from kfp.dsl import task_final_status
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import custom_artifact_types
+from kfp.dsl.types import custom_artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 _DEFAULT_BASE_IMAGE = 'python:3.7'
 
@@ -195,7 +195,7 @@ def extract_component_interface(
             passing_style = type_annotations.get_io_artifact_annotation(
                 parameter_type)
 
-            # parameter_type is a type like typing_extensions.Annotated[kfp.components.types.artifact_types.Artifact, <class 'kfp.components.types.type_annotations.OutputAnnotation'>] OR typing_extensions.Annotated[typing.List[kfp.components.types.artifact_types.Artifact], <class 'kfp.components.types.type_annotations.OutputAnnotation'>]
+            # parameter_type is a type like typing_extensions.Annotated[kfp.dsl.types.artifact_types.Artifact, <class 'kfp.dsl.types.type_annotations.OutputAnnotation'>] OR typing_extensions.Annotated[typing.List[kfp.dsl.types.artifact_types.Artifact], <class 'kfp.dsl.types.type_annotations.OutputAnnotation'>]
 
             is_artifact_list = type_annotations.is_list_of_artifacts(
                 parameter_type.__origin__)
@@ -421,7 +421,7 @@ def _get_command_and_args_for_lightweight_component(
         textwrap.dedent('''\
                     program_path=$(mktemp -d)
                     printf "%s" "$0" > "$program_path/ephemeral_component.py"
-                    python3 -m kfp.components.executor_main \
+                    python3 -m kfp.dsl.executor_main \
                         --component_module_path \
                         "$program_path/ephemeral_component.py" \
                         "$@"
@@ -444,7 +444,7 @@ def _get_command_and_args_for_containerized_component(
     command = [
         'python3',
         '-m',
-        'kfp.components.executor_main',
+        'kfp.dsl.executor_main',
     ]
 
     args = [
@@ -569,7 +569,7 @@ def make_input_for_parameterized_container_component_function(
 
 
 def create_container_component_from_func(
-        func: Callable) -> container_component.ContainerComponent:
+        func: Callable) -> container_component_class.ContainerComponent:
     """Implementation for the @container_component decorator.
 
     The decorator is defined under container_component_decorator.py. See
@@ -593,7 +593,7 @@ def create_container_component_from_func(
     component_spec.implementation = structures.Implementation(
         container_spec_implementation)
     component_spec._validate_placeholders()
-    return container_component.ContainerComponent(component_spec, func)
+    return container_component_class.ContainerComponent(component_spec, func)
 
 
 def create_graph_component_from_func(

sdk/python/kfp/dsl/component_factory_test.py

@@ -16,14 +16,14 @@ from typing import List
 import unittest
 
 from kfp import dsl
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components import structures
-from kfp.components.component_decorator import component
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import structures
+from kfp.dsl.component_decorator import component
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class TestGetPackagesToInstallCommand(unittest.TestCase):

sdk/python/kfp/dsl/container_component_artifact_channel.py

@@ -14,8 +14,6 @@
 
 from typing import Union
 
-from kfp.components import placeholders
-
 
 class ContainerComponentArtifactChannel:
     """A class for passing in placeholders into container_component decorated
@@ -25,13 +23,10 @@ class ContainerComponentArtifactChannel:
         self._io_type = io_type
         self._var_name = var_name
 
-    def __getattr__(
+    def __getattr__(self, _name: str) -> Union['placeholders.Placeholder']:
-        self, _name: str
+        # aviod circular imports
-    ) -> Union[placeholders.InputUriPlaceholder, placeholders
+        from kfp.dsl import placeholders
-               .InputPathPlaceholder, placeholders.OutputUriPlaceholder,
+
-               placeholders.OutputPathPlaceholder,
-               placeholders.InputMetadataPlaceholder,
-               placeholders.OutputMetadataPlaceholder]:
         attr_to_placeholder_dict = {
             'uri': {
                 'input': placeholders.InputUriPlaceholder,

sdk/python/kfp/dsl/container_component_artifact_channel_test.py

@@ -14,8 +14,8 @@
 
 import unittest
 
-from kfp.components import container_component_artifact_channel
+from kfp.dsl import container_component_artifact_channel
-from kfp.components import placeholders
+from kfp.dsl import placeholders
 
 
 class TestContainerComponentArtifactChannel(unittest.TestCase):

sdk/python/kfp/dsl/container_component_class.py

@@ -15,8 +15,8 @@
 
 from typing import Callable
 
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components import structures
+from kfp.dsl import structures
 
 
 class ContainerComponent(base_component.BaseComponent):

sdk/python/kfp/dsl/container_component_decorator.py

@@ -14,12 +14,12 @@
 
 from typing import Callable
 
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components import container_component
+from kfp.dsl import container_component_class
 
 
 def container_component(
-        func: Callable) -> container_component.ContainerComponent:
+        func: Callable) -> container_component_class.ContainerComponent:
     """Decorator for container-based components in KFP v2.
 
     Args:

sdk/python/kfp/dsl/container_component_decorator_test.py

@@ -16,8 +16,8 @@ from typing import Dict, List
 import unittest
 
 from kfp import dsl
-from kfp.components import container_component
 from kfp.dsl import Artifact
+from kfp.dsl import container_component_class
 from kfp.dsl import Input
 from kfp.dsl import Output
 
@@ -36,7 +36,7 @@ class TestContainerComponentDecorator(unittest.TestCase):
             )
 
         self.assertIsInstance(hello_world,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
         self.assertIsNone(hello_world.component_spec.inputs)
 
     def test_func_with_simple_io(self):
@@ -52,7 +52,7 @@ class TestContainerComponentDecorator(unittest.TestCase):
                 args=['--text', text, '--output_path', text_output_path])
 
         self.assertIsInstance(hello_world_io,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
 
     def test_func_with_artifact_io(self):
 
@@ -78,7 +78,7 @@ class TestContainerComponentDecorator(unittest.TestCase):
                 ])
 
         self.assertIsInstance(container_comp_with_artifacts,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
 
 
 class TestInputValuePlaceholderIrTypeHack(unittest.TestCase):

sdk/python/kfp/dsl/executor.py

@@ -16,10 +16,10 @@ import json
 import os
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from kfp.components import python_component
+from kfp.dsl import python_component
-from kfp.components import task_final_status
+from kfp.dsl import task_final_status
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl.types import type_annotations
 
 
 class Executor():

sdk/python/kfp/dsl/executor_main.py

@@ -17,9 +17,9 @@ import logging
 import os
 import sys
 
-from kfp.components import executor as component_executor
+from kfp.dsl import executor as component_executor
-from kfp.components import kfp_config
+from kfp.dsl import kfp_config
-from kfp.components import utils
+from kfp.dsl import utils
 
 
 def _setup_logging():

sdk/python/kfp/dsl/executor_test.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.executor."""
+"""Tests for kfp.dsl.executor."""
 
 import json
 import os
@@ -21,17 +21,17 @@ import unittest
 from unittest import mock
 
 from absl.testing import parameterized
-from kfp.components import executor
+from kfp.dsl import executor
-from kfp.components.task_final_status import PipelineTaskFinalStatus
-from kfp.components.types import artifact_types
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Dataset
-from kfp.components.types.artifact_types import Metrics
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.task_final_status import PipelineTaskFinalStatus
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Dataset
+from kfp.dsl.types.artifact_types import Metrics
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class ExecutorTest(parameterized.TestCase):

sdk/python/kfp/dsl/for_loop.py

@@ -16,7 +16,7 @@
 import re
 from typing import Any, Dict, List, Optional, Union
 
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 ItemList = List[Union[int, float, str, Dict[str, Any]]]
 

sdk/python/kfp/dsl/for_loop_test.py

@@ -15,8 +15,8 @@
 import unittest
 
 from absl.testing import parameterized
-from kfp.components import for_loop
+from kfp.dsl import for_loop
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 
 class ForLoopTest(parameterized.TestCase):

sdk/python/kfp/dsl/graph_component.py

@@ -18,10 +18,10 @@ from typing import Callable, Optional
 import uuid
 
 from kfp.compiler import pipeline_spec_builder as builder
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import pipeline_context
+from kfp.dsl import pipeline_context
-from kfp.components import structures
+from kfp.dsl import structures
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 

sdk/python/kfp/dsl/importer_component.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 """Importer-based component."""
 
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components import structures
+from kfp.dsl import structures
 
 
 class ImporterComponent(base_component.BaseComponent):

sdk/python/kfp/dsl/importer_node.py

@@ -15,14 +15,14 @@
 
 from typing import Any, Dict, Mapping, Optional, Type, Union
 
-from kfp.components import importer_component
+from kfp.dsl import importer_component
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components import utils
+from kfp.dsl import utils
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 URI_KEY = 'uri'
 OUTPUT_KEY = 'artifact'

sdk/python/kfp/dsl/importer_node_test.py

@@ -14,8 +14,8 @@
 import unittest
 
 from kfp import dsl
-from kfp.components import importer_node
+from kfp.dsl import importer_node
-from kfp.components.types.artifact_types import Dataset
+from kfp.dsl.types.artifact_types import Dataset
 
 
 class TestImporterSupportsDynamicMetadata(unittest.TestCase):

sdk/python/kfp/dsl/pipeline_channel.py

@@ -20,7 +20,7 @@ import json
 import re
 from typing import Dict, List, Optional, Union
 
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 
 @dataclasses.dataclass
@@ -97,7 +97,7 @@ class PipelineChannel(abc.ABC):
         # so that serialization and unserialization remain consistent
         # (i.e. None => '' => None)
         self.task_name = task_name or None
-        from kfp.components import pipeline_context
+        from kfp.dsl import pipeline_context
 
         default_pipeline = pipeline_context.Pipeline.get_default_pipeline()
         if self.task_name is not None and default_pipeline is not None and default_pipeline.tasks:

sdk/python/kfp/dsl/pipeline_channel_test.py

@@ -11,13 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.pipeline_channel."""
+"""Tests for kfp.dsl.pipeline_channel."""
 
 import unittest
 
 from absl.testing import parameterized
 from kfp import dsl
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 
 class PipelineChannelTest(parameterized.TestCase):

sdk/python/kfp/dsl/pipeline_context.py

@@ -16,10 +16,10 @@
 import functools
 from typing import Callable, Optional
 
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import tasks_group
+from kfp.dsl import tasks_group
-from kfp.components import utils
+from kfp.dsl import utils
 
 
 def pipeline(func: Optional[Callable] = None,

sdk/python/kfp/dsl/pipeline_task.py

@@ -20,12 +20,12 @@ import re
 from typing import Any, Dict, List, Mapping, Optional, Union
 import warnings
 
-from kfp.components import constants
+from kfp.dsl import constants
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import structures
+from kfp.dsl import structures
-from kfp.components import utils
+from kfp.dsl import utils
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 _register_task_handler = lambda task: utils.maybe_rename_for_k8s(
@@ -69,7 +69,7 @@ class PipelineTask:
     ):
         """Initilizes a PipelineTask instance."""
         # import within __init__ to avoid circular import
-        from kfp.components.tasks_group import TasksGroup
+        from kfp.dsl.tasks_group import TasksGroup
 
         self.parent_task_group: Union[None, TasksGroup] = None
         args = args or {}
@@ -617,7 +617,7 @@ class PipelineTask:
         return self
 
 
-# TODO: this function should ideally be in the function kfp.components.structures.check_placeholder_references_valid_io_name, which does something similar, but this causes the exception to be raised at component definition time, rather than compile time. This would break tests that load v1 component YAML, even though that YAML is invalid.
+# TODO: this function should ideally be in the function kfp.dsl.structures.check_placeholder_references_valid_io_name, which does something similar, but this causes the exception to be raised at component definition time, rather than compile time. This would break tests that load v1 component YAML, even though that YAML is invalid.
 def check_primitive_placeholder_is_used_for_correct_io_type(
     inputs_dict: Dict[str, structures.InputSpec],
     outputs_dict: Dict[str, structures.OutputSpec],

sdk/python/kfp/dsl/pipeline_task_test.py

@@ -11,16 +11,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.pipeline_task."""
+"""Tests for kfp.dsl.pipeline_task."""
 
 import textwrap
 import unittest
 
 from absl.testing import parameterized
 from kfp import dsl
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import structures
+from kfp.dsl import structures
 
 V2_YAML = textwrap.dedent("""\
 components:

sdk/python/kfp/dsl/placeholders.py

@@ -18,8 +18,8 @@ import abc
 import json
 from typing import Any, Dict, List, Optional, Union
 
-from kfp.components import utils
+from kfp.dsl import utils
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 
 class Placeholder(abc.ABC):

sdk/python/kfp/dsl/placeholders_test.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Contains tests for kfp.components.placeholders."""
+"""Contains tests for kfp.dsl.placeholders."""
 import os
 import tempfile
 from typing import Any, List
@@ -19,11 +19,11 @@ from typing import Any, List
 from absl.testing import parameterized
 from kfp import compiler
 from kfp import dsl
-from kfp.components import placeholders
 from kfp.dsl import Artifact
 from kfp.dsl import Dataset
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import placeholders
 
 
 class TestExecutorInputPlaceholder(parameterized.TestCase):

sdk/python/kfp/dsl/python_component.py

@@ -15,11 +15,11 @@
 
 from typing import Callable
 
-from kfp import components
+from kfp.dsl import base_component
-from kfp.components import structures
+from kfp.dsl import structures
 
 
-class PythonComponent(components.BaseComponent):
+class PythonComponent(base_component.BaseComponent):
     """A component defined via Python function.
 
     **Note:** ``PythonComponent`` is not intended to be used to construct components directly. Use ``@kfp.dsl.component`` instead.

sdk/python/kfp/dsl/structures.py

@@ -23,15 +23,15 @@ import uuid
 
 from google.protobuf import json_format
 import kfp
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import utils
+from kfp.dsl import utils
-from kfp.components import v1_components
+from kfp.dsl import v1_components
-from kfp.components import v1_structures
+from kfp.dsl import v1_structures
-from kfp.components.container_component_artifact_channel import \
+from kfp.dsl.container_component_artifact_channel import \
     ContainerComponentArtifactChannel
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 
@@ -912,9 +912,9 @@ class ComponentSpec:
         # import here to aviod circular module dependency
         from kfp.compiler import compiler_utils
         from kfp.compiler import pipeline_spec_builder as builder
-        from kfp.components import pipeline_channel
+        from kfp.dsl import pipeline_channel
-        from kfp.components import pipeline_task
+        from kfp.dsl import pipeline_task
-        from kfp.components import tasks_group
+        from kfp.dsl import tasks_group
 
         args_dict = {}
         pipeline_inputs = self.inputs or {}

sdk/python/kfp/dsl/structures_test.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.structures."""
+"""Tests for kfp.dsl.structures."""
 
 import os
 import tempfile
@@ -22,9 +22,9 @@ from absl.testing import parameterized
 from kfp import compiler
 from kfp import components
 from kfp import dsl
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components import placeholders
+from kfp.dsl import placeholders
-from kfp.components import structures
+from kfp.dsl import structures
 
 V1_YAML_IF_PLACEHOLDER = textwrap.dedent("""\
     implementation:

sdk/python/kfp/dsl/tasks_group.py

@@ -16,10 +16,10 @@
 import enum
 from typing import Optional, Union
 
-from kfp.components import for_loop
+from kfp.dsl import for_loop
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
-from kfp.components import pipeline_context
+from kfp.dsl import pipeline_context
-from kfp.components import pipeline_task
+from kfp.dsl import pipeline_task
 
 
 class TasksGroupType(str, enum.Enum):

sdk/python/kfp/dsl/tasks_group_test.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 from absl.testing import parameterized
-from kfp.components import for_loop
+from kfp.dsl import for_loop
-from kfp.components import pipeline_context
+from kfp.dsl import pipeline_context
-from kfp.components import tasks_group
+from kfp.dsl import tasks_group
 
 
 class ParallelForTest(parameterized.TestCase):

sdk/python/kfp/dsl/types/artifact_types_test.py

@@ -18,7 +18,7 @@ import os
 import unittest
 
 from absl.testing import parameterized
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
 
 
 class ArtifactsTest(parameterized.TestCase):

sdk/python/kfp/dsl/types/custom_artifact_types.py

@@ -16,9 +16,9 @@ import ast
 import inspect
 from typing import Callable, Dict, List, Union
 
-from kfp.components import component_factory
+from kfp.dsl import component_factory
-from kfp.components.types import type_annotations
+from kfp.dsl.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 RETURN_PREFIX = 'return-'
 

sdk/python/kfp/dsl/types/custom_artifact_types_test.py

@@ -24,14 +24,14 @@ import unittest
 from absl.testing import parameterized
 import kfp
 from kfp import dsl
-from kfp.components.types import artifact_types
-from kfp.components.types import custom_artifact_types
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Dataset
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import custom_artifact_types
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Dataset
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputPath
 
 Alias = Artifact
 artifact_types_alias = artifact_types
@@ -219,9 +219,9 @@ class TestGetParamToCustomArtifactClass(_TestCaseWithThirdPartyPackage):
 class TestGetFullQualnameForArtifact(_TestCaseWithThirdPartyPackage):
     # only gets called on artifacts, so don't need to test on all types
     @parameterized.parameters([
-        (Alias, 'kfp.components.types.artifact_types.Artifact'),
+        (Alias, 'kfp.dsl.types.artifact_types.Artifact'),
-        (Artifact, 'kfp.components.types.artifact_types.Artifact'),
+        (Artifact, 'kfp.dsl.types.artifact_types.Artifact'),
-        (Dataset, 'kfp.components.types.artifact_types.Dataset'),
+        (Dataset, 'kfp.dsl.types.artifact_types.Dataset'),
     ])
     def test(self, obj: Any, expected_qualname: str):
         self.assertEqual(

sdk/python/kfp/dsl/types/type_annotations.py

@@ -19,9 +19,9 @@ These are only compatible with v2 Pipelines.
 import re
 from typing import List, Type, TypeVar, Union
 
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 
 class OutputPath:

sdk/python/kfp/dsl/types/type_annotations_test.py

@@ -11,21 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.types.type_annotations."""
+"""Tests for kfp.dsl.types.type_annotations."""
 
 from typing import Any, Dict, List, Optional
 import unittest
 
 from absl.testing import parameterized
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import InputAnnotation
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputAnnotation
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import InputAnnotation
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputAnnotation
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class AnnotationsTest(parameterized.TestCase):

sdk/python/kfp/dsl/types/type_utils.py

@@ -20,11 +20,10 @@ from typing import Any, Callable, Dict, Optional, Type, Union
 import warnings
 
 import kfp
-from kfp.components import pipeline_channel
+from kfp.dsl import structures
-from kfp.components import structures
+from kfp.dsl import task_final_status
-from kfp.components import task_final_status
+from kfp.dsl.types import artifact_types
-from kfp.components.types import artifact_types
+from kfp.dsl.types import type_annotations
-from kfp.components.types import type_annotations
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 DEFAULT_ARTIFACT_SCHEMA_VERSION = '0.0.1'
@@ -231,9 +230,9 @@ def _get_type_string_from_component_argument(
     argument_value: Union['pipeline_channel.PipelineChannel', str, bool, int,
                           float, dict, list]
 ) -> str:
-    # argument is a PipelineChannel
+    # avoid circular imports
-    if isinstance(argument_value,
+    from kfp.dsl import pipeline_channel
-                  kfp.components.pipeline_channel.PipelineChannel):
+    if isinstance(argument_value, pipeline_channel.PipelineChannel):
         return argument_value.channel_type
 
     # argument is a constant

sdk/python/kfp/dsl/types/type_utils_test.py

@@ -21,16 +21,16 @@ import kfp
 from kfp import compiler
 from kfp import components
 from kfp import dsl
-from kfp.components import base_component
+from kfp.dsl import base_component
-from kfp.components import pipeline_channel
-from kfp.components import structures
-from kfp.components import yaml_component
-from kfp.components.types import artifact_types
-from kfp.components.types import type_utils
-from kfp.components.types.type_utils import InconsistentTypeException
 from kfp.dsl import Dataset
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import pipeline_channel
+from kfp.dsl import structures
+from kfp.dsl import yaml_component
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_utils
+from kfp.dsl.types.type_utils import InconsistentTypeException
 from kfp.pipeline_spec import pipeline_spec_pb2 as pb
 
 _PARAMETER_TYPES = [

sdk/python/kfp/dsl/utils_test.py

@@ -11,12 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.utils."""
+"""Tests for kfp.dsl.utils."""
 
 import unittest
 
 from absl.testing import parameterized
-from kfp.components import utils
+from kfp.dsl import utils
 
 
 class UtilsTest(parameterized.TestCase):

sdk/python/kfp/dsl/v1_components.py

@@ -15,7 +15,7 @@
 import hashlib
 import warnings
 
-from kfp.components import v1_structures
+from kfp.dsl import v1_structures
 import yaml
 
 

sdk/python/kfp/dsl/v1_structures.py

@@ -15,10 +15,9 @@
 from collections import OrderedDict
 from typing import Any, Dict, List, Mapping, Optional, Union
 
+from kfp.dsl.v1_modelbase import ModelBase
 import yaml
 
-from .v1_modelbase import ModelBase
-
 PrimitiveTypes = Union[str, int, float, bool]
 PrimitiveTypesIncludingNone = Optional[PrimitiveTypes]
 

sdk/python/kfp/dsl/yaml_component.py

@@ -0,0 +1,54 @@
+# Copyright 2021-2022 The Kubeflow Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Component loaded from YAML."""
+
+from google.protobuf import json_format
+from kfp.dsl import base_component
+from kfp.dsl import structures
+from kfp.pipeline_spec import pipeline_spec_pb2
+
+
+class YamlComponent(base_component.BaseComponent):
+    """A component loaded from a YAML file.
+
+    **Note:** ``YamlComponent`` is not intended to be used to construct components directly. Use ``kfp.components.load_component_from_*()`` instead.
+
+    Attribute:
+        component_spec: Component definition.
+        component_yaml: The yaml string that this component is loaded from.
+    """
+
+    def __init__(
+        self,
+        component_spec: structures.ComponentSpec,
+        component_yaml: str,
+    ):
+        super().__init__(component_spec=component_spec)
+        self.component_yaml = component_yaml
+
+    @property
+    def pipeline_spec(self) -> pipeline_spec_pb2.PipelineSpec:
+        """Returns the pipeline spec of the component."""
+        component_dict = structures.load_documents_from_yaml(
+            self.component_yaml)[0]
+        is_v1 = 'implementation' in set(component_dict.keys())
+        if is_v1:
+            return self.component_spec.to_pipeline_spec()
+        else:
+            return json_format.ParseDict(component_dict,
+                                         pipeline_spec_pb2.PipelineSpec())
+
+    def execute(self, *args, **kwargs):
+        """Not implemented."""
+        raise NotImplementedError

sdk/python/test_data/components/add_numbers.yaml

@@ -32,7 +32,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -40,7 +40,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -81,4 +81,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/component_with_metadata_fields.yaml

@@ -48,7 +48,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -56,7 +56,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -124,4 +124,4 @@ root:
         description: The concatenated string.
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/component_with_pip_install.yaml

@@ -19,14 +19,14 @@ deploymentSpec:
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location --index-url\
           \ https://pypi.org/simple --trusted-host https://pypi.org/simple 'yapf'\
-          \ 'kfp==2.0.0-beta.16' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -46,4 +46,4 @@ root:
         taskInfo:
           name: component-with-pip-install
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/component_with_task_final_status.yaml

@@ -24,7 +24,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.17'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -32,7 +32,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -61,4 +61,4 @@ root:
         isOptional: true
         parameterType: TASK_FINAL_STATUS
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.17
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/concat_message.yaml

@@ -32,7 +32,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -40,7 +40,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -82,4 +82,4 @@ root:
       Output:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/dict_input.yaml

@@ -23,7 +23,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -31,7 +31,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -58,4 +58,4 @@ root:
       struct:
         parameterType: STRUCT
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/identity.yaml

@@ -29,7 +29,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -37,7 +37,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -74,4 +74,4 @@ root:
       Output:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/input_artifact.yaml

@@ -25,7 +25,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -33,7 +33,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -63,4 +63,4 @@ root:
           schemaTitle: system.Dataset
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/nested_return.yaml

@@ -23,7 +23,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -31,7 +31,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -61,4 +61,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/output_metrics.yaml

@@ -27,7 +27,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -35,7 +35,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -77,4 +77,4 @@ root:
           schemaTitle: system.Metrics
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/components/preprocess.yaml

@@ -56,7 +56,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -64,7 +64,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,4 +171,4 @@ root:
       output_parameter_path:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/component_with_optional_inputs.yaml

@@ -29,7 +29,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -37,7 +37,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -68,4 +68,4 @@ root:
         taskInfo:
           name: component-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/component_with_pip_index_urls.yaml

@@ -19,14 +19,14 @@ deploymentSpec:
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location --index-url\
           \ https://pypi.org/simple --trusted-host https://pypi.org/simple 'yapf'\
-          \ 'kfp==2.0.0-rc.2' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -45,4 +45,4 @@ root:
         taskInfo:
           name: component-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/components_with_optional_artifacts.yaml

@@ -126,7 +126,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -134,7 +134,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -155,7 +155,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -163,7 +163,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -237,4 +237,4 @@ root:
           schemaVersion: 0.0.1
         isOptional: true
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/lightweight_python_functions_pipeline.yaml

@@ -78,7 +78,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -86,7 +86,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -130,7 +130,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -138,7 +138,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -238,4 +238,4 @@ root:
       message:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/lightweight_python_functions_with_outputs.yaml

@@ -81,7 +81,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -89,7 +89,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -108,7 +108,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -116,7 +116,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -135,7 +135,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -143,7 +143,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -162,7 +162,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -170,7 +170,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -273,4 +273,4 @@ root:
           schemaTitle: system.Metrics
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_complex.yaml

@@ -285,7 +285,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -293,7 +293,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -315,7 +315,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -323,7 +323,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -345,7 +345,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -353,7 +353,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -375,7 +375,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -383,7 +383,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -403,7 +403,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -411,7 +411,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -484,4 +484,4 @@ root:
           schemaTitle: system.Dataset
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_simple.yaml

@@ -90,7 +90,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -98,7 +98,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -136,7 +136,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -144,7 +144,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -209,4 +209,4 @@ root:
           schemaVersion: 0.0.1
         isArtifactList: true
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/conditional_producer_and_consumers.yaml

@@ -132,7 +132,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -140,7 +140,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -158,7 +158,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -166,7 +166,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -225,4 +225,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/nested_with_parameters.yaml

@@ -150,7 +150,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -158,12 +158,12 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
-          \ *\n\ndef add(nums: List[int]) -> int:\n    import itertools\n    return\
+          \ *\n\ndef add(nums: List[List[int]]) -> int:\n    import itertools\n  \
-          \ sum(itertools.chain(*nums))\n\n"
+          \  return sum(itertools.chain(*nums))\n\n"
         image: python:3.7
     exec-add-two-nums:
       container:
@@ -177,7 +177,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -185,7 +185,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -203,7 +203,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -211,7 +211,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -229,7 +229,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -237,7 +237,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -283,4 +283,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_complex.yaml

@@ -224,7 +224,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -232,7 +232,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -251,7 +251,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -259,7 +259,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -277,7 +277,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -285,7 +285,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -303,7 +303,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -311,7 +311,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -330,7 +330,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -338,7 +338,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -357,7 +357,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -365,7 +365,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -383,7 +383,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -391,7 +391,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -477,4 +477,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_simple.yaml

@@ -75,7 +75,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -83,7 +83,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -111,7 +111,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -119,7 +119,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -180,4 +180,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/parallelfor_fan_in/pipeline_producer_consumer.yaml

@@ -206,7 +206,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -214,7 +214,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -233,7 +233,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -241,7 +241,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -259,7 +259,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -267,7 +267,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -286,7 +286,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -294,7 +294,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -356,4 +356,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_as_exit_task.yaml

@@ -129,7 +129,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -137,7 +137,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -156,7 +156,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -164,7 +164,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -183,7 +183,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -191,7 +191,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -210,7 +210,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -218,7 +218,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -262,4 +262,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_in_pipeline.yaml

@@ -74,7 +74,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -82,7 +82,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -101,7 +101,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -109,7 +109,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -152,4 +152,4 @@ root:
         taskInfo:
           name: print-op1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_in_pipeline_complex.yaml

@@ -161,7 +161,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -169,7 +169,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -188,7 +188,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -196,7 +196,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -241,4 +241,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_in_pipeline_loaded_from_yaml.yaml

@@ -152,7 +152,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.1'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -160,7 +160,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -179,7 +179,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.1'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -187,7 +187,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -206,7 +206,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -214,7 +214,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -264,4 +264,4 @@ root:
         taskInfo:
           name: print-op1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_with_condition.yaml

@@ -88,7 +88,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -96,7 +96,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -116,7 +116,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -124,7 +124,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -144,7 +144,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -152,7 +152,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,7 +171,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -179,7 +179,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -198,7 +198,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -206,7 +206,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -264,4 +264,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_with_dynamic_importer_metadata.yaml

@@ -94,7 +94,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -102,7 +102,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -181,4 +181,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_with_env.yaml

@@ -41,7 +41,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -49,7 +49,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -79,4 +79,4 @@ root:
         taskInfo:
           name: print-env-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1

sdk/python/test_data/pipelines/pipeline_with_exit_handler.yaml

@@ -65,7 +65,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -73,7 +73,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -92,7 +92,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -100,7 +100,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -119,7 +119,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -127,7 +127,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,4 +171,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1