nonebot-plugin-bililive 2.1.4__tar.gz → 2.1.6__tar.gz

{nonebot_plugin_bililive-2.1.4 → nonebot_plugin_bililive-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.1.4
+Version: 2.1.6
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,bilibili,onebot,onebot-v11
 Author-Email: Akiyy_Lab <2806578374@qq.com>
@@ -27,7 +27,7 @@ Requires-Dist: nonebot2>=2.5.0
 Requires-Dist: playwright>=1.58.0
 Requires-Dist: pydantic<3.0,>=1.10.0
 Requires-Dist: python-dotenv>=1.2.2
-Requires-Dist: tortoise-orm[asyncpg]>=0.19.3
+Requires-Dist: tortoise-orm[asyncpg]<2.0,>=1.0.0
 Requires-Dist: packaging>=26.0
 Requires-Dist: msvc-runtime>=14.34.31931; sys_platform == "win32"
 Description-Content-Type: text/markdown

{nonebot_plugin_bililive-2.1.4 → nonebot_plugin_bililive-2.1.6}/nonebot_plugin_bililive/database/db.py

@@ -1,11 +1,32 @@
 import asyncio
+import inspect
 import json
+from collections.abc import Callable
 from pathlib import Path
 
 from nonebot import get_driver, logger
 from packaging.version import Version as version_parser
 from tortoise import Tortoise
 
+get_current_context: Callable[[], object | None] | None
+
+
+def _detect_tortoise_v1() -> bool:
+    """Tortoise 1.x 才有 context 模块与 _enable_global_fallback 参数。"""
+    try:
+        from tortoise.context import get_current_context as _gcc
+    except ImportError:
+        return False
+
+    global get_current_context
+    get_current_context = _gcc
+    params = inspect.signature(Tortoise.init).parameters
+    return "_enable_global_fallback" in params
+
+
+get_current_context = None
+_TORTOISE_V1 = _detect_tortoise_v1()
+
 from ..utils import get_path
 from ..version import VERSION as APP_VERSION
 from .models import Group, Sub, User, Version
@@ -13,6 +34,8 @@ from .models import Group, Sub, User, Version
 uid_list = {"live": {"list": [], "index": 0}, "dynamic": {"list": [], "index": 0}}
 dynamic_offset = {}
 
+_db_init_lock = asyncio.Lock()
+
 
 class DB:
     """数据库交互类，与增删改查无关的部分不应该在这里面实现"""
@@ -24,15 +47,20 @@ class DB:
         return Path(get_path("dynamic_offset.json"))
 
     @classmethod
-    async def init(cls):
-        """初始化数据库"""
+    def _orm_context_ok(cls) -> bool:
+        """_ready 与 Tortoise 1.x 全局上下文需同时成立，否则会出现 No TortoiseContext。"""
+        if not cls._ready:
+            return False
+        if not _TORTOISE_V1:
+            return True
+        return get_current_context() is not None
+
+    @classmethod
+    async def _do_init(cls) -> None:
+        """在持有 _db_init_lock 时执行完整初始化。"""
         cls._ready = False
         config = {
             "connections": {
-                # "bililive": {
-                #     "engine": "tortoise.backends.sqlite",
-                #     "credentials": {"file_path": get_path("data.sqlite3")},
-                # },
                 "bililive": f"sqlite://{get_path('data.sqlite3')}"
             },
             "apps": {
@@ -43,7 +71,16 @@ class DB:
             },
         }
 
-        await Tortoise.init(config, _enable_global_fallback=True)
+        init_kwargs = (
+            {"_enable_global_fallback": True} if _TORTOISE_V1 else {}
+        )
+        try:
+            await Tortoise.init(config, **init_kwargs)
+        except TypeError:
+            if init_kwargs:
+                await Tortoise.init(config)
+            else:
+                raise
 
         await Tortoise.generate_schemas()
         await cls.migrate()
@@ -52,26 +89,58 @@ class DB:
         await cls.save_dynamic_offsets()
         cls._ready = True
 
+    @classmethod
+    async def init(cls):
+        """初始化数据库"""
+        async with _db_init_lock:
+            await cls._do_init()
+
     @classmethod
     async def close(cls):
-        cls._ready = False
-        await cls.save_dynamic_offsets()
-        await Tortoise.close_connections()
+        async with _db_init_lock:
+            cls._ready = False
+            await cls.save_dynamic_offsets()
+            await Tortoise.close_connections()
+
+    @classmethod
+    async def _recover_stale_orm(cls) -> None:
+        """_ready 仍为 True 但 Tortoise 上下文已丢失时，关闭并重新初始化。"""
+        if not _TORTOISE_V1:
+            return
+        async with _db_init_lock:
+            if get_current_context() is not None:
+                return
+            if not cls._ready:
+                return
+            logger.warning(
+                "Tortoise ORM 上下文已失效（可能被其他代码关闭连接），"
+                "正在重新初始化数据库"
+            )
+            try:
+                await Tortoise.close_connections()
+            except Exception:
+                logger.exception("关闭 Tortoise 连接时出错，仍将尝试重新初始化")
+            cls._ready = False
+            await cls._do_init()
 
     @classmethod
     async def wait_until_ready(cls, timeout: float = 30) -> bool:
-        if cls._ready:
+        if cls._orm_context_ok():
             return True
 
         waited = 0.0
         interval = 0.1
         while waited < timeout:
-            if cls._ready:
+            if cls._orm_context_ok():
                 return True
+            if cls._ready and _TORTOISE_V1 and get_current_context() is None:
+                await cls._recover_stale_orm()
+                if cls._orm_context_ok():
+                    return True
             await asyncio.sleep(interval)
             waited += interval
 
-        return cls._ready
+        return cls._orm_context_ok()
 
     @classmethod
     async def load_dynamic_offsets(cls):

{nonebot_plugin_bililive-2.1.4 → nonebot_plugin_bililive-2.1.6}/nonebot_plugin_bililive/version.py

@@ -1,4 +1,4 @@
 from packaging.version import Version
 
-__version__ = "2.1.4"
+__version__ = "2.1.6"
 VERSION = Version(__version__)

{nonebot_plugin_bililive-2.1.4 → nonebot_plugin_bililive-2.1.6}/pyproject.toml

@@ -34,12 +34,12 @@ dependencies = [
     "playwright>=1.58.0",
     "pydantic>=1.10.0,<3.0",
     "python-dotenv>=1.2.2",
-    "tortoise-orm[asyncpg]>=0.19.3",
+    "tortoise-orm[asyncpg]>=1.0.0,<2.0",
     "packaging>=26.0",
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.1.4"
+version = "2.1.6"
 
 [project.license]
 text = "AGPL-3.0-or-later"

{nonebot_plugin_bililive-2.1.4 → nonebot_plugin_bililive-2.1.6}/tests/test_maintenance.py

@@ -197,7 +197,14 @@ class DBPermissionTests(unittest.IsolatedAsyncioTestCase):
         ):
             await DB.init()
 
-        self.assertTrue(init_db.await_args.kwargs["_enable_global_fallback"])
+        if db_module._TORTOISE_V1:
+            self.assertTrue(
+                init_db.await_args.kwargs["_enable_global_fallback"]
+            )
+        else:
+            self.assertNotIn(
+                "_enable_global_fallback", init_db.await_args.kwargs
+            )
         self.assertTrue(DB._ready)
         generate_schemas.assert_awaited_once()
         migrate.assert_awaited_once()