Refactor error handling in bot and LLM modules; improve logging format and add state management in planner

Author: AlexTkDev

bot.py

@@ -30,8 +30,10 @@ async def main():
         try:
             logger.info("Starting bot...")
             await dp.start_polling(bot)
-        except Exception as e:
-            logger.error(f"Error starting bot: {e}")
+        except (KeyboardInterrupt, SystemExit):
+            logger.info("Bot stopped!")
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            logger.error("Error starting bot: %s", e)
 
 
     asyncio.run(main())

handlers/planner.py

@@ -15,12 +15,13 @@ class PlanFormat(StatesGroup):
     """State machine for selecting the format of the study plan."""
     waiting_for_format = State()
     waiting_for_topic = State()
+    waiting_for_next_action = State()
 
     def __str__(self):
         return "PlanFormat FSM"
 
 
-@router.message(Command("plan"))  # Changed from /start to /plan
+@router.message(Command("plan"))
 async def cmd_plan(message: types.Message, state: FSMContext):
     await state.set_state(PlanFormat.waiting_for_format)
     await message.answer(
@@ -63,4 +64,29 @@ async def handle_topic(message: types.Message, state: FSMContext):
             document=types.FSInputFile(txt_path),
             caption="📄 Твой учебный план в TXT")
 
+    await state.set_state(PlanFormat.waiting_for_next_action)
+    await message.answer(
+        "Что ещё ты хотел бы сделать?",
+        reply_markup=types.InlineKeyboardMarkup(
+            inline_keyboard=[
+                [types.InlineKeyboardButton(text="🔄 Создать новый план",
+                                            callback_data="new_plan")],
+                [types.InlineKeyboardButton(text="👋 Ничего, хорошего дня!",
+                                            callback_data="goodbye")]
+            ]
+        )
+    )
+
+
+@router.callback_query(PlanFormat.waiting_for_next_action, F.data == "new_plan")
+async def handle_new_plan(callback: types.CallbackQuery, state: FSMContext):
+    await callback.answer()
+    await callback.message.edit_text("Создаем новый план!")
+    await cmd_plan(callback.message, state)
+
+
+@router.callback_query(PlanFormat.waiting_for_next_action, F.data == "goodbye")
+async def handle_goodbye(callback: types.CallbackQuery, state: FSMContext):
+    await callback.answer()
+    await callback.message.edit_text("Хорошего дня! 👋 Буду рад помочь снова, когда понадобится.")
     await state.clear()

services/llm.py

@@ -17,7 +17,7 @@
 # Локальный генератор
 def generate_local_plan(topic: str) -> list:
     """Generate a basic study plan without using API"""
-    logger.info(f"Using local plan generator for topic: {topic}")
+    logger.info("Using local plan generator for topic: %s", topic)
 
     plan = [
         f"Учебный план по теме: {topic}",
@@ -45,7 +45,8 @@ async def generate_study_plan(topic: str) -> list:
     for attempt in range(MAX_RETRIES):
         try:
             logger.info(
-                f"Generating study plan for topic: {topic} (attempt {attempt + 1}/{MAX_RETRIES})")
+                "Generating study plan for topic: %s (attempt %s/%s)",
+                topic, attempt + 1, MAX_RETRIES)
 
             response = client.chat.completions.create(
                 model="gpt-3.5-turbo",
@@ -58,16 +59,17 @@ async def generate_study_plan(topic: str) -> list:
             return text.strip().split("\n")
 
         except RateLimitError as e:
-            logger.warning(f"Rate limit error: {str(e)}. Retrying in {RETRY_DELAY} seconds...")
+            logger.warning("Rate limit error: %s. Retrying in %s seconds...",
+                           str(e), RETRY_DELAY * (attempt + 1))
             await asyncio.sleep(RETRY_DELAY * (attempt + 1))  # Экспоненциальная задержка
 
         except (APIError, OpenAIError) as e:
-            logger.error(f"OpenAI API error: {str(e)}")
+            logger.error("OpenAI API error: %s", str(e))
             logger.info("Falling back to local plan generator")
             return generate_local_plan(topic)
 
-        except Exception as e:
-            logger.error(f"Unexpected error: {str(e)}")
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            logger.error("Unexpected error: %s", str(e))
             return generate_local_plan(topic)
 
     # Если все попытки исчерпаны, используем локальный генератор

services/pdf.py

@@ -22,15 +22,15 @@ def save_plan_to_pdf(plan_lines: list[str], user_id: int) -> str:
         else:
             # Fallback to standard font
             pdf.set_font("Arial", size=12)
-    except Exception:
+    except (IOError, RuntimeError):  # Specify expected exceptions
         # If error with custom font, use standard
         pdf.set_font("Arial", size=12)
 
     # Convert non-Latin characters to ensure compatibility
     for line in plan_lines:
         try:
             pdf.multi_cell(0, 10, txt=line)
-        except Exception:
+        except (UnicodeEncodeError, RuntimeError):  # Specify expected exceptions
             # Handle encoding issues
             pdf.multi_cell(0, 10, txt="[Text encoding error]")