超级Ruff

2025-09-09 19:25:12 +08:00
parent ac2936d5fc
commit 163dbb6b90
68 changed files with 1092 additions and 1043 deletions
--- a/src/chat/utils/statistic.py
+++ b/src/chat/utils/statistic.py
@@ -385,18 +385,18 @@ class StatisticOutputTask(AsyncTask):
                time_cost_key = f"time_costs_by_{category.split('_')[-1]}"
                avg_key = f"avg_time_costs_by_{category.split('_')[-1]}"
                std_key = f"std_time_costs_by_{category.split('_')[-1]}"
-                
+
                for item_name in stats[period_key][category]:
                    time_costs = stats[period_key][time_cost_key].get(item_name, [])
                    if time_costs:
                        # 计算平均耗时
                        avg_time_cost = sum(time_costs) / len(time_costs)
                        stats[period_key][avg_key][item_name] = round(avg_time_cost, 3)
-                        
+
                        # 计算标准差
                        if len(time_costs) > 1:
                            variance = sum((x - avg_time_cost) ** 2 for x in time_costs) / len(time_costs)
-                            std_time_cost = variance ** 0.5
+                            std_time_cost = variance**0.5
                            stats[period_key][std_key][item_name] = round(std_time_cost, 3)
                        else:
                            stats[period_key][std_key][item_name] = 0.0
@@ -506,8 +506,6 @@ class StatisticOutputTask(AsyncTask):
                    break
        return stats

-    
-
    def _collect_all_statistics(self, now: datetime) -> Dict[str, Dict[str, Any]]:
        """
        收集各时间段的统计数据
@@ -639,7 +637,9 @@ class StatisticOutputTask(AsyncTask):
            cost = stats[COST_BY_MODEL][model_name]
            avg_time_cost = stats[AVG_TIME_COST_BY_MODEL][model_name]
            std_time_cost = stats[STD_TIME_COST_BY_MODEL][model_name]
-            output.append(data_fmt.format(name, count, in_tokens, out_tokens, tokens, cost, avg_time_cost, std_time_cost))
+            output.append(
+                data_fmt.format(name, count, in_tokens, out_tokens, tokens, cost, avg_time_cost, std_time_cost)
+            )

        output.append("")
        return "\n".join(output)
@@ -728,7 +728,9 @@ class StatisticOutputTask(AsyncTask):
                    f"<td>{stat_data[STD_TIME_COST_BY_MODEL][model_name]:.1f} 秒</td>"
                    f"</tr>"
                    for model_name, count in sorted(stat_data[REQ_CNT_BY_MODEL].items())
-                ] if stat_data[REQ_CNT_BY_MODEL] else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
+                ]
+                if stat_data[REQ_CNT_BY_MODEL]
+                else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
            )
            # 按请求类型分类统计
            type_rows = "\n".join(
@@ -744,7 +746,9 @@ class StatisticOutputTask(AsyncTask):
                    f"<td>{stat_data[STD_TIME_COST_BY_TYPE][req_type]:.1f} 秒</td>"
                    f"</tr>"
                    for req_type, count in sorted(stat_data[REQ_CNT_BY_TYPE].items())
-                ] if stat_data[REQ_CNT_BY_TYPE] else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
+                ]
+                if stat_data[REQ_CNT_BY_TYPE]
+                else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
            )
            # 按模块分类统计
            module_rows = "\n".join(
@@ -760,7 +764,9 @@ class StatisticOutputTask(AsyncTask):
                    f"<td>{stat_data[STD_TIME_COST_BY_MODULE][module_name]:.1f} 秒</td>"
                    f"</tr>"
                    for module_name, count in sorted(stat_data[REQ_CNT_BY_MODULE].items())
-                ] if stat_data[REQ_CNT_BY_MODULE] else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
+                ]
+                if stat_data[REQ_CNT_BY_MODULE]
+                else ["<tr><td colspan='8' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
            )

            # 聊天消息统计
@@ -768,7 +774,9 @@ class StatisticOutputTask(AsyncTask):
                [
                    f"<tr><td>{self.name_mapping[chat_id][0]}</td><td>{count}</td></tr>"
                    for chat_id, count in sorted(stat_data[MSG_CNT_BY_CHAT].items())
-                ] if stat_data[MSG_CNT_BY_CHAT] else ["<tr><td colspan='2' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
+                ]
+                if stat_data[MSG_CNT_BY_CHAT]
+                else ["<tr><td colspan='2' style='text-align: center; color: #999;'>暂无数据</td></tr>"]
            )
            # 生成HTML
            return f"""
--- a/src/chat/utils/utils.py
+++ b/src/chat/utils/utils.py
@@ -49,9 +49,9 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, bool, float
    reply_probability = 0.0
    is_at = False
    is_mentioned = False
-    
+
    # 这部分怎么处理啊啊啊啊
-    #我觉得可以给消息加一个 reply_probability_boost字段
+    # 我觉得可以给消息加一个 reply_probability_boost字段
    if (
        message.message_info.additional_config is not None
        and message.message_info.additional_config.get("is_mentioned") is not None
@@ -826,20 +826,48 @@ def parse_keywords_string(keywords_input) -> list[str]:
    return [keywords_str] if keywords_str else []


-
-
 def cut_key_words(concept_name: str) -> list[str]:
    """对概念名称进行jieba分词，并过滤掉关键词列表中的关键词"""
    concept_name_tokens = list(jieba.cut(concept_name))

    # 定义常见连词、停用词与标点
-    conjunctions = {
-        "和", "与", "及", "跟", "以及", "并且", "而且", "或", "或者", "并"
-    }
+    conjunctions = {"和", "与", "及", "跟", "以及", "并且", "而且", "或", "或者", "并"}
    stop_words = {
-        "的", "了", "呢", "吗", "吧", "啊", "哦", "恩", "嗯", "呀", "嘛", "哇",
-        "在", "是", "很", "也", "又", "就", "都", "还", "更", "最", "被", "把",
-        "给", "对", "和", "与", "及", "跟", "并", "而且", "或者", "或", "以及"
+        "的",
+        "了",
+        "呢",
+        "吗",
+        "吧",
+        "啊",
+        "哦",
+        "恩",
+        "嗯",
+        "呀",
+        "嘛",
+        "哇",
+        "在",
+        "是",
+        "很",
+        "也",
+        "又",
+        "就",
+        "都",
+        "还",
+        "更",
+        "最",
+        "被",
+        "把",
+        "给",
+        "对",
+        "和",
+        "与",
+        "及",
+        "跟",
+        "并",
+        "而且",
+        "或者",
+        "或",
+        "以及",
    }
    chinese_punctuations = set("，。！？、；：（）【】《》“”‘’—…·-——,.!?;:()[]<>'\"/\\")

@@ -864,11 +892,16 @@ def cut_key_words(concept_name: str) -> list[str]:
            left = merged_tokens[-1]
            right = cleaned_tokens[i + 1]
            # 左右都需要是有效词
-            if left and right \
-                and left not in conjunctions and right not in conjunctions \
-                and left not in stop_words and right not in stop_words \
-                and not all(ch in chinese_punctuations for ch in left) \
-                and not all(ch in chinese_punctuations for ch in right):
+            if (
+                left
+                and right
+                and left not in conjunctions
+                and right not in conjunctions
+                and left not in stop_words
+                and right not in stop_words
+                and not all(ch in chinese_punctuations for ch in left)
+                and not all(ch in chinese_punctuations for ch in right)
+            ):
                # 合并为一个新词，并替换掉左侧与跳过右侧
                combined = f"{left}{tok}{right}"
                merged_tokens[-1] = combined
@@ -889,7 +922,7 @@ def cut_key_words(concept_name: str) -> list[str]:
        if tok in stop_words:
            continue
        # if tok in ban_words:
-            # continue
+        # continue
        if all(ch in chinese_punctuations for ch in tok):
            continue
        if tok.strip() == "":
@@ -899,4 +932,4 @@ def cut_key_words(concept_name: str) -> list[str]:
            result_tokens.append(tok)

    filtered_concept_name_tokens = result_tokens
-    return filtered_concept_name_tokens
+    return filtered_concept_name_tokens
--- a/src/chat/utils/utils_image.py
+++ b/src/chat/utils/utils_image.py
@@ -91,9 +91,10 @@ class ImageManager:
                desc_obj.save()
        except Exception as e:
            logger.error(f"保存描述到数据库失败 (Peewee): {str(e)}")
-            
+
    async def get_emoji_tag(self, image_base64: str) -> str:
        from src.chat.emoji_system.emoji_manager import get_emoji_manager
+
        emoji_manager = get_emoji_manager()
        if isinstance(image_base64, str):
            image_base64 = image_base64.encode("ascii", errors="ignore").decode("ascii")
@@ -120,6 +121,7 @@ class ImageManager:
            # 优先使用EmojiManager查询已注册表情包的描述
            try:
                from src.chat.emoji_system.emoji_manager import get_emoji_manager
+
                emoji_manager = get_emoji_manager()
                tags = await emoji_manager.get_emoji_tag_by_hash(image_hash)
                if tags: