whatsapp-chatbot-python 0.9.3__tar.gz → 0.9.5__tar.gz

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatsapp-chatbot-python
-Version: 0.9.3
+Version: 0.9.5
 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
@@ -72,7 +72,7 @@ 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/).
+Before launching the bot, you should remove Webhook Url (if set) from Personal Cabinet or by setting empty webhookUrl by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/). These settings will be enabled by bot automatically:
 
 
 ```json

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/README.md

@@ -38,7 +38,7 @@ 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/).
+Before launching the bot, you should remove Webhook Url (if set) from Personal Cabinet or by setting empty webhookUrl by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/). These settings will be enabled by bot automatically:
 
 
 ```json

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="UTF-8") as file:
 
 setup(
     name="whatsapp-chatbot-python",
-    version="0.9.3",
+    version="0.9.5",
     description=(
         "This library helps you easily create"
         " a Python chatbot with WhatsApp API."

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/whatsapp_chatbot_python/manager/handler.py

@@ -53,16 +53,33 @@ class Notification:
             return self.event["senderData"]["sender"]
 
     def get_message_text(self) -> Optional[str]:
-        message_data = self.event["messageData"]
-
-        type_message = message_data["typeMessage"]
-        if type_message == "textMessage":
-            return message_data["textMessageData"]["textMessage"]
-        elif (
-                type_message == "extendedTextMessage"
-                or type_message == "quotedMessage"
-        ):
-            return message_data["extendedTextMessageData"]["text"]
+        type_webhook = self.event["typeWebhook"]
+        if type_webhook != "outgoingMessageStatus":
+            message_data = self.event["messageData"]
+
+            type_message = message_data["typeMessage"]
+            if type_message == "textMessage":
+                return message_data["textMessageData"]["textMessage"]
+            elif (
+                    type_message == "extendedTextMessage"
+                    or type_message == "quotedMessage"
+            ):
+                return message_data["extendedTextMessageData"]["text"]
+
+    def get_id_message(self) -> Optional[str]:
+        id_message = self.event['idMessage']
+        return id_message
+
+    def get_status_message(self) -> Optional[str]:
+        type_webhook = self.event["typeWebhook"]
+        if type_webhook == "outgoingMessageStatus":
+            return self.event["status"]
+
+    def get_message_data(self) -> Optional[str]:
+        type_webhook = self.event["typeWebhook"]
+        if type_webhook != "outgoingMessageStatus":
+            message_data = self.event["messageData"]
+            return message_data
 
     def answer(
             self,

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/whatsapp_chatbot_python/manager/router.py

@@ -23,6 +23,7 @@ class Router:
         self.outgoing_message: AbstractObserver = Observer(self)
         self.outgoing_api_message: AbstractObserver = Observer(self)
         self.outgoing_message_status: AbstractObserver = Observer(self)
+        self.incoming_call: AbstractObserver = Observer(self)
 
         self.buttons: AbstractObserver = ButtonObserver(self)
 
@@ -33,7 +34,8 @@ class Router:
             "incomingMessageReceived": self.message,
             "outgoingMessageReceived": self.outgoing_message,
             "outgoingAPIMessageReceived": self.outgoing_api_message,
-            "outgoingMessageStatus": self.outgoing_message_status
+            "outgoingMessageStatus": self.outgoing_message_status,
+            "incomingCall": self.incoming_call
         }
 
     def route_event(self, event: dict) -> None:
@@ -42,7 +44,7 @@ class Router:
         observer = self.observers.get(type_webhook)
         if observer:
             data = json.dumps(event, ensure_ascii=False, indent=4)
-
+         
             self.logger.log(
                 logging.DEBUG, (
                     f"Routing {type_webhook} event with data: {data}"

{whatsapp_chatbot_python-0.9.3 → whatsapp_chatbot_python-0.9.5}/whatsapp_chatbot_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatsapp-chatbot-python
-Version: 0.9.3
+Version: 0.9.5
 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
@@ -72,7 +72,7 @@ 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/).
+Before launching the bot, you should remove Webhook Url (if set) from Personal Cabinet or by setting empty webhookUrl by using [SetSettings method](https://green-api.com/en/docs/api/account/SetSettings/). These settings will be enabled by bot automatically:
 
 
 ```json