From 2d03f0a0b6de0263c88f60822d3f4043138dc3bd Mon Sep 17 00:00:00 2001 From: Amy Wu Date: Thu, 8 May 2025 20:05:47 -0700 Subject: [PATCH] feat: Support models.get/delete/update in Java PiperOrigin-RevId: 756565011 --- google/genai/tests/models/test_delete.py | 3 +++ google/genai/tests/models/test_get.py | 8 +++---- google/genai/tests/models/test_update.py | 28 ++++++++++++------------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/google/genai/tests/models/test_delete.py b/google/genai/tests/models/test_delete.py index d7ec8629..46224c7b 100644 --- a/google/genai/tests/models/test_delete.py +++ b/google/genai/tests/models/test_delete.py @@ -30,6 +30,7 @@ model='models/8533706666867163136' ), exception_if_mldev='404', + skip_in_api_mode='cannot be deleted for multiple times', ), pytest_helper.TestTableItem( name='test_delete_model_with_http_options_in_method', @@ -44,6 +45,7 @@ ), exception_if_vertex=TEST_API_VERSION, exception_if_mldev='404', + skip_in_api_mode='cannot be deleted for multiple times', ), pytest_helper.TestTableItem( name='test_delete_tuned_model', @@ -51,6 +53,7 @@ model='tunedModels/generate-num-9598' ), exception_if_vertex='404', + skip_in_api_mode='cannot be deleted for multiple times', ), ] pytestmark = pytest_helper.setup( diff --git a/google/genai/tests/models/test_get.py b/google/genai/tests/models/test_get.py index 73b03bc2..d53299c0 100644 --- a/google/genai/tests/models/test_get.py +++ b/google/genai/tests/models/test_get.py @@ -28,21 +28,21 @@ pytest_helper.TestTableItem( name='test_get_vertex_tuned_model', parameters=types._GetModelParameters( - model='models/2121966731898388480' + model='models/2171259487439028224' ), exception_if_mldev='404', ), pytest_helper.TestTableItem( name='test_get_mldev_tuned_model', parameters=types._GetModelParameters( - model='tunedModels/generate-num-1896' + model='tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8' ), exception_if_vertex='404', ), pytest_helper.TestTableItem( name='test_get_vertex_tuned_model_with_http_options_in_method', parameters=types._GetModelParameters( - model='models/2121966731898388480', + model='models/2171259487439028224', config={ 'http_options': test_http_options, }, @@ -62,8 +62,6 @@ pytest_helper.TestTableItem( name='test_get_base_model', parameters=types._GetModelParameters(model='gemini-1.5-flash'), - # TODO(b/382104121): Add test for base model once Vertex support it. - exception_if_vertex='404', ), pytest_helper.TestTableItem( name='test_get_base_model_with_models_prefix', diff --git a/google/genai/tests/models/test_update.py b/google/genai/tests/models/test_update.py index bc78d0e3..8920fe04 100644 --- a/google/genai/tests/models/test_update.py +++ b/google/genai/tests/models/test_update.py @@ -25,9 +25,9 @@ pytest_helper.TestTableItem( name='test_mldev_tuned_models_update', parameters=types._UpdateModelParameters( - model='tunedModels/generate-num-8498', + model='tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8', config={ - 'display_name': 'My tuned gemini-1.0', + 'display_name': 'My tuned gemini-1.5', }, ), exception_if_vertex='404', @@ -35,10 +35,10 @@ pytest_helper.TestTableItem( name='test_vertex_tuned_models_update', parameters=types._UpdateModelParameters( - model='models/2121966731898388480', + model='models/2171259487439028224', config={ 'description': ( - 'My SupervisedTuningJob 2024-05-16 13:36:47.332273' + 'My SupervisedTuningJob' ), 'default_checkpoint_id': '8', }, @@ -48,7 +48,7 @@ pytest_helper.TestTableItem( name='test_mldev_tuned_models_update_with_http_options_in_method', parameters=types._UpdateModelParameters( - model='tunedModels/generate-num-8498', + model='tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8', config={ 'display_name': 'My tuned gemini-1.0', 'http_options': test_http_options, @@ -59,10 +59,10 @@ pytest_helper.TestTableItem( name='test_vertex_tuned_models_update_with_http_options_in_method', parameters=types._UpdateModelParameters( - model='models/2121966731898388480', + model='models/2171259487439028224', config={ 'description': ( - 'My SupervisedTuningJob 2024-05-16 13:36:47.332273' + 'My SupervisedTuningJob' ), 'default_checkpoint_id': '8', 'http_options': test_http_options, @@ -85,7 +85,7 @@ async def test_async_update_tuned_model(client): if client._api_client.vertexai: with pytest.raises(errors.ClientError) as e: await client.aio.models.update( - model='tunedModels/generate-num-8498', + model='tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8', config={ 'description': 'My tuned gemini-1.0', 'http_options': test_http_options, @@ -94,9 +94,9 @@ async def test_async_update_tuned_model(client): assert '404' in str(e) else: response = await client.aio.models.update( - model='tunedModels/generate-num-8498', + model='tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8', config={ - 'description': 'My tuned gemini-1.0', + 'description': 'My tuned gemini-1.5', 'http_options': test_http_options, }, ) @@ -106,18 +106,18 @@ async def test_async_update_tuned_model(client): async def test_async_update_model(client): if client._api_client.vertexai: response = await client.aio.models.update( - model='models/7687416965014487040', + model='models/2171259487439028224', config={ - 'display_name': 'My tuned gemini-1.0', + 'display_name': 'My tuned gemini-1.5', 'http_options': test_http_options, }, ) else: with pytest.raises(errors.ClientError) as e: await client.aio.models.update( - model='models/7687416965014487040', + model='models/2171259487439028224', config={ - 'display_name': 'My tuned gemini-1.0', + 'display_name': 'My tuned gemini-1.5', 'http_options': test_http_options, }, )