whatsapp-python 3.0.4__tar.gz → 3.0.6__tar.gz

whatsapp_python-3.0.6/.version

@@ -0,0 +1 @@
+3.0.6

{whatsapp_python-3.0.4 → whatsapp_python-3.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatsapp-python
-Version: 3.0.4
+Version: 3.0.6
 Summary: Open source Python wrapper for the WhatsApp Cloud API
 Project-URL: Homepage, https://github.com/filipporomani/whatsapp
 Project-URL: Bug Tracker, https://github.com/filipporomani/whatsapp/issues

{whatsapp_python-3.0.4 → whatsapp_python-3.0.6}/SECURITY.md

@@ -9,5 +9,6 @@
 
 ## Reporting a Vulnerability
 
-Please report any vulnerability at Filippo Romani via e-mail: mail@filipporomani.it.
+Please report any vulnerability via e-mail: mail@filipporomani.it.
 I'll review vulnerabilities as soon as possible, with maximum prioirity. 
+If you find any security issue that is not crucial, feel free to open an issue for it.

{whatsapp_python-3.0.4 → whatsapp_python-3.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name="whatsapp-python"
-version="3.0.4"
+version="3.0.6"
 authors = [{name="Filippo Romani", email="mail@filipporomani.it"}]
 description="Open source Python wrapper for the WhatsApp Cloud API"
 readme = "README.md"
@@ -25,4 +25,7 @@ classifiers=[
 [project.urls]
 "Homepage" = "https://github.com/filipporomani/whatsapp"
 "Bug Tracker" = "https://github.com/filipporomani/whatsapp/issues"
-"Download" = "https://github.com/filipporomani/whatsapp/releases/latest"
+"Download" = "https://github.com/filipporomani/whatsapp/releases/latest"
+
+[tool.hatch.build.targets.wheel]
+packages = ["whatsapp"]

{whatsapp_python-3.0.4 → whatsapp_python-3.0.6}/whatsapp/__init__.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 import requests
 import logging
 from fastapi import FastAPI, Request
+from uvicorn import run as _run
 from .constants import VERSION
 from . import ext
 from .ext._property import authorized
@@ -17,8 +18,6 @@ from .ext._buttons import send_button, create_button, send_reply_button
 from .ext._static import is_message, get_mobile, get_author, get_name, get_message, get_message_id, get_message_type, get_message_timestamp, get_audio, get_delivery, get_document, get_image, get_interactive_response, get_location, get_video, changed_field
 
 
-
-
 class WhatsApp(object):
     def __init__(self, token: str = "", phone_number_id: str = "", logger: bool = True, update_check: bool = True):
         """
@@ -32,19 +31,25 @@ class WhatsApp(object):
 
         # Check if the version is up to date
         logging.getLogger(__name__).addHandler(logging.NullHandler())
-        
 
         self.VERSION = VERSION
         if update_check is True:
             latest = str(requests.get(
                 "https://pypi.org/pypi/whatsapp-python/json").json()["info"]["version"])
             if self.VERSION != latest:
-                version_int = int(self.VERSION.replace(".", ""))
+                try:
+                    version_int = int(self.VERSION.replace(".", ""))
+                except:
+                    version_int = 0
                 latest_int = int(latest.replace(".", ""))
                 # this is to avoid the case where the version is 1.0.10 and the latest is 1.0.2 (possible if user is using the github version)
                 if version_int < latest_int:
-                    logging.critical(
-                        f"Whatsapp-python is out of date. Please update to the latest version {latest}. READ THE CHANGELOG BEFORE UPDATING. NEW VERSIONS MAY BREAK YOUR CODE IF NOT PROPERLY UPDATED.")
+                    if version_int == 0:
+                        logging.critical(
+                            f"There was an error while checking for updates, please update the package manually or report the issue on GitHub.")
+                    else:
+                        logging.critical(
+                            f"Whatsapp-python is out of date. Please update to the latest version {latest}. READ THE CHANGELOG BEFORE UPDATING. NEW VERSIONS MAY BREAK YOUR CODE IF NOT PROPERLY UPDATED.")
                 if version_int > latest_int:
                     latest_beta = int(str(requests.get(
                         "https://raw.githubusercontent.com/filipporomani/whatsapp/main/.version").text).replace(".", ""))
@@ -54,13 +59,17 @@ class WhatsApp(object):
                     logging.critical(
                         f"You are using a development version of whatsapp-python. Please report any issue on GitHub.")
 
-        if token == "" or phone_number_id == "":
-            logging.error("Token or phone number id not provided")
+        
+        if token == "":
+            logging.error("Token not provided")
+            raise ValueError("Token not provided but required")
+        if phone_number_id == "":
+            logging.error("Phone number id not provided")
             raise ValueError(
-                "Token or phone number ID not provided but is required")
+                "Phone number ID not provided but required")
         self.token = token
         self.phone_number_id = phone_number_id
-        self.base_url = "https://graph.facebook.com/v17.0"
+        self.base_url = "https://graph.facebook.com/v18.0"
         self.url = f"{self.base_url}/{phone_number_id}/messages"
 
         async def base():
@@ -169,8 +178,8 @@ class WhatsApp(object):
         """
         self.verification_handler = handler
 
-    def run(self, host: str = "localhost", port: int = 5000, debug: bool = False, **options):
-        self.app.run(host=host, port=port, debug=debug, **options)
+    def run(self, host: str = "localhost", port: int = 5000, **options):
+        _run(self.app, host=host, port=port, **options)
 
 
 class Message(object):

whatsapp_python-3.0.6/whatsapp/constants.py

@@ -0,0 +1,3 @@
+# internal use only - numbers and . only 
+
+VERSION = "3.0.6"

whatsapp_python-3.0.4/.version

@@ -1 +0,0 @@
-3.0.1

whatsapp_python-3.0.4/examples/example_hook_obj.py

@@ -1,85 +0,0 @@
-from whatsapp import Message, Hook, WhatsApp
-from flask import Response
-from os import getenv
-from dotenv import load_dotenv
-
-
-def handler(msg: Message):
-    message_type = msg.type
-    messenger = msg.instance
-    mobile = msg.sender
-
-    if message_type == "text":
-        message = msg.content
-        name = msg.name
-        m = Message(instance=messenger, to=mobile, content="Hello World")
-        m.send()
-
-    elif message_type == "interactive":
-        message_response = msg.interactive
-        if message_response is None:
-            return Response(status=400)
-        interactive_type = message_response.get("type")
-        message_id = message_response[interactive_type]["id"]
-        message_text = message_response[interactive_type]["title"]
-        # Do some action
-
-    elif message_type == "location":
-        message_location = msg.location
-        if message_location is None:
-            return Response(status=400)
-        message_latitude = message_location["latitude"]
-        message_longitude = message_location["longitude"]
-        # Do some action
-
-    elif message_type == "image":
-        image = msg.image
-        if image is None:
-            return Response(status=400)
-        image_id, mime_type = image["id"], image["mime_type"]
-        image_url = messenger.query_media_url(image_id)
-        if image_url is None:
-            return Response(status=400)
-        image_filename = messenger.download_media(image_url, mime_type)
-        # Do some action
-
-    elif message_type == "video":
-        video = msg.video
-        if video is None:
-            return Response(status=400)
-        video_id, mime_type = video["id"], video["mime_type"]
-        video_url = messenger.query_media_url(video_id)
-        if video_url is None:
-            return Response(status=400)
-        video_filename = messenger.download_media(video_url, mime_type)
-        # Do some action
-
-    elif message_type == "audio":
-        audio = msg.audio
-        if audio is None:
-            return Response(status=400)
-        audio_id, mime_type = audio["id"], audio["mime_type"]
-        audio_url = messenger.query_media_url(audio_id)
-        if audio_url is None:
-            return Response(status=400)
-        audio_filename = messenger.download_media(audio_url, mime_type)
-        # Do some action
-
-    elif message_type == "document":
-        file = msg.document
-        if file is None:
-            return Response(status=400)
-        file_id, mime_type = file["id"], file["mime_type"]
-        file_url = messenger.query_media_url(file_id)
-        if file_url is None:
-            return Response(status=400)
-        file_filename = messenger.download_media(file_url, mime_type)
-        # Do some action
-
-
-messenger = WhatsApp(token=getenv("TOKEN"),
-                     phone_number_id=getenv("PHONE_NUMBER_ID"))
-hook = Hook(instance=messenger, handler=handler, port=5000,
-            host="0.0.0.0", verify_token=getenv("VERIFY_TOKEN"))
-
-hook.run()

whatsapp_python-3.0.4/whatsapp/constants.py

@@ -1,3 +0,0 @@
-# internal use only
-
-VERSION = "3.0.4"