feat: add metadata field in _GenerativeModels class methods to pass the metadata down the method chain.

tests/system/vertexai/test_generative_models.py

@@ -90,6 +90,16 @@ def test_generate_content_from_text(self):
         )
         assert response.text
 
+    def test_generate_content_from_text_with_metadata(self):
+        model = generative_models.GenerativeModel("gemini-pro")
+        metadata = (("x-metadata-key", "metadata-value"),)
+        response = model.generate_content(
+            "Why is sky blue?",
+            generation_config=generative_models.GenerationConfig(temperature=0),
+            metadata=metadata
+        )
+        assert response.text
+
     @pytest.mark.asyncio
     async def test_generate_content_async(self):
         model = generative_models.GenerativeModel("gemini-pro")
@@ -99,6 +109,17 @@ async def test_generate_content_async(self):
         )
         assert response.text
 
+    @pytest.mark.asyncio
+    async def test_generate_content_async_with_metadata(self):
+        model = generative_models.GenerativeModel("gemini-pro")
+        metadata = (("x-metadata-key", "metadata-value"),)
+        response = await model.generate_content_async(
+            "Why is sky blue?",
+            generation_config=generative_models.GenerationConfig(temperature=0),
+            metadata=metadata,
+        )
+        assert response.text
+
     def test_generate_content_streaming(self):
         model = generative_models.GenerativeModel("gemini-pro")
         stream = model.generate_content(

tests/unit/vertexai/test_generative_models.py

@@ -17,7 +17,7 @@
 
 # pylint: disable=protected-access,bad-continuation
 import pytest
-from typing import Iterable, MutableSequence, Optional
+from typing import Iterable, MutableSequence, Optional, Sequence, Tuple
 from unittest import mock
 
 import vertexai
@@ -117,6 +117,7 @@ def mock_generate_content(
     *,
     model: Optional[str] = None,
     contents: Optional[MutableSequence[gapic_content_types.Content]] = None,
+    metadata: Sequence[Tuple[str, str]] = (),
 ) -> Iterable[gapic_prediction_service_types.GenerateContentResponse]:
     last_message_part = request.contents[-1].parts[0]
     should_fail = last_message_part.text and "Please fail" in last_message_part.text
@@ -247,9 +248,10 @@ def mock_stream_generate_content(
     *,
     model: Optional[str] = None,
     contents: Optional[MutableSequence[gapic_content_types.Content]] = None,
+    metadata: Sequence[Tuple[str, str]] = (),
 ) -> Iterable[gapic_prediction_service_types.GenerateContentResponse]:
     yield mock_generate_content(
-        self=self, request=request, model=model, contents=contents
+        self=self, request=request, model=model, contents=contents, metadata=metadata
     )
 
 
@@ -307,6 +309,7 @@ def test_generate_content(self, generative_models: generative_models):
                 max_output_tokens=200,
                 stop_sequences=["\n\n\n"],
             ),
+            metadata=(("x-metadata-key", "metadata-value"),)
         )
         assert response2.text
 
@@ -339,7 +342,8 @@ def test_chat_send_message(self, generative_models: generative_models):
         chat = model.start_chat()
         response1 = chat.send_message("Why is sky blue?")
         assert response1.text
-        response2 = chat.send_message("Is sky blue on other planets?")
+        metadata = (("x-metadata-key", "metadata-value"),)
+        response2 = chat.send_message("Is sky blue on other planets?", metadata=metadata)
         assert response2.text
 
     @mock.patch.object(