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

Commit fd06e9f

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#429)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring docs(v2beta1): clarified meaning of the legacy editions docs(v2beta1): clarified semantic of the streaming APIs 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 bf68864 commit fd06e9f

File tree

180 files changed

+1623
-4515
lines changed

Some content is hidden

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

180 files changed

+1623
-4515
lines changed

‎google/cloud/dialogflow_v2/services/agents/async_client.py‎

Lines changed: 30 additions & 28 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.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.dialogflow_v2.services.agents import pagers
@@ -159,17 +161,17 @@ def __init__(
159161

160162
async def get_agent(
161163
self,
162-
request: agent.GetAgentRequest = None,
164+
request: Union[agent.GetAgentRequest, dict] = None,
163165
*,
164166
parent: str = None,
165-
retry: retries.Retry = gapic_v1.method.DEFAULT,
167+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
166168
timeout: float = None,
167169
metadata: Sequence[Tuple[str, str]] = (),
168170
) -> agent.Agent:
169171
r"""Retrieves the specified agent.
170172
171173
Args:
172-
request (:class:`google.cloud.dialogflow_v2.types.GetAgentRequest`):
174+
request (Union[google.cloud.dialogflow_v2.types.GetAgentRequest, dict]):
173175
The request object. The request message for
174176
[Agents.GetAgent][google.cloud.dialogflow.v2.Agents.GetAgent].
175177
parent (:class:`str`):
@@ -239,10 +241,10 @@ async def get_agent(
239241

240242
async def set_agent(
241243
self,
242-
request: gcd_agent.SetAgentRequest = None,
244+
request: Union[gcd_agent.SetAgentRequest, dict] = None,
243245
*,
244246
agent: gcd_agent.Agent = None,
245-
retry: retries.Retry = gapic_v1.method.DEFAULT,
247+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
246248
timeout: float = None,
247249
metadata: Sequence[Tuple[str, str]] = (),
248250
) -> gcd_agent.Agent:
@@ -253,7 +255,7 @@ async def set_agent(
253255
documentation <https://cloud.google.com/dialogflow/es/docs/training>`__.
254256
255257
Args:
256-
request (:class:`google.cloud.dialogflow_v2.types.SetAgentRequest`):
258+
request (Union[google.cloud.dialogflow_v2.types.SetAgentRequest, dict]):
257259
The request object. The request message for
258260
[Agents.SetAgent][google.cloud.dialogflow.v2.Agents.SetAgent].
259261
agent (:class:`google.cloud.dialogflow_v2.types.Agent`):
@@ -323,17 +325,17 @@ async def set_agent(
323325

324326
async def delete_agent(
325327
self,
326-
request: agent.DeleteAgentRequest = None,
328+
request: Union[agent.DeleteAgentRequest, dict] = None,
327329
*,
328330
parent: str = None,
329-
retry: retries.Retry = gapic_v1.method.DEFAULT,
331+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
330332
timeout: float = None,
331333
metadata: Sequence[Tuple[str, str]] = (),
332334
) -> None:
333335
r"""Deletes the specified agent.
334336
335337
Args:
336-
request (:class:`google.cloud.dialogflow_v2.types.DeleteAgentRequest`):
338+
request (Union[google.cloud.dialogflow_v2.types.DeleteAgentRequest, dict]):
337339
The request object. The request message for
338340
[Agents.DeleteAgent][google.cloud.dialogflow.v2.Agents.DeleteAgent].
339341
parent (:class:`str`):
@@ -387,10 +389,10 @@ async def delete_agent(
387389

388390
async def search_agents(
389391
self,
390-
request: agent.SearchAgentsRequest = None,
392+
request: Union[agent.SearchAgentsRequest, dict] = None,
391393
*,
392394
parent: str = None,
393-
retry: retries.Retry = gapic_v1.method.DEFAULT,
395+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
394396
timeout: float = None,
395397
metadata: Sequence[Tuple[str, str]] = (),
396398
) -> pagers.SearchAgentsAsyncPager:
@@ -403,7 +405,7 @@ async def search_agents(
403405
Sub-Collections <https://cloud.google.com/apis/design/design_patterns#list_sub-collections>`__.
404406
405407
Args:
406-
request (:class:`google.cloud.dialogflow_v2.types.SearchAgentsRequest`):
408+
request (Union[google.cloud.dialogflow_v2.types.SearchAgentsRequest, dict]):
407409
The request object. The request message for
408410
[Agents.SearchAgents][google.cloud.dialogflow.v2.Agents.SearchAgents].
409411
parent (:class:`str`):
@@ -473,10 +475,10 @@ async def search_agents(
473475

474476
async def train_agent(
475477
self,
476-
request: agent.TrainAgentRequest = None,
478+
request: Union[agent.TrainAgentRequest, dict] = None,
477479
*,
478480
parent: str = None,
479-
retry: retries.Retry = gapic_v1.method.DEFAULT,
481+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
480482
timeout: float = None,
481483
metadata: Sequence[Tuple[str, str]] = (),
482484
) -> operation_async.AsyncOperation:
@@ -497,7 +499,7 @@ async def train_agent(
497499
documentation <https://cloud.google.com/dialogflow/es/docs/training>`__.
498500
499501
Args:
500-
request (:class:`google.cloud.dialogflow_v2.types.TrainAgentRequest`):
502+
request (Union[google.cloud.dialogflow_v2.types.TrainAgentRequest, dict]):
501503
The request object. The request message for
502504
[Agents.TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent].
503505
parent (:class:`str`):
@@ -579,10 +581,10 @@ async def train_agent(
579581

580582
async def export_agent(
581583
self,
582-
request: agent.ExportAgentRequest = None,
584+
request: Union[agent.ExportAgentRequest, dict] = None,
583585
*,
584586
parent: str = None,
585-
retry: retries.Retry = gapic_v1.method.DEFAULT,
587+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
586588
timeout: float = None,
587589
metadata: Sequence[Tuple[str, str]] = (),
588590
) -> operation_async.AsyncOperation:
@@ -599,7 +601,7 @@ async def export_agent(
599601
[ExportAgentResponse][google.cloud.dialogflow.v2.ExportAgentResponse]
600602
601603
Args:
602-
request (:class:`google.cloud.dialogflow_v2.types.ExportAgentRequest`):
604+
request (Union[google.cloud.dialogflow_v2.types.ExportAgentRequest, dict]):
603605
The request object. The request message for
604606
[Agents.ExportAgent][google.cloud.dialogflow.v2.Agents.ExportAgent].
605607
parent (:class:`str`):
@@ -672,9 +674,9 @@ async def export_agent(
672674

673675
async def import_agent(
674676
self,
675-
request: agent.ImportAgentRequest = None,
677+
request: Union[agent.ImportAgentRequest, dict] = None,
676678
*,
677-
retry: retries.Retry = gapic_v1.method.DEFAULT,
679+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
678680
timeout: float = None,
679681
metadata: Sequence[Tuple[str, str]] = (),
680682
) -> operation_async.AsyncOperation:
@@ -709,7 +711,7 @@ async def import_agent(
709711
documentation <https://cloud.google.com/dialogflow/es/docs/training>`__.
710712
711713
Args:
712-
request (:class:`google.cloud.dialogflow_v2.types.ImportAgentRequest`):
714+
request (Union[google.cloud.dialogflow_v2.types.ImportAgentRequest, dict]):
713715
The request object. The request message for
714716
[Agents.ImportAgent][google.cloud.dialogflow.v2.Agents.ImportAgent].
715717
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -770,9 +772,9 @@ async def import_agent(
770772

771773
async def restore_agent(
772774
self,
773-
request: agent.RestoreAgentRequest = None,
775+
request: Union[agent.RestoreAgentRequest, dict] = None,
774776
*,
775-
retry: retries.Retry = gapic_v1.method.DEFAULT,
777+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
776778
timeout: float = None,
777779
metadata: Sequence[Tuple[str, str]] = (),
778780
) -> operation_async.AsyncOperation:
@@ -805,7 +807,7 @@ async def restore_agent(
805807
documentation <https://cloud.google.com/dialogflow/es/docs/training>`__.
806808
807809
Args:
808-
request (:class:`google.cloud.dialogflow_v2.types.RestoreAgentRequest`):
810+
request (Union[google.cloud.dialogflow_v2.types.RestoreAgentRequest, dict]):
809811
The request object. The request message for
810812
[Agents.RestoreAgent][google.cloud.dialogflow.v2.Agents.RestoreAgent].
811813
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -866,9 +868,9 @@ async def restore_agent(
866868

867869
async def get_validation_result(
868870
self,
869-
request: agent.GetValidationResultRequest = None,
871+
request: Union[agent.GetValidationResultRequest, dict] = None,
870872
*,
871-
retry: retries.Retry = gapic_v1.method.DEFAULT,
873+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
872874
timeout: float = None,
873875
metadata: Sequence[Tuple[str, str]] = (),
874876
) -> validation_result.ValidationResult:
@@ -877,7 +879,7 @@ async def get_validation_result(
877879
automatically when training is completed.
878880
879881
Args:
880-
request (:class:`google.cloud.dialogflow_v2.types.GetValidationResultRequest`):
882+
request (Union[google.cloud.dialogflow_v2.types.GetValidationResultRequest, dict]):
881883
The request object. The request message for
882884
[Agents.GetValidationResult][google.cloud.dialogflow.v2.Agents.GetValidationResult].
883885
retry (google.api_core.retry.Retry): Designation of what errors, if any,

‎google/cloud/dialogflow_v2/services/agents/client.py‎

Lines changed: 11 additions & 9 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.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.dialogflow_v2.services.agents import pagers
@@ -351,7 +353,7 @@ def get_agent(
351353
request: Union[agent.GetAgentRequest, dict] = None,
352354
*,
353355
parent: str = None,
354-
retry: retries.Retry = gapic_v1.method.DEFAULT,
356+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
355357
timeout: float = None,
356358
metadata: Sequence[Tuple[str, str]] = (),
357359
) -> agent.Agent:
@@ -431,7 +433,7 @@ def set_agent(
431433
request: Union[gcd_agent.SetAgentRequest, dict] = None,
432434
*,
433435
agent: gcd_agent.Agent = None,
434-
retry: retries.Retry = gapic_v1.method.DEFAULT,
436+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
435437
timeout: float = None,
436438
metadata: Sequence[Tuple[str, str]] = (),
437439
) -> gcd_agent.Agent:
@@ -515,7 +517,7 @@ def delete_agent(
515517
request: Union[agent.DeleteAgentRequest, dict] = None,
516518
*,
517519
parent: str = None,
518-
retry: retries.Retry = gapic_v1.method.DEFAULT,
520+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
519521
timeout: float = None,
520522
metadata: Sequence[Tuple[str, str]] = (),
521523
) -> None:
@@ -579,7 +581,7 @@ def search_agents(
579581
request: Union[agent.SearchAgentsRequest, dict] = None,
580582
*,
581583
parent: str = None,
582-
retry: retries.Retry = gapic_v1.method.DEFAULT,
584+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
583585
timeout: float = None,
584586
metadata: Sequence[Tuple[str, str]] = (),
585587
) -> pagers.SearchAgentsPager:
@@ -665,7 +667,7 @@ def train_agent(
665667
request: Union[agent.TrainAgentRequest, dict] = None,
666668
*,
667669
parent: str = None,
668-
retry: retries.Retry = gapic_v1.method.DEFAULT,
670+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
669671
timeout: float = None,
670672
metadata: Sequence[Tuple[str, str]] = (),
671673
) -> operation.Operation:
@@ -771,7 +773,7 @@ def export_agent(
771773
request: Union[agent.ExportAgentRequest, dict] = None,
772774
*,
773775
parent: str = None,
774-
retry: retries.Retry = gapic_v1.method.DEFAULT,
776+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
775777
timeout: float = None,
776778
metadata: Sequence[Tuple[str, str]] = (),
777779
) -> operation.Operation:
@@ -863,7 +865,7 @@ def import_agent(
863865
self,
864866
request: Union[agent.ImportAgentRequest, dict] = None,
865867
*,
866-
retry: retries.Retry = gapic_v1.method.DEFAULT,
868+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
867869
timeout: float = None,
868870
metadata: Sequence[Tuple[str, str]] = (),
869871
) -> operation.Operation:
@@ -962,7 +964,7 @@ def restore_agent(
962964
self,
963965
request: Union[agent.RestoreAgentRequest, dict] = None,
964966
*,
965-
retry: retries.Retry = gapic_v1.method.DEFAULT,
967+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
966968
timeout: float = None,
967969
metadata: Sequence[Tuple[str, str]] = (),
968970
) -> operation.Operation:
@@ -1059,7 +1061,7 @@ def get_validation_result(
10591061
self,
10601062
request: Union[agent.GetValidationResultRequest, dict] = None,
10611063
*,
1062-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1064+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10631065
timeout: float = None,
10641066
metadata: Sequence[Tuple[str, str]] = (),
10651067
) -> validation_result.ValidationResult:

‎google/cloud/dialogflow_v2/services/agents/transports/base.py‎

Lines changed: 2 additions & 35 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
@@ -42,15 +41,6 @@
4241
except pkg_resources.DistributionNotFound:
4342
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4443

45-
try:
46-
# google.auth.__version__ was added in 1.26.0
47-
_GOOGLE_AUTH_VERSION = google.auth.__version__
48-
except AttributeError:
49-
try: # try pkg_resources if it is available
50-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
51-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
52-
_GOOGLE_AUTH_VERSION = None
53-
5444

5545
class AgentsTransport(abc.ABC):
5646
"""Abstract transport class for Agents."""
@@ -103,7 +93,7 @@ def __init__(
10393
host += ":443"
10494
self._host = host
10595

106-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
96+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10797

10898
# Save the scopes.
10999
self._scopes = scopes
@@ -136,29 +126,6 @@ def __init__(
136126
# Save the credentials.
137127
self._credentials = credentials
138128

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

205172
@property
206-
def operations_client(self) -> operations_v1.OperationsClient:
173+
def operations_client(self):
207174
"""Return the client designed to process long-running operations."""
208175
raise NotImplementedError()
209176

‎google/cloud/dialogflow_v2/services/agents/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def __init__(
115115
self._grpc_channel = None
116116
self._ssl_channel_credentials = ssl_channel_credentials
117117
self._stubs: Dict[str, Callable] = {}
118-
self._operations_client = None
118+
self._operations_client: Optional[operations_v1.OperationsClient] = None
119119

120120
if api_mtls_endpoint:
121121
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -162,7 +161,7 @@ def __init__(
162161
self._grpc_channel = None
163162
self._ssl_channel_credentials = ssl_channel_credentials
164163
self._stubs: Dict[str, Callable] = {}
165-
self._operations_client = None
164+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
166165

167166
if api_mtls_endpoint:
168167
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)