nonebot-plugin-pErithacus 1.4.2__tar.gz → 1.4.4__tar.gz

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-pErithacus
-Version: 1.4.2
+Version: 1.4.4
 Summary: pErithacus 是一个基于 NoneBot2 框架的聊天插件，可以根据用户设定的关键词自动回复相关内容。该插件提供了完整的词条管理功能，让用户能够轻松创建、编辑和管理自定义回复内容
 Keywords: nonebot2,chatbot,qqbot,nonebot-plugin
 Author: SnowMoonSS
 License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Robot Framework
 Requires-Dist: httpx>=0.24.0
@@ -18,7 +18,7 @@ Requires-Dist: nonebot-plugin-orm[default]>=0.8.2
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0
 Requires-Dist: pyright[nodejs] ; extra == 'dev'
 Requires-Dist: ruff ; extra == 'dev'
-Requires-Python: >=3.12, <4.0
+Requires-Python: >=3.11, <4.0
 Project-URL: Homepage, https://github.com/SnowMoonSS/nonebot-plugin-pErithacus
 Project-URL: Repository, https://github.com/SnowMoonSS/nonebot-plugin-pErithacus.git
 Project-URL: Documentation, https://github.com/SnowMoonSS/nonebot-plugin-pErithacus/blob/master/README.md

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "nonebot-plugin-pErithacus"
-version = "1.4.2"
+version = "1.4.4"
 description = "pErithacus 是一个基于 NoneBot2 框架的聊天插件，可以根据用户设定的关键词自动回复相关内容。该插件提供了完整的词条管理功能，让用户能够轻松创建、编辑和管理自定义回复内容"
 readme = "README.md"
-requires-python = ">=3.12, <4.0"
+requires-python = ">=3.11, <4.0"
 dependencies = [
   "httpx>=0.24.0",
   "filetype>=1.2.0",
@@ -17,7 +17,7 @@ authors = [{ name = "SnowMoonSS" }]
 license = "MIT"
 classifiers = [
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.12",
   "Operating System :: OS Independent",
   "Framework :: Robot Framework"
 ]
@@ -58,7 +58,7 @@ nonebot-plugin-apscheduler = ["nonebot_plugin_apscheduler"]
 
 [tool.ruff]
 line-length = 128
-target-version = "py314"
+target-version = "py312"
 
 [tool.ruff.format]
 line-ending = "lf"
@@ -126,6 +126,6 @@ keep-runtime-typing = true
 
 [tool.pyright]
 # For Pylance/Pyright configurations, see https://microsoft.github.io/pyright/#/configuration.
-pythonVersion = "3.14"
+pythonVersion = "3.12"
 pythonPlatform = "All"
 typeCheckingMode = "standard"

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/__init__.py

@@ -26,7 +26,7 @@ from .upgrade_database import upgrade_content_db
 
 driver = get_driver()
 
-__version__ = "1.4.2"
+__version__ = "1.4.4"
 __plugin_meta__ = PluginMetadata(
     name="pErithacus",
     description=("pErithacus 是一个基于 NoneBot2 框架的聊天插件，"

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_add.py

@@ -8,7 +8,7 @@ from nonebot_plugin_alconna import (
     UniMessage,
     UniMsg,
 )
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .apscheduler import add_cron_job
 from .command import pe
@@ -27,7 +27,7 @@ from .handle_args import (
     handle_reg,
     handle_scope,
 )
-from .lib import dump_msg, get_cron, get_scope, get_source, load_media
+from .lib import dump_msg, get_cron, get_scope, get_source
 
 
 @pe.assign("add")
@@ -91,13 +91,13 @@ async def _(  # noqa: PLR0913
             entry_id = existing_entry.id
             await session.commit()
 
-            uni_keyword = load_media(keyword_text)
+            uni_keyword = UniMessage.load(keyword_text)
             await pe.finish(
                 f"词条 {entry_id} : " + uni_keyword + " 加入了新的内容："
                 f"{add_content_result.content_id}"
             )
         else:
-            uni_keyword = load_media(keyword_text)
+            uni_keyword = UniMessage.load(keyword_text)
             await pe.finish(
                 f"词条 {existing_entry.id} : " + uni_keyword + " 已存在该内容："
                 f"{add_content_result.content_id}",
@@ -128,7 +128,7 @@ async def _(  # noqa: PLR0913
         entry_id = new_entry.id
         await session.commit()
 
-        uni_keyword = load_media(keyword_text)
+        uni_keyword = UniMessage.load(keyword_text)
         await pe.finish(
             f"词条 {entry_id} : " + uni_keyword + " 已创建并加入了新的内容："
             f"{add_content_result.content_id}"

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_check.py

@@ -2,7 +2,7 @@ import json
 from datetime import UTC, timedelta, timezone
 
 from nonebot_plugin_alconna import AlconnaMatch, AlconnaQuery, Match, Query, UniMessage
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .command import pe
 from .database import get_entry_by_id

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_delete.py

@@ -2,7 +2,7 @@ import json
 from datetime import UTC, datetime
 
 from nonebot_plugin_alconna import AlconnaMatch, Match, MsgTarget, UniMsg
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .apscheduler import remove_cron_job
 from .command import pe

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_detail.py

@@ -1,7 +1,7 @@
 from datetime import UTC, timedelta, timezone
 
 from nonebot_plugin_alconna import AlconnaMatch, AlconnaQuery, Match, Query, UniMessage
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .command import pe
 from .database import get_contents, get_entry_by_id

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_edit.py

@@ -1,6 +1,6 @@
 from nonebot import logger
 from nonebot_plugin_alconna import AlconnaMatch, Match, MsgTarget, UniMessage, UniMsg
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .command import pe
 from .database import (

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_list.py

@@ -7,7 +7,7 @@ from nonebot_plugin_alconna import (
     Query,
     UniMessage,
 )
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .command import pe
 from .database import get_entries

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/cmd_search.py

@@ -12,11 +12,12 @@ from nonebot_plugin_alconna import (
     Query,
     UniMessage,
 )
+from nonebot_plugin_alconna.uniseg.segment import At, Media
 from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
 
 from .command import pe
 from .database import Index, get_all_contents, get_entries, get_entry_by_id
-from .lib import dump_msg, get_scope, get_source, load_msg
+from .lib import get_scope, get_source, load_msg, pe_download
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -82,19 +83,17 @@ async def _(  # noqa: PLR0913
         await pe.finish(UniMessage("搜索结果：\n无"))
 
 async def get_key(keyword: Match) -> str:
-    keyword_text = await dump_msg(keyword.result, media_save_dir=False)
-    pe_message_list = json.loads(keyword_text)
+    msg = UniMessage(keyword.result) if not isinstance(keyword.result, UniMessage) else keyword.result
+    msg = await pe_download(msg)
 
     # 检查pe_message_list中的每个元素
     key = None
-    for item in pe_message_list:
-        if not isinstance(item, dict):
-            continue
-        if item.get("media"):
-            key = item["id"]
+    for seg in msg:
+        if isinstance(seg, Media):
+            key = seg.id
             break
-        if item.get("type") == "at":
-            key = item["target"]
+        if isinstance(seg, At):
+            key = seg.target
             break
     if not key:
         key = UniMessage(keyword.result).extract_plain_text()
@@ -110,9 +109,7 @@ async def search_in_entries(
             # 检查keyword列和alias列包含key的行
             if key in entry.keyword or (entry.alias and key in entry.alias):
                 result_list.append(entry.id)
-                logger.info(
-                    f"在 Index 中找到匹配的词条 {entry.id}，关键词 {entry.keyword}"
-                )
+                logger.info(f"在 Index 中找到匹配的词条 {entry.id}，关键词 {entry.keyword}")
     return result_list
 
 async def search_in_contents(
@@ -124,14 +121,11 @@ async def search_in_contents(
 ) -> list[int]:
     contents = await get_all_contents(session)
     for content in contents:
-        if not content.deleted and key in content.content:
-            if content.entry_id not in result_list:
-                if not await check_is_deleted(session, content.entry_id, scope_list):
-                    result_list.append(content.entry_id)
-            else:
-                logger.debug(f"跳过词条 {content.entry_id}，该词条已存在搜索结果中")
-        else:
-            logger.debug(f"未在 {content.entry_id} 中找到包含 {key} 的内容")
+        if ((not content.deleted and key in content.content)
+            and (content.entry_id not in result_list)
+            and (not await check_is_deleted(session, content.entry_id, scope_list))):
+            result_list.append(content.entry_id)
+            logger.debug(f"在 {content.entry_id} 中找到包含 {key} 的内容")
 
     return result_list
 

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/database.py

@@ -151,6 +151,8 @@ def _is_fuzzy_match(entry: Index, keyword_msg: UniMessage) -> bool:
         return False
 
     key = keyword_msg.extract_plain_text()
+    if not key:  # 空字符串不应匹配任何词条
+        return False
     entry_key = load_media(entry.keyword).extract_plain_text()
     if key in entry_key:
         return True
@@ -174,6 +176,8 @@ def _is_regex_match(entry: Index, keyword_msg: UniMessage) -> bool:
         return False
 
     key = keyword_msg.extract_plain_text()
+    if not key:  # 空字符串不应匹配任何词条
+        return False
     return bool(re.match(entry.reg, key))
 
 async def matching(
@@ -320,7 +324,8 @@ async def add_entry(
         **kwargs
     )
     session.add(new_entry)
-    logger.debug(f"添加新词条 {new_entry.id} : {new_entry.keyword} 到 Index")
+    await session.flush()
+    logger.info(f"添加新词条 {new_entry.id}: {new_entry.keyword} 到 Index")
     return new_entry
 
 async def get_entry_by_id(
@@ -535,7 +540,6 @@ async def add_content(
             await restore_deleted_content(session, row.id)
             return AddContentResult(success=True, content_id=row.id)
 
-    logger.debug(f"添加内容 {content} 到 Content")
     new_content = Content(
         entry_id=entry_id,
         content=content,
@@ -544,6 +548,7 @@ async def add_content(
     )
     session.add(new_content)
     await session.flush()
+    logger.info(f"添加内容 {new_content.id}: {content} 到 Content")
     return AddContentResult(success=True, content_id=new_content.id)
 
 async def delete_content(session: async_scoped_session, content_id: int) -> bool:

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/lib.py

@@ -10,6 +10,7 @@ from json import dumps
 from pathlib import Path
 from typing import Any, Literal, overload
 
+import anyio
 import filetype
 import httpx
 from apscheduler.triggers.cron import CronTrigger
@@ -37,11 +38,11 @@ async def download_media(
     :return: 最终文件路径 或 None（失败时）
     """
     save_dir = Path(save_dir)
-    save_dir.mkdir(parents=True, exist_ok=True)
+    await anyio.Path(save_dir).mkdir(parents=True, exist_ok=True)
 
     # 创建临时文件（在 save_dir 中）
     with tempfile.NamedTemporaryFile(delete=False, dir=save_dir) as tmp_file:
-        tmp_path = Path(tmp_file.name)
+        tmp_path = anyio.Path(tmp_file.name)
         md5_hash = hashlib.md5()
 
         try:
@@ -59,13 +60,13 @@ async def download_media(
             os.fsync(tmp_file.fileno())
         except httpx.HTTPError as e:
             # 包括连接错误、超时、4xx/5xx 等
-            tmp_path.unlink(missing_ok=True)
+            await tmp_path.unlink(missing_ok=True)
             logger.error(f"HTTP 请求失败: {e}")
             return None
 
         except OSError as e:
             # 文件写入、fsync、磁盘空间、权限等问题
-            tmp_path.unlink(missing_ok=True)
+            await tmp_path.unlink(missing_ok=True)
             logger.error(f"文件 I/O 错误: {e}")
             return None
 
@@ -82,20 +83,20 @@ async def download_media(
     final_path = save_dir / (md5_hex + extension)
 
     if json:
-        tmp_path.unlink(missing_ok=True)
+        await tmp_path.unlink(missing_ok=True)
         return final_path
-    if final_path.exists():
+    if await anyio.Path(final_path).exists():
         logger.info(f"文件已存在，跳过: {final_path}")
-        tmp_path.unlink(missing_ok=True)
+        await tmp_path.unlink(missing_ok=True)
         return final_path
 
     # 重命名
     try:
-        tmp_path.rename(final_path)
+        await tmp_path.rename(anyio.Path(final_path))
         logger.info(f"保存成功: {final_path}")
     except OSError as e:
         logger.info(f"重命名失败: {e}")
-        tmp_path.unlink(missing_ok=True)
+        await tmp_path.unlink(missing_ok=True)
         return None
     else:
         return final_path
@@ -247,10 +248,10 @@ async def pe_download(
         stream (bool, optional): 是否以流式下载. Defaults to False.
         **kwargs: 传递给下载器的参数
     """
-    logger.debug("开始下载媒体数据")
     for media in self.select(Media):
         if not media.url:
             continue
+        logger.debug("开始下载媒体数据")
         raw: bytes = b""
         async with httpx.AsyncClient(**kwargs) as client:
             if stream:
@@ -363,7 +364,7 @@ def pe_save(
     return path.resolve()
 
 async def dump_msg(
-    msg: UniMessage,
+    msg: UniMessage | str | tuple,
     *,
     media_save_dir: str | Path | bool | None = MEDIA_SAVE_DIR
 ) -> str:
@@ -382,7 +383,7 @@ async def dump_msg(
     :rtype: str
     """
 
-    if isinstance(msg, tuple):
+    if not isinstance(msg, UniMessage):
         msg = UniMessage(msg)
 
     msg = await pe_download(msg)

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.4}/src/nonebot_plugin_perithacus/trigger.py

@@ -2,7 +2,7 @@ import random
 
 from nonebot.log import logger
 from nonebot_plugin_alconna import MsgTarget, UniMessage, UniMsg
-from nonebot_plugin_orm import async_scoped_session  # noqa: TC002
+from nonebot_plugin_orm import async_scoped_session
 
 from .command import on_every_message
 from .database import get_contents, get_entry