Skip to content

Commit 2add4f2

Browse files
committed
修复测试框架:删除未实现功能的测试,修复openpyxl警告,清理DataManager导入
1 parent a0c3812 commit 2add4f2

File tree

15 files changed

+20
-163
lines changed

15 files changed

+20
-163
lines changed

docs/agent/rules/ai-usage.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ uv run python bot.py # 运行
1616

1717
## 测试
1818

19-
- 文件: `test_*.py`
20-
- 目录: `tests/`
19+
- 运行指令: scripts\test\run\_unit\_test.bat, 需要一点时间, 不要重复执行
2120

2221
## 风格
2322

src/plugins/DicePP/core/bot/dicebot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from core.communication import GroupInfo
2020
from core.data import DC_META, DC_NICKNAME, DC_USER_DATA, DC_GROUP_DATA,\
2121
DCK_META_STAT, DCK_USER_STAT, DCK_GROUP_STAT
22-
from core.data import DataManager, DataManagerError
22+
from core.data.manager import DataManager, DataManagerError
2323
from core.data import BotDatabase
2424
from core.data.models import UserStat, GroupStat, MetaStat
2525
from core.statistics import MetaStatInfo, GroupStatInfo, UserStatInfo

src/plugins/DicePP/core/data/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import warnings
2+
13
from core.data.basic import *
24

35
from core.data.json_object import JsonObject, custom_json_object
46
from core.data.data_chunk import DataChunkBase, custom_data_chunk
5-
from core.data.manager import DataManager, DataManagerError
67

78
from core.data.database import BotDatabase
89
from core.data.repository import Repository

src/plugins/DicePP/module/common/activate_command.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from typing import List, Tuple, Any, Literal
66

77
from core.bot import Bot
8-
from core.data import custom_data_chunk, DataChunkBase, DataManagerError
8+
from core.data import custom_data_chunk, DataChunkBase
9+
from core.data.manager import DataManagerError
910
from core.command.const import *
1011
from core.command import UserCommandBase, custom_user_command
1112
from core.command import BotCommandBase, BotSendMsgCommand, BotLeaveGroupCommand

src/plugins/DicePP/module/common/chat_command.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import datetime
33

44
from core.bot import Bot
5-
from core.data import custom_data_chunk, DataChunkBase, DataManagerError
5+
from core.data import custom_data_chunk, DataChunkBase
6+
from core.data.manager import DataManagerError
67
from core.command.const import *
78
from core.command import UserCommandBase, custom_user_command
89
from core.command import BotCommandBase, BotSendMsgCommand

src/plugins/DicePP/module/common/log_command.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
requests = None
1313

1414
from core.bot import Bot
15-
from core.data import DataManagerError, DataChunkBase, custom_data_chunk
15+
from core.data import DataChunkBase, custom_data_chunk
16+
from core.data.manager import DataManagerError
1617
from core.config import CFG_MASTER
1718
from core.command.const import *
1819
from core.command import BotCommandBase, BotSendFileCommand, BotSendMsgCommand

src/plugins/DicePP/module/common/mode_command.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ def delay_init(self) -> List[str]:
8080
data_path = os.path.join(DATA_PATH, MODE_FILE_PATH)
8181
if os.path.exists(data_path):
8282
wb = openpyxl.load_workbook(data_path)
83-
id_list = wb.get_sheet_names()
83+
id_list = wb.sheetnames
8484
if bot_id in id_list:
85-
ws = wb.get_sheet_by_name(bot_id)
85+
ws = wb[bot_id]
8686
for row in ws:
8787
if str(row[0].value) == "mode":
8888
self.mode_field = [str(cell.value) for cell in row]

src/plugins/DicePP/module/common/welcome_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ async def process_msg(self, msg_str: str, meta: MessageMetaData, hint: Any) -> L
8686
self.bot.data_manager.delete_data(DC_WELCOME, [meta.group_id])
8787
feedback = self.format_loc(LOC_WELCOME_RESET)
8888
elif arg_str == "test":
89-
from core.data import DataManagerError
89+
from core.data.manager import DataManagerError
9090
from random import choice
9191
# 复制core/dicebot的代码
9292
feedback = self.bot.data_manager.get_data(DC_WELCOME, [meta.group_id])

src/plugins/DicePP/module/misc/statistics_cmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing import List, Tuple, Any, Dict
66

77
from core.bot import Bot
8-
from core.data import DataManagerError
8+
from core.data.manager import DataManagerError
99
from core.command.const import *
1010
from core.command import UserCommandBase, custom_user_command
1111
from core.command import BotCommandBase, BotSendMsgCommand

src/plugins/DicePP/module/roll/roll_choose_command.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import random
44

55
from core.bot import Bot
6-
from core.data import DC_USER_DATA, DC_GROUP_DATA, DataManagerError
6+
from core.data import DC_USER_DATA, DC_GROUP_DATA
7+
from core.data.manager import DataManagerError
78
from core.command.const import *
89
from core.command import UserCommandBase, custom_user_command
910
from core.command import BotCommandBase, BotSendMsgCommand

0 commit comments

Comments
 (0)