diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 2567653c0..ae6c57fad 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a + digest: sha256:82b12321da4446a73cb11bcb6812fbec8c105abda3946d46e6394e5fbfb64c0f diff --git a/CHANGELOG.md b/CHANGELOG.md index 8475f4f9c..861404fd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ [1]: https://pypi.org/project/dialogflow/#history +## [2.9.0](https://www.github.com/googleapis/python-dialogflow/compare/v2.8.1...v2.9.0) (2021-09-30) + + +### Features + +* added support for TelephonyTransferCall in Participant ResponseMessage ([#406](https://www.github.com/googleapis/python-dialogflow/issues/406)) ([814055d](https://www.github.com/googleapis/python-dialogflow/commit/814055d2f6d7948f832b8cc0ae0573fea163ace1)) + + +### Bug Fixes + +* improper types in pagers generation ([814055d](https://www.github.com/googleapis/python-dialogflow/commit/814055d2f6d7948f832b8cc0ae0573fea163ace1)) + + +### Documentation + +* **samples:** added webhook code snippet ([#401](https://www.github.com/googleapis/python-dialogflow/issues/401)) ([9e279c8](https://www.github.com/googleapis/python-dialogflow/commit/9e279c86136543432cc218c2b1876bbb96f24240)) + ### [2.8.1](https://www.github.com/googleapis/python-dialogflow/compare/v2.8.0...v2.8.1) (2021-09-29) diff --git a/google/cloud/dialogflow_v2/services/agents/pagers.py b/google/cloud/dialogflow_v2/services/agents/pagers.py index d8e3602be..8dbecf85b 100644 --- a/google/cloud/dialogflow_v2/services/agents/pagers.py +++ b/google/cloud/dialogflow_v2/services/agents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import agent @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[agent.SearchAgentsResponse]: + def pages(self) -> Iterator[agent.SearchAgentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[agent.Agent]: + def __iter__(self) -> Iterator[agent.Agent]: for page in self.pages: yield from page.agents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[agent.SearchAgentsResponse]: + async def pages(self) -> AsyncIterator[agent.SearchAgentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[agent.Agent]: + def __aiter__(self) -> AsyncIterator[agent.Agent]: async def async_generator(): async for page in self.pages: for response in page.agents: diff --git a/google/cloud/dialogflow_v2/services/answer_records/pagers.py b/google/cloud/dialogflow_v2/services/answer_records/pagers.py index 18ffae225..7a92f17a1 100644 --- a/google/cloud/dialogflow_v2/services/answer_records/pagers.py +++ b/google/cloud/dialogflow_v2/services/answer_records/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import answer_record @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[answer_record.ListAnswerRecordsResponse]: + def pages(self) -> Iterator[answer_record.ListAnswerRecordsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[answer_record.AnswerRecord]: + def __iter__(self) -> Iterator[answer_record.AnswerRecord]: for page in self.pages: yield from page.answer_records @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[answer_record.ListAnswerRecordsResponse]: + async def pages(self) -> AsyncIterator[answer_record.ListAnswerRecordsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[answer_record.AnswerRecord]: + def __aiter__(self) -> AsyncIterator[answer_record.AnswerRecord]: async def async_generator(): async for page in self.pages: for response in page.answer_records: diff --git a/google/cloud/dialogflow_v2/services/contexts/pagers.py b/google/cloud/dialogflow_v2/services/contexts/pagers.py index e61140a68..a8c9d5cbc 100644 --- a/google/cloud/dialogflow_v2/services/contexts/pagers.py +++ b/google/cloud/dialogflow_v2/services/contexts/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import context @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[context.ListContextsResponse]: + def pages(self) -> Iterator[context.ListContextsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[context.Context]: + def __iter__(self) -> Iterator[context.Context]: for page in self.pages: yield from page.contexts @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[context.ListContextsResponse]: + async def pages(self) -> AsyncIterator[context.ListContextsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[context.Context]: + def __aiter__(self) -> AsyncIterator[context.Context]: async def async_generator(): async for page in self.pages: for response in page.contexts: diff --git a/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py b/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py index fe92fe799..e12f2bbb4 100644 --- a/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py +++ b/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import conversation_profile @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation_profile.ListConversationProfilesResponse]: + def pages(self) -> Iterator[conversation_profile.ListConversationProfilesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[conversation_profile.ConversationProfile]: + def __iter__(self) -> Iterator[conversation_profile.ConversationProfile]: for page in self.pages: yield from page.conversation_profiles @@ -140,14 +140,14 @@ def __getattr__(self, name: str) -> Any: @property async def pages( self, - ) -> AsyncIterable[conversation_profile.ListConversationProfilesResponse]: + ) -> AsyncIterator[conversation_profile.ListConversationProfilesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[conversation_profile.ConversationProfile]: + def __aiter__(self) -> AsyncIterator[conversation_profile.ConversationProfile]: async def async_generator(): async for page in self.pages: for response in page.conversation_profiles: diff --git a/google/cloud/dialogflow_v2/services/conversations/pagers.py b/google/cloud/dialogflow_v2/services/conversations/pagers.py index 6296c621b..e8e0ef6e3 100644 --- a/google/cloud/dialogflow_v2/services/conversations/pagers.py +++ b/google/cloud/dialogflow_v2/services/conversations/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import conversation @@ -75,14 +75,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation.ListConversationsResponse]: + def pages(self) -> Iterator[conversation.ListConversationsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[conversation.Conversation]: + def __iter__(self) -> Iterator[conversation.Conversation]: for page in self.pages: yield from page.conversations @@ -137,14 +137,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[conversation.ListConversationsResponse]: + async def pages(self) -> AsyncIterator[conversation.ListConversationsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[conversation.Conversation]: + def __aiter__(self) -> AsyncIterator[conversation.Conversation]: async def async_generator(): async for page in self.pages: for response in page.conversations: @@ -203,14 +203,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation.ListMessagesResponse]: + def pages(self) -> Iterator[conversation.ListMessagesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[participant.Message]: + def __iter__(self) -> Iterator[participant.Message]: for page in self.pages: yield from page.messages @@ -265,14 +265,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[conversation.ListMessagesResponse]: + async def pages(self) -> AsyncIterator[conversation.ListMessagesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[participant.Message]: + def __aiter__(self) -> AsyncIterator[participant.Message]: async def async_generator(): async for page in self.pages: for response in page.messages: diff --git a/google/cloud/dialogflow_v2/services/documents/pagers.py b/google/cloud/dialogflow_v2/services/documents/pagers.py index b79d77b4a..d0dd63f48 100644 --- a/google/cloud/dialogflow_v2/services/documents/pagers.py +++ b/google/cloud/dialogflow_v2/services/documents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import document @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[document.ListDocumentsResponse]: + def pages(self) -> Iterator[document.ListDocumentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[document.Document]: + def __iter__(self) -> Iterator[document.Document]: for page in self.pages: yield from page.documents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[document.ListDocumentsResponse]: + async def pages(self) -> AsyncIterator[document.ListDocumentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[document.Document]: + def __aiter__(self) -> AsyncIterator[document.Document]: async def async_generator(): async for page in self.pages: for response in page.documents: diff --git a/google/cloud/dialogflow_v2/services/entity_types/pagers.py b/google/cloud/dialogflow_v2/services/entity_types/pagers.py index 2e4f1b75f..bd8839192 100644 --- a/google/cloud/dialogflow_v2/services/entity_types/pagers.py +++ b/google/cloud/dialogflow_v2/services/entity_types/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import entity_type @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[entity_type.ListEntityTypesResponse]: + def pages(self) -> Iterator[entity_type.ListEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[entity_type.EntityType]: + def __iter__(self) -> Iterator[entity_type.EntityType]: for page in self.pages: yield from page.entity_types @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[entity_type.ListEntityTypesResponse]: + async def pages(self) -> AsyncIterator[entity_type.ListEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[entity_type.EntityType]: + def __aiter__(self) -> AsyncIterator[entity_type.EntityType]: async def async_generator(): async for page in self.pages: for response in page.entity_types: diff --git a/google/cloud/dialogflow_v2/services/environments/pagers.py b/google/cloud/dialogflow_v2/services/environments/pagers.py index 426fc8f49..41e4185fa 100644 --- a/google/cloud/dialogflow_v2/services/environments/pagers.py +++ b/google/cloud/dialogflow_v2/services/environments/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import environment @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[environment.ListEnvironmentsResponse]: + def pages(self) -> Iterator[environment.ListEnvironmentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[environment.Environment]: + def __iter__(self) -> Iterator[environment.Environment]: for page in self.pages: yield from page.environments @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[environment.ListEnvironmentsResponse]: + async def pages(self) -> AsyncIterator[environment.ListEnvironmentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[environment.Environment]: + def __aiter__(self) -> AsyncIterator[environment.Environment]: async def async_generator(): async for page in self.pages: for response in page.environments: @@ -202,14 +202,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[environment.EnvironmentHistory]: + def pages(self) -> Iterator[environment.EnvironmentHistory]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[environment.EnvironmentHistory.Entry]: + def __iter__(self) -> Iterator[environment.EnvironmentHistory.Entry]: for page in self.pages: yield from page.entries @@ -264,14 +264,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[environment.EnvironmentHistory]: + async def pages(self) -> AsyncIterator[environment.EnvironmentHistory]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[environment.EnvironmentHistory.Entry]: + def __aiter__(self) -> AsyncIterator[environment.EnvironmentHistory.Entry]: async def async_generator(): async for page in self.pages: for response in page.entries: diff --git a/google/cloud/dialogflow_v2/services/intents/pagers.py b/google/cloud/dialogflow_v2/services/intents/pagers.py index 5e9b67d52..f28626ab8 100644 --- a/google/cloud/dialogflow_v2/services/intents/pagers.py +++ b/google/cloud/dialogflow_v2/services/intents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import intent @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[intent.ListIntentsResponse]: + def pages(self) -> Iterator[intent.ListIntentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[intent.Intent]: + def __iter__(self) -> Iterator[intent.Intent]: for page in self.pages: yield from page.intents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[intent.ListIntentsResponse]: + async def pages(self) -> AsyncIterator[intent.ListIntentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[intent.Intent]: + def __aiter__(self) -> AsyncIterator[intent.Intent]: async def async_generator(): async for page in self.pages: for response in page.intents: diff --git a/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py b/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py index b8b845661..cbfa16b57 100644 --- a/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py +++ b/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import knowledge_base @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[knowledge_base.ListKnowledgeBasesResponse]: + def pages(self) -> Iterator[knowledge_base.ListKnowledgeBasesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[knowledge_base.KnowledgeBase]: + def __iter__(self) -> Iterator[knowledge_base.KnowledgeBase]: for page in self.pages: yield from page.knowledge_bases @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[knowledge_base.ListKnowledgeBasesResponse]: + async def pages(self) -> AsyncIterator[knowledge_base.ListKnowledgeBasesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[knowledge_base.KnowledgeBase]: + def __aiter__(self) -> AsyncIterator[knowledge_base.KnowledgeBase]: async def async_generator(): async for page in self.pages: for response in page.knowledge_bases: diff --git a/google/cloud/dialogflow_v2/services/participants/pagers.py b/google/cloud/dialogflow_v2/services/participants/pagers.py index 311970137..2b0833112 100644 --- a/google/cloud/dialogflow_v2/services/participants/pagers.py +++ b/google/cloud/dialogflow_v2/services/participants/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import participant @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[participant.ListParticipantsResponse]: + def pages(self) -> Iterator[participant.ListParticipantsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[participant.Participant]: + def __iter__(self) -> Iterator[participant.Participant]: for page in self.pages: yield from page.participants @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[participant.ListParticipantsResponse]: + async def pages(self) -> AsyncIterator[participant.ListParticipantsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[participant.Participant]: + def __aiter__(self) -> AsyncIterator[participant.Participant]: async def async_generator(): async for page in self.pages: for response in page.participants: diff --git a/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py b/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py index a3b58bcf5..56e46abd4 100644 --- a/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py +++ b/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import session_entity_type @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[session_entity_type.ListSessionEntityTypesResponse]: + def pages(self) -> Iterator[session_entity_type.ListSessionEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[session_entity_type.SessionEntityType]: + def __iter__(self) -> Iterator[session_entity_type.SessionEntityType]: for page in self.pages: yield from page.session_entity_types @@ -140,14 +140,14 @@ def __getattr__(self, name: str) -> Any: @property async def pages( self, - ) -> AsyncIterable[session_entity_type.ListSessionEntityTypesResponse]: + ) -> AsyncIterator[session_entity_type.ListSessionEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[session_entity_type.SessionEntityType]: + def __aiter__(self) -> AsyncIterator[session_entity_type.SessionEntityType]: async def async_generator(): async for page in self.pages: for response in page.session_entity_types: diff --git a/google/cloud/dialogflow_v2/services/versions/pagers.py b/google/cloud/dialogflow_v2/services/versions/pagers.py index 316090b46..26b6b52c0 100644 --- a/google/cloud/dialogflow_v2/services/versions/pagers.py +++ b/google/cloud/dialogflow_v2/services/versions/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2.types import version @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[version.ListVersionsResponse]: + def pages(self) -> Iterator[version.ListVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[version.Version]: + def __iter__(self) -> Iterator[version.Version]: for page in self.pages: yield from page.versions @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[version.ListVersionsResponse]: + async def pages(self) -> AsyncIterator[version.ListVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[version.Version]: + def __aiter__(self) -> AsyncIterator[version.Version]: async def async_generator(): async for page in self.pages: for response in page.versions: diff --git a/google/cloud/dialogflow_v2beta1/services/agents/pagers.py b/google/cloud/dialogflow_v2beta1/services/agents/pagers.py index e7d1795a3..ee5753a3d 100644 --- a/google/cloud/dialogflow_v2beta1/services/agents/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/agents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import agent @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[agent.SearchAgentsResponse]: + def pages(self) -> Iterator[agent.SearchAgentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[agent.Agent]: + def __iter__(self) -> Iterator[agent.Agent]: for page in self.pages: yield from page.agents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[agent.SearchAgentsResponse]: + async def pages(self) -> AsyncIterator[agent.SearchAgentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[agent.Agent]: + def __aiter__(self) -> AsyncIterator[agent.Agent]: async def async_generator(): async for page in self.pages: for response in page.agents: diff --git a/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py b/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py index 777fb93c6..252faa0c2 100644 --- a/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import answer_record @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[answer_record.ListAnswerRecordsResponse]: + def pages(self) -> Iterator[answer_record.ListAnswerRecordsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[answer_record.AnswerRecord]: + def __iter__(self) -> Iterator[answer_record.AnswerRecord]: for page in self.pages: yield from page.answer_records @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[answer_record.ListAnswerRecordsResponse]: + async def pages(self) -> AsyncIterator[answer_record.ListAnswerRecordsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[answer_record.AnswerRecord]: + def __aiter__(self) -> AsyncIterator[answer_record.AnswerRecord]: async def async_generator(): async for page in self.pages: for response in page.answer_records: diff --git a/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py b/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py index d09d4bb51..f4c2f6c32 100644 --- a/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import context @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[context.ListContextsResponse]: + def pages(self) -> Iterator[context.ListContextsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[context.Context]: + def __iter__(self) -> Iterator[context.Context]: for page in self.pages: yield from page.contexts @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[context.ListContextsResponse]: + async def pages(self) -> AsyncIterator[context.ListContextsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[context.Context]: + def __aiter__(self) -> AsyncIterator[context.Context]: async def async_generator(): async for page in self.pages: for response in page.contexts: diff --git a/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py b/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py index e9679190a..883594f06 100644 --- a/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import conversation_profile @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation_profile.ListConversationProfilesResponse]: + def pages(self) -> Iterator[conversation_profile.ListConversationProfilesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[conversation_profile.ConversationProfile]: + def __iter__(self) -> Iterator[conversation_profile.ConversationProfile]: for page in self.pages: yield from page.conversation_profiles @@ -140,14 +140,14 @@ def __getattr__(self, name: str) -> Any: @property async def pages( self, - ) -> AsyncIterable[conversation_profile.ListConversationProfilesResponse]: + ) -> AsyncIterator[conversation_profile.ListConversationProfilesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[conversation_profile.ConversationProfile]: + def __aiter__(self) -> AsyncIterator[conversation_profile.ConversationProfile]: async def async_generator(): async for page in self.pages: for response in page.conversation_profiles: diff --git a/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py b/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py index abde5304e..5c21ec71d 100644 --- a/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import conversation @@ -75,14 +75,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation.ListConversationsResponse]: + def pages(self) -> Iterator[conversation.ListConversationsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[conversation.Conversation]: + def __iter__(self) -> Iterator[conversation.Conversation]: for page in self.pages: yield from page.conversations @@ -137,14 +137,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[conversation.ListConversationsResponse]: + async def pages(self) -> AsyncIterator[conversation.ListConversationsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[conversation.Conversation]: + def __aiter__(self) -> AsyncIterator[conversation.Conversation]: async def async_generator(): async for page in self.pages: for response in page.conversations: @@ -203,14 +203,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[conversation.ListMessagesResponse]: + def pages(self) -> Iterator[conversation.ListMessagesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[participant.Message]: + def __iter__(self) -> Iterator[participant.Message]: for page in self.pages: yield from page.messages @@ -265,14 +265,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[conversation.ListMessagesResponse]: + async def pages(self) -> AsyncIterator[conversation.ListMessagesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[participant.Message]: + def __aiter__(self) -> AsyncIterator[participant.Message]: async def async_generator(): async for page in self.pages: for response in page.messages: diff --git a/google/cloud/dialogflow_v2beta1/services/documents/pagers.py b/google/cloud/dialogflow_v2beta1/services/documents/pagers.py index 35afd5c3f..3b87f0cc5 100644 --- a/google/cloud/dialogflow_v2beta1/services/documents/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/documents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import document @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[document.ListDocumentsResponse]: + def pages(self) -> Iterator[document.ListDocumentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[document.Document]: + def __iter__(self) -> Iterator[document.Document]: for page in self.pages: yield from page.documents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[document.ListDocumentsResponse]: + async def pages(self) -> AsyncIterator[document.ListDocumentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[document.Document]: + def __aiter__(self) -> AsyncIterator[document.Document]: async def async_generator(): async for page in self.pages: for response in page.documents: diff --git a/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py b/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py index d5b513263..73baab3fb 100644 --- a/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import entity_type @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[entity_type.ListEntityTypesResponse]: + def pages(self) -> Iterator[entity_type.ListEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[entity_type.EntityType]: + def __iter__(self) -> Iterator[entity_type.EntityType]: for page in self.pages: yield from page.entity_types @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[entity_type.ListEntityTypesResponse]: + async def pages(self) -> AsyncIterator[entity_type.ListEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[entity_type.EntityType]: + def __aiter__(self) -> AsyncIterator[entity_type.EntityType]: async def async_generator(): async for page in self.pages: for response in page.entity_types: diff --git a/google/cloud/dialogflow_v2beta1/services/environments/pagers.py b/google/cloud/dialogflow_v2beta1/services/environments/pagers.py index 4307c677d..3f547999f 100644 --- a/google/cloud/dialogflow_v2beta1/services/environments/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/environments/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import environment @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[environment.ListEnvironmentsResponse]: + def pages(self) -> Iterator[environment.ListEnvironmentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[environment.Environment]: + def __iter__(self) -> Iterator[environment.Environment]: for page in self.pages: yield from page.environments @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[environment.ListEnvironmentsResponse]: + async def pages(self) -> AsyncIterator[environment.ListEnvironmentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[environment.Environment]: + def __aiter__(self) -> AsyncIterator[environment.Environment]: async def async_generator(): async for page in self.pages: for response in page.environments: @@ -202,14 +202,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[environment.EnvironmentHistory]: + def pages(self) -> Iterator[environment.EnvironmentHistory]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[environment.EnvironmentHistory.Entry]: + def __iter__(self) -> Iterator[environment.EnvironmentHistory.Entry]: for page in self.pages: yield from page.entries @@ -264,14 +264,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[environment.EnvironmentHistory]: + async def pages(self) -> AsyncIterator[environment.EnvironmentHistory]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[environment.EnvironmentHistory.Entry]: + def __aiter__(self) -> AsyncIterator[environment.EnvironmentHistory.Entry]: async def async_generator(): async for page in self.pages: for response in page.entries: diff --git a/google/cloud/dialogflow_v2beta1/services/intents/pagers.py b/google/cloud/dialogflow_v2beta1/services/intents/pagers.py index 9199c11b1..e7c0edf18 100644 --- a/google/cloud/dialogflow_v2beta1/services/intents/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/intents/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import intent @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[intent.ListIntentsResponse]: + def pages(self) -> Iterator[intent.ListIntentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[intent.Intent]: + def __iter__(self) -> Iterator[intent.Intent]: for page in self.pages: yield from page.intents @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[intent.ListIntentsResponse]: + async def pages(self) -> AsyncIterator[intent.ListIntentsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[intent.Intent]: + def __aiter__(self) -> AsyncIterator[intent.Intent]: async def async_generator(): async for page in self.pages: for response in page.intents: diff --git a/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py b/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py index 63661986c..e14b74782 100644 --- a/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import knowledge_base @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[knowledge_base.ListKnowledgeBasesResponse]: + def pages(self) -> Iterator[knowledge_base.ListKnowledgeBasesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[knowledge_base.KnowledgeBase]: + def __iter__(self) -> Iterator[knowledge_base.KnowledgeBase]: for page in self.pages: yield from page.knowledge_bases @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[knowledge_base.ListKnowledgeBasesResponse]: + async def pages(self) -> AsyncIterator[knowledge_base.ListKnowledgeBasesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[knowledge_base.KnowledgeBase]: + def __aiter__(self) -> AsyncIterator[knowledge_base.KnowledgeBase]: async def async_generator(): async for page in self.pages: for response in page.knowledge_bases: diff --git a/google/cloud/dialogflow_v2beta1/services/participants/pagers.py b/google/cloud/dialogflow_v2beta1/services/participants/pagers.py index d830b5dc1..1bb2d78e6 100644 --- a/google/cloud/dialogflow_v2beta1/services/participants/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/participants/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import participant @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[participant.ListParticipantsResponse]: + def pages(self) -> Iterator[participant.ListParticipantsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[participant.Participant]: + def __iter__(self) -> Iterator[participant.Participant]: for page in self.pages: yield from page.participants @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[participant.ListParticipantsResponse]: + async def pages(self) -> AsyncIterator[participant.ListParticipantsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[participant.Participant]: + def __aiter__(self) -> AsyncIterator[participant.Participant]: async def async_generator(): async for page in self.pages: for response in page.participants: @@ -202,14 +202,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[participant.ListSuggestionsResponse]: + def pages(self) -> Iterator[participant.ListSuggestionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[participant.Suggestion]: + def __iter__(self) -> Iterator[participant.Suggestion]: for page in self.pages: yield from page.suggestions @@ -264,14 +264,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[participant.ListSuggestionsResponse]: + async def pages(self) -> AsyncIterator[participant.ListSuggestionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[participant.Suggestion]: + def __aiter__(self) -> AsyncIterator[participant.Suggestion]: async def async_generator(): async for page in self.pages: for response in page.suggestions: diff --git a/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py b/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py index 5f010f5ef..42feb8011 100644 --- a/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import session_entity_type @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[session_entity_type.ListSessionEntityTypesResponse]: + def pages(self) -> Iterator[session_entity_type.ListSessionEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[session_entity_type.SessionEntityType]: + def __iter__(self) -> Iterator[session_entity_type.SessionEntityType]: for page in self.pages: yield from page.session_entity_types @@ -140,14 +140,14 @@ def __getattr__(self, name: str) -> Any: @property async def pages( self, - ) -> AsyncIterable[session_entity_type.ListSessionEntityTypesResponse]: + ) -> AsyncIterator[session_entity_type.ListSessionEntityTypesResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[session_entity_type.SessionEntityType]: + def __aiter__(self) -> AsyncIterator[session_entity_type.SessionEntityType]: async def async_generator(): async for page in self.pages: for response in page.session_entity_types: diff --git a/google/cloud/dialogflow_v2beta1/services/versions/pagers.py b/google/cloud/dialogflow_v2beta1/services/versions/pagers.py index fe16a182a..ba6de490a 100644 --- a/google/cloud/dialogflow_v2beta1/services/versions/pagers.py +++ b/google/cloud/dialogflow_v2beta1/services/versions/pagers.py @@ -15,13 +15,13 @@ # from typing import ( Any, - AsyncIterable, + AsyncIterator, Awaitable, Callable, - Iterable, Sequence, Tuple, Optional, + Iterator, ) from google.cloud.dialogflow_v2beta1.types import version @@ -74,14 +74,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - def pages(self) -> Iterable[version.ListVersionsResponse]: + def pages(self) -> Iterator[version.ListVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = self._method(self._request, metadata=self._metadata) yield self._response - def __iter__(self) -> Iterable[version.Version]: + def __iter__(self) -> Iterator[version.Version]: for page in self.pages: yield from page.versions @@ -136,14 +136,14 @@ def __getattr__(self, name: str) -> Any: return getattr(self._response, name) @property - async def pages(self) -> AsyncIterable[version.ListVersionsResponse]: + async def pages(self) -> AsyncIterator[version.ListVersionsResponse]: yield self._response while self._response.next_page_token: self._request.page_token = self._response.next_page_token self._response = await self._method(self._request, metadata=self._metadata) yield self._response - def __aiter__(self) -> AsyncIterable[version.Version]: + def __aiter__(self) -> AsyncIterator[version.Version]: async def async_generator(): async for page in self.pages: for response in page.versions: diff --git a/google/cloud/dialogflow_v2beta1/types/participant.py b/google/cloud/dialogflow_v2beta1/types/participant.py index df355b71c..0f3e087b5 100644 --- a/google/cloud/dialogflow_v2beta1/types/participant.py +++ b/google/cloud/dialogflow_v2beta1/types/participant.py @@ -1090,6 +1090,10 @@ class ResponseMessage(proto.Message): end_interaction (google.cloud.dialogflow_v2beta1.types.ResponseMessage.EndInteraction): A signal that indicates the interaction with the Dialogflow agent has ended. + telephony_transfer_call (google.cloud.dialogflow_v2beta1.types.ResponseMessage.TelephonyTransferCall): + A signal that the client should transfer the + phone call connected to this agent to a third- + party endpoint. """ class Text(proto.Message): @@ -1129,6 +1133,21 @@ class EndInteraction(proto.Message): ended. """ + class TelephonyTransferCall(proto.Message): + r"""Represents the signal that telles the client to transfer the + phone call connected to the agent to a third-party endpoint. + + Attributes: + phone_number (str): + Transfer the call to a phone number in `E.164 + format `__. + sip_uri (str): + Transfer the call to a SIP endpoint. + """ + + phone_number = proto.Field(proto.STRING, number=1, oneof="endpoint",) + sip_uri = proto.Field(proto.STRING, number=2, oneof="endpoint",) + text = proto.Field(proto.MESSAGE, number=1, oneof="message", message=Text,) payload = proto.Field( proto.MESSAGE, number=2, oneof="message", message=struct_pb2.Struct, @@ -1139,6 +1158,9 @@ class EndInteraction(proto.Message): end_interaction = proto.Field( proto.MESSAGE, number=4, oneof="message", message=EndInteraction, ) + telephony_transfer_call = proto.Field( + proto.MESSAGE, number=6, oneof="message", message=TelephonyTransferCall, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index b008613f0..1fd8956fb 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -98,6 +98,10 @@ def get_pytest_env_vars() -> Dict[str, str]: "True", "true", ) + +# Error if a python version is missing +nox.options.error_on_missing_interpreters = True + # # Style Checks # diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index d7301a752..43219141a 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1 +1,2 @@ -google-cloud-dialogflow==2.8.0 +google-cloud-dialogflow==2.8.1 +Flask==2.0.1 diff --git a/samples/snippets/webhook.py b/samples/snippets/webhook.py new file mode 100644 index 000000000..2a3b00be3 --- /dev/null +++ b/samples/snippets/webhook.py @@ -0,0 +1,37 @@ +# Copyright 2021, Google LLC +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# returns fullfillment response for dialogflow detect_intent call + +# [START dialogflow_webhook] +def handleWebhook(request): + + req = request.get_json() + + responseText = "" + intent = req["queryResult"]["intent"]["displayName"] + + if intent == "Default Welcome Intent": + responseText = "Hello from a GCF Webhook" + elif intent == "get-agent-name": + responseText = "My name is Flowhook" + else: + responseText = f"There are no fulfillment responses defined for Intent {intent}" + + # You can also use the google.cloud.dialogflowcx_v3.types.WebhookRequest protos instead of manually writing the json object + res = {"fulfillmentMessages": [{"text": {"text": [responseText]}}]} + + return res + + +# [END dialogflow_webhook] diff --git a/samples/snippets/webhook_test.py b/samples/snippets/webhook_test.py new file mode 100644 index 000000000..53ae97714 --- /dev/null +++ b/samples/snippets/webhook_test.py @@ -0,0 +1,27 @@ +import flask +import pytest + +from webhook import handleWebhook + +# Create a fake 'app' for generating test request contexts. + +request = { + "queryResult": { + "queryText": "hi", + "intent": { + "name": "projects/galstarter-316823/agent/intents/00c2877d-2440-447f-8dc1-045623a55bd4", + "displayName": "Default Welcome Intent", + }, + } +} + + +@pytest.fixture(scope="module") +def app(): + return flask.Flask(__name__) + + +def test_handleWebhook(app): + with app.test_request_context(json=request): + res = handleWebhook(flask.request) + assert "Hello from a GCF Webhook" in str(res) diff --git a/setup.py b/setup.py index 3d3e7a932..d028264e0 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ name = "dialogflow" description = "Client library for the Dialogflow API" -version = "2.8.1" +version = "2.9.0" release_status = "Development Status :: 5 - Production/Stable" dependencies = [ # NOTE: Maintainers, please do not require google-api-core>=2.x.x