aiogram-webhook 1.0.0__tar.gz → 2.0.0__tar.gz

{aiogram_webhook-1.0.0 → aiogram_webhook-2.0.0}/PKG-INFO

@@ -1,35 +1,36 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: aiogram-webhook
-Version: 1.0.0
+Version: 2.0.0
 Summary: A python library for integrating webhook support with multiple web frameworks in aiogram. Organizes bot operation via webhooks for both single and multi-bot setups.
-Project-URL: Homepage, https://github.com/m-xim/aiogram-webhook
-Project-URL: Repository, https://github.com/m-xim/aiogram-webhook
-Project-URL: Issues, https://github.com/m-xim/aiogram-webhook/issues
-Project-URL: Documentation, https://github.com/m-xim/aiogram-webhook#readme
+Keywords: aiogram,telegram,webhook,fastapi,aiohttp,multibot
+Author: m-xim
 Author-email: m-xim <i@m-xim.ru>
 License: MIT
-License-File: LICENSE
-Keywords: aiogram,aiohttp,fastapi,multibot,telegram,webhook
-Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.10
+Classifier: Operating System :: OS Independent
 Requires-Dist: aiogram>=3.14.0
 Requires-Dist: yarl>=1.17.0
+Requires-Dist: aiohttp>=3.9.0 ; extra == 'aiohttp'
+Requires-Dist: ruff ; extra == 'dev'
+Requires-Dist: ty ; extra == 'dev'
+Requires-Dist: pytest ; extra == 'dev'
+Requires-Dist: pytest-asyncio ; extra == 'dev'
+Requires-Dist: httpx ; extra == 'dev'
+Requires-Dist: fastapi>=0.128.0 ; extra == 'fastapi'
+Requires-Python: >=3.10
+Project-URL: Homepage, https://github.com/m-xim/aiogram-webhook
+Project-URL: Repository, https://github.com/m-xim/aiogram-webhook
+Project-URL: Issues, https://github.com/m-xim/aiogram-webhook/issues
+Project-URL: Documentation, https://github.com/m-xim/aiogram-webhook#readme
 Provides-Extra: aiohttp
-Requires-Dist: aiohttp>=3.9.0; extra == 'aiohttp'
 Provides-Extra: dev
-Requires-Dist: httpx; extra == 'dev'
-Requires-Dist: pytest; extra == 'dev'
-Requires-Dist: pytest-asyncio; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
-Requires-Dist: ty; extra == 'dev'
 Provides-Extra: fastapi
-Requires-Dist: fastapi>=0.128.0; extra == 'fastapi'
 Description-Content-Type: text/markdown
 
 # aiogram-webhook
@@ -74,38 +75,43 @@ from fastapi import FastAPI
 from aiogram import Bot, Dispatcher, Router
 from aiogram.filters import CommandStart
 from aiogram.types import Message
-from aiogram_webhook import SimpleEngine, FastApiWebAdapter
+from aiogram_webhook import SimpleEngine, FastApiWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 
 router = Router()
 
+
 @router.message(CommandStart())
 async def start(message: Message):
     await message.answer("OK")
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 bot = Bot("BOT_TOKEN")
 
-engine = SimpleEngine( # or other engine
+
+engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=FastApiWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"], drop_pending_updates=True),
     # security=Security(...)
 )
 
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     engine.register(app)
-    await engine.set_webhook(
-        drop_pending_updates=True,
-        allowed_updates=("message", "callback_query"),
-    )
+    await engine.set_webhook()  # Uses webhook_config defaults
+    # Or override specific params:
+    # await engine.set_webhook(max_connections=100)
     await engine.on_startup(app)
     yield
     await engine.on_shutdown(app)
 
+
 app = FastAPI(lifespan=lifespan)
 ```
 
@@ -114,29 +120,33 @@ app = FastAPI(lifespan=lifespan)
 from aiogram import Bot, Dispatcher, Router
 from aiogram.filters import CommandStart
 from aiogram.types import Message
-from aiogram_webhook import SimpleEngine, AiohttpWebAdapter
+from aiogram_webhook import SimpleEngine, AiohttpWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 from aiohttp import web
 
 router = Router()
 
+
 @router.message(CommandStart())
 async def start(message: Message):
     await message.answer("OK")
 
-async def on_startup(bot: Bot, webhook_engine:SimpleEngine) -> None:
+
+async def on_startup(bot: Bot, webhook_engine: SimpleEngine) -> None:
     await webhook_engine.set_webhook()
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 dispatcher.startup.register(on_startup)
 bot = Bot("BOT_TOKEN")
 
-engine = SimpleEngine( # or other engine
+engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=AiohttpWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )
 app = web.Application()
@@ -155,21 +165,23 @@ Used for serving a single Telegram bot. Suitable for most standard scenarios whe
 
 - Connects aiogram `Dispatcher` and `Bot` to the selected web framework (FastAPI, aiohttp, etc.)
 - Handles webhook requests for a single bot
-- Requires explicit dispatcher, bot, web_adapter, and routing (security is optional)
+- Requires explicit dispatcher, bot, web_adapter, and routing (security and webhook_config are optional)
 
 **Example:**
 ```python
 from aiogram import Bot, Dispatcher
-from aiogram_webhook import SimpleEngine, FastApiWebAdapter
+from aiogram_webhook import SimpleEngine, FastApiWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 
 bot = Bot("BOT_TOKEN")
 dispatcher = Dispatcher()
+
 engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=FastApiWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"], drop_pending_updates=True),
     # security=Security(...)
 )
 ```
@@ -180,7 +192,7 @@ Allows you to serve multiple Telegram bots in a single application. Useful if yo
 
 - Allows serving multiple bots via a single endpoint
 - Uses the bot token for request routing
-- Requires dispatcher, web_adapter, routing, bot_settings (a dict with bot settings), security (optional)
+- Requires dispatcher, web_adapter, routing, bot_settings (optional), webhook_config (optional), and security (optional)
 
 **Example:**
 
@@ -189,11 +201,12 @@ from aiogram import Dispatcher, Router
 from aiogram.client.default import DefaultBotProperties
 from aiogram.types import Message
 from aiogram.filters import Command, CommandObject
-from aiogram_webhook import TokenEngine, FastApiWebAdapter
+from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig, BotConfig
 from aiogram_webhook.routing import PathRouting
 
 router = Router()
 
+
 @router.message(Command("addbot"))
 async def add_bot_handler(message: Message, command: CommandObject, webhook_engine: TokenEngine):
     token = command.args
@@ -203,14 +216,17 @@ async def add_bot_handler(message: Message, command: CommandObject, webhook_engi
     new_bot = await webhook_engine.set_webhook(token)
     await message.answer(f"Bot #{new_bot.id} started!")
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 
+
 engine = TokenEngine(
     dispatcher,
     web_adapter=FastApiWebAdapter(),
     routing=PathRouting(url="https://example.com/webhook/{bot_token}"),
-    bot_settings={"default": DefaultBotProperties(parse_mode="HTML")},
+    bot_config=BotConfig(default=DefaultBotProperties(parse_mode="HTML")),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )
 ```
@@ -302,6 +318,12 @@ See [routing examples](/src/aiogram_webhook/routing) for implementation details.
 
 ---
 
+## ⚙️ Webhook Configuration
+
+`WebhookConfig` allows you to set default parameters for the Telegram [`setWebhook`](https://core.telegram.org/bots/api#setwebhook) API call. All parameters are optional and can be overridden when calling `engine.set_webhook()`.
+
+---
+
 ## 🛡️ Security
 
 aiogram-webhook provides a flexible and extensible security system for processing webhook requests. You can use built-in mechanisms, combine them, or implement your own checks.
@@ -310,8 +332,8 @@ aiogram-webhook provides a flexible and extensible security system for processin
 from aiogram_webhook.security import Security, StaticSecretToken, IPCheck
 
 security = Security(
-    IPCheck(), # and other checks...
-    secret_token=StaticSecretToken("YOUR_SECRET_TOKEN")
+    IPCheck(),  # and other checks...
+    secret_token=StaticSecretToken("YOUR_SECRET_TOKEN"),
 )
 ```
 

{aiogram_webhook-1.0.0 → aiogram_webhook-2.0.0}/README.md

@@ -40,38 +40,43 @@ from fastapi import FastAPI
 from aiogram import Bot, Dispatcher, Router
 from aiogram.filters import CommandStart
 from aiogram.types import Message
-from aiogram_webhook import SimpleEngine, FastApiWebAdapter
+from aiogram_webhook import SimpleEngine, FastApiWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 
 router = Router()
 
+
 @router.message(CommandStart())
 async def start(message: Message):
     await message.answer("OK")
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 bot = Bot("BOT_TOKEN")
 
-engine = SimpleEngine( # or other engine
+
+engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=FastApiWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"], drop_pending_updates=True),
     # security=Security(...)
 )
 
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     engine.register(app)
-    await engine.set_webhook(
-        drop_pending_updates=True,
-        allowed_updates=("message", "callback_query"),
-    )
+    await engine.set_webhook()  # Uses webhook_config defaults
+    # Or override specific params:
+    # await engine.set_webhook(max_connections=100)
     await engine.on_startup(app)
     yield
     await engine.on_shutdown(app)
 
+
 app = FastAPI(lifespan=lifespan)
 ```
 
@@ -80,29 +85,33 @@ app = FastAPI(lifespan=lifespan)
 from aiogram import Bot, Dispatcher, Router
 from aiogram.filters import CommandStart
 from aiogram.types import Message
-from aiogram_webhook import SimpleEngine, AiohttpWebAdapter
+from aiogram_webhook import SimpleEngine, AiohttpWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 from aiohttp import web
 
 router = Router()
 
+
 @router.message(CommandStart())
 async def start(message: Message):
     await message.answer("OK")
 
-async def on_startup(bot: Bot, webhook_engine:SimpleEngine) -> None:
+
+async def on_startup(bot: Bot, webhook_engine: SimpleEngine) -> None:
     await webhook_engine.set_webhook()
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 dispatcher.startup.register(on_startup)
 bot = Bot("BOT_TOKEN")
 
-engine = SimpleEngine( # or other engine
+engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=AiohttpWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )
 app = web.Application()
@@ -121,21 +130,23 @@ Used for serving a single Telegram bot. Suitable for most standard scenarios whe
 
 - Connects aiogram `Dispatcher` and `Bot` to the selected web framework (FastAPI, aiohttp, etc.)
 - Handles webhook requests for a single bot
-- Requires explicit dispatcher, bot, web_adapter, and routing (security is optional)
+- Requires explicit dispatcher, bot, web_adapter, and routing (security and webhook_config are optional)
 
 **Example:**
 ```python
 from aiogram import Bot, Dispatcher
-from aiogram_webhook import SimpleEngine, FastApiWebAdapter
+from aiogram_webhook import SimpleEngine, FastApiWebAdapter, WebhookConfig
 from aiogram_webhook.routing import StaticRouting
 
 bot = Bot("BOT_TOKEN")
 dispatcher = Dispatcher()
+
 engine = SimpleEngine(
     dispatcher,
     bot,
     web_adapter=FastApiWebAdapter(),
     routing=StaticRouting(url="https://example.com/webhook"),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"], drop_pending_updates=True),
     # security=Security(...)
 )
 ```
@@ -146,7 +157,7 @@ Allows you to serve multiple Telegram bots in a single application. Useful if yo
 
 - Allows serving multiple bots via a single endpoint
 - Uses the bot token for request routing
-- Requires dispatcher, web_adapter, routing, bot_settings (a dict with bot settings), security (optional)
+- Requires dispatcher, web_adapter, routing, bot_settings (optional), webhook_config (optional), and security (optional)
 
 **Example:**
 
@@ -155,11 +166,12 @@ from aiogram import Dispatcher, Router
 from aiogram.client.default import DefaultBotProperties
 from aiogram.types import Message
 from aiogram.filters import Command, CommandObject
-from aiogram_webhook import TokenEngine, FastApiWebAdapter
+from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig, BotConfig
 from aiogram_webhook.routing import PathRouting
 
 router = Router()
 
+
 @router.message(Command("addbot"))
 async def add_bot_handler(message: Message, command: CommandObject, webhook_engine: TokenEngine):
     token = command.args
@@ -169,14 +181,17 @@ async def add_bot_handler(message: Message, command: CommandObject, webhook_engi
     new_bot = await webhook_engine.set_webhook(token)
     await message.answer(f"Bot #{new_bot.id} started!")
 
+
 dispatcher = Dispatcher()
 dispatcher.include_router(router)
 
+
 engine = TokenEngine(
     dispatcher,
     web_adapter=FastApiWebAdapter(),
     routing=PathRouting(url="https://example.com/webhook/{bot_token}"),
-    bot_settings={"default": DefaultBotProperties(parse_mode="HTML")},
+    bot_config=BotConfig(default=DefaultBotProperties(parse_mode="HTML")),
+    webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )
 ```
@@ -268,6 +283,12 @@ See [routing examples](/src/aiogram_webhook/routing) for implementation details.
 
 ---
 
+## ⚙️ Webhook Configuration
+
+`WebhookConfig` allows you to set default parameters for the Telegram [`setWebhook`](https://core.telegram.org/bots/api#setwebhook) API call. All parameters are optional and can be overridden when calling `engine.set_webhook()`.
+
+---
+
 ## 🛡️ Security
 
 aiogram-webhook provides a flexible and extensible security system for processing webhook requests. You can use built-in mechanisms, combine them, or implement your own checks.
@@ -276,8 +297,8 @@ aiogram-webhook provides a flexible and extensible security system for processin
 from aiogram_webhook.security import Security, StaticSecretToken, IPCheck
 
 security = Security(
-    IPCheck(), # and other checks...
-    secret_token=StaticSecretToken("YOUR_SECRET_TOKEN")
+    IPCheck(),  # and other checks...
+    secret_token=StaticSecretToken("YOUR_SECRET_TOKEN"),
 )
 ```
 

{aiogram_webhook-1.0.0 → aiogram_webhook-2.0.0}/pyproject.toml

@@ -1,14 +1,11 @@
 [project]
 name = "aiogram-webhook"
-version = "1.0.0"
+version = "2.0.0"
 description = "A python library for integrating webhook support with multiple web frameworks in aiogram. Organizes bot operation via webhooks for both single and multi-bot setups."
 readme = "README.md"
 license = { text = "MIT" }
-authors = [
-    { name = "m-xim", email = "i@m-xim.ru" },
-]
+authors = [{ name = "m-xim", email = "i@m-xim.ru" }]
 requires-python = ">=3.10"
-packages = [{ include = "aiogram_webhook" }]
 dependencies = [
     "aiogram>=3.14.0",
     "yarl>=1.17.0",
@@ -28,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
     "Operating System :: OS Independent",
 ]
@@ -54,11 +52,12 @@ dev = [
 ]
 
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["uv_build"]
+build-backend = "uv_build"
+
+[tool.uv]
+package = true
 
-[tool.hatch.build]
-sources = ["src"]
 
 [tool.semantic_release]
 version_source = "pyproject"
@@ -70,59 +69,6 @@ version_toml = [
 [tool.semantic_release.branches.main]
 match = "main"
 
-[tool.semantic_release.branches.dev]
-match = "dev"
+[tool.semantic_release.branches.develop]
+match = "develop"
 prerelease = true
-
-[tool.ruff]
-line-length = 120
-exclude = [".venv", "__pycache__"]
-
-[tool.ruff.format]
-skip-magic-trailing-comma = false
-
-[tool.ruff.lint]
-select = ["ALL"]
-ignore = [
-    "D",
-    "ANN",
-    "PLR09",
-    "COM812",
-
-    "ERA001",
-    "T201",
-    "RUF059",
-    "BLE001",
-    "RUF001",
-    "RUF003",
-
-    "TRY003",
-    "EM101",
-
-    "RUF002",
-    "EM102",
-
-    "FBT001",
-    "FBT002",
-    "TD002",
-    "FIX002",
-
-    "TD003",
-    "PLR2004",
-    "N806",
-    "E501",
-    "N815"
-]
-
-[tool.ruff.lint.flake8-tidy-imports]
-ban-relative-imports = "all"
-
-[tool.ruff.lint.per-file-ignores]
-"tests/**/*" = [
-    "PLR2004",
-    "S101",
-    "TID252",
-    "S106",
-    "S105",
-    "ARG002"
-]

aiogram_webhook-2.0.0/src/aiogram_webhook/__init__.py

@@ -0,0 +1,21 @@
+from aiogram_webhook.config.bot import BotConfig
+from aiogram_webhook.config.webhook import WebhookConfig
+from aiogram_webhook.engines.simple import SimpleEngine
+from aiogram_webhook.engines.token import TokenEngine
+
+__all__ = ["BotConfig", "SimpleEngine", "TokenEngine", "WebhookConfig"]
+
+
+try:
+    from aiogram_webhook.adapters.aiohttp.adapter import AiohttpWebAdapter  # noqa: F401
+
+    __all__.insert(0, "AiohttpWebAdapter")
+except ImportError:
+    pass
+
+try:
+    from aiogram_webhook.adapters.fastapi.adapter import FastApiWebAdapter  # noqa: F401
+
+    __all__.insert(1, "FastApiWebAdapter")
+except ImportError:
+    pass

aiogram_webhook-1.0.0/aiogram_webhook/adapters/aiohttp.py → aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/aiohttp/adapter.py

@@ -1,44 +1,46 @@
-from ipaddress import IPv4Address, IPv6Address
 from typing import TYPE_CHECKING, Any, cast
 
 from aiohttp.web import Application, Request
 from aiohttp.web_response import Response, json_response
 
-from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
+from aiogram_webhook.adapters.aiohttp.mapping import AiohttpHeadersMapping, AiohttpQueryMapping
+from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
 
 if TYPE_CHECKING:
     from asyncio import Transport
 
 
-class AiohttpBoundRequest(BoundRequest):
-    adapter: "AiohttpWebAdapter"
-    request: Request
+class AiohttpBoundRequest(BoundRequest[Request]):
+    def __init__(self, request: Request):
+        super().__init__(request)
+        self._headers = AiohttpHeadersMapping(self.request.headers)
+        self._query_params = AiohttpQueryMapping(self.request.query)
 
-    async def json(self) -> dict[str, Any]:
+    async def json(self):
         return await self.request.json()
 
-    def header(self, name: str) -> Any | None:
-        return self.request.headers.get(name)
-
-    def query_param(self, name: str) -> Any | None:
-        return self.request.query.get(name)
-
-    def path_param(self, name: str) -> Any | None:
-        return self.request.match_info.get(name)
-
-    def ip(self) -> IPv4Address | IPv6Address | str | None:
+    @property
+    def client_ip(self):
         if peer_name := cast("Transport", self.request.transport).get_extra_info("peername"):
             return peer_name[0]
-
         return None
 
-    def json_response(self, status: int, payload: dict[str, Any]) -> Response:
-        return json_response(status=status, data=payload)
+    @property
+    def headers(self) -> AiohttpHeadersMapping:
+        return self._headers
+
+    @property
+    def query_params(self) -> AiohttpQueryMapping:
+        return self._query_params
+
+    @property
+    def path_params(self):
+        return self.request.match_info
 
 
 class AiohttpWebAdapter(WebAdapter):
     def bind(self, request: Request) -> AiohttpBoundRequest:
-        return AiohttpBoundRequest(adapter=self, request=request)
+        return AiohttpBoundRequest(request=request)
 
     def register(self, app: Application, path, handler, on_startup=None, on_shutdown=None) -> None:
         async def endpoint(request: Request):
@@ -49,3 +51,6 @@ class AiohttpWebAdapter(WebAdapter):
             app.on_startup.append(on_startup)
         if on_shutdown is not None:
             app.on_shutdown.append(on_shutdown)
+
+    def create_json_response(self, status: int, payload: dict[str, Any]) -> Response:
+        return json_response(status=status, data=payload)

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/aiohttp/mapping.py

@@ -0,0 +1,15 @@
+from typing import Any
+
+from multidict import CIMultiDictProxy, MultiMapping
+
+from aiogram_webhook.adapters.base_mapping import MappingABC
+
+
+class AiohttpHeadersMapping(MappingABC[CIMultiDictProxy[str]]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getall(name, [])
+
+
+class AiohttpQueryMapping(MappingABC[MultiMapping[str]]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getall(name, [])