whatsapp-python 3.3.5.dev0__py3-none-any.whl → 3.3.9b0__py3-none-any.whl

whatsapp/__init__.py

@@ -34,12 +34,10 @@ class WhatsApp(object):
         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")
@@ -48,7 +46,6 @@ class WhatsApp(object):
         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
 
@@ -305,11 +302,9 @@ class Message(object):
         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)}")
+            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"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()
@@ -335,14 +330,10 @@ class Message(object):
         
         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:
@@ -357,7 +348,6 @@ class Message(object):
             "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}")

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.3.5.dev0"
+VERSION = "3.3.9b"

whatsapp/ext/_message.py

@@ -104,7 +104,6 @@ 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",

whatsapp/ext/_send_media.py

@@ -2,7 +2,7 @@ import logging
 import requests
 
 
-def send_location(self, lat: str, long: str, name: str, address: str, recipient_id: str) -> dict:
+def send_location(self, lat: str, long: str, name: str, address: str, recipient_id: str, sender = None) -> dict:
     """
     Sends a location message to a WhatsApp user
 
@@ -18,6 +18,18 @@ def send_location(self, lat: str, long: str, name: str, address: str, recipient_
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_location("-23.564", "-46.654", "My Location", "Rua dois, 123", "5511999999999")
     """
+    try:
+        sender = dict(self.instance.l)[sender]
+        
+        
+
+    except:
+        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",
         "to": recipient_id,
@@ -30,7 +42,7 @@ def send_location(self, lat: str, long: str, name: str, address: str, recipient_
         },
     }
     logging.info(f"Sending location to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Location sent to {recipient_id}")
         return r.json()
@@ -47,6 +59,7 @@ def send_image(
     recipient_type: str = "individual",
     caption: str = "",
     link: bool = True,
+    sender = None
 ) -> dict:
     """
     Sends an image message to a WhatsApp user
@@ -67,6 +80,18 @@ def send_image(
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_image("https://i.imgur.com/Fh7XVYY.jpeg", "5511999999999")
     """
+    try:
+        sender = dict(self.l)[sender]
+        
+        
+
+    except:
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
     if link:
         data = {
             "messaging_product": "whatsapp",
@@ -84,7 +109,7 @@ def send_image(
             "image": {"id": image, "caption": caption},
         }
     logging.info(f"Sending image to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Image sent to {recipient_id}")
         return r.json()
@@ -94,7 +119,7 @@ def send_image(
     return r.json()
 
 
-def send_sticker(self, sticker: str, recipient_id: str, recipient_type: str = "individual", link: bool = True) -> dict:
+def send_sticker(self, sticker: str, recipient_id: str, recipient_type: str = "individual", link: bool = True, sender = None) -> dict:
     """
     Sends a sticker message to a WhatsApp user
 
@@ -113,6 +138,18 @@ def send_sticker(self, sticker: str, recipient_id: str, recipient_type: str = "i
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_sticker("170511049062862", "5511999999999", link=False)
     """
+    try:
+        sender = dict(self.l)[sender]
+        
+        
+
+    except:
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
     if link:
         data = {
             "messaging_product": "whatsapp",
@@ -130,7 +167,7 @@ def send_sticker(self, sticker: str, recipient_id: str, recipient_type: str = "i
             "sticker": {"id": sticker},
         }
     logging.info(f"Sending sticker to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Sticker sent to {recipient_id}")
         return r.json()
@@ -140,7 +177,7 @@ def send_sticker(self, sticker: str, recipient_id: str, recipient_type: str = "i
     return r.json()
 
 
-def send_audio(self, audio: str, recipient_id: str, link: bool = True) -> dict:
+def send_audio(self, audio: str, recipient_id: str, link: bool = True, sender = None) -> dict:
     """
     Sends an audio message to a WhatsApp user
     Audio messages can either be sent by passing the audio id or by passing the audio link.
@@ -155,6 +192,18 @@ def send_audio(self, audio: str, recipient_id: str, link: bool = True) -> dict:
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_audio("https://www.soundhelix.com/examples/mp3/SoundHelix-Song-1.mp3", "5511999999999")
     """
+    try:
+        sender = dict(self.l)[sender]
+        
+        
+
+    except:
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
     if link:
         data = {
             "messaging_product": "whatsapp",
@@ -170,7 +219,7 @@ def send_audio(self, audio: str, recipient_id: str, link: bool = True) -> dict:
             "audio": {"id": audio},
         }
     logging.info(f"Sending audio to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Audio sent to {recipient_id}")
         return r.json()
@@ -181,7 +230,7 @@ def send_audio(self, audio: str, recipient_id: str, link: bool = True) -> dict:
 
 
 def send_video(
-    self, video: str, recipient_id: str, caption: str = "", link: bool = True
+    self, video: str, recipient_id: str, caption: str = "", link: bool = True, sender = None
 ) -> dict:
     """ "
     Sends a video message to a WhatsApp user
@@ -198,6 +247,18 @@ def send_video(
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_video("https://www.youtube.com/watch?v=dQw4w9WgXcQ", "5511999999999")
     """
+    try:
+        sender = dict(self.l)[sender]
+        
+        
+
+    except:
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
     if link:
         data = {
             "messaging_product": "whatsapp",
@@ -213,7 +274,7 @@ def send_video(
             "video": {"id": video, "caption": caption},
         }
     logging.info(f"Sending video to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Video sent to {recipient_id}")
         return r.json()
@@ -241,6 +302,18 @@ def send_document(
         >>> whatsapp = WhatsApp(token, phone_number_id)
         >>> whatsapp.send_document("https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf", "5511999999999")
     """
+    try:
+        sender = dict(self.l)[sender]
+        
+        
+
+    except:
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
     if link:
         data = {
             "messaging_product": "whatsapp",
@@ -257,7 +330,7 @@ def send_document(
         }
 
     logging.info(f"Sending document to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Document sent to {recipient_id}")
         return r.json()

whatsapp/ext/_send_others.py

@@ -3,7 +3,7 @@ import requests
 import logging
 
 
-def send_custom_json(self, data: dict, recipient_id: str = ""):
+def send_custom_json(self, data: dict, recipient_id: str = "", sender=None):
     """
     Sends a custom json to a WhatsApp user. This can be used to send custom objects to the message endpoint.
 
@@ -18,17 +18,28 @@ def send_custom_json(self, data: dict, recipient_id: str = ""):
                 "type": "audio",
                 "audio": {"id": audio}}, "5511999999999")
     """
+    try:
+        sender = dict(self.l)[sender]
+
+    except:
+        sender = self.phone_number_id
+
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
 
     if recipient_id:
         if "to" in data.keys():
             data_recipient_id = data["to"]
             logging.info(
-                f"Recipient Id is defined in data ({data_recipient_id}) and recipient_id parameter ({recipient_id})")
+                f"Recipient Id is defined in data ({data_recipient_id}) and recipient_id parameter ({recipient_id})"
+            )
         else:
             data["to"] = recipient_id
 
     logging.info(f"Sending custom json to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Custom json sent to {recipient_id}")
         return r.json()
@@ -39,7 +50,7 @@ def send_custom_json(self, data: dict, recipient_id: str = ""):
 
 
 def send_contacts(
-    self, contacts: List[Dict[Any, Any]], recipient_id: str
+    self, contacts: List[Dict[Any, Any]], recipient_id: str, sender=None
 ) -> Dict[Any, Any]:
     """send_contacts
 
@@ -68,6 +79,16 @@ def send_contacts(
 
     REFERENCE: https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#contacts-object
     """
+    try:
+        sender = dict(self.l)[sender]
+
+    except:
+        sender = self.phone_number_id
+
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
 
     data = {
         "messaging_product": "whatsapp",
@@ -76,7 +97,7 @@ def send_contacts(
         "contacts": contacts,
     }
     logging.info(f"Sending contacts to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
+    r = requests.post(url, headers=self.headers, json=data)
     if r.status_code == 200:
         logging.info(f"Contacts sent to {recipient_id}")
         return r.json()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: whatsapp-python
-Version: 3.3.5.dev0
+Version: 3.3.9b0
 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
@@ -107,7 +107,7 @@ Whereas using third-party providers of the WhatsApp API can result in monthly fe
 All the prices are available in the [**WhatsApp API docs**](https://developers.facebook.com/docs/whatsapp/pricing).
 
 > [!TIP]  
-> One recommendation I can give you is to use a test number (you can get a free phone number and use it for testing purposes only).
+> I recomend to use a test number, as you you can get a free one and use it for testing purposes.
 
 ## Migrating from `Neurotech-HQ/heyoo`
 

whatsapp_python-3.3.9b0.dist-info/RECORD

@@ -0,0 +1,13 @@
+whatsapp/__init__.py,sha256=wTwyUgvhE9Pjweo7gTY_LV5-p6mcqNl3VBLYeqH_pz4,14284
+whatsapp/constants.py,sha256=1Vg2VGdkCT6XJDRTrxzst_9U_KR_x7ZPUw75rwyWv-w,226
+whatsapp/ext/_buttons.py,sha256=whj0v4Qgow9AWaWztZxUxaHB8o0MnqA8uRjHHsDht6c,2836
+whatsapp/ext/_media.py,sha256=SAawDZ_5ctneC9kLmtxkjmQyI4sbnQkSuKWs9mcYQUM,4377
+whatsapp/ext/_message.py,sha256=ProE9GbqtsLic0WjKXU-F2NPxtRs3Z0VACzghol6yF8,4385
+whatsapp/ext/_property.py,sha256=-btASb_1B4t69TRGAm21lgnjgb5yemZteW7Bmmouooc,123
+whatsapp/ext/_send_media.py,sha256=DER4i5sCALVJFjfhyP-KOoVomt7d6U_pbun2Sk4pJr8,11350
+whatsapp/ext/_send_others.py,sha256=_h79gcj4iWN1q73PBHOZvZ64Ih1fGz4yznGoSY3cqj0,3327
+whatsapp/ext/_static.py,sha256=NghY748DarWcpHZ6Xa7DtuVpYnHv3udEgZL5E1YdL4M,9853
+whatsapp_python-3.3.9b0.dist-info/METADATA,sha256=MQlEvZFgsXLVmnbUJ3IAtsWjlRYh137WEKnLC4SMoPo,6321
+whatsapp_python-3.3.9b0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+whatsapp_python-3.3.9b0.dist-info/licenses/LICENSE,sha256=Lcl62br0APneFzEOsYHEVs0hThCIA8eEauvxuLGd1cs,1076
+whatsapp_python-3.3.9b0.dist-info/RECORD,,

whatsapp_python-3.3.5.dev0.dist-info/RECORD

@@ -1,13 +0,0 @@
-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,,