use uuid for query

common.py

@@ -2,6 +2,13 @@ import logging
 import os
 import re
 
+try:
+    import uvloop, asyncio
+
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+except ImportError:
+    uvloop = None
+
 BOT_TOKEN = os.getenv("BOT_TOKEN")
 ADMIN = [int(i) for i in os.getenv("BOT_ADMIN").split(",")]
 
@@ -23,4 +30,7 @@ logging.basicConfig(
     level=os.getenv("LOG_LEVEL", "WARNING"),
     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 )
-logger = logging.getLogger(__name__)
+
+
+def get_logger(name: str) -> logging.Logger:
+    return logging.getLogger(name)

main.py

@@ -1,15 +1,22 @@
+from __future__ import annotations
+
 import html
 from functools import wraps
+from typing import TYPE_CHECKING
 
-from aiohttp import ClientSession
-from telegram import Chat, InlineKeyboardButton, InlineKeyboardMarkup, Message, Update
+from telegram import InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.constants import ChatAction, ChatType, ParseMode
-from telegram.ext import (Application, ApplicationBuilder, CallbackQueryHandler, CommandHandler, ContextTypes, Defaults,
+from telegram.ext import (ApplicationBuilder, CallbackQueryHandler, CommandHandler, Defaults,
                           InlineQueryHandler, MessageHandler, PicklePersistence, filters)
 
 import common
-from common import logger
-from tweet import TGTweet
+from tweet import TelegramTweet
+
+if TYPE_CHECKING:
+    from telegram import Chat, Message, Update
+    from telegram.ext import Application, ContextTypes
+
+logger = common.get_logger(__name__)
 
 
 def send_action(action):
@@ -197,7 +204,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:
@@ -205,7 +212,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,3 @@
 python-telegram-bot[webhooks]~=21.3
-aiohttp[speedups]~=3.9.3
+httpx[http2]~=0.27.0
+uvloop~=0.19.0; sys_platform != 'win32'

tweet.py

@@ -1,16 +1,21 @@
+from __future__ import annotations
+
 import html
-from typing import Generator
+from functools import cached_property
+from typing import TYPE_CHECKING
+from uuid import uuid4
 
-from aiohttp import ClientSession
-from telegram import (
-    InlineQueryResultPhoto,
-    InlineQueryResultVideo,
-    InlineQueryResultMpeg4Gif,
-    InputMediaPhoto,
-    InputMediaVideo
-)
+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 typing import Generator, TypedDict
+
+logger = get_logger(__name__)
 
-from common import x_url_regex, x_media_regex, x_tco_regex, logger
 
 twimg_url = 'https://pbs.twimg.com/'
 vx_api_url = 'https://api.vxtwitter.com/{0}/status/{1}'
@@ -20,11 +25,19 @@ message_raw_text = """{url}
 """
 
 
-async def fetch_json(session: ClientSession, url: str) -> dict:
+def create_client() -> AsyncClient:
+    return AsyncClient(http2=True)
+
+
+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:
-        assert response.status == 200, f"Failed to fetch {url}, status code {response.status}"
-        return await response.json()
+    response = await _client.get(url)
+    assert response.status_code == response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
+    return response.json()
 
 
 class TweetMedia:
@@ -119,7 +132,7 @@ class Tweet:
 
 
 class TGTweet(Tweet):
-    _session: ClientSession
+    _httpx_client: AsyncClient
 
     def __init__(self, url: str):
         self._url: str = url
@@ -136,15 +149,15 @@ class TGTweet(Tweet):
         pass
 
     @classmethod
-    def set_session(cls, session: ClientSession) -> None:
-        cls._session = session
+    def init_client(cls) -> None:
+        cls._httpx_client = create_client()
 
     @classmethod
-    async def close_session(cls) -> None:
-        await cls._session.close()
+    async def close_client(cls) -> None:
+        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:
@@ -196,18 +209,18 @@ class TGTweet(Tweet):
     def inline_query_generator(self) -> Generator[
         InlineQueryResultPhoto | InlineQueryResultVideo | InlineQueryResultMpeg4Gif, None, None
     ]:
-        for i, tweet_media in enumerate(self.media):
+        for tweet_media in self.media:
             logger.info(str(tweet_media))
             if tweet_media.type == "image":
                 yield InlineQueryResultPhoto(
-                    id=str(i),
+                    id=str(uuid4()),
                     photo_url=tweet_media.url,
                     thumbnail_url=tweet_media.thumb,
                     caption=self.message_text
                 )
             elif tweet_media.type == "video":
                 yield InlineQueryResultVideo(
-                    id=str(i),
+                    id=str(uuid4()),
                     video_url=tweet_media.url,
                     mime_type="video/mp4",
                     thumbnail_url=tweet_media.thumb,
@@ -216,7 +229,7 @@ class TGTweet(Tweet):
                 )
             elif tweet_media.type == "gif":
                 yield InlineQueryResultMpeg4Gif(
-                    id=str(i),
+                    id=str(uuid4()),
                     mpeg4_url=tweet_media.url,
                     thumbnail_url=tweet_media.thumb,
                     caption=self.message_text