nonebot-plugin-dialectlist 2.2.2__tar.gz → 2.2.3__tar.gz

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.2.2
+Version: 2.2.3
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT
@@ -8,6 +8,7 @@ Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: nonebot-plugin-chatrecorder>=0.6.0
 Requires-Dist: requests>=2.32.3
+Requires-Dist: nonebot-plugin-orm[default]
 Requires-Dist: nonebot-plugin-apscheduler>=0.4.0
 Requires-Dist: nonebot-plugin-alconna>=0.50.2
 Requires-Dist: nonebot-plugin-cesaa>=0.4.0
@@ -75,11 +76,11 @@ nonebot-plugin-dialectlist
 
 在 .env 中，可以添加以下配置项
 ```python
-dialectlist__string_format = '第{index}名：\n{nickname},{chatdatanum}条消息、n' #消息格式
+dialectlist__string_format = "第{index}名：\n{nickname},{chatdatanum}条消息、\n" #消息格式
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
-# dialectlist__visualization_type = '圆环图' #可视化方案 （不再支持）
-dialectlist__font = 'SimHei' #字体格式
+# dialectlist__visualization_type = "圆环图" #可视化方案 （不再支持）
+dialectlist__font = "SimHei" #字体格式
 dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 dialectlist__suffix: bool = False  # 是否显示后缀

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/README.md

@@ -50,11 +50,11 @@ nonebot-plugin-dialectlist
 
 在 .env 中，可以添加以下配置项
 ```python
-dialectlist__string_format = '第{index}名：\n{nickname},{chatdatanum}条消息、n' #消息格式
+dialectlist__string_format = "第{index}名：\n{nickname},{chatdatanum}条消息、\n" #消息格式
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
-# dialectlist__visualization_type = '圆环图' #可视化方案 （不再支持）
-dialectlist__font = 'SimHei' #字体格式
+# dialectlist__visualization_type = "圆环图" #可视化方案 （不再支持）
+dialectlist__font = "SimHei" #字体格式
 dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 dialectlist__suffix: bool = False  # 是否显示后缀

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/__init__.py

@@ -19,30 +19,22 @@ from arclet.alconna import ArparmaBehavior
 from arclet.alconna.arparma import Arparma
 
 from nonebot.log import logger
-from nonebot.params import Arg, Depends
 from nonebot.typing import T_State
 from nonebot.compat import model_dump
-from nonebot.adapters import Bot, Event, Message
 from nonebot.params import Arg, Depends
+from nonebot.adapters import Bot, Event
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata, inherit_supported_adapters
-from nonebot.typing import T_State
 from nonebot_plugin_alconna import (
-    Alconna,
-    AlconnaMatch,
-    AlconnaMatcher,
-    AlconnaQuery,
-    Option,
     Args,
-    Match,
     Option,
-    Query,
-    image_fetch,
+    Alconna,
     on_alconna,
 )
 
-from nonebot_plugin_chatrecorder import get_message_records
+from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_userinfo import get_user_info
+from nonebot_plugin_chatrecorder import get_message_records
 from nonebot_plugin_session import Session, SessionIdType, extract_session
 
 # from . import migrations #抄词云的部分代码，还不知道这有什么用
@@ -58,10 +50,9 @@ from .model import UserRankInfo
 from .utils import (
     got_rank,
     msg_counter,
-    persist_id2user_id,
-    user_id2persist_id,
-    group_id2persist_id,
     get_rank_image,
+    persist_id2user_id,
+    # get_user_info2,
 )
 
 __plugin_meta__ = PluginMetadata(
@@ -202,6 +193,8 @@ async def _group_message(
                         state["stop"] = state["start"] + timedelta(days=1)
                 except ValueError:
                     await rank_cmd.finish("请输入正确的日期，不然我没法理解呢！")
+                    
+    logger.debug(f"命令解析花费时间:{t.time() - t1}")
 
 
 @rank_cmd.got(
@@ -223,6 +216,7 @@ async def handle_rank(
     start: datetime = Arg(),
     stop: datetime = Arg(),
 ):
+    t1 = t.time()
     if id := state["group_id"]:
         id = str(id)
         logger.debug(f"group_id: {id}")
@@ -233,6 +227,9 @@ async def handle_rank(
     if not id:
         await saa.Text("没有指定群哦").finish()
 
+    logger.debug(f"所属群聊解析花费时间:{t.time() - t1}")
+    t1 = t.time()
+
     messages = await get_message_records(
         id2s=[id],
         id_type=SessionIdType.GROUP,
@@ -243,11 +240,16 @@ async def handle_rank(
         time_stop=stop,
         exclude_id1s=plugin_config.excluded_people,
     )
-
+    
+    logger.debug(f"获取群聊消息花费时间:{t.time() - t1}")
+    t1 = t.time()
+    
     if not messages:
         await saa.Text("明明这个时间段都没有人说话怎么会有话痨榜呢？").finish()
 
     rank = got_rank(msg_counter(messages))
+    logger.debug(f"群聊消息计数花费时间:{t.time() - t1}")
+    t1 = t.time()
     logger.debug(rank)
     rank2: List[UserRankInfo] = []
     ids = await persist_id2user_id([int(i[0]) for i in rank])
@@ -300,16 +302,27 @@ async def handle_rank(
             chatdatanum=rank2[i].user_bnum,
         )
         string += str_example
-    
+
     msg = saa.Text(string)
-    
+    logger.debug(f"群聊消息渲染文字花费时间:{t.time() - t1}")
+    t1 = t.time()
+
     if plugin_config.visualization:
         image = await get_rank_image(rank2)
         msg += saa.Image(image)
-    
+
     if plugin_config.suffix:
         timecost = t.time() - state["t1"]
         suffix = saa.Text(plugin_config.string_suffix.format(timecost=timecost))
         msg += suffix
-        
+
+    logger.debug(f"群聊消息渲染图片花费时间:{t.time() - t1}")
+
     await msg.finish(reply=True)
+
+
+# @scheduler.scheduled_job(
+#     "dialectlist", day="*/2", id="xxx", args=[1], kwargs={"arg2": 2}
+# )
+# async def __():
+#     pass

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/config.py

@@ -1,19 +1,20 @@
-from typing import Optional, Literal, List
-from nonebot import get_driver, get_plugin_config
 from pydantic import BaseModel
+from typing import Optional, List
+from nonebot import get_driver, get_plugin_config
 
 
 class ScopedConfig(BaseModel):
-    font: str = "SimHei"  # 字体格式
     get_num: int = 5  # 获取人数数量
-    timezone: Optional[str] = "Asia/Shanghai"
+    font: str = "SimHei"  # 字体格式
+    suffix: bool = False  # 是否显示后缀
     excluded_self: bool = True
-    string_format: str = "第{index}名：\n{nickname},{chatdatanum}条消息\n"  # 消息格式
-    template_path: str = "./template/rank_template.j2"  # 模板路径
     visualization: bool = True  # 是否可视化
+    counting_cache: bool = True
     excluded_people: List[str] = []  # 排除的人的QQ号
-    suffix: bool = False  # 是否显示后缀
+    timezone: Optional[str] = "Asia/Shanghai"
     string_suffix: str = "统计花费时间:{timecost}秒"  # 消息格式后缀
+    template_path: str = "./template/rank_template.j2"  # 模板路径
+    string_format: str = "第{index}名：\n{nickname},{chatdatanum}条消息\n"  # 消息格式
 
 
 class Config(BaseModel):

nonebot_plugin_dialectlist-2.2.3/nonebot_plugin_dialectlist/model.py

@@ -0,0 +1,17 @@
+from typing import Union
+from pydantic import BaseModel
+from nonebot_plugin_orm import Model
+from nonebot_plugin_userinfo import UserInfo
+
+
+class UserRankInfo(UserInfo):
+    user_bnum: int
+    user_proportion: float
+    user_nickname: str
+    user_index: Union[int, str]
+    user_avatar_bytes: bytes
+
+class MsgCountDayData(BaseModel):
+    user_id:str
+# class MsgCountData(Model):
+#     __tablename__ = 'dialectlist_msg_data'

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/storage.py

@@ -1 +1,2 @@
 # TODO 使用计数缓存进行数据库查询优化，避免一次性查询过多消息导致内存爆炸。
+from nonebot_plugin_orm import Model

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/template/css/style.css

@@ -1,5 +1,5 @@
 body {
-    background-image: url('https://image.anosu.top/pixiv/direct?size=regular');
+    background-image: url('https://api.yimian.xyz/img');
     background-attachment: scroll;
     margin: 0;
     background-size: cover;

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/time.py

@@ -1,16 +1,15 @@
 # TODO 时间处理模块，用于处理时间相关操作。
-from datetime import datetime, time, tzinfo
-from typing import Optional, Union
 from zoneinfo import ZoneInfo
+from typing import Optional, Union
+from datetime import datetime, time, tzinfo
 
-from nonebot.typing import T_State
 from nonebot.params import Arg
+from nonebot.typing import T_State
 from nonebot.adapters import Message
 
 from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_alconna import AlconnaMatcher
 
-
 from .config import plugin_config
 
 

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist/utils.py

@@ -1,30 +1,24 @@
 import os
 import unicodedata
 
-from typing import Optional, Dict, List, Union
-from pathlib import Path
+from typing import Dict, List
 from sqlalchemy import or_, select
 from sqlalchemy.sql import ColumnElement
 
 from nonebot.log import logger
-from nonebot.params import Arg, Depends
-from nonebot.typing import T_State
+from nonebot.params import Depends
 from nonebot.matcher import Matcher
-from nonebot.adapters import Message
 
 from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import Session, SessionLevel, extract_session
+from nonebot_plugin_localstore import get_cache_dir
+from nonebot_plugin_htmlrender import template_to_pic
 from nonebot_plugin_session_orm import SessionModel
-from nonebot_plugin_userinfo import EventUserInfo, UserInfo
-from nonebot_plugin_htmlrender import html_to_pic, template_to_pic
-from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_chatrecorder import MessageRecord
-from nonebot_plugin_localstore import get_cache_dir
-from nonebot_plugin_alconna import AlconnaMatcher
 
 
-from .config import plugin_config
 from .model import UserRankInfo
+from .config import plugin_config
 
 cache_path = get_cache_dir("nonebot_plugin_dialectlist")
 

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.2.2
+Version: 2.2.3
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT
@@ -8,6 +8,7 @@ Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: nonebot-plugin-chatrecorder>=0.6.0
 Requires-Dist: requests>=2.32.3
+Requires-Dist: nonebot-plugin-orm[default]
 Requires-Dist: nonebot-plugin-apscheduler>=0.4.0
 Requires-Dist: nonebot-plugin-alconna>=0.50.2
 Requires-Dist: nonebot-plugin-cesaa>=0.4.0
@@ -75,11 +76,11 @@ nonebot-plugin-dialectlist
 
 在 .env 中，可以添加以下配置项
 ```python
-dialectlist__string_format = '第{index}名：\n{nickname},{chatdatanum}条消息、n' #消息格式
+dialectlist__string_format = "第{index}名：\n{nickname},{chatdatanum}条消息、\n" #消息格式
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
-# dialectlist__visualization_type = '圆环图' #可视化方案 （不再支持）
-dialectlist__font = 'SimHei' #字体格式
+# dialectlist__visualization_type = "圆环图" #可视化方案 （不再支持）
+dialectlist__font = "SimHei" #字体格式
 dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 dialectlist__suffix: bool = False  # 是否显示后缀

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/nonebot_plugin_dialectlist.egg-info/requires.txt

@@ -1,5 +1,6 @@
 nonebot-plugin-chatrecorder>=0.6.0
 requests>=2.32.3
+nonebot-plugin-orm[default]
 nonebot-plugin-apscheduler>=0.4.0
 nonebot-plugin-alconna>=0.50.2
 nonebot-plugin-cesaa>=0.4.0

{nonebot_plugin_dialectlist-2.2.2 → nonebot_plugin_dialectlist-2.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-dialectlist"
-version = "2.2.2"
+version = "2.2.3"
 description = "看看你群群友有多能说"
 authors = [
     {name = "Chen_Xu233", email = "woyerpa@outlook.com"},
@@ -8,6 +8,7 @@ authors = [
 dependencies = [
     "nonebot-plugin-chatrecorder>=0.6.0",
     "requests>=2.32.3",
+    "nonebot-plugin-orm[default]",
     "nonebot-plugin-apscheduler>=0.4.0",
     "nonebot-plugin-alconna>=0.50.2",
     "nonebot-plugin-cesaa>=0.4.0",

nonebot_plugin_dialectlist-2.2.2/nonebot_plugin_dialectlist/model.py

@@ -1,11 +0,0 @@
-from typing import Optional, Literal, List, Union
-from pydantic import BaseModel
-from nonebot_plugin_userinfo import get_user_info, UserInfo
-
-
-class UserRankInfo(UserInfo):
-    user_bnum: int
-    user_proportion: float
-    user_nickname: str
-    user_index: Union[int, str]
-    user_avatar_bytes: bytes