Skip to content

fix: move from gemini-1.5-flash to gemini-2.5-flash #2346

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

Closed
wants to merge 1 commit into from
+19 −19
Closed

fix: move from gemini-1.5-flash to gemini-2.5-flash #2346

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
18 changes: 9 additions & 9 deletions integrations/google_ai/tests/generators/chat/test_chat_gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def test_init(self, tools, monkeypatch):
tools=tools,
)
mock_genai_configure.assert_called_once_with(api_key="test")
assert gemini._model_name == "gemini-2.0-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._generation_config == generation_config
assert gemini._safety_settings == safety_settings
assert gemini._tools == tools
Expand All @@ -120,7 +120,7 @@ def test_to_dict(self, monkeypatch):
"type": TYPE,
"init_parameters": {
"api_key": {"env_vars": ["GOOGLE_API_KEY"], "strict": True, "type": "env_var"},
"model": "gemini-2.0-flash",
"model": "gemini-2.5-flash",
"generation_config": None,
"safety_settings": None,
"streaming_callback": None,
Expand Down Expand Up @@ -161,7 +161,7 @@ def test_to_dict_with_param(self, monkeypatch):
"type": TYPE,
"init_parameters": {
"api_key": {"env_vars": ["GOOGLE_API_KEY"], "strict": True, "type": "env_var"},
"model": "gemini-2.0-flash",
"model": "gemini-2.5-flash",
"generation_config": {
"temperature": 0.5,
"top_p": 0.5,
Expand Down Expand Up @@ -212,7 +212,7 @@ def test_from_dict(self, monkeypatch):
"type": TYPE,
"init_parameters": {
"api_key": {"env_vars": ["GOOGLE_API_KEY"], "strict": True, "type": "env_var"},
"model": "gemini-2.0-flash",
"model": "gemini-2.5-flash",
"generation_config": None,
"safety_settings": None,
"streaming_callback": None,
Expand All @@ -221,7 +221,7 @@ def test_from_dict(self, monkeypatch):
}
)

assert gemini._model_name == "gemini-2.0-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._generation_config is None
assert gemini._safety_settings is None
assert gemini._tools is None
Expand All @@ -236,7 +236,7 @@ def test_from_dict_with_param(self, monkeypatch):
"type": TYPE,
"init_parameters": {
"api_key": {"env_vars": ["GOOGLE_API_KEY"], "strict": True, "type": "env_var"},
"model": "gemini-2.0-flash",
"model": "gemini-2.5-flash",
"generation_config": {
"temperature": 0.5,
"top_p": 0.5,
Expand All @@ -262,7 +262,7 @@ def test_from_dict_with_param(self, monkeypatch):
}
)

assert gemini._model_name == "gemini-2.0-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._generation_config == GenerationConfig(
candidate_count=1,
stop_sequences=["stop"],
Expand All @@ -286,7 +286,7 @@ def test_serde_in_pipeline(self, monkeypatch):
tool = Tool(name="name", description="description", parameters={"x": {"type": "string"}}, function=print)

generator = GoogleAIGeminiChatGenerator(
model="gemini-2.0-flash",
model="gemini-2.5-flash",
generation_config=GenerationConfig(
temperature=0.6,
stop_sequences=["stop", "words"],
Expand All @@ -308,7 +308,7 @@ def test_serde_in_pipeline(self, monkeypatch):
"type": TYPE,
"init_parameters": {
"api_key": {"env_vars": ["GOOGLE_API_KEY"], "strict": True, "type": "env_var"},
"model": "gemini-2.0-flash",
"model": "gemini-2.5-flash",
"generation_config": {
"temperature": 0.6,
"stop_sequences": ["stop", "words"],
Expand Down
2 changes: 1 addition & 1 deletion ...oogle_vertex/src/haystack_integrations/components/generators/google_vertex/chat/gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def get_current_weather(
def __init__(
self,
*,
model: str = "gemini-1.5-flash",
model: str = "gemini-2.5-flash",
project_id: Optional[str] = None,
location: Optional[str] = None,
generation_config: Optional[Union[GenerationConfig, Dict[str, Any]]] = None,
Expand Down
18 changes: 9 additions & 9 deletions integrations/google_vertex/tests/chat/test_gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def test_init(self, mock_vertexai_init, _mock_generative_model, tools):
tool_config=tool_config,
)
mock_vertexai_init.assert_called()
assert gemini._model_name == "gemini-1.5-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._generation_config == generation_config
assert gemini._safety_settings == safety_settings
assert gemini._tools == tools
Expand All @@ -126,7 +126,7 @@ def test_to_dict(self, _mock_vertexai_init, _mock_generative_model):
assert gemini.to_dict() == {
"type": "haystack_integrations.components.generators.google_vertex.chat.gemini.VertexAIGeminiChatGenerator",
"init_parameters": {
"model": "gemini-1.5-flash",
"model": "gemini-2.5-flash",
"project_id": None,
"location": None,
"generation_config": None,
Expand Down Expand Up @@ -171,7 +171,7 @@ def test_to_dict_with_params(self, _mock_vertexai_init, _mock_generative_model):
expected_dict = {
"type": "haystack_integrations.components.generators.google_vertex.chat.gemini.VertexAIGeminiChatGenerator",
"init_parameters": {
"model": "gemini-1.5-flash",
"model": "gemini-2.5-flash",
"project_id": "TestID123",
"location": "TestLocation",
"generation_config": {
Expand Down Expand Up @@ -225,7 +225,7 @@ def test_from_dict(self, _mock_vertexai_init, _mock_generative_model):
),
"init_parameters": {
"project_id": None,
"model": "gemini-1.5-flash",
"model": "gemini-2.5-flash",
"generation_config": None,
"safety_settings": None,
"tools": None,
Expand All @@ -234,7 +234,7 @@ def test_from_dict(self, _mock_vertexai_init, _mock_generative_model):
}
)

assert gemini._model_name == "gemini-1.5-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._project_id is None
assert gemini._safety_settings is None
assert gemini._tools is None
Expand All @@ -254,7 +254,7 @@ def test_from_dict_with_param(self, _mock_vertexai_init, _mock_generative_model)
"init_parameters": {
"project_id": "TestID123",
"location": "TestLocation",
"model": "gemini-1.5-flash",
"model": "gemini-2.5-flash",
"generation_config": {
"temperature": 0.5,
"top_p": 0.5,
Expand Down Expand Up @@ -288,7 +288,7 @@ def test_from_dict_with_param(self, _mock_vertexai_init, _mock_generative_model)
}
)

assert gemini._model_name == "gemini-1.5-flash"
assert gemini._model_name == "gemini-2.5-flash"
assert gemini._project_id == "TestID123"
assert gemini._location == "TestLocation"
assert gemini._safety_settings == {
Expand Down Expand Up @@ -666,7 +666,7 @@ def test_serde_in_pipeline(self):

generator = VertexAIGeminiChatGenerator(
project_id="TestID123",
model="gemini-1.5-flash",
model="gemini-2.5-flash",
generation_config=GenerationConfig(
temperature=0.6,
stop_sequences=["stop", "words"],
Expand All @@ -690,7 +690,7 @@ def test_serde_in_pipeline(self):
),
"init_parameters": {
"project_id": "TestID123",
"model": "gemini-1.5-flash",
"model": "gemini-2.5-flash",
"generation_config": {
"temperature": 0.6,
"stop_sequences": ["stop", "words"],
Expand Down
Loading