Merge branch 'main' into owl-bot-copy

Author: matthew29tang

tests/unit/vertexai/genai/test_evals.py

@@ -25,8 +25,10 @@
 from vertexai import _genai
 from vertexai._genai import types as vertexai_genai_types
 from google.genai import types as genai_types
+import google.genai.errors as genai_errors
 import pandas as pd
 import pytest
+import warnings
 
 _TEST_PROJECT = "test-project"
 _TEST_LOCATION = "us-central1"
@@ -52,11 +54,18 @@ def test_evaluate_instances(self):
         test_client = _genai.client.Client(
             project=_TEST_PROJECT, location=_TEST_LOCATION
         )
-        with mock.patch.object(
-            test_client.evals, "_evaluate_instances"
-        ) as mock_evaluate:
-            test_client.evals._evaluate_instances(bleu_input=_genai.types.BleuInput())
-            mock_evaluate.assert_called_once_with(bleu_input=_genai.types.BleuInput())
+        with warnings.catch_warnings(record=True) as captured_warnings:
+            warnings.simplefilter("always")
+            with mock.patch.object(
+                test_client.evals, "_evaluate_instances"
+            ) as mock_evaluate:
+                test_client.evals._evaluate_instances(
+                    bleu_input=_genai.types.BleuInput()
+                )
+                mock_evaluate.assert_called_once_with(
+                    bleu_input=_genai.types.BleuInput()
+                )
+                assert captured_warnings[0].category == genai_errors.ExperimentalWarning
 
     @pytest.mark.usefixtures("google_auth_mock")
     def test_eval_run(self):

vertexai/_genai/client.py

@@ -16,10 +16,12 @@
 from typing import Optional, Union
 
 import google.auth
+from google.genai import _common
 from google.genai import client
 from google.genai import types
-from .evals import Evals
+
 from .evals import AsyncEvals
+from .evals import Evals
 
 
 class AsyncClient:
@@ -31,6 +33,10 @@ def __init__(self, api_client: client.Client):
         self._evals = AsyncEvals(self._api_client)
 
     @property
+    @_common.experimental_warning(
+        "The Vertex SDK GenAI evals module is experimental, and may change in future "
+        "versions."
+    )
     def evals(self) -> AsyncEvals:
         return self._evals
 
@@ -88,5 +94,9 @@ def __init__(
         self._evals = Evals(self._api_client)
 
     @property
+    @_common.experimental_warning(
+        "The Vertex SDK GenAI evals module is experimental, and may change in future "
+        "versions."
+    )
     def evals(self) -> Evals:
         return self._evals