mirror of
https://github.com/aiogram/aiogram.git
synced 2025-12-14 10:53:23 +00:00
PoC Scenes (#1280)
* Base implementation
* Small refactoring + added possibility to specify post-action on handlers
* Move scene properties to config object
* Revise aiogram/scenes with wizard-based design pattern
Modified files in aiogram/scenes to incorporate the Wizard design pattern. Files affected are _marker.py, _registry.py, _wizard.py and __init__.py. The changes introduced a SceneWizard Class and ScenesManager, both of which aid in controlling navigation between different scenes or states. This helps clarifying the codebase, streamline scene transitions and offer more control over the app flow.
* Added example
* Small optimizations
* Replace ValueError with SceneException in scenes. Added error safety in scene resolver.
* str
* Added possibility to reset context on scene entered and to handle callback query in any state
* Remove inline markup in example
* Small changes
* Docs + example
* Small refactoring
* Remove scene inclusion methods from router
The methods for including scenes as sub-routers have been removed from the router.py file. Instead, the SceneRegistry class is now set to register scenes by default upon initializing. This streamlines the scene management process by removing redundant routers and making registration automatic.
* Init tests
* Small fix in tests
* Add support for State instance in the scene
The aiogram FSM scene now allows the use of State instance as an argument, enabling more customization. Modified the 'as_handler' method to receive **kwargs arguments, allowing passing of attributes to the handler. An additional type check has been also added to ensure the 'scene' is either a subclass of Scene or a string.
* Fixed test
* Expand test coverage for test_fsm module
The commit enhances tests for the test_fsm module to improve code reliability. It includes additional unit tests for the ObserverDecorator and ActionContainer classes and introduces new tests for the SceneHandlerWrapper class. This ensures the correct functionality of the decorator methods, the action container execution, and the handler wrapper.
* Reformat code
* Fixed long line in the example
* Skip some tests on PyPy
* Change mock return_value
* Compatibility...
* Compatibility...
* Compatibility...
* Added base changes description
* Scenes Tests (#1369)
* ADD tests for `SceneRegistry`
* ADD tests for `ScenesManager`
* ADD Changelog
* Revert "ADD Changelog"
This reverts commit 6dd9301252.
* Remove `@pytest.mark.asyncio`, Reformat code
* Scenes Tests. Part 2 (#1371)
* ADD tests for `SceneWizard`
* ADD tests for `Scene`
* Refactor ObserverDecorator to use on.message syntax in test_scene.py
Cover `Scene::__init_subclass__::if isinstance(value, ObserverDecorator):`
* Refactor `HistoryManager` in `aiogram/fsm/scene.py`
Removed condition that checked if 'history' is empty before calling 'update_data' in 'Scene'.
* ADD tests for `HistoryManager`
* Small changes in the documentation
* Small changes in the documentation
* Small changes in the documentation
---------
Co-authored-by: Andrew <11490628+andrew000@users.noreply.github.com>
This commit is contained in:
parent
ce4e1a706d
commit
3d63bf3b99
14 changed files with 3234 additions and 23 deletions
|
|
@ -46,7 +46,7 @@ class TestEventObserver:
|
|||
assert observer.handlers[2].awaitable
|
||||
|
||||
with patch(
|
||||
"aiogram.dispatcher.event.handler.CallableMixin.call",
|
||||
"aiogram.dispatcher.event.handler.CallableObject.call",
|
||||
new_callable=AsyncMock,
|
||||
) as mocked_my_handler:
|
||||
results = await observer.trigger("test")
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import pytest
|
|||
from magic_filter import F as A
|
||||
|
||||
from aiogram import F
|
||||
from aiogram.dispatcher.event.handler import CallableMixin, FilterObject, HandlerObject
|
||||
from aiogram.dispatcher.event.handler import CallableObject, FilterObject, HandlerObject
|
||||
from aiogram.filters import Filter
|
||||
from aiogram.handlers import BaseHandler
|
||||
from aiogram.types import Update
|
||||
|
|
@ -38,16 +38,16 @@ class SyncCallable:
|
|||
return locals()
|
||||
|
||||
|
||||
class TestCallableMixin:
|
||||
class TestCallableObject:
|
||||
@pytest.mark.parametrize("callback", [callback2, TestFilter()])
|
||||
def test_init_awaitable(self, callback):
|
||||
obj = CallableMixin(callback)
|
||||
obj = CallableObject(callback)
|
||||
assert obj.awaitable
|
||||
assert obj.callback == callback
|
||||
|
||||
@pytest.mark.parametrize("callback", [callback1, SyncCallable()])
|
||||
def test_init_not_awaitable(self, callback):
|
||||
obj = CallableMixin(callback)
|
||||
obj = CallableObject(callback)
|
||||
assert not obj.awaitable
|
||||
assert obj.callback == callback
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ class TestCallableMixin:
|
|||
],
|
||||
)
|
||||
def test_init_args_spec(self, callback: Callable, args: Set[str]):
|
||||
obj = CallableMixin(callback)
|
||||
obj = CallableObject(callback)
|
||||
assert set(obj.params) == args
|
||||
|
||||
def test_init_decorated(self):
|
||||
|
|
@ -82,8 +82,8 @@ class TestCallableMixin:
|
|||
def callback2(foo, bar, baz):
|
||||
pass
|
||||
|
||||
obj1 = CallableMixin(callback1)
|
||||
obj2 = CallableMixin(callback2)
|
||||
obj1 = CallableObject(callback1)
|
||||
obj2 = CallableObject(callback2)
|
||||
|
||||
assert set(obj1.params) == {"foo", "bar", "baz"}
|
||||
assert obj1.callback == callback1
|
||||
|
|
@ -127,17 +127,17 @@ class TestCallableMixin:
|
|||
def test_prepare_kwargs(
|
||||
self, callback: Callable, kwargs: Dict[str, Any], result: Dict[str, Any]
|
||||
):
|
||||
obj = CallableMixin(callback)
|
||||
obj = CallableObject(callback)
|
||||
assert obj._prepare_kwargs(kwargs) == result
|
||||
|
||||
async def test_sync_call(self):
|
||||
obj = CallableMixin(callback1)
|
||||
obj = CallableObject(callback1)
|
||||
|
||||
result = await obj.call(foo=42, bar="test", baz="fuz", spam=True)
|
||||
assert result == {"foo": 42, "bar": "test", "baz": "fuz"}
|
||||
|
||||
async def test_async_call(self):
|
||||
obj = CallableMixin(callback2)
|
||||
obj = CallableObject(callback2)
|
||||
|
||||
result = await obj.call(foo=42, bar="test", baz="fuz", spam=True)
|
||||
assert result == {"foo": 42, "bar": "test", "baz": "fuz"}
|
||||
|
|
|
|||
1547
tests/test_fsm/test_scene.py
Normal file
1547
tests/test_fsm/test_scene.py
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue