Skip to content
This repository was archived by the owner on Sep 5, 2023. It is now read-only.

Commit 84914d5

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#176)
- [ ] 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: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 41919bc commit 84914d5

76 files changed

Lines changed: 489 additions & 1747 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google/cloud/talent_v4/services/company_service/async_client.py‎

Lines changed: 18 additions & 16 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.talent_v4.services.company_service import pagers
3032
from google.cloud.talent_v4.types import common
3133
from google.cloud.talent_v4.types import company
@@ -171,18 +173,18 @@ def __init__(
171173

172174
async def create_company(
173175
self,
174-
request: company_service.CreateCompanyRequest = None,
176+
request: Union[company_service.CreateCompanyRequest, dict] = None,
175177
*,
176178
parent: str = None,
177179
company: gct_company.Company = None,
178-
retry: retries.Retry = gapic_v1.method.DEFAULT,
180+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
179181
timeout: float = None,
180182
metadata: Sequence[Tuple[str, str]] = (),
181183
) -> gct_company.Company:
182184
r"""Creates a new company entity.
183185
184186
Args:
185-
request (:class:`google.cloud.talent_v4.types.CreateCompanyRequest`):
187+
request (Union[google.cloud.talent_v4.types.CreateCompanyRequest, dict]):
186188
The request object. The Request of the CreateCompany
187189
method.
188190
parent (:class:`str`):
@@ -258,17 +260,17 @@ async def create_company(
258260

259261
async def get_company(
260262
self,
261-
request: company_service.GetCompanyRequest = None,
263+
request: Union[company_service.GetCompanyRequest, dict] = None,
262264
*,
263265
name: str = None,
264-
retry: retries.Retry = gapic_v1.method.DEFAULT,
266+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
265267
timeout: float = None,
266268
metadata: Sequence[Tuple[str, str]] = (),
267269
) -> company.Company:
268270
r"""Retrieves specified company.
269271
270272
Args:
271-
request (:class:`google.cloud.talent_v4.types.GetCompanyRequest`):
273+
request (Union[google.cloud.talent_v4.types.GetCompanyRequest, dict]):
272274
The request object. Request for getting a company by
273275
name.
274276
name (:class:`str`):
@@ -348,18 +350,18 @@ async def get_company(
348350

349351
async def update_company(
350352
self,
351-
request: company_service.UpdateCompanyRequest = None,
353+
request: Union[company_service.UpdateCompanyRequest, dict] = None,
352354
*,
353355
company: gct_company.Company = None,
354356
update_mask: field_mask_pb2.FieldMask = None,
355-
retry: retries.Retry = gapic_v1.method.DEFAULT,
357+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
356358
timeout: float = None,
357359
metadata: Sequence[Tuple[str, str]] = (),
358360
) -> gct_company.Company:
359361
r"""Updates specified company.
360362
361363
Args:
362-
request (:class:`google.cloud.talent_v4.types.UpdateCompanyRequest`):
364+
request (Union[google.cloud.talent_v4.types.UpdateCompanyRequest, dict]):
363365
The request object. Request for updating a specified
364366
company.
365367
company (:class:`google.cloud.talent_v4.types.Company`):
@@ -445,10 +447,10 @@ async def update_company(
445447

446448
async def delete_company(
447449
self,
448-
request: company_service.DeleteCompanyRequest = None,
450+
request: Union[company_service.DeleteCompanyRequest, dict] = None,
449451
*,
450452
name: str = None,
451-
retry: retries.Retry = gapic_v1.method.DEFAULT,
453+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
452454
timeout: float = None,
453455
metadata: Sequence[Tuple[str, str]] = (),
454456
) -> None:
@@ -457,7 +459,7 @@ async def delete_company(
457459
it.
458460
459461
Args:
460-
request (:class:`google.cloud.talent_v4.types.DeleteCompanyRequest`):
462+
request (Union[google.cloud.talent_v4.types.DeleteCompanyRequest, dict]):
461463
The request object. Request to delete a company.
462464
name (:class:`str`):
463465
Required. The resource name of the company to be
@@ -524,17 +526,17 @@ async def delete_company(
524526

525527
async def list_companies(
526528
self,
527-
request: company_service.ListCompaniesRequest = None,
529+
request: Union[company_service.ListCompaniesRequest, dict] = None,
528530
*,
529531
parent: str = None,
530-
retry: retries.Retry = gapic_v1.method.DEFAULT,
532+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
531533
timeout: float = None,
532534
metadata: Sequence[Tuple[str, str]] = (),
533535
) -> pagers.ListCompaniesAsyncPager:
534536
r"""Lists all companies associated with the project.
535537
536538
Args:
537-
request (:class:`google.cloud.talent_v4.types.ListCompaniesRequest`):
539+
request (Union[google.cloud.talent_v4.types.ListCompaniesRequest, dict]):
538540
The request object. List companies for which the client
539541
has ACL visibility.
540542
parent (:class:`str`):

‎google/cloud/talent_v4/services/company_service/client.py‎

Lines changed: 7 additions & 5 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.talent_v4.services.company_service import pagers
3436
from google.cloud.talent_v4.types import common
3537
from google.cloud.talent_v4.types import company
@@ -372,7 +374,7 @@ def create_company(
372374
*,
373375
parent: str = None,
374376
company: gct_company.Company = None,
375-
retry: retries.Retry = gapic_v1.method.DEFAULT,
377+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
376378
timeout: float = None,
377379
metadata: Sequence[Tuple[str, str]] = (),
378380
) -> gct_company.Company:
@@ -458,7 +460,7 @@ def get_company(
458460
request: Union[company_service.GetCompanyRequest, dict] = None,
459461
*,
460462
name: str = None,
461-
retry: retries.Retry = gapic_v1.method.DEFAULT,
463+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
462464
timeout: float = None,
463465
metadata: Sequence[Tuple[str, str]] = (),
464466
) -> company.Company:
@@ -539,7 +541,7 @@ def update_company(
539541
*,
540542
company: gct_company.Company = None,
541543
update_mask: field_mask_pb2.FieldMask = None,
542-
retry: retries.Retry = gapic_v1.method.DEFAULT,
544+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
543545
timeout: float = None,
544546
metadata: Sequence[Tuple[str, str]] = (),
545547
) -> gct_company.Company:
@@ -635,7 +637,7 @@ def delete_company(
635637
request: Union[company_service.DeleteCompanyRequest, dict] = None,
636638
*,
637639
name: str = None,
638-
retry: retries.Retry = gapic_v1.method.DEFAULT,
640+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
639641
timeout: float = None,
640642
metadata: Sequence[Tuple[str, str]] = (),
641643
) -> None:
@@ -704,7 +706,7 @@ def list_companies(
704706
request: Union[company_service.ListCompaniesRequest, dict] = None,
705707
*,
706708
parent: str = None,
707-
retry: retries.Retry = gapic_v1.method.DEFAULT,
709+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
708710
timeout: float = None,
709711
metadata: Sequence[Tuple[str, str]] = (),
710712
) -> pagers.ListCompaniesPager:

‎google/cloud/talent_v4/services/company_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 CompanyServiceTransport(abc.ABC):
5242
"""Abstract transport class for CompanyService."""
@@ -99,7 +89,7 @@ def __init__(
9989
host += ":443"
10090
self._host = host
10191

102-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
92+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10393

10494
# Save the scopes.
10595
self._scopes = scopes
@@ -132,29 +122,6 @@ def __init__(
132122
# Save the credentials.
133123
self._credentials = credentials
134124

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

‎google/cloud/talent_v4/services/company_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

‎google/cloud/talent_v4/services/completion/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.talent_v4.types import common
3032
from google.cloud.talent_v4.types import completion_service
3133
from .transports.base import CompletionTransport, DEFAULT_CLIENT_INFO
@@ -159,9 +161,9 @@ def __init__(
159161

160162
async def complete_query(
161163
self,
162-
request: completion_service.CompleteQueryRequest = None,
164+
request: Union[completion_service.CompleteQueryRequest, dict] = None,
163165
*,
164-
retry: retries.Retry = gapic_v1.method.DEFAULT,
166+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
165167
timeout: float = None,
166168
metadata: Sequence[Tuple[str, str]] = (),
167169
) -> completion_service.CompleteQueryResponse:
@@ -170,7 +172,7 @@ async def complete_query(
170172
complete search box.
171173
172174
Args:
173-
request (:class:`google.cloud.talent_v4.types.CompleteQueryRequest`):
175+
request (Union[google.cloud.talent_v4.types.CompleteQueryRequest, dict]):
174176
The request object. Auto-complete parameters.
175177
retry (google.api_core.retry.Retry): Designation of what errors, if any,
176178
should be retried.

‎google/cloud/talent_v4/services/completion/client.py‎

Lines changed: 3 additions & 1 deletion
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.talent_v4.types import common
3436
from google.cloud.talent_v4.types import completion_service
3537
from .transports.base import CompletionTransport, DEFAULT_CLIENT_INFO
@@ -362,7 +364,7 @@ def complete_query(
362364
self,
363365
request: Union[completion_service.CompleteQueryRequest, dict] = None,
364366
*,
365-
retry: retries.Retry = gapic_v1.method.DEFAULT,
367+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
366368
timeout: float = None,
367369
metadata: Sequence[Tuple[str, str]] = (),
368370
) -> completion_service.CompleteQueryResponse:

‎google/cloud/talent_v4/services/completion/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 CompletionTransport(abc.ABC):
4939
"""Abstract transport class for Completion."""
@@ -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/cloud/talent_v4/services/completion/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)