Skip to content

chore: remove mldev deprecated tunings.list() #2278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: remove mldev deprecated tunings.list() #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions google/genai/tests/shared/tunings/test_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
parameters=genai_types._ListTuningJobsParameters(
config=genai_types.ListTuningJobsConfig(page_size=1)
),
exception_if_mldev='only supported in'
),
]

Expand Down
8 changes: 8 additions & 0 deletions google/genai/tests/tunings/test_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
pytest_helper.TestTableItem(
name='test_default',
parameters=genai_types._ListTuningJobsParameters(),
exception_if_mldev='only supported in',
),
pytest_helper.TestTableItem(
name='test_with_config',
parameters=genai_types._ListTuningJobsParameters(
config=genai_types.ListTuningJobsConfig(page_size=2)
),
exception_if_mldev='only supported in',
),
]

Expand All @@ -46,6 +48,9 @@


def test_pager(client):
if not client._api_client.vertexai:
return

tuning_jobs = client.tunings.list(config={'page_size': 2})
assert 'content-type' in tuning_jobs.sdk_http_response.headers
assert tuning_jobs.name == 'tuning_jobs'
Expand All @@ -61,6 +66,9 @@ def test_pager(client):

@pytest.mark.asyncio
async def test_async_pager(client):
if not client._api_client.vertexai:
return

tuning_jobs = await client.aio.tunings.list(config={'page_size': 2})

assert 'Content-Type' in tuning_jobs.sdk_http_response.headers
Expand Down
106 changes: 8 additions & 98 deletions google/genai/tunings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,31 +907,6 @@ def _GetTuningJobParameters_to_vertex(
return to_object


def _ListTuningJobsConfig_to_mldev(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
root_object: Optional[Union[dict[str, Any], object]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}

if getv(from_object, ['page_size']) is not None:
setv(
parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
)

if getv(from_object, ['page_token']) is not None:
setv(
parent_object,
['_query', 'pageToken'],
getv(from_object, ['page_token']),
)

if getv(from_object, ['filter']) is not None:
setv(parent_object, ['_query', 'filter'], getv(from_object, ['filter']))

return to_object


def _ListTuningJobsConfig_to_vertex(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
Expand All @@ -957,20 +932,6 @@ def _ListTuningJobsConfig_to_vertex(
return to_object


def _ListTuningJobsParameters_to_mldev(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
root_object: Optional[Union[dict[str, Any], object]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ['config']) is not None:
_ListTuningJobsConfig_to_mldev(
getv(from_object, ['config']), to_object, root_object
)

return to_object


def _ListTuningJobsParameters_to_vertex(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
Expand All @@ -985,33 +946,6 @@ def _ListTuningJobsParameters_to_vertex(
return to_object


def _ListTuningJobsResponse_from_mldev(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
root_object: Optional[Union[dict[str, Any], object]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ['sdkHttpResponse']) is not None:
setv(
to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
)

if getv(from_object, ['nextPageToken']) is not None:
setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))

if getv(from_object, ['tunedModels']) is not None:
setv(
to_object,
['tuning_jobs'],
[
_TuningJob_from_mldev(item, to_object, root_object)
for item in getv(from_object, ['tunedModels'])
],
)

return to_object


def _ListTuningJobsResponse_from_vertex(
from_object: Union[dict[str, Any], object],
parent_object: Optional[dict[str, Any]] = None,
Expand Down Expand Up @@ -1632,8 +1566,9 @@ def _list(
)

request_url_dict: Optional[dict[str, str]]

if self._api_client.vertexai:
if not self._api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _ListTuningJobsParameters_to_vertex(
parameter_model, None, parameter_model
)
Expand All @@ -1642,15 +1577,7 @@ def _list(
path = 'tuningJobs'.format_map(request_url_dict)
else:
path = 'tuningJobs'
else:
request_dict = _ListTuningJobsParameters_to_mldev(
parameter_model, None, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
path = 'tunedModels'.format_map(request_url_dict)
else:
path = 'tunedModels'

query_params = request_dict.get('_query')
if query_params:
path = f'{path}?{urlencode(query_params)}'
Expand All @@ -1676,11 +1603,6 @@ def _list(
response_dict, None, parameter_model
)

if not self._api_client.vertexai:
response_dict = _ListTuningJobsResponse_from_mldev(
response_dict, None, parameter_model
)

return_value = types.ListTuningJobsResponse._from_response(
response=response_dict,
kwargs={
Expand Down Expand Up @@ -2215,8 +2137,9 @@ async def _list(
)

request_url_dict: Optional[dict[str, str]]

if self._api_client.vertexai:
if not self._api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _ListTuningJobsParameters_to_vertex(
parameter_model, None, parameter_model
)
Expand All @@ -2225,15 +2148,7 @@ async def _list(
path = 'tuningJobs'.format_map(request_url_dict)
else:
path = 'tuningJobs'
else:
request_dict = _ListTuningJobsParameters_to_mldev(
parameter_model, None, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
path = 'tunedModels'.format_map(request_url_dict)
else:
path = 'tunedModels'

query_params = request_dict.get('_query')
if query_params:
path = f'{path}?{urlencode(query_params)}'
Expand Down Expand Up @@ -2261,11 +2176,6 @@ async def _list(
response_dict, None, parameter_model
)

if not self._api_client.vertexai:
response_dict = _ListTuningJobsResponse_from_mldev(
response_dict, None, parameter_model
)

return_value = types.ListTuningJobsResponse._from_response(
response=response_dict,
kwargs={
Expand Down
Loading