nonebot-plugin-randpic 1.2.2__tar.gz → 1.3.0__tar.gz

{nonebot_plugin_randpic-1.2.2 → nonebot_plugin_randpic-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-randpic
-Version: 1.2.2
+Version: 1.3.0
 Summary: 一个通过指令随机发送你存储的图片的nonebot2插件
 License: MIT
 License-File: LICENSE
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aiosqlite (>=0.13.0,<0.14.0)
 Requires-Dist: alibabacloud_oss_v2 (>=1.1.0)
 Requires-Dist: httpx (>=0.20.0,<1.0.0)
+Requires-Dist: imagehash (>=4.3.0)
 Requires-Dist: nonebot-adapter-onebot (>=2.1.5,<3.0.0)
 Requires-Dist: nonebot-plugin-localstore (>=0.6.0,<0.7.0)
 Requires-Dist: nonebot2[fastapi] (>=2.0.0,<3.0.0)
@@ -56,7 +57,7 @@ _✨ 一个发送指令就能让你的 bot 发出对应指令的图片的插件
 
 你可以很方便地直接通过在配置文件里设置好触发指令（支持多个触发指令）后，在群聊中发送对应指令，从而使 Bot 随机发送出你所存储的图片。
 
-插件除了能随机发送图片，还能在群聊内直接通过指令存储图片，同时为了避免重复加入同一张图片，该插件添加了 md5 码检查。
+插件除了能随机发送图片，还能在群聊内直接通过指令存储图片，同时为了避免重复加入同一张图片，该插件添加了图片感知哈希算法，相似的图片无法重复添加。
 
 随机发送图片是利用 sql 语句随机选择指令。
 
@@ -224,7 +225,7 @@ randpic_oss_no_upload_list=["capoo"]
 ## TODO
 - [x] 指令触发 bot 发送图片
 - [x] 在 QQ 上让 bot 存储对应指令的图片
-- [x] 每次存储图片，判断图片是否已经存在，避免重复加入
+- [x] 每次存储图片，判断相似图片是否已经存在，避免重复加入
 - [X] 由capoo插件衍生成一个模板插件，即仅需修改参数就能发送别的图片
 - [X] 添加图片压缩功能，避免图片文件夹空间过大
 - [X] 以阿里云OSS对象存储搭建静态网页，便于浏览器查看图片

{nonebot_plugin_randpic-1.2.2 → nonebot_plugin_randpic-1.3.0}/README.md

@@ -27,7 +27,7 @@ _✨ 一个发送指令就能让你的 bot 发出对应指令的图片的插件
 
 你可以很方便地直接通过在配置文件里设置好触发指令（支持多个触发指令）后，在群聊中发送对应指令，从而使 Bot 随机发送出你所存储的图片。
 
-插件除了能随机发送图片，还能在群聊内直接通过指令存储图片，同时为了避免重复加入同一张图片，该插件添加了 md5 码检查。
+插件除了能随机发送图片，还能在群聊内直接通过指令存储图片，同时为了避免重复加入同一张图片，该插件添加了图片感知哈希算法，相似的图片无法重复添加。
 
 随机发送图片是利用 sql 语句随机选择指令。
 
@@ -195,7 +195,7 @@ randpic_oss_no_upload_list=["capoo"]
 ## TODO
 - [x] 指令触发 bot 发送图片
 - [x] 在 QQ 上让 bot 存储对应指令的图片
-- [x] 每次存储图片，判断图片是否已经存在，避免重复加入
+- [x] 每次存储图片，判断相似图片是否已经存在，避免重复加入
 - [X] 由capoo插件衍生成一个模板插件，即仅需修改参数就能发送别的图片
 - [X] 添加图片压缩功能，避免图片文件夹空间过大
 - [X] 以阿里云OSS对象存储搭建静态网页，便于浏览器查看图片

{nonebot_plugin_randpic-1.2.2 → nonebot_plugin_randpic-1.3.0}/nonebot_plugin_randpic/__init__.py

@@ -15,10 +15,10 @@ from nonebot.params import Fullmatch
 from urllib import parse
 from urllib.parse import urlparse
 import importlib
-
+import imagehash
 from .config import *
 from .ali_oss import *
-from .compress import compress_image_from_bytes, get_image_extension
+from .compress import compress_image_from_bytes, get_image_extension, compute_phash
 from .web import StaticImageGalleryGenerator
 
 __plugin_meta__ = PluginMetadata(
@@ -77,8 +77,9 @@ async def create_dir():
         await cursor.execute('DROP table if exists Pic_of_{command};'.format(command=command))
         await cursor.execute('''
             CREATE TABLE IF NOT EXISTS Pic_of_{command} (
-                md5 TEXT PRIMARY KEY,
-                img_url TEXT
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                img_url TEXT NOT NULL,
+                phash TEXT NOT NULL
             )
             '''.format(command=command))
         await connection.commit()
@@ -123,12 +124,12 @@ async def create_dir():
             with (path / filename).open('wb') as f:
                 f.write(data)
 
-            fmd5 = hashlib.md5(data).hexdigest()
+            new_phash_str = compute_phash(data)
             cursor = await connection.cursor()
             command: str = randpic_command_tuple[index]
             await cursor.execute(
-                'INSERT or REPLACE INTO Pic_of_{command}(md5, img_url) VALUES (?, ?)'.format(command=command),
-                (fmd5, str(Path() / command / filename)))
+                'INSERT INTO Pic_of_{command}(img_url, phash) VALUES (?, ?)'.format(command=command),
+                (str(Path() / command / filename), new_phash_str))
             await connection.commit()
 
 def web_app_init(web_driver: Driver):
@@ -155,7 +156,7 @@ def web_app_init(web_driver: Driver):
 web_app_init(driver)
 
 
-picture = on_fullmatch(randpic_command_tuple, permission=GROUP, priority=1, block=True)
+picture = on_fullmatch(randpic_command_tuple, permission=GROUP, priority=2, block=True)
 
 
 @picture.handle()
@@ -178,7 +179,7 @@ async def pic(event: GroupMessageEvent):
         await picture.send(f'{command}出不来了，稍后再试试吧~')
 
 
-add = on_fullmatch(randpic_command_add_tuple, permission=GROUP_ADMIN | GROUP_OWNER, priority=1, block=True)
+add = on_fullmatch(randpic_command_add_tuple, permission=GROUP_ADMIN | GROUP_OWNER, priority=2, block=True)
 
 
 @add.got("pic", prompt="请发送图片！")
@@ -210,45 +211,48 @@ async def add_pic(args: str = Fullmatch(), pic_list: Message = Arg('pic')):
 
         data = resp.content
         data = compress_image_from_bytes(data)  # 若图片超规格，压缩图片
-        fmd5 = hashlib.md5(data).hexdigest()
-
-        await cursor.execute(f'SELECT img_url FROM Pic_of_{command} where md5=?', (fmd5,))
-        status = await cursor.fetchone()
-
-        if status is not None:
-            await add.send(pic_name + Message('\n这张已经有了，不能重复添加！'))
-        else:
-            randpic_cur_picnum = len(os.listdir(randpic_img_path / command))
-            file_name = (randpic_filename.format(command=command, index=str(randpic_cur_picnum + 1).zfill(10))
-                        + get_image_extension(data))
-            file_path = randpic_img_path / command / file_name
-
-            try:
-                with file_path.open("wb") as f:
-                    f.write(data)
-                await cursor.execute('insert into Pic_of_{command}(md5, img_url) values (?, ?)'.format(command=command),
-                                     (fmd5, str(Path() / command / file_name)))
-                await connection.commit()
-            except Exception as e:
-                logger.warning(e)
-                await add.finish(pic_name + Message("\n导入失败！"), at_sender=True)
-
-            msg = "\n导入成功！"
-            if isOss and command not in randpic_oss_no_upload_list:
-                msg += f'可去 {endpoint}/{parse.quote(command)}/ 查看'
-                # StaticImageGalleryGenerator(randpic_img_path, randpic_path / 'public').generate_static_site()
-                StaticImageGalleryGenerator(randpic_img_path, randpic_path / 'public').generate_command_html(command, file_name, randpic_oss_no_upload_list)
-                await OSSUploaderV2().upload_file(str(randpic_path/ 'public' / command / 'index.html'), f'{command}/index.html') # 修改index.html文件
-                await OSSUploaderV2().upload_file(str(randpic_path / 'public' / 'index.html'), 'index.html')
-                await OSSUploaderV2().upload_file(file_path, f'{command}/{file_name}') # 上传新增的图片到OSS
-            await add.finish(pic_name + Message(msg), at_sender=True)
-
-oss = on_fullmatch('上传oss', ignorecase=True, permission=GROUP_ADMIN | GROUP_OWNER, priority=1, block=True, )
-@oss.handle()
+        new_phash_str = compute_phash(data)
+        new_phash = imagehash.hex_to_hash(new_phash_str)
+
+        await cursor.execute(f'SELECT phash FROM Pic_of_{command}')
+        existing = await cursor.fetchall()
+        SIMILARITY_THRESHOLD = 5  # 汉明距离 ≤5 认为相似
+        for ex_phash_str, in existing:
+            ex_phash = imagehash.hex_to_hash(ex_phash_str)
+            if (new_phash - ex_phash) < SIMILARITY_THRESHOLD:
+                await add.finish(pic_name + Message('\n这张已经有相似图，不能重复添加！'))
+
+        randpic_cur_picnum = len(os.listdir(randpic_img_path / command))
+        file_name = (randpic_filename.format(command=command, index=str(randpic_cur_picnum + 1).zfill(10))
+                    + get_image_extension(data))
+        file_path = randpic_img_path / command / file_name
+
+        try:
+            with file_path.open("wb") as f:
+                f.write(data)
+            await cursor.execute('insert into Pic_of_{command}(img_url, phash) values (?, ?)'.format(command=command),
+                                 (str(Path() / command / file_name), new_phash_str))
+            await connection.commit()
+        except Exception as e:
+            logger.warning(e)
+            await add.finish(pic_name + Message("\n导入失败！"), at_sender=True)
+
+        msg = "\n导入成功！"
+        if isOss and command not in randpic_oss_no_upload_list:
+            msg += f'可去 {endpoint}/{parse.quote(command)}/ 查看'
+            # StaticImageGalleryGenerator(randpic_img_path, randpic_path / 'public').generate_static_site()
+            StaticImageGalleryGenerator(randpic_img_path, randpic_path / 'public').generate_command_html(command, file_name, randpic_oss_no_upload_list)
+            await OSSUploaderV2().upload_file(str(randpic_path/ 'public' / command / 'index.html'), f'{command}/index.html') # 修改index.html文件
+            await OSSUploaderV2().upload_file(str(randpic_path / 'public' / 'index.html'), 'index.html')
+            await OSSUploaderV2().upload_file(file_path, f'{command}/{file_name}') # 上传新增的图片到OSS
+        await add.finish(pic_name + Message(msg), at_sender=True)
+
+OSS = on_fullmatch('上传oss', ignorecase=True, permission=GROUP_ADMIN | GROUP_OWNER, priority=1, block=True, )
+@OSS.handle()
 async def handle_oss(event: GroupMessageEvent) -> None:
     if not isOss:
         return
-    await oss.send('正在上传至OSS...')
+    await OSS.send('正在上传至OSS...')
     start_time = time.time()
 
     StaticImageGalleryGenerator(randpic_img_path, randpic_path / 'public').generate_static_site(randpic_oss_no_upload_list)
@@ -256,4 +260,4 @@ async def handle_oss(event: GroupMessageEvent) -> None:
 
     end_time = time.time()
     elapsed_time = end_time - start_time
-    await oss.finish(f'上传完成，用时: {elapsed_time:.2f}秒，地址：{endpoint}/')
+    await OSS.finish(f'上传完成，用时: {elapsed_time:.2f}秒，地址：{endpoint}/')

{nonebot_plugin_randpic-1.2.2 → nonebot_plugin_randpic-1.3.0}/nonebot_plugin_randpic/compress.py

@@ -2,6 +2,7 @@ import zipfile
 from pathlib import Path
 from nonebot.log import logger
 from PIL import Image
+import imagehash
 import io
 
 
@@ -199,6 +200,11 @@ def compress_folder_basic(folder_path, zip_path, include_subfolders=True):
         return False
 
 
+def compute_phash(image_bytes: bytes):
+    """计算图片感知哈希，返回十六进制字符串"""
+    with Image.open(io.BytesIO(image_bytes)) as img:
+        return str(imagehash.phash(img))
+
 # 测试
 if __name__ == '__main__':
     with open('C:\\Users\\hu_pa\\Desktop\\randpic\\lh\\randpic_lh_2.jpg', 'rb') as f:

{nonebot_plugin_randpic-1.2.2 → nonebot_plugin_randpic-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-randpic"
-version = "1.2.2"
+version = "1.3.0"
 description = "一个通过指令随机发送你存储的图片的nonebot2插件"
 authors = ["HuParry <hu_parry@qq.com>"]
 license = "MIT"
@@ -19,6 +19,7 @@ aiosqlite = "^0.13.0"
 httpx = ">=0.20.0,<1.0.0"
 alibabacloud_oss_v2 = ">=1.1.0"
 pillow = ">=11.0.0"
+imagehash = ">=4.3.0"
 
 [build-system]
 requires = ["poetry-core"]