chore: use gapic-generator-python 0.53.4 (#155)

- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
googleapis · Nov 1, 2021 · 1f81d4e · 1f81d4e
1 parent a7e437e
commit 1f81d4e
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 158 deletions.
diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py b/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py
@@ -19,13 +19,15 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-import google.api_core.client_options as ClientOptions  # type: ignore
+from google.api_core.client_options import ClientOptions  # type: ignore
 from google.api_core import exceptions as core_exceptions  # type: ignore
 from google.api_core import gapic_v1  # type: ignore
 from google.api_core import retry as retries  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.analytics.data_v1beta.types import analytics_data_api
 from google.analytics.data_v1beta.types import data
 from .transports.base import BetaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
@@ -163,9 +165,9 @@ def __init__(
 
     async def run_report(
         self,
-        request: analytics_data_api.RunReportRequest = None,
+        request: Union[analytics_data_api.RunReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunReportResponse:
@@ -180,7 +182,7 @@ async def run_report(
         criteria, such as country or event name.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.RunReportRequest`):
+            request (Union[google.analytics.data_v1beta.types.RunReportRequest, dict]):
                 The request object. The request to generate a report.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -219,9 +221,9 @@ async def run_report(
 
     async def run_pivot_report(
         self,
-        request: analytics_data_api.RunPivotReportRequest = None,
+        request: Union[analytics_data_api.RunPivotReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunPivotReportResponse:
@@ -233,7 +235,7 @@ async def run_pivot_report(
         dissect your data.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.RunPivotReportRequest`):
+            request (Union[google.analytics.data_v1beta.types.RunPivotReportRequest, dict]):
                 The request object. The request to generate a pivot
                 report.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -273,17 +275,17 @@ async def run_pivot_report(
 
     async def batch_run_reports(
         self,
-        request: analytics_data_api.BatchRunReportsRequest = None,
+        request: Union[analytics_data_api.BatchRunReportsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.BatchRunReportsResponse:
         r"""Returns multiple reports in a batch. All reports must
         be for the same GA4 Property.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.BatchRunReportsRequest`):
+            request (Union[google.analytics.data_v1beta.types.BatchRunReportsRequest, dict]):
                 The request object. The batch request containing
                 multiple report requests.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -323,17 +325,17 @@ async def batch_run_reports(
 
     async def batch_run_pivot_reports(
         self,
-        request: analytics_data_api.BatchRunPivotReportsRequest = None,
+        request: Union[analytics_data_api.BatchRunPivotReportsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.BatchRunPivotReportsResponse:
         r"""Returns multiple pivot reports in a batch. All
         reports must be for the same GA4 Property.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.BatchRunPivotReportsRequest`):
+            request (Union[google.analytics.data_v1beta.types.BatchRunPivotReportsRequest, dict]):
                 The request object. The batch request containing
                 multiple pivot report requests.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -373,10 +375,10 @@ async def batch_run_pivot_reports(
 
     async def get_metadata(
         self,
-        request: analytics_data_api.GetMetadataRequest = None,
+        request: Union[analytics_data_api.GetMetadataRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.Metadata:
@@ -393,7 +395,7 @@ async def get_metadata(
         such as ``country`` and ``totalUsers``.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.GetMetadataRequest`):
+            request (Union[google.analytics.data_v1beta.types.GetMetadataRequest, dict]):
                 The request object. Request for a property's dimension
                 and metric metadata.
             name (:class:`str`):
@@ -464,9 +466,9 @@ async def get_metadata(
 
     async def run_realtime_report(
         self,
-        request: analytics_data_api.RunRealtimeReportRequest = None,
+        request: Union[analytics_data_api.RunRealtimeReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunRealtimeReportResponse:
@@ -476,7 +478,7 @@ async def run_realtime_report(
         last 30 minutes.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.RunRealtimeReportRequest`):
+            request (Union[google.analytics.data_v1beta.types.RunRealtimeReportRequest, dict]):
                 The request object. The request to generate a realtime
                 report.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -516,9 +518,9 @@ async def run_realtime_report(
 
     async def check_compatibility(
         self,
-        request: analytics_data_api.CheckCompatibilityRequest = None,
+        request: Union[analytics_data_api.CheckCompatibilityRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.CheckCompatibilityResponse:
@@ -535,7 +537,7 @@ async def check_compatibility(
         for Core reports.
 
         Args:
-            request (:class:`google.analytics.data_v1beta.types.CheckCompatibilityRequest`):
+            request (Union[google.analytics.data_v1beta.types.CheckCompatibilityRequest, dict]):
                 The request object. The request for compatibility
                 information for a report's dimensions and metrics. Check
                 compatibility provides a preview of the compatibility of

diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/client.py b/google/analytics/data_v1beta/services/beta_analytics_data/client.py
@@ -30,6 +30,8 @@
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.analytics.data_v1beta.types import analytics_data_api
 from google.analytics.data_v1beta.types import data
 from .transports.base import BetaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
@@ -348,7 +350,7 @@ def run_report(
         self,
         request: Union[analytics_data_api.RunReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunReportResponse:
@@ -405,7 +407,7 @@ def run_pivot_report(
         self,
         request: Union[analytics_data_api.RunPivotReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunPivotReportResponse:
@@ -460,7 +462,7 @@ def batch_run_reports(
         self,
         request: Union[analytics_data_api.BatchRunReportsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.BatchRunReportsResponse:
@@ -511,7 +513,7 @@ def batch_run_pivot_reports(
         self,
         request: Union[analytics_data_api.BatchRunPivotReportsRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.BatchRunPivotReportsResponse:
@@ -563,7 +565,7 @@ def get_metadata(
         request: Union[analytics_data_api.GetMetadataRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.Metadata:
@@ -653,7 +655,7 @@ def run_realtime_report(
         self,
         request: Union[analytics_data_api.RunRealtimeReportRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.RunRealtimeReportResponse:
@@ -706,7 +708,7 @@ def check_compatibility(
         self,
         request: Union[analytics_data_api.CheckCompatibilityRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> analytics_data_api.CheckCompatibilityResponse:

diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py
@@ -15,7 +15,6 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth  # type: ignore
@@ -35,15 +34,6 @@
 except pkg_resources.DistributionNotFound:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
 
-try:
-    # google.auth.__version__ was added in 1.26.0
-    _GOOGLE_AUTH_VERSION = google.auth.__version__
-except AttributeError:
-    try:  # try pkg_resources if it is available
-        _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
-    except pkg_resources.DistributionNotFound:  # pragma: NO COVER
-        _GOOGLE_AUTH_VERSION = None
-
 
 class BetaAnalyticsDataTransport(abc.ABC):
     """Abstract transport class for BetaAnalyticsData."""
@@ -96,7 +86,7 @@ def __init__(
             host += ":443"
         self._host = host
 
-        scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
+        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
         # Save the scopes.
         self._scopes = scopes
@@ -129,29 +119,6 @@ def __init__(
         # Save the credentials.
         self._credentials = credentials
 
-    # TODO(busunkim): This method is in the base transport
-    # to avoid duplicating code across the transport classes. These functions
-    # should be deleted once the minimum required versions of google-auth is increased.
-
-    # TODO: Remove this function once google-auth >= 1.25.0 is required
-    @classmethod
-    def _get_scopes_kwargs(
-        cls, host: str, scopes: Optional[Sequence[str]]
-    ) -> Dict[str, Optional[Sequence[str]]]:
-        """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
-
-        scopes_kwargs = {}
-
-        if _GOOGLE_AUTH_VERSION and (
-            packaging.version.parse(_GOOGLE_AUTH_VERSION)
-            >= packaging.version.parse("1.25.0")
-        ):
-            scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
-        else:
-            scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
-
-        return scopes_kwargs
-
     def _prep_wrapped_messages(self, client_info):
         # Precompute the wrapped methods.
         self._wrapped_methods = {

diff --git a/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py b/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py
@@ -20,7 +20,6 @@
 from google.api_core import grpc_helpers_async  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-import packaging.version
 
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore