fix: Deprecate disable_attribution in GoogleSearchRetrieval.

qiaodev · copybara-github · commit c68d559b9d0f · 2024-08-12T17:09:42.000-07:00
PiperOrigin-RevId: 662280701
diff --git a/tests/system/vertexai/test_generative_models.py b/tests/system/vertexai/test_generative_models.py
@@ -298,9 +298,7 @@ def test_grounding_google_search_retriever(self, api_endpoint):
         model = preview_generative_models.GenerativeModel(GEMINI_MODEL_NAME)
         google_search_retriever_tool = (
             preview_generative_models.Tool.from_google_search_retrieval(
-                preview_generative_models.grounding.GoogleSearchRetrieval(
-                    disable_attribution=False
-                )
+                preview_generative_models.grounding.GoogleSearchRetrieval()
             )
         )
         response = model.generate_content(
diff --git a/tests/unit/vertexai/test_generative_models.py b/tests/unit/vertexai/test_generative_models.py
@@ -1016,9 +1016,7 @@ def test_generate_content_grounding_google_search_retriever_preview(self):
         model = preview_generative_models.GenerativeModel("gemini-pro")
         google_search_retriever_tool = (
             preview_generative_models.Tool.from_google_search_retrieval(
-                preview_generative_models.grounding.GoogleSearchRetrieval(
-                    disable_attribution=False
-                )
+                preview_generative_models.grounding.GoogleSearchRetrieval()
             )
         )
         response = model.generate_content(
diff --git a/vertexai/generative_models/_generative_models.py b/vertexai/generative_models/_generative_models.py
@@ -2310,20 +2310,22 @@ class GoogleSearchRetrieval:
 
         def __init__(
             self,
-            disable_attribution: Optional[bool] = None,
+            disable_attribution: Optional[
+                bool
+            ] = None,  # pylint: disable=unused-argument
         ):
             """Initializes a Google Search Retrieval tool.
 
             Args:
                 disable_attribution (bool):
-                    Optional. Disable using the result from this
-                    tool in detecting grounding attribution. This
+                    Optional. This field is Deprecated. Disable using the result
+                    from this tool in detecting grounding attribution. This
                     does not affect how the result is given to the
                     model for generation.
             """
-            self._raw_google_search_retrieval = gapic_tool_types.GoogleSearchRetrieval(
-                disable_attribution=disable_attribution,
-            )
+            if disable_attribution is not None:
+                warnings.warn("disable_attribution is deprecated.")
+            self._raw_google_search_retrieval = gapic_tool_types.GoogleSearchRetrieval()
 
 
 def _to_content(

Original file line number	Diff line number	Diff line change
`@@ -298,9 +298,7 @@ def test_grounding_google_search_retriever(self, api_endpoint):`
`298`	`298`	`model = preview_generative_models.GenerativeModel(GEMINI_MODEL_NAME)`
`299`	`299`	`google_search_retriever_tool = (`
`300`	`300`	`preview_generative_models.Tool.from_google_search_retrieval(`
`301`		`- preview_generative_models.grounding.GoogleSearchRetrieval(`
`302`		`- disable_attribution=False`
`303`		`- )`
	`301`	`+ preview_generative_models.grounding.GoogleSearchRetrieval()`
`304`	`302`	`)`
`305`	`303`	`)`
`306`	`304`	`response = model.generate_content(`
Original file line number	Diff line number	Diff line change
`@@ -1016,9 +1016,7 @@ def test_generate_content_grounding_google_search_retriever_preview(self):`
`1016`	`1016`	`model = preview_generative_models.GenerativeModel("gemini-pro")`
`1017`	`1017`	`google_search_retriever_tool = (`
`1018`	`1018`	`preview_generative_models.Tool.from_google_search_retrieval(`
`1019`		`- preview_generative_models.grounding.GoogleSearchRetrieval(`
`1020`		`- disable_attribution=False`
`1021`		`- )`
	`1019`	`+ preview_generative_models.grounding.GoogleSearchRetrieval()`
`1022`	`1020`	`)`
`1023`	`1021`	`)`
`1024`	`1022`	`response = model.generate_content(`