clean up

sdk/python/kfp/cli/cli_test.py

@@ -132,8 +132,6 @@ class TestSmokeTestAllCommandsWithHelp(parameterized.TestCase):
     def setUpClass(cls):
         cls.runner = testing.CliRunner()
 
-        cls.vals = [('run', 'list')]
-
     @parameterized.parameters(*noun_verb_list)
     def test(self, noun: str, verb: str):
         with mock.patch('kfp.cli.cli.client.Client'):

sdk/python/kfp/cli/diagnose_me_cli.py

@@ -24,12 +24,10 @@
 @click.option(
     '-p',
     '--project-id',
-    type=Text,
     help='Target project id. It will use environment default if not specified.')
 @click.option(
     '-n',
     '--namespace',
-    type=Text,
     help='Namespace to use for Kubernetes cluster.all-namespaces is used if not specified.'
 )
 @click.pass_context

sdk/python/kfp/cli/experiment.py

@@ -43,6 +43,7 @@ def create(ctx: click.Context, description: str, name: str):
     '-m',
     '--max-size',
     default=100,
+    type=int,
     help=parsing.get_param_descr(client.Client.list_experiments, 'page_size'))
 @click.option(
     '--sort-by',
@@ -147,8 +148,7 @@ def archive(ctx: click.Context, experiment_id: str, experiment_name: str):
     client = ctx.obj['client']
 
     if (experiment_id is None) == (experiment_name is None):
-        raise ValueError(
-            'Either --experiment-id or --experiment-name is required.')
+        raise ValueError(either_option_required)
 
     if not experiment_id:
         experiment = client.get_experiment(experiment_name=experiment_name)
@@ -175,8 +175,7 @@ def unarchive(ctx: click.Context, experiment_id: str, experiment_name: str):
     client = ctx.obj['client']
 
     if (experiment_id is None) == (experiment_name is None):
-        raise ValueError(
-            'Either --expriment-id or --experiment-name is required.')
+        raise ValueError(either_option_required)
 
     if not experiment_id:
         experiment = client.get_experiment(experiment_name=experiment_name)

sdk/python/kfp/cli/pipeline.py

@@ -97,9 +97,10 @@ def upload_version(ctx: click.Context,
         if pipeline_id is None:
             raise ValueError(
                 f"Can't find a pipeline with name: {pipeline_name}")
-    # TODO: this is broken
-    version = client.pipeline_uploads.upload_pipeline_version(
-        package_file, name=pipeline_version, pipelineid=pipeline_id)
+    version = client.upload_pipeline_version(
+        pipeline_package_path=package_file,
+        pipeline_version_name=pipeline_version,
+        pipeline_id=pipeline_id)
     _display_pipeline_version(version, output_format)
 
 
@@ -112,6 +113,7 @@ def upload_version(ctx: click.Context,
     '-m',
     '--max-size',
     default=100,
+    type=int,
     help=parsing.get_param_descr(client.Client.list_pipelines, 'page_size'))
 @click.option(
     '--sort-by',
@@ -191,17 +193,7 @@ def list_versions(ctx: click.Context, pipeline_id: str, page_token: str,
 @click.argument('version-id')
 @click.pass_context
 def delete_version(ctx: click.Context, version_id: str):
-    """Delete a version of a pipeline.
-
-    Args:
-      version_id: id of the pipeline version.
-
-    Returns:
-      Object. If the method is called asynchronously, returns the request thread.
-
-    Throws:
-      Exception if pipeline version is not found.
-    """
+    """Delete a version of a pipeline."""
     confirmation = f'Are you sure you want to delete pipeline version {version_id}?'
     if not click.confirm(confirmation):
         return

sdk/python/kfp/cli/recurring_run.py

@@ -76,6 +76,7 @@ def recurring_run():
                                  'job_name'))
 @click.option(
     '--interval-second',
+    type=int,
     help=parsing.get_param_descr(client.Client.create_recurring_run,
                                  'interval_second'))
 @click.option(
@@ -97,7 +98,10 @@ def recurring_run():
     '--start-time',
     help=parsing.get_param_descr(client.Client.create_recurring_run,
                                  'start_time'))
-@click.option('--version-id', help='The id of a pipeline version.')
+@click.option(
+    '--version-id',
+    help=parsing.get_param_descr(client.Client.create_recurring_run,
+                                 'version_id'))
 @click.argument('args', nargs=-1)
 @click.pass_context
 def create(ctx: click.Context,
@@ -165,6 +169,7 @@ def create(ctx: click.Context,
     '-m',
     '--max-size',
     default=100,
+    type=int,
     help=parsing.get_param_descr(client.Client.list_recurring_runs,
                                  'page_size'))
 @click.option(

sdk/python/kfp/cli/run.py

@@ -46,6 +46,7 @@ def run():
     '-m',
     '--max-size',
     default=100,
+    type=int,
     help=parsing.get_param_descr(client.Client.list_runs, 'page_size'))
 @click.option(
     '--sort-by',
@@ -110,8 +111,8 @@ def list(ctx: click.Context, experiment_id: str, page_token: str, max_size: int,
     '-t',
     '--timeout',
     default=0,
-    help='Wait for a run to complete until timeout in seconds.',
-    type=int)
+    type=int,
+    help='Wait for a run to complete until timeout in seconds.')
 @click.argument('args', nargs=-1)
 @click.pass_context
 def submit(ctx: click.Context, experiment_name: str, run_name: str,
@@ -161,7 +162,7 @@ def submit(ctx: click.Context, experiment_name: str, run_name: str,
     '--detail',
     is_flag=True,
     default=False,
-    help='Get detailed information of the run in json format.')
+    help='Get detailed information of the run in JSON format.')
 @click.argument('run-id')
 @click.pass_context
 def get(ctx: click.Context, watch: bool, detail: bool, run_id: str):

sdk/python/kfp/client/client.py

@@ -678,7 +678,7 @@ def list_pipelines(
         Args:
             page_token: Token for starting of the page.
             page_size: Size of the page.
-            sort_by: one of 'field_name', 'field_name desc'. For example,
+            sort_by: One of 'field_name', 'field_name desc'. For example,
                 'name desc'.
             filter: A url-encoded, JSON-serialized Filter protocol buffer
                 (see [filter.proto](https://github.com/kubeflow/pipelines/blob/master/backend/api/filter.proto)).
@@ -1019,7 +1019,7 @@ def create_run_from_pipeline_func(
             pipeline_func: A function that describes a pipeline by calling
                 components and composing them into execution graph.
             arguments: Arguments to the pipeline function provided as a dict.
-            run_name (Optional): Name of the run to be shown in the UI.
+            run_name (Optional): Name of the run.
             experiment_name (Optional): Name of the experiment to add the run to.
             namespace: Kubernetes namespace where the pipeline runs are created.
                 For single user deployment, leave it as None;
@@ -1076,7 +1076,7 @@ def create_run_from_pipeline_package(
         Args:
             pipeline_file: A compiled pipeline package file.
             arguments: Arguments to the pipeline function provided as a dict.
-            run_name (Optional):  Name of the run to be shown in the UI.
+            run_name (Optional):  Name of the run.
             experiment_name (Optional): Name of the experiment to add the run to.
             namespace (Optional): Kubernetes namespace where the pipeline runs are created.
               For single user deployment, leave it as None;
@@ -1385,9 +1385,8 @@ def upload_pipeline(
 
         Args:
             pipeline_package_path: Local path to the pipeline package.
-            pipeline_name (Optional): Name of the pipeline to be shown in the UI.
-            description (Optional): Description of the pipeline to be shown in
-                the UI.
+            pipeline_name (Optional): Name of the pipeline.
+            description (Optional): Description of the pipeline..
 
         Returns:
             Server response object containing pipleine id and other information.
@@ -1414,12 +1413,10 @@ def upload_pipeline_version(
 
         Args:
             pipeline_package_path: Local path to the pipeline package.
-            pipeline_version_name:  Name of the pipeline version to be shown in
-                the UI.
+            pipeline_version_name:  Name of the pipeline version.
             pipeline_id (Optional): Id of the pipeline.
             pipeline_name (Optional): Name of the pipeline.
-            description (Optional): Description of the pipeline version to be
-                shown in the UI.
+            description (Optional): Description of the pipeline version.
 
         Returns:
             Server response object containing pipleine id and other information.