nonebot-plugin-savepic 0.2.6__tar.gz → 0.3.0__tar.gz

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-savepic
-Version: 0.2.6
+Version: 0.3.0
 Summary: 保存表情包（语录）与随机出图
 Home-page: https://github.com/Yan-Zero/nonebot-plugin-savepic
 License: MIT

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/nonebot_plugin_savepic/__init__.py

@@ -11,7 +11,7 @@ from nonebot.matcher import Matcher
 from nonebot.plugin import PluginMetadata
 from nonebot.dependencies import Dependent
 from sqlalchemy.exc import DBAPIError
-from arclet.alconna import Alconna, Option, Args, CommandMeta, append
+from arclet.alconna import Alconna, Option, Args, CommandMeta
 import os
 import random
 from typing import (
@@ -46,20 +46,19 @@ from .config import Config
 from .config import WORDS
 from .pic_sql import (  # noqa: E402
     savepic,
-    rename,
     delete,
     regexp_pic,
-    listpic,
 )
 from .rule import PIC_AMDIN
 from .rule import BLACK_GROUP
 from .rule import GROUP_ADMIN
-from .ext_listener import pic_listen  # noqa: E402, F401
-from .picture import write_pic, load_pic  # noqa: E402
+from .picture import write_pic, load_pic
 from .ai_utils import img2vec
 from .randpic import url_to_image
-from .countpic import cpic
 from .mvpic import INVALID_FILENAME_CHARACTERS
+from .listpic import s_listpic
+from .ext_listener import pic_listen
+from .countpic import cpic
 
 
 __plugin_meta__ = PluginMetadata(
@@ -89,7 +88,6 @@ a_spic = Alconna(
     meta=CommandMeta(description="保存图片，默认保存到本群"),
 )
 s_simpic = on_command("simpic", priority=5, permission=BLACK_GROUP)
-s_listpic = on_command("listpic", priority=5, permission=BLACK_GROUP)
 
 
 def got_random_prompt(
@@ -162,39 +160,6 @@ async def _(bot: Bot, event, args: V11Msg = CommandArg()):
         )
 
 
-@s_listpic.handle()
-async def _(bot: Bot, event, args: V11Msg = CommandArg()):
-    reg = args.extract_plain_text().strip().rsplit("\\page", maxsplit=1)
-    try:
-        if len(reg) > 1:
-            reg, pages = reg
-        else:
-            reg, pages = reg[0], 0
-        pages = int(pages)
-    except Exception as ex:
-        await repic.finish(
-            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
-        )
-
-    group_id = (
-        "globe"
-        if not isinstance(event, GroupMessageEvent)
-        else f"qq_group:{event.group_id}"
-    )
-    try:
-        pic = await listpic(reg, group_id, pages=pages)
-        if pic:
-            await bot.send(event, "\n".join(pic))
-    except DBAPIError as ex:
-        await repic.finish(
-            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex.orig}'
-        )
-    except Exception as ex:
-        await repic.finish(
-            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
-        )
-
-
 @spic.handle()
 async def _(
     bot: Bot,

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/nonebot_plugin_savepic/config.py

@@ -33,3 +33,12 @@ class Config(BaseModel):
 
     embedding_sqlurl: str
     black_group: list[str]
+
+    notfound_with_jpg: bool = True
+    """ randpic 的时候，尝试带 .jpg 再度检索向量 """
+    count_per_page_in_list: int = 7
+    """ 每页最多多少条 """
+    forward_when_listpic: bool = True
+    """ listpic 的时候合并转发 """
+    max_page_in_listpic: int = 20
+    """ 合并转发中所能显示的最大页数 """

nonebot_plugin_savepic-0.3.0/nonebot_plugin_savepic/listpic.py

@@ -0,0 +1,84 @@
+import random
+from nonebot import on_command
+from nonebot import get_plugin_config
+from nonebot.params import CommandArg
+from nonebot.internal.adapter import Bot
+from nonebot.adapters.onebot.v11.event import GroupMessageEvent as V11GME
+from nonebot.adapters.onebot.v11.message import Message as V11Msg
+from nonebot.adapters.onebot.v11.message import MessageSegment as V11Seg
+from sqlalchemy.exc import DBAPIError
+
+from .rule import BLACK_GROUP
+from .config import WORDS
+from .pic_sql import listpic
+from .config import Config
+
+p_config: Config = get_plugin_config(Config)
+s_listpic = on_command("listpic", priority=5, permission=BLACK_GROUP)
+
+
+@s_listpic.handle()
+async def _(bot: Bot, event, args: V11Msg = CommandArg()):
+    reg = args.extract_plain_text().strip().rsplit("\\page", maxsplit=1)
+    try:
+        if len(reg) > 1:
+            reg, pages = reg
+        else:
+            reg, pages = reg[0], 1
+        pages = int(pages)
+    except Exception as ex:
+        await s_listpic.finish(
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
+        )
+
+    group_id = (
+        "globe" if not isinstance(event, V11GME) else f"qq_group:{event.group_id}"
+    )
+    try:
+        pics = await listpic(reg, group_id, pages=pages)
+        if not pics:
+            return
+
+        cpp = max(p_config.count_per_page_in_list, 1)
+        if p_config.forward_when_listpic:
+            message = []
+            for i in range(len(pics) // cpp + 1):
+                if pics[i * cpp : (i + 1) * cpp]:
+                    message.append(
+                        {
+                            "type": "node",
+                            "data": {
+                                "uin": str(event.get_user_id()),
+                                "name": f"Page {pages+i}",
+                                "content": V11Seg.text(
+                                    "\n".join(pics[i * cpp : (i + 1) * cpp])
+                                    + f"\n\nPage {pages+i}"
+                                ),
+                            },
+                        },
+                    )
+
+            if isinstance(event, V11GME):
+                await bot.call_api(
+                    "send_group_forward_msg",
+                    group_id=event.group_id,
+                    messages=message,
+                )
+            else:
+                await s_listpic.send(
+                    V11Seg.forward(
+                        await bot.call_api("send_forward_msg", messages=message)
+                    )
+                )
+            return
+
+        await s_listpic.send("\n".join(pics[:cpp]))
+
+    except DBAPIError as ex:
+        await s_listpic.finish(
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex.orig}'
+        )
+    except Exception as ex:
+        await s_listpic.finish(
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
+        )

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/nonebot_plugin_savepic/mvpic.py

@@ -1,6 +1,6 @@
 import random
-import re
 from nonebot import on_command
+from nonebot.params import CommandArg
 from nonebot.internal.adapter import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent as V11GME
 from .rule import BLACK_GROUP
@@ -26,16 +26,13 @@ INVALID_FILENAME_CHARACTERS = r'\/:*?"<>|'
 
 
 @s_mvpic.handle()
-async def _(
-    bot: Bot,
-    event: V11GME,
-):
+async def _(bot: Bot, event: V11GME, args=CommandArg()):
     if not (await PIC_AMDIN(bot, event) or await GROUP_ADMIN(bot, event)):
         await s_mvpic.finish(
             random.choice(WORDS.get("permission denied", ["没有权限"]))
         )
 
-    cmd = event.message.extract_plain_text().strip()
+    cmd = args.extract_plain_text().strip()
     name = []
     options = []
 
@@ -104,7 +101,6 @@ async def _(
                 name.append(_str(""))
 
     parser()
-
     if not name:
         await s_mvpic.finish("文件名呢？")
     if not options:
@@ -124,8 +120,12 @@ async def _(
     if not dname.endswith((".jpg", ".png", ".gif")):
         dname += ".jpg"
 
-    sg = options[0]
-    dg = options[1] if len(options) > 1 else sg
+    sg = "globe" if options[0] == "g" else f"qq_group:{event.group_id}"
+    dg = options[1] if len(options) > 1 else options[0]
+    dg = "globe" if dg == "g" else f"qq_group:{event.group_id}"
+
+    if sname == dname and sg == dg:
+        await s_mvpic.finish("嗯，什么都没有变化嘛。")
 
     try:
         await rename(sname, dname, sg, dg)

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/nonebot_plugin_savepic/pic_sql.py

@@ -30,14 +30,31 @@ def AsyncDatabase():
     return _async_database
 
 
+async def update_vec(pic: PicData):
+    if pic is None:
+        return
+    if not pic.u_vec_text:
+        return
+
+    async with AsyncSession(_async_database) as db_session:
+        # if pic.u_vec_text:
+        pic.u_vec_text = False
+        await _async_embedding_database.execute(
+            "UPDATE savepic_word2vec SET embedding = $1 WHERE id = $2",
+            str(word2vec(pic.name)),
+            pic.id,
+        )
+        await db_session.merge(pic)
+        await db_session.commit()
+
+
 async def select_pic(filename: str, group: str):
     async with AsyncSession(_async_database) as db_session:
-        pic = await db_session.scalar(
+        if pic := await db_session.scalar(
             select(PicData)
             .where(PicData.name == filename)
             .where(PicData.group == group)
-        )
-        if pic:
+        ):
             await update_vec(pic)
             return pic
         return await db_session.scalar(
@@ -97,19 +114,6 @@ async def savepic(
         if despic:
             raise SameNameException(despic.name)
 
-        # if not collision_allow:
-        #     ret = _pincone_index.query(img_vec, top_k=25)["matches"]
-        #     for i in ret:
-        #         if i["score"] and i["score"] < 0.98:
-        #             break
-        #         despic = await db_session.scalar(
-        #             select(PicData)
-        #             .where(PicData.id == int(ret[0]["id"]))
-        #             .where(sa.or_(PicData.group == group_id, PicData.group == "globe"))
-        #         )
-        #         if despic:
-        #             raise SimilarPictureException(despic.name, i["score"], despic.url)
-
         empty = await db_session.scalar(select(PicData).where(PicData.name == ""))
         if empty:
             pic.id = empty.id
@@ -118,7 +122,6 @@ async def savepic(
             db_session.add(pic)
         await db_session.flush()
 
-        # _pincone_index.upsert([(str(pic.id), img_vec)])
         await _async_embedding_database.execute(
             (
                 "INSERT INTO savepic_word2vec (id, embedding) VALUES ($1, $2) "
@@ -145,9 +148,9 @@ async def rename(ori: str, des: str, s_group: str, d_group: str):
         )
         if despic:
             raise SameNameException(despic.name)
+
         pic.name = des
         pic.group = d_group
-
         pic.u_vec_text = False
         await _async_embedding_database.execute(
             "UPDATE savepic_word2vec SET embedding = $1 WHERE id = $2",
@@ -218,6 +221,7 @@ async def randpic(
         ):
             await update_vec(pic)
             return pic, ""
+
         if not vector:
             return None, ""
 
@@ -237,6 +241,25 @@ async def randpic(
             .order_by(sa.func.random())
         ):
             return pic, "（语义向量相似度检索）"
+
+        if p_config.notfound_with_jpg:
+            datas = await _async_embedding_database.fetch(
+                (
+                    "SELECT id FROM savepic_word2vec "
+                    "WHERE embedding IS NOT NULL and embedding <=> $1 <= 0.45 "
+                    "ORDER BY embedding <#> $1 LIMIT 8;"
+                ),
+                str(word2vec(name + ".jpg")),
+            )
+            if pic := await db_session.scalar(
+                select(PicData)
+                .where(sa.or_(PicData.group == group, PicData.group == "globe"))
+                .where(PicData.id.in_([i["id"] for i in datas]))
+                .where(PicData.name != "")
+                .order_by(sa.func.random())
+            ):
+                return pic, "（语义向量相似度检索）"
+
         return None, False
 
 
@@ -258,34 +281,16 @@ async def countpic(reg: str, group: str = "globe") -> int:
         return 0
 
 
-async def update_vec(pic: PicData):
-    if not pic:
-        return
-    if not pic.u_vec_text:  # and not pic.u_vec_img:
-        return
-    if pic.u_vec_text:
-        pic.u_vec_text = False
-        await _async_embedding_database.execute(
-            "UPDATE savepic_word2vec SET embedding = $1 WHERE id = $2",
-            str(word2vec(pic.name)),
-            pic.id,
-        )
-    # if pic.u_vec_img:
-    #     pic.u_vec_img = False
-    #     _pincone_index.upsert(
-    #         [(str(pic.id), file2vec(pathlib.Path(pic.url), pic.name))]
-    #     )
-    async with AsyncSession(_async_database) as db_session:
-        db_session.merge(pic)
-        await db_session.flush()
-        db_session.commit()
-
-
 async def listpic(reg: str, group: str = "globe", pages: int = 0) -> list[str]:
     reg = reg.strip()
     if not reg:
         reg = ".*"
-    pages -= 1
+
+    pages = max(pages - 1, 0)
+    _count = min(
+        max(1, p_config.count_per_page_in_list * p_config.max_page_in_listpic), 1000
+    )
+
     async with AsyncSession(_async_database) as db_session:
         pics = await db_session.scalars(
             select(PicData)
@@ -293,8 +298,8 @@ async def listpic(reg: str, group: str = "globe", pages: int = 0) -> list[str]:
             .where(PicData.name != "")
             .where(PicData.name.regexp_match(reg, flags="i"))
             .order_by(PicData.name)
-            .offset((0 if pages < 0 else pages) * 10)
-            .limit(10)
+            .offset(pages * p_config.count_per_page_in_list)
+            .limit(_count)
         )
         if pics:
             return [str(pic.name) for pic in pics]

{nonebot_plugin_savepic-0.2.6 → nonebot_plugin_savepic-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-savepic"
-version = "0.2.6"
+version = "0.3.0"
 description = "保存表情包（语录）与随机出图"
 authors = ["Yan <1964649083@qq.com>"]
 license = "MIT"