Merge pull request #366 from vlkorsakov/lint_example_code

Enable flake8 use for example code and fix lint warnings

.github/workflows/setup.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Run flake8
         run: |
-          python -m flake8 src/aiogram_dialog tests
+          python -m flake8 src/aiogram_dialog tests example
 
       - name: Run tests
         run: |

example/i18n/bot.py

@@ -1,7 +1,7 @@
 """
-This is example of i18n with aiogram-dialog
-To use it you need to install `fluent.runtime` package
+This is example of i18n with aiogram-dialog.
 
+To use it you need to install `fluent.runtime` package
 Translation files are located in `translations` directory
 """
 
@@ -11,16 +11,16 @@
 
 from aiogram import Bot, Dispatcher
 from aiogram.filters import CommandStart
-from aiogram.fsm.state import StatesGroup, State
+from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import Message
-from fluent.runtime import FluentResourceLoader, FluentLocalization
+from fluent.runtime import FluentLocalization, FluentResourceLoader
+from i18n_format import I18NFormat
+from i18n_middleware import I18nMiddleware
 
 from aiogram_dialog import (
-    Dialog, DialogManager, StartMode, setup_dialogs, Window,
+    Dialog, DialogManager, setup_dialogs, StartMode, Window,
 )
 from aiogram_dialog.widgets.kbd import Button, Cancel, Row
-from i18n_format import I18NFormat
-from i18n_middleware import I18nMiddleware
 
 
 class DialogSG(StatesGroup):
@@ -43,7 +43,7 @@ async def get_data(dialog_manager: DialogManager, **kwargs):
         ),
         getter=get_data,
         state=DialogSG.greeting,
-    )
+    ),
 )
 
 DEFAULT_LOCALE = "en"

example/i18n/i18n_middleware.py

@@ -1,9 +1,8 @@
-from typing import Dict, Callable, Any, Awaitable, Union
+from typing import Any, Awaitable, Callable, Dict, Union
 
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types import CallbackQuery, Message
 from fluent.runtime import FluentLocalization
-
 from i18n_format import I18N_FORMAT_KEY
 
 

example/input_media_group.py

@@ -7,16 +7,15 @@
 from aiogram.filters import CommandStart
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.fsm.storage.memory import MemoryStorage, SimpleEventIsolation
-from aiogram.types import Message, CallbackQuery
+from aiogram.types import CallbackQuery, Message
 
 from aiogram_dialog import (
-    Dialog, Window, DialogManager, StartMode, setup_dialogs,
+    Dialog, DialogManager, setup_dialogs, StartMode, Window,
 )
 from aiogram_dialog.api.entities import MediaAttachment, MediaId
 from aiogram_dialog.widgets.common import ManagedScroll
 from aiogram_dialog.widgets.input import MessageInput
-from aiogram_dialog.widgets.kbd import StubScroll, NumberedPager, Group, Button
-from aiogram_dialog.widgets.markup.reply_keyboard import ReplyKeyboardFactory
+from aiogram_dialog.widgets.kbd import Button, Group, NumberedPager, StubScroll
 from aiogram_dialog.widgets.media import DynamicMedia
 from aiogram_dialog.widgets.text import Const, Format
 
@@ -55,7 +54,7 @@ async def getter(dialog_manager: DialogManager, **kwargs) -> dict:
         )
     else:
         media = MediaAttachment(
-            url="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Image_not_available.png/800px-Image_not_available.png?20210219185637",
+            url="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Image_not_available.png/800px-Image_not_available.png?20210219185637",  # noqa: E501
             type=ContentType.PHOTO,
         )
     return {
@@ -71,7 +70,7 @@ async def getter(dialog_manager: DialogManager, **kwargs) -> dict:
     StubScroll(id="pages", pages="media_count"),
     Group(
         NumberedPager(scroll="pages", when=F["pages"] > 1),
-        width=8
+        width=8,
     ),
     Button(Format("🗑️ Delete photo #{media_number}"), id="del",
            on_click=on_delete, when="media_count"),

example/launch_modes.py

@@ -4,12 +4,12 @@
 
 from aiogram import Bot, Dispatcher
 from aiogram.filters import CommandStart
-from aiogram.filters.state import StatesGroup, State
+from aiogram.filters.state import State, StatesGroup
 from aiogram.fsm.storage.memory import MemoryStorage
 from aiogram.types import Message
 
 from aiogram_dialog import (
-    Dialog, DialogManager, LaunchMode, Window, setup_dialogs, StartMode,
+    Dialog, DialogManager, LaunchMode, setup_dialogs, StartMode, Window,
 )
 from aiogram_dialog.widgets.kbd import Cancel, Row, Start
 from aiogram_dialog.widgets.text import Const, Format
@@ -34,7 +34,7 @@ class Product(StatesGroup):
         Const("BANNER IS HERE"),
         Start(Const("Try start"), id="start", state=MainSG.default),
         Cancel(),
-        state=BannerSG.default
+        state=BannerSG.default,
     ),
     launch_mode=LaunchMode.EXCLUSIVE,
 )
@@ -43,7 +43,7 @@ class Product(StatesGroup):
         Const("This is main menu"),
         Start(Const("Product"), id="product", state=Product.show),
         Cancel(),
-        state=MainSG.default
+        state=MainSG.default,
     ),
     # we do not worry about resetting stack
     # each time we start dialog with ROOT launch mode
@@ -67,7 +67,7 @@ async def product_getter(dialog_manager: DialogManager, **kwargs):
         ),
         Cancel(),
         getter=product_getter,
-        state=Product.show
+        state=Product.show,
     ),
     # when this dialog is on top and tries to launch a copy
     # it just replaces himself with it

example/list_group.py

@@ -5,18 +5,16 @@
 
 from aiogram import Bot, Dispatcher
 from aiogram.filters import CommandStart
-from aiogram.filters.state import StatesGroup, State
+from aiogram.filters.state import State, StatesGroup
 from aiogram.fsm.storage.memory import MemoryStorage
 from aiogram.types import Message
-from magic_filter import F
 
 from aiogram_dialog import (
-    Dialog, LaunchMode, SubManager, Window, DialogManager, StartMode,
-    setup_dialogs,
+    Dialog, DialogManager, LaunchMode, setup_dialogs, StartMode, SubManager,
+    Window,
 )
 from aiogram_dialog.widgets.kbd import (
-    Row, Checkbox, Radio, ManagedCheckbox,
-    ListGroup,
+    Checkbox, ListGroup, ManagedCheckbox, Radio, Row,
 )
 from aiogram_dialog.widgets.text import Const, Format
 
@@ -38,14 +36,14 @@ def when_checked(data: Dict, widget, manager: SubManager) -> bool:
 async def data_getter(*args, **kwargs):
     return {
         "fruits": ["mango", "papaya", "kiwi"],
-        "colors": ["blue", "pink"]
+        "colors": ["blue", "pink"],
     }
 
 
 dialog = Dialog(
     Window(
         Const(
-            "Hello, please check you options for each item:"
+            "Hello, please check you options for each item:",
         ),
         ListGroup(
             Checkbox(
@@ -61,22 +59,22 @@ async def data_getter(*args, **kwargs):
                     item_id_getter=str,
                     items=["black", "white"],
                     # Alternatives:
-                        #items=F["data"]["colors"],
-                        #items=lambda d: d["data"]["colors"],
+                    # items=F["data"]["colors"],  # noqa: E800
+                    # items=lambda d: d["data"]["colors"],  # noqa: E800
                     when=when_checked,
-                )
+                ),
             ),
             id="lg",
             item_id_getter=str,
             items=["apple", "orange", "pear"],
             # Alternatives:
-                #items=F["fruits"],
-                #items=lambda d: d["fruits"],
+            # items=F["fruits"],  # noqa: E800
+            # items=lambda d: d["fruits"],  # noqa: E800
         ),
         state=DialogSG.greeting,
-        getter=data_getter
+        getter=data_getter,
     ),
-    launch_mode=LaunchMode.SINGLE_TOP
+    launch_mode=LaunchMode.SINGLE_TOP,
 )
 
 

example/loading.py

@@ -4,12 +4,12 @@
 
 from aiogram import Bot, Dispatcher
 from aiogram.filters import CommandStart
-from aiogram.fsm.state import StatesGroup, State
+from aiogram.fsm.state import State, StatesGroup
 from aiogram.fsm.storage.memory import MemoryStorage, SimpleEventIsolation
-from aiogram.types import Message, CallbackQuery
+from aiogram.types import CallbackQuery, Message
 
 from aiogram_dialog import (
-    BaseDialogManager, Dialog, DialogManager, StartMode, Window, setup_dialogs,
+    BaseDialogManager, Dialog, DialogManager, setup_dialogs, StartMode, Window,
 )
 from aiogram_dialog.widgets.kbd import Button
 from aiogram_dialog.widgets.text import Const, Multi, Progress
@@ -25,7 +25,7 @@ class Bg(StatesGroup):
 
 async def get_bg_data(dialog_manager: DialogManager, **kwargs):
     return {
-        "progress": dialog_manager.dialog_data.get("progress", 0)
+        "progress": dialog_manager.dialog_data.get("progress", 0),
     }
 
 

example/mega/bot.py

@@ -6,20 +6,20 @@
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.filters import ExceptionTypeFilter
 from aiogram.fsm.storage.memory import MemoryStorage
-from aiogram.types import Message, ErrorEvent, ReplyKeyboardRemove
-
-from aiogram_dialog import DialogManager, setup_dialogs, StartMode, ShowMode
-from aiogram_dialog.api.exceptions import UnknownIntent
+from aiogram.types import ErrorEvent, Message, ReplyKeyboardRemove
 from bot_dialogs import states
 from bot_dialogs.calendar import calendar_dialog
 from bot_dialogs.counter import counter_dialog
 from bot_dialogs.layouts import layouts_dialog
 from bot_dialogs.main import main_dialog
 from bot_dialogs.mutltiwidget import multiwidget_dialog
+from bot_dialogs.reply_buttons import reply_kbd_dialog
 from bot_dialogs.scrolls import scroll_dialog
 from bot_dialogs.select import selects_dialog
 from bot_dialogs.switch import switch_dialog
-from bot_dialogs.reply_buttons import reply_kbd_dialog
+
+from aiogram_dialog import DialogManager, setup_dialogs, ShowMode, StartMode
+from aiogram_dialog.api.exceptions import UnknownIntent
 
 
 async def start(message: Message, dialog_manager: DialogManager):
@@ -28,7 +28,7 @@ async def start(message: Message, dialog_manager: DialogManager):
 
 
 async def on_unknown_intent(event: ErrorEvent, dialog_manager: DialogManager):
-    """Example of handling UnknownIntent Error and starting new dialog."""
+    # Example of handling UnknownIntent Error and starting new dialog.
     logging.error("Restarting dialog: %s", event.exception)
     if event.update.callback_query:
         await event.update.callback_query.answer(
@@ -66,6 +66,7 @@ async def on_unknown_intent(event: ErrorEvent, dialog_manager: DialogManager):
     reply_kbd_dialog,
 )
 
+
 def setup_dp():
     storage = MemoryStorage()
     dp = Dispatcher(storage=storage)

example/mega/bot_dialogs/calendar.py

@@ -2,20 +2,17 @@
 from typing import Dict
 
 from aiogram import F
-from aiogram.types import CallbackQuery
 from babel.dates import get_day_names, get_month_names
 
-from aiogram_dialog import (
-    Dialog, Window, DialogManager, ChatEvent,
-)
+from aiogram_dialog import ChatEvent, Dialog, DialogManager, Window
 from aiogram_dialog.widgets.kbd import (
     Calendar, CalendarScope, ManagedCalendar, SwitchTo,
 )
 from aiogram_dialog.widgets.kbd.calendar_kbd import (
     CalendarDaysView, CalendarMonthView, CalendarScopeView, CalendarYearsView,
     DATE_TEXT, TODAY_TEXT,
 )
-from aiogram_dialog.widgets.text import Const, Text, Format
+from aiogram_dialog.widgets.text import Const, Format, Text
 from . import states
 from .common import MAIN_MENU_BUTTON
 
@@ -82,15 +79,15 @@ def _init_views(self) -> Dict[CalendarScope, CalendarScopeView]:
 async def on_date_clicked(
         callback: ChatEvent, widget: ManagedCalendar,
         manager: DialogManager,
-        selected_date: date, /
+        selected_date: date, /,
 ):
     await callback.answer(str(selected_date))
 
 
 async def on_date_selected(
         callback: ChatEvent, widget: ManagedCalendar,
         manager: DialogManager,
-        clicked_date: date, /
+        clicked_date: date, /,
 ):
     selected = manager.dialog_data.setdefault(SELECTED_DAYS_KEY, [])
     serial_date = clicked_date.isoformat()
@@ -103,7 +100,7 @@ async def on_date_selected(
 async def selection_getter(dialog_manager, **_):
     selected = dialog_manager.dialog_data.get(SELECTED_DAYS_KEY, [])
     return {
-        "selected": ", ".join(sorted(selected))
+        "selected": ", ".join(sorted(selected)),
     }
 
 
@@ -116,12 +113,12 @@ async def selection_getter(dialog_manager, **_):
         SwitchTo(
             Const("Default"),
             id="default",
-            state=states.Calendar.DEFAULT
+            state=states.Calendar.DEFAULT,
         ),
         SwitchTo(
             Const("Customized"),
             id="custom",
-            state=states.Calendar.CUSTOM
+            state=states.Calendar.CUSTOM,
         ),
         MAIN_MENU_BUTTON,
         state=states.Calendar.MAIN,

example/mega/bot_dialogs/counter.py

@@ -1,11 +1,7 @@
 from aiogram.types import CallbackQuery
 
-from aiogram_dialog import (
-    Dialog, Window, DialogManager,
-)
-from aiogram_dialog.widgets.kbd import (
-    Counter, ManagedCounter,
-)
+from aiogram_dialog import Dialog, DialogManager, Window
+from aiogram_dialog.widgets.kbd import Counter, ManagedCounter
 from aiogram_dialog.widgets.text import Const, Progress
 from . import states
 from .common import MAIN_MENU_BUTTON

example/mega/bot_dialogs/layouts.py

@@ -2,7 +2,7 @@
     Dialog, Window,
 )
 from aiogram_dialog.widgets.kbd import (
-    SwitchTo, Select, Button, Row, Column, Group,
+    Button, Column, Group, Row, Select, SwitchTo,
 )
 from aiogram_dialog.widgets.text import Const, Format
 from . import states

example/mega/bot_dialogs/main.py

@@ -1,11 +1,6 @@
-from aiogram_dialog import (
-    Dialog, Window, LaunchMode,
-)
+from aiogram_dialog import Dialog, LaunchMode, Window
 from aiogram_dialog.about import about_aiogram_dialog_button
-from aiogram_dialog.widgets.kbd import (
-    Start, Row, RequestContact, RequestLocation,
-)
-from aiogram_dialog.widgets.markup.reply_keyboard import ReplyKeyboardFactory
+from aiogram_dialog.widgets.kbd import Start
 from aiogram_dialog.widgets.text import Const
 from . import states
 

example/mega/bot_dialogs/mutltiwidget.py

@@ -1,7 +1,7 @@
 from aiogram_dialog import (
     Dialog, Window,
 )
-from aiogram_dialog.widgets.kbd import Checkbox, Radio, Counter, Multiselect
+from aiogram_dialog.widgets.kbd import Checkbox, Counter, Multiselect, Radio
 from aiogram_dialog.widgets.text import Const, Format
 from . import states
 from .common import MAIN_MENU_BUTTON
@@ -36,5 +36,5 @@
         ),
         MAIN_MENU_BUTTON,
         state=states.Multiwidget.MAIN,
-    )
+    ),
 )