From 1c4f9eb43178047c2fba68d8495bcec1ee111b63 Mon Sep 17 00:00:00 2001 From: Ning Date: Tue, 26 Mar 2019 09:33:16 -0700 Subject: [PATCH] exposing type checking (#1022) * exposing types under dsl.types --- sdk/python/kfp/components/_components.py | 2 +- sdk/python/kfp/dsl/__init__.py | 2 +- sdk/python/kfp/dsl/_component.py | 2 +- sdk/python/kfp/dsl/_metadata.py | 2 +- sdk/python/kfp/dsl/{_types.py => types.py} | 0 sdk/python/tests/compiler/compiler_tests.py | 2 +- sdk/python/tests/components/test_components.py | 2 +- sdk/python/tests/dsl/component_tests.py | 4 ++-- sdk/python/tests/dsl/pipeline_tests.py | 2 +- sdk/python/tests/dsl/type_tests.py | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) rename sdk/python/kfp/dsl/{_types.py => types.py} (100%) diff --git a/sdk/python/kfp/components/_components.py b/sdk/python/kfp/components/_components.py index cb7fbc2ef09..2236d030faf 100644 --- a/sdk/python/kfp/components/_components.py +++ b/sdk/python/kfp/components/_components.py @@ -26,7 +26,7 @@ from ._structures import ComponentSpec from ._structures import * from kfp.dsl import PipelineParam -from kfp.dsl._types import InconsistentTypeException, check_types +from kfp.dsl.types import InconsistentTypeException, check_types import kfp _default_component_name = 'Component' diff --git a/sdk/python/kfp/dsl/__init__.py b/sdk/python/kfp/dsl/__init__.py index 06fae50887b..c31a97e498d 100644 --- a/sdk/python/kfp/dsl/__init__.py +++ b/sdk/python/kfp/dsl/__init__.py @@ -17,5 +17,5 @@ from ._pipeline import Pipeline, pipeline, get_pipeline_conf from ._container_op import ContainerOp from ._ops_group import OpsGroup, ExitHandler, Condition -from ._component import python_component +from ._component import python_component, component #TODO: expose the component decorator when ready \ No newline at end of file diff --git a/sdk/python/kfp/dsl/_component.py b/sdk/python/kfp/dsl/_component.py index ef5e1fce0ff..0709058080c 100644 --- a/sdk/python/kfp/dsl/_component.py +++ b/sdk/python/kfp/dsl/_component.py @@ -14,7 +14,7 @@ from ._metadata import ComponentMeta, ParameterMeta, TypeMeta, _annotation_to_typemeta from ._pipeline_param import PipelineParam -from ._types import check_types, InconsistentTypeException +from .types import check_types, InconsistentTypeException import kfp def python_component(name, description=None, base_image=None, target_component_file: str = None): diff --git a/sdk/python/kfp/dsl/_metadata.py b/sdk/python/kfp/dsl/_metadata.py index 2188e9086a9..afbe6be9cbd 100644 --- a/sdk/python/kfp/dsl/_metadata.py +++ b/sdk/python/kfp/dsl/_metadata.py @@ -14,7 +14,7 @@ from typing import Dict, List from abc import ABCMeta, abstractmethod -from ._types import BaseType, _check_valid_type_dict, _instance_to_dict +from .types import BaseType, _check_valid_type_dict, _instance_to_dict class BaseMeta(object): __metaclass__ = ABCMeta diff --git a/sdk/python/kfp/dsl/_types.py b/sdk/python/kfp/dsl/types.py similarity index 100% rename from sdk/python/kfp/dsl/_types.py rename to sdk/python/kfp/dsl/types.py diff --git a/sdk/python/tests/compiler/compiler_tests.py b/sdk/python/tests/compiler/compiler_tests.py index 705c0cbe608..eef2c254eee 100644 --- a/sdk/python/tests/compiler/compiler_tests.py +++ b/sdk/python/tests/compiler/compiler_tests.py @@ -25,7 +25,7 @@ from kfp.dsl._component import component from kfp.dsl import ContainerOp, pipeline -from kfp.dsl._types import Integer, InconsistentTypeException +from kfp.dsl.types import Integer, InconsistentTypeException class TestCompiler(unittest.TestCase): diff --git a/sdk/python/tests/components/test_components.py b/sdk/python/tests/components/test_components.py index d13bf278b65..f3d14a7d154 100644 --- a/sdk/python/tests/components/test_components.py +++ b/sdk/python/tests/components/test_components.py @@ -22,7 +22,7 @@ import kfp import kfp.components as comp from kfp.components._yaml_utils import load_yaml -from kfp.dsl._types import InconsistentTypeException +from kfp.dsl.types import InconsistentTypeException class LoadComponentTestCase(unittest.TestCase): def _test_load_component_from_file(self, component_path: str): diff --git a/sdk/python/tests/dsl/component_tests.py b/sdk/python/tests/dsl/component_tests.py index b6b9d244a5a..ea04e0da011 100644 --- a/sdk/python/tests/dsl/component_tests.py +++ b/sdk/python/tests/dsl/component_tests.py @@ -13,9 +13,9 @@ # limitations under the License. import kfp -from kfp.dsl._component import component +from kfp.dsl import component from kfp.dsl._metadata import ComponentMeta, ParameterMeta, TypeMeta -from kfp.dsl._types import GCSPath, Integer, InconsistentTypeException +from kfp.dsl.types import Integer, GCSPath, InconsistentTypeException from kfp.dsl import ContainerOp, Pipeline import unittest diff --git a/sdk/python/tests/dsl/pipeline_tests.py b/sdk/python/tests/dsl/pipeline_tests.py index e7dc44cc37d..0f4c242fc57 100644 --- a/sdk/python/tests/dsl/pipeline_tests.py +++ b/sdk/python/tests/dsl/pipeline_tests.py @@ -15,7 +15,7 @@ import kfp from kfp.dsl import Pipeline, PipelineParam, ContainerOp, pipeline from kfp.dsl._metadata import PipelineMeta, ParameterMeta, TypeMeta -from kfp.dsl._types import GCSPath, Integer +from kfp.dsl.types import GCSPath, Integer import unittest diff --git a/sdk/python/tests/dsl/type_tests.py b/sdk/python/tests/dsl/type_tests.py index 5a90c2a6eb7..f53aceaaef8 100644 --- a/sdk/python/tests/dsl/type_tests.py +++ b/sdk/python/tests/dsl/type_tests.py @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - -from kfp.dsl._types import _instance_to_dict, check_types, GCSPath +from kfp.dsl.types import _instance_to_dict, check_types, GCSPath import unittest class TestTypes(unittest.TestCase):