kubeflow
/
pipelines
mirror of https://github.com/kubeflow/pipelines.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the handling of PipelineParam-based default values in extract_metadata (#1380)

This commit is contained in:
Alexey Volkov 2019-05-31 20:48:23 -07:00 committed by Kubernetes Prow Robot
parent 88bca8223d
commit a2eab56ae8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/python/kfp/dsl/_metadata.py
View File

@ -157,6 +157,10 @@ def _annotation_to_typemeta(annotation):
def _extract_component_metadata(func): def _extract_component_metadata(func):
'''Creates component metadata structure instance based on the function signature.''' '''Creates component metadata structure instance based on the function signature.'''
# Importing here to prevent circular import failures
#TODO: Change _pipeline_param to stop importing _metadata
from ._pipeline_param import PipelineParam
import inspect import inspect
fullargspec = inspect.getfullargspec(func) fullargspec = inspect.getfullargspec(func)
annotations = fullargspec.annotations annotations = fullargspec.annotations
@ -172,6 +176,8 @@ def _extract_component_metadata(func):
for arg in fullargspec.args: for arg in fullargspec.args:
arg_type = TypeMeta() arg_type = TypeMeta()
arg_default = arg_defaults[arg] if arg in arg_defaults else None arg_default = arg_defaults[arg] if arg in arg_defaults else None
if isinstance(arg_default, PipelineParam):
arg_default = arg_default.value
if arg in annotations: if arg in annotations:
arg_type = _annotation_to_typemeta(annotations[arg]) arg_type = _annotation_to_typemeta(annotations[arg])
inputs.append(ParameterMeta(name=arg, description='', param_type=arg_type, default=arg_default)) inputs.append(ParameterMeta(name=arg, description='', param_type=arg_type, default=arg_default))
@ -199,6 +205,10 @@ def _extract_component_metadata(func):
def _extract_pipeline_metadata(func): def _extract_pipeline_metadata(func):
'''Creates pipeline metadata structure instance based on the function signature.''' '''Creates pipeline metadata structure instance based on the function signature.'''
# Importing here to prevent circular import failures
#TODO: Change _pipeline_param to stop importing _metadata
from ._pipeline_param import PipelineParam
import inspect import inspect
fullargspec = inspect.getfullargspec(func) fullargspec = inspect.getfullargspec(func)
args = fullargspec.args args = fullargspec.args
@ -219,6 +229,8 @@ def _extract_pipeline_metadata(func):
for arg in args: for arg in args:
arg_type = TypeMeta() arg_type = TypeMeta()
arg_default = arg_defaults[arg] if arg in arg_defaults else None arg_default = arg_defaults[arg] if arg in arg_defaults else None
if isinstance(arg_default, PipelineParam):
arg_default = arg_default.value
if arg in annotations: if arg in annotations:
arg_type = _annotation_to_typemeta(annotations[arg]) arg_type = _annotation_to_typemeta(annotations[arg])
pipeline_meta.inputs.append(ParameterMeta(name=arg, description='', param_type=arg_type, default=arg_default)) pipeline_meta.inputs.append(ParameterMeta(name=arg, description='', param_type=arg_type, default=arg_default))