upgrade template

Author: thehighestmath

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+charset = utf-8

example/db_adapter.py

@@ -1,5 +1,7 @@
 from datetime import datetime
 
+from .handlers.custom_types import Question
+
 
 def get_connection_to_data_base():
     pass
@@ -26,7 +28,8 @@ def create_tables_from_db(connection=None):
 @decorator_add_connection
 def delete_question_by_id_db(question_id: int, connection=None):
     """
-    удалить вопрос, варианты ответа, а также всю статистику связанную с ним из бд
+    удалить вопрос, варианты ответа,
+    а также всю статистику связанную с ним из бд
     """
     pass
 
@@ -58,23 +61,21 @@ def get_all_stat(connection=None) -> list[list]:
 
 
 @decorator_add_connection
-def get_personal_stat(telegram_id, connection=None) -> list[list]:
+def get_personal_stat(telegram_id: int, connection=None) -> list[list]:
     """
     получить личную статистику пользователя
     """
     return [[]]
 
 
 @decorator_add_connection
-def get_random_question(telegram_id, connection=None) -> tuple[int, str]:
+def get_random_question(telegram_id: int, connection=None) -> Question:
     """
     получить случайный, неотвеченный вопрос из бд
 
-    return: tuple[int, str]
-    int -- question.id
-    str -- question.text
+    return: Question
     """
-    return (0, "example")
+    return Question(id=0, text="")
 
 
 @decorator_add_connection
@@ -86,7 +87,7 @@ def get_choices_by_question_id(question_id: int, connection=None) -> list[str]:
 
 
 @decorator_add_connection
-def add_user_vote_db(choice_id, telegram_id, connection=None):
+def add_user_vote_db(choice_id: int, telegram_id: int, connection=None):
     """
     добавить голос пользователя выбранному варианту ответа
     """

example/deco.py

@@ -5,6 +5,7 @@ def wrapper():
         print('g2')
     return wrapper
 
+
 def h(func):
     def wrapper():
         print('h1')
@@ -13,10 +14,13 @@ def wrapper():
     return wrapper
 
 # @h
-# @g 
+# @g
+
+
 def f():
     print('hello')
 
+
 f = h(g(f))
 
-f()
+f()

example/handlers/__init__.py

@@ -1,6 +1,15 @@
-def register_handlers():
-    from . import add_question
-    from . import delete_question
-    from . import person_stats
-    from . import all_stats
-    from . import get_survey
+from . import (
+    add_question,
+    delete_question,
+    person_stats,
+    all_stats,
+    get_survey,
+)
+
+
+def register_handlers(bot):
+    add_question.register_handlers(bot)
+    delete_question.register_handlers(bot)
+    person_stats.register_handlers(bot)
+    all_stats.register_handlers(bot)
+    get_survey.register_handlers(bot)

example/handlers/add_question.py

@@ -2,54 +2,56 @@
 from telebot.handler_backends import StatesGroup, State
 from datetime import datetime
 
-from db_adapter import *
-
-from init_bot import bot
-
+from db_adapter import (
+    add_question_to_db,
+    add_choice_to_db,
+)
 
 
 class AdditionQuestion(StatesGroup):
     waiting_question = State()
     waiting_choices = State()
 
-ADMIN_IDS = [68360888707]
-
-def is_admin(func):
-    def wrapper(*args, **kwargs):
-        message = args[0]
-        if message.from_user.id in ADMIN_IDS:
-            func(*args, **kwargs)
-        else:
-            bot.reply_to(message, "Нет прав")
-    return wrapper
-
-@is_admin
-@bot.message_handler(commands=['create_question'])
-def start_addition_question(message: telebot.types.Message):
-    if message.from_user.id in ADMIN_IDS:
+
+ADMIN_IDS = [
+    369937974,  # @the_real_math
+]
+
+logger = telebot.logger
+
+
+def register_handlers(bot):
+    def is_admin(func):
+        def wrapper(*args, **kwargs):
+            message = args[0]
+            if message.from_user.id in ADMIN_IDS:
+                func(*args, **kwargs)
+            else:
+                bot.reply_to(message, "Нет прав")
+        return wrapper
+
+    @bot.message_handler(commands=['create_question'])
+    @is_admin
+    def start_addition_question(message: telebot.types.Message):
         bot.reply_to(message, "Введите вопрос")
         bot.set_state(message.from_user.id, AdditionQuestion.waiting_question)
-    else:
-        bot.reply_to(message, "Нет прав")
-
-
-@is_admin
-@bot.message_handler(state=AdditionQuestion.waiting_question)
-def wait_question(message: telebot.types.Message):
-    bot.reply_to(message, "Вопрос получен. Введите варианты ответа")
-    question_text = message.text
-    publish_date = datetime.now()
-    inserted_question_id = add_question_to_db(question_text, publish_date)
-    with bot.retrieve_data(message.from_user.id) as data:
-        data['question_id'] = inserted_question_id
-    bot.set_state(message.from_user.id, AdditionQuestion.waiting_choices)
-
-
-@is_admin
-@bot.message_handler(state=AdditionQuestion.waiting_choices)
-def wait_choice(message: telebot.types.Message):
-    bot.reply_to(message, "Ответы получены. Сохранил")
-    with bot.retrieve_data(message.from_user.id) as data:
-        inserted_question_id = data['question_id']
-    for x in message.text.split('\n'):
-        add_choice_to_db(x, inserted_question_id)
+
+    @bot.message_handler(state=AdditionQuestion.waiting_question)
+    @is_admin
+    def wait_question(message: telebot.types.Message):
+        bot.reply_to(message, "Вопрос получен. Введите варианты ответа")
+        question_text = message.text
+        publish_date = datetime.now()
+        inserted_question_id = add_question_to_db(question_text, publish_date)
+        with bot.retrieve_data(message.from_user.id) as data:
+            data['question_id'] = inserted_question_id
+        bot.set_state(message.from_user.id, AdditionQuestion.waiting_choices)
+
+    @bot.message_handler(state=AdditionQuestion.waiting_choices)
+    @is_admin
+    def wait_choice(message: telebot.types.Message):
+        bot.reply_to(message, "Ответы получены. Сохранил")
+        with bot.retrieve_data(message.from_user.id) as data:
+            inserted_question_id = data['question_id']
+        for x in message.text.split('\n'):
+            add_choice_to_db(x, inserted_question_id)

example/handlers/all_stats.py

@@ -1,8 +1,7 @@
 import telebot.types
 
-from init_bot import bot
 
-
-@bot.message_handler()
-def get_all_stats(message: telebot.types.Message):
-    pass
+def register_handlers(bot):
+    @bot.message_handler()
+    def get_all_stats(message: telebot.types.Message):
+        pass

example/handlers/custom_types.py

@@ -0,0 +1,7 @@
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True, kw_only=True)
+class Question:
+    id: int
+    text: str

example/handlers/delete_question.py

@@ -1,13 +1,11 @@
 import telebot.types
 
-from init_bot import bot
 
+def register_handlers(bot):
+    @bot.message_handler()
+    def start_delete_question(message: telebot.types.Message):
+        pass
 
-@bot.message_handler()
-def start_delete_question(message: telebot.types.Message):
-    pass
-
-
-@bot.message_handler()
-def process_user_answer(message: telebot.types.Message):
-    pass
+    @bot.message_handler()
+    def process_user_answer(message: telebot.types.Message):
+        pass

example/handlers/get_survey.py

@@ -1,13 +1,11 @@
 import telebot.types
 
-from init_bot import bot
 
+def register_handlers(bot):
+    @bot.message_handler()
+    def start_survey(message: telebot.types.Message):
+        pass
 
-@bot.message_handler()
-def start_survey(message: telebot.types.Message):
-    pass
-
-
-@bot.message_handler()
-def process_user_answer(message: telebot.types.Message):
-    pass
+    @bot.message_handler()
+    def process_user_answer(message: telebot.types.Message):
+        pass

example/handlers/person_stats.py

@@ -1,8 +1,7 @@
 import telebot.types
 
-from init_bot import bot
 
-
-@bot.message_handler()
-def get_my_personal_stat(message: telebot.types.Message):
-    pass
+def register_handlers(bot):
+    @bot.message_handler()
+    def get_my_personal_stat(message: telebot.types.Message):
+        pass