From cc5defbb6fd1fd4f3e44ade6d6c2d7c617e67ad1 Mon Sep 17 00:00:00 2001 From: Stefano Fiorucci Date: Fri, 4 Oct 2024 11:04:55 +0200 Subject: [PATCH] pin version (#1124) --- integrations/google_vertex/pyproject.toml | 2 +- .../google_vertex/tests/chat/test_gemini.py | 18 ++++++++++++------ .../google_vertex/tests/test_gemini.py | 18 ++++++++++++------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml index a0cefbcd4..51bc4ffd7 100644 --- a/integrations/google_vertex/pyproject.toml +++ b/integrations/google_vertex/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] -dependencies = ["haystack-ai", "google-cloud-aiplatform>=1.38", "pyarrow>3"] +dependencies = ["haystack-ai", "google-cloud-aiplatform>=1.61", "pyarrow>3"] [project.urls] Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google_vertex#readme" diff --git a/integrations/google_vertex/tests/chat/test_gemini.py b/integrations/google_vertex/tests/chat/test_gemini.py index 87b43d66b..6b1308dab 100644 --- a/integrations/google_vertex/tests/chat/test_gemini.py +++ b/integrations/google_vertex/tests/chat/test_gemini.py @@ -22,11 +22,11 @@ name="get_current_weather", description="Get the current weather in a given location", parameters={ - "type_": "OBJECT", + "type": "object", "properties": { - "location": {"type_": "STRING", "description": "The city and state, e.g. San Francisco, CA"}, + "location": {"type": "string", "description": "The city and state, e.g. San Francisco, CA"}, "unit": { - "type_": "STRING", + "type": "string", "enum": [ "celsius", "fahrenheit", @@ -238,13 +238,19 @@ def test_from_dict_with_param(_mock_vertexai_init, _mock_generative_model): "name": "get_current_weather", "description": "Get the current weather in a given location", "parameters": { - "type_": "OBJECT", + "type": "object", "properties": { "location": { - "type_": "STRING", + "type": "string", "description": "The city and state, e.g. San Francisco, CA", }, - "unit": {"type_": "STRING", "enum": ["celsius", "fahrenheit"]}, + "unit": { + "type": "string", + "enum": [ + "celsius", + "fahrenheit", + ], + }, }, "required": ["location"], }, diff --git a/integrations/google_vertex/tests/test_gemini.py b/integrations/google_vertex/tests/test_gemini.py index 1543f3ccf..9ec3529d7 100644 --- a/integrations/google_vertex/tests/test_gemini.py +++ b/integrations/google_vertex/tests/test_gemini.py @@ -18,11 +18,11 @@ name="get_current_weather", description="Get the current weather in a given location", parameters={ - "type_": "OBJECT", + "type": "object", "properties": { - "location": {"type_": "STRING", "description": "The city and state, e.g. San Francisco, CA"}, + "location": {"type": "string", "description": "The city and state, e.g. San Francisco, CA"}, "unit": { - "type_": "STRING", + "type": "string", "enum": [ "celsius", "fahrenheit", @@ -226,13 +226,19 @@ def test_from_dict_with_param(_mock_vertexai_init, _mock_generative_model): { "name": "get_current_weather", "parameters": { - "type_": "OBJECT", + "type": "object", "properties": { - "unit": {"type_": "STRING", "enum": ["celsius", "fahrenheit"]}, "location": { - "type_": "STRING", + "type": "string", "description": "The city and state, e.g. San Francisco, CA", }, + "unit": { + "type": "string", + "enum": [ + "celsius", + "fahrenheit", + ], + }, }, "required": ["location"], },