Improvements to imports and type hints

Author: MasterGroosha

bot/handlers/callbacks.py

@@ -8,6 +8,8 @@
 from bot.keyboards import make_regenerate_keyboard, make_settings_keyboard
 from bot.localization import get_settings_string
 from bot.common import cb_wordcount, cb_separators, cb_prefixes
+from bot.config_reader import Config
+from bot.pwdgen import XKCD
 
 
 async def regenerate_custom_password(call: types.CallbackQuery, state: FSMContext):
@@ -17,7 +19,7 @@ async def regenerate_custom_password(call: types.CallbackQuery, state: FSMContex
     :param call: Callback Query
     :param state: current user's state & data
     """
-    pwd = call.bot.get("pwd")
+    pwd: XKCD = call.bot.get("pwd")
     data = await state.get_data()
     new_password = pwd.custom(data.get("words_count"), data.get("separators"), data.get("prefixes_suffixes"))
     await call.message.edit_text(
@@ -33,7 +35,7 @@ async def update_settings_message(call: types.CallbackQuery, data: dict):
     :param call: Callback Query
     :param data: current user's state & data
     """
-    config = call.bot.get("config")
+    config: Config = call.bot.get("config")
     lang_code = call.from_user.language_code
     words_count = data.get("words_count")
     separators_enabled = data.get("separators")
@@ -68,7 +70,6 @@ async def change_words_count(call: types.CallbackQuery, callback_data: dict, sta
     :param callback_data: buttons data
     :param state: current user's state & data
     """
-    from bot.config_reader import Config
     config: Config = call.bot.get("config")
     data = await state.get_data()
     old_value = data.get("words_count", 3)

bot/handlers/commands.py

@@ -4,11 +4,13 @@
 
 from bot.localization import get_string, get_settings_string
 from bot.keyboards import make_settings_keyboard, make_regenerate_keyboard
+from bot.config_reader import Config
+from bot.pwdgen import XKCD
 
 
 async def cmd_start(message: types.Message, state: FSMContext):
     data = await state.get_data()
-    config = message.bot.get("config")
+    config: Config = message.bot.get("config")
 
     # Check whether user's settings exist and initialize if missing
     if data.get("words_count") is None:
@@ -26,22 +28,22 @@ async def cmd_help(message: types.Message):
 
 
 async def cmd_generate_weak(message: types.Message):
-    pwd = message.bot.get("pwd")
+    pwd: XKCD = message.bot.get("pwd")
     await message.answer(hcode(pwd.weak()))
 
 
 async def cmd_generate_normal(message: types.Message):
-    pwd = message.bot.get("pwd")
+    pwd: XKCD = message.bot.get("pwd")
     await message.answer(hcode(pwd.normal()))
 
 
 async def cmd_generate_strong(message: types.Message):
-    pwd = message.bot.get("pwd")
+    pwd: XKCD = message.bot.get("pwd")
     await message.answer(hcode(pwd.strong()))
 
 
 async def cmd_generate_custom(message: types.Message, state: FSMContext):
-    pwd = message.bot.get("pwd")
+    pwd: XKCD = message.bot.get("pwd")
     data = await state.get_data()
     custom_pwd = pwd.custom(data.get("words_count"), data.get("separators"), data.get("prefixes_suffixes"))
     await message.answer(
@@ -52,13 +54,13 @@ async def cmd_generate_custom(message: types.Message, state: FSMContext):
 
 async def default(message: types.Message):
     # same as cmd_generate_normal()
-    pwd = message.bot.get("pwd")
+    pwd: XKCD = message.bot.get("pwd")
     await message.answer(hcode(pwd.normal()))
 
 
 async def cmd_settings(message: types.Message, state: FSMContext):
     data = await state.get_data()
-    config = message.bot.get("config")
+    config: Config = message.bot.get("config")
     lang_code = message.from_user.language_code
     kb = make_settings_keyboard(
         config=config,

bot/handlers/inline_mode.py

@@ -1,10 +1,11 @@
 from aiogram import types, Dispatcher
 from aiogram.utils.markdown import hcode
 from bot.localization import get_string
+from bot.pwdgen import XKCD
 
 
 async def inline_handler(query: types.InlineQuery):
-    pwd = query.bot.get("pwd")
+    pwd: XKCD = query.bot.get("pwd")
     data = [
         {
             "title_tag": "inline_strong_title",