[requirements] removing requests

docs/source/content/handlers/overview.rst

@@ -370,6 +370,7 @@ To enable this feature, you need to pass the ``app_secret`` when initializing th
     from pywa import WhatsApp
 
     wa = WhatsApp(
+        validate_updates=True, # Default is True
         app_secret='xxxx',
         ...
     )

pywa/api.py

@@ -1,35 +1,48 @@
 """The internal API for the WhatsApp client."""
 
-import typing
+import importlib
+import logging
 from typing import Any, TYPE_CHECKING
 
-import requests
+import httpx
 
 import pywa
+from . import utils
 from .errors import WhatsAppError
 
 if TYPE_CHECKING:
     from .client import WhatsApp
 
 
+_logger = logging.getLogger(__name__)
+
+
 class WhatsAppCloudApi:
     """Internal methods for the WhatsApp client. Do not use this class directly."""
 
     def __init__(
         self,
         token: str,
-        session: requests.Session,
+        session: httpx.Client,
         base_url: str,
         api_version: float,
     ):
         self._session = self._setup_session(session, token)
         self._base_url = f"{base_url}/v{api_version}"
 
+        # backward compatibility with requests.Session
+        self._is_requests_session, _ = utils.is_requests_and_err(session)
+        if self._is_requests_session:
+            _logger.warning(
+                "Using `requests.Session` is deprecated and will be removed in future versions. "
+                "Please use `httpx.Client` instead."
+            )
+
     @staticmethod
-    def _setup_session(session, token: str) -> requests.Session:
+    def _setup_session(session, token: str) -> httpx.Client:
         if session.headers.get("Authorization") is not None:
             raise ValueError(
-                "You can't use the same requests.Session for multiple WhatsApp instances!"
+                "You can't use the same httpx.Client for multiple WhatsApp instances!"
             )
         session.headers.update(
             {
@@ -262,8 +275,20 @@ def upload_media(
         return self._make_request(
             method="POST",
             endpoint=f"/{phone_id}/media",
-            files=[("file", (filename, media, mime_type))],
-            data={"messaging_product": "whatsapp"},
+            **(
+                dict(
+                    files=[("file", (filename, media, mime_type))],
+                    data={"messaging_product": "whatsapp"},
+                )
+                if self._is_requests_session
+                else dict(
+                    files={
+                        "file": (filename, media, mime_type),
+                        "messaging_product": (None, "whatsapp"),
+                        "type": (None, mime_type),
+                    }
+                )
+            ),
         )
 
     def get_media_url(self, media_id: str) -> dict:
@@ -808,12 +833,25 @@ def update_flow_json(self, flow_id: str, flow_json: str) -> dict:
         return self._make_request(
             method="POST",
             endpoint=f"/{flow_id}/assets",
-            files=[("file", ("flow.json", flow_json, "application/json"))],
-            data={
-                "name": "flow.json",
-                "asset_type": "FLOW_JSON",
-                "messaging_product": "whatsapp",
-            },
+            **(
+                dict(
+                    files=[("file", ("flow.json", flow_json, "application/json"))],
+                    data={
+                        "name": "flow.json",
+                        "asset_type": "FLOW_JSON",
+                        "messaging_product": "whatsapp",
+                    },
+                )
+                if self._is_requests_session
+                else dict(
+                    files={
+                        "file": ("flow.json", flow_json, "application/json"),
+                        "name": (None, "flow.json"),
+                        "asset_type": (None, "FLOW_JSON"),
+                        "messaging_product": (None, "whatsapp"),
+                    }
+                )
+            ),
         )
 
     def publish_flow(

pywa/client.py

@@ -6,7 +6,6 @@
 
 import collections
 import dataclasses
-import functools
 import hashlib
 import json
 import logging
@@ -17,7 +16,7 @@
 from types import NoneType
 from typing import BinaryIO, Iterable, Literal, Any, Callable
 
-import requests
+import httpx
 
 from . import utils
 from .api import WhatsAppCloudApi
@@ -73,7 +72,7 @@ def __init__(
         | int
         | float
         | Literal[utils.Version.GRAPH_API] = utils.Version.GRAPH_API,
-        session: requests.Session | None = None,
+        session: httpx.Client | None = None,
         server: Flask | FastAPI | None = utils.MISSING,
         webhook_endpoint: str = "/",
         verify_token: str | None = None,
@@ -128,11 +127,11 @@ def __init__(
              `use permanent token <https://developers.facebook.com/docs/whatsapp/business-management-api/get-started>`_).
             base_url: The base URL of the WhatsApp API (Do not change unless you know what you're doing).
             api_version: The API version of the WhatsApp Cloud API (default to the latest version).
-            session: The session to use for requests (default: new ``requests.Session()``, For cases where you want to
+            session: The session to use for requests (default: new ``httpx.Client()``, For cases where you want to
              use a custom session, e.g. for proxy support. Do not use the same session across multiple WhatsApp clients!).
             server: The Flask or FastAPI app instance to use for the webhook. required when you want to handle incoming
              updates.
-            callback_url: The callback URL to register (optional, only if you want pywa to register the callback URL for
+            callback_url: The callback URL of the server to register (optional, only if you want pywa to register the callback URL for
              you).
             verify_token: The verify token of the registered ``callback_url`` (Required when ``server`` is provided.
              The verify token can be any string. It is used to challenge the webhook endpoint to verify that the
@@ -211,14 +210,14 @@ def __init__(
 
     def _setup_api(
         self,
-        session: requests.Session | None,
+        session: httpx.Client | None,
         token: str,
         base_url: str,
         api_version: float,
     ) -> None:
         self.api = WhatsAppCloudApi(
             token=token,
-            session=session or requests.Session(),
+            session=session or httpx.Client(),
             base_url=base_url,
             api_version=api_version,
         )
@@ -1381,7 +1380,7 @@ def upload_media(
         media: str | pathlib.Path | bytes | BinaryIO,
         mime_type: str | None = None,
         filename: str | None = None,
-        dl_session: requests.Session | None = None,
+        dl_session: httpx.Client | None = None,
         phone_id: str | None = None,
     ) -> str:
         """
@@ -1399,7 +1398,7 @@ def upload_media(
             media: The media to upload (can be a URL, bytes, or a file path).
             mime_type: The MIME type of the media (required if media is bytes or a file path).
             filename: The file name of the media (required if media is bytes).
-            dl_session: A requests session to use when downloading the media from a URL (optional, if not provided, a
+            dl_session: A httpx client to use when downloading the media from a URL (optional, if not provided, a
              new session will be created).
             phone_id: The phone ID to upload the media to (optional, if not provided, the client's phone ID will be used).
 
@@ -1422,10 +1421,16 @@ def upload_media(
                     mime_type or mimetypes.guess_type(path)[0],
                 )
             elif (url := str(media)).startswith(("https://", "http://")):
-                res = (dl_session or requests).get(url)
+                is_requests, err_cls = utils.is_requests_and_err(dl_session)
+                if is_requests:
+                    _logger.warning(
+                        "Using `requests.Session` is deprecated and will be removed in future versions. "
+                        "Please use `httpx.Client` instead."
+                    )
+                res = (dl_session or httpx).get(url)
                 try:
                     res.raise_for_status()
-                except requests.HTTPError as e:
+                except err_cls as e:
                     raise ValueError(
                         f"An error occurred while downloading from {url}"
                     ) from e
@@ -1502,7 +1507,7 @@ def download_media(
             path: The path where to save the file (if not provided, the current working directory will be used).
             filename: The name of the file (if not provided, it will be guessed from the URL + extension).
             in_memory: Whether to return the file as bytes instead of saving it to disk (default: False).
-            **kwargs: Additional arguments to pass to :py:func:`requests.get`.
+            **kwargs: Additional arguments to pass to :py:func:`httpx.get`.
 
         Returns:
             The path of the saved file if ``in_memory`` is False, the file as bytes otherwise.

pywa/errors.py

@@ -5,7 +5,7 @@
 import functools
 from typing import Iterable, Type
 
-import requests
+import httpx
 
 
 class WhatsAppError(Exception):
@@ -23,7 +23,7 @@ class WhatsAppError(Exception):
         details: The error details (optional).
         fbtrace_id: The Facebook trace ID (optional).
         href: The href to the documentation (optional).
-        raw_response: The :class:`requests.Response` obj that returned the error (optional, only if the error was raised
+        raw_response: The :class:`httpx.Response` obj that returned the error (optional, only if the error was raised
          from an API call).
     """
 
@@ -36,7 +36,7 @@ def __init__(
         details: str | None,
         fbtrace_id: str | None,
         href: str | None,
-        raw_response: requests.Response | None,
+        raw_response: httpx.Response | None,
         error_subcode: int | None = None,
         err_type: str | None = None,
     ) -> None:
@@ -56,7 +56,7 @@ def status_code(self) -> int | None:
 
     @classmethod
     def from_dict(
-        cls, error: dict, response: requests.Response | None = None
+        cls, error: dict, response: httpx.Response | None = None
     ) -> "WhatsAppError":
         """Create an error from a response."""
         return cls._get_exception(error["code"])(

pywa/types/media.py

@@ -67,7 +67,7 @@ def download(
             path: The path where to save the file (if not provided, the current working directory will be used).
             filename: The name of the file (if not provided, it will be guessed from the URL + extension).
             in_memory: Whether to return the file as bytes instead of saving it to disk (default: False).
-            **kwargs: Additional arguments to pass to requests.get.
+            **kwargs: Additional arguments to pass to ``httpx.get(...)``.
 
         Returns:
             The path of the saved file if ``in_memory`` is False, the file as bytes otherwise.
@@ -223,7 +223,7 @@ def download(
             filepath: The path where to save the file (if not provided, the current working directory will be used).
             filename: The name of the file (if not provided, it will be guessed from the URL + extension).
             in_memory: Whether to return the file as bytes instead of saving it to disk (default: False).
-            **kwargs: Additional arguments to pass to requests.get.
+            **kwargs: Additional arguments to pass to ``httpx.get(...)``.
 
         Returns:
             The path of the saved file if ``in_memory`` is False, the file as bytes otherwise.

pywa/utils.py

@@ -9,11 +9,13 @@
 import enum
 import importlib
 import warnings
+import logging
 from typing import Any, Callable, Protocol, TypeAlias
 
-
 import httpx
-import requests
+
+_logger = logging.getLogger(__name__)
+
 
 HUB_VT = "hub.verify_token"
 """The key for the verify token in the query parameters of the webhook get request."""
@@ -77,6 +79,16 @@ def is_installed(lib: str) -> bool:
         return False
 
 
+def is_requests_and_err(session) -> tuple[bool, type[Exception]]:
+    """Check if the given object is a requests/httpx session and return the error type."""
+    try:
+        if isinstance(session, importlib.import_module("requests").Session):
+            return True, importlib.import_module("requests").HTTPError
+        raise ImportError
+    except ImportError:
+        return False, importlib.import_module("httpx").HTTPStatusError
+
+
 class Version(enum.Enum):
     """
     Enum for the latest and minimum versions of the `Graph API <https://developers.facebook.com/docs/graph-api>`_ and
@@ -295,9 +307,7 @@ def webhook_updates_validator(
     return hmac.compare_digest(signature, x_hub_signature.removeprefix("sha256="))
 
 
-def _download_cdn_file_sync(
-    session: requests.Session | httpx.Client, url: str
-) -> bytes:
+def _download_cdn_file_sync(session: httpx.Client, url: str) -> bytes:
     response = session.get(url)
     response.raise_for_status()
     return response.content
@@ -311,7 +321,7 @@ async def _download_cdn_file_async(session: httpx.AsyncClient, url: str) -> byte
 
 def flow_request_media_decryptor_sync(
     encrypted_media: dict[str, str | dict[str, str]],
-    dl_session: requests.Session | httpx.Client | None = None,
+    dl_session: httpx.Client | None = None,
 ) -> tuple[str, str, bytes]:
     """
     Decrypt the encrypted media file from the flow request.
@@ -334,7 +344,7 @@ def flow_request_media_decryptor_sync(
 
     Args:
         encrypted_media (dict): encrypted media data from the flow request (see example above).
-        dl_session (requests.Session | httpx.Client): download session. Optional.
+        dl_session (httpx.Client): download session. Optional.
 
     Returns:
         tuple[str, str, bytes]
@@ -345,6 +355,12 @@ def flow_request_media_decryptor_sync(
     Raises:
         ValueError: If any of the hash verifications fail.
     """
+    is_requests, _ = is_requests_and_err(dl_session)
+    if is_requests:
+        _logger.warning(
+            "Using `requests.Session` is deprecated and will be removed in future versions. "
+            "Please use `httpx.Client` instead."
+        )
     cdn_file = _download_cdn_file_sync(
         dl_session or httpx.Client(), encrypted_media["cdn_url"]
     )

pywa_async/client.py

@@ -165,7 +165,7 @@ def __init__(
              use a custom session, e.g. for proxy support. Do not use the same session across multiple WhatsApp clients!).
             server: The Flask or FastAPI app instance to use for the webhook. required when you want to handle incoming
              updates.
-            callback_url: The callback URL to register (optional, only if you want pywa to register the callback URL for
+            callback_url: The callback URL of the server to register (optional, only if you want pywa to register the callback URL for
              you).
             verify_token: The verify token of the registered ``callback_url`` (Required when ``server`` is provided.
              The verify token can be any string. It is used to challenge the webhook endpoint to verify that the
@@ -1340,7 +1340,7 @@ async def upload_media(
             media: The media to upload (can be a URL, bytes, or a file path).
             mime_type: The MIME type of the media (required if media is bytes or a file path).
             filename: The file name of the media (required if media is bytes).
-            dl_session: A requests session to use when downloading the media from a URL (optional, if not provided, a
+            dl_session: A httpx client to use when downloading the media from a URL (optional, if not provided, a
              new session will be created).
             phone_id: The phone ID to upload the media to (optional, if not provided, the client's phone ID will be used).
 

pywa_async/types/media.py

@@ -56,7 +56,7 @@ async def download(
             path: The path where to save the file (if not provided, the current working directory will be used).
             filename: The name of the file (if not provided, it will be guessed from the URL + extension).
             in_memory: Whether to return the file as bytes instead of saving it to disk (default: False).
-            **kwargs: Additional arguments to pass to requests.get.
+            **kwargs: Additional arguments to pass to httpx.get.
 
         Returns:
             The path of the saved file if ``in_memory`` is False, the file as bytes otherwise.

pywa_async/types/message.py

@@ -112,7 +112,7 @@ async def download_media(
             filepath: The path where to save the file (if not provided, the current working directory will be used).
             filename: The name of the file (if not provided, it will be guessed from the URL + extension).
             in_memory: Whether to return the file as bytes instead of saving it to disk (default: False).
-            **kwargs: Additional arguments to pass to requests.get.
+            **kwargs: Additional arguments to pass to httpx.get.
 
         Returns:
             The path of the saved file if ``in_memory`` is False, the file as bytes otherwise.

requirements-dev.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
-pytest==8.2.0
-pytest-asyncio==0.23.6
+pytest==8.3.2
+pytest-asyncio==0.23.8
 pytest-mock==3.14.0
-ruff==0.4.3
-pre-commit==3.7.0
+ruff==0.5.5
+pre-commit==3.7.1

requirements.txt

@@ -1,2 +1 @@
-requests>=2.31.0
 httpx>=0.27.0