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

Commit c44582e

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#201)
- [ ] 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 b6ced63 commit c44582e

File tree

192 files changed

+1788
-4791
lines changed

Some content is hidden

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

192 files changed

+1788
-4791
lines changed

‎google/cloud/dialogflowcx_v3/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.dialogflowcx_v3.services.agents import pagers
@@ -179,18 +181,18 @@ def __init__(
179181

180182
async def list_agents(
181183
self,
182-
request: agent.ListAgentsRequest = None,
184+
request: Union[agent.ListAgentsRequest, dict] = None,
183185
*,
184186
parent: str = None,
185-
retry: retries.Retry = gapic_v1.method.DEFAULT,
187+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
186188
timeout: float = None,
187189
metadata: Sequence[Tuple[str, str]] = (),
188190
) -> pagers.ListAgentsAsyncPager:
189191
r"""Returns the list of all agents in the specified
190192
location.
191193
192194
Args:
193-
request (:class:`google.cloud.dialogflowcx_v3.types.ListAgentsRequest`):
195+
request (Union[google.cloud.dialogflowcx_v3.types.ListAgentsRequest, dict]):
194196
The request object. The request message for
195197
[Agents.ListAgents][google.cloud.dialogflow.cx.v3.Agents.ListAgents].
196198
parent (:class:`str`):
@@ -260,17 +262,17 @@ async def list_agents(
260262

261263
async def get_agent(
262264
self,
263-
request: agent.GetAgentRequest = None,
265+
request: Union[agent.GetAgentRequest, dict] = None,
264266
*,
265267
name: str = None,
266-
retry: retries.Retry = gapic_v1.method.DEFAULT,
268+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
267269
timeout: float = None,
268270
metadata: Sequence[Tuple[str, str]] = (),
269271
) -> agent.Agent:
270272
r"""Retrieves the specified agent.
271273
272274
Args:
273-
request (:class:`google.cloud.dialogflowcx_v3.types.GetAgentRequest`):
275+
request (Union[google.cloud.dialogflowcx_v3.types.GetAgentRequest, dict]):
274276
The request object. The request message for
275277
[Agents.GetAgent][google.cloud.dialogflow.cx.v3.Agents.GetAgent].
276278
name (:class:`str`):
@@ -343,11 +345,11 @@ async def get_agent(
343345

344346
async def create_agent(
345347
self,
346-
request: gcdc_agent.CreateAgentRequest = None,
348+
request: Union[gcdc_agent.CreateAgentRequest, dict] = None,
347349
*,
348350
parent: str = None,
349351
agent: gcdc_agent.Agent = None,
350-
retry: retries.Retry = gapic_v1.method.DEFAULT,
352+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
351353
timeout: float = None,
352354
metadata: Sequence[Tuple[str, str]] = (),
353355
) -> gcdc_agent.Agent:
@@ -358,7 +360,7 @@ async def create_agent(
358360
documentation <https://cloud.google.com/dialogflow/cx/docs/concept/training>`__.
359361
360362
Args:
361-
request (:class:`google.cloud.dialogflowcx_v3.types.CreateAgentRequest`):
363+
request (Union[google.cloud.dialogflowcx_v3.types.CreateAgentRequest, dict]):
362364
The request object. The request message for
363365
[Agents.CreateAgent][google.cloud.dialogflow.cx.v3.Agents.CreateAgent].
364366
parent (:class:`str`):
@@ -438,11 +440,11 @@ async def create_agent(
438440

439441
async def update_agent(
440442
self,
441-
request: gcdc_agent.UpdateAgentRequest = None,
443+
request: Union[gcdc_agent.UpdateAgentRequest, dict] = None,
442444
*,
443445
agent: gcdc_agent.Agent = None,
444446
update_mask: field_mask_pb2.FieldMask = None,
445-
retry: retries.Retry = gapic_v1.method.DEFAULT,
447+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
446448
timeout: float = None,
447449
metadata: Sequence[Tuple[str, str]] = (),
448450
) -> gcdc_agent.Agent:
@@ -453,7 +455,7 @@ async def update_agent(
453455
documentation <https://cloud.google.com/dialogflow/cx/docs/concept/training>`__.
454456
455457
Args:
456-
request (:class:`google.cloud.dialogflowcx_v3.types.UpdateAgentRequest`):
458+
request (Union[google.cloud.dialogflowcx_v3.types.UpdateAgentRequest, dict]):
457459
The request object. The request message for
458460
[Agents.UpdateAgent][google.cloud.dialogflow.cx.v3.Agents.UpdateAgent].
459461
agent (:class:`google.cloud.dialogflowcx_v3.types.Agent`):
@@ -536,17 +538,17 @@ async def update_agent(
536538

537539
async def delete_agent(
538540
self,
539-
request: agent.DeleteAgentRequest = None,
541+
request: Union[agent.DeleteAgentRequest, dict] = None,
540542
*,
541543
name: str = 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
) -> None:
546548
r"""Deletes the specified agent.
547549
548550
Args:
549-
request (:class:`google.cloud.dialogflowcx_v3.types.DeleteAgentRequest`):
551+
request (Union[google.cloud.dialogflowcx_v3.types.DeleteAgentRequest, dict]):
550552
The request object. The request message for
551553
[Agents.DeleteAgent][google.cloud.dialogflow.cx.v3.Agents.DeleteAgent].
552554
name (:class:`str`):
@@ -600,9 +602,9 @@ async def delete_agent(
600602

601603
async def export_agent(
602604
self,
603-
request: agent.ExportAgentRequest = None,
605+
request: Union[agent.ExportAgentRequest, dict] = None,
604606
*,
605-
retry: retries.Retry = gapic_v1.method.DEFAULT,
607+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
606608
timeout: float = None,
607609
metadata: Sequence[Tuple[str, str]] = (),
608610
) -> operation_async.AsyncOperation:
@@ -619,7 +621,7 @@ async def export_agent(
619621
[ExportAgentResponse][google.cloud.dialogflow.cx.v3.ExportAgentResponse]
620622
621623
Args:
622-
request (:class:`google.cloud.dialogflowcx_v3.types.ExportAgentRequest`):
624+
request (Union[google.cloud.dialogflowcx_v3.types.ExportAgentRequest, dict]):
623625
The request object. The request message for
624626
[Agents.ExportAgent][google.cloud.dialogflow.cx.v3.Agents.ExportAgent].
625627
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -671,9 +673,9 @@ async def export_agent(
671673

672674
async def restore_agent(
673675
self,
674-
request: agent.RestoreAgentRequest = None,
676+
request: Union[agent.RestoreAgentRequest, dict] = None,
675677
*,
676-
retry: retries.Retry = gapic_v1.method.DEFAULT,
678+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
677679
timeout: float = None,
678680
metadata: Sequence[Tuple[str, str]] = (),
679681
) -> operation_async.AsyncOperation:
@@ -698,7 +700,7 @@ async def restore_agent(
698700
documentation <https://cloud.google.com/dialogflow/cx/docs/concept/training>`__.
699701
700702
Args:
701-
request (:class:`google.cloud.dialogflowcx_v3.types.RestoreAgentRequest`):
703+
request (Union[google.cloud.dialogflowcx_v3.types.RestoreAgentRequest, dict]):
702704
The request object. The request message for
703705
[Agents.RestoreAgent][google.cloud.dialogflow.cx.v3.Agents.RestoreAgent].
704706
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -759,9 +761,9 @@ async def restore_agent(
759761

760762
async def validate_agent(
761763
self,
762-
request: agent.ValidateAgentRequest = None,
764+
request: Union[agent.ValidateAgentRequest, dict] = None,
763765
*,
764-
retry: retries.Retry = gapic_v1.method.DEFAULT,
766+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
765767
timeout: float = None,
766768
metadata: Sequence[Tuple[str, str]] = (),
767769
) -> agent.AgentValidationResult:
@@ -771,7 +773,7 @@ async def validate_agent(
771773
completed to get the complete validation results.
772774
773775
Args:
774-
request (:class:`google.cloud.dialogflowcx_v3.types.ValidateAgentRequest`):
776+
request (Union[google.cloud.dialogflowcx_v3.types.ValidateAgentRequest, dict]):
775777
The request object. The request message for
776778
[Agents.ValidateAgent][google.cloud.dialogflow.cx.v3.Agents.ValidateAgent].
777779
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -811,18 +813,18 @@ async def validate_agent(
811813

812814
async def get_agent_validation_result(
813815
self,
814-
request: agent.GetAgentValidationResultRequest = None,
816+
request: Union[agent.GetAgentValidationResultRequest, dict] = None,
815817
*,
816818
name: str = None,
817-
retry: retries.Retry = gapic_v1.method.DEFAULT,
819+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
818820
timeout: float = None,
819821
metadata: Sequence[Tuple[str, str]] = (),
820822
) -> agent.AgentValidationResult:
821823
r"""Gets the latest agent validation result. Agent
822824
validation is performed when ValidateAgent is called.
823825
824826
Args:
825-
request (:class:`google.cloud.dialogflowcx_v3.types.GetAgentValidationResultRequest`):
827+
request (Union[google.cloud.dialogflowcx_v3.types.GetAgentValidationResultRequest, dict]):
826828
The request object. The request message for
827829
[Agents.GetAgentValidationResult][google.cloud.dialogflow.cx.v3.Agents.GetAgentValidationResult].
828830
name (:class:`str`):

‎google/cloud/dialogflowcx_v3/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.dialogflowcx_v3.services.agents import pagers
@@ -444,7 +446,7 @@ def list_agents(
444446
request: Union[agent.ListAgentsRequest, dict] = None,
445447
*,
446448
parent: str = None,
447-
retry: retries.Retry = gapic_v1.method.DEFAULT,
449+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
448450
timeout: float = None,
449451
metadata: Sequence[Tuple[str, str]] = (),
450452
) -> pagers.ListAgentsPager:
@@ -525,7 +527,7 @@ def get_agent(
525527
request: Union[agent.GetAgentRequest, dict] = None,
526528
*,
527529
name: str = None,
528-
retry: retries.Retry = gapic_v1.method.DEFAULT,
530+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
529531
timeout: float = None,
530532
metadata: Sequence[Tuple[str, str]] = (),
531533
) -> agent.Agent:
@@ -609,7 +611,7 @@ def create_agent(
609611
*,
610612
parent: str = None,
611613
agent: gcdc_agent.Agent = None,
612-
retry: retries.Retry = gapic_v1.method.DEFAULT,
614+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
613615
timeout: float = None,
614616
metadata: Sequence[Tuple[str, str]] = (),
615617
) -> gcdc_agent.Agent:
@@ -704,7 +706,7 @@ def update_agent(
704706
*,
705707
agent: gcdc_agent.Agent = None,
706708
update_mask: field_mask_pb2.FieldMask = 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
) -> gcdc_agent.Agent:
@@ -801,7 +803,7 @@ def delete_agent(
801803
request: Union[agent.DeleteAgentRequest, dict] = None,
802804
*,
803805
name: str = None,
804-
retry: retries.Retry = gapic_v1.method.DEFAULT,
806+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
805807
timeout: float = None,
806808
metadata: Sequence[Tuple[str, str]] = (),
807809
) -> None:
@@ -864,7 +866,7 @@ def export_agent(
864866
self,
865867
request: Union[agent.ExportAgentRequest, dict] = None,
866868
*,
867-
retry: retries.Retry = gapic_v1.method.DEFAULT,
869+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
868870
timeout: float = None,
869871
metadata: Sequence[Tuple[str, str]] = (),
870872
) -> operation.Operation:
@@ -936,7 +938,7 @@ def restore_agent(
936938
self,
937939
request: Union[agent.RestoreAgentRequest, dict] = None,
938940
*,
939-
retry: retries.Retry = gapic_v1.method.DEFAULT,
941+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
940942
timeout: float = None,
941943
metadata: Sequence[Tuple[str, str]] = (),
942944
) -> operation.Operation:
@@ -1025,7 +1027,7 @@ def validate_agent(
10251027
self,
10261028
request: Union[agent.ValidateAgentRequest, dict] = None,
10271029
*,
1028-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1030+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10291031
timeout: float = None,
10301032
metadata: Sequence[Tuple[str, str]] = (),
10311033
) -> agent.AgentValidationResult:
@@ -1079,7 +1081,7 @@ def get_agent_validation_result(
10791081
request: Union[agent.GetAgentValidationResultRequest, dict] = None,
10801082
*,
10811083
name: str = None,
1082-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1084+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10831085
timeout: float = None,
10841086
metadata: Sequence[Tuple[str, str]] = (),
10851087
) -> agent.AgentValidationResult:

‎google/cloud/dialogflowcx_v3/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
@@ -41,15 +40,6 @@
4140
except pkg_resources.DistributionNotFound:
4241
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4342

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

5444
class AgentsTransport(abc.ABC):
5545
"""Abstract transport class for Agents."""
@@ -102,7 +92,7 @@ def __init__(
10292
host += ":443"
10393
self._host = host
10494

105-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
95+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10696

10797
# Save the scopes.
10898
self._scopes = scopes
@@ -135,29 +125,6 @@ def __init__(
135125
# Save the credentials.
136126
self._credentials = credentials
137127

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

204171
@property
205-
def operations_client(self) -> operations_v1.OperationsClient:
172+
def operations_client(self):
206173
"""Return the client designed to process long-running operations."""
207174
raise NotImplementedError()
208175

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

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

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

‎google/cloud/dialogflowcx_v3/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
@@ -161,7 +160,7 @@ def __init__(
161160
self._grpc_channel = None
162161
self._ssl_channel_credentials = ssl_channel_credentials
163162
self._stubs: Dict[str, Callable] = {}
164-
self._operations_client = None
163+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
165164

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

0 commit comments

Comments
 (0)