aiogram-webhook 3.0.0__tar.gz → 3.0.1__tar.gz

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aiogram-webhook
-Version: 3.0.0
+Version: 3.0.1
 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.
 Keywords: aiogram,multibot,telegram,webhook,fastapi,aiohttp
 Author: m-xim

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiogram-webhook"
-version = "3.0.0"
+version = "3.0.1"
 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" }

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/src/aiogram_webhook/engines/base.py

@@ -1,8 +1,10 @@
 import warnings
 from abc import ABC, abstractmethod
+from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
 from typing import Any, Generic, TypeVar
 
-from aiogram import Bot
+from aiogram import Bot, Dispatcher
 from aiogram.methods import TelegramMethod
 
 from aiogram_webhook.engines.errors import (
@@ -31,9 +33,7 @@ FrameworkResponseT = TypeVar("FrameworkResponseT")
 class BaseWebhookEngine(ABC, Generic[AppT, RawRequestT, FrameworkResponseT]):
     def __init__(
         self,
-        dispatcher,
-        /,
-        *,
+        dispatcher: Dispatcher,
         web: WebAdapter[AppT, RawRequestT, FrameworkResponseT],
         route: Route,
         security: Security | None = None,
@@ -111,6 +111,14 @@ class BaseWebhookEngine(ABC, Generic[AppT, RawRequestT, FrameworkResponseT]):
         self._is_shutting_down = True
         await self._on_shutdown(app, *args, **kwargs)
 
+    @asynccontextmanager
+    async def lifespan(self, app: AppT) -> AsyncGenerator[None, Any]:
+        try:
+            await self.on_startup(app=app)
+            yield
+        finally:
+            await self.on_shutdown(app=app)
+
     @abstractmethod
     async def _on_startup(self, app: AppT, *args: Any, **kwargs: Any) -> None:
         raise NotImplementedError

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/src/aiogram_webhook/engines/multi.py

@@ -21,8 +21,6 @@ class BaseMultiBotEngine(
     def __init__(
         self,
         dispatcher,
-        /,
-        *,
         web: WebAdapter[AppT, RawRequestT, FrameworkResponseT],
         route: Route,
         security: Security | None = None,
@@ -34,7 +32,7 @@ class BaseMultiBotEngine(
         self._bots: dict[int, Bot] = {}
         self.webhook_config = webhook_config or WebhookConfig()
         super().__init__(
-            dispatcher,
+            dispatcher=dispatcher,
             web=web,
             route=route,
             security=security,

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/src/aiogram_webhook/engines/single.py

@@ -19,8 +19,6 @@ class SingleBotEngine(
         self,
         dispatcher,
         bot: Bot,
-        /,
-        *,
         web: WebAdapter[AppT, RawRequestT, FrameworkResponseT],
         route: Route,
         security=None,
@@ -31,7 +29,7 @@ class SingleBotEngine(
         self._task_tracker = TaskTracker()
 
         super().__init__(
-            dispatcher,
+            dispatcher=dispatcher,
             web=web,
             route=route,
             security=security,

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/src/aiogram_webhook/engines/token.py

@@ -24,8 +24,6 @@ class TokenEngine(
     def __init__(
         self,
         dispatcher,
-        /,
-        *,
         web: WebAdapter[AppT, RawRequestT, FrameworkResponseT],
         route: Route,
         security=None,
@@ -35,7 +33,7 @@ class TokenEngine(
         shutdown_timeout: float = 10.0,
     ) -> None:
         super().__init__(
-            dispatcher,
+            dispatcher=dispatcher,
             web=web,
             route=route,
             security=security,

{aiogram_webhook-3.0.0 → aiogram_webhook-3.0.1}/src/aiogram_webhook/web/fastapi.py

@@ -1,12 +1,10 @@
-from collections.abc import AsyncIterator, Mapping
-from contextlib import asynccontextmanager
+from collections.abc import Mapping
 from typing import Any
 
 from aiohttp import Payload
-from fastapi import APIRouter, FastAPI, Request, Response
+from fastapi import FastAPI, Request, Response
 from fastapi.responses import JSONResponse
 from multidict import CIMultiDict, CIMultiDictProxy, MultiDict, MultiDictProxy
-from starlette.types import Lifespan
 
 from aiogram_webhook.web._starlette import AiohttpPayloadResponse
 from aiogram_webhook.web.base import (
@@ -60,33 +58,19 @@ class FastAPIAdapter(WebAdapter[FastAPI, Request, Response]):
     def bind_request(self, request: Request) -> WebRequest[Request]:
         return FastAPIWebRequest(request)
 
-    @staticmethod
-    def _build_lifespan(on_startup: LifecycleCallback, on_shutdown: LifecycleCallback) -> Lifespan[FastAPI]:
-        @asynccontextmanager
-        async def lifespan(app: FastAPI) -> AsyncIterator[None]:
-            await on_startup(app)
-            try:
-                yield
-            finally:
-                await on_shutdown(app)
-
-        return lifespan
-
     def register(
         self,
         app: FastAPI,
         path: str,
         handler: WebHandler[Request, Response],
         *,
-        on_startup: LifecycleCallback,
-        on_shutdown: LifecycleCallback,
+        on_startup: LifecycleCallback,  # noqa: ARG002
+        on_shutdown: LifecycleCallback,  # noqa: ARG002
     ) -> None:
         async def endpoint(request: Request) -> Response:
             return await handler(self.bind_request(request))
 
-        router = APIRouter(lifespan=self._build_lifespan(on_startup, on_shutdown))
-        router.add_api_route(path=path, endpoint=endpoint, methods=["POST"])
-        app.include_router(router)
+        app.add_api_route(path=path, endpoint=endpoint, methods=["POST"])
 
     def json_response(
         self, status_code: int, data: dict[str, str] | None = None, headers: Mapping[str, str] | None = None