Skip to content

Commit dfd4cc1

Browse files
authored
feat(sdk)!: Pin kfp-pipeline-spec==0.4.0, kfp-server-api>=2.1.0,<2.4.0 (#11192)
Signed-off-by: Chen Sun <[email protected]>
1 parent d3aa837 commit dfd4cc1

File tree

4 files changed

+66
-54
lines changed

4 files changed

+66
-54
lines changed

sdk/python/kfp/client/client.py

+40-34
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def get_kfp_healthz(
421421
)
422422

423423
try:
424-
return self._healthz_api.get_healthz()
424+
return self._healthz_api.healthz_service_get_healthz()
425425
# ApiException, including network errors, is the only type that may
426426
# recover after retry.
427427
except kfp_server_api.ApiException:
@@ -474,7 +474,8 @@ def create_experiment(
474474
description=description,
475475
namespace=namespace,
476476
)
477-
experiment = self._experiment_api.create_experiment(body=experiment)
477+
experiment = self._experiment_api.experiment_service_create_experiment(
478+
body=experiment)
478479

479480
link = f'{self._get_url_prefix()}/#/experiments/details/{experiment.experiment_id}'
480481
if auth.is_ipython():
@@ -502,7 +503,8 @@ def get_pipeline_id(self, name: str) -> Optional[str]:
502503
'stringValue': name,
503504
}]
504505
})
505-
result = self._pipelines_api.list_pipelines(filter=pipeline_filter)
506+
result = self._pipelines_api.pipeline_service_list_pipelines(
507+
filter=pipeline_filter)
506508
if result.pipelines is None:
507509
return None
508510
if len(result.pipelines) == 1:
@@ -545,7 +547,7 @@ def list_experiments(
545547
``V2beta1ListExperimentsResponse`` object.
546548
"""
547549
namespace = namespace or self.get_user_namespace()
548-
return self._experiment_api.list_experiments(
550+
return self._experiment_api.experiment_service_list_experiments(
549551
page_token=page_token,
550552
page_size=page_size,
551553
sort_by=sort_by,
@@ -577,7 +579,7 @@ def get_experiment(
577579
raise ValueError(
578580
'Either experiment_id or experiment_name is required.')
579581
if experiment_id is not None:
580-
return self._experiment_api.get_experiment(
582+
return self._experiment_api.experiment_service_get_experiment(
581583
experiment_id=experiment_id)
582584
experiment_filter = json.dumps({
583585
'predicates': [{
@@ -587,10 +589,10 @@ def get_experiment(
587589
}]
588590
})
589591
if namespace is not None:
590-
result = self._experiment_api.list_experiments(
592+
result = self._experiment_api.experiment_service_list_experiments(
591593
filter=experiment_filter, namespace=namespace)
592594
else:
593-
result = self._experiment_api.list_experiments(
595+
result = self._experiment_api.experiment_service_list_experiments(
594596
filter=experiment_filter)
595597
if not result.experiments:
596598
raise ValueError(
@@ -609,7 +611,7 @@ def archive_experiment(self, experiment_id: str) -> dict:
609611
Returns:
610612
Empty dictionary.
611613
"""
612-
return self._experiment_api.archive_experiment(
614+
return self._experiment_api.experiment_service_archive_experiment(
613615
experiment_id=experiment_id)
614616

615617
def unarchive_experiment(self, experiment_id: str) -> dict:
@@ -621,7 +623,7 @@ def unarchive_experiment(self, experiment_id: str) -> dict:
621623
Returns:
622624
Empty dictionary.
623625
"""
624-
return self._experiment_api.unarchive_experiment(
626+
return self._experiment_api.experiment_service_unarchive_experiment(
625627
experiment_id=experiment_id)
626628

627629
def delete_experiment(self, experiment_id: str) -> dict:
@@ -633,7 +635,7 @@ def delete_experiment(self, experiment_id: str) -> dict:
633635
Returns:
634636
Empty dictionary.
635637
"""
636-
return self._experiment_api.delete_experiment(
638+
return self._experiment_api.experiment_service_delete_experiment(
637639
experiment_id=experiment_id)
638640

639641
def list_pipelines(
@@ -666,7 +668,7 @@ def list_pipelines(
666668
Returns:
667669
``V2beta1ListPipelinesResponse`` object.
668670
"""
669-
return self._pipelines_api.list_pipelines(
671+
return self._pipelines_api.pipeline_service_list_pipelines(
670672
namespace=namespace,
671673
page_token=page_token,
672674
page_size=page_size,
@@ -730,7 +732,7 @@ def run_pipeline(
730732
runtime_config=job_config.runtime_config,
731733
service_account=service_account)
732734

733-
response = self._run_api.create_run(body=run_body)
735+
response = self._run_api.run_service_create_run(body=run_body)
734736

735737
link = f'{self._get_url_prefix()}/#/runs/details/{response.run_id}'
736738
if auth.is_ipython():
@@ -751,7 +753,7 @@ def archive_run(self, run_id: str) -> dict:
751753
Returns:
752754
Empty dictionary.
753755
"""
754-
return self._run_api.archive_run(run_id=run_id)
756+
return self._run_api.run_service_archive_run(run_id=run_id)
755757

756758
def unarchive_run(self, run_id: str) -> dict:
757759
"""Restores an archived run.
@@ -762,7 +764,7 @@ def unarchive_run(self, run_id: str) -> dict:
762764
Returns:
763765
Empty dictionary.
764766
"""
765-
return self._run_api.unarchive_run(run_id=run_id)
767+
return self._run_api.run_service_unarchive_run(run_id=run_id)
766768

767769
def delete_run(self, run_id: str) -> dict:
768770
"""Deletes a run.
@@ -773,7 +775,7 @@ def delete_run(self, run_id: str) -> dict:
773775
Returns:
774776
Empty dictionary.
775777
"""
776-
return self._run_api.delete_run(run_id=run_id)
778+
return self._run_api.run_service_delete_run(run_id=run_id)
777779

778780
def terminate_run(self, run_id: str) -> dict:
779781
"""Terminates a run.
@@ -784,7 +786,7 @@ def terminate_run(self, run_id: str) -> dict:
784786
Returns:
785787
Empty dictionary.
786788
"""
787-
return self._run_api.terminate_run(run_id=run_id)
789+
return self._run_api.run_service_terminate_run(run_id=run_id)
788790

789791
def create_recurring_run(
790792
self,
@@ -896,7 +898,8 @@ def create_recurring_run(
896898
trigger=trigger,
897899
max_concurrency=max_concurrency,
898900
service_account=service_account)
899-
return self._recurring_run_api.create_recurring_run(body=job_body)
901+
return self._recurring_run_api.recurring_run_service_create_recurring_run(
902+
body=job_body)
900903

901904
def _create_job_config(
902905
self,
@@ -1131,7 +1134,7 @@ def delete_recurring_run(self, recurring_run_id: str) -> dict:
11311134
Returns:
11321135
Empty dictionary.
11331136
"""
1134-
return self._recurring_run_api.delete_recurring_run(
1137+
return self._recurring_run_api.recurring_run_service_delete_recurring_run(
11351138
recurring_run_id=recurring_run_id)
11361139

11371140
def disable_job(self, job_id: str) -> dict:
@@ -1159,7 +1162,7 @@ def disable_recurring_run(self, recurring_run_id: str) -> dict:
11591162
Returns:
11601163
Empty dictionary.
11611164
"""
1162-
return self._recurring_run_api.disable_recurring_run(
1165+
return self._recurring_run_api.recurring_run_service_disable_recurring_run(
11631166
recurring_run_id=recurring_run_id)
11641167

11651168
def enable_job(self, job_id: str) -> dict:
@@ -1187,7 +1190,7 @@ def enable_recurring_run(self, recurring_run_id: str) -> dict:
11871190
Returns:
11881191
Empty dictionary.
11891192
"""
1190-
return self._recurring_run_api.enable_recurring_run(
1193+
return self._recurring_run_api.recurring_run_service_enable_recurring_run(
11911194
recurring_run_id=recurring_run_id)
11921195

11931196
def list_runs(
@@ -1225,23 +1228,23 @@ def list_runs(
12251228
"""
12261229
namespace = namespace or self.get_user_namespace()
12271230
if experiment_id is not None:
1228-
return self._run_api.list_runs(
1231+
return self._run_api.run_service_list_runs(
12291232
page_token=page_token,
12301233
page_size=page_size,
12311234
sort_by=sort_by,
12321235
experiment_id=experiment_id,
12331236
filter=filter)
12341237

12351238
elif namespace is not None:
1236-
return self._run_api.list_runs(
1239+
return self._run_api.run_service_list_runs(
12371240
page_token=page_token,
12381241
page_size=page_size,
12391242
sort_by=sort_by,
12401243
namespace=namespace,
12411244
filter=filter)
12421245

12431246
else:
1244-
return self._run_api.list_runs(
1247+
return self._run_api.run_service_list_runs(
12451248
page_token=page_token,
12461249
page_size=page_size,
12471250
sort_by=sort_by,
@@ -1281,23 +1284,23 @@ def list_recurring_runs(
12811284
``V2beta1ListRecurringRunsResponse`` object.
12821285
"""
12831286
if experiment_id is not None:
1284-
return self._recurring_run_api.list_recurring_runs(
1287+
return self._recurring_run_api.recurring_run_service_list_recurring_runs(
12851288
page_token=page_token,
12861289
page_size=page_size,
12871290
sort_by=sort_by,
12881291
experiment_id=experiment_id,
12891292
filter=filter)
12901293

12911294
elif namespace is not None:
1292-
return self._recurring_run_api.list_recurring_runs(
1295+
return self._recurring_run_api.recurring_run_service_list_recurring_runs(
12931296
page_token=page_token,
12941297
page_size=page_size,
12951298
sort_by=sort_by,
12961299
namespace=namespace,
12971300
filter=filter)
12981301

12991302
else:
1300-
return self._recurring_run_api.list_recurring_runs(
1303+
return self._recurring_run_api.recurring_run_service_list_recurring_runs(
13011304
page_token=page_token,
13021305
page_size=page_size,
13031306
sort_by=sort_by,
@@ -1324,7 +1327,7 @@ def get_recurring_run(
13241327
stacklevel=2)
13251328
recurring_run_id = recurring_run_id or job_id
13261329

1327-
return self._recurring_run_api.get_recurring_run(
1330+
return self._recurring_run_api.recurring_run_service_get_recurring_run(
13281331
recurring_run_id=recurring_run_id)
13291332

13301333
def get_run(self, run_id: str) -> kfp_server_api.V2beta1Run:
@@ -1336,7 +1339,7 @@ def get_run(self, run_id: str) -> kfp_server_api.V2beta1Run:
13361339
Returns:
13371340
``V2beta1Run`` object.
13381341
"""
1339-
return self._run_api.get_run(run_id=run_id)
1342+
return self._run_api.run_service_get_run(run_id=run_id)
13401343

13411344
def wait_for_run_completion(
13421345
self,
@@ -1362,7 +1365,8 @@ def wait_for_run_completion(
13621365
finish_states = ['succeeded', 'failed', 'skipped', 'error']
13631366
while True:
13641367
try:
1365-
get_run_response = self._run_api.get_run(run_id=run_id)
1368+
get_run_response = self._run_api.run_service_get_run(
1369+
run_id=run_id)
13661370
is_valid_token = True
13671371
except kfp_server_api.ApiException as api_ex:
13681372
# if the token is valid but receiving 401 Unauthorized error
@@ -1480,7 +1484,8 @@ def get_pipeline(self, pipeline_id: str) -> kfp_server_api.V2beta1Pipeline:
14801484
Returns:
14811485
``V2beta1Pipeline`` object.
14821486
"""
1483-
return self._pipelines_api.get_pipeline(pipeline_id=pipeline_id)
1487+
return self._pipelines_api.pipeline_service_get_pipeline(
1488+
pipeline_id=pipeline_id)
14841489

14851490
def delete_pipeline(self, pipeline_id: str) -> dict:
14861491
"""Deletes a pipeline.
@@ -1491,7 +1496,8 @@ def delete_pipeline(self, pipeline_id: str) -> dict:
14911496
Returns:
14921497
Empty dictionary.
14931498
"""
1494-
return self._pipelines_api.delete_pipeline(pipeline_id=pipeline_id)
1499+
return self._pipelines_api.pipeline_service_delete_pipeline(
1500+
pipeline_id=pipeline_id)
14951501

14961502
def list_pipeline_versions(
14971503
self,
@@ -1525,7 +1531,7 @@ def list_pipeline_versions(
15251531
``V2beta1ListPipelineVersionsResponse`` object.
15261532
"""
15271533

1528-
return self._pipelines_api.list_pipeline_versions(
1534+
return self._pipelines_api.pipeline_service_list_pipeline_versions(
15291535
page_token=page_token,
15301536
page_size=page_size,
15311537
sort_by=sort_by,
@@ -1546,7 +1552,7 @@ def get_pipeline_version(
15461552
Returns:
15471553
``V2beta1PipelineVersion`` object.
15481554
"""
1549-
return self._pipelines_api.get_pipeline_version(
1555+
return self._pipelines_api.pipeline_service_get_pipeline_version(
15501556
pipeline_id=pipeline_id,
15511557
pipeline_version_id=pipeline_version_id,
15521558
)
@@ -1565,7 +1571,7 @@ def delete_pipeline_version(
15651571
Returns:
15661572
Empty dictionary.
15671573
"""
1568-
return self._pipelines_api.delete_pipeline_version(
1574+
return self._pipelines_api.pipeline_service_delete_pipeline_version(
15691575
pipeline_id=pipeline_id,
15701576
pipeline_version_id=pipeline_version_id,
15711577
)

0 commit comments

Comments
 (0)