update to httpx

main.py

@@ -2,7 +2,6 @@ import html
 from functools import wraps
 from typing import TYPE_CHECKING
 
-from aiohttp import ClientSession
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.constants import ChatAction, ChatType, ParseMode
 from telegram.ext import (ApplicationBuilder, CallbackQueryHandler, CommandHandler, Defaults,
@@ -203,7 +202,7 @@ async def post_init(application: Application) -> None:
     DESCRIPTION = "A bot to fetch tweets from Twitter."
     await application.bot.set_my_description(DESCRIPTION)
     await application.bot.set_my_short_description(DESCRIPTION)
-    TGTweet.set_session(ClientSession())
+    TGTweet.init_client()
 
 
 async def post_stop(application: Application) -> None:
@@ -211,7 +210,7 @@ async def post_stop(application: Application) -> None:
 
 
 async def post_shutdown(application: Application) -> None:
-    await TGTweet.close_session()
+    await TGTweet.close_client()
 
 
 def main():

requirements.txt

@@ -1,2 +1,2 @@
 python-telegram-bot[webhooks]~=21.3
-aiohttp[speedups]~=3.9.3
+httpx[http2]~=0.27.0

tweet.py

@@ -1,14 +1,12 @@
 import html
-from typing import Generator, TYPE_CHECKING
+from typing import Generator
 
+from httpx import AsyncClient
 from telegram import (InlineQueryResultMpeg4Gif, InlineQueryResultPhoto, InlineQueryResultVideo, InputMediaPhoto,
                       InputMediaVideo)
 
 from common import get_logger, x_media_regex, x_tco_regex, x_url_regex
 
-if TYPE_CHECKING:
-    from aiohttp import ClientSession
-
 logger = get_logger(__name__)
 
 
@@ -20,11 +18,19 @@ message_raw_text = """{url}
 """
 
 
-async def fetch_json(session: ClientSession, url: str) -> dict:
+def create_client() -> 'AsyncClient':
+    return AsyncClient()
+
+
+async def close_client(_client: 'AsyncClient') -> None:
+    await _client.aclose()
+
+
+async def fetch_json(_client: 'AsyncClient', url: str) -> dict:
     logger.info(f"Fetching {url}")
-    async with session.get(url) as response:
+    response = await _client.get(url)
-        assert response.status == 200, f"Failed to fetch {url}, status code {response.status}"
+    assert response.status_code == response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
-        return await response.json()
+    return response.json()
 
 
 class TweetMedia:
@@ -119,7 +125,7 @@ class Tweet:
 
 
 class TGTweet(Tweet):
-    _session: ClientSession
+    _httpx_client: AsyncClient
 
     def __init__(self, url: str):
         self._url: str = url
@@ -136,15 +142,15 @@ class TGTweet(Tweet):
         pass
 
     @classmethod
-    def set_session(cls, session: ClientSession) -> None:
+    def init_client(cls) -> None:
-        cls._session = session
+        cls._httpx_client = create_client()
 
     @classmethod
-    async def close_session(cls) -> None:
+    async def close_client(cls) -> None:
-        await cls._session.close()
+        await close_client(cls._httpx_client)
 
     async def _fetch_tweet(self, api_param: tuple[str]) -> dict:
-        return await fetch_json(self._session, vx_api_url.format(*api_param))
+        return await fetch_json(self._httpx_client, vx_api_url.format(*api_param))
 
     @property
     def _tweet_id(self) -> tuple[str] | None: