mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Some checks failed
Tests / tests (macos-latest, 3.10) (push) Has been cancelled
Tests / tests (macos-latest, 3.11) (push) Has been cancelled
Tests / tests (macos-latest, 3.12) (push) Has been cancelled
Tests / tests (macos-latest, 3.13) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.10) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.11) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.12) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.13) (push) Has been cancelled
Tests / tests (windows-latest, 3.10) (push) Has been cancelled
Tests / tests (windows-latest, 3.11) (push) Has been cancelled
Tests / tests (windows-latest, 3.12) (push) Has been cancelled
Tests / tests (windows-latest, 3.13) (push) Has been cancelled
Tests / pypy-tests (macos-latest, pypy3.10) (push) Has been cancelled
Tests / pypy-tests (macos-latest, pypy3.11) (push) Has been cancelled
Tests / pypy-tests (ubuntu-latest, pypy3.10) (push) Has been cancelled
Tests / pypy-tests (ubuntu-latest, pypy3.11) (push) Has been cancelled
* Drop py3.9 and pypy3.9 Add pypy3.11 (testing) into `tests.yml` Remove py3.9 from matrix in `tests.yml` Refactor not auto-gen code to be compatible with py3.10+, droping ugly 3.9 annotation. Replace some `from typing` imports to `from collections.abc`, due to deprecation Add `from __future__ import annotations` and `if TYPE_CHECKING:` where possible Add some `noqa` to calm down Ruff in some places, if Ruff will be used as default linting+formatting tool in future Replace some relative imports to absolute Sort `__all__` tuples in `__init__.py` and some other `.py` files Sort `__slots__` tuples in classes Split raises into `msg` and `raise` (`EM101`, `EM102`) to not duplicate error message in the traceback Add `Self` from `typing_extenstion` where possible Resolve typing problem in `aiogram/filters/command.py:18` Concatenate nested `if` statements Convert `HandlerContainer` into a dataclass in `aiogram/fsm/scene.py` Bump tests docker-compose.yml `redis:6-alpine` -> `redis:8-alpine` Bump tests docker-compose.yml `mongo:7.0.6` -> `mongo:8.0.14` Bump pre-commit-config `black==24.4.2` -> `black==25.9.0` Bump pre-commit-config `ruff==0.5.1` -> `ruff==0.13.3` Update Makefile lint for ruff to show fixes Add `make outdated` into Makefile Use `pathlib` instead of `os.path` Bump `redis[hiredis]>=5.0.1,<5.3.0` -> `redis[hiredis]>=6.2.0,<7` Bump `cryptography>=43.0.0` -> `cryptography>=46.0.0` due to security reasons Bump `pytz~=2023.3` -> `pytz~=2025.2` Bump `pycryptodomex~=3.19.0` -> `pycryptodomex~=3.23.0` due to security reasons Bump linting and formatting tools * Add `1726.removal.rst` * Update aiogram/utils/dataclass.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update aiogram/filters/callback_data.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update 1726.removal.rst * Remove `outdated` from Makefile * Add `__slots__` to `HandlerContainer` * Remove unused imports * Add `@dataclass` with `slots=True` to `HandlerContainer` --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
95 lines
3.3 KiB
Python
95 lines
3.3 KiB
Python
import asyncio
|
|
import inspect
|
|
import warnings
|
|
from collections.abc import Callable
|
|
from dataclasses import dataclass, field
|
|
from functools import partial
|
|
from typing import Any
|
|
|
|
from magic_filter.magic import MagicFilter as OriginalMagicFilter
|
|
|
|
from aiogram.dispatcher.flags import extract_flags_from_object
|
|
from aiogram.filters.base import Filter
|
|
from aiogram.handlers import BaseHandler
|
|
from aiogram.utils.magic_filter import MagicFilter
|
|
from aiogram.utils.warnings import Recommendation
|
|
|
|
CallbackType = Callable[..., Any]
|
|
|
|
|
|
@dataclass
|
|
class CallableObject:
|
|
callback: CallbackType
|
|
awaitable: bool = field(init=False)
|
|
params: set[str] = field(init=False)
|
|
varkw: bool = field(init=False)
|
|
|
|
def __post_init__(self) -> None:
|
|
callback = inspect.unwrap(self.callback)
|
|
self.awaitable = inspect.isawaitable(callback) or inspect.iscoroutinefunction(callback)
|
|
spec = inspect.getfullargspec(callback)
|
|
self.params = {*spec.args, *spec.kwonlyargs}
|
|
self.varkw = spec.varkw is not None
|
|
|
|
def _prepare_kwargs(self, kwargs: dict[str, Any]) -> dict[str, Any]:
|
|
if self.varkw:
|
|
return kwargs
|
|
|
|
return {k: kwargs[k] for k in self.params if k in kwargs}
|
|
|
|
async def call(self, *args: Any, **kwargs: Any) -> Any:
|
|
wrapped = partial(self.callback, *args, **self._prepare_kwargs(kwargs))
|
|
if self.awaitable:
|
|
return await wrapped()
|
|
return await asyncio.to_thread(wrapped)
|
|
|
|
|
|
@dataclass
|
|
class FilterObject(CallableObject):
|
|
magic: MagicFilter | None = None
|
|
|
|
def __post_init__(self) -> None:
|
|
if isinstance(self.callback, OriginalMagicFilter):
|
|
# MagicFilter instance is callable but generates
|
|
# only "CallOperation" instead of applying the filter
|
|
self.magic = self.callback
|
|
self.callback = self.callback.resolve
|
|
if not isinstance(self.magic, MagicFilter):
|
|
# Issue: https://github.com/aiogram/aiogram/issues/990
|
|
warnings.warn(
|
|
category=Recommendation,
|
|
message="You are using F provided by magic_filter package directly, "
|
|
"but it lacks `.as_()` extension."
|
|
"\n Please change the import statement: from `from magic_filter import F` "
|
|
"to `from aiogram import F` to silence this warning.",
|
|
stacklevel=6,
|
|
)
|
|
|
|
super().__post_init__()
|
|
|
|
if isinstance(self.callback, Filter):
|
|
self.awaitable = True
|
|
|
|
|
|
@dataclass
|
|
class HandlerObject(CallableObject):
|
|
filters: list[FilterObject] | None = None
|
|
flags: dict[str, Any] = field(default_factory=dict)
|
|
|
|
def __post_init__(self) -> None:
|
|
super().__post_init__()
|
|
callback = inspect.unwrap(self.callback)
|
|
if inspect.isclass(callback) and issubclass(callback, BaseHandler):
|
|
self.awaitable = True
|
|
self.flags.update(extract_flags_from_object(callback))
|
|
|
|
async def check(self, *args: Any, **kwargs: Any) -> tuple[bool, dict[str, Any]]:
|
|
if not self.filters:
|
|
return True, kwargs
|
|
for event_filter in self.filters:
|
|
check = await event_filter.call(*args, **kwargs)
|
|
if not check:
|
|
return False, kwargs
|
|
if isinstance(check, dict):
|
|
kwargs.update(check)
|
|
return True, kwargs
|