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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.1.9
+Version: 2.2.0
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT

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

@@ -41,8 +41,6 @@ from nonebot_plugin_alconna import (
 )
 
 from nonebot_plugin_chatrecorder import get_message_records
-from nonebot_plugin_localstore import get_cache_file
-from nonebot_plugin_htmlrender import html_to_pic
 from nonebot_plugin_userinfo import get_user_info
 from nonebot_plugin_session import Session, SessionIdType, extract_session
 
@@ -50,14 +48,19 @@ from nonebot_plugin_session import Session, SessionIdType, extract_session
 # from .function import *
 from .config import Config, plugin_config
 from .usage import __usage__
-from .time import get_datetime_fromisoformat_with_timezone, get_datetime_now_with_timezone,parse_datetime
+from .time import (
+    get_datetime_fromisoformat_with_timezone,
+    get_datetime_now_with_timezone,
+    parse_datetime,
+)
 from .model import UserRankInfo
 from .utils import (
     got_rank,
     msg_counter,
     persist_id2user_id,
     user_id2persist_id,
-    get_rank_image
+    group_id2persist_id,
+    get_rank_image,
 )
 
 __plugin_meta__ = PluginMetadata(
@@ -83,17 +86,20 @@ class SameTime(ArparmaBehavior):
             interface.behave_fail()
 
 
-def wrapper(slot: Union[int, str], content: Optional[str],context) -> 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,],
-        Option("-g|--group_id",Args["group_id?", str]),
+            "time?",
+            str,
+        ],
+        Option("-g|--group_id", Args["group_id?", str]),
         behaviors=[SameTime()],
     ),
     aliases={"废话榜"},
@@ -206,10 +212,7 @@ 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,
@@ -217,10 +220,9 @@ async def handle_rank(
     session: Session = Depends(extract_session),
     start: datetime = Arg(),
     stop: datetime = Arg(),
-    # group_id: str = Arg(),
 ):
     if id := state["group_id"]:
-        # id = await user_id2persist_id(id)
+        id = str(id)
         logger.debug(f"group_id: {id}")
     else:
         id = session.id2
@@ -239,10 +241,10 @@ 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] = []
@@ -256,37 +258,47 @@ async def handle_rank(
     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\
-                                    if user_info.user_name\
-                                    else\
-                                        user_info.user_id
-            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(**model_dump(user_info),
-                                user_bnum=i[1],
-                                user_proportion= round(i[1] / total * 100, 2),
-                                user_index= cn2an.an2cn(index),
-                                user_nickname= user_nickname,
-                                user_avatar_bytes= user_avatar,
+            user_nickname = (
+                user_info.user_displayname
+                if user_info.user_displayname
+                else user_info.user_name if user_info.user_name else user_info.user_id
+            )
+            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(
+                **model_dump(user_info),
+                user_bnum=i[1],
+                user_proportion=round(i[1] / total * 100, 2),
+                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"
             )
-            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 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, 
-            chatdatanum=rank2[i].user_bnum
+            index=rank2[i].user_index,
+            nickname=rank2[i].user_nickname,
+            chatdatanum=rank2[i].user_bnum,
         )
         string += str_example
-    
+
     image = await get_rank_image(rank2)
 
     await (saa.Text(string) + saa.Image(image)).finish(reply=True)

{nonebot_plugin_dialectlist-2.1.9 → nonebot_plugin_dialectlist-2.2.0}/nonebot_plugin_dialectlist/model.py

@@ -7,5 +7,5 @@ class UserRankInfo(UserInfo):
     user_bnum: int
     user_proportion: float
     user_nickname: str
-    user_index: Union[int,str]
-    user_avatar_bytes: bytes
+    user_index: Union[int, str]
+    user_avatar_bytes: bytes

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

@@ -16,7 +16,7 @@ from nonebot_plugin_orm import get_session
 from nonebot_plugin_session import Session, SessionLevel, extract_session
 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_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
@@ -49,7 +49,7 @@ 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_id = (await db_session.scalar(select(SessionModel).where(or_(*[SessionModel.id == i])))).id1  # type: ignore
             user_ids.append(user_id)
     return user_ids
 
@@ -65,16 +65,15 @@ async def user_id2persist_id(ids: List[str]) -> List[int]:
         records = (await db_session.scalars(statement)).all()
     return [i.id for i in records]
 
+
 async def group_id2persist_id(ids: List[str]) -> List[int]:
-    whereclause: List[ColumnElement[bool]] = []
-    whereclause.append(or_(*[SessionModel.id2 == id for id in ids]))
-    statement = (
-        select(SessionModel).where(*whereclause)
-        # .join(SessionModel, SessionModel.id == MessageRecord.session_persist_id)
-    )
+    persist_ids = []
     async with get_session() as db_session:
-        records = (await db_session.scalars(statement)).all()
-    return [i.id for i in records]
+        for i in ids:
+            persist_id = (await db_session.scalar(select(SessionModel).where(or_(*[SessionModel.id2 == i])))).id  # type: ignore
+            persist_ids.append(persist_id)
+    return persist_ids
+
 
 async def persist_id2group_id(ids: List[str]) -> List[str]:
     whereclause: List[ColumnElement[bool]] = []
@@ -87,6 +86,7 @@ async def persist_id2group_id(ids: List[str]) -> List[str]:
         records = (await db_session.scalars(statement)).all()
     return [i.id2 for i in records]
 
+
 def msg_counter(msg_list: List[MessageRecord]) -> Dict[str, int]:
     """### 计算每个人的消息量
 
@@ -137,6 +137,7 @@ def got_rank(msg_dict: Dict[str, int]) -> List:
 
     return rank
 
+
 def remove_control_characters(string: str) -> str:
     """### 将字符串中的控制符去除
 
@@ -148,27 +149,40 @@ def remove_control_characters(string: str) -> str:
     """
     return "".join(ch for ch in string if unicodedata.category(ch)[0] != "C")
 
+
 async def get_rank_image(rank: List[UserRankInfo]) -> bytes:
     for i in rank:
         if i.user_avatar:
             try:
                 user_avatar = i.user_avatar_bytes
             except NotImplementedError:
-                user_avatar = open(os.path.dirname(os.path.abspath(__file__))+"/template/avatar/default.jpg", "rb").read()
+                user_avatar = open(
+                    os.path.dirname(os.path.abspath(__file__))
+                    + "/template/avatar/default.jpg",
+                    "rb",
+                ).read()
             # if not os.path.exists(cache_path / str(i.user_id)):
             with open(cache_path / (str(i.user_id) + ".jpg"), "wb") as f:
                 f.write(user_avatar)
-                
-    if plugin_config.template_path[:2] == './':
-        path = os.path.dirname(os.path.abspath(__file__)) + plugin_config.template_path[1:]
+
+    if plugin_config.template_path[:2] == "./":
+        path = (
+            os.path.dirname(os.path.abspath(__file__)) + plugin_config.template_path[1:]
+        )
     else:
         path = plugin_config.template_path
-        
+
     path_dir, filename = os.path.split(path)
-    logger.debug(os.path.dirname(os.path.abspath(__file__)) + plugin_config.template_path[1:])
-    return await template_to_pic(path_dir,
-                                 filename,
-                                 {'users': rank,
-                                           'cache_path': cache_path,
-                                           'file_path': os.path.dirname(os.path.abspath(__file__))},
-                                 pages={"viewport": {"width": 1366, "height": 10}})
+    logger.debug(
+        os.path.dirname(os.path.abspath(__file__)) + plugin_config.template_path[1:]
+    )
+    return await template_to_pic(
+        path_dir,
+        filename,
+        {
+            "users": rank,
+            "cache_path": cache_path,
+            "file_path": os.path.dirname(os.path.abspath(__file__)),
+        },
+        pages={"viewport": {"width": 1100, "height": 10}},
+    )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.1.9
+Version: 2.2.0
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT

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

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-dialectlist"
-version = "2.1.9"
+version = "2.2.0"
 description = "看看你群群友有多能说"
 authors = [
     {name = "Chen_Xu233", email = "woyerpa@outlook.com"},