whatsapp-chatbot-python 0.8.0__tar.gz → 0.9.1__tar.gz

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatsapp-chatbot-python
-Version: 0.8.0
+Version: 0.9.1
 Summary: This library helps you easily create a Python chatbot with WhatsApp API.
 Home-page: https://github.com/green-api/whatsapp-chatbot-python
 Author: GREEN API
@@ -30,7 +30,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: whatsapp-api-client-python==0.0.44
+Requires-Dist: whatsapp-api-client-python==0.0.45
 
 # whatsapp-chatbot-python
 
@@ -70,6 +70,19 @@ python -m pip install whatsapp-chatbot-python
 from whatsapp_chatbot_python import GreenAPIBot, Notification
 ```
 
+## Setup
+
+Before launching the bot, you should enable incoming notifications in instance settings by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/).
+
+
+```json
+{
+  "incomingWebhook": "yes",
+  "outgoingMessageWebhook": "yes",
+  "outgoingAPIMessageWebhook": "yes"
+}
+```
+
 ## Examples
 
 ### How to initialize an object

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/README.md

@@ -36,6 +36,19 @@ python -m pip install whatsapp-chatbot-python
 from whatsapp_chatbot_python import GreenAPIBot, Notification
 ```
 
+## Setup
+
+Before launching the bot, you should enable incoming notifications in instance settings by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/).
+
+
+```json
+{
+  "incomingWebhook": "yes",
+  "outgoingMessageWebhook": "yes",
+  "outgoingAPIMessageWebhook": "yes"
+}
+```
+
 ## Examples
 
 ### How to initialize an object

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="UTF-8") as file:
 
 setup(
     name="whatsapp-chatbot-python",
-    version="0.8.0",
+    version="0.9.1",
     description=(
         "This library helps you easily create"
         " a Python chatbot with WhatsApp API."
@@ -43,6 +43,6 @@ setup(
         "Creative Commons Attribution-NoDerivatives 4.0 International"
         " (CC BY-ND 4.0)"
     ),
-    install_requires=["whatsapp-api-client-python==0.0.44"],
+    install_requires=["whatsapp-api-client-python==0.0.45"],
     python_requires=">=3.7"
 )

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/__init__.py

@@ -1,4 +1,4 @@
-from .bot import Bot, GreenAPI, GreenAPIBot, GreenAPIError
+from .bot import Bot, GreenAPI, GreenAPIBot, GreenAPIError, GreenAPIBotError
 from .manager.handler import Notification
 from .manager.state import BaseStates
 
@@ -7,6 +7,7 @@ __all__ = [
     "GreenAPI",
     "GreenAPIBot",
     "GreenAPIError",
+    "GreenAPIBotError",
     "Notification",
     "BaseStates"
 ]

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/bot.py

@@ -1,4 +1,5 @@
 import logging
+import time
 from typing import NoReturn, Optional
 
 from whatsapp_api_client_python.API import GreenAPI, GreenAPIError
@@ -12,7 +13,7 @@ class Bot:
             id_instance: str,
             api_token_instance: str,
             debug_mode: bool = False,
-            raise_errors: bool = True,
+            raise_errors: bool = False,
             host: Optional[str] = None,
             media: Optional[str] = None,
             bot_debug_mode: bool = False,
@@ -78,6 +79,14 @@ class Bot:
                 self.api.receiving.deleteNotification(response["receiptId"])
             except KeyboardInterrupt:
                 break
+            except Exception as error:
+                if self.raise_errors:
+                    raise GreenAPIBotError(error)
+                self.logger.log(logging.ERROR, error)
+
+                time.sleep(5.0)
+
+                continue
 
         self.api.session.headers["Connection"] = "close"
 
@@ -158,4 +167,14 @@ class GreenAPIBot(Bot):
     pass
 
 
-__all__ = ["Bot", "GreenAPI", "GreenAPIBot", "GreenAPIError"]
+class GreenAPIBotError(Exception):
+    pass
+
+
+__all__ = [
+    "Bot",
+    "GreenAPI",
+    "GreenAPIBot",
+    "GreenAPIError",
+    "GreenAPIBotError"
+]

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/filters.py

@@ -5,6 +5,8 @@ from typing import Dict, List, Optional, TYPE_CHECKING, Type, Union
 if TYPE_CHECKING:
     from .manager.handler import Notification
 
+TEXT_TYPES = ["textMessage", "extendedTextMessage", "quotedMessage"]
+
 
 class AbstractFilter(ABC):
     @abstractmethod
@@ -132,6 +134,22 @@ class StateFilter(AbstractFilter):
         return False
 
 
+class StanzaFilter(AbstractFilter):
+    def __init__(self, stanza: Optional[str]):
+        self.stanza = stanza
+
+    def check_event(self, notification: "Notification") -> bool:
+        message_data = notification.event["messageData"]
+
+        type_message = message_data["typeMessage"]
+        if type_message == "pollUpdateMessage":
+            stanza = message_data["pollMessageData"]["stanzaId"]
+            if stanza == self.stanza:
+                return True
+
+        return False
+
+
 filters: Dict[str, Type[AbstractFilter]] = {
     "from_chat": ChatIDFilter,
     "from_sender": SenderFilter,
@@ -139,12 +157,13 @@ filters: Dict[str, Type[AbstractFilter]] = {
     "text_message": TextMessageFilter,
     "regexp": RegExpFilter,
     "command": CommandFilter,
-    "state": StateFilter
+    "state": StateFilter,
+    "stanza": StanzaFilter
 }
 
-TEXT_TYPES = ["textMessage", "extendedTextMessage", "quotedMessage"]
-
 __all__ = [
+    "TEXT_TYPES",
+
     "AbstractFilter",
     "ChatIDFilter",
     "SenderFilter",
@@ -153,6 +172,7 @@ __all__ = [
     "RegExpFilter",
     "CommandFilter",
     "StateFilter",
-    "filters",
-    "TEXT_TYPES"
+    "StanzaFilter",
+
+    "filters"
 ]

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/manager/handler.py

@@ -104,6 +104,19 @@ class Notification:
                 chat, file, file_name, caption, quoted_message_id
             )
 
+    def answer_with_poll(
+            self,
+            message: str,
+            options: List[Dict[str, str]],
+            multiple_answers: Optional[bool] = None,
+            quoted_message_id: Optional[str] = None
+    ) -> Optional[Response]:
+        chat = self.get_chat()
+        if chat:
+            return self.api.sending.sendPoll(
+                chat, message, options, multiple_answers, quoted_message_id
+            )
+
 
 HandlerType = Callable[[Notification], Any]
 

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/manager/observer.py

@@ -89,4 +89,34 @@ class ButtonObserver(Observer):
         self.router.message.add_handler(handler, **filters)
 
 
-__all__ = ["AbstractObserver", "ButtonObserver", "Observer"]
+class PollObserver(Observer):
+    def add_handler(self, handler: HandlerType, **filters: Any) -> None:
+        filters["type_message"] = "pollMessage"
+
+        self.router.message.add_handler(handler, **filters)
+
+
+class PollUpdateObserver(Observer):
+    def add_handler(self, handler: HandlerType, **filters: Any) -> None:
+        filters["type_message"] = "pollUpdateMessage"
+
+        self.router.message.add_handler(handler, **filters)
+
+    def add_handler_with_stanza(
+            self, handler: HandlerType, stanza: str, **filters: Any
+    ) -> None:
+        filters.update({
+            "stanza": stanza,
+            "type_message": "pollUpdateMessage"
+        })
+
+        self.router.message.add_handler(handler, **filters)
+
+
+__all__ = [
+    "AbstractObserver",
+    "ButtonObserver",
+    "Observer",
+    "PollObserver",
+    "PollUpdateObserver"
+]

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python/manager/router.py

@@ -2,7 +2,13 @@ import json
 import logging
 from typing import Dict, TYPE_CHECKING
 
-from .observer import AbstractObserver, ButtonObserver, Observer
+from .observer import (
+    AbstractObserver,
+    ButtonObserver,
+    Observer,
+    PollObserver,
+    PollUpdateObserver
+)
 
 if TYPE_CHECKING:
     from ..bot import GreenAPI
@@ -20,6 +26,9 @@ class Router:
 
         self.buttons: AbstractObserver = ButtonObserver(self)
 
+        self.poll_message: PollObserver = PollObserver(self)
+        self.poll_update_message: PollUpdateObserver = PollUpdateObserver(self)
+
         self.observers: Dict[str, AbstractObserver] = {
             "incomingMessageReceived": self.message,
             "outgoingMessageReceived": self.outgoing_message,

{whatsapp-chatbot-python-0.8.0 → whatsapp-chatbot-python-0.9.1}/whatsapp_chatbot_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatsapp-chatbot-python
-Version: 0.8.0
+Version: 0.9.1
 Summary: This library helps you easily create a Python chatbot with WhatsApp API.
 Home-page: https://github.com/green-api/whatsapp-chatbot-python
 Author: GREEN API
@@ -30,7 +30,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: whatsapp-api-client-python==0.0.44
+Requires-Dist: whatsapp-api-client-python==0.0.45
 
 # whatsapp-chatbot-python
 
@@ -70,6 +70,19 @@ python -m pip install whatsapp-chatbot-python
 from whatsapp_chatbot_python import GreenAPIBot, Notification
 ```
 
+## Setup
+
+Before launching the bot, you should enable incoming notifications in instance settings by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/).
+
+
+```json
+{
+  "incomingWebhook": "yes",
+  "outgoingMessageWebhook": "yes",
+  "outgoingAPIMessageWebhook": "yes"
+}
+```
+
 ## Examples
 
 ### How to initialize an object

whatsapp-chatbot-python-0.9.1/whatsapp_chatbot_python.egg-info/requires.txt

@@ -0,0 +1 @@
+whatsapp-api-client-python==0.0.45

whatsapp-chatbot-python-0.8.0/whatsapp_chatbot_python.egg-info/requires.txt

@@ -1 +0,0 @@
-whatsapp-api-client-python==0.0.44