SDK - Python Components - Stop generating output saving code if no outputs (#3836)

Removed dead code from the generated python command-line wrapper.

sdk/python/kfp/components/_python_op.py

@@ -555,10 +555,13 @@ def _func_to_component_spec(func, extra_code='', base_image : str = None, packag
 
     arg_parse_code_lines = list(definitions) + arg_parse_code_lines
 
-    arg_parse_code_lines.extend([
+    arg_parse_code_lines.append(
         '_parsed_args = vars(_parser.parse_args())',
-        '_output_files = _parsed_args.pop("_output_paths", [])',
+    )
-    ])
+    if outputs_passed_through_func_return_tuple:
+        arg_parse_code_lines.append(
+            '_output_files = _parsed_args.pop("_output_paths", [])',
+        )
 
     # Putting singular return values in a list to be "zipped" with the serializers and output paths
     outputs_to_list_code = ''
@@ -573,17 +576,7 @@ def _func_to_component_spec(func, extra_code='', base_image : str = None, packag
 
     output_serialization_code = ''.join('    {},\n'.format(s) for s in output_serialization_expression_strings)
 
-    full_source = \
+    full_output_handling_code = '''
-'''\
-{pre_func_code}
-
-{extra_code}
-
-{func_code}
-
-{arg_parse_code}
-
-_outputs = {func_name}(**_parsed_args)
 
 {outputs_to_list_code}
 
@@ -599,16 +592,33 @@ for idx, output_file in enumerate(_output_files):
         pass
     with open(output_file, 'w') as f:
         f.write(_output_serializers[idx](_outputs[idx]))
+'''.format(
+        output_serialization_code=output_serialization_code,
+        outputs_to_list_code=outputs_to_list_code,
+    )
+
+    full_source = \
+'''\
+{pre_func_code}
+
+{extra_code}
+
+{func_code}
+
+{arg_parse_code}
+
+_outputs = {func_name}(**_parsed_args)
 '''.format(
         func_name=func.__name__,
         func_code=func_code,
         pre_func_code=pre_func_code,
         extra_code=extra_code,
         arg_parse_code='\n'.join(arg_parse_code_lines),
-        output_serialization_code=output_serialization_code,
-        outputs_to_list_code=outputs_to_list_code,
     )
 
+    if outputs_passed_through_func_return_tuple:
+        full_source += full_output_handling_code
+
     #Removing consecutive blank lines
     import re
     full_source = re.sub('\n\n\n+', '\n\n', full_source).strip('\n') + '\n'

sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.yaml

@@ -27,22 +27,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -71,22 +57,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -115,22 +87,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -159,22 +117,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -203,22 +147,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -247,22 +177,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: 
@@ -291,22 +207,8 @@ spec:
               _parser = argparse.ArgumentParser(prog='Consume', description='')
               _parser.add_argument("--param1", dest="param1", type=str, required=True, default=argparse.SUPPRESS)
               _parsed_args = vars(_parser.parse_args())
-              _output_files = _parsed_args.pop("_output_paths", [])
               
               _outputs = consume(**_parsed_args)
-              
-              _output_serializers = [
-              
-              ]
-              
-              import os
-              for idx, output_file in enumerate(_output_files):
-                  try:
-                      os.makedirs(os.path.dirname(output_file))
-                  except OSError:
-                      pass
-                  with open(output_file, 'w') as f:
-                      f.write(_output_serializers[idx](_outputs[idx]))
         image: "tensorflow/tensorflow:1.13.2-py3"
       inputs: 
         parameters: