From 834bfbe90ae929b27c54a208d15b959d99ae0c9c Mon Sep 17 00:00:00 2001 From: Connor McCarthy Date: Tue, 29 Nov 2022 20:39:23 -0800 Subject: [PATCH] fix(sdk): revert premature client changes (#8507) * revert _v1 client changes * do not install kfp_server_api from source --- sdk/python/kfp/client/client.py | 54 +++++++++++++-------------- test/presubmit-sdk-execution-tests.sh | 4 -- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/sdk/python/kfp/client/client.py b/sdk/python/kfp/client/client.py index fdb8ccc3fb..1a6846d416 100644 --- a/sdk/python/kfp/client/client.py +++ b/sdk/python/kfp/client/client.py @@ -474,8 +474,7 @@ class Client: name=name, description=description, resource_references=resource_references) - experiment = self._experiment_api.create_experiment_v1( - body=experiment) + experiment = self._experiment_api.create_experiment(body=experiment) link = f'{self._get_url_prefix()}/#/experiments/details/{experiment.id}' if self._is_ipython(): @@ -503,7 +502,7 @@ class Client: 'stringValue': name, }] }) - result = self._pipelines_api.list_pipelines_v1(filter=pipeline_filter) + result = self._pipelines_api.list_pipelines(filter=pipeline_filter) if result.pipelines is None: return None if len(result.pipelines) == 1: @@ -546,7 +545,7 @@ class Client: ``ApiListExperimentsResponse`` object. """ namespace = namespace or self.get_user_namespace() - response = self._experiment_api.list_experiments_v1( + response = self._experiment_api.list_experiment( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -577,7 +576,7 @@ class Client: raise ValueError( 'Either experiment_id or experiment_name is required') if experiment_id is not None: - return self._experiment_api.get_experiment_v1(id=experiment_id) + return self._experiment_api.get_experiment(id=experiment_id) experiment_filter = json.dumps({ 'predicates': [{ 'op': _FILTER_OPERATIONS['EQUALS'], @@ -586,13 +585,13 @@ class Client: }] }) if namespace: - result = self._experiment_api.list_experiments_v1( + result = self._experiment_api.list_experiment( filter=experiment_filter, resource_reference_key_type=kfp_server_api.ApiResourceType .NAMESPACE, resource_reference_key_id=namespace) else: - result = self._experiment_api.list_experiments_v1( + result = self._experiment_api.list_experiment( filter=experiment_filter) if not result.experiments: raise ValueError( @@ -611,7 +610,7 @@ class Client: Returns: Empty dictionary. """ - return self._experiment_api.archive_experiment_v1(id=experiment_id) + return self._experiment_api.archive_experiment(id=experiment_id) def unarchive_experiment(self, experiment_id: str) -> dict: """Unarchives an experiment. @@ -622,7 +621,7 @@ class Client: Returns: Empty dictionary. """ - return self._experiment_api.unarchive_experiment_v1(id=experiment_id) + return self._experiment_api.unarchive_experiment(id=experiment_id) def delete_experiment(self, experiment_id: str) -> dict: """Delete experiment. @@ -633,7 +632,7 @@ class Client: Returns: Empty dictionary. """ - return self._experiment_api.delete_experiment_v1(id=experiment_id) + return self._experiment_api.delete_experiment(id=experiment_id) def _extract_pipeline_yaml(self, package_file: str) -> dict: @@ -718,7 +717,7 @@ class Client: Returns: ``ApiListPipelinesResponse`` object. """ - return self._pipelines_api.list_pipelines_v1( + return self._pipelines_api.list_pipelines( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -782,7 +781,7 @@ class Client: name=job_name, service_account=service_account) - response = self._run_api.create_run_v1(body=run_body) + response = self._run_api.create_run(body=run_body) link = f'{self._get_url_prefix()}/#/runs/details/{response.run.id}' if self._is_ipython(): @@ -803,7 +802,7 @@ class Client: Returns: Empty dictionary. """ - return self._run_api.archive_run_v1(id=run_id) + return self._run_api.archive_run(id=run_id) def unarchive_run(self, run_id: str) -> dict: """Restores an archived run. @@ -814,7 +813,7 @@ class Client: Returns: Empty dictionary. """ - return self._run_api.unarchive_run_v1(id=run_id) + return self._run_api.unarchive_run(id=run_id) def delete_run(self, run_id: str) -> dict: """Deletes a run. @@ -825,7 +824,7 @@ class Client: Returns: Empty dictionary. """ - return self._run_api.delete_run_v1(id=run_id) + return self._run_api.delete_run(id=run_id) def terminate_run(self, run_id: str) -> dict: """Terminates a run. @@ -836,7 +835,7 @@ class Client: Returns: Empty dictionary. """ - return self._run_api.terminate_run_v1(run_id=run_id) + return self._run_api.terminate_run(run_id=run_id) def create_recurring_run( self, @@ -1206,7 +1205,7 @@ class Client: """ namespace = namespace or self.get_user_namespace() if experiment_id is not None: - response = self._run_api.list_runs_v1( + response = self._run_api.list_runs( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -1215,7 +1214,7 @@ class Client: resource_reference_key_id=experiment_id, filter=filter) elif namespace: - response = self._run_api.list_runs_v1( + response = self._run_api.list_runs( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -1224,7 +1223,7 @@ class Client: resource_reference_key_id=namespace, filter=filter) else: - response = self._run_api.list_runs_v1( + response = self._run_api.list_runs( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -1298,7 +1297,7 @@ class Client: Returns: ``ApiRun`` object. """ - return self._run_api.get_run_v1(run_id=run_id) + return self._run_api.get_run(run_id=run_id) def wait_for_run_completion(self, run_id: str, timeout: int) -> kfp_server_api.ApiRun: @@ -1319,7 +1318,7 @@ class Client: while (status is None or status.lower() not in ['succeeded', 'failed', 'skipped', 'error']): try: - get_run_response = self._run_api.get_run_v1(run_id=run_id) + get_run_response = self._run_api.get_run(run_id=run_id) is_valid_token = True except kfp_server_api.ApiException as api_ex: # if the token is valid but receiving 401 Unauthorized error @@ -1348,7 +1347,7 @@ class Client: Returns: Workflow JSON. """ - get_run_response = self._run_api.get_run_v1(run_id=run_id) + get_run_response = self._run_api.get_run(run_id=run_id) workflow = get_run_response.pipeline_runtime.workflow_manifest workflow_json = json.loads(workflow) return workflow_json @@ -1445,7 +1444,7 @@ class Client: Returns: ``ApiPipeline`` object. """ - return self._pipelines_api.get_pipeline_v1(id=pipeline_id) + return self._pipelines_api.get_pipeline(id=pipeline_id) def delete_pipeline(self, pipeline_id: str) -> dict: """Deletes a pipeline. @@ -1456,7 +1455,7 @@ class Client: Returns: Empty dictionary. """ - return self._pipelines_api.delete_pipeline_v1(id=pipeline_id) + return self._pipelines_api.delete_pipeline(id=pipeline_id) def list_pipeline_versions( self, @@ -1490,7 +1489,7 @@ class Client: ``ApiListPipelineVersionsResponse`` object. """ - return self._pipelines_api.list_pipeline_versions_v1( + return self._pipelines_api.list_pipeline_versions( page_token=page_token, page_size=page_size, sort_by=sort_by, @@ -1508,8 +1507,7 @@ class Client: Returns: ``ApiPipelineVersion`` object. """ - return self._pipelines_api.get_pipeline_version_v1( - version_id=version_id) + return self._pipelines_api.get_pipeline_version(version_id=version_id) def delete_pipeline_version(self, version_id: str) -> dict: """Deletes a pipeline version. @@ -1520,7 +1518,7 @@ class Client: Returns: Empty dictionary. """ - return self._pipelines_api.delete_pipeline_version_v1( + return self._pipelines_api.delete_pipeline_version( version_id=version_id) diff --git a/test/presubmit-sdk-execution-tests.sh b/test/presubmit-sdk-execution-tests.sh index dcef611b05..e44a250922 100755 --- a/test/presubmit-sdk-execution-tests.sh +++ b/test/presubmit-sdk-execution-tests.sh @@ -19,10 +19,6 @@ python3 -m pip install --upgrade pip python3 -m pip install $source_root/sdk/python python3 -m pip install -r $source_root/test/sdk-execution-tests/requirements.txt -# Install KFP server API from commit. -cp -r $source_root/backend/api/v1beta1/python_http_client /python_http_client -python3 -m pip install /python_http_client - export KFP_ENDPOINT="https://$(curl https://raw.githubusercontent.com/kubeflow/testing/master/test-infra/kfp/endpoint)" export TIMEOUT_SECONDS=2700