Skip to content

Commit af4d682

Browse files
MarkDaoustcopybara-github
authored andcommitted
chore:update tests
PiperOrigin-RevId: 912791706
1 parent 84822a1 commit af4d682

13 files changed

Lines changed: 62 additions & 20 deletions

google/genai/tests/shared/batches/test_create_delete.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from .... import types as genai_types
1919
from ... import pytest_helper
20+
from .. import model_names
2021

2122

2223
def create_delete(client, parameters):
@@ -35,7 +36,7 @@ def create_delete(client, parameters):
3536
pytest_helper.TestTableItem(
3637
name="test_create_delete_mldev",
3738
parameters=genai_types._CreateBatchJobParameters(
38-
model="gemini-2.5-flash",
39+
model=model_names.MODEL_FLASH,
3940
src=[{
4041
"contents": [{
4142
"parts": [{"text": "Why is the sky blue?"}],

google/genai/tests/shared/batches/test_create_get_cancel.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
from .... import types as genai_types
2020
from ... import pytest_helper
21+
from .. import model_names
2122

2223

2324
def create_get_cancel(client, parameters):
@@ -34,7 +35,7 @@ def create_get_cancel(client, parameters):
3435
pytest_helper.TestTableItem(
3536
name="test_create_get_cancel_mldev",
3637
parameters=genai_types._CreateBatchJobParameters(
37-
model="gemini-2.5-flash",
38+
model=model_names.MODEL_FLASH,
3839
src=[{
3940
"contents": [{
4041
"parts": [{"text": "Why is the sky blue?"}],

google/genai/tests/shared/caches/test_create_get_delete.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from .... import types as genai_types
1919
from ... import pytest_helper
20+
from .. import model_names
2021

2122

2223
def create_get_delete(client, parameters):
@@ -46,7 +47,7 @@ def create_get_delete(client, parameters):
4647
pytest_helper.TestTableItem(
4748
name="test_create_get_delete",
4849
parameters=genai_types._CreateCachedContentParameters(
49-
model="gemini-2.5-flash",
50+
model=model_names.MODEL_CACHE,
5051
config=genai_types.CreateCachedContentConfig(
5152
contents=[genai_types.Part.from_uri(
5253
file_uri="gs://cloud-samples-data/generative-ai/image/a-man-and-a-dog.png",

google/genai/tests/shared/caches/test_create_update_get.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from .... import types as genai_types
1919
from ... import pytest_helper
20+
from .. import model_names
2021

2122

2223
def create_update_get(client, parameters):
@@ -50,7 +51,7 @@ def create_update_get(client, parameters):
5051
pytest_helper.TestTableItem(
5152
name="test_create_update_get",
5253
parameters=genai_types._CreateCachedContentParameters(
53-
model="gemini-2.5-flash",
54+
model=model_names.MODEL_CACHE,
5455
config=genai_types.CreateCachedContentConfig(
5556
contents=[genai_types.Part.from_uri(
5657
file_uri="gs://cloud-samples-data/generative-ai/image/a-man-and-a-dog.png",

google/genai/tests/shared/chats/test_send_message.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
"""Table tests for chats.send_message()."""
1717

18+
import pydantic
1819
from ... import pytest_helper
19-
from pydantic import BaseModel
20+
from .. import model_names
2021

2122

22-
class _SendMessageParameters(BaseModel):
23+
class _SendMessageParameters(pydantic.BaseModel):
2324
model: str
2425
message: str
2526

@@ -32,7 +33,7 @@ def send_message(client, parameters):
3233
pytest_helper.TestTableItem(
3334
name="test_send_message",
3435
parameters=_SendMessageParameters(
35-
model="gemini-2.5-flash",
36+
model=model_names.MODEL_FLASH,
3637
message="Hello",
3738
),
3839
),

google/genai/tests/shared/chats/test_send_message_stream.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
"""Table tests for chats.send_message_stream()."""
1717

18+
import pydantic
1819
from ... import pytest_helper
19-
from pydantic import BaseModel
20+
from .. import model_names
2021

2122

22-
class _SendMessageStreamParameters(BaseModel):
23+
class _SendMessageStreamParameters(pydantic.BaseModel):
2324
model: str
2425
message: str
2526

@@ -34,7 +35,7 @@ def send_message_stream(client, parameters):
3435
pytest_helper.TestTableItem(
3536
name="test_send_message_stream",
3637
parameters=_SendMessageStreamParameters(
37-
model="gemini-2.5-flash",
38+
model=model_names.MODEL_FLASH,
3839
message="Tell a joke.",
3940
),
4041
),
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
16+
"""Central model name constants for shared tests.
17+
18+
Update the model names here to change them across all shared tests.
19+
After changing model names, re-record replays with:
20+
sh run_tests.sh pytest tests/shared --mode=record
21+
"""
22+
23+
# The default model used for most shared tests (generate, chat, tokens, etc.)
24+
MODEL_FLASH = 'gemini-3-flash-preview'
25+
26+
# The default model used for caching tests.
27+
MODEL_CACHE = 'gemini-3-pro-preview'
28+
29+
# The default model used for tuning tests.
30+
MODEL_FLASH_FOR_TUNING = 'gemini-2.5-flash'

google/genai/tests/shared/models/test_compute_tokens.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818

1919
from .... import types as genai_types
2020
from ... import pytest_helper
21+
from .. import model_names
2122

2223

2324
test_table: list[pytest_helper.TestTableItem] = [
2425
pytest_helper.TestTableItem(
2526
name='test_compute_tokens',
2627
parameters=genai_types._ComputeTokensParameters(
27-
model='gemini-2.5-flash',
28+
model=model_names.MODEL_FLASH,
2829
contents='The quick brown fox jumps over the lazy dog.',
2930
),
3031
exception_if_mldev=(

google/genai/tests/shared/models/test_count_tokens.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818

1919
from .... import types as genai_types
2020
from ... import pytest_helper
21+
from .. model_names import MODEL_FLASH
2122

2223

2324
test_table: list[pytest_helper.TestTableItem] = [
2425
pytest_helper.TestTableItem(
2526
name='test_count_tokens',
2627
parameters=genai_types._CountTokensParameters(
27-
model='gemini-2.5-flash',
28+
model=MODEL_FLASH,
2829
contents='The quick brown fox jumps over the lazy dog.',
2930
),
3031
),

google/genai/tests/shared/models/test_generate_content.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@
1717

1818
from .... import types as genai_types
1919
from ... import pytest_helper
20+
from .. import model_names
2021

2122

2223
test_table: list[pytest_helper.TestTableItem] = [
2324
pytest_helper.TestTableItem(
2425
name='test_generate_content',
2526
parameters=genai_types._GenerateContentParameters(
26-
model='gemini-2.5-flash',
27+
model=model_names.MODEL_FLASH,
2728
contents='The quick brown fox jumps over the lazy dog.',
2829
),
2930
),
3031
pytest_helper.TestTableItem(
3132
name='test_generate_content_with_config_schema',
3233
parameters=genai_types._GenerateContentParameters(
33-
model='gemini-2.5-flash',
34+
model=model_names.MODEL_FLASH,
3435
contents='Return a summary of the passage.',
3536
config={'response_mime_type': 'application/json', 'response_schema': {'type': 'OBJECT', 'properties': {'summary': {'type': 'STRING'}}}},
3637
),
@@ -39,7 +40,7 @@
3940
pytest_helper.TestTableItem(
4041
name='test_generate_content_with_config_json_schema',
4142
parameters=genai_types._GenerateContentParameters(
42-
model='gemini-2.5-flash',
43+
model=model_names.MODEL_FLASH,
4344
contents='Return a JSON summary.',
4445
config={'response_mime_type': 'application/json', 'response_json_schema': {'type': 'object', 'properties': {'summary': {'type': 'string'}}}},
4546
),

0 commit comments

Comments
 (0)