From 927f48ef12a4ddfb6dd03e2c031094535bc892ac Mon Sep 17 00:00:00 2001
From: Maple127667 <98679702+Maple127667@users.noreply.github.com>
Date: Mon, 24 Mar 2025 23:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEruff=E7=9A=84=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
emoji_reviewer.py | 25 ++++++++++++++++---------
src/plugins/chat/emoji_manager.py | 4 +++-
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/emoji_reviewer.py b/emoji_reviewer.py
index 96da18ea..d0fc75e2 100644
--- a/emoji_reviewer.py
+++ b/emoji_reviewer.py
@@ -24,8 +24,11 @@ except ImportError:
os.makedirs(log_dir, exist_ok=True)
# 配置控制台输出格式
logger.remove() # 移除默认的处理器
- logger.add(sys.stderr, format="{time:MM-DD HH:mm} | emoji_reviewer | {message}") # 添加控制台输出
- logger.add("logs/emoji_reviewer/{time:YYYY-MM-DD}.log", rotation="00:00", format="{time:MM-DD HH:mm} | emoji_reviewer | {message}")
+ logger.add(sys.stderr,
+ format="{time:MM-DD HH:mm} | emoji_reviewer | {message}") # 添加控制台输出
+ logger.add("logs/emoji_reviewer/{time:YYYY-MM-DD}.log",
+ rotation="00:00",
+ format="{time:MM-DD HH:mm} | emoji_reviewer | {message}")
logger.warning("检测到src.common.logger并未导入，将使用默认loguru作为日志记录器")
logger.warning("如果你是用的是低版本(0.5.13)麦麦，请忽略此警告")
# 忽略 gradio 版本警告
@@ -43,8 +46,8 @@ if os.path.exists(bot_config_path):
except tomli.TOMLDecodeError as e:
logger.critical(f"配置文件bot_config.toml填写有误，请检查第{e.lineno}行第{e.colno}处：{e.msg}")
exit(1)
- except KeyError as e:
- logger.critical(f"配置文件bot_config.toml缺少model.embedding设置，请补充后再编辑表情包")
+ except KeyError :
+ logger.critical("配置文件bot_config.toml缺少model.embedding设置，请补充后再编辑表情包")
exit(1)
else:
logger.critical(f"没有找到配置文件{bot_config_path}")
@@ -106,7 +109,7 @@ async def get_embedding(text):
return embedding
else:
return f"网络错误{response.status_code}"
- except:
+ except: # noqa: E722
return None
@@ -170,7 +173,7 @@ def on_select(evt: gr.SelectData, *tag_values):
if new_index is None:
emoji_show = None
targets = []
- for current_value, tag in zip(tag_values, tags.keys()):
+ for current_value in zip(tag_values, tags.keys()):
if current_value:
neglect_update += 1
targets.append(False)
@@ -224,7 +227,9 @@ async def save_desc(desc):
yield ["正在构建embedding，请勿关闭页面...", gr.update(interactive=False), gr.update(interactive=False)]
embedding = await get_embedding(desc)
if embedding is None or isinstance(embedding, str):
- yield [f"获取embeddings失败！{embedding}", gr.update(interactive=True), gr.update(interactive=True)]
+ yield [f"获取embeddings失败！{embedding}",
+ gr.update(interactive=True),
+ gr.update(interactive=True)]
else:
e_id = emoji_show["_id"]
update_dict = {"$set": {"embedding": embedding, "description": desc}}
@@ -239,7 +244,9 @@ async def save_desc(desc):
logger.info(f'Update description and embeddings: {e_id}(hash={hash})')
yield ["保存完成", gr.update(value=desc, interactive=True), gr.update(interactive=True)]
except Exception as e:
- yield [f"出现异常: {e}", gr.update(interactive=True), gr.update(interactive=True)]
+ yield [f"出现异常: {e}",
+ gr.update(interactive=True),
+ gr.update(interactive=True)]
else:
yield ["没有选中表情包", gr.update()]
@@ -343,7 +350,7 @@ with gr.Blocks(title="MaimBot表情包审查器") as app:
gallery.select(fn=on_select, inputs=list(tag_boxes.values()), outputs=[gallery, description, *tag_boxes.values()])
revert_btn.click(fn=revert_desc, inputs=None, outputs=description)
save_btn.click(fn=save_desc, inputs=description, outputs=[description_label, description, save_btn])
- for k, v in tag_boxes.items():
+ for v in tag_boxes.items():
v.change(fn=change_tag, inputs=list(tag_boxes.values()), outputs=description_label)
app.load(
fn=update_gallery,
diff --git a/src/plugins/chat/emoji_manager.py b/src/plugins/chat/emoji_manager.py
index 8dea30b6..da3aacca 100644
--- a/src/plugins/chat/emoji_manager.py
+++ b/src/plugins/chat/emoji_manager.py
@@ -398,7 +398,9 @@ class EmojiManager:
# 修复拼写错误
if "discription" in emoji:
desc = emoji["discription"]
- db.emoji.update_one({"_id": emoji["_id"]}, {"$unset": {"discription": ""}, "$set": {"description": desc}})
+ db.emoji.update_one({"_id": emoji["_id"]},
+ {"$unset": {"discription": ""},
+ "$set": {"description": desc}})
except Exception as item_error:
logger.error(f"[错误] 处理表情包记录时出错: {str(item_error)}")