feat: more user friendly position removal

Author: daya0576

.gitignore

@@ -5,6 +5,7 @@ __pycache__/
 
 sql_app.db
 *.swp
+*.log
 .venv/
 .env
 tags

Dockerfile

@@ -3,14 +3,5 @@ FROM tiangolo/uvicorn-gunicorn:python3.9
 COPY requirements.txt /tmp/requirements.txt
 RUN pip install --no-cache-dir -r /tmp/requirements.txt
 
-# Install redis
-RUN set -ex; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        redis-server \
-    ; \
-    rm -rf /var/lib/apt/lists/*
-
 COPY . .
-
 CMD ["uvicorn", "telegram_bot.app:app", "--host", "0.0.0.0", "--port", "8080", "--workers", "2"]

README.md

@@ -43,4 +43,4 @@ Q. 有考虑支持多地区订阅吗(比如关心亲朋好友和出差人员)？
 A. 支持 `add_sub_locations `命令添加子城市，`delete_sub_locations` 命令清除。
 
 Q. 希望能支持 docker 部署 ，还有说明一下，哪些参数要改？
-A.
+A. WIP..

poetry.lock

@@ -11,7 +11,7 @@
 from telegram_bot.cron import cron, scheduler
 from telegram_bot.database import models
 from telegram_bot.database.database import engine
-from telegram_bot.settings import settings, aio_lru_cache_1h
+from telegram_bot.settings import settings
 
 # 日志格式设置
 logger.remove()
@@ -25,7 +25,6 @@
 app.include_router(release.router)
 
 
-@aio_lru_cache_1h
 @app.on_event("startup")
 async def startup_event():
     # 定时任务

telegram_bot/app.py

@@ -164,13 +164,15 @@ def remove_ding_bot(db: Session, chat_id: str):
     return False
 
 
-def remove_sub_locations(db: Session, chat_id: str):
-    locations = filter_locations(db, chat_id)
-    if locations:
-        for location in locations:
-            db.delete(location)
+def remove_sub_location(db: Session, location_id: str) -> bool:
+    location = (
+        db.query(models.Locations).filter(models.Locations.id == location_id).first()
+    )
+    if location:
+        db.delete(location)
         db.commit()
         return True
+    return False
 
 
 def get_cron_job(db, chat_id, hour):

telegram_bot/database/crud.py

@@ -10,9 +10,11 @@
 
 connect_args = {}
 if not settings.is_production:
-    connect_args = {'check_same_thread': False}
+    connect_args["check_same_thread"] = False
 
-engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args=connect_args)
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL, connect_args=connect_args, pool_pre_ping=True
+)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()

telegram_bot/database/database.py

@@ -5,7 +5,6 @@
 
 from aiocache import cached, Cache
 from aiogram.contrib.fsm_storage.redis import RedisStorage
-from aiogram.contrib.fsm_storage.memory import MemoryStorage
 from pydantic import BaseSettings, SecretStr
 
 

telegram_bot/settings.py

@@ -7,6 +7,8 @@
 from telegram_bot.settings import aio_lru_cache_24h
 from telegram_bot.telegram.dispatcher import dp
 from telegram_bot.telegram.keyboard.keyboard_markup_factory import (
+    HOURS_TEMPLATE,
+    REMOVE_LOCATION_PREFIX,
     KeyboardMarkUpFactory,
     WELCOME_TEXT,
     GET_WEATHER,
@@ -15,7 +17,7 @@
     DISABLE_SUB,
     UPDATE_SUB_CRON,
     BACK,
-    HOURS,
+    hour_decode,
 )
 from telegram_bot.telegram.update_location import update_location
 
@@ -163,9 +165,9 @@ async def exit_callback_handler(query: types.CallbackQuery):
         await query.answer("")
 
 
-@dp.callback_query_handler(lambda callback_query: callback_query.data in HOURS)
+@dp.callback_query_handler(lambda callback_query: callback_query.data in HOURS_TEMPLATE)
 async def sub_cron_update_callback_handler(query: types.CallbackQuery):
-    hour = query.data
+    hour = hour_decode(query.data)
     chat_id = query.message.chat.id
 
     with get_db_session() as db:
@@ -183,3 +185,37 @@ async def sub_cron_update_callback_handler(query: types.CallbackQuery):
         db.refresh(user)
         cron_sub_menu = KeyboardMarkUpFactory.build_cron_options(user)
         await query.message.edit_reply_markup(cron_sub_menu)
+
+
+@dp.message_handler(commands=["delete_sub_locations"])
+async def remove_ding_token(message: types.Message) -> None:
+    chat_id = str(message.chat.id)
+    with get_db_session() as db:
+        locations = crud.filter_locations(db, chat_id)
+    if not locations:
+        await message.reply("不存在其他子位置")
+        return
+
+    mark_up = KeyboardMarkUpFactory.build_sub_locations(locations)
+    await TelegramMessageService.send_keyboard_markup(
+        dp.bot, chat_id, "单击城市删除👇", mark_up
+    )
+
+
+@dp.callback_query_handler(
+    lambda callback_query: REMOVE_LOCATION_PREFIX in callback_query.data
+)
+async def delete_sub_location_update_callback_handler(query: types.CallbackQuery):
+    location_id = query.data.replace(REMOVE_LOCATION_PREFIX, "")
+    chat_id = str(query.message.chat.id)
+
+    with get_db_session() as db:
+        deleted = crud.remove_sub_location(db, location_id)
+        if not deleted:
+            return
+
+        await query.answer("删除成功")
+
+        locations = crud.filter_locations(db, chat_id)
+        cron_sub_menu = KeyboardMarkUpFactory.build_sub_locations(locations)
+        await query.message.edit_reply_markup(cron_sub_menu)

telegram_bot/telegram/callbacks.py

@@ -1,8 +1,10 @@
-from typing import Optional
+import itertools
+from typing import List, Optional, Union
 
 from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 
-from telegram_bot.database import models
+from telegram_bot.database import crud, models
+from telegram_bot.database.database import get_db, get_db_session
 
 WELCOME_TEXT = """\
 基于「和风」的天气预报机器人；根据定位查询精准实时天气，并每天自动播报。
@@ -15,7 +17,14 @@
 UPDATE_SUB_CRON = "update_cron"
 BACK = "back"
 
+REMOVE_LOCATION_PREFIX = "remove_location_"
+
+# fmt: off
+def hour_encode(hour: Union[int, str]) -> str: return f"cron_{hour}"
+def hour_decode(hour: str) -> str: return hour.replace("cron_", "")
+# fmt: on
 HOURS = tuple(str(x) for x in range(0, 24, 2))
+HOURS_TEMPLATE = tuple(hour_encode(x) for x in range(0, 24, 2))
 
 
 class KeyboardMarkUpFactory:
@@ -24,16 +33,20 @@ def build_main_menu(chat: "models.Chat") -> InlineKeyboardMarkup:
         keyboard_markup = InlineKeyboardMarkup(row_width=6)
 
         # 第一行：天气获取
-        weather_button = InlineKeyboardButton('获取实时天气', callback_data=GET_WEATHER)
+        weather_button = InlineKeyboardButton("获取实时天气", callback_data=GET_WEATHER)
         keyboard_markup.add(weather_button)
 
         # 第二行：自定义配置
-        inline_buttons = [InlineKeyboardButton('更新位置', callback_data=UPDATE_LOCATION)]
+        inline_buttons = [InlineKeyboardButton("更新位置", callback_data=UPDATE_LOCATION)]
         if chat and chat.is_location_exist:
-            sub_cron_button = InlineKeyboardButton('定时订阅', callback_data=UPDATE_SUB_CRON)
+            sub_cron_button = InlineKeyboardButton(
+                "定时订阅", callback_data=UPDATE_SUB_CRON
+            )
             inline_buttons.append(sub_cron_button)
 
-        star_button = InlineKeyboardButton('关注项目✨', url="https://github.com/daya0576/he_weather_bot")
+        star_button = InlineKeyboardButton(
+            "关注项目✨", url="https://github.com/daya0576/he_weather_bot"
+        )
         inline_buttons.append(star_button)
         keyboard_markup.row(*inline_buttons)
 
@@ -49,12 +62,33 @@ def build_cron_options(chat: "models.Chat") -> Optional[InlineKeyboardMarkup]:
         chunk_size = 6
         for x in range(0, len(HOURS), chunk_size):
             inline_btn_list = []
-            for hour in HOURS[x:x + chunk_size]:
+            for hour in HOURS[x : x + chunk_size]:
                 hour_formatted = f"{hour}✓" if hour in chat.sub_hours else hour
-                btn = InlineKeyboardButton(hour_formatted, callback_data=hour)
+                btn = InlineKeyboardButton(
+                    hour_formatted, callback_data=hour_encode(hour)
+                )
                 inline_btn_list.append(btn)
             keyboard_markup.row(*inline_btn_list)
 
         back_btn = InlineKeyboardButton("返回", callback_data=BACK)
         keyboard_markup.add(back_btn)
         return keyboard_markup
+
+    @staticmethod
+    def build_sub_locations(
+        locations: List["models.Locations"],
+    ) -> Optional[InlineKeyboardMarkup]:
+        keyboard_markup = InlineKeyboardMarkup(row_width=6)
+
+        chunk_size = 4
+        for i in range(0, len(locations), chunk_size):
+            inline_position_list = []
+            for location in locations[i : i + chunk_size]:
+                btn = InlineKeyboardButton(
+                    str(location.city_name),
+                    callback_data=f"{REMOVE_LOCATION_PREFIX}{location.id}",
+                )
+                inline_position_list.append(btn)
+            keyboard_markup.row(*inline_position_list)
+
+        return keyboard_markup