From 7290736e464dc5a7cccb3ade2235a3eb07ab7891 Mon Sep 17 00:00:00 2001 From: Ri-Nai Date: Sun, 19 Oct 2025 00:29:48 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=B0=86=20InfoUtils=20=E7=B1=BB?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=88=86=E6=9E=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AE=9E=E7=8E=B0=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=98=B5=E7=A7=B0=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/analysis/analyzers/golden_quote_analyzer.py | 2 +- src/analysis/analyzers/topic_analyzer.py | 2 +- src/analysis/statistics.py | 2 +- src/analysis/utils/__init__.py | 7 ++++++- src/{ => analysis}/utils/info_utils.py | 2 +- src/utils/__init__.py | 4 +--- 6 files changed, 11 insertions(+), 8 deletions(-) rename src/{ => analysis}/utils/info_utils.py (82%) diff --git a/src/analysis/analyzers/golden_quote_analyzer.py b/src/analysis/analyzers/golden_quote_analyzer.py index f764af8..671ac63 100644 --- a/src/analysis/analyzers/golden_quote_analyzer.py +++ b/src/analysis/analyzers/golden_quote_analyzer.py @@ -9,7 +9,7 @@ from astrbot.api import logger from ...models.data_models import GoldenQuote, TokenUsage from .base_analyzer import BaseAnalyzer from ..utils.json_utils import extract_golden_quotes_with_regex -from ...utils import InfoUtils +from ..utils import InfoUtils diff --git a/src/analysis/analyzers/topic_analyzer.py b/src/analysis/analyzers/topic_analyzer.py index e69400e..d8f580d 100644 --- a/src/analysis/analyzers/topic_analyzer.py +++ b/src/analysis/analyzers/topic_analyzer.py @@ -10,7 +10,7 @@ from astrbot.api import logger from ...models.data_models import SummaryTopic, TokenUsage from .base_analyzer import BaseAnalyzer from ..utils.json_utils import extract_topics_with_regex -from ...utils import InfoUtils +from ..utils import InfoUtils class TopicAnalyzer(BaseAnalyzer): diff --git a/src/analysis/statistics.py b/src/analysis/statistics.py index dcd01b1..c1bbb1a 100644 --- a/src/analysis/statistics.py +++ b/src/analysis/statistics.py @@ -6,7 +6,7 @@ from datetime import datetime from typing import List, Dict from collections import defaultdict -from ..utils import InfoUtils +from .utils import InfoUtils class UserAnalyzer: diff --git a/src/analysis/utils/__init__.py b/src/analysis/utils/__init__.py index 440c513..b935e13 100644 --- a/src/analysis/utils/__init__.py +++ b/src/analysis/utils/__init__.py @@ -17,6 +17,8 @@ from .llm_utils import ( extract_response_text ) +from .info_utils import InfoUtils + __all__ = [ # JSON处理工具 'fix_json', @@ -28,5 +30,8 @@ __all__ = [ # LLM工具 'call_provider_with_retry', 'extract_token_usage', - 'extract_response_text' + 'extract_response_text', + + # 信息工具 + 'InfoUtils' ] \ No newline at end of file diff --git a/src/utils/info_utils.py b/src/analysis/utils/info_utils.py similarity index 82% rename from src/utils/info_utils.py rename to src/analysis/utils/info_utils.py index 2e63af8..bf07545 100644 --- a/src/utils/info_utils.py +++ b/src/analysis/utils/info_utils.py @@ -4,7 +4,7 @@ class InfoUtils: """ 获取用户昵称 - 优先使用nickname字段,如果为空则使用card(群名片)字段 + 优先使用nickname字段,如果为空则使用card(群名片)字段 """ enable_user_card = config_manager.get_enable_user_card() if enable_user_card: diff --git a/src/utils/__init__.py b/src/utils/__init__.py index 5e00fa4..c70fe49 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -5,10 +5,8 @@ from .pdf_utils import PDFInstaller from .helpers import MessageAnalyzer -from .info_utils import InfoUtils __all__ = [ 'PDFInstaller', - 'MessageAnalyzer', - 'InfoUtils' + 'MessageAnalyzer' ] \ No newline at end of file