Addressed PR feedback: Reduced indentation.

sdk/python/kfp/components/_components.py

@@ -240,75 +240,74 @@ def expand_command_part(arg): #input values with original names
                 return None
             if isinstance(arg, (str, int, float, bool)):
                 return str(arg)
-            else:
 
-                if isinstance(arg, InputValuePlaceholder):
-                    port_name = arg.input_name
-                    input_value = pythonic_input_argument_values[input_name_to_pythonic[port_name]]
-                    if input_value is not None:
-                        return str(input_value)
-                    else:
-                        input_spec = inputs_dict[port_name]
-                        if input_spec.optional:
-                            #Even when we support default values there is no need to check for a default here.
-                            #In current execution flow (called by python task factory), the missing argument would be replaced with the default value by python itself.
-                            return None
-                        else:
-                            raise ValueError('No value provided for input {}'.format(port_name))
-
-                if isinstance(arg, InputPathPlaceholder):
-                    port_name = arg.input_name
-                    input_filename = _generate_input_file_name(port_name)
-                    input_key = input_name_to_kubernetes[port_name]
-                    input_value = pythonic_input_argument_values[input_name_to_pythonic[port_name]]
-                    if input_value is not None:
-                        file_inputs[input_key] = {'local_path': input_filename, 'data_source': input_value}
-                        return input_filename
-                    else:
-                        input_spec = inputs_dict[port_name]
-                        if input_spec.optional:
-                            #Even when we support default values there is no need to check for a default here.
-                            #In current execution flow (called by python task factory), the missing argument would be replaced with the default value by python itself.
-                            return None
-                        else:
-                            raise ValueError('No value provided for input {}'.format(port_name))
-
-                elif isinstance(arg, OutputPathPlaceholder):
-                    port_name = arg.output_name
-                    output_filename = _generate_output_file_name(port_name)
-                    output_key = output_name_to_kubernetes[port_name]
-                    if output_key in file_outputs:
-                        if file_outputs[output_key] != output_filename:
-                            raise ValueError('Conflicting output files specified for port {}: {} and {}'.format(port_name, file_outputs[output_key], output_filename))
+            if isinstance(arg, InputValuePlaceholder):
+                port_name = arg.input_name
+                input_value = pythonic_input_argument_values[input_name_to_pythonic[port_name]]
+                if input_value is not None:
+                    return str(input_value)
+                else:
+                    input_spec = inputs_dict[port_name]
+                    if input_spec.optional:
+                        #Even when we support default values there is no need to check for a default here.
+                        #In current execution flow (called by python task factory), the missing argument would be replaced with the default value by python itself.
+                        return None
                     else:
-                        file_outputs[output_key] = output_filename
-
-                    return output_filename
-
-                elif isinstance(arg, ConcatPlaceholder):
-                    expanded_argument_strings = expand_argument_list(arg.items)
-                    return ''.join(expanded_argument_strings)
-
-                elif isinstance(arg, IfPlaceholder):
-                    arg = arg.if_structure
-                    condition_result = expand_command_part(arg.condition)
-                    from distutils.util import strtobool
-                    condition_result_bool = condition_result and strtobool(condition_result) #Python gotcha: bool('False') == True; Need to use strtobool; Also need to handle None and []
-                    result_node = arg.then_value if condition_result_bool else arg.else_value
-                    if result_node is None:
-                        return []
-                    if isinstance(result_node, list):
-                        expanded_result = expand_argument_list(result_node)
+                        raise ValueError('No value provided for input {}'.format(port_name))
+
+            if isinstance(arg, InputPathPlaceholder):
+                port_name = arg.input_name
+                input_filename = _generate_input_file_name(port_name)
+                input_key = input_name_to_kubernetes[port_name]
+                input_value = pythonic_input_argument_values[input_name_to_pythonic[port_name]]
+                if input_value is not None:
+                    file_inputs[input_key] = {'local_path': input_filename, 'data_source': input_value}
+                    return input_filename
+                else:
+                    input_spec = inputs_dict[port_name]
+                    if input_spec.optional:
+                        #Even when we support default values there is no need to check for a default here.
+                        #In current execution flow (called by python task factory), the missing argument would be replaced with the default value by python itself.
+                        return None
                     else:
-                        expanded_result = expand_command_part(result_node)
-                    return expanded_result
-
-                elif isinstance(arg, IsPresentPlaceholder):
-                    pythonic_input_name = input_name_to_pythonic[arg.input_name]
-                    argument_is_present = pythonic_input_argument_values[pythonic_input_name] is not None
-                    return str(argument_is_present)
+                        raise ValueError('No value provided for input {}'.format(port_name))
+
+            elif isinstance(arg, OutputPathPlaceholder):
+                port_name = arg.output_name
+                output_filename = _generate_output_file_name(port_name)
+                output_key = output_name_to_kubernetes[port_name]
+                if output_key in file_outputs:
+                    if file_outputs[output_key] != output_filename:
+                        raise ValueError('Conflicting output files specified for port {}: {} and {}'.format(port_name, file_outputs[output_key], output_filename))
+                else:
+                    file_outputs[output_key] = output_filename
+
+                return output_filename
+
+            elif isinstance(arg, ConcatPlaceholder):
+                expanded_argument_strings = expand_argument_list(arg.items)
+                return ''.join(expanded_argument_strings)
+
+            elif isinstance(arg, IfPlaceholder):
+                arg = arg.if_structure
+                condition_result = expand_command_part(arg.condition)
+                from distutils.util import strtobool
+                condition_result_bool = condition_result and strtobool(condition_result) #Python gotcha: bool('False') == True; Need to use strtobool; Also need to handle None and []
+                result_node = arg.then_value if condition_result_bool else arg.else_value
+                if result_node is None:
+                    return []
+                if isinstance(result_node, list):
+                    expanded_result = expand_argument_list(result_node)
                 else:
-                    raise TypeError('Unrecognized argument type: {}'.format(arg))
+                    expanded_result = expand_command_part(result_node)
+                return expanded_result
+
+            elif isinstance(arg, IsPresentPlaceholder):
+                pythonic_input_name = input_name_to_pythonic[arg.input_name]
+                argument_is_present = pythonic_input_argument_values[pythonic_input_name] is not None
+                return str(argument_is_present)
+            else:
+                raise TypeError('Unrecognized argument type: {}'.format(arg))
 
         def expand_argument_list(argument_list):
             expanded_list = []