nonebot-plugin-dialectlist 2.1.6__tar.gz → 2.1.9__tar.gz

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/PKG-INFO

@@ -1,26 +1,27 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.1.6
+Version: 2.1.9
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT
-Requires-Python: <4.0,>=3.8
+Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nonebot2>=2.3.1
 Requires-Dist: nonebot-plugin-chatrecorder>=0.6.0
-Requires-Dist: pygal>=3.0.4
 Requires-Dist: requests>=2.32.3
 Requires-Dist: nonebot-plugin-apscheduler>=0.4.0
-Requires-Dist: nonebot-plugin-alconna>=0.46.6
+Requires-Dist: nonebot-plugin-alconna>=0.50.2
 Requires-Dist: nonebot-plugin-cesaa>=0.4.0
 Requires-Dist: nonebot-plugin-userinfo>=0.2.4
-Requires-Dist: pyecharts>=2.0.5
-Requires-Dist: nonebot-plugin-htmlrender>=0.3.2
+Requires-Dist: nonebot-plugin-htmlrender>=0.3.3
+Requires-Dist: nonebot2>=2.3.2
+Requires-Dist: cn2an>=0.5.22
 Provides-Extra: dev
-Requires-Dist: ruff>=0.4.9; extra == "dev"
-Requires-Dist: setuptools>=70.0.0; extra == "dev"
+Requires-Dist: ruff>=0.5.5; extra == "dev"
+Requires-Dist: setuptools>=71.1.0; extra == "dev"
 Requires-Dist: twine>=5.1.0; extra == "dev"
 Requires-Dist: nb-cli>=0.7.6; extra == "dev"
+Provides-Extra: test
+Requires-Dist: nonebot-adapter-onebot>=2.4.4; extra == "test"
 
 <div align="center">
   <a href="https://v2.nonebot.dev/store"><img src="./docs/NoneBotPlugin.svg" width="400" alt="NoneBotPluginLogo"></a>
@@ -34,8 +35,8 @@ Requires-Dist: nb-cli>=0.7.6; extra == "dev"
 nonebot-plugin-dialectlist
 
 <p align="center">
-  <a href="https://pypi.python.org/pypi/nonebot-plugin-wordcloud">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-wordcloud.svg" alt="pypi">
+  <a href="https://pypi.python.org/pypi/nonebot-plugin-dialectlist">
+    <img src="https://img.shields.io/pypi/v/nonebot-plugin-dialectlist.svg" alt="pypi">
   </a>
   
   <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
@@ -79,8 +80,8 @@ dialectlist__string_suffix_format = '你们的职业是水群吗？————M
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
 dialectlist__visualization_type = '圆环图' #可视化方案
-dialectlist__font = 'SimHei'#字体格式
-dialectlist__excluded_people = []#排除的人的 QQ 号（或频道号？（未经测试）)
+dialectlist__font = 'SimHei' #字体格式
+dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 ```
 💭也可以不进行配置，这将会使插件按照默认配置运行
@@ -191,11 +192,23 @@ __！！注意！！__
 
 - [x] 适配全平台
 
-- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）
+- [x] 尝试利用 jinja2 模板引擎制作可视化图片
 
-- [ ] 关键词查询
+- [ ] 更好看的图片渲染
+
+- [ ] 提供多样化的渲染器配置（html渲染，pillow渲染，统计绘图软件渲染）
+- [ ] 为pillow渲染方式提供插件的加载方式（什么？插件里的插件？？？）
+
+- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）一半完成
+
+- [ ] 查询带某关键词的消息量
+
+- [ ] 使用管理员权限直接获取QQ官方统计的今日消息量以优化代码运行速度
+
+- [ ] 特殊的储存方案优化消息统计
+
+- [ ] 添加一些全新的可配置项
 
-- [ ] 尝试利用 jinja2 模板引擎制作可视化图片 ((（真的可以吗？))
   
  待补充。.....
 

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/README.md

@@ -10,8 +10,8 @@
 nonebot-plugin-dialectlist
 
 <p align="center">
-  <a href="https://pypi.python.org/pypi/nonebot-plugin-wordcloud">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-wordcloud.svg" alt="pypi">
+  <a href="https://pypi.python.org/pypi/nonebot-plugin-dialectlist">
+    <img src="https://img.shields.io/pypi/v/nonebot-plugin-dialectlist.svg" alt="pypi">
   </a>
   
   <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
@@ -55,8 +55,8 @@ dialectlist__string_suffix_format = '你们的职业是水群吗？————M
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
 dialectlist__visualization_type = '圆环图' #可视化方案
-dialectlist__font = 'SimHei'#字体格式
-dialectlist__excluded_people = []#排除的人的 QQ 号（或频道号？（未经测试）)
+dialectlist__font = 'SimHei' #字体格式
+dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 ```
 💭也可以不进行配置，这将会使插件按照默认配置运行
@@ -167,11 +167,23 @@ __！！注意！！__
 
 - [x] 适配全平台
 
-- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）
+- [x] 尝试利用 jinja2 模板引擎制作可视化图片
 
-- [ ] 关键词查询
+- [ ] 更好看的图片渲染
+
+- [ ] 提供多样化的渲染器配置（html渲染，pillow渲染，统计绘图软件渲染）
+- [ ] 为pillow渲染方式提供插件的加载方式（什么？插件里的插件？？？）
+
+- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）一半完成
+
+- [ ] 查询带某关键词的消息量
+
+- [ ] 使用管理员权限直接获取QQ官方统计的今日消息量以优化代码运行速度
+
+- [ ] 特殊的储存方案优化消息统计
+
+- [ ] 添加一些全新的可配置项
 
-- [ ] 尝试利用 jinja2 模板引擎制作可视化图片 ((（真的可以吗？))
   
  待补充。.....
 

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist/__init__.py

@@ -9,6 +9,7 @@ require("nonebot_plugin_cesaa")
 
 import re
 import os
+import cn2an
 import nonebot_plugin_saa as saa
 
 from typing import Union, Optional, List
@@ -19,6 +20,7 @@ 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.permission import SUPERUSER
@@ -29,6 +31,7 @@ from nonebot_plugin_alconna import (
     AlconnaMatch,
     AlconnaMatcher,
     AlconnaQuery,
+    Option,
     Args,
     Match,
     Option,
@@ -53,6 +56,7 @@ from .utils import (
     got_rank,
     msg_counter,
     persist_id2user_id,
+    user_id2persist_id,
     get_rank_image
 )
 
@@ -79,23 +83,22 @@ class SameTime(ArparmaBehavior):
             interface.behave_fail()
 
 
-def wrapper(slot: Union[int, str], content: Optional[str]) -> str:
+def wrapper(slot: Union[int, str], content: Optional[str],context) -> str:
     if slot == "type" and content:
         return content
     return ""  # pragma: no cover
 
-
 rank_cmd = on_alconna(
     Alconna(
         "B话榜",
         Args["type?", ["今日", "昨日", "本周", "上周", "本月", "上月", "年度", "历史"]][
-            "time?",str,][
-            "group_id?", str
-        ],
+            "time?",str,],
+        Option("-g|--group_id",Args["group_id?", str]),
         behaviors=[SameTime()],
     ),
     aliases={"废话榜"},
     use_cmd_start=True,
+    block=True,
 )
 
 
@@ -103,7 +106,16 @@ rank_cmd.shortcut(
     r"(?P<type>今日|昨日|本周|上周|本月|上月|年度|历史)B话榜",
     {
         "prefix": True,
-        "command": "B话榜 ",
+        "command": "B话榜",
+        "wrapper": wrapper,
+        "args": ["{type}"],
+    },
+)
+rank_cmd.shortcut(
+    r"(?P<type>今日|昨日|本周|上周|本月|上月|年度|历史)废话榜",
+    {
+        "prefix": True,
+        "command": "废话榜",
         "wrapper": wrapper,
         "args": ["{type}"],
     },
@@ -122,10 +134,11 @@ async def _group_message(
 
     dt = get_datetime_now_with_timezone()
 
-    if group_id is None:
+    if not group_id:
         group_id = session.id2
-
-    state["group_id"] = group_id
+        logger.debug(f"session id2: {group_id}")
+    if group_id:
+        state["group_id"] = group_id
 
     if not type:
         await rank_cmd.finish(__plugin_meta__.usage)
@@ -193,19 +206,25 @@ async def _group_message(
     prompt="请输入你要查询的结束日期（如 2022-02-22）",
     parameterless=[Depends(parse_datetime("stop"))],
 )
-@rank_cmd.got("group_id", prompt="请输入你要查询的群号。")
+@rank_cmd.got(
+    "group_id",
+    prompt="请输入你要查询的群号。"
+)
 async def handle_rank(
+    state: T_State,
     bot: Bot,
     event: Event,
     session: Session = Depends(extract_session),
     start: datetime = Arg(),
     stop: datetime = Arg(),
-    group_id: str = Arg(),
+    # group_id: str = Arg(),
 ):
-    if group_id:
-        id = group_id
+    if id := state["group_id"]:
+        # id = await user_id2persist_id(id)
+        logger.debug(f"group_id: {id}")
     else:
         id = session.id2
+        logger.debug(f"group_id: {id}")
 
     if not id:
         await saa.Text("没有指定群哦").finish()
@@ -220,7 +239,12 @@ async def handle_rank(
         time_stop=stop,
         exclude_id1s=plugin_config.excluded_people,
     )
+    
+    if not messages:
+        await saa.Text("明明这个时间段都没有人说话怎么会有话痨榜呢？").finish()
+        
     rank = got_rank(msg_counter(messages))
+    logger.debug(rank)
     rank2: List[UserRankInfo] = []
     ids = await persist_id2user_id([int(i[0]) for i in rank])
     for i in range(len(rank)):
@@ -228,9 +252,10 @@ async def handle_rank(
         logger.debug(rank[i])
 
     total = sum([i[1] for i in rank])
-
+    index = 1
     for i in rank:
         if user_info := await get_user_info(bot, event, user_id=str(i[0])):
+            logger.debug(user_info)
             user_nickname = user_info.user_displayname\
                                 if user_info.user_displayname\
                                 else user_info.user_name\
@@ -240,18 +265,21 @@ async def handle_rank(
             user_avatar = await user_info.user_avatar.get_image()\
                             if user_info.user_avatar\
                             else open(os.path.dirname(os.path.abspath(__file__))+"/template/avatar/default.jpg", "rb").read()
-            user = UserRankInfo(**user_info.model_dump(),
+            user = UserRankInfo(**model_dump(user_info),
                                 user_bnum=i[1],
                                 user_proportion= round(i[1] / total * 100, 2),
-                                user_index= rank.index(i) + 1,
-                                user_nickname=user_nickname,
+                                user_index= cn2an.an2cn(index),
+                                user_nickname= user_nickname,
                                 user_avatar_bytes= user_avatar,
             )
             user.user_gender="她" if user_info.user_gender == "female" else "他" if user_info.user_gender == "male" else "ta"
             rank2.append(user)
+            index += 1
             
     string: str = ""
-    for i in range(len(rank)):
+    for i in rank2:
+        logger.debug(i.user_name)
+    for i in range(len(rank2)):
         str_example = plugin_config.string_format.format(
             index=rank2[i].user_index, 
             nickname=rank2[i].user_nickname, 

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist/template/rank_template.j2

@@ -19,7 +19,7 @@
                 <div class="rank_card">
                     <img class="profile" src="{{ cache_path }}/{{ i.user_id }}.jpg"/>
                     <div class="rank_card_info">
-                        <h1>第{{ i.user_index }}名:{{ i.user_name }}</h1>
+                        <h1>第{{ i.user_index }}名:{{ i.user_nickname }}</h1>
                         <div class="g-container">
                             <div class="g-progress" style="width: {{ i.user_proportion }}%"></div>
                         </div>

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist/utils.py

@@ -46,28 +46,46 @@ async def ensure_group(matcher: Matcher, session: Session = Depends(extract_sess
 
 
 async def persist_id2user_id(ids: List) -> List[str]:
+    user_ids = []
+    async with get_session() as db_session:
+        for i in ids:
+            user_id = (await db_session.scalar(select(SessionModel).where(or_(*[SessionModel.id == i])))).id1 # type: ignore
+            user_ids.append(user_id)
+    return user_ids
+
+
+async def user_id2persist_id(ids: List[str]) -> List[int]:
     whereclause: List[ColumnElement[bool]] = []
-    whereclause.append(or_(*[SessionModel.id == id for id in ids]))
+    whereclause.append(or_(*[SessionModel.id1 == id for id in ids]))
     statement = (
         select(SessionModel).where(*whereclause)
         # .join(SessionModel, SessionModel.id == MessageRecord.session_persist_id)
     )
     async with get_session() as db_session:
         records = (await db_session.scalars(statement)).all()
-    return [i.id1 for i in records]
+    return [i.id for i in records]
 
-
-async def user_id2persist_id(id: str) -> int:
+async def group_id2persist_id(ids: List[str]) -> List[int]:
     whereclause: List[ColumnElement[bool]] = []
-    whereclause.append(or_(*[SessionModel.id2 == id]))
+    whereclause.append(or_(*[SessionModel.id2 == id for id in ids]))
     statement = (
         select(SessionModel).where(*whereclause)
         # .join(SessionModel, SessionModel.id == MessageRecord.session_persist_id)
     )
     async with get_session() as db_session:
         records = (await db_session.scalars(statement)).all()
-    return records[0].id
+    return [i.id for i in records]
 
+async def persist_id2group_id(ids: List[str]) -> List[str]:
+    whereclause: List[ColumnElement[bool]] = []
+    whereclause.append(or_(*[SessionModel.id == id for id in ids]))
+    statement = (
+        select(SessionModel).where(*whereclause)
+        # .join(SessionModel, SessionModel.id == MessageRecord.session_persist_id)
+    )
+    async with get_session() as db_session:
+        records = (await db_session.scalars(statement)).all()
+    return [i.id2 for i in records]
 
 def msg_counter(msg_list: List[MessageRecord]) -> Dict[str, int]:
     """### 计算每个人的消息量

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist.egg-info/PKG-INFO

@@ -1,26 +1,27 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.1.6
+Version: 2.1.9
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT
-Requires-Python: <4.0,>=3.8
+Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nonebot2>=2.3.1
 Requires-Dist: nonebot-plugin-chatrecorder>=0.6.0
-Requires-Dist: pygal>=3.0.4
 Requires-Dist: requests>=2.32.3
 Requires-Dist: nonebot-plugin-apscheduler>=0.4.0
-Requires-Dist: nonebot-plugin-alconna>=0.46.6
+Requires-Dist: nonebot-plugin-alconna>=0.50.2
 Requires-Dist: nonebot-plugin-cesaa>=0.4.0
 Requires-Dist: nonebot-plugin-userinfo>=0.2.4
-Requires-Dist: pyecharts>=2.0.5
-Requires-Dist: nonebot-plugin-htmlrender>=0.3.2
+Requires-Dist: nonebot-plugin-htmlrender>=0.3.3
+Requires-Dist: nonebot2>=2.3.2
+Requires-Dist: cn2an>=0.5.22
 Provides-Extra: dev
-Requires-Dist: ruff>=0.4.9; extra == "dev"
-Requires-Dist: setuptools>=70.0.0; extra == "dev"
+Requires-Dist: ruff>=0.5.5; extra == "dev"
+Requires-Dist: setuptools>=71.1.0; extra == "dev"
 Requires-Dist: twine>=5.1.0; extra == "dev"
 Requires-Dist: nb-cli>=0.7.6; extra == "dev"
+Provides-Extra: test
+Requires-Dist: nonebot-adapter-onebot>=2.4.4; extra == "test"
 
 <div align="center">
   <a href="https://v2.nonebot.dev/store"><img src="./docs/NoneBotPlugin.svg" width="400" alt="NoneBotPluginLogo"></a>
@@ -34,8 +35,8 @@ Requires-Dist: nb-cli>=0.7.6; extra == "dev"
 nonebot-plugin-dialectlist
 
 <p align="center">
-  <a href="https://pypi.python.org/pypi/nonebot-plugin-wordcloud">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-wordcloud.svg" alt="pypi">
+  <a href="https://pypi.python.org/pypi/nonebot-plugin-dialectlist">
+    <img src="https://img.shields.io/pypi/v/nonebot-plugin-dialectlist.svg" alt="pypi">
   </a>
   
   <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
@@ -79,8 +80,8 @@ dialectlist__string_suffix_format = '你们的职业是水群吗？————M
 dialectlist__get_num = 10 #获取人数数量
 dialectlist__visualization = True #是否可视化
 dialectlist__visualization_type = '圆环图' #可视化方案
-dialectlist__font = 'SimHei'#字体格式
-dialectlist__excluded_people = []#排除的人的 QQ 号（或频道号？（未经测试）)
+dialectlist__font = 'SimHei' #字体格式
+dialectlist__excluded_people = [] #排除的人的 QQ 号（或频道号？（未经测试）)
 dialectlist__excluded_self = True #是否排除机器人自己 QQ
 ```
 💭也可以不进行配置，这将会使插件按照默认配置运行
@@ -191,11 +192,23 @@ __！！注意！！__
 
 - [x] 适配全平台
 
-- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）
+- [x] 尝试利用 jinja2 模板引擎制作可视化图片
 
-- [ ] 关键词查询
+- [ ] 更好看的图片渲染
+
+- [ ] 提供多样化的渲染器配置（html渲染，pillow渲染，统计绘图软件渲染）
+- [ ] 为pillow渲染方式提供插件的加载方式（什么？插件里的插件？？？）
+
+- [ ] 私聊的查询（超级用户可以任意查询群聊的信息）一半完成
+
+- [ ] 查询带某关键词的消息量
+
+- [ ] 使用管理员权限直接获取QQ官方统计的今日消息量以优化代码运行速度
+
+- [ ] 特殊的储存方案优化消息统计
+
+- [ ] 添加一些全新的可配置项
 
-- [ ] 尝试利用 jinja2 模板引擎制作可视化图片 ((（真的可以吗？))
   
  待补充。.....
 

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 MANIFEST.in
 README.md
 pyproject.toml
-setup.py
 nonebot_plugin_dialectlist/__init__.py
 nonebot_plugin_dialectlist/config.py
 nonebot_plugin_dialectlist/model.py

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/nonebot_plugin_dialectlist.egg-info/requires.txt

@@ -1,16 +1,18 @@
-nonebot2>=2.3.1
 nonebot-plugin-chatrecorder>=0.6.0
-pygal>=3.0.4
 requests>=2.32.3
 nonebot-plugin-apscheduler>=0.4.0
-nonebot-plugin-alconna>=0.46.6
+nonebot-plugin-alconna>=0.50.2
 nonebot-plugin-cesaa>=0.4.0
 nonebot-plugin-userinfo>=0.2.4
-pyecharts>=2.0.5
-nonebot-plugin-htmlrender>=0.3.2
+nonebot-plugin-htmlrender>=0.3.3
+nonebot2>=2.3.2
+cn2an>=0.5.22
+
+[Test]
+nonebot-adapter-onebot>=2.4.4
 
 [dev]
-ruff>=0.4.9
-setuptools>=70.0.0
+ruff>=0.5.5
+setuptools>=71.1.0
 twine>=5.1.0
 nb-cli>=0.7.6

{nonebot_plugin_dialectlist-2.1.6 → nonebot_plugin_dialectlist-2.1.9}/pyproject.toml

@@ -1,34 +1,36 @@
 [project]
 name = "nonebot-plugin-dialectlist"
-version = "2.1.6"
+version = "2.1.9"
 description = "看看你群群友有多能说"
 authors = [
     {name = "Chen_Xu233", email = "woyerpa@outlook.com"},
 ]
 dependencies = [
-    "nonebot2>=2.3.1",
     "nonebot-plugin-chatrecorder>=0.6.0",
-    "pygal>=3.0.4",
     "requests>=2.32.3",
     "nonebot-plugin-apscheduler>=0.4.0",
-    "nonebot-plugin-alconna>=0.46.6",
+    "nonebot-plugin-alconna>=0.50.2",
     "nonebot-plugin-cesaa>=0.4.0",
     "nonebot-plugin-userinfo>=0.2.4",
-    "pyecharts>=2.0.5",
-    "nonebot-plugin-htmlrender>=0.3.2",
+    "nonebot-plugin-htmlrender>=0.3.3",
+    "nonebot2>=2.3.2",
+    "cn2an>=0.5.22"
 ]
-requires-python = ">=3.8,<4.0"
+requires-python = ">=3.9,<4.0"
 readme = "README.md"
 license = {text = "MIT"}
 
 
 [project.optional-dependencies]
 dev = [
-    "ruff>=0.4.9",
-    "setuptools>=70.0.0",
+    "ruff>=0.5.5",
+    "setuptools>=71.1.0",
     "twine>=5.1.0",
     "nb-cli>=0.7.6"
 ]
+Test = [
+    "nonebot-adapter-onebot>=2.4.4",
+]
 
 [tool.pdm]
 distribution = true

nonebot_plugin_dialectlist-2.1.6/setup.py

@@ -1,3 +0,0 @@
-from setuptools import setup, find_packages
-
-setup()