whatsapp-python 3.2.5__py3-none-any.whl → 3.3.5.dev0__py3-none-any.whl

whatsapp/__init__.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 import requests
 import logging
+from typing import Union
 from fastapi import FastAPI, HTTPException, Request
 from uvicorn import run as _run
 from .constants import VERSION
@@ -19,7 +20,7 @@ import json
 
 
 class WhatsApp(object):
-    def __init__(self, token: str = "", phone_number_id: str = "", logger: bool = True, update_check: bool = True, verify_token: str = "", debug: bool = True):
+    def __init__(self, token: str = "", phone_number_id: Union[str, dict] = "", logger: bool = True, update_check: bool = True, verify_token: str = "", debug: bool = True):
         """
         Initialize the WhatsApp Object
 
@@ -32,6 +33,25 @@ class WhatsApp(object):
         # Check if the version is up to date
         logging.getLogger(__name__).addHandler(logging.NullHandler())
 
+        self.l = phone_number_id
+        print(self.l)
+
+        if isinstance(phone_number_id, dict):
+            # use first phone number id as default
+            phone_number_id = phone_number_id[list(phone_number_id.keys())[0]]
+            print(phone_number_id)
+
+        elif phone_number_id == "":
+            logging.error("Phone number ID not provided")
+            raise ValueError(
+                "Phone number ID not provided but required")
+        elif isinstance(phone_number_id, str):
+            logging.critical(
+                "The phone number ID should be a dictionary of phone numbers and their IDs. Using strings is deprecated and will be removed in the next version.")
+            print(phone_number_id)
+        else:
+            pass
+
         self.VERSION = VERSION
         if update_check is True:
             latest = str(requests.get(
@@ -206,10 +226,12 @@ class WhatsApp(object):
 
 
 class Message(object):
-    def __init__(self, id: int = None, data: dict = {}, instance: WhatsApp = None, content: str = "", to: str = "", rec_type: str = "individual"):  # type: ignore
+    # type: ignore
+    def __init__(self, id: int = None, data: dict = {}, instance: WhatsApp = None, content: str = "", to: str = "", rec_type: str = "individual"):
         self.instance = instance
         self.url = self.instance.url
         self.headers = self.instance.headers
+        
 
         try:
             self.id = instance.get_message_id(data)
@@ -227,10 +249,6 @@ class Message(object):
                 data)
         except:
             self.content = content
-        try:
-            self.sender = self.instance.get_mobile(data)
-        except:
-            self.sender = None
         try:
             self.name = self.instance.get_name(data)
         except:
@@ -272,4 +290,97 @@ class Message(object):
             except:
                 pass
 
-    from .ext._message import send, reply, mark_as_read, react
+    def reply(self, reply_text: str = "", preview_url: bool = True) -> dict:
+        if self.data == {}:
+            return {"error": "No data provided"}
+        author = self.instance.get_author(self.data)
+        payload = {
+            "messaging_product": "whatsapp",
+            "recipient_type": "individual",
+            "to": str(author),
+            "type": "text",
+            "context": {"message_id": self.id},
+            "text": {"preview_url": preview_url, "body": reply_text},
+        }
+        logging.info(f"Replying to {self.id}")
+        r = requests.post(self.url, headers=self.headers, json=payload)
+        if r.status_code == 200:
+            logging.info(f"Message sent to {
+                         self.instance.get_author(self.data)}")
+            return r.json()
+        logging.info(f"Message not sent to {
+                     self.instance.get_author(self.data)}")
+        logging.info(f"Status code: {r.status_code}")
+        logging.error(f"Response: {r.json()}")
+        return r.json()
+
+    def mark_as_read(self) -> dict:
+        
+        payload = {
+            "messaging_product": "whatsapp",
+            "status": "read",
+            "message_id": self.id,
+        }
+
+        response = requests.post(
+            f"{self.instance.url}", headers=self.instance.headers, json=payload)
+        if response.status_code == 200:
+            logging.info(response.json())
+            return response.json()
+        else:
+            logging.error(response.json())
+            return response.json()
+
+    def send(self,sender = None, preview_url: bool = True) -> dict:
+        
+        try:
+            sender = dict(self.instance.l)[sender]
+            print(self.instance.l)
+            print(sender)
+            
+            
+            print(12)
+
+        except:
+            print(22)
+            sender = self.instance.phone_number_id
+            
+        if sender == None:
+            sender = self.instance.phone_number_id
+
+        url = f"https://graph.facebook.com/v18.0/{sender}/messages"
+        data = {
+            "messaging_product": "whatsapp",
+            "recipient_type": self.rec,
+            "to": self.to,
+            "type": "text",
+            "text": {"preview_url": preview_url, "body": self.content},
+        }
+        logging.info(f"Sending message to {self.to}")
+        print(url)
+        r = requests.post(url, headers=self.headers, json=data)
+        if r.status_code == 200:
+            logging.info(f"Message sent to {self.to}")
+            return r.json()
+        logging.info(f"Message not sent to {self.to}")
+        logging.info(f"Status code: {r.status_code}")
+        logging.error(f"Response: {r.json()}")
+        return r.json()
+
+    def react(self, emoji: str) -> dict:
+        data = {
+            "messaging_product": "whatsapp",
+            "recipient_type": "individual",
+            "to": self.to,
+            "type": "reaction",
+            "reaction": {"message_id": self.id, "emoji": emoji},
+        }
+        logging.info(f"Reacting to {self.id}")
+        r = requests.post(self.url, headers=self.headers, json=data)
+        if r.status_code == 200:
+            logging.info(f"Reaction sent to {self.to}")
+            return r.json()
+        logging.info(f"Reaction not sent to {self.to}")
+        logging.info(f"Status code: {r.status_code}")
+        logging.debug(f"Response: {r.json()}")
+        return r.json()

whatsapp/constants.py

@@ -1,4 +1,4 @@
 # This file contains the constants used in the project.
 # The VERSION constant is used to store the version of the project - it's not only used in the __init__.py file, but also in the pyproject.toml file.
 
-VERSION = "3.2.5"
+VERSION = "3.3.5.dev0"

whatsapp/ext/_message.py

@@ -104,6 +104,8 @@ def mark_as_read(self) -> dict:
 
 
 def send(self, preview_url: bool = True) -> dict:
+    print(self.sender)
+    url = f"https://graph.facebook.com/v18.0/{self.sender}/messages"
     data = {
         "messaging_product": "whatsapp",
         "recipient_type": self.rec,
@@ -112,7 +114,7 @@ def send(self, preview_url: bool = True) -> dict:
         "text": {"preview_url": preview_url, "body": self.content},
     }
     logging.info(f"Sending message to {self.to}")
-    r = requests.post(f"{self.url}", headers=self.headers, json=data)
+    r = requests.post(f"{url}", headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Message sent to {self.to}")
         return r.json()

{whatsapp_python-3.2.5.dist-info → whatsapp_python-3.3.5.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: whatsapp-python
-Version: 3.2.5
+Version: 3.3.5.dev0
 Summary: Open source Python wrapper for the WhatsApp Cloud API
 Project-URL: Homepage, https://github.com/filipporomani/whatsapp-python
 Project-URL: Docs, https://github.com/filipporomani/whatsapp-python/wiki
@@ -81,6 +81,7 @@ I fixed some bugs and added many features, however the library still needs a lot
 
 - Listening to events (messages, media, etc.)
 - Sending messages
+- Sending messages from different numbers individually
 - Marking messages as read
 - Reacting to messages
 - Sending Media (images, audio, video and documents)

whatsapp_python-3.3.5.dev0.dist-info/RECORD

@@ -0,0 +1,13 @@
+whatsapp/__init__.py,sha256=7G9OXsmH3tIXlUPw5tRvvo9RymKaNdAa0mImS_iD3ys,14548
+whatsapp/constants.py,sha256=LC4qzGNpp1zEedl6VVfWej-2mD6CDYshqSLtaIYL_VI,230
+whatsapp/ext/_buttons.py,sha256=whj0v4Qgow9AWaWztZxUxaHB8o0MnqA8uRjHHsDht6c,2836
+whatsapp/ext/_media.py,sha256=SAawDZ_5ctneC9kLmtxkjmQyI4sbnQkSuKWs9mcYQUM,4377
+whatsapp/ext/_message.py,sha256=pCtE0DsEwd6mTku4wT89SH09mvMi331V_s8R4n4AS4k,4408
+whatsapp/ext/_property.py,sha256=-btASb_1B4t69TRGAm21lgnjgb5yemZteW7Bmmouooc,123
+whatsapp/ext/_send_media.py,sha256=CpvAdFUOh65G628NULqauy4lEM-xmks6-6irsdy31Yc,9769
+whatsapp/ext/_send_others.py,sha256=A6554k98ftStmUu_Wo0wls-2zWuB8ZujaqQoEEgtbZs,2848
+whatsapp/ext/_static.py,sha256=NghY748DarWcpHZ6Xa7DtuVpYnHv3udEgZL5E1YdL4M,9853
+whatsapp_python-3.3.5.dev0.dist-info/METADATA,sha256=gGotqHv5UZYGWEOv_9CIplBhyQWaVbXGxWbo2Rj21-M,6358
+whatsapp_python-3.3.5.dev0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+whatsapp_python-3.3.5.dev0.dist-info/licenses/LICENSE,sha256=Lcl62br0APneFzEOsYHEVs0hThCIA8eEauvxuLGd1cs,1076
+whatsapp_python-3.3.5.dev0.dist-info/RECORD,,

whatsapp_python-3.2.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-whatsapp/__init__.py,sha256=GJlJBuBmtMN7R8THoRGGYAVgvwJHKHF2sxoF01GgNt8,10516
-whatsapp/constants.py,sha256=46gfu0Ww1ZG0lipwh3o8HTNCSze4Dmu87mJ8Gk0DdI8,225
-whatsapp/ext/_buttons.py,sha256=whj0v4Qgow9AWaWztZxUxaHB8o0MnqA8uRjHHsDht6c,2836
-whatsapp/ext/_media.py,sha256=SAawDZ_5ctneC9kLmtxkjmQyI4sbnQkSuKWs9mcYQUM,4377
-whatsapp/ext/_message.py,sha256=vvI7leCqZSX-RGuiJ3CFpifCPniPo_GK5eRgCwUSD1s,4321
-whatsapp/ext/_property.py,sha256=-btASb_1B4t69TRGAm21lgnjgb5yemZteW7Bmmouooc,123
-whatsapp/ext/_send_media.py,sha256=CpvAdFUOh65G628NULqauy4lEM-xmks6-6irsdy31Yc,9769
-whatsapp/ext/_send_others.py,sha256=A6554k98ftStmUu_Wo0wls-2zWuB8ZujaqQoEEgtbZs,2848
-whatsapp/ext/_static.py,sha256=NghY748DarWcpHZ6Xa7DtuVpYnHv3udEgZL5E1YdL4M,9853
-whatsapp_python-3.2.5.dist-info/METADATA,sha256=dpdwNvJ8WmCmwQrhqlGt4eq6cNJW5ozxBCCbnfAauCo,6298
-whatsapp_python-3.2.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-whatsapp_python-3.2.5.dist-info/licenses/LICENSE,sha256=Lcl62br0APneFzEOsYHEVs0hThCIA8eEauvxuLGd1cs,1076
-whatsapp_python-3.2.5.dist-info/RECORD,,