Skip to content
This repository was archived by the owner on Nov 9, 2024. It is now read-only.

Commit 1f81d4e

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
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: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent a7e437e commit 1f81d4e

8 files changed

Lines changed: 108 additions & 158 deletions

File tree

‎google/analytics/data_v1beta/services/beta_analytics_data/async_client.py‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.analytics.data_v1beta.types import analytics_data_api
3032
from google.analytics.data_v1beta.types import data
3133
from .transports.base import BetaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
@@ -163,9 +165,9 @@ def __init__(
163165

164166
async def run_report(
165167
self,
166-
request: analytics_data_api.RunReportRequest = None,
168+
request: Union[analytics_data_api.RunReportRequest, dict] = None,
167169
*,
168-
retry: retries.Retry = gapic_v1.method.DEFAULT,
170+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
169171
timeout: float = None,
170172
metadata: Sequence[Tuple[str, str]] = (),
171173
) -> analytics_data_api.RunReportResponse:
@@ -180,7 +182,7 @@ async def run_report(
180182
criteria, such as country or event name.
181183
182184
Args:
183-
request (:class:`google.analytics.data_v1beta.types.RunReportRequest`):
185+
request (Union[google.analytics.data_v1beta.types.RunReportRequest, dict]):
184186
The request object. The request to generate a report.
185187
retry (google.api_core.retry.Retry): Designation of what errors, if any,
186188
should be retried.
@@ -219,9 +221,9 @@ async def run_report(
219221

220222
async def run_pivot_report(
221223
self,
222-
request: analytics_data_api.RunPivotReportRequest = None,
224+
request: Union[analytics_data_api.RunPivotReportRequest, dict] = None,
223225
*,
224-
retry: retries.Retry = gapic_v1.method.DEFAULT,
226+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
225227
timeout: float = None,
226228
metadata: Sequence[Tuple[str, str]] = (),
227229
) -> analytics_data_api.RunPivotReportResponse:
@@ -233,7 +235,7 @@ async def run_pivot_report(
233235
dissect your data.
234236
235237
Args:
236-
request (:class:`google.analytics.data_v1beta.types.RunPivotReportRequest`):
238+
request (Union[google.analytics.data_v1beta.types.RunPivotReportRequest, dict]):
237239
The request object. The request to generate a pivot
238240
report.
239241
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -273,17 +275,17 @@ async def run_pivot_report(
273275

274276
async def batch_run_reports(
275277
self,
276-
request: analytics_data_api.BatchRunReportsRequest = None,
278+
request: Union[analytics_data_api.BatchRunReportsRequest, dict] = None,
277279
*,
278-
retry: retries.Retry = gapic_v1.method.DEFAULT,
280+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
279281
timeout: float = None,
280282
metadata: Sequence[Tuple[str, str]] = (),
281283
) -> analytics_data_api.BatchRunReportsResponse:
282284
r"""Returns multiple reports in a batch. All reports must
283285
be for the same GA4 Property.
284286
285287
Args:
286-
request (:class:`google.analytics.data_v1beta.types.BatchRunReportsRequest`):
288+
request (Union[google.analytics.data_v1beta.types.BatchRunReportsRequest, dict]):
287289
The request object. The batch request containing
288290
multiple report requests.
289291
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -323,17 +325,17 @@ async def batch_run_reports(
323325

324326
async def batch_run_pivot_reports(
325327
self,
326-
request: analytics_data_api.BatchRunPivotReportsRequest = None,
328+
request: Union[analytics_data_api.BatchRunPivotReportsRequest, dict] = None,
327329
*,
328-
retry: retries.Retry = gapic_v1.method.DEFAULT,
330+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
329331
timeout: float = None,
330332
metadata: Sequence[Tuple[str, str]] = (),
331333
) -> analytics_data_api.BatchRunPivotReportsResponse:
332334
r"""Returns multiple pivot reports in a batch. All
333335
reports must be for the same GA4 Property.
334336
335337
Args:
336-
request (:class:`google.analytics.data_v1beta.types.BatchRunPivotReportsRequest`):
338+
request (Union[google.analytics.data_v1beta.types.BatchRunPivotReportsRequest, dict]):
337339
The request object. The batch request containing
338340
multiple pivot report requests.
339341
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -373,10 +375,10 @@ async def batch_run_pivot_reports(
373375

374376
async def get_metadata(
375377
self,
376-
request: analytics_data_api.GetMetadataRequest = None,
378+
request: Union[analytics_data_api.GetMetadataRequest, dict] = None,
377379
*,
378380
name: str = None,
379-
retry: retries.Retry = gapic_v1.method.DEFAULT,
381+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
380382
timeout: float = None,
381383
metadata: Sequence[Tuple[str, str]] = (),
382384
) -> analytics_data_api.Metadata:
@@ -393,7 +395,7 @@ async def get_metadata(
393395
such as ``country`` and ``totalUsers``.
394396
395397
Args:
396-
request (:class:`google.analytics.data_v1beta.types.GetMetadataRequest`):
398+
request (Union[google.analytics.data_v1beta.types.GetMetadataRequest, dict]):
397399
The request object. Request for a property's dimension
398400
and metric metadata.
399401
name (:class:`str`):
@@ -464,9 +466,9 @@ async def get_metadata(
464466

465467
async def run_realtime_report(
466468
self,
467-
request: analytics_data_api.RunRealtimeReportRequest = None,
469+
request: Union[analytics_data_api.RunRealtimeReportRequest, dict] = None,
468470
*,
469-
retry: retries.Retry = gapic_v1.method.DEFAULT,
471+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
470472
timeout: float = None,
471473
metadata: Sequence[Tuple[str, str]] = (),
472474
) -> analytics_data_api.RunRealtimeReportResponse:
@@ -476,7 +478,7 @@ async def run_realtime_report(
476478
last 30 minutes.
477479
478480
Args:
479-
request (:class:`google.analytics.data_v1beta.types.RunRealtimeReportRequest`):
481+
request (Union[google.analytics.data_v1beta.types.RunRealtimeReportRequest, dict]):
480482
The request object. The request to generate a realtime
481483
report.
482484
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -516,9 +518,9 @@ async def run_realtime_report(
516518

517519
async def check_compatibility(
518520
self,
519-
request: analytics_data_api.CheckCompatibilityRequest = None,
521+
request: Union[analytics_data_api.CheckCompatibilityRequest, dict] = None,
520522
*,
521-
retry: retries.Retry = gapic_v1.method.DEFAULT,
523+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
522524
timeout: float = None,
523525
metadata: Sequence[Tuple[str, str]] = (),
524526
) -> analytics_data_api.CheckCompatibilityResponse:
@@ -535,7 +537,7 @@ async def check_compatibility(
535537
for Core reports.
536538
537539
Args:
538-
request (:class:`google.analytics.data_v1beta.types.CheckCompatibilityRequest`):
540+
request (Union[google.analytics.data_v1beta.types.CheckCompatibilityRequest, dict]):
539541
The request object. The request for compatibility
540542
information for a report's dimensions and metrics. Check
541543
compatibility provides a preview of the compatibility of

‎google/analytics/data_v1beta/services/beta_analytics_data/client.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.analytics.data_v1beta.types import analytics_data_api
3436
from google.analytics.data_v1beta.types import data
3537
from .transports.base import BetaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
@@ -348,7 +350,7 @@ def run_report(
348350
self,
349351
request: Union[analytics_data_api.RunReportRequest, dict] = None,
350352
*,
351-
retry: retries.Retry = gapic_v1.method.DEFAULT,
353+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
352354
timeout: float = None,
353355
metadata: Sequence[Tuple[str, str]] = (),
354356
) -> analytics_data_api.RunReportResponse:
@@ -405,7 +407,7 @@ def run_pivot_report(
405407
self,
406408
request: Union[analytics_data_api.RunPivotReportRequest, dict] = None,
407409
*,
408-
retry: retries.Retry = gapic_v1.method.DEFAULT,
410+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
409411
timeout: float = None,
410412
metadata: Sequence[Tuple[str, str]] = (),
411413
) -> analytics_data_api.RunPivotReportResponse:
@@ -460,7 +462,7 @@ def batch_run_reports(
460462
self,
461463
request: Union[analytics_data_api.BatchRunReportsRequest, dict] = None,
462464
*,
463-
retry: retries.Retry = gapic_v1.method.DEFAULT,
465+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
464466
timeout: float = None,
465467
metadata: Sequence[Tuple[str, str]] = (),
466468
) -> analytics_data_api.BatchRunReportsResponse:
@@ -511,7 +513,7 @@ def batch_run_pivot_reports(
511513
self,
512514
request: Union[analytics_data_api.BatchRunPivotReportsRequest, dict] = None,
513515
*,
514-
retry: retries.Retry = gapic_v1.method.DEFAULT,
516+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
515517
timeout: float = None,
516518
metadata: Sequence[Tuple[str, str]] = (),
517519
) -> analytics_data_api.BatchRunPivotReportsResponse:
@@ -563,7 +565,7 @@ def get_metadata(
563565
request: Union[analytics_data_api.GetMetadataRequest, dict] = None,
564566
*,
565567
name: str = None,
566-
retry: retries.Retry = gapic_v1.method.DEFAULT,
568+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
567569
timeout: float = None,
568570
metadata: Sequence[Tuple[str, str]] = (),
569571
) -> analytics_data_api.Metadata:
@@ -653,7 +655,7 @@ def run_realtime_report(
653655
self,
654656
request: Union[analytics_data_api.RunRealtimeReportRequest, dict] = None,
655657
*,
656-
retry: retries.Retry = gapic_v1.method.DEFAULT,
658+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
657659
timeout: float = None,
658660
metadata: Sequence[Tuple[str, str]] = (),
659661
) -> analytics_data_api.RunRealtimeReportResponse:
@@ -706,7 +708,7 @@ def check_compatibility(
706708
self,
707709
request: Union[analytics_data_api.CheckCompatibilityRequest, dict] = None,
708710
*,
709-
retry: retries.Retry = gapic_v1.method.DEFAULT,
711+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
710712
timeout: float = None,
711713
metadata: Sequence[Tuple[str, str]] = (),
712714
) -> analytics_data_api.CheckCompatibilityResponse:

‎google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -35,15 +34,6 @@
3534
except pkg_resources.DistributionNotFound:
3635
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3736

38-
try:
39-
# google.auth.__version__ was added in 1.26.0
40-
_GOOGLE_AUTH_VERSION = google.auth.__version__
41-
except AttributeError:
42-
try: # try pkg_resources if it is available
43-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
44-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
45-
_GOOGLE_AUTH_VERSION = None
46-
4737

4838
class BetaAnalyticsDataTransport(abc.ABC):
4939
"""Abstract transport class for BetaAnalyticsData."""
@@ -96,7 +86,7 @@ def __init__(
9686
host += ":443"
9787
self._host = host
9888

99-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
89+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10090

10191
# Save the scopes.
10292
self._scopes = scopes
@@ -129,29 +119,6 @@ def __init__(
129119
# Save the credentials.
130120
self._credentials = credentials
131121

132-
# TODO(busunkim): This method is in the base transport
133-
# to avoid duplicating code across the transport classes. These functions
134-
# should be deleted once the minimum required versions of google-auth is increased.
135-
136-
# TODO: Remove this function once google-auth >= 1.25.0 is required
137-
@classmethod
138-
def _get_scopes_kwargs(
139-
cls, host: str, scopes: Optional[Sequence[str]]
140-
) -> Dict[str, Optional[Sequence[str]]]:
141-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
142-
143-
scopes_kwargs = {}
144-
145-
if _GOOGLE_AUTH_VERSION and (
146-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
147-
>= packaging.version.parse("1.25.0")
148-
):
149-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
150-
else:
151-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
152-
153-
return scopes_kwargs
154-
155122
def _prep_wrapped_messages(self, client_info):
156123
# Precompute the wrapped methods.
157124
self._wrapped_methods = {

‎google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

0 commit comments

Comments
 (0)