googleapis · parthea · Oct 20, 2023 · Oct 13, 2023 · Oct 13, 2023 · Oct 17, 2023
diff --git a/docs/index.rst b/docs/index.rst
@@ -84,8 +84,8 @@ API. By default, you will get ``v1``, the latest stable version.
 .. toctree::
     :maxdepth: 2
 
-    vision_v1/services
-    vision_v1/types
+    vision_v1/services_
+    vision_v1/types_
 
 
 A new beta release with additional features over the current stable version,
@@ -96,8 +96,8 @@ usual beta admonishment (changes are possible, etc.) applies.
 .. toctree::
     :maxdepth: 2
 
-    vision_v1p4beta1/services
-    vision_v1p4beta1/types
+    vision_v1p4beta1/services_
+    vision_v1p4beta1/types_
 
 Previous beta releases ``v1p3beta1`` and ``v1p2beta1`` are provided as well.
 
@@ -106,17 +106,17 @@ An API and type reference is provided for ``v1p3beta1``:
 .. toctree::
     :maxdepth: 2
 
-    vision_v1p3beta1/services
-    vision_v1p3beta1/types
+    vision_v1p3beta1/services_
+    vision_v1p3beta1/types_
 
 
 An API and type reference is provided for ``v1p2beta1``:
 
 .. toctree::
     :maxdepth: 2
 
-    vision_v1p2beta1/services
-    vision_v1p2beta1/types
+    vision_v1p2beta1/services_
+    vision_v1p2beta1/types_
 
 Migration Guide
 ---------------

diff --git a/docs/vision_v1/services.rst → docs/vision_v1/services_.rst b/docs/vision_v1/services.rst → docs/vision_v1/services_.rst
diff --git a/docs/vision_v1/types.rst → docs/vision_v1/types_.rst b/docs/vision_v1/types.rst → docs/vision_v1/types_.rst
diff --git a/docs/vision_v1p2beta1/services.rst → docs/vision_v1p2beta1/services_.rst b/docs/vision_v1p2beta1/services.rst → docs/vision_v1p2beta1/services_.rst
diff --git a/docs/vision_v1p2beta1/types.rst → docs/vision_v1p2beta1/types_.rst b/docs/vision_v1p2beta1/types.rst → docs/vision_v1p2beta1/types_.rst
diff --git a/docs/vision_v1p3beta1/services.rst → docs/vision_v1p3beta1/services_.rst b/docs/vision_v1p3beta1/services.rst → docs/vision_v1p3beta1/services_.rst
diff --git a/docs/vision_v1p3beta1/types.rst → docs/vision_v1p3beta1/types_.rst b/docs/vision_v1p3beta1/types.rst → docs/vision_v1p3beta1/types_.rst
diff --git a/docs/vision_v1p4beta1/services.rst → docs/vision_v1p4beta1/services_.rst b/docs/vision_v1p4beta1/services.rst → docs/vision_v1p4beta1/services_.rst
diff --git a/docs/vision_v1p4beta1/types.rst → docs/vision_v1p4beta1/types_.rst b/docs/vision_v1p4beta1/types.rst → docs/vision_v1p4beta1/types_.rst
diff --git a/tests/unit/gapic/vision_v1/test_image_annotator.py b/tests/unit/gapic/vision_v1/test_image_annotator.py
@@ -1585,8 +1585,9 @@ def test_batch_annotate_images_rest(request_type):
         # Wrap the value into a proper Response obj
         response_value = Response()
         response_value.status_code = 200
-        pb_return_value = image_annotator.BatchAnnotateImagesResponse.pb(return_value)
-        json_return_value = json_format.MessageToJson(pb_return_value)
+        # Convert return value to protobuf type
+        return_value = image_annotator.BatchAnnotateImagesResponse.pb(return_value)
+        json_return_value = json_format.MessageToJson(return_value)
 
         response_value._content = json_return_value.encode("UTF-8")
         req.return_value = response_value
@@ -1656,10 +1657,9 @@ def test_batch_annotate_images_rest_required_fields(
             response_value = Response()
             response_value.status_code = 200
 
-            pb_return_value = image_annotator.BatchAnnotateImagesResponse.pb(
-                return_value
-            )
-            json_return_value = json_format.MessageToJson(pb_return_value)
+            # Convert return value to protobuf type
+            return_value = image_annotator.BatchAnnotateImagesResponse.pb(return_value)
+            json_return_value = json_format.MessageToJson(return_value)
 
             response_value._content = json_return_value.encode("UTF-8")
             req.return_value = response_value
@@ -1788,8 +1788,9 @@ def test_batch_annotate_images_rest_flattened():
         # Wrap the value into a proper Response obj
         response_value = Response()
         response_value.status_code = 200
-        pb_return_value = image_annotator.BatchAnnotateImagesResponse.pb(return_value)
-        json_return_value = json_format.MessageToJson(pb_return_value)
+        # Convert return value to protobuf type
+        return_value = image_annotator.BatchAnnotateImagesResponse.pb(return_value)
+        json_return_value = json_format.MessageToJson(return_value)
         response_value._content = json_return_value.encode("UTF-8")
         req.return_value = response_value
 
@@ -1854,8 +1855,9 @@ def test_batch_annotate_files_rest(request_type):
         # Wrap the value into a proper Response obj
         response_value = Response()
         response_value.status_code = 200
-        pb_return_value = image_annotator.BatchAnnotateFilesResponse.pb(return_value)
-        json_return_value = json_format.MessageToJson(pb_return_value)
+        # Convert return value to protobuf type
+        return_value = image_annotator.BatchAnnotateFilesResponse.pb(return_value)
+        json_return_value = json_format.MessageToJson(return_value)
 
         response_value._content = json_return_value.encode("UTF-8")
         req.return_value = response_value
@@ -1925,10 +1927,9 @@ def test_batch_annotate_files_rest_required_fields(
             response_value = Response()
             response_value.status_code = 200
 
-            pb_return_value = image_annotator.BatchAnnotateFilesResponse.pb(
-                return_value
-            )
-            json_return_value = json_format.MessageToJson(pb_return_value)
+            # Convert return value to protobuf type
+            return_value = image_annotator.BatchAnnotateFilesResponse.pb(return_value)
+            json_return_value = json_format.MessageToJson(return_value)
 
             response_value._content = json_return_value.encode("UTF-8")
             req.return_value = response_value
@@ -2059,8 +2060,9 @@ def test_batch_annotate_files_rest_flattened():
         # Wrap the value into a proper Response obj
         response_value = Response()
         response_value.status_code = 200
-        pb_return_value = image_annotator.BatchAnnotateFilesResponse.pb(return_value)
-        json_return_value = json_format.MessageToJson(pb_return_value)
+        # Convert return value to protobuf type
+        return_value = image_annotator.BatchAnnotateFilesResponse.pb(return_value)
+        json_return_value = json_format.MessageToJson(return_value)
         response_value._content = json_return_value.encode("UTF-8")
         req.return_value = response_value