Add notification test

Author: shinonomeow

backend/src/module/api/config.py

@@ -5,6 +5,7 @@
 
 from module.conf import settings
 from module.models import APIResponse, Config
+from module.models.config import Notification
 from module.security.api import get_current_user
 
 router = APIRouter(prefix="/config", tags=["config"])
@@ -15,13 +16,43 @@
 async def get_config():
     return settings
 
+# 测试通知的是否生效
+@router.post("/test_notify", response_model=APIResponse, dependencies=[Depends(get_current_user)])
+async def test_notify(config: Notification):
+    try:
+        from module.notification.notification import PostNotification
+        from module.models import Message
+        print(config)
+
+        title = "AB通知测试"
+        link = "https://mikanani.me/images/Bangumi/202507/8a6beaff.jpg"
+        nt = Message(title=title, season="1", episode="1", poster_path=link)
+        sender = PostNotification()
+        sender.initialize(config)
+        await sender.send(nt)
+
+        logger.info("Notification test completed")
+        return JSONResponse(
+            status_code=200,
+            content={
+                "msg_en": "Test notification sent successfully.",
+                "msg_zh": "测试通知发送成功。",
+            },
+        )
+    except Exception as e:
+        logger.warning(e)
+        return JSONResponse(
+            status_code=406,
+            content={"msg_en": "Test notification failed.", "msg_zh": "测试通知失败。"},
+        )
+
 
 @router.patch(
     "/update", response_model=APIResponse, dependencies=[Depends(get_current_user)]
 )
 async def update_config(config: Config):
     try:
-        settings.save(config_dict=config.dict())
+        settings.save(config_dict=config.model_dump())
         settings.load()
         # update_rss()
         logger.info("Config updated")

backend/src/module/database/migration.py

@@ -408,6 +408,11 @@ def check_and_upgrade_database() -> bool:
 
         logger.info(f"数据库版本: {db_version}, 应用版本: {app_version}")
 
+        # 对 dev 版本进行特殊处理
+        if app_version == "DEV_VERSION":
+            logger.info("当前应用版本为开发版本，跳过数据库升级")
+            return True
+
         # 先检查应用版本是否大于数据库版本，如果不是则什么都不做
         version_comparison = migration._version_compare(app_version, db_version)
         if version_comparison <= 0:

backend/src/module/manager/renamer.py

@@ -4,7 +4,7 @@
 from module.conf import settings
 from module.database import Database
 from module.downloader import Client as download_client
-from module.models import EpisodeFile, Notification, SubtitleFile
+from module.models import EpisodeFile, Message, SubtitleFile
 from module.models.bangumi import Bangumi
 from module.models.torrent import Torrent
 from module.parser import TitleParser, TmdbParser
@@ -173,17 +173,17 @@ async def rename_file(
         logger.debug(f"[Renamer] {ep=} ")
         if result and file_type == "media":
             # 重命名成功, 发送通知
-            notify_info = Notification(
+            notify_info = Message(
                 title=bangumi_name,
-                season=season,
-                episode=ep.episode,
+                season=str(season),
+                episode=str(ep.episode),
                 poster_path=bangumi.poster_link if bangumi else "",
             )
             await self._publish_notification_request(notify_info)
 
         return result
 
-    async def _publish_notification_request(self, notify_info: Notification) -> None:
+    async def _publish_notification_request(self, notify_info: Message) -> None:
         """发布下载开始事件
 
         Args:

backend/src/module/models/__init__.py

@@ -1,4 +1,4 @@
-from .bangumi import Bangumi, BangumiUpdate, Episode, Notification
+from .bangumi import Bangumi, BangumiUpdate, Episode, Message
 from .config import Config
 from .database_version import DatabaseVersion
 from .mikan import MikanInfo
@@ -28,7 +28,7 @@
     "BangumiUpdate",
     "Config",
     "Episode",
-    "Notification",
+    "Message",
     "APIResponse",
     "ResponseModel",
     "RSSItem",

backend/src/module/models/bangumi.py

@@ -44,11 +44,11 @@ class BangumiUpdate(BangumiBase):
     pass
 
 
-class Notification(BaseModel):
+class Message(BaseModel):
     title: str = Field(..., alias="title", title="标题")
     message: str = Field(default="", alias="message", title="消息")
-    season: int = Field(default=1, ge=1, alias="season", title="番剧季度")
-    episode: int = Field(default="", alias="episode", title="番剧集数")
+    season: str = Field(default="",  alias="season", title="番剧季度")
+    episode: str = Field(default="", alias="episode", title="番剧集数")
     poster_path: str = Field(default="", alias="poster_path", title="番剧海报路径")
     file: bytes | None = Field(default=None, alias="file", title="文件内容")
 

backend/src/module/network/cache.py

@@ -24,7 +24,7 @@ async def load_image(img_path: str) -> bytes | None:
     # is http or https
     if img_path.startswith("http"):
         img_path = url_to_str(img_path)
-    image_path = Path("data") / img_path
+    image_path = Path("data") / Path("posters")/ img_path
     if img_path and isfile(image_path):
         with open(image_path, "rb") as f:
             return f.read()

backend/src/module/notification/notification.py

@@ -1,14 +1,11 @@
-from __future__ import annotations
-
+import importlib
 import logging
-from enum import Enum
 
 from module.conf import settings
 from module.database import Database
-from module.models import Notification
+from module.models import Message
+from module.models.config import Notification
 from module.network import load_image
-import importlib
-
 from module.notification.plugin.log import Notifier
 
 logger = logging.getLogger(__name__)
@@ -36,12 +33,12 @@ def get_poster_from_db(title: str) -> str:
             logger.error(f"获取海报失败: {title} - {e}")
             return ""
 
-    async def process_notification(self, notify: Notification) -> Notification:
+    async def process_notification(self, notify: Message) -> Message:
         """
         处理通知对象，进行必要的数据解析和补充
         """
         # 创建副本，避免修改原对象
-        processed = Notification(
+        processed = Message(
             title=notify.title,
             season=notify.season,
             episode=notify.episode,
@@ -70,17 +67,25 @@ class PostNotification:
     """
 
     def __init__(self) -> None:
-        self.processor = NotificationProcessor()
+        self.processor: NotificationProcessor = NotificationProcessor()
         self.logger = logging.getLogger(self.__class__.__name__)
-        self.notifier = None
+        self.config: Notification = settings.notification
+        self.notifier = Notifier(**self.config.model_dump())
 
-    def initialize(self) -> None:
+    def initialize(self,config:Notification|None = None) -> None:
         """根据设置创建通知管理器"""
-        self.notifier = self._get_notifier()
-        self.notifier.initialize()
-
-    def _get_notifier(self):
-        notification_type = settings.notification.type
+        self.config = settings.notification
+        if not self.config.enable:
+            logger.info("通知功能已禁用")
+            return
+        self.notifier = self._get_notifier(config)
+        # self.notifier.initialize()
+
+    def _get_notifier(self, config: Notification | None = None) -> Notifier:
+        print(f"获取通知器: {config}")
+        if config is None:
+            config = self.config
+        notification_type = config.type
         package_path = f"module.notification.plugin.{notification_type}"
         try:
             notification_module = importlib.import_module(package_path)
@@ -93,10 +98,10 @@ def _get_notifier(self):
                 f"使用默认日志通知器: {notification_module.Notifier.__name__}"
             )
         Notifier = notification_module.Notifier
-        logger.debug(f"加载通知器: {Notifier.__name__}")
-        return Notifier()
+        logger.debug(f"加载通知器: {config.type}")
+        return Notifier(**config.model_dump())
 
-    async def send(self, notify: Notification) -> bool:
+    async def send(self, notify: Message) -> bool:
         """
         发送通知
 
@@ -125,7 +130,10 @@ async def send(self, notify: Notification) -> bool:
     # 测试用例
     title = "败犬"
     link = "posters/aHR0cHM6Ly9pbWFnZS50bWRiLm9yZy90L3Avdzc4MC9wYWRSbWJrMkxkTGd1ZGg1Y0xZMG85VEZ6aEkuanBn"
-    nt = Notification(title=title, season=1, episode="1", poster_path=link)
+
+    title = "AB通知测试"
+    link = "https://mikanani.me/images/Bangumi/202507/8a6beaff.jpg"
+    nt = Message(title=title, season="1", episode="1", poster_path=link)
     sender = PostNotification()
     sender.initialize()
 

backend/src/module/notification/plugin/bark.py

@@ -1,49 +1,32 @@
 from typing import Any
 
-from pydantic import BaseModel, Field
-
-from module.conf import get_plugin_config
-from module.models import Notification
+from module.models import Message
 from module.network import RequestContent
 from module.utils.cache_image import str_to_url
 
 from .base_notifier import BaseNotifier
 
-
-class Config(BaseModel):
-    token: str = Field(
-        default="",
-        alias="token",
-        description="Telegram bot token, can be obtained from BotFather",
-    )
-
 class Notifier(BaseNotifier):
     """Bark 通知器"""
 
-    def __init__(self):
+    def __init__(self,**kwargs):
         super().__init__()
         self.notification_url = "https://api.day.app/push"
+        self.token: str = kwargs.get("token", "")
 
     def initialize(self) -> None:
-        self.config: Config = get_plugin_config(Config(), "notification")
-        self.token: str = self.config.token.strip()
-        self.photo_url: str = (
-            f"https://api.telegram.org/bot{self.config.token}/sendPhoto"
-        )
-        self.message_url: str = (
-            f"https://api.telegram.org/bot{self.config.token}/sendMessage"
-        )
+        pass
 
-    def format_message(self, notify: Notification) -> dict[str, Any]:
+    def format_message(self, notify: Message) -> dict[str, Any]:
         """格式化 Bark 通知消息"""
         poster_path = notify.poster_path
         if poster_path:
-            if "/" in poster_path:
+            if "posters" in poster_path:
                 poster_path = str_to_url(poster_path.split("/")[-1])
 
         notify.poster_path = poster_path
 
-    async def post_msg(self, notify: Notification) -> bool:
+    async def post_msg(self, notify: Message) -> bool:
         """发送 Bark 通知"""
         try:
             self.format_message(notify)
@@ -72,7 +55,7 @@ async def post_msg(self, notify: Notification) -> bool:
     # 示例用法
     #https://api.day.app/sG7GDikc5iEu5c5iXEuDa4/Icon?icon=https://day.app/assets/images/avatar.jpg
     notifier = Notifier(token="sG7GDikc5iEu5c5iXEuDa4")
-    notification = Notification(
+    notification = Message(
         title="测试通知",
         message="这是一个测试消息",
         poster_path="/path/to/poster.jpg"

backend/src/module/notification/plugin/base_notifier.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Dict, Optional
 
-from module.models import Notification
+from module.models import Message
 
 logger = logging.getLogger(__name__)
 
@@ -17,7 +17,7 @@ def __init__(self):
         self.logger = logging.getLogger(self.__class__.__name__)
 
     @abstractmethod
-    async def post_msg(self, notify: Notification) -> bool:
+    async def post_msg(self, notify: Message) -> bool:
         """
         发送通知消息
 
@@ -29,7 +29,7 @@ async def post_msg(self, notify: Notification) -> bool:
         """
         pass
 
-    async def send_with_retry(self, notify: Notification, max_retries: int = 3) -> bool:
+    async def send_with_retry(self, notify: Message, max_retries: int = 3) -> bool:
         """
         带重试机制的发送
 

backend/src/module/notification/plugin/log.py

@@ -1,16 +1,19 @@
-from module.models import Notification
+from module.models import Message
 
 from .base_notifier import BaseNotifier
 
 
 class Notifier(BaseNotifier):
     """日志通知器 - 将通知输出到日志"""
 
-    def __init__(self, token: str = "", **kwargs):
-        # 日志通知器不需要token，但保持接口一致
+    def __init__(self, **kwargs):
         super().__init__()
 
-    async def post_msg(self, notify: Notification) -> bool:
+    def initialize(self) -> None:
+        """初始化通知器"""
+        pass
+
+    async def post_msg(self, notify: Message) -> bool:
         """输出通知到日志"""
         try:
             message = notify.message