chore(sdk): apply yapf formatting (#7414)

sdk/python/kfp/compiler_cli_tests/test_data/lightweight_python_functions_v2_pipeline.py

@@ -16,8 +16,13 @@ from typing import Dict, List
 
 from kfp import compiler
 from kfp import dsl
-from kfp.dsl import (Dataset, Input, InputPath, Model, Output, OutputPath,
+from kfp.dsl import Dataset
-                        component)
+from kfp.dsl import Input
+from kfp.dsl import InputPath
+from kfp.dsl import Model
+from kfp.dsl import Output
+from kfp.dsl import OutputPath
+from kfp.dsl import component
 
 
 @component

sdk/python/kfp/compiler_cli_tests/test_data/pipeline_with_resource_spec.py

@@ -38,8 +38,8 @@ def my_pipeline(input_location: str = 'gs://test-bucket/pipeline_root',
         training_op(
             examples=ingestor.outputs['examples'],
             optimizer=optimizer,
-            n_epochs=n_epochs).set_cpu_limit('4').set_memory_limit(
+            n_epochs=n_epochs).set_cpu_limit('4').set_memory_limit('14Gi')
-                '14Gi').add_node_selector_constraint('tpu-v3').set_gpu_limit('1'))
+        .add_node_selector_constraint('tpu-v3').set_gpu_limit('1'))
 
 
 if __name__ == '__main__':

sdk/python/kfp/components/component_decorator.py

@@ -93,7 +93,7 @@ def component(func: Optional[Callable] = None,
     """
     if output_component_file is not None:
         raise Exception("output_component_file is not supported yet in v2 early"
-        "releases and will be added back for v2.0.0 ")
+                        "releases and will be added back for v2.0.0 ")
 
     if func is None:
         return functools.partial(

sdk/python/kfp/components/pipeline_task.py

@@ -106,9 +106,7 @@ class PipelineTask:
 
         self.task_spec = structures.TaskSpec(
             name=self.register_task_handler(),
-            inputs={
+            inputs={input_name: value for input_name, value in args.items()},
-                input_name: value for input_name, value in args.items()
-            },
             dependent_tasks=[],
             component_ref=component_spec.name,
             enable_caching=True,
@@ -338,8 +336,7 @@ class PipelineTask:
         resolved_container_spec = copy.deepcopy(container_spec)
         resolved_container_spec.command = expand_argument_list(
             container_spec.command)
-        resolved_container_spec.args = expand_argument_list(
+        resolved_container_spec.args = expand_argument_list(container_spec.args)
-            container_spec.args)
 
         return resolved_container_spec
 

sdk/python/kfp/components/structures.py

@@ -375,7 +375,8 @@ class ComponentSpec(BaseModel):
                 raise ValueError(
                     f'Argument "{arg}" references non-existing input.')
             for placeholder in itertools.chain(arg.if_structure.then or [],
-                                               arg.if_structure.otherwise or []):
+                                               arg.if_structure.otherwise or
+                                               []):
                 cls._check_valid_placeholder_reference(valid_inputs,
                                                        valid_outputs,
                                                        placeholder)
@@ -413,15 +414,20 @@ class ComponentSpec(BaseModel):
             if isinstance(arg, str):
                 return arg
             if 'inputValue' in arg:
-                return InputValuePlaceholder(input_name=utils.sanitize_input_name(arg['inputValue']))
+                return InputValuePlaceholder(
+                    input_name=utils.sanitize_input_name(arg['inputValue']))
             if 'inputPath' in arg:
-                return InputPathPlaceholder(input_name=utils.sanitize_input_name(arg['inputPath']))
+                return InputPathPlaceholder(
+                    input_name=utils.sanitize_input_name(arg['inputPath']))
             if 'inputUri' in arg:
-                return InputUriPlaceholder(input_name=utils.sanitize_input_name(arg['inputUri']))
+                return InputUriPlaceholder(
+                    input_name=utils.sanitize_input_name(arg['inputUri']))
             if 'outputPath' in arg:
-                return OutputPathPlaceholder(output_name=utils.sanitize_input_name(arg['outputPath']))
+                return OutputPathPlaceholder(
+                    output_name=utils.sanitize_input_name(arg['outputPath']))
             if 'outputUri' in arg:
-                return OutputUriPlaceholder(output_name=utils.sanitize_input_name(arg['outputUri']))
+                return OutputUriPlaceholder(
+                    output_name=utils.sanitize_input_name(arg['outputUri']))
             if 'if' in arg:
                 if_placeholder_values = arg['if']
                 if_placeholder_values_then = list(if_placeholder_values['then'])
@@ -434,7 +440,8 @@ class ComponentSpec(BaseModel):
                 IfPresentPlaceholderStructure.update_forward_refs()
                 return IfPresentPlaceholder(
                     if_structure=IfPresentPlaceholderStructure(
-                        input_name=utils.sanitize_input_name(if_placeholder_values['cond']['isPresent']),
+                        input_name=utils.sanitize_input_name(
+                            if_placeholder_values['cond']['isPresent']),
                         then=list(
                             _transform_arg(val)
                             for val in if_placeholder_values_then),
@@ -497,7 +504,8 @@ class ComponentSpec(BaseModel):
                 for spec in component_dict.get('inputs', [])
             },
             outputs={
-                utils.sanitize_input_name(spec['name']): OutputSpec(type=spec.get('type', 'Artifact'))
+                utils.sanitize_input_name(spec['name']):
+                OutputSpec(type=spec.get('type', 'Artifact'))
                 for spec in component_dict.get('outputs', [])
             })
 
@@ -554,8 +562,8 @@ class ComponentSpec(BaseModel):
                         for cmd in self.implementation.container.command or []
                     ],
                     args=[
-                        _transform_arg(arg) for arg in
+                        _transform_arg(arg)
-                        self.implementation.container.args or []
+                        for arg in self.implementation.container.args or []
                     ],
                     env={
                         name: _transform_arg(value) for name, value in

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

@@ -20,9 +20,8 @@ from absl.testing import parameterized
 from kfp.components.types import type_annotations
 from kfp.components.types.artifact_types import Model
 from kfp.components.types.type_annotations import (Input, InputAnnotation,
-                                                      InputPath, Output,
+                                                   InputPath, Output,
-                                                      OutputAnnotation,
+                                                   OutputAnnotation, OutputPath)
-                                                      OutputPath)
 
 
 class AnnotationsTest(parameterized.TestCase):

sdk/python/kfp/deprecated/_local_client.py

@@ -346,13 +346,12 @@ class LocalClient:
         return cmd
 
     def _generate_cmd_for_docker_execution(
-        self,
+            self,
-        run_name: str,
+            run_name: str,
-        pipeline: dsl.Pipeline,
+            pipeline: dsl.Pipeline,
-        op: dsl.ContainerOp,
+            op: dsl.ContainerOp,
-        stack: Dict[str, Any],
+            stack: Dict[str, Any],
-        docker_options: List[str] = []
+            docker_options: List[str] = []) -> List[str]:
-    ) -> List[str]:
         """Generate the command to run the op in docker locally."""
         cmd = self._generate_cmd_for_subprocess_execution(
             run_name, pipeline, op, stack)
@@ -394,8 +393,8 @@ class LocalClient:
         for node in group_dag.topological_sort():
             subgroup = _get_subgroup(current_group.groups, node)
             if subgroup is not None:  # Node of DAG is subgroup
-                success = self._run_group(run_name, pipeline, pipeline_dag, subgroup,
+                success = self._run_group(run_name, pipeline, pipeline_dag,
-                                stack, execution_mode)
+                                          subgroup, stack, execution_mode)
                 if not success:
                     return False
             else:  # Node of DAG is op
@@ -416,7 +415,8 @@ class LocalClient:
                         run_name, pipeline, op, stack)
                 else:
                     cmd = self._generate_cmd_for_docker_execution(
-                        run_name, pipeline, op, stack, execution_mode.docker_options)
+                        run_name, pipeline, op, stack,
+                        execution_mode.docker_options)
                 process = subprocess.Popen(
                     cmd,
                     shell=False,
@@ -492,8 +492,8 @@ class LocalClient:
             else:
                 raise Exception("Not implemented")
         else:
-            return self._run_group_dag(run_name, pipeline, pipeline_dag, current_group,
+            return self._run_group_dag(run_name, pipeline, pipeline_dag,
-                                stack, execution_mode)
+                                       current_group, stack, execution_mode)
 
     def create_run_from_pipeline_func(
             self,
@@ -540,7 +540,7 @@ class LocalClient:
         run_name = pipeline.name.replace(" ", "_").lower() + "_" + run_version
 
         pipeline_dag = self._create_op_dag(pipeline)
-        success = self._run_group(run_name, pipeline, pipeline_dag, pipeline.groups[0],
+        success = self._run_group(run_name, pipeline, pipeline_dag,
-                        {}, execution_mode)
+                                  pipeline.groups[0], {}, execution_mode)
 
         return RunPipelineResult(self, pipeline, run_name, success=success)

sdk/python/kfp/deprecated/cli/experiment.py

@@ -122,11 +122,13 @@ def _display_experiment(exp: kfp_server_api.ApiExperiment,
 @click.option(
     "--experiment-id",
     default=None,
-    help="The ID of the experiment to archive, can only supply either an experiment ID or name.")
+    help="The ID of the experiment to archive, can only supply either an experiment ID or name."
+)
 @click.option(
     "--experiment-name",
     default=None,
-    help="The name of the experiment to archive, can only supply either an experiment ID or name.")
+    help="The name of the experiment to archive, can only supply either an experiment ID or name."
+)
 @click.pass_context
 def archive(ctx: click.Context, experiment_id: str, experiment_name: str):
     """Archive an experiment"""

sdk/python/kfp/deprecated/cli/recurring_run.py

@@ -48,10 +48,12 @@ def recurring_run():
     help='The RFC3339 time string of the time when to end the job.')
 @click.option(
     '--experiment-id',
-    help='The ID of the experiment to create the recurring run under, can only supply either an experiment ID or name.')
+    help='The ID of the experiment to create the recurring run under, can only supply either an experiment ID or name.'
+)
 @click.option(
     '--experiment-name',
-    help='The name of the experiment to create the recurring run under, can only supply either an experiment ID or name.')
+    help='The name of the experiment to create the recurring run under, can only supply either an experiment ID or name.'
+)
 @click.option('--job-name', help='The name of the recurring run.')
 @click.option(
     '--interval-second',

sdk/python/kfp/deprecated/compiler/_data_passing_using_volume.py

@@ -129,11 +129,15 @@ def rewrite_data_passing_to_use_volumes(
                     'value': output_subpath,  # Requires Argo 2.3.0+
                 })
             whitelist = ['mlpipeline-ui-metadata', 'mlpipeline-metrics']
-            output_artifacts = [artifact for artifact in output_artifacts if artifact['name'] in whitelist]
+            output_artifacts = [
+                artifact for artifact in output_artifacts
+                if artifact['name'] in whitelist
+            ]
             if not output_artifacts:
-              template.get('outputs', {}).pop('artifacts', None)
+                template.get('outputs', {}).pop('artifacts', None)
             else:
-                template.get('outputs', {}).update({'artifacts': output_artifacts})
+                template.get('outputs',
+                             {}).update({'artifacts': output_artifacts})
 
     # Rewrite DAG templates
     for template in templates:

sdk/python/kfp/deprecated/compiler/_op_to_template.py

@@ -319,9 +319,9 @@ def _op_to_template(op: BaseOp):
                     and re.match('^{{inputs.parameters.*}}$', str(param)):
                     if not 'containers' in podSpecPatch:
                         podSpecPatch['containers'] = [{
-                                'name': 'main',
+                            'name': 'main',
-                                'resources': {}
+                            'resources': {}
-                            }]
+                        }]
                     if setting not in podSpecPatch['containers'][0][
                             'resources']:
                         podSpecPatch['containers'][0]['resources'][setting] = {

sdk/python/kfp/deprecated/compiler/compiler.py

@@ -831,7 +831,10 @@ class Compiler(object):
 
         # set ttl after workflow finishes
         if pipeline_conf.ttl_seconds_after_finished >= 0:
-            workflow['spec']['ttlStrategy'] = {'secondsAfterCompletion': pipeline_conf.ttl_seconds_after_finished}
+            workflow['spec']['ttlStrategy'] = {
+                'secondsAfterCompletion':
+                    pipeline_conf.ttl_seconds_after_finished
+            }
 
         if pipeline_conf._pod_disruption_budget_min_available:
             pod_disruption_budget = {

sdk/python/kfp/deprecated/compiler/main.py

@@ -82,8 +82,9 @@ def _compile_pipeline_function(
     else:
         pipeline_func = pipeline_funcs[0]
 
-    kfp.deprecated.compiler.Compiler(mode=mode).compile(pipeline_func, output_path,
+    kfp.deprecated.compiler.Compiler(mode=mode).compile(pipeline_func,
-                                             type_check, pipeline_conf)
+                                                        output_path, type_check,
+                                                        pipeline_conf)
 
 
 class PipelineCollectorContext():

sdk/python/kfp/deprecated/components/_components.py

@@ -136,7 +136,7 @@ def load_component_from_spec(component_spec):
     if component_spec is None:
         raise TypeError
     return _create_task_factory_from_component_spec(
-            component_spec=component_spec)
+        component_spec=component_spec)
 
 
 def _fix_component_uri(uri: str) -> str:

sdk/python/kfp/deprecated/components_tests/test_python_op.py

@@ -21,8 +21,9 @@ from pathlib import Path
 from typing import Callable, NamedTuple, Sequence
 
 from kfp.deprecated import components as comp
-from kfp.deprecated.components import (InputBinaryFile, InputPath, InputTextFile,
+from kfp.deprecated.components import (InputBinaryFile, InputPath,
-                          OutputBinaryFile, OutputPath, OutputTextFile)
+                                       InputTextFile, OutputBinaryFile,
+                                       OutputPath, OutputTextFile)
 from kfp.deprecated.components._components import _resolve_command_line_and_paths
 from kfp.deprecated.components.structures import InputSpec, OutputSpec
 

sdk/python/kfp/deprecated/dsl/_component.py

@@ -18,7 +18,6 @@ from .types import check_types, InconsistentTypeException
 from ._ops_group import Graph
 import kfp.deprecated as kfp
 
-
 # @deprecated(
 #     version='0.2.6',
 #     reason='This decorator does not seem to be used, so we deprecate it. '

sdk/python/kfp/deprecated/dsl/_component_bridge.py

@@ -631,7 +631,7 @@ def _attach_v2_specs(
         argument_is_parameter_type = type_utils.is_parameter_type(argument_type)
         input_is_parameter_type = type_utils.is_parameter_type(input_type)
         if COMPILING_FOR_V2 and (argument_is_parameter_type !=
-                                     input_is_parameter_type):
+                                 input_is_parameter_type):
             if isinstance(argument_value, dsl.PipelineParam):
                 param_or_value_msg = 'PipelineParam "{}"'.format(
                     argument_value.full_name)

sdk/python/kfp/deprecated/dsl/_container_op.py

@@ -28,7 +28,6 @@ from kubernetes.client.models import (V1Container, V1ContainerPort,
                                       V1SecurityContext, V1Volume,
                                       V1VolumeDevice, V1VolumeMount)
 
-
 # generics
 T = TypeVar('T')
 # type alias: either a string or a list of string
@@ -1446,7 +1445,8 @@ class ContainerOp(BaseOp):
                 is_legacy_name, normalized_name = _is_legacy_output_name(
                     output.name)
                 if is_legacy_name and normalized_name in self.output_artifact_paths:
-                    output_filename = self.output_artifact_paths[normalized_name]
+                    output_filename = self.output_artifact_paths[
+                        normalized_name]
                 else:
                     output_filename = _components._generate_output_file_name(
                         output.name)

sdk/python/kfp/deprecated/dsl/_volume_op.py

@@ -105,7 +105,8 @@ class VolumeOp(ResourceOp):
         if not match_serialized_pipelineparam(str(resource_name)):
             resource_name = sanitize_k8s_name(resource_name)
         pvc_metadata = V1ObjectMeta(
-            name="{{workflow.name}}-%s" % resource_name if generate_unique_name else resource_name,
+            name="{{workflow.name}}-%s" %
+            resource_name if generate_unique_name else resource_name,
             annotations=annotations)
         requested_resources = V1ResourceRequirements(requests={"storage": size})
         pvc_spec = V1PersistentVolumeClaimSpec(

sdk/python/tests/compiler/testdata/artifact_passing_using_volume.py

@@ -12,14 +12,18 @@ processor_op = load_component_from_file(
 consumer_op = load_component_from_file(
     str(test_data_dir / 'consume_2.component.yaml'))
 
+
 def metadata_and_metrics() -> NamedTuple(
     "Outputs",
-    [("mlpipeline_ui_metadata", "UI_metadata"), ("mlpipeline_metrics", "Metrics")],
+    [("mlpipeline_ui_metadata", "UI_metadata"), ("mlpipeline_metrics", "Metrics"
+                                                )],
 ):
     metadata = {
-        "outputs": [
+        "outputs": [{
-            {"storage": "inline", "source": "*this should be bold*", "type": "markdown"}
+            "storage": "inline",
-        ]
+            "source": "*this should be bold*",
+            "type": "markdown"
+        }]
     }
     metrics = {
         "metrics": [
@@ -36,9 +40,10 @@ def metadata_and_metrics() -> NamedTuple(
     from collections import namedtuple
     import json
 
-    return namedtuple("output", ["mlpipeline_ui_metadata", "mlpipeline_metrics"])(
+    return namedtuple("output",
-        json.dumps(metadata), json.dumps(metrics)
+                      ["mlpipeline_ui_metadata", "mlpipeline_metrics"])(
-    )
+                          json.dumps(metadata), json.dumps(metrics))
+
 
 @kfp.dsl.pipeline()
 def artifact_passing_pipeline():

sdk/python/tests/dsl/component_tests.py

@@ -23,6 +23,7 @@ from kfp.deprecated.dsl.types import Integer, GCSPath, InconsistentTypeException
 from kfp.deprecated.dsl import ContainerOp, Pipeline, PipelineParam
 from kfp.deprecated.components.structures import ComponentSpec, InputSpec, OutputSpec
 
+
 @unittest.skip("deprecated")
 class TestGraphComponent(unittest.TestCase):
 

sdk/python/tests/local_runner_test.py

@@ -228,14 +228,12 @@ class LocalRunnerTest(unittest.TestCase):
             check_option()
 
         run_result = run_pipeline_func_locally(
-            _pipeline,
+            _pipeline, {},
-            {},
+            execution_mode=LocalClient.ExecutionMode(
-            execution_mode=LocalClient.ExecutionMode(mode="docker",
+                mode="docker", docker_options=["-e", "foo=bar"]))
-                                                    docker_options=["-e", "foo=bar"])
-        )
         assert run_result.success
         output_file_path = run_result.get_output_file("check-option")
 
         with open(output_file_path, "r") as f:
             line = f.readline()
-            assert "bar" in line
+            assert "bar" in line