Skip to content

Commit ba41ce5

Browse files
speedstorm1copybara-github
authored andcommitted
chore: remove Gemini Developer API deprecated tunings.list()
PiperOrigin-RevId: 900342127
1 parent 8bdc1c3 commit ba41ce5

3 files changed

Lines changed: 17 additions & 98 deletions

File tree

google/genai/tests/shared/tunings/test_list.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
parameters=genai_types._ListTuningJobsParameters(
2727
config=genai_types.ListTuningJobsConfig(page_size=1)
2828
),
29+
exception_if_mldev='only supported in the Vertex AI client'
2930
),
3031
]
3132

google/genai/tests/tunings/test_list.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626
pytest_helper.TestTableItem(
2727
name='test_default',
2828
parameters=genai_types._ListTuningJobsParameters(),
29+
exception_if_mldev='only supported in the Vertex AI client',
2930
),
3031
pytest_helper.TestTableItem(
3132
name='test_with_config',
3233
parameters=genai_types._ListTuningJobsParameters(
3334
config=genai_types.ListTuningJobsConfig(page_size=2)
3435
),
36+
exception_if_mldev='only supported in the Vertex AI client',
3537
),
3638
]
3739

@@ -46,6 +48,9 @@
4648

4749

4850
def test_pager(client):
51+
if not client._api_client.vertexai:
52+
return
53+
4954
tuning_jobs = client.tunings.list(config={'page_size': 2})
5055
assert 'content-type' in tuning_jobs.sdk_http_response.headers
5156
assert tuning_jobs.name == 'tuning_jobs'
@@ -61,6 +66,9 @@ def test_pager(client):
6166

6267
@pytest.mark.asyncio
6368
async def test_async_pager(client):
69+
if not client._api_client.vertexai:
70+
return
71+
6472
tuning_jobs = await client.aio.tunings.list(config={'page_size': 2})
6573

6674
assert 'Content-Type' in tuning_jobs.sdk_http_response.headers

google/genai/tunings.py

Lines changed: 8 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -907,31 +907,6 @@ def _GetTuningJobParameters_to_vertex(
907907
return to_object
908908

909909

910-
def _ListTuningJobsConfig_to_mldev(
911-
from_object: Union[dict[str, Any], object],
912-
parent_object: Optional[dict[str, Any]] = None,
913-
root_object: Optional[Union[dict[str, Any], object]] = None,
914-
) -> dict[str, Any]:
915-
to_object: dict[str, Any] = {}
916-
917-
if getv(from_object, ['page_size']) is not None:
918-
setv(
919-
parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
920-
)
921-
922-
if getv(from_object, ['page_token']) is not None:
923-
setv(
924-
parent_object,
925-
['_query', 'pageToken'],
926-
getv(from_object, ['page_token']),
927-
)
928-
929-
if getv(from_object, ['filter']) is not None:
930-
setv(parent_object, ['_query', 'filter'], getv(from_object, ['filter']))
931-
932-
return to_object
933-
934-
935910
def _ListTuningJobsConfig_to_vertex(
936911
from_object: Union[dict[str, Any], object],
937912
parent_object: Optional[dict[str, Any]] = None,
@@ -957,20 +932,6 @@ def _ListTuningJobsConfig_to_vertex(
957932
return to_object
958933

959934

960-
def _ListTuningJobsParameters_to_mldev(
961-
from_object: Union[dict[str, Any], object],
962-
parent_object: Optional[dict[str, Any]] = None,
963-
root_object: Optional[Union[dict[str, Any], object]] = None,
964-
) -> dict[str, Any]:
965-
to_object: dict[str, Any] = {}
966-
if getv(from_object, ['config']) is not None:
967-
_ListTuningJobsConfig_to_mldev(
968-
getv(from_object, ['config']), to_object, root_object
969-
)
970-
971-
return to_object
972-
973-
974935
def _ListTuningJobsParameters_to_vertex(
975936
from_object: Union[dict[str, Any], object],
976937
parent_object: Optional[dict[str, Any]] = None,
@@ -985,33 +946,6 @@ def _ListTuningJobsParameters_to_vertex(
985946
return to_object
986947

987948

988-
def _ListTuningJobsResponse_from_mldev(
989-
from_object: Union[dict[str, Any], object],
990-
parent_object: Optional[dict[str, Any]] = None,
991-
root_object: Optional[Union[dict[str, Any], object]] = None,
992-
) -> dict[str, Any]:
993-
to_object: dict[str, Any] = {}
994-
if getv(from_object, ['sdkHttpResponse']) is not None:
995-
setv(
996-
to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
997-
)
998-
999-
if getv(from_object, ['nextPageToken']) is not None:
1000-
setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
1001-
1002-
if getv(from_object, ['tunedModels']) is not None:
1003-
setv(
1004-
to_object,
1005-
['tuning_jobs'],
1006-
[
1007-
_TuningJob_from_mldev(item, to_object, root_object)
1008-
for item in getv(from_object, ['tunedModels'])
1009-
],
1010-
)
1011-
1012-
return to_object
1013-
1014-
1015949
def _ListTuningJobsResponse_from_vertex(
1016950
from_object: Union[dict[str, Any], object],
1017951
parent_object: Optional[dict[str, Any]] = None,
@@ -1632,8 +1566,9 @@ def _list(
16321566
)
16331567

16341568
request_url_dict: Optional[dict[str, str]]
1635-
1636-
if self._api_client.vertexai:
1569+
if not self._api_client.vertexai:
1570+
raise ValueError('This method is only supported in the Vertex AI client.')
1571+
else:
16371572
request_dict = _ListTuningJobsParameters_to_vertex(
16381573
parameter_model, None, parameter_model
16391574
)
@@ -1642,15 +1577,7 @@ def _list(
16421577
path = 'tuningJobs'.format_map(request_url_dict)
16431578
else:
16441579
path = 'tuningJobs'
1645-
else:
1646-
request_dict = _ListTuningJobsParameters_to_mldev(
1647-
parameter_model, None, parameter_model
1648-
)
1649-
request_url_dict = request_dict.get('_url')
1650-
if request_url_dict:
1651-
path = 'tunedModels'.format_map(request_url_dict)
1652-
else:
1653-
path = 'tunedModels'
1580+
16541581
query_params = request_dict.get('_query')
16551582
if query_params:
16561583
path = f'{path}?{urlencode(query_params)}'
@@ -1676,11 +1603,6 @@ def _list(
16761603
response_dict, None, parameter_model
16771604
)
16781605

1679-
if not self._api_client.vertexai:
1680-
response_dict = _ListTuningJobsResponse_from_mldev(
1681-
response_dict, None, parameter_model
1682-
)
1683-
16841606
return_value = types.ListTuningJobsResponse._from_response(
16851607
response=response_dict,
16861608
kwargs={
@@ -2215,8 +2137,9 @@ async def _list(
22152137
)
22162138

22172139
request_url_dict: Optional[dict[str, str]]
2218-
2219-
if self._api_client.vertexai:
2140+
if not self._api_client.vertexai:
2141+
raise ValueError('This method is only supported in the Vertex AI client.')
2142+
else:
22202143
request_dict = _ListTuningJobsParameters_to_vertex(
22212144
parameter_model, None, parameter_model
22222145
)
@@ -2225,15 +2148,7 @@ async def _list(
22252148
path = 'tuningJobs'.format_map(request_url_dict)
22262149
else:
22272150
path = 'tuningJobs'
2228-
else:
2229-
request_dict = _ListTuningJobsParameters_to_mldev(
2230-
parameter_model, None, parameter_model
2231-
)
2232-
request_url_dict = request_dict.get('_url')
2233-
if request_url_dict:
2234-
path = 'tunedModels'.format_map(request_url_dict)
2235-
else:
2236-
path = 'tunedModels'
2151+
22372152
query_params = request_dict.get('_query')
22382153
if query_params:
22392154
path = f'{path}?{urlencode(query_params)}'
@@ -2261,11 +2176,6 @@ async def _list(
22612176
response_dict, None, parameter_model
22622177
)
22632178

2264-
if not self._api_client.vertexai:
2265-
response_dict = _ListTuningJobsResponse_from_mldev(
2266-
response_dict, None, parameter_model
2267-
)
2268-
22692179
return_value = types.ListTuningJobsResponse._from_response(
22702180
response=response_dict,
22712181
kwargs={

0 commit comments

Comments
 (0)