nonebot-plugin-splatoon3-nso 2.0.0__tar.gz → 2.2.2__tar.gz

{nonebot_plugin_splatoon3_nso-2.0.0 → nonebot_plugin_splatoon3_nso-2.2.2}/PKG-INFO

@@ -1,37 +1,36 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: nonebot-plugin-splatoon3-nso
-Version: 2.0.0
+Version: 2.2.2
 Summary: 一个基于nonebot2框架的splatoon3游戏nso数据查询插件
-License-File: LICENSE
 Author: cypas
-Author-email: ayano05@outlook.com
-Requires-Python: >=3.10,<4.0
+Author-email: cypas <ayano05@outlook.com>
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: Pillow (>=11.3.0,<12.0.0)
-Requires-Dist: SQLAlchemy (>=2.0.25,<3.0.0)
-Requires-Dist: async-lru (>=2.0.0,<3.0.0)
-Requires-Dist: beautifulsoup4 (>=4.12.2,<5.0.0)
-Requires-Dist: cos_python_sdk_v5 (>=1.9.30,<2.0.0)
-Requires-Dist: fastapi (>=0.104.1,<0.105.0)
-Requires-Dist: httpx (>=0.28.1,<0.29.0)
-Requires-Dist: nonebot-adapter-kaiheila (>=0.3.4,<0.4.0)
-Requires-Dist: nonebot-adapter-onebot (>=2.4.6,<3.0.0)
-Requires-Dist: nonebot-adapter-qq (>=1.6.6,<2.0.0)
-Requires-Dist: nonebot-adapter-telegram (>=0.1.0b20,<0.2.0)
-Requires-Dist: nonebot-plugin-apscheduler (>=0.5.0,<0.6.0)
-Requires-Dist: nonebot2 (>=2.4.4,<3.0.0)
-Requires-Dist: nonebot_plugin_datastore (>=1.3.0,<2.0.0)
-Requires-Dist: nonebot_plugin_htmlrender (>=0.6.7,<0.7.0)
-Requires-Dist: playwright (>=1.40.0,<2.0.0)
-Requires-Dist: pydantic (>=1.0.0,<3.0.0,!=2.5.0,!=2.5.1)
-Requires-Dist: pymmh3 (>=0.0.5,<0.0.6)
-Requires-Dist: pympler (>=1.1,<2.0)
-Requires-Dist: redis (>=5.2.0,<6.0.0)
+Requires-Dist: beautifulsoup4>=4.12.2,<5
+Requires-Dist: httpx>=0.28.1,<0.29
+Requires-Dist: nonebot2>=2.4.4,<3
+Requires-Dist: pydantic>=1.0.0,!=2.5.0,!=2.5.1,<3.0.0
+Requires-Dist: nonebot-adapter-onebot>=2.4.6,<3
+Requires-Dist: nonebot-adapter-telegram>=0.1.0b20,<0.2
+Requires-Dist: nonebot-adapter-kaiheila>=0.3.4,<0.4
+Requires-Dist: nonebot-adapter-qq>=1.7.1,<2
+Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<0.6
+Requires-Dist: nonebot-plugin-datastore>=1.3.0,<2
+Requires-Dist: nonebot-plugin-htmlrender>=0.6.7,<0.7
+Requires-Dist: sqlalchemy>=2.0.25,<3
+Requires-Dist: playwright>=1.40.0,<2
+Requires-Dist: redis>=5.2.0,<6
+Requires-Dist: pillow>=11.3.0,<12
+Requires-Dist: pympler>=1.1,<2
+Requires-Dist: cos-python-sdk-v5>=1.9.30,<2
+Requires-Dist: pymmh3>=0.0.5,<0.0.6
+Requires-Dist: fastapi>=0.123.9,<0.124
+Requires-Dist: async-lru>=2.0.0,<3
+Requires-Python: >=3.10, <4
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -224,8 +223,8 @@ nso查询过程中使用到了第三方的自动令牌生成接口
 - https://github.com/imink-app/f-API 模拟nso授权步骤的公开接口
 - https://github.com/samuelthomas2774/nxapi-znca-api 模拟nso授权步骤的公开接口
 - [zurl](https://github.com/helloxz/zurl)一个简单易用的短链接服务
+- [喷喷借口生成器](https://github.com/arainwong/excuse-generator)参考了喷喷借口生成器的代码和借口语料
 
 ## ⏳ Star 趋势
 
 [![Stargazers over time](https://starchart.cc/Cypas/splatoon3-nso.svg)](https://starchart.cc/Cypas/splatoon3-nso)
-

{nonebot_plugin_splatoon3_nso-2.0.0 → nonebot_plugin_splatoon3_nso-2.2.2}/README.md

@@ -188,6 +188,7 @@ nso查询过程中使用到了第三方的自动令牌生成接口
 - https://github.com/imink-app/f-API 模拟nso授权步骤的公开接口
 - https://github.com/samuelthomas2774/nxapi-znca-api 模拟nso授权步骤的公开接口
 - [zurl](https://github.com/helloxz/zurl)一个简单易用的短链接服务
+- [喷喷借口生成器](https://github.com/arainwong/excuse-generator)参考了喷喷借口生成器的代码和借口语料
 
 ## ⏳ Star 趋势
 

nonebot_plugin_splatoon3_nso-2.2.2/nonebot_plugin_splatoon3_nso/__init__.py

@@ -0,0 +1,122 @@
+from nonebot.plugin import PluginMetadata
+
+from .config import driver, plugin_config, Config
+from .data.db_sqlite import init_db
+from .data.transfer import transfer_user_db
+from .handle import *
+from .handle.cron import remove_all_scheduler, scheduler_controller
+from .handle.qq_md import get_qq_face_md, new_user_added_md
+from .handle.send_msg import bot_send, notify_to_channel, bot_send_new_user_added_md
+from .s3s.splatnet_image import global_browser
+from .utils import MSG_HELP_QQ, MSG_HELP_CN, MSG_HELP, BOT_VERSION, get_time_now_china_str, get_msg_id
+from .utils.bot import *
+from .api.main import app as fastapi_app  # 引入fastapi接口
+
+__plugin_meta__ = PluginMetadata(
+    name="splatoon3游戏nso查询",
+    description="一个基于nonebot2框架的splatoon3游戏nso数据查询插件",
+    usage="发送 帮助 或 help 可查看详细指令\n",
+    type="application",
+    # 发布必填，当前有效类型有：`library`（为其他插件编写提供功能），`application`（向机器人用户提供功能）。
+    homepage="https://github.com/Cypas/splatoon3-nso",
+    # 发布必填。
+    config=Config,
+    supported_adapters={"~onebot.v11", "~onebot.v12", "~telegram", "~kaiheila", "~qq"},
+)
+
+
+@driver.on_startup
+async def bot_on_start():
+    # 检查旧数据库文件与新数据库文件是否存在
+    old_db_path = f"{DIR_RESOURCE}/data.sqlite"
+    new_db_path = f"{DIR_RESOURCE}/nso_data.sqlite"
+    if os.path.exists(old_db_path) and not os.path.exists(new_db_path):
+        # 旧数据库存在，新数据库不存在，启动转移函数
+        logger.info("检测到旧版本用户数据库，将开始进行数据转移")
+        transfer_user_db()
+        logger.info("用户数据库转移完成")
+    else:
+        init_db()
+
+    # 创建定时任务
+    scheduler_controller()
+    version = BOT_VERSION
+    logger.info(f" bot start, version: {version} ".center(120, "-"))
+    await notify_to_channel(f"bot start, version: {version}")
+
+
+@driver.on_shutdown
+async def bot_on_shutdown():
+    version = BOT_VERSION
+    logger.info(f" bot shutdown, version: {version} ".center(120, "x"))
+
+
+@driver.on_bot_connect
+async def _(bot: Bot):
+    bot_name = bot.adapter.get_name()
+    logger.info(f" {bot_name} bot connect {bot.self_id} ".center(60, "-").center(90, " "))
+    if bot_name == "QQ":
+        text = f"bot {bot_name}: {bot.self_id} online ~"
+        if plugin_config.splatoon3_bot_disconnect_notify:
+            await notify_to_channel(text)
+
+
+@driver.on_bot_disconnect
+async def _(bot: Bot):
+    bot_name = bot.adapter.get_name()
+    text = f"bot {bot_name}: {bot.self_id} disconnect !!!!!!!!!!!!!!!!!!!"
+    if plugin_config.splatoon3_bot_disconnect_notify:
+        try:
+            await notify_to_channel(text)
+        except Exception as e:
+            logger.warning(f"{text}")
+            logger.warning(f"日志通知失败: {e}")
+
+# @event_preprocessor
+# async def tg_private_msg(bot: Tg_Bot, event: Event):
+#     try:
+#         user_id = event.get_user_id()
+#         message = event.get_plaintext().strip()
+#     except:
+#         user_id = ''
+#         message = ''
+#
+#     _event = event.dict() or {}
+#     logger.debug(_event)
+#     if user_id and message and 'group' not in _event.get('chat', {}).get('type', ''):
+#         logger.info(f'tg_private_msg {user_id} {message}')
+#
+#         name = _event.get('from_', {}).get('first_name', '')
+#         if _event.get('from_', {}).get('last_name', ''):
+#             name += ' ' + _event.get('from_', {}).get('last_name', '')
+#         if not name:
+#             name = _event.get('from_', {}).get('username', '')
+#
+#         text = f"#tg{user_id}\n昵称:{name}\n消息:{message}"
+#         try:
+#             await notify_to_channel(text)
+#         except Exception as e:
+#             logger.warning("text")
+#             logger.warning(f"日志通知失败: {e}")
+#
+#
+# @event_preprocessor
+# async def kk_private_msg(bot: Kook_Bot, event: Event):
+#     try:
+#         user_id = event.get_user_id()
+#         message = event.get_plaintext().strip()
+#     except:
+#         user_id = ''
+#         message = ''
+#
+#     if user_id == 'SYSTEM' and message == "[系统消息]":
+#         return
+#
+#     _event = event.dict() or {}
+#     logger.debug(_event)
+#     if user_id and message and 'group' not in event.get_event_name():
+#         logger.info(f'kk_private_msg {user_id} {message}')
+#
+#         name = _event.get('event', {}).get('author', {}).get('username') or ''
+#         text = f"#kk{user_id}\n昵称:{name}\n消息:{message}"
+#         await notify_to_channel(text)

{nonebot_plugin_splatoon3_nso-2.0.0 → nonebot_plugin_splatoon3_nso-2.2.2}/nonebot_plugin_splatoon3_nso/api/main.py

@@ -9,6 +9,15 @@ from fastapi.middleware.cors import CORSMiddleware
 from ..utils.utils import DIR_RESOURCE, get_jwt_exp_info
 from ..utils.redis import api_rget_json_file_name, api_rdel_json_file_name, api_rget_info
 
+### bot.py 中启动fastapi
+# nonebot.init()
+# asgi = nonebot.get_asgi()
+# driver = nonebot.get_driver()
+# driver.register_adapter(OneBotV11Adapter)
+# nonebot.load_plugins("plugins")
+# asgi.mount("/api", fastapi_app)
+###
+
 fast_logger = logger.bind(fastapi=True)
 app = FastAPI(
     title="小鱿鱿外部fastapi接口",

{nonebot_plugin_splatoon3_nso-2.0.0 → nonebot_plugin_splatoon3_nso-2.2.2}/nonebot_plugin_splatoon3_nso/config.py

@@ -19,6 +19,11 @@ class ZurlConfig(BaseModel, extra=Extra.ignore):
     host: str = ""  # http://demo.a.com
     token: str = ""  # 密钥
 
+class FullMessageConfig(BaseModel, extra=Extra.ignore):
+    """全量消息相关配置 """
+    enabled: bool = False
+    bot_qq: str = ""  # bot qq号
+    bot_uid: str = ""  # bot_uid需要借助第三方bot才能获取到
 
 # 其他地方出现的类似 from .. import config，均是从 __init__.py 导入的 Config 实例
 class Config(BaseModel):
@@ -75,6 +80,8 @@ class Config(BaseModel):
     splatoon3_cos_config: CosConfig = Field(default_factory=CosConfig)
     # zurl短链接配置
     splatoon3_zurl_config: ZurlConfig = Field(default_factory=ZurlConfig)
+    # 全量消息配置
+    splatoon3_full_message_config: FullMessageConfig = Field(default_factory=FullMessageConfig)
 
 
 driver = get_driver()

{nonebot_plugin_splatoon3_nso-2.0.0 → nonebot_plugin_splatoon3_nso-2.2.2}/nonebot_plugin_splatoon3_nso/data/data_source.py

@@ -1,10 +1,10 @@
 import copy
-import datetime
 import weakref
 from typing import Type
+from datetime import datetime as dt, timedelta
 
 from nonebot import logger
-from sqlalchemy import and_, text
+from sqlalchemy import and_, or_, text, func
 from sqlalchemy.dialects import mysql
 
 from .db_sqlite import *
@@ -57,6 +57,10 @@ def dict_get_or_set_user_info(platform, user_id, _type="normal", **kwargs):
                 ns_name=user.ns_name,
                 ns_friend_code=user.ns_friend_code,
                 nsa_id=user.nsa_id,
+                first_play_time=user.first_play_time,
+                last_play_time=user.last_play_time,
+                next_report_run_time=user.next_report_run_time,
+                last_cmd_time=user.last_cmd_time,
                 req_client=get_or_init_client(platform, user_id, _type)
             )
             user_dict.update({key: user_info})
@@ -209,6 +213,96 @@ def model_get_all_user() -> list[UserTable]:
     return users
 
 
+def model_get_all_report_user() -> list[UserTable]:
+    """获取全部session_token不为空用户 且日报更新时间为小于等于今天，或日报更新时间为None(新用户)的日报"""
+    session = DBSession()
+    today = datetime.datetime.now().date()
+
+    query = (session.query(UserTable).filter(
+        and_(
+            UserTable.session_token.isnot(None),
+            UserTable.session_token != "",
+            UserTable.user_agreement == 1,
+            or_(
+                UserTable.next_report_run_time.is_(None),
+                func.date(UserTable.next_report_run_time) <= today
+            )
+        )
+    ))
+
+    query = query.order_by(UserTable.platform.asc(), UserTable.id.asc())
+
+    # # 打印生成的 SQL 语句（包含参数）
+    # from sqlalchemy.dialects import sqlite
+    # compiled = query.statement.compile(dialect=sqlite.dialect(), compile_kwargs={"literal_binds": True})
+    # logger.info(f"Generated SQL: {compiled}")
+
+    users = query.all()
+    session.close()
+    return users
+
+
+def model_get_all_active_report_user() -> list[UserTable]:
+    """获取全部昨天或今天使用了nso功能  session_token不为空用户"""
+    session = DBSession()
+    now = datetime.datetime.utcnow()
+    today = now.date()
+    yesterday = (now - timedelta(days=1)).date()
+    two_before_day = (now - timedelta(days=2)).date()
+
+    query = (session.query(UserTable).filter(
+        and_(
+            UserTable.session_token.isnot(None),
+            UserTable.session_token != "",
+            UserTable.user_agreement == 1,
+            or_(
+                func.date(UserTable.last_cmd_time) == today,
+                func.date(UserTable.last_cmd_time) == yesterday,
+                func.date(UserTable.last_cmd_time) == two_before_day,
+            )
+        )
+    ))
+
+    query = query.order_by(UserTable.platform.asc(), UserTable.id.asc())
+
+    # # 打印生成的 SQL 语句（包含参数）
+    # from sqlalchemy.dialects import sqlite
+    # compiled = query.statement.compile(dialect=sqlite.dialect(), compile_kwargs={"literal_binds": True})
+    # logger.info(f"Generated SQL: {compiled}")
+
+    users = query.all()
+    session.close()
+    return users
+
+
+def model_get_all_inactive_report_user() -> list[UserTable]:
+    """获取全部不活跃日报用户  session_token不为空用户 且日报更新时间大于今天，或日报更新时间为None(新用户)的日报"""
+    session = DBSession()
+    today = datetime.datetime.now().date()
+
+    query = (session.query(UserTable).filter(
+        and_(
+            UserTable.session_token.isnot(None),
+            UserTable.session_token != "",
+            UserTable.user_agreement == 1,
+            or_(
+                UserTable.next_report_run_time.isnot(None),
+                UserTable.next_report_run_time != "",
+                func.date(UserTable.next_report_run_time) > today
+            )
+        )
+    ))
+
+    query = query.order_by(UserTable.platform.asc(), UserTable.id.asc())
+    # # 打印生成的 SQL 语句（包含参数）
+    # from sqlalchemy.dialects import sqlite
+    # compiled = query.statement.compile(dialect=sqlite.dialect(), compile_kwargs={"literal_binds": True})
+    # logger.info(f"Generated SQL: {compiled}")
+    users = query.all()
+    session.close()
+    return users
+
+
 def model_get_all_stat_user() -> list[UserTable]:
     """获取全部session_token不为空,且stat key不为空用户"""
     session = DBSession()
@@ -243,6 +337,41 @@ def model_get_newest_user() -> UserTable:
     return user
 
 
+def model_add_seed_export(row: SeedExportTable):
+    """添加观星导出记录"""
+    session = DBSession()
+    session.add(row)
+    session.commit()
+    session.close()
+
+
+def model_get_seed_export_cnt(platform, user_id):
+    """查询单用户观星导出记录
+    """
+    session = DBSession()
+    # 查询某个人按 game_sp_id 分组的记录
+    records = session.query(
+        SeedExportTable.platform,
+        SeedExportTable.user_id,
+        SeedExportTable.game_name,
+        SeedExportTable.game_sp_id,
+        SeedExportTable.ns_name,
+        SeedExportTable.ns_friend_code,
+        SeedExportTable.nsa_id,
+        func.min(SeedExportTable.create_time).label("first_export_time"),
+        func.max(SeedExportTable.create_time).label("last_export_time"),
+        func.count(SeedExportTable.id).label("count")
+    ).filter(
+        SeedExportTable.platform == platform,
+        SeedExportTable.user_id == user_id
+    ).group_by(
+        SeedExportTable.game_sp_id
+    ).all()
+
+    session.close()
+    return records
+
+
 def model_get_login_user_by_sp_code(player_code):
     """获取登录用户信息"""
     session = DBSession()
@@ -254,7 +383,7 @@ def model_get_login_user_by_sp_code(player_code):
 
 def model_get_top_player(player_code):
     """获取一名top玩家信息"""
-    session = DBSession()
+    session = DBSession_Top()
     user = session.query(TopPlayer).filter(
         TopPlayer.player_code == player_code).order_by(TopPlayer.power.desc()).first()
     session.close()
@@ -263,7 +392,7 @@ def model_get_top_player(player_code):
 
 def model_get_max_power_top_all(player_code) -> TopAll:
     """获取一条最高分数 top all信息"""
-    session = DBSession()
+    session = DBSession_Top()
     user = session.query(TopAll).filter(
         TopAll.player_code == player_code).order_by(TopAll.power.desc()).first()
     session.close()
@@ -272,7 +401,7 @@ def model_get_max_power_top_all(player_code) -> TopAll:
 
 def model_get_all_top_all(player_code):
     """获取某人全部上榜数据"""
-    session = DBSession()
+    session = DBSession_Top()
     user = session.query(TopAll).filter(TopAll.player_code == player_code).all()
     session.close()
     return user
@@ -317,7 +446,7 @@ def model_add_report(new_report: Report):
     if not user_id_sp:
         report_logger.warning(f"no user_id_sp: {new_report}")
         return
-    session = DBSession()
+    session = DBSession_Report()
     _res = session.query(Report).filter(Report.user_id_sp == user_id_sp).order_by(Report.create_time.desc()).first()
     # 避免一天内多次写入
     if _res and _res.create_time.date() >= datetime.datetime.utcnow().date():
@@ -334,7 +463,7 @@ def model_get_today_report(user_id_sp):
     """获取今日日报数据 用于判断日报是否需要推送"""
     if not user_id_sp:
         return None
-    session = DBSession()
+    session = DBSession_Report()
     # 1. 获取当前 UTC+0 时间
     utc_now = datetime.datetime.utcnow()
     # 2. 确定“今天”的 UTC+0 日期（0点）
@@ -357,7 +486,7 @@ def model_get_report(user_id_sp, create_time=""):
     """获取日报"""
     if not user_id_sp:
         return None
-    session = DBSession()
+    session = DBSession_Report()
 
     #     query = [Report.user_id_sp == user_id_sp]
     #     report = session.query(Report).filter(*query).order_by(Report.create_time.desc()).all()
@@ -396,7 +525,7 @@ def model_get_report_all(user_id_sp):
     """获取全部日报"""
     if not user_id_sp:
         return None
-    session = DBSession()
+    session = DBSession_Report()
     data = session.execute(text(f"""
 SELECT id, DATETIME(last_play_time, '+8 hours') as last_play_time,
 total_cnt,
@@ -433,7 +562,7 @@ def model_get_user_friend(game_name) -> UserFriendTable:
 
 
 def model_new_get_user_friend(nsa_id) -> UserFriendTable:
-    """获取好友数据(使用nsa_id精准匹配)"""
+    """获取好友数据(使用nsa_id精准匹配)  后来发现好友里面取不到nsa_id 放弃了"""
     session = DBSession_Friends()
     user = session.query(UserFriendTable).filter(
         UserFriendTable.nsa_id == nsa_id
@@ -485,9 +614,31 @@ def model_set_user_friend(data_lst):
     session.close()
 
 
+def model_delete_user_friend():
+    """清除90天前创建或90天前才更新的好友数据"""
+    # 两种情况删除   1. 90天前创建，从未更新   2.更新时间不为none，在90天前
+    session = DBSession_Friends()
+    ninety_days_ago = datetime.datetime.now() - datetime.timedelta(days=90)
+
+    # 情况1: 90天前创建且从未更新（update_time为None）
+    session.query(UserFriendTable).filter(
+        UserFriendTable.create_time < ninety_days_ago,
+        UserFriendTable.update_time == None
+    ).delete()
+
+    # 情况2: 更新时间不为None，且在90天前
+    session.query(UserFriendTable).filter(
+        UserFriendTable.update_time != None,
+        UserFriendTable.update_time < ninety_days_ago
+    ).delete()
+
+    session.commit()
+    session.close()
+
+
 def model_delete_top_player(top_id):
     """删除指定赛季 top榜单玩家数据"""
-    session = DBSession()
+    session = DBSession_Top()
     session.query(TopPlayer).filter(TopPlayer.top_id == top_id).delete()
     session.commit()
     session.close()
@@ -495,7 +646,7 @@ def model_delete_top_player(top_id):
 
 def model_delete_top_all(top_id):
     """删除指定赛季 top_all榜单玩家数据"""
-    session = DBSession()
+    session = DBSession_Top()
     session.query(TopAll).filter(TopAll.top_id == top_id).delete()
     session.commit()
     session.close()
@@ -505,7 +656,7 @@ def model_add_top_player(row):
     """添加top榜单数据"""
     top_id, _top_type, rank, power, name, name_id, player_code, byname, weapon_id, weapon = row
 
-    session = DBSession()
+    session = DBSession_Top()
     _dict = {
         'top_id': top_id,
         'top_type': _top_type,
@@ -528,7 +679,7 @@ def model_add_top_all(row):
     """添加top_all榜单数据"""
     top_id, _top_type, rank, power, name, name_id, player_code, byname, weapon_id, weapon, play_time = row
 
-    session = DBSession()
+    session = DBSession_Top()
     _dict = {
         'top_id': top_id,
         'top_type': _top_type,
@@ -550,7 +701,7 @@ def model_add_top_all(row):
 
 def model_get_top_all_count_by_top_type(top_type):
     """通过top_all类型取得top_all记录的count"""
-    session = DBSession()
+    session = DBSession_Top()
     top_count = session.query(func.count(TopAll.id)).where(TopAll.top_type.contains(top_type)).scalar()
     session.close()
     return top_count
@@ -571,7 +722,7 @@ def model_get_top_all_count_by_top_type(top_type):
 #     ORDER BY
 #         top_all.create_time DESC
 #     """
-#     session = DBSession()
+#     session = DBSession_Top()
 #     top = session.query(TopAll).where(TopAll.top_type.like("LeagueMatchRankingTeam%")).group_by(TopAll.top_type) \
 #         .order_by(TopAll.create_time.desc()).first()
 #     session.close()
@@ -579,7 +730,7 @@ def model_get_top_all_count_by_top_type(top_type):
 
 
 def model_get_power_rank():
-    session = DBSession()
+    session = DBSession_Report()
     data = session.execute(text(f"""
 select user_id_sp, max(max_power) max_power,
        row_number() over (order by max_power desc) rank