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

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

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

{nonebot_plugin_savepic-0.2.7 → nonebot_plugin_savepic-0.3.1}/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.7 → nonebot_plugin_savepic-0.3.1}/nonebot_plugin_savepic/config.py

@@ -36,3 +36,9 @@ class Config(BaseModel):
 
     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.1/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.7 → nonebot_plugin_savepic-0.3.1}/nonebot_plugin_savepic/mvpic.py

@@ -1,5 +1,4 @@
 import random
-import re
 from nonebot import on_command
 from nonebot.params import CommandArg
 from nonebot.internal.adapter import Bot

{nonebot_plugin_savepic-0.2.7 → nonebot_plugin_savepic-0.3.1}/nonebot_plugin_savepic/pic_sql.py

@@ -6,7 +6,6 @@ import asyncpg
 from nonebot import get_driver
 import dashscope
 import pathlib
-from pinecone import Pinecone, ServerlessSpec
 
 from .model import PicData
 from .picture import del_pic
@@ -20,7 +19,6 @@ from .error import NoPictureException
 gdriver = get_driver()
 p_config = Config.parse_obj(gdriver.config)
 _async_database = None
-_pincone_index = None
 _async_embedding_database = None
 
 
@@ -37,15 +35,15 @@ async def update_vec(pic: PicData):
         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()
+        # 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):
@@ -64,37 +62,6 @@ async def select_pic(filename: str, group: str):
         )
 
 
-# async def get_most_similar_pic(
-#     img_vec: list[float],
-#     group_id: str,
-#     ignore_diagonal: bool = False,
-#     ignore_min: bool = False,
-# ) -> tuple[float, PicData]:
-#     async with AsyncSession(_async_database) as db_session:
-#         ret = _pincone_index.query(img_vec, top_k=20)["matches"]
-#         if not ret:
-#             return None, None
-#         if not ret[0]["id"]:
-#             return None, None
-#         if ignore_diagonal and ret[0]["score"] >= 0.999:
-#             ret.pop(0)
-
-#         for i in ret:
-#             if i["score"] < 0.65 and not ignore_min:
-#                 return None, None
-#             if i["id"]:
-#                 despic = await db_session.scalar(
-#                     select(PicData)
-#                     .where(PicData.id == int(i["id"]))
-#                     .where(PicData.name != "")
-#                     .where(sa.or_(PicData.group == group_id, PicData.group == "globe"))
-#                 )
-#                 if despic:
-#                     return i["score"], despic
-
-#         return None, None
-
-
 async def savepic(
     filename: str,
     url: str,
@@ -173,7 +140,6 @@ async def delete(filename: str, group: str):
         del_pic(pic.url)
         pic.name = ""
         await db_session.merge(pic)
-        # _pincone_index.delete(ids=[str(pic.id)])
         await _async_embedding_database.execute(
             "UPDATE savepic_word2vec SET embedding = NULL WHERE id = $1", pic.id
         )
@@ -285,7 +251,12 @@ 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 +264,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]
@@ -302,7 +273,7 @@ async def listpic(reg: str, group: str = "globe", pages: int = 0) -> list[str]:
 
 async def init_db():
     # check if the table exists
-    global _async_database, _pincone_index, _async_embedding_database
+    global _async_database, _async_embedding_database
     _async_database = create_async_engine(
         p_config.savepic_sqlurl,
         future=True,
@@ -350,22 +321,6 @@ async def init_db():
             )
         )
 
-    if not p_config.pinecone_apikey:
-        raise Exception("请配置 pinecone_apikey")
-    if not p_config.pinecone_environment:
-        raise Exception("请配置 pinecone_environment")
-
-    pc = Pinecone(api_key=p_config.pinecone_apikey)
-    if p_config.pinecone_index not in pc.list_indexes().names():
-        pc.create_index(
-            name=p_config.pinecone_index,
-            dimension=1536,
-            metric="euclidean",
-            spec=ServerlessSpec(cloud="aws", region="us-west-2"),
-        )
-    if not _pincone_index:
-        _pincone_index = pc.Index(p_config.pinecone_index)
-
 
 @gdriver.on_startup
 async def _():
@@ -388,7 +343,6 @@ async def _():
     #                     .where(PicData.name != "")
     #                 )
     #                 if pic:
-    #                     _pincone_index.upsert([(str(pic.id), files[i])])
     #                     print(f"{pic.name} 加载成功")
     #         except Exception as ex:
     #             print(ex)

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

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