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

* 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>

google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py

@@ -1368,7 +1368,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "AutoscalingPolicyServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py

@@ -1088,7 +1088,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1188,7 +1188,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1290,7 +1290,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

google/cloud/dataproc_v1/services/batch_controller/async_client.py

@@ -1193,7 +1193,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "BatchControllerAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/batch_controller/transports/rest.py

@@ -945,7 +945,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1045,7 +1045,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1147,7 +1147,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

google/cloud/dataproc_v1/services/cluster_controller/async_client.py

@@ -1984,7 +1984,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ClusterControllerAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py

@@ -1523,7 +1523,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1623,7 +1623,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1725,7 +1725,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

google/cloud/dataproc_v1/services/job_controller/async_client.py

@@ -1697,7 +1697,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "JobControllerAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/job_controller/transports/rest.py

@@ -1325,7 +1325,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1425,7 +1425,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1527,7 +1527,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

google/cloud/dataproc_v1/services/node_group_controller/async_client.py

@@ -1129,7 +1129,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "NodeGroupControllerAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py

@@ -873,7 +873,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -973,7 +973,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1075,7 +1075,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

google/cloud/dataproc_v1/services/workflow_template_service/async_client.py

@@ -1773,7 +1773,7 @@ async def test_iam_permissions(
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "WorkflowTemplateServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py

@@ -1463,7 +1463,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1563,7 +1563,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 
@@ -1665,7 +1665,7 @@ def __call__(
             request_kwargs = json_format.MessageToDict(request)
             transcoded_request = path_template.transcode(http_options, **request_kwargs)
 
-            body = json.loads(json.dumps(transcoded_request["body"]))
+            body = json.dumps(transcoded_request["body"])
             uri = transcoded_request["uri"]
             method = transcoded_request["method"]
 

samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json

@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-dataproc",
-    "version": "5.4.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {

tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py

@@ -791,11 +791,6 @@ def test_create_autoscaling_policy(request_type, transport: str = "grpc"):
         call.return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
         response = client.create_autoscaling_policy(request)
 
@@ -1057,11 +1052,6 @@ def test_update_autoscaling_policy(request_type, transport: str = "grpc"):
         call.return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
         response = client.update_autoscaling_policy(request)
 
@@ -1313,11 +1303,6 @@ def test_get_autoscaling_policy(request_type, transport: str = "grpc"):
         call.return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
         response = client.get_autoscaling_policy(request)
 
@@ -1983,9 +1968,11 @@ async def test_list_autoscaling_policies_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_autoscaling_policies(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
@@ -2266,11 +2253,6 @@ def test_create_autoscaling_policy_rest(request_type):
         return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
 
         # Wrap the value into a proper Response obj
@@ -2593,11 +2575,6 @@ def test_update_autoscaling_policy_rest(request_type):
         return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
 
         # Wrap the value into a proper Response obj
@@ -2894,11 +2871,6 @@ def test_get_autoscaling_policy_rest(request_type):
         return_value = autoscaling_policies.AutoscalingPolicy(
             id="id_value",
             name="name_value",
-            basic_algorithm=autoscaling_policies.BasicAutoscalingAlgorithm(
-                yarn_config=autoscaling_policies.BasicYarnAutoscalingConfig(
-                    graceful_decommission_timeout=duration_pb2.Duration(seconds=751)
-                )
-            ),
         )
 
         # Wrap the value into a proper Response obj

tests/unit/gapic/dataproc_v1/test_batch_controller.py

@@ -1015,9 +1015,6 @@ def test_get_batch(request_type, transport: str = "grpc"):
             state_message="state_message_value",
             creator="creator_value",
             operation="operation_value",
-            pyspark_batch=batches.PySparkBatch(
-                main_python_file_uri="main_python_file_uri_value"
-            ),
         )
         response = client.get_batch(request)
 
@@ -1651,9 +1648,11 @@ async def test_list_batches_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_batches(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
@@ -2343,9 +2342,6 @@ def test_get_batch_rest(request_type):
             state_message="state_message_value",
             creator="creator_value",
             operation="operation_value",
-            pyspark_batch=batches.PySparkBatch(
-                main_python_file_uri="main_python_file_uri_value"
-            ),
         )
 
         # Wrap the value into a proper Response obj

tests/unit/gapic/dataproc_v1/test_cluster_controller.py

@@ -2513,9 +2513,11 @@ async def test_list_clusters_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_clusters(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