Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-18 10:40:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Develop: 完全使用 ruff 替代 isort 与 black (#1757)

Browse Source 
* 🚨 完全使用 ruff 替代 isort 与 black

* 🚨 ruff lint&format
This commit is contained in:
BalconyJH
2024-12-10 19:49:11 +08:00
committed by GitHub
parent 28dd15a950
commit bc5a9c4fcc
147 changed files with 823 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhenxun/models/bag_user.py
+6 -7
View File
@@ -1,5 +1,3 @@
from typing import Dict
from tortoise import fields
from zhenxun.services.db_context import Model
@@ -8,7 +6,6 @@ from .goods_info import GoodsInfo
class BagUser(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255)
@@ -25,7 +22,7 @@ class BagUser(Model):
"""今日获取金币"""
spend_today_gold = fields.IntField(default=0)
"""今日获取金币"""
property: Dict[str, int] = fields.JSONField(default={}) # type: ignore
property: dict[str, int] = fields.JSONField(default={}) # type: ignore
"""道具"""
class Meta:
@@ -50,7 +47,7 @@ class BagUser(Model):
@classmethod
async def get_property(
cls, user_id: str, group_id: str, only_active: bool = False
) -> Dict[str, int]:
) -> dict[str, int]:
"""获取当前道具
参数:
@@ -153,8 +150,10 @@ class BagUser(Model):
@classmethod
async def _run_script(cls):
return [
"ALTER TABLE bag_users DROP props;", # 删除 props 字段
"ALTER TABLE bag_users RENAME COLUMN user_qq TO user_id;", # 将user_qq改为user_id
# 删除 props 字段
"ALTER TABLE bag_users DROP props;",
# 将user_qq改为user_id
"ALTER TABLE bag_users RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE bag_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE bag_users ALTER COLUMN group_id TYPE character varying(255);",
zhenxun/models/ban_console.py
+1 -1
View File
@@ -3,8 +3,8 @@ from typing_extensions import Self
from tortoise import fields
from zhenxun.services.log import logger
from zhenxun.services.db_context import Model
from zhenxun.services.log import logger
from zhenxun.utils.exception import UserAndGroupIsNone
zhenxun/models/chat_history.py
+16 -10
View File
@@ -1,15 +1,14 @@
from datetime import datetime, timedelta
from typing import Literal
from typing_extensions import Self
from tortoise import fields
from tortoise.functions import Count
from typing_extensions import Self
from zhenxun.services.db_context import Model
class ChatHistory(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255)
@@ -27,7 +26,7 @@ class ChatHistory(Model):
platform = fields.CharField(255, null=True)
"""平台"""
class Meta: # type: ignore
class Meta: # type: ignore
table = "chat_history"
table_description = "聊天记录数据表"
@@ -116,13 +115,20 @@ class ChatHistory(Model):
@classmethod
async def _run_script(cls):
return [
"alter table chat_history alter group_id drop not null;", # 允许 group_id 为空
"alter table chat_history alter text drop not null;", # 允许 text 为空
"alter table chat_history alter plain_text drop not null;", # 允许 plain_text 为空
"ALTER TABLE chat_history RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE chat_history ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE chat_history ALTER COLUMN group_id TYPE character varying(255);",
"ALTER TABLE chat_history ADD bot_id VARCHAR(255);", # 添加bot_id字段
# 允许 group_id 为空
"alter table chat_history alter group_id drop not null;",
# 允许 text 为空
"alter table chat_history alter text drop not null;",
# 允许 plain_text 为空
"alter table chat_history alter plain_text drop not null;",
# 将user_id改为user_id
"ALTER TABLE chat_history RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE chat_history "
"ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE chat_history "
"ALTER COLUMN group_id TYPE character varying(255);",
# 添加bot_id字段
"ALTER TABLE chat_history ADD bot_id VARCHAR(255);",
"ALTER TABLE chat_history ALTER COLUMN bot_id TYPE character varying(255);",
"ALTER TABLE chat_history ADD COLUMN platform character varying(255);",
]
zhenxun/models/fg_request.py
+4 -4
View File
@@ -1,10 +1,10 @@
from tortoise import fields
from nonebot.adapters import Bot
from tortoise import fields
from zhenxun.services.db_context import Model
from zhenxun.utils.exception import NotFoundError
from zhenxun.models.group_console import GroupConsole
from zhenxun.utils.enum import RequestType, RequestHandleType
from zhenxun.services.db_context import Model
from zhenxun.utils.enum import RequestHandleType, RequestType
from zhenxun.utils.exception import NotFoundError
class FgRequest(Model):
zhenxun/models/friend_user.py
+4 -4
View File
@@ -1,5 +1,3 @@
from typing import Union
from tortoise import fields
from zhenxun.configs.config import Config
@@ -78,6 +76,8 @@ class FriendUser(Model):
@classmethod
def _run_script(cls):
return [
"ALTER TABLE friend_users ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE friend_users ADD COLUMN platform character varying(255) default 'qq';",
"ALTER TABLE friend_users "
"ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE friend_users "
"ADD COLUMN platform character varying(255) default 'qq';",
]
zhenxun/models/goods_info.py
+4 -4
View File
@@ -1,8 +1,7 @@
from typing_extensions import Self
import uuid
from typing import Dict
from tortoise import fields
from typing_extensions import Self
from zhenxun.services.db_context import Model
@@ -147,7 +146,7 @@ class GoodsInfo(Model):
goods_lst = []
for _ in range(len(query)):
min_id = min(id_lst)
goods_lst.append([x for x in query if x.id == min_id][0])
goods_lst.append(next(x for x in query if x.id == min_id))
id_lst.remove(min_id)
return goods_lst
@@ -158,5 +157,6 @@ class GoodsInfo(Model):
"ALTER TABLE goods_info ADD daily_limit Integer DEFAULT 0;",
"ALTER TABLE goods_info ADD is_passive boolean DEFAULT False;",
"ALTER TABLE goods_info ADD icon VARCHAR(255);",
"ALTER TABLE goods_info DROP daily_purchase_limit;", # 删除 daily_purchase_limit 字段
# 删除 daily_purchase_limit 字段
"ALTER TABLE goods_info DROP daily_purchase_limit;",
]
zhenxun/models/group_member_info.py
+14 -9
View File
@@ -1,5 +1,3 @@
from typing import Set
from tortoise import fields
from zhenxun.configs.config import Config
@@ -30,7 +28,7 @@ class GroupInfoUser(Model):
unique_together = ("user_id", "group_id")
@classmethod
async def get_all_uid(cls, group_id: str) -> Set[int]:
async def get_all_uid(cls, group_id: str) -> set[int]:
"""获取该群所有用户id
参数:
@@ -101,11 +99,18 @@ class GroupInfoUser(Model):
@classmethod
async def _run_script(cls):
return [
"alter table group_info_users alter user_join_time drop not null;", # 允许 user_join_time 为空
"ALTER TABLE group_info_users ALTER COLUMN user_join_time TYPE timestamp with time zone USING user_join_time::timestamp with time zone;",
"ALTER TABLE group_info_users RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE group_info_users ALTER COLUMN user_id TYPE character varying(255);",
# 允许 user_join_time 为空
"alter table group_info_users alter user_join_time drop not null;",
"ALTER TABLE group_info_users "
"ALTER COLUMN user_join_time TYPE timestamp with time zone "
"USING user_join_time::timestamp with time zone;",
# 将user_id改为user_id
"ALTER TABLE group_info_users RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE group_info_users "
"ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE group_info_users ALTER COLUMN group_id TYPE character varying(255);",
"ALTER TABLE group_info_users ADD COLUMN platform character varying(255) default 'qq';",
"ALTER TABLE group_info_users "
"ALTER COLUMN group_id TYPE character varying(255);",
"ALTER TABLE group_info_users "
"ADD COLUMN platform character varying(255) default 'qq';",
]
zhenxun/models/level_user.py
+6 -6
View File
@@ -1,6 +1,3 @@
from datetime import datetime
from typing import Union
from tortoise import fields
from zhenxun.services.db_context import Model
@@ -120,8 +117,11 @@ class LevelUser(Model):
@classmethod
async def _run_script(cls):
return [
"ALTER TABLE level_users RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE level_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id改为user_id
"ALTER TABLE level_users RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE level_users "
"ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE level_users ALTER COLUMN group_id TYPE character varying(255);",
"ALTER TABLE level_users "
"ALTER COLUMN group_id TYPE character varying(255);",
]
zhenxun/models/plugin_info.py
+1 -1
View File
@@ -2,9 +2,9 @@ from typing_extensions import Self
from tortoise import fields
from zhenxun.models.plugin_limit import PluginLimit # noqa: F401
from zhenxun.services.db_context import Model
from zhenxun.utils.enum import BlockType, PluginType
from zhenxun.models.plugin_limit import PluginLimit # noqa: F401
class PluginInfo(Model):
zhenxun/models/sign_group_user.py
+8 -7
View File
@@ -1,5 +1,4 @@
from datetime import datetime
from typing import List, Literal, Optional, Tuple, Union
from tortoise import fields
@@ -7,7 +6,6 @@ from zhenxun.services.db_context import Model
class SignGroupUser(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255)
@@ -49,8 +47,8 @@ class SignGroupUser(Model):
@classmethod
async def get_all_impression(
cls, group_id: Union[int, str]
) -> Tuple[List[str], List[float], List[str]]:
cls, group_id: int | str
) -> tuple[list[str], list[float], list[str]]:
"""
说明:
获取该群所有用户 id 及对应 好感度
@@ -74,8 +72,11 @@ class SignGroupUser(Model):
@classmethod
async def _run_script(cls):
return [
"ALTER TABLE sign_group_users RENAME COLUMN user_qq TO user_id;", # 将user_id改为user_id
"ALTER TABLE sign_group_users ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id改为user_id
"ALTER TABLE sign_group_users RENAME COLUMN user_qq TO user_id;",
"ALTER TABLE sign_group_users "
"ALTER COLUMN user_id TYPE character varying(255);",
# 将user_id字段类型改为character varying(255)
"ALTER TABLE sign_group_users ALTER COLUMN group_id TYPE character varying(255);",
"ALTER TABLE sign_group_users "
"ALTER COLUMN group_id TYPE character varying(255);",
]
zhenxun/models/sign_log.py
-4
View File
@@ -1,13 +1,9 @@
from datetime import datetime
from typing import List, Literal, Optional, Tuple, Union
from tortoise import fields
from zhenxun.services.db_context import Model
class SignLog(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, description="用户id")
zhenxun/models/sign_user.py
+2 -2
View File
@@ -1,6 +1,7 @@
from tortoise import fields
from typing_extensions import Self
from tortoise import fields
from zhenxun.services.db_context import Model
from .sign_log import SignLog
@@ -8,7 +9,6 @@ from .user_console import UserConsole
class SignUser(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, unique=True, description="用户id")
zhenxun/models/user_console.py
+1 -4
View File
@@ -1,5 +1,3 @@
from typing import Dict
from tortoise import fields
from zhenxun.models.goods_info import GoodsInfo
@@ -11,7 +9,6 @@ from .user_gold_log import UserGoldLog
class UserConsole(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, unique=True, description="用户id")
@@ -22,7 +19,7 @@ class UserConsole(Model):
"""金币数量"""
sign = fields.ReverseRelation["SignUser"] # type: ignore
"""好感度"""
props: Dict[str, int] = fields.JSONField(default={}) # type: ignore
props: dict[str, int] = fields.JSONField(default={}) # type: ignore
"""道具"""
platform = fields.CharField(255, null=True, description="平台")
"""平台"""
zhenxun/models/user_gold_log.py
-1
View File
@@ -5,7 +5,6 @@ from zhenxun.utils.enum import GoldHandle
class UserGoldLog(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, description="用户id")
zhenxun/models/user_props.py
+1 -6
View File
@@ -1,21 +1,16 @@
from typing import Dict
from tortoise import fields
from zhenxun.services.db_context import Model
from .sign_user import SignUser
class UserProps(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, unique=True, description="用户id")
"""用户id"""
name = fields.CharField(255, description="道具名称")
"""道具名称"""
property: Dict[str, int] = fields.JSONField(default={}) # type: ignore
property: dict[str, int] = fields.JSONField(default={}) # type: ignore
"""道具"""
platform = fields.CharField(255, null=True)
"""平台"""
zhenxun/models/user_props_log.py
-5
View File
@@ -1,15 +1,10 @@
from typing import Dict
from tortoise import fields
from zhenxun.services.db_context import Model
from zhenxun.utils.enum import PropHandle
from .sign_user import SignUser
class UserPropsLog(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_id = fields.CharField(255, description="用户id")