nonebot-plugin-savepic 0.2.5__tar.gz → 0.2.7__tar.gz

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/PKG-INFO

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

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/nonebot_plugin_savepic/__init__.py

@@ -5,7 +5,6 @@ from nonebot import on_command
 from nonebot.params import CommandArg, Arg
 from nonebot.adapters.onebot.v11.message import Message as V11Msg
 from nonebot.adapters.onebot.v11.message import MessageSegment as V11Seg
-from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.event import MessageEvent
 from nonebot.matcher import Matcher
@@ -15,7 +14,6 @@ from sqlalchemy.exc import DBAPIError
 from arclet.alconna import Alconna, Option, Args, CommandMeta, append
 import os
 import random
-import json
 from typing import (
     Any,
     Union,
@@ -41,11 +39,11 @@ from nonebot.internal.adapter import (
 require("nonebot_plugin_datastore")
 
 from .error import (
-    NoPictureException,
     SimilarPictureException,
     SameNameException,
 )  # noqa: E402, E501
-from .config import Config  # noqa: E402
+from .config import Config
+from .config import WORDS
 from .pic_sql import (  # noqa: E402
     savepic,
     rename,
@@ -53,28 +51,17 @@ from .pic_sql import (  # noqa: E402
     regexp_pic,
     listpic,
 )
-from .rule import PIC_AMDIN, BLACK_GROUP
+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 .ai_utils import img2vec
-from .randpic import rpic
+from .randpic import url_to_image
 from .countpic import cpic
+from .mvpic import INVALID_FILENAME_CHARACTERS
 
 
-def url_to_image(url: str):
-    if url.startswith("http"):
-        return V11Seg.image(url)
-    return V11Seg.image(Path(url))
-
-
-words = {}
-for root, _, files in os.walk("words"):
-    for file in files:
-        if not file.endswith(".json"):
-            continue
-        with open(os.path.join(root, file), "r", encoding="utf-8") as f:
-            words.update(json.load(f))
-
 __plugin_meta__ = PluginMetadata(
     name="Savepic",
     description="表情包保存",
@@ -89,7 +76,6 @@ __plugin_meta__ = PluginMetadata(
     type="application",
     supported_adapters=["~onebot.v11"],
 )
-INVALID_FILENAME_CHARACTERS = r'\/:*?"<>|'
 
 p_config = get_plugin_config(Config)
 repic = on_command("repic", priority=5, permission=BLACK_GROUP)
@@ -102,13 +88,6 @@ a_spic = Alconna(
     Args.filename[str],
     meta=CommandMeta(description="保存图片，默认保存到本群"),
 )
-s_mvpic = on_command("mvpic", priority=5, permission=BLACK_GROUP)
-a_mvpic = Alconna(
-    "/mvpic",
-    Option("-l", args=Args.filename[str], help_text="本地图片", action=append),
-    Option("-g", args=Args.filename[str], help_text="全局图片", action=append),
-    meta=CommandMeta(description="重命名图片，按照参数先后判断"),
-)
 s_simpic = on_command("simpic", priority=5, permission=BLACK_GROUP)
 s_listpic = on_command("listpic", priority=5, permission=BLACK_GROUP)
 
@@ -175,11 +154,11 @@ async def _(bot: Bot, event, args: V11Msg = CommandArg()):
             await bot.send(event, V11Msg([pic.name, url_to_image(pic.url)]))
     except DBAPIError as ex:
         await repic.finish(
-            f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex.orig}'
+            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}'
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
         )
 
 
@@ -194,7 +173,7 @@ async def _(bot: Bot, event, args: V11Msg = CommandArg()):
         pages = int(pages)
     except Exception as ex:
         await repic.finish(
-            f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex}'
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
         )
 
     group_id = (
@@ -208,11 +187,11 @@ async def _(bot: Bot, event, args: V11Msg = CommandArg()):
             await bot.send(event, "\n".join(pic))
     except DBAPIError as ex:
         await repic.finish(
-            f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex.orig}'
+            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}'
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
         )
 
 
@@ -248,7 +227,7 @@ async def _(
     if command.d:
         if not (await PIC_AMDIN(bot, event) or await GROUP_ADMIN(bot, event)):
             await spic.finish(
-                random.choice(words.get("permission denied", ["没有权限"]))
+                random.choice(WORDS.get("permission denied", ["没有权限"]))
             )
         try:
             await delete(filename, state["savepiv_group"])
@@ -263,11 +242,11 @@ async def _(
         matcher.set_arg("picture", picture)
 
 
-@got_random_prompt(spic, "picture", words.get("wait for image", ["图呢"]))
+@got_random_prompt(spic, "picture", WORDS.get("wait for image", ["图呢"]))
 async def _(state: T_State, picture: V11Msg = Arg()):
     picture = picture.get("image")
     if not picture:
-        await spic.finish(random.choice(words.get("not image", ["6，这也不是图啊"])))
+        await spic.finish(random.choice(WORDS.get("not image", ["6，这也不是图啊"])))
 
     try:
         dir = await write_pic(picture[0].data["url"], p_config.savepic_dir)
@@ -284,7 +263,7 @@ async def _(state: T_State, picture: V11Msg = Arg()):
     except SameNameException:
         os.remove(dir)
         await spic.finish(
-            random.choice(words.get("name has been taken", ["文件名重复"]))
+            random.choice(WORDS.get("name has been taken", ["文件名重复"]))
         )
     except SimilarPictureException as ex:
         os.remove(dir)
@@ -292,13 +271,13 @@ async def _(state: T_State, picture: V11Msg = Arg()):
             image = await load_pic(ex.url)
         except Exception as exc:
             await spic.finish(
-                f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{exc}'
+                f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{exc}'
             )
 
         await spic.finish(
             V11Msg(
                 [
-                    random.choice(words.get("similar picture", ["存在相似图片"])),
+                    random.choice(WORDS.get("similar picture", ["存在相似图片"])),
                     "\n\n" + ex.name,
                     f"\n(相似度：{'%.4g' % (min(ex.similarity * 100, 100.0))}%)\n",
                     V11Seg.image(file=image),
@@ -307,70 +286,13 @@ async def _(state: T_State, picture: V11Msg = Arg()):
         )
     except Exception as ex:
         os.remove(dir)
-        await spic.finish(f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex}')
+        await spic.finish(f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}')
     await spic.send(
-        random.choice(words.get("save succeed", ["保存成功"]))
+        random.choice(WORDS.get("save succeed", ["保存成功"]))
         + state["savepiv_warning"]
     )
 
 
-@s_mvpic.handle()
-async def _(
-    bot: Bot,
-    event: GroupMessageEvent,
-):
-    if not (await PIC_AMDIN(bot, event) or await GROUP_ADMIN(bot, event)):
-        await spic.finish(random.choice(words.get("permission denied", ["没有权限"])))
-
-    cmd = a_mvpic.parse(event.message.extract_plain_text())
-    if not cmd.matched:
-        await s_mvpic.finish(str(cmd.error_info) + "\n\n" + a_mvpic.get_help())
-    options = cmd.options
-    if not options:
-        await s_mvpic.finish("文件名呢？" + "\n\n" + a_mvpic.get_help())
-
-    sg = "globe" if list(options.keys())[0] == "g" else f"qq_group:{event.group_id}"
-    if len(options["g" if sg == "globe" else "l"].args.get("filename", [])) >= 2:
-        dg = sg
-    else:
-        dg = "globe" if sg != "globe" else f"qq_group:{event.group_id}"
-    if ("g" if dg == "globe" else "l") not in options:
-        await s_mvpic.finish("至多只有一个文件名哦？" + "\n\n" + a_mvpic.get_help())
-
-    if (not await PIC_AMDIN(bot, event)) and await GROUP_ADMIN(bot, event):
-        if sg == "globe":
-            await spic.finish("管理员不能改全局名称哦~")
-        if dg == "globe":
-            await spic.finish("管理员不能改全局名称哦~")
-
-    sname = options["g" if sg == "globe" else "l"].args["filename"][0]
-    dname = options["g" if dg == "globe" else "l"].args["filename"][
-        1 if sg == dg else 0
-    ]
-    for c in INVALID_FILENAME_CHARACTERS:
-        sname = sname.replace(c, "-")
-        dname = dname.replace(c, "-")
-    if not sname.endswith((".jpg", ".png", ".gif")):
-        sname += ".jpg"
-    if not dname.endswith((".jpg", ".png", ".gif")):
-        dname += ".jpg"
-
-    try:
-        await rename(sname, dname, sg, dg)
-    except NoPictureException as ex:
-        await spic.finish(
-            random.choice(words.get("not found", [ex.name + " 没有找到哦"]))
-            + f"\n{ex.name} 没有找到哦"
-        )
-    except SameNameException:
-        await spic.finish(
-            random.choice(words.get("name has been taken", ["文件名重复"]))
-        )
-    except Exception as ex:
-        await spic.finish(f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex}')
-    await spic.finish(random.choice(words.get("rename succeed", ["图片已重命名"])))
-
-
 @s_simpic.handle()
 async def _(bot: Bot, event: MessageEvent, args: V11Msg = CommandArg()):
     if True:
@@ -380,7 +302,7 @@ async def _(bot: Bot, event: MessageEvent, args: V11Msg = CommandArg()):
     if not picture:
         await s_simpic.finish(
             random.choice(
-                words.get("missing image reference", ["没找到引用消息中的图片"])
+                WORDS.get("missing image reference", ["没找到引用消息中的图片"])
             )
         )
     vec = img2vec(await load_pic(picture[0].data["url"]))
@@ -411,8 +333,8 @@ async def _(bot: Bot, event: MessageEvent, args: V11Msg = CommandArg()):
                 ),
             )
         else:
-            await s_simpic.send(random.choice(words.get("not found", ["Nope."])))
+            await s_simpic.send(random.choice(WORDS.get("not found", ["Nope."])))
     except Exception as ex:
         await s_simpic.finish(
-            f'{random.choice(words.get("error", ["出错了喵~"]))}\n\n{ex}'
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
         )

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/nonebot_plugin_savepic/config.py

@@ -1,5 +1,15 @@
+import os
+import json
 from pydantic import BaseModel
-from enum import Enum
+
+
+WORDS = {}
+for root, _, files in os.walk("words"):
+    for file in files:
+        if not file.endswith(".json"):
+            continue
+        with open(os.path.join(root, file), "r", encoding="utf-8") as f:
+            WORDS.update(json.load(f))
 
 
 class Config(BaseModel):
@@ -23,3 +33,6 @@ class Config(BaseModel):
 
     embedding_sqlurl: str
     black_group: list[str]
+
+    notfound_with_jpg: bool = True
+    """ randpic 的时候，尝试带 .jpg 再度检索向量 """

nonebot_plugin_savepic-0.2.7/nonebot_plugin_savepic/mvpic.py

@@ -0,0 +1,146 @@
+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
+from .rule import PIC_AMDIN
+from .rule import GROUP_ADMIN
+from .config import WORDS
+from .pic_sql import rename
+from .error import NoPictureException
+from .error import SameNameException
+
+s_mvpic = on_command("mvpic", priority=5, permission=BLACK_GROUP)
+INVALID_FILENAME_CHARACTERS = r'\/:*?"<>|'
+
+
+# mvpic -l name -g name
+# mvpic -lg name name
+# mvpic -gl name name
+# mvpic -l -g name
+# mvpic -g -l name
+# mvpic -gl name
+# mvpic -lg name
+# mvpic name name
+
+
+@s_mvpic.handle()
+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 = args.extract_plain_text().strip()
+    name = []
+    options = []
+
+    def parser():
+        pos = 0
+        nonlocal cmd, name, options
+
+        def _str(t: str) -> str:
+            nonlocal pos, cmd
+
+            result = ""
+            pos += 1
+            while pos < len(cmd):
+                if cmd[pos] == t:
+                    break
+                if not t and not cmd[pos].strip():
+                    break
+
+                if cmd[pos] == "\\":
+                    pos += 1
+                    if pos >= len(cmd):
+                        result += "\\"
+                        break
+                    elif cmd[pos] == "'":
+                        result += "'"
+                    elif cmd[pos] == '"':
+                        result += '"'
+                    elif cmd[pos] == "t":
+                        result += "\t"
+                    elif cmd[pos] == "n":
+                        result += "\n"
+                    elif cmd[pos] == "r":
+                        result += "\r"
+                    elif cmd[pos] == "\\":
+                        result += "\\"
+                    else:
+                        result += "\\"
+                        pos -= 1
+                else:
+                    result += cmd[pos]
+                pos += 1
+            pos += 1
+            return result
+
+        def _options() -> list[str]:
+            nonlocal pos, cmd
+
+            pos += 1
+            result = []
+            while pos < len(cmd) and cmd[pos].strip():
+                result.append(cmd[pos])
+                pos += 1
+            return result
+
+        while pos < len(cmd):
+            if cmd[pos] == "'":
+                name.append(_str("'"))
+            elif not cmd[pos].strip():
+                pos += 1
+            elif cmd[pos] == "-":
+                options.extend(_options())
+            elif cmd[pos] == '"':
+                name.append(_str('"'))
+            else:
+                pos -= 1
+                name.append(_str(""))
+
+    parser()
+    if not name:
+        await s_mvpic.finish("文件名呢？")
+    if not options:
+        options = ["l"]
+
+    if (not await PIC_AMDIN(bot, event)) and await GROUP_ADMIN(bot, event):
+        if "g" in options:
+            await s_mvpic.finish("管理员不能改全局名称哦~")
+
+    sname = name[0]
+    dname = name[1] if len(name) > 1 else sname
+    for c in INVALID_FILENAME_CHARACTERS:
+        sname = sname.replace(c, "-")
+        dname = dname.replace(c, "-")
+    if not sname.endswith((".jpg", ".png", ".gif")):
+        sname += ".jpg"
+    if not dname.endswith((".jpg", ".png", ".gif")):
+        dname += ".jpg"
+
+    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)
+    except NoPictureException as ex:
+        await s_mvpic.finish(
+            random.choice(WORDS.get("not found", [ex.name + " 没有找到哦"]))
+            + f"\n{ex.name} 没有找到哦"
+        )
+    except SameNameException:
+        await s_mvpic.finish(
+            random.choice(WORDS.get("name has been taken", ["文件名重复"]))
+        )
+    except Exception as ex:
+        await s_mvpic.finish(
+            f'{random.choice(WORDS.get("error", ["出错了喵~"]))}\n\n{ex}'
+        )
+    await s_mvpic.finish(random.choice(WORDS.get("rename succeed", ["图片已重命名"])))

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/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,
+            )
+        db_session.merge(pic)
+        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,29 +281,6 @@ 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:

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/nonebot_plugin_savepic/rule.py

@@ -7,6 +7,8 @@ from nonebot.adapters import Bot, Event
 from nonebot.internal.permission import Permission
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent as V11G
 from .config import Config
+from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN
+
 
 plugin_config = get_plugin_config(Config)
 

{nonebot_plugin_savepic-0.2.5 → nonebot_plugin_savepic-0.2.7}/pyproject.toml

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