Skip to content

Commit cabb13f

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#197)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 06e5219 commit cabb13f

File tree

17 files changed

+71
-382
lines changed

17 files changed

+71
-382
lines changed

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/async_client.py‎

Lines changed: 9 additions & 7 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.cloud.errorreporting_v1beta1.types import common
3032
from google.cloud.errorreporting_v1beta1.types import error_group_service
3133
from .transports.base import ErrorGroupServiceTransport, DEFAULT_CLIENT_INFO
@@ -165,17 +167,17 @@ def __init__(
165167

166168
async def get_group(
167169
self,
168-
request: error_group_service.GetGroupRequest = None,
170+
request: Union[error_group_service.GetGroupRequest, dict] = None,
169171
*,
170172
group_name: str = None,
171-
retry: retries.Retry = gapic_v1.method.DEFAULT,
173+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
172174
timeout: float = None,
173175
metadata: Sequence[Tuple[str, str]] = (),
174176
) -> common.ErrorGroup:
175177
r"""Get the specified group.
176178
177179
Args:
178-
request (:class:`google.cloud.errorreporting_v1beta1.types.GetGroupRequest`):
180+
request (Union[google.cloud.errorreporting_v1beta1.types.GetGroupRequest, dict]):
179181
The request object. A request to return an individual
180182
group.
181183
group_name (:class:`str`):
@@ -242,18 +244,18 @@ async def get_group(
242244

243245
async def update_group(
244246
self,
245-
request: error_group_service.UpdateGroupRequest = None,
247+
request: Union[error_group_service.UpdateGroupRequest, dict] = None,
246248
*,
247249
group: common.ErrorGroup = None,
248-
retry: retries.Retry = gapic_v1.method.DEFAULT,
250+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
249251
timeout: float = None,
250252
metadata: Sequence[Tuple[str, str]] = (),
251253
) -> common.ErrorGroup:
252254
r"""Replace the data for the specified group.
253255
Fails if the group does not exist.
254256
255257
Args:
256-
request (:class:`google.cloud.errorreporting_v1beta1.types.UpdateGroupRequest`):
258+
request (Union[google.cloud.errorreporting_v1beta1.types.UpdateGroupRequest, dict]):
257259
The request object. A request to replace the existing
258260
data for the given group.
259261
group (:class:`google.cloud.errorreporting_v1beta1.types.ErrorGroup`):

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/client.py‎

Lines changed: 4 additions & 2 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.cloud.errorreporting_v1beta1.types import common
3436
from google.cloud.errorreporting_v1beta1.types import error_group_service
3537
from .transports.base import ErrorGroupServiceTransport, DEFAULT_CLIENT_INFO
@@ -349,7 +351,7 @@ def get_group(
349351
request: Union[error_group_service.GetGroupRequest, dict] = None,
350352
*,
351353
group_name: str = None,
352-
retry: retries.Retry = gapic_v1.method.DEFAULT,
354+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
353355
timeout: float = None,
354356
metadata: Sequence[Tuple[str, str]] = (),
355357
) -> common.ErrorGroup:
@@ -426,7 +428,7 @@ def update_group(
426428
request: Union[error_group_service.UpdateGroupRequest, dict] = None,
427429
*,
428430
group: common.ErrorGroup = None,
429-
retry: retries.Retry = gapic_v1.method.DEFAULT,
431+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
430432
timeout: float = None,
431433
metadata: Sequence[Tuple[str, str]] = (),
432434
) -> common.ErrorGroup:

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/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
@@ -38,15 +37,6 @@
3837
except pkg_resources.DistributionNotFound:
3938
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4039

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

5141
class ErrorGroupServiceTransport(abc.ABC):
5242
"""Abstract transport class for ErrorGroupService."""
@@ -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 = {

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_group_service/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

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/async_client.py‎

Lines changed: 12 additions & 10 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.cloud.errorreporting_v1beta1.services.error_stats_service import pagers
3032
from google.cloud.errorreporting_v1beta1.types import common
3133
from google.cloud.errorreporting_v1beta1.types import error_stats_service
@@ -168,18 +170,18 @@ def __init__(
168170

169171
async def list_group_stats(
170172
self,
171-
request: error_stats_service.ListGroupStatsRequest = None,
173+
request: Union[error_stats_service.ListGroupStatsRequest, dict] = None,
172174
*,
173175
project_name: str = None,
174176
time_range: error_stats_service.QueryTimeRange = None,
175-
retry: retries.Retry = gapic_v1.method.DEFAULT,
177+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
176178
timeout: float = None,
177179
metadata: Sequence[Tuple[str, str]] = (),
178180
) -> pagers.ListGroupStatsAsyncPager:
179181
r"""Lists the specified groups.
180182
181183
Args:
182-
request (:class:`google.cloud.errorreporting_v1beta1.types.ListGroupStatsRequest`):
184+
request (Union[google.cloud.errorreporting_v1beta1.types.ListGroupStatsRequest, dict]):
183185
The request object. Specifies a set of `ErrorGroupStats`
184186
to return.
185187
project_name (:class:`str`):
@@ -272,18 +274,18 @@ async def list_group_stats(
272274

273275
async def list_events(
274276
self,
275-
request: error_stats_service.ListEventsRequest = None,
277+
request: Union[error_stats_service.ListEventsRequest, dict] = None,
276278
*,
277279
project_name: str = None,
278280
group_id: str = None,
279-
retry: retries.Retry = gapic_v1.method.DEFAULT,
281+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
280282
timeout: float = None,
281283
metadata: Sequence[Tuple[str, str]] = (),
282284
) -> pagers.ListEventsAsyncPager:
283285
r"""Lists the specified events.
284286
285287
Args:
286-
request (:class:`google.cloud.errorreporting_v1beta1.types.ListEventsRequest`):
288+
request (Union[google.cloud.errorreporting_v1beta1.types.ListEventsRequest, dict]):
287289
The request object. Specifies a set of error events to
288290
return.
289291
project_name (:class:`str`):
@@ -368,17 +370,17 @@ async def list_events(
368370

369371
async def delete_events(
370372
self,
371-
request: error_stats_service.DeleteEventsRequest = None,
373+
request: Union[error_stats_service.DeleteEventsRequest, dict] = None,
372374
*,
373375
project_name: str = None,
374-
retry: retries.Retry = gapic_v1.method.DEFAULT,
376+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
375377
timeout: float = None,
376378
metadata: Sequence[Tuple[str, str]] = (),
377379
) -> error_stats_service.DeleteEventsResponse:
378380
r"""Deletes all error events of a given project.
379381
380382
Args:
381-
request (:class:`google.cloud.errorreporting_v1beta1.types.DeleteEventsRequest`):
383+
request (Union[google.cloud.errorreporting_v1beta1.types.DeleteEventsRequest, dict]):
382384
The request object. Deletes all events in the project.
383385
project_name (:class:`str`):
384386
Required. The resource name of the Google Cloud Platform

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/client.py‎

Lines changed: 5 additions & 3 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.cloud.errorreporting_v1beta1.services.error_stats_service import pagers
3436
from google.cloud.errorreporting_v1beta1.types import common
3537
from google.cloud.errorreporting_v1beta1.types import error_stats_service
@@ -353,7 +355,7 @@ def list_group_stats(
353355
*,
354356
project_name: str = None,
355357
time_range: error_stats_service.QueryTimeRange = None,
356-
retry: retries.Retry = gapic_v1.method.DEFAULT,
358+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
357359
timeout: float = None,
358360
metadata: Sequence[Tuple[str, str]] = (),
359361
) -> pagers.ListGroupStatsPager:
@@ -457,7 +459,7 @@ def list_events(
457459
*,
458460
project_name: str = None,
459461
group_id: str = None,
460-
retry: retries.Retry = gapic_v1.method.DEFAULT,
462+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
461463
timeout: float = None,
462464
metadata: Sequence[Tuple[str, str]] = (),
463465
) -> pagers.ListEventsPager:
@@ -552,7 +554,7 @@ def delete_events(
552554
request: Union[error_stats_service.DeleteEventsRequest, dict] = None,
553555
*,
554556
project_name: str = None,
555-
retry: retries.Retry = gapic_v1.method.DEFAULT,
557+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
556558
timeout: float = None,
557559
metadata: Sequence[Tuple[str, str]] = (),
558560
) -> error_stats_service.DeleteEventsResponse:

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/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
@@ -37,15 +36,6 @@
3736
except pkg_resources.DistributionNotFound:
3837
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3938

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

5040
class ErrorStatsServiceTransport(abc.ABC):
5141
"""Abstract transport class for ErrorStatsService."""
@@ -95,7 +85,7 @@ def __init__(
9585
host += ":443"
9686
self._host = host
9787

98-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
88+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9989

10090
# Save the scopes.
10191
self._scopes = scopes
@@ -128,29 +118,6 @@ def __init__(
128118
# Save the credentials.
129119
self._credentials = credentials
130120

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

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/error_stats_service/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

‎packages/google-cloud-error-reporting/google/cloud/errorreporting_v1beta1/services/report_errors_service/async_client.py‎

Lines changed: 6 additions & 4 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.cloud.errorreporting_v1beta1.types import report_errors_service
3032
from .transports.base import ReportErrorsServiceTransport, DEFAULT_CLIENT_INFO
3133
from .transports.grpc_asyncio import ReportErrorsServiceGrpcAsyncIOTransport
@@ -161,11 +163,11 @@ def __init__(
161163

162164
async def report_error_event(
163165
self,
164-
request: report_errors_service.ReportErrorEventRequest = None,
166+
request: Union[report_errors_service.ReportErrorEventRequest, dict] = None,
165167
*,
166168
project_name: str = None,
167169
event: report_errors_service.ReportedErrorEvent = None,
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
) -> report_errors_service.ReportErrorEventResponse:
@@ -187,7 +189,7 @@ async def report_error_event(
187189
regionalized logs </error-reporting/docs/regionalization>`__.
188190
189191
Args:
190-
request (:class:`google.cloud.errorreporting_v1beta1.types.ReportErrorEventRequest`):
192+
request (Union[google.cloud.errorreporting_v1beta1.types.ReportErrorEventRequest, dict]):
191193
The request object. A request for reporting an
192194
individual error event.
193195
project_name (:class:`str`):

0 commit comments

Comments
 (0)