Use DatabaseManager for search filters

Replace the SearchFilterService indirection and centralize search filter operations in DatabaseManager. Handlers now call DatabaseManager.get_and_touch_user_filters / get_user_filters / upsert_user_filters / reset_user_filters directly; upsert_user_filters now accepts a SearchFilter and JSON-serializes it internally. Deleted the old services/search_filter/search_filter_service.py module and updated imports across many handlers and clip/search/semantic handlers. Also adjusted return types and SQL in database_manager.get_user_filters to return a SearchFilter (or None) and updated callers accordingly. Additional small refactors: renamed internal parser methods in FilterParser to use private names, renamed _format_filter to __format_filter and updated usages, removed some explicit typing annotations and cleaned up list initializations. These changes centralize filter persistence logic and simplify handler code.

Author: dam2452

bot/database/database_manager.py

@@ -31,6 +31,7 @@
 )
 from bot.exceptions import TooManyActiveTokensError
 from bot.settings import settings
+from bot.types import SearchFilter
 from bot.utils.constants import DatabaseKeys
 
 db_manager_logger = logging.getLogger(__name__)
@@ -1069,15 +1070,15 @@ async def set_user_active_series(user_id: int, series_id: int) -> None:
             )
 
     @staticmethod
-    async def get_user_filters(chat_id: int) -> Optional[Dict[str, Any]]:
+    async def get_user_filters(chat_id: int) -> Optional[SearchFilter]:
         async with DatabaseManager.__get_db_connection() as conn:
             row = await conn.fetchrow(
-                "SELECT filters, last_used_at FROM user_search_filters WHERE chat_id = $1",
+                "SELECT filters FROM user_search_filters WHERE chat_id = $1",
                 chat_id,
             )
             if row is None:
                 return None
-            return {"filters": json.loads(row["filters"]), "last_used_at": row["last_used_at"]}
+            return json.loads(row["filters"]) or None
 
     @staticmethod
     async def get_and_touch_user_filters(chat_id: int) -> Optional[Dict[str, Any]]:
@@ -1096,7 +1097,7 @@ async def get_and_touch_user_filters(chat_id: int) -> Optional[Dict[str, Any]]:
             return json.loads(row["filters"])
 
     @staticmethod
-    async def upsert_user_filters(chat_id: int, filters_json: str) -> None:
+    async def upsert_user_filters(chat_id: int, filters: SearchFilter) -> None:
         async with DatabaseManager.__get_db_connection() as conn:
             async with conn.transaction():
                 await conn.execute(
@@ -1107,7 +1108,7 @@ async def upsert_user_filters(chat_id: int, filters_json: str) -> None:
                     SET filters = user_search_filters.filters || $2::jsonb,
                         last_used_at = CURRENT_TIMESTAMP
                     """,
-                    chat_id, filters_json,
+                    chat_id, json.dumps(filters),
                 )
 
     @staticmethod

bot/handlers/bot_message_handler.py

@@ -13,6 +13,7 @@
     Dict,
     List,
     Optional,
+    Tuple,
     Union,
 )
 
@@ -216,7 +217,7 @@ async def __extract_clip_with_size_guard(
         start_time: float,
         end_time: float,
         segment: Dict[str, Any],
-    ) -> tuple[Path, float, float]:
+    ) -> Tuple[Path, float, float]:
         output = await ClipsExtractor.extract_clip(video_path, start_time, end_time, self._logger)
         file_size_bytes = output.stat().st_size
         limit_bytes = settings.FILE_SIZE_LIMIT_MB * 1024 * 1024

bot/handlers/not_sending_videos/characters_handler.py

@@ -21,7 +21,6 @@
     scene_to_search_segment,
 )
 from bot.search.video_frames import CharacterFinder
-from bot.services.search_filter import SearchFilterService
 from bot.settings import settings as s
 from bot.types import CharacterScene
 
@@ -52,7 +51,8 @@ async def _do_handle(self) -> None:
         user_id = self._message.get_user_id()
         series_name = await self._get_user_active_series(user_id)
 
-        seasons = await SearchFilterService.get_seasons_from_active_filters(self._message.get_chat_id())
+        active_filter = await DatabaseManager.get_and_touch_user_filters(self._message.get_chat_id())
+        seasons = active_filter.get("seasons") if active_filter else None
 
         if not args:
             await self.__handle_list_mode(series_name, is_full)

bot/handlers/not_sending_videos/filter_handler.py

@@ -2,6 +2,7 @@
 import math
 from typing import List
 
+from bot.database.database_manager import DatabaseManager
 from bot.handlers.bot_message_handler import (
     BotMessageHandler,
     ValidatorFunctions,
@@ -18,7 +19,6 @@
 from bot.services.search_filter import (
     FilterParser,
     FilterValidator,
-    SearchFilterService,
 )
 
 
@@ -51,12 +51,12 @@ async def _do_handle(self) -> None:
             await self.__handle_set(chat_id, subcommand, series_name)
 
     async def __handle_reset(self, chat_id: int) -> None:
-        await SearchFilterService.reset_filters(chat_id)
+        await DatabaseManager.reset_user_filters(chat_id)
         await self._reply(get_filter_reset_message())
         await self._log_system_message(logging.INFO, get_log_filter_reset_message(chat_id))
 
     async def __handle_info(self, chat_id: int) -> None:
-        search_filter = await SearchFilterService.get_filters_for_display(chat_id)
+        search_filter = await DatabaseManager.get_user_filters(chat_id)
         await self._reply(get_filter_info_message(search_filter))
 
     async def __handle_set(self, chat_id: int, raw: str, series_name: str) -> None:
@@ -68,7 +68,7 @@ async def __handle_set(self, chat_id: int, raw: str, series_name: str) -> None:
             await self._reply(get_no_args_message())
             return
         resolved_filter, notes = await FilterValidator.resolve(search_filter, series_name, self._logger)
-        await SearchFilterService.update_filters(chat_id, resolved_filter)
-        active = await SearchFilterService.get_filters_for_display(chat_id)
+        await DatabaseManager.upsert_user_filters(chat_id, resolved_filter)
+        active = await DatabaseManager.get_user_filters(chat_id)
         await self._reply(get_filter_set_message(active or resolved_filter, notes))
         await self._log_system_message(logging.INFO, get_log_filter_set_message(chat_id))

bot/handlers/not_sending_videos/objects_handler.py

@@ -25,7 +25,6 @@
     object_scene_to_search_segment,
 )
 from bot.search.video_frames import ObjectFinder
-from bot.services.search_filter import SearchFilterService
 from bot.settings import settings as s
 from bot.types import (
     ObjectScene,
@@ -51,7 +50,7 @@ def _get_usage_message(self) -> str:
 
     async def __check_argument_count(self) -> bool:
         command = self._message.get_text().split()[0].lstrip("/").lower()
-        min_args = 1 if command in ObjectsHandler.__SEARCH_COMMANDS else 0
+        min_args = command in ObjectsHandler.__SEARCH_COMMANDS
         return await self._validate_argument_count(self._message, min_args, math.inf)
 
     async def _do_handle(self) -> None:
@@ -65,7 +64,8 @@ async def _do_handle(self) -> None:
         if not args:
             await self.__handle_list_mode(series_name, is_full)
         else:
-            seasons = await SearchFilterService.get_seasons_from_active_filters(self._message.get_chat_id())
+            active_filter = await DatabaseManager.get_and_touch_user_filters(self._message.get_chat_id())
+            seasons = active_filter.get("seasons") if active_filter else None
             if len(args) == 1:
                 await self.__handle_object_mode(args[0], series_name, is_full, seasons)
             else:

bot/handlers/not_sending_videos/search_handler.py

@@ -20,7 +20,6 @@
 )
 from bot.search.filter_applicator import FilterApplicator
 from bot.search.text_segments_finder import TextSegmentsFinder
-from bot.services.search_filter import SearchFilterService
 from bot.settings import settings
 
 
@@ -58,7 +57,7 @@ async def _do_handle(self) -> None:
         active_series = await self._get_user_active_series(user_id)
         chat_id = self._message.get_chat_id()
 
-        search_filter = await SearchFilterService.get_active_filters(chat_id)
+        search_filter = await DatabaseManager.get_and_touch_user_filters(chat_id)
 
         segments = await TextSegmentsFinder.find_segment_by_quote(
             quote, self._logger, active_series,

bot/handlers/not_sending_videos/semantic_search_handler.py

@@ -24,7 +24,6 @@
 )
 from bot.search.filter_applicator import FilterApplicator
 from bot.search.semantic_segments_finder import SemanticSearchMode
-from bot.services.search_filter import SearchFilterService
 from bot.utils.constants import EpisodeMetadataKeys
 
 
@@ -68,19 +67,20 @@ async def _handle_semantic_results(
             return
 
         chat_id = self._message.get_chat_id()
-        search_filter = await SearchFilterService.get_active_filters(chat_id)
-
-        if search_filter and mode != SemanticSearchMode.EPISODE:
-            results = await FilterApplicator.apply_to_text_segments(
-                results, search_filter, active_series, self._logger,
-            )
-        elif search_filter:
-            seasons = FilterApplicator.get_seasons_list(search_filter)
-            if seasons:
-                results = [
-                    r for r in results
-                    if r.get(EpisodeMetadataKeys.EPISODE_METADATA, {}).get(EpisodeMetadataKeys.SEASON) in seasons
-                ]
+        search_filter = await DatabaseManager.get_and_touch_user_filters(chat_id)
+
+        if search_filter:
+            if mode == SemanticSearchMode.EPISODE:
+                seasons = FilterApplicator.get_seasons_list(search_filter)
+                if seasons:
+                    results = [
+                        r for r in results
+                        if r.get(EpisodeMetadataKeys.EPISODE_METADATA, {}).get(EpisodeMetadataKeys.SEASON) in seasons
+                    ]
+            else:
+                results = await FilterApplicator.apply_to_text_segments(
+                    results, search_filter, active_series, self._logger,
+                )
 
         if not results:
             await self.__reply_no_segments_found(query)

bot/handlers/not_sending_videos/transcription_handler.py

@@ -6,6 +6,7 @@
     Tuple,
 )
 
+from bot.database.database_manager import DatabaseManager
 from bot.handlers.bot_message_handler import (
     BotMessageHandler,
     ValidatorFunctions,
@@ -22,7 +23,6 @@
 from bot.search.scene_finder import SceneFinder
 from bot.search.text_segments_finder import TextSegmentsFinder
 from bot.services.scene_snap.scene_snap_service import SceneSnapService
-from bot.services.search_filter import SearchFilterService
 from bot.types import TranscriptionContext
 from bot.utils.constants import (
     EpisodeMetadataKeys,
@@ -48,7 +48,7 @@ async def _do_handle(self) -> None:
         quote = " ".join(args[1:])
 
         active_series = await self._get_user_active_series(self._message.get_user_id())
-        search_filter = await SearchFilterService.get_active_filters(self._message.get_chat_id())
+        search_filter = await DatabaseManager.get_and_touch_user_filters(self._message.get_chat_id())
 
         result = await TextSegmentsFinder.find_segment_with_context(
             quote, self._logger, active_series, context_size=15, search_filter=search_filter,

bot/handlers/sending_videos/character_clip_handler.py

@@ -13,7 +13,6 @@
     get_no_scenes_found_message,
 )
 from bot.search.video_frames import CharacterFinder
-from bot.services.search_filter import SearchFilterService
 from bot.settings import settings
 
 
@@ -35,7 +34,8 @@ async def _do_handle(self) -> None:
         user_id = self._message.get_user_id()
         series_name = await self._get_user_active_series(user_id)
 
-        seasons = await SearchFilterService.get_seasons_from_active_filters(self._message.get_chat_id())
+        active_filter = await DatabaseManager.get_and_touch_user_filters(self._message.get_chat_id())
+        seasons = active_filter.get("seasons") if active_filter else None
 
         character, emotion_input, emotion_en = await self._find_character(args, series_name)
         if character is None:

bot/handlers/sending_videos/clip_handler.py

@@ -22,7 +22,6 @@
 from bot.search.filter_applicator import FilterApplicator
 from bot.search.text_segments_finder import TextSegmentsFinder
 from bot.services.scene_snap.scene_snap_service import SceneSnapService
-from bot.services.search_filter import SearchFilterService
 from bot.settings import settings
 from bot.utils.constants import SegmentKeys
 from bot.video.clips_extractor import ClipsExtractor
@@ -59,7 +58,7 @@ async def _do_handle(self) -> None:
 
         active_series = await self._get_user_active_series(msg.get_user_id())
 
-        search_filter = await SearchFilterService.get_active_filters(msg.get_chat_id())
+        search_filter = await DatabaseManager.get_and_touch_user_filters(msg.get_chat_id())
 
         raw = await TextSegmentsFinder.find_segment_by_quote(
             quote, self._logger, active_series,