chore: use gapic-generator-python 0.58.4 (#284)

* chore: use gapic-generator-python 0.58.4

fix: provide appropriate mock values for message body fields

committer: dovs
PiperOrigin-RevId: 419025932

Source-Link: googleapis/googleapis@73da669

Source-Link: googleapis/googleapis-gen@46df624
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9

* chore: use gapic-generator-python 0.58.4

fix: provide appropriate mock values for message body fields

committer: dovs
PiperOrigin-RevId: 419025932

Source-Link: googleapis/googleapis@73da669

Source-Link: googleapis/googleapis-gen@46df624
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot

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>

Author: gcf-owl-bot[bot]

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/transports/base.py

@@ -104,7 +104,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1/services/product_search/transports/base.py

@@ -105,7 +105,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p1beta1/services/image_annotator/transports/base.py

@@ -102,7 +102,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p2beta1/services/image_annotator/transports/base.py

@@ -104,7 +104,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p3beta1/services/image_annotator/transports/base.py

@@ -104,7 +104,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p3beta1/services/product_search/transports/base.py

@@ -105,7 +105,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p4beta1/services/image_annotator/transports/base.py

@@ -104,7 +104,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/google/cloud/vision_v1p4beta1/services/product_search/transports/base.py

@@ -105,7 +105,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

packages/google-cloud-vision/tests/unit/gapic/vision_v1/test_image_annotator.py

@@ -252,20 +252,20 @@ def test_image_annotator_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -324,7 +324,7 @@ def test_image_annotator_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -419,7 +419,7 @@ def test_image_annotator_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -450,7 +450,7 @@ def test_image_annotator_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -483,9 +483,10 @@ def test_image_annotator_client_client_options_from_dict():
         )
 
 
-def test_batch_annotate_images(
-    transport: str = "grpc", request_type=image_annotator.BatchAnnotateImagesRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [image_annotator.BatchAnnotateImagesRequest, dict,]
+)
+def test_batch_annotate_images(request_type, transport: str = "grpc"):
     client = ImageAnnotatorClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -511,10 +512,6 @@ def test_batch_annotate_images(
     assert isinstance(response, image_annotator.BatchAnnotateImagesResponse)
 
 
-def test_batch_annotate_images_from_dict():
-    test_batch_annotate_images(request_type=dict)
-
-
 def test_batch_annotate_images_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -675,9 +672,10 @@ async def test_batch_annotate_images_flattened_error_async():
         )
 
 
-def test_batch_annotate_files(
-    transport: str = "grpc", request_type=image_annotator.BatchAnnotateFilesRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [image_annotator.BatchAnnotateFilesRequest, dict,]
+)
+def test_batch_annotate_files(request_type, transport: str = "grpc"):
     client = ImageAnnotatorClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -703,10 +701,6 @@ def test_batch_annotate_files(
     assert isinstance(response, image_annotator.BatchAnnotateFilesResponse)
 
 
-def test_batch_annotate_files_from_dict():
-    test_batch_annotate_files(request_type=dict)
-
-
 def test_batch_annotate_files_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -879,10 +873,10 @@ async def test_batch_annotate_files_flattened_error_async():
         )
 
 
-def test_async_batch_annotate_images(
-    transport: str = "grpc",
-    request_type=image_annotator.AsyncBatchAnnotateImagesRequest,
-):
+@pytest.mark.parametrize(
+    "request_type", [image_annotator.AsyncBatchAnnotateImagesRequest, dict,]
+)
+def test_async_batch_annotate_images(request_type, transport: str = "grpc"):
     client = ImageAnnotatorClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -908,10 +902,6 @@ def test_async_batch_annotate_images(
     assert isinstance(response, future.Future)
 
 
-def test_async_batch_annotate_images_from_dict():
-    test_async_batch_annotate_images(request_type=dict)
-
-
 def test_async_batch_annotate_images_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1094,9 +1084,10 @@ async def test_async_batch_annotate_images_flattened_error_async():
         )
 
 
-def test_async_batch_annotate_files(
-    transport: str = "grpc", request_type=image_annotator.AsyncBatchAnnotateFilesRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [image_annotator.AsyncBatchAnnotateFilesRequest, dict,]
+)
+def test_async_batch_annotate_files(request_type, transport: str = "grpc"):
     client = ImageAnnotatorClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1122,10 +1113,6 @@ def test_async_batch_annotate_files(
     assert isinstance(response, future.Future)
 
 
-def test_async_batch_annotate_files_from_dict():
-    test_async_batch_annotate_files(request_type=dict)
-
-
 def test_async_batch_annotate_files_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1882,7 +1869,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(