From 74e1380337db94bb620700a58e56e2a719b39d8a Mon Sep 17 00:00:00 2001 From: dsodx Date: Mon, 5 Jun 2023 19:31:32 +0300 Subject: [PATCH] Fix that `redis` package is required --- aiogram/fsm/__init__.py | 15 +++++++++++---- aiogram/fsm/storage/__init__.py | 6 +++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/aiogram/fsm/__init__.py b/aiogram/fsm/__init__.py index 18c351ce..7a4cd5be 100644 --- a/aiogram/fsm/__init__.py +++ b/aiogram/fsm/__init__.py @@ -1,19 +1,26 @@ +from contextlib import suppress + from .context import FSMContext from .middleware import FSMContextMiddleware from .state import State, StatesGroup, StatesGroupMeta from .storage import ( BaseEventIsolation, BaseStorage, - DefaultKeyBuilder, DisabledEventIsolation, - KeyBuilder, MemoryStorage, MemoryStorageRecord, - RedisEventIsolation, - RedisStorage, SimpleEventIsolation, StorageKey, ) + +with suppress(ImportError): + from .storage import ( + DefaultKeyBuilder, + KeyBuilder, + RedisEventIsolation, + RedisStorage, + ) + from .strategy import FSMStrategy, apply_strategy __all__ = ( diff --git a/aiogram/fsm/storage/__init__.py b/aiogram/fsm/storage/__init__.py index b64937df..1b900380 100644 --- a/aiogram/fsm/storage/__init__.py +++ b/aiogram/fsm/storage/__init__.py @@ -1,3 +1,5 @@ +from contextlib import suppress + from .base import BaseEventIsolation, BaseStorage, StorageKey from .memory import ( DisabledEventIsolation, @@ -5,7 +7,9 @@ from .memory import ( MemoryStorageRecord, SimpleEventIsolation, ) -from .redis import DefaultKeyBuilder, KeyBuilder, RedisEventIsolation, RedisStorage + +with suppress(ModuleNotFoundError): + from .redis import DefaultKeyBuilder, KeyBuilder, RedisEventIsolation, RedisStorage __all__ = ( "StorageKey",