Refactored utils.py

Created constants FORBIDDEN_CHARS, PUNCTUATION, PASSWORD_CHARS
Removed pipe from forbidden chars
Moved Message type alias to the top of the file
Optimized _base_check and made its parameter positional only
Changed gen_password to use said constants

src/__init__.py

@@ -1,12 +1,10 @@
 import os
 
 from dotenv import load_dotenv
-from sqlalchemy.future import Engine
 
 from . import bot, cryptography, database
 
 __all__ = ["bot", "cryptography", "database"]
-engine: Engine
 
 
 def main() -> None:
@@ -16,7 +14,7 @@ def main() -> None:
         user=os.getenv("DB_USER"),
         passwd=os.getenv("DB_PASS"),
         db=os.getenv("DB_NAME"),
-    )  # type: ignore
+    )
     database.prepare.prepare(engine)
-    bot_ = bot.create_bot(os.getenv("TG_TOKEN"), engine)  # type: ignore
+    bot_ = bot.create_bot(os.getenv("TG_TOKEN"), engine)
     bot_.infinity_polling()

src/bot/handlers.py

@@ -22,9 +22,7 @@ from .utils import (
 Message = telebot.types.Message
 
 
-def get_accounts(
+def get_accounts(bot: telebot.TeleBot, engine: Engine, mes: Message) -> None:
-    bot: telebot.TeleBot, engine: Engine, mes: telebot.types.Message
-) -> None:
     base_handler(bot, mes)
     accounts = database.get.get_accounts(engine, mes.from_user.id)
     if not accounts:
@@ -42,9 +40,7 @@ def get_accounts(
     )
 
 
-def delete_all(
+def delete_all(bot: telebot.TeleBot, engine: Engine, mes: Message) -> None:
-    bot: telebot.TeleBot, engine: Engine, mes: telebot.types.Message
-) -> None:
     base_handler(bot, mes)
     bot_mes = bot.send_message(
         mes.chat.id,
@@ -333,7 +329,7 @@ def _delete_account2(
     send_tmp_message(bot, mes.chat.id, "Аккаунт удалён")
 
 
-def help(bot: telebot.TeleBot, mes: telebot.types.Message) -> None:
+def help(bot: telebot.TeleBot, mes: Message) -> None:
     message = """Команды:
 /set_master_pass - установить мастер пароль
 /add_account - создать аккаунт

src/bot/utils.py

@@ -11,7 +11,16 @@ from sqlalchemy.future import Engine
 from .. import cryptography, database
 
 
-class Account(pydantic.BaseModel):
+FORBIDDEN_CHARS = frozenset("`\n")
+PUNCTUATION = frozenset(string.punctuation).difference(FORBIDDEN_CHARS)
+PASSWORD_CHARS = tuple(
+    frozenset(string.ascii_letters + string.digits).difference(FORBIDDEN_CHARS)
+    | PUNCTUATION
+)
+Message = telebot.types.Message
+
+
+class _Account(pydantic.BaseModel):
     name: str
     login: str
     passwd: str
@@ -25,11 +34,11 @@ class Account(pydantic.BaseModel):
 
 
 class _Accounts(pydantic.BaseModel):
-    accounts: list[Account] = pydantic.Field(default_factory=list)
+    accounts: list[_Account] = pydantic.Field(default_factory=list)
 
 
 def _accounts_list_to_json(accounts: list[tuple[str, str, str]]) -> str:
-    accounts = _Accounts(accounts=[Account.from_tuple(i) for i in accounts])
+    accounts = _Accounts(accounts=[_Account.from_tuple(i) for i in accounts])
     return accounts.json()
 
 
@@ -38,9 +47,6 @@ def json_to_accounts(json_: str) -> list[tuple[str, str, str]]:
     return [i.as_tuple() for i in accounts.accounts]
 
 
-Message = telebot.types.Message
-
-
 def send_tmp_message(
     bot: telebot.TeleBot, chat_id: telebot.types.Message, text: str, timeout: int = 5
 ) -> None:
@@ -78,9 +84,9 @@ def accounts_to_json(accounts: list[tuple[str, str, str]]) -> io.StringIO:
     return file
 
 
-def _base_check(val: str) -> bool:
+def _base_check(val: str, /) -> bool:
     "Returns false if finds new lines or backtick (`)"
-    return not ("\n" in val or "`" in val)
+    return not any(i in FORBIDDEN_CHARS for i in val)
 
 
 def check_account_name(name: str) -> bool:
@@ -106,17 +112,14 @@ def check_account(name: str, login: str, passwd: str) -> bool:
 def gen_passwd() -> str:
     """Generates password of length 32"""
     choices = SystemRandom().choices
-    chars = frozenset(string.ascii_letters + string.digits + string.punctuation)
-    # Remove backtick and pipe characters and convert into tuple
-    chars = tuple(chars.difference("`|"))
     while True:
-        passwd = "".join(choices(chars, k=32))
+        passwd = "".join(choices(PASSWORD_CHARS, k=32))
-        passwd_chars = frozenset(passwd)
         # If there is at least one lowercase character, uppercase character
         # and one punctuation character
         if (
-            passwd_chars.intersection(string.ascii_lowercase)
+            any(c.islower() for c in passwd)
-            and passwd_chars.intersection(string.ascii_uppercase)
+            and any(c.isupper() for c in passwd)
-            and passwd_chars.intersection(string.punctuation)
+            and any(c.isdigit() for c in passwd)
+            and any(c in PUNCTUATION for c in passwd)
         ):
             return passwd