Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sdk): fix load_test #6978

Merged
merged 4 commits into from
Nov 29, 2021
Merged

fix(sdk): fix load_test #6978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8ebc5e
fix(sdk): fix load_test
ji-yaqi Nov 29, 2021
5ebc1cb
concat placeholder
ji-yaqi Nov 29, 2021
17a13eb
Merge branch 'master' of github.com:ji-yaqi/pipelines into load_tests
ji-yaqi Nov 29, 2021
a990f9a
release notes
ji-yaqi Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
* Depends on `google-auth>=1.6.1,<3` [\#6939](https://github.com/kubeflow/pipelines/pull/6939)
* Change otherwise to else in yaml [\#6952](https://github.com/kubeflow/pipelines/pull/6952)
* Avoid pydantic bug on Union type [\#6957](https://github.com/kubeflow/pipelines/pull/6957)
* Fix bug for if and concat placeholders [\#6978](https://github.com/kubeflow/pipelines/pull/6978)


## Documentation Updates

Expand Down
12 changes: 5 additions & 7 deletions sdk/python/kfp/v2/compiler_cli_tests/compiler_cli_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,13 @@ def test_pipeline_with_importer(self):
# def test_pipeline_with_ontology(self):
# self._test_compile_py_to_json('pipeline_with_ontology')

# TODO: re-enable the test, debug load_component_from_file error
# def test_pipeline_with_if_placeholder(self):
# self._test_compile_py_to_json('pipeline_with_if_placeholder')
def test_pipeline_with_if_placeholder(self):
self._test_compile_py_to_json('pipeline_with_if_placeholder')

# TODO: re-enable the test, debug load_component_from_file error
# def test_pipeline_with_concat_placeholder(self):
# self._test_compile_py_to_json('pipeline_with_concat_placeholder')
def test_pipeline_with_concat_placeholder(self):
self._test_compile_py_to_json('pipeline_with_concat_placeholder')

# TODO: re-enable the test, debug load_component_from_file error
# TODO: re-enable the test, debug add_node_selector_constraint error
# def test_pipeline_with_resource_spec(self):
# self._test_compile_py_to_json('pipeline_with_resource_spec')

Expand Down
94 changes: 45 additions & 49 deletions sdk/python/kfp/v2/compiler_cli_tests/test_data/pipeline_with_concat_placeholder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,59 @@
{
"pipelineSpec": {
"components": {
"comp-component-with-concat-placeholder": {
"executorLabel": "exec-component-with-concat-placeholder",
"inputDefinitions": {
"parameters": {
"input_prefix": {
"parameterType": "STRING"
}
"components": {
"comp-component-with-concat-placeholder": {
"executorLabel": "exec-component-with-concat-placeholder",
"inputDefinitions": {
"parameters": {
"input_prefix": {
"parameterType": "STRING"
}
}
}
},
"deploymentSpec": {
"executors": {
"exec-component-with-concat-placeholder": {
"container": {
"args": [
"--arg0",
"{{$.inputs.parameters['input_prefix']}}some value"
],
"image": "gcr.io/my-project/my-image"
}
}
},
"defaultPipelineRoot": "dummy_root",
"deploymentSpec": {
"executors": {
"exec-component-with-concat-placeholder": {
"container": {
"args": [
"--arg0",
"{{$.inputs.parameters['input_prefix']}}some value"
],
"image": "gcr.io/my-project/my-image"
}
}
},
"pipelineInfo": {
"name": "one-step-pipeline-with-concat-placeholder"
},
"root": {
"dag": {
"tasks": {
"component-with-concat-placeholder": {
"cachingOptions": {
"enableCache": true
},
"componentRef": {
"name": "comp-component-with-concat-placeholder"
},
"inputs": {
"parameters": {
"input_prefix": {
"runtimeValue": {
"constant": "some prefix:"
}
}
},
"pipelineInfo": {
"name": "one-step-pipeline-with-concat-placeholder"
},
"root": {
"dag": {
"tasks": {
"component-with-concat-placeholder": {
"cachingOptions": {
"enableCache": true
},
"componentRef": {
"name": "comp-component-with-concat-placeholder"
},
"inputs": {
"parameters": {
"input_prefix": {
"runtimeValue": {
"constant": "some prefix:"
}
}
},
"taskInfo": {
"name": "component-with-concat-placeholder"
}
},
"taskInfo": {
"name": "component-with-concat-placeholder"
}
}
}
},
"schemaVersion": "2.1.0",
"sdkVersion": "kfp-1.8.6"
}
},
"runtimeConfig": {
"gcsOutputDirectory": "dummy_root"
}
"schemaVersion": "2.1.0",
"sdkVersion": "kfp-1.8.9"
}
134 changes: 65 additions & 69 deletions sdk/python/kfp/v2/compiler_cli_tests/test_data/pipeline_with_if_placeholder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,84 +1,80 @@
{
"pipelineSpec": {
"components": {
"comp-component-with-optional-inputs": {
"executorLabel": "exec-component-with-optional-inputs",
"inputDefinitions": {
"parameters": {
"optional_input_1": {
"parameterType": "STRING"
},
"required_input": {
"parameterType": "STRING"
}
"components": {
"comp-component-with-optional-inputs": {
"executorLabel": "exec-component-with-optional-inputs",
"inputDefinitions": {
"parameters": {
"optional_input_1": {
"parameterType": "STRING"
},
"required_input": {
"parameterType": "STRING"
}
}
}
},
"deploymentSpec": {
"executors": {
"exec-component-with-optional-inputs": {
"container": {
"args": [
"--arg0",
"{{$.inputs.parameters['required_input']}}",
"--arg1",
"{{$.inputs.parameters['optional_input_1']}}",
"--arg3",
"default value"
],
"image": "gcr.io/my-project/my-image"
}
}
},
"defaultPipelineRoot": "dummy_root",
"deploymentSpec": {
"executors": {
"exec-component-with-optional-inputs": {
"container": {
"args": [
"--arg0",
"{{$.inputs.parameters['required_input']}}",
"--arg1",
"{{$.inputs.parameters['optional_input_1']}}",
"--arg3",
"default value"
],
"image": "gcr.io/my-project/my-image"
}
}
},
"pipelineInfo": {
"name": "one-step-pipeline-with-if-placeholder"
},
"root": {
"dag": {
"tasks": {
"component-with-optional-inputs": {
"cachingOptions": {
"enableCache": true
},
"componentRef": {
"name": "comp-component-with-optional-inputs"
},
"inputs": {
"parameters": {
"optional_input_1": {
"componentInputParameter": "input1"
},
"required_input": {
"componentInputParameter": "input0"
}
}
},
"pipelineInfo": {
"name": "one-step-pipeline-with-if-placeholder"
},
"root": {
"dag": {
"tasks": {
"component-with-optional-inputs": {
"cachingOptions": {
"enableCache": true
},
"componentRef": {
"name": "comp-component-with-optional-inputs"
},
"inputs": {
"parameters": {
"optional_input_1": {
"componentInputParameter": "input1"
},
"required_input": {
"componentInputParameter": "input0"
}
},
"taskInfo": {
"name": "component-with-optional-inputs"
}
}
}
},
"inputDefinitions": {
"parameters": {
"input0": {
"parameterType": "STRING"
},
"input1": {
"parameterType": "STRING"
},
"input2": {
"parameterType": "STRING"
"taskInfo": {
"name": "component-with-optional-inputs"
}
}
}
},
"schemaVersion": "2.1.0",
"sdkVersion": "kfp-1.8.6"
"inputDefinitions": {
"parameters": {
"input0": {
"parameterType": "STRING"
},
"input1": {
"parameterType": "STRING"
},
"input2": {
"parameterType": "STRING"
}
}
}
},
"runtimeConfig": {
"gcsOutputDirectory": "dummy_root"
}
"schemaVersion": "2.1.0",
"sdkVersion": "kfp-1.8.9"
}
5 changes: 2 additions & 3 deletions sdk/python/kfp/v2/components/structures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ def _check_valid_placeholder_reference(cls, valid_inputs: Sequence[str],
if arg.if_structure.input_name not in valid_inputs:
raise ValueError(
f'Argument "{arg}" references non-existing input.')
for placeholder in itertools.chain(arg.if_structure.then,
arg.if_structure.otherwise):
for placeholder in itertools.chain(arg.if_structure.then or [],
arg.if_structure.otherwise or []):
cls._check_valid_placeholder_reference(valid_inputs,
valid_outputs,
placeholder)
Expand Down Expand Up @@ -573,7 +573,6 @@ def load_from_component_yaml(cls, component_yaml: str) -> 'ComponentSpec':
Returns:
Component spec in the form of V2 ComponentSpec.
"""

json_component = yaml.safe_load(component_yaml)
try:
return ComponentSpec.parse_obj(json_component)
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/kfp/v2/components/yaml_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def load_component_from_file(file_path: str) -> base_component.BaseComponent:
file_path: A string containing path to the YAML file.
"""
with open(file_path, 'rb') as component_stream:
return load_component_from_text(component_stream)
return load_component_from_text(component_stream.read())


def load_component_from_url(url: str,
Expand Down