fix: Add async context manager return types (#421)

gcf-owl-bot[bot] · web-flow · commit a1aa85062d52 · 2023-07-04T13:22:28.000-04:00
* fix: Add async context manager return types chore: Mock return_value should not populate oneof message fields chore: Support snippet generation for services that only support REST transport chore: Update gapic-generator-python to v1.11.0 PiperOrigin-RevId: 545430278 Source-Link: googleapis/googleapis@601b532 Source-Link: googleapis/googleapis-gen@b3f18d0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMThkMGY2NTYwYTg1NTAyMmZkMDU4ODY1ZTc2MjA0NzlkN2FmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/catalog_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/catalog_service/async_client.py
@@ -1578,7 +1578,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CatalogServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/completion_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/completion_service/async_client.py
@@ -525,7 +525,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CompletionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/control_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/control_service/async_client.py
@@ -903,7 +903,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ControlServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/model_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/model_service/async_client.py
@@ -1246,7 +1246,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ModelServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/prediction_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/prediction_service/async_client.py
@@ -408,7 +408,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "PredictionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/product_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/product_service/async_client.py
@@ -1984,7 +1984,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ProductServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/search_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/search_service/async_client.py
@@ -438,7 +438,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "SearchServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/serving_config_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/serving_config_service/async_client.py
@@ -1146,7 +1146,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ServingConfigServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2/services/user_event_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2/services/user_event_service/async_client.py
@@ -894,7 +894,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "UserEventServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/catalog_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/catalog_service/async_client.py
@@ -1672,7 +1672,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CatalogServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/completion_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/completion_service/async_client.py
@@ -525,7 +525,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CompletionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/control_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/control_service/async_client.py
@@ -905,7 +905,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ControlServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/merchant_center_account_link_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/merchant_center_account_link_service/async_client.py
@@ -728,7 +728,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "MerchantCenterAccountLinkServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/model_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/model_service/async_client.py
@@ -1254,7 +1254,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ModelServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/prediction_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/prediction_service/async_client.py
@@ -408,7 +408,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "PredictionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/product_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/product_service/async_client.py
@@ -2103,7 +2103,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ProductServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/search_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/search_service/async_client.py
@@ -438,7 +438,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "SearchServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/serving_config_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/serving_config_service/async_client.py
@@ -1146,7 +1146,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ServingConfigServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/user_event_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2alpha/services/user_event_service/async_client.py
@@ -894,7 +894,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "UserEventServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/catalog_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/catalog_service/async_client.py
@@ -1670,7 +1670,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CatalogServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/completion_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/completion_service/async_client.py
@@ -525,7 +525,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "CompletionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/control_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/control_service/async_client.py
@@ -905,7 +905,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ControlServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/model_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/model_service/async_client.py
@@ -1248,7 +1248,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ModelServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/prediction_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/prediction_service/async_client.py
@@ -408,7 +408,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "PredictionServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/product_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/product_service/async_client.py
@@ -1986,7 +1986,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ProductServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/search_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/search_service/async_client.py
@@ -438,7 +438,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "SearchServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/serving_config_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/serving_config_service/async_client.py
@@ -1146,7 +1146,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ServingConfigServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/google/cloud/retail_v2beta/services/user_event_service/async_client.py b/packages/google-cloud-retail/google/cloud/retail_v2beta/services/user_event_service/async_client.py
@@ -894,7 +894,7 @@ async def get_operation(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "UserEventServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):
diff --git a/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2.json b/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-retail",
-    "version": "1.16.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2alpha.json b/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2alpha.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-retail",
-    "version": "1.16.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2beta.json b/packages/google-cloud-retail/samples/generated_samples/snippet_metadata_google.cloud.retail.v2beta.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-retail",
-    "version": "1.16.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_catalog_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_catalog_service.py
@@ -1121,9 +1121,11 @@ async def test_list_catalogs_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_catalogs(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_control_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_control_service.py
@@ -737,7 +737,6 @@ def test_create_control(request_type, transport: str = "grpc"):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
         response = client.create_control(request)
 
@@ -1246,7 +1245,6 @@ def test_update_control(request_type, transport: str = "grpc"):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
         response = client.update_control(request)
 
@@ -1525,7 +1523,6 @@ def test_get_control(request_type, transport: str = "grpc"):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
         response = client.get_control(request)
 
@@ -2166,9 +2163,11 @@ async def test_list_controls_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_controls(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -2250,7 +2249,6 @@ def test_create_control_rest(request_type):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
 
         # Wrap the value into a proper Response obj
@@ -2925,7 +2923,6 @@ def test_update_control_rest(request_type):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
 
         # Wrap the value into a proper Response obj
@@ -3268,7 +3265,6 @@ def test_get_control_rest(request_type):
             search_solution_use_case=[
                 common.SearchSolutionUseCase.SEARCH_SOLUTION_USE_CASE_SEARCH
             ],
-            rule=common.Rule(boost_action=common.Rule.BoostAction(boost=0.551)),
         )
 
         # Wrap the value into a proper Response obj
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_model_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_model_service.py
@@ -2401,9 +2401,11 @@ async def test_list_models_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_models(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_product_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_product_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_search_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_search_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_serving_config_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2/test_serving_config_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_catalog_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_catalog_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_control_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_control_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_model_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_model_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_product_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_product_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_search_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_search_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_serving_config_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2alpha/test_serving_config_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_catalog_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_catalog_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_control_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_control_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_model_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_model_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_product_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_product_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_search_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_search_service.py
diff --git a/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_serving_config_service.py b/packages/google-cloud-retail/tests/unit/gapic/retail_v2beta/test_serving_config_service.py
