Skip to content

Commit

Permalink
fix for flake 8
Browse files Browse the repository at this point in the history
  • Loading branch information
chirizxc committed Nov 5, 2024
1 parent a5b3734 commit 2667b20
Show file tree
Hide file tree
Showing 62 changed files with 296 additions and 121 deletions.
17 changes: 13 additions & 4 deletions src/aiogram_dialog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,21 @@
import importlib.metadata as _metadata

from .api.entities import (
AccessSettings, ChatEvent, Data, DEFAULT_STACK_ID, GROUP_STACK_ID,
LaunchMode, ShowMode, StartMode,
DEFAULT_STACK_ID,
GROUP_STACK_ID,
AccessSettings,
ChatEvent,
Data,
LaunchMode,
ShowMode,
StartMode,
)
from .api.protocols import (
BaseDialogManager, BgManagerFactory, CancelEventProcessing,
DialogManager, DialogProtocol,
BaseDialogManager,
BgManagerFactory,
CancelEventProcessing,
DialogManager,
DialogProtocol,
UnsetId,
)
from .dialog import Dialog
Expand Down
10 changes: 7 additions & 3 deletions src/aiogram_dialog/api/entities/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@

from .access import AccessSettings
from .context import Context, Data
from .events import ChatEvent, EVENT_CONTEXT_KEY, EventContext
from .events import EVENT_CONTEXT_KEY, ChatEvent, EventContext
from .launch_mode import LaunchMode
from .media import MediaAttachment, MediaId
from .modes import ShowMode, StartMode
from .new_message import MarkupVariant, NewMessage, OldMessage, UnknownText
from .stack import DEFAULT_STACK_ID, GROUP_STACK_ID, Stack
from .update_event import (
DIALOG_EVENT_NAME, DialogAction, DialogStartEvent, DialogSwitchEvent,
DialogUpdate, DialogUpdateEvent,
DIALOG_EVENT_NAME,
DialogAction,
DialogStartEvent,
DialogSwitchEvent,
DialogUpdate,
DialogUpdateEvent,
)
5 changes: 4 additions & 1 deletion src/aiogram_dialog/api/entities/new_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
from typing import Optional, Union

from aiogram.types import (
Chat, ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup,
Chat,
ForceReply,
InlineKeyboardMarkup,
ReplyKeyboardMarkup,
ReplyKeyboardRemove,
)

Expand Down
1 change: 1 addition & 0 deletions src/aiogram_dialog/api/entities/stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from aiogram.fsm.state import State

from aiogram_dialog.api.exceptions import DialogStackOverflow

from .access import AccessSettings
from .context import Context, Data

Expand Down
16 changes: 13 additions & 3 deletions src/aiogram_dialog/api/internal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,20 @@
DialogManagerFactory,
)
from .middleware import (
CALLBACK_DATA_KEY, CONTEXT_KEY, EVENT_SIMULATED, STACK_KEY, STORAGE_KEY,
CALLBACK_DATA_KEY,
CONTEXT_KEY,
EVENT_SIMULATED,
STACK_KEY,
STORAGE_KEY,
)
from .widgets import (
ButtonVariant, DataGetter, InputWidget, KeyboardWidget,
MediaWidget, RawKeyboard, TextWidget, Widget,
ButtonVariant,
DataGetter,
InputWidget,
KeyboardWidget,
MediaWidget,
RawKeyboard,
TextWidget,
Widget,
)
from .window import WindowProtocol
3 changes: 2 additions & 1 deletion src/aiogram_dialog/api/internal/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

from aiogram_dialog.api.entities import ChatEvent
from aiogram_dialog.api.protocols import (
DialogManager, DialogRegistryProtocol,
DialogManager,
DialogRegistryProtocol,
)


Expand Down
14 changes: 10 additions & 4 deletions src/aiogram_dialog/api/internal/widgets.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
from abc import abstractmethod
from collections.abc import Awaitable, Callable
from typing import (
Any, Optional, Protocol,
runtime_checkable, Union,
Any,
Optional,
Protocol,
Union,
runtime_checkable,
)
from collections.abc import Awaitable, Callable

from aiogram.types import (
CallbackQuery, InlineKeyboardButton, KeyboardButton, Message,
CallbackQuery,
InlineKeyboardButton,
KeyboardButton,
Message,
)

from aiogram_dialog import DialogManager
Expand Down
1 change: 1 addition & 0 deletions src/aiogram_dialog/api/internal/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from aiogram_dialog.api.entities import Data, NewMessage
from aiogram_dialog.api.protocols import DialogProtocol

from .manager import DialogManager


Expand Down
5 changes: 4 additions & 1 deletion src/aiogram_dialog/api/protocols/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

from .dialog import CancelEventProcessing, DialogProtocol
from .manager import (
BaseDialogManager, BgManagerFactory, DialogManager, UnsetId,
BaseDialogManager,
BgManagerFactory,
DialogManager,
UnsetId,
)
from .media import MediaIdStorageProtocol
from .message_manager import MessageManagerProtocol, MessageNotModified
Expand Down
5 changes: 4 additions & 1 deletion src/aiogram_dialog/api/protocols/dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
from aiogram.fsm.state import State, StatesGroup

from aiogram_dialog.api.entities import (
Data, LaunchMode, NewMessage,
Data,
LaunchMode,
NewMessage,
)

from .manager import DialogManager


Expand Down
7 changes: 6 additions & 1 deletion src/aiogram_dialog/api/protocols/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@

from aiogram_dialog.api.entities import (
AccessSettings,
ChatEvent, Context, Data, ShowMode, Stack, StartMode,
ChatEvent,
Context,
Data,
ShowMode,
Stack,
StartMode,
)


Expand Down
3 changes: 2 additions & 1 deletion src/aiogram_dialog/context/access_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

from aiogram_dialog import ChatEvent
from aiogram_dialog.api.entities import (
Context, Stack,
Context,
Stack,
)
from aiogram_dialog.api.protocols import StackAccessValidator

Expand Down
26 changes: 18 additions & 8 deletions src/aiogram_dialog/context/intent_middleware.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from collections.abc import Awaitable, Callable
from logging import getLogger
from typing import Any, Optional
from collections.abc import Awaitable, Callable

from aiogram import Router
from aiogram.dispatcher.event.bases import UNHANDLED
Expand All @@ -10,30 +10,40 @@
CallbackQuery,
ChatJoinRequest,
ChatMemberUpdated,
InaccessibleMessage, Message,
InaccessibleMessage,
Message,
)
from aiogram.types.error_event import ErrorEvent

from aiogram_dialog.api.entities import (
DEFAULT_STACK_ID,
EVENT_CONTEXT_KEY,
ChatEvent,
Context,
DEFAULT_STACK_ID,
DialogUpdateEvent,
EVENT_CONTEXT_KEY,
EventContext,
Stack,
)
from aiogram_dialog.api.exceptions import (
InvalidStackIdError, OutdatedIntent, UnknownIntent, UnknownState,
InvalidStackIdError,
OutdatedIntent,
UnknownIntent,
UnknownState,
)
from aiogram_dialog.api.internal import (
CALLBACK_DATA_KEY, CONTEXT_KEY, EVENT_SIMULATED,
ReplyCallbackQuery, STACK_KEY, STORAGE_KEY,
CALLBACK_DATA_KEY,
CONTEXT_KEY,
EVENT_SIMULATED,
STACK_KEY,
STORAGE_KEY,
ReplyCallbackQuery,
)
from aiogram_dialog.api.protocols import (
DialogRegistryProtocol, StackAccessValidator,
DialogRegistryProtocol,
StackAccessValidator,
)
from aiogram_dialog.utils import remove_intent_id, split_reply_callback

from .storage import StorageProxy

logger = getLogger(__name__)
Expand Down
9 changes: 7 additions & 2 deletions src/aiogram_dialog/context/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
from aiogram import Bot
from aiogram.fsm.state import State, StatesGroup
from aiogram.fsm.storage.base import (
BaseEventIsolation, BaseStorage, StorageKey,
BaseEventIsolation,
BaseStorage,
StorageKey,
)

from aiogram_dialog.api.entities import (
AccessSettings, Context, DEFAULT_STACK_ID, Stack,
DEFAULT_STACK_ID,
AccessSettings,
Context,
Stack,
)
from aiogram_dialog.api.exceptions import UnknownIntent, UnknownState

Expand Down
7 changes: 5 additions & 2 deletions src/aiogram_dialog/dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
)
from aiogram_dialog.api.internal import Widget, WindowProtocol
from aiogram_dialog.api.protocols import (
CancelEventProcessing, DialogManager, DialogProtocol,
CancelEventProcessing,
DialogManager,
DialogProtocol,
)

from .context.intent_filter import IntentFilter
from .utils import remove_intent_id
from .widgets.data import PreviewAwareGetter
from .widgets.utils import ensure_data_getter, GetterVariant
from .widgets.utils import GetterVariant, ensure_data_getter

logger = getLogger(__name__)

Expand Down
9 changes: 6 additions & 3 deletions src/aiogram_dialog/manager/bg_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from aiogram.types import Chat, User

from aiogram_dialog.api.entities import (
DEFAULT_STACK_ID,
AccessSettings,
Data,
DEFAULT_STACK_ID,
DialogAction,
DialogStartEvent,
DialogSwitchEvent,
Expand All @@ -19,10 +19,13 @@
StartMode,
)
from aiogram_dialog.api.internal import (
FakeChat, FakeUser,
FakeChat,
FakeUser,
)
from aiogram_dialog.api.protocols import (
BaseDialogManager, BgManagerFactory, UnsetId,
BaseDialogManager,
BgManagerFactory,
UnsetId,
)
from aiogram_dialog.manager.updater import Updater
from aiogram_dialog.utils import is_chat_loaded, is_user_loaded
Expand Down
39 changes: 29 additions & 10 deletions src/aiogram_dialog/manager/manager.py
Original file line number Diff line number Diff line change
@@ -1,49 +1,68 @@
from copy import deepcopy
from logging import getLogger
from typing import Any, cast, Optional, Union
from typing import Any, Optional, Union, cast

from aiogram import Router
from aiogram.enums import ChatType
from aiogram.fsm.state import State
from aiogram.types import (
CallbackQuery, Chat, ErrorEvent, Message, ReplyKeyboardMarkup, User,
CallbackQuery,
Chat,
ErrorEvent,
Message,
ReplyKeyboardMarkup,
User,
)

from aiogram_dialog.api.entities import (
DEFAULT_STACK_ID,
EVENT_CONTEXT_KEY,
AccessSettings,
ChatEvent,
Context,
Data,
DEFAULT_STACK_ID,
EVENT_CONTEXT_KEY,
EventContext,
LaunchMode,
MediaId,
NewMessage,
OldMessage,
ShowMode,
Stack,
StartMode,
UnknownText,
)
from aiogram_dialog.api.entities import OldMessage, UnknownText
from aiogram_dialog.api.exceptions import (
IncorrectBackgroundError, InvalidKeyboardType, NoContextError,
IncorrectBackgroundError,
InvalidKeyboardType,
NoContextError,
)
from aiogram_dialog.api.internal import (
CONTEXT_KEY, EVENT_SIMULATED, FakeChat, FakeUser,
STACK_KEY, STORAGE_KEY,
CONTEXT_KEY,
EVENT_SIMULATED,
STACK_KEY,
STORAGE_KEY,
FakeChat,
FakeUser,
)
from aiogram_dialog.api.protocols import (
BaseDialogManager, DialogManager, DialogProtocol, DialogRegistryProtocol,
MediaIdStorageProtocol, MessageManagerProtocol, MessageNotModified,
BaseDialogManager,
DialogManager,
DialogProtocol,
DialogRegistryProtocol,
MediaIdStorageProtocol,
MessageManagerProtocol,
MessageNotModified,
UnsetId,
)
from aiogram_dialog.context.storage import StorageProxy
from aiogram_dialog.utils import get_media_id

from .bg_manager import (
BgManager,
coalesce_business_connection_id,
coalesce_thread_id,
)

logger = getLogger(__name__)


Expand Down
7 changes: 5 additions & 2 deletions src/aiogram_dialog/manager/manager_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
from aiogram_dialog.api.entities import ChatEvent
from aiogram_dialog.api.internal import DialogManagerFactory
from aiogram_dialog.api.protocols import (
DialogManager, DialogRegistryProtocol,
MediaIdStorageProtocol, MessageManagerProtocol,
DialogManager,
DialogRegistryProtocol,
MediaIdStorageProtocol,
MessageManagerProtocol,
)

from .manager import ManagerImpl


Expand Down
Loading

0 comments on commit 2667b20

Please sign in to comment.