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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-pErithacus
-Version: 1.4.2
+Version: 1.4.3
 Summary: pErithacus 是一个基于 NoneBot2 框架的聊天插件，可以根据用户设定的关键词自动回复相关内容。该插件提供了完整的词条管理功能，让用户能够轻松创建、编辑和管理自定义回复内容
 Keywords: nonebot2,chatbot,qqbot,nonebot-plugin
 Author: SnowMoonSS

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

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-pErithacus"
-version = "1.4.2"
+version = "1.4.3"
 description = "pErithacus 是一个基于 NoneBot2 框架的聊天插件，可以根据用户设定的关键词自动回复相关内容。该插件提供了完整的词条管理功能，让用户能够轻松创建、编辑和管理自定义回复内容"
 readme = "README.md"
 requires-python = ">=3.12, <4.0"

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.3}/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.3"
 __plugin_meta__ = PluginMetadata(
     name="pErithacus",
     description=("pErithacus 是一个基于 NoneBot2 框架的聊天插件，"

{nonebot_plugin_perithacus-1.4.2 → nonebot_plugin_perithacus-1.4.3}/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.3}/src/nonebot_plugin_perithacus/lib.py

@@ -247,10 +247,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 +363,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 +382,7 @@ async def dump_msg(
     :rtype: str
     """
 
-    if isinstance(msg, tuple):
+    if not isinstance(msg, UniMessage):
         msg = UniMessage(msg)
 
     msg = await pe_download(msg)