nonebot-plugin-osubot 6.21.0__tar.gz → 6.22.0__tar.gz

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-osubot
-Version: 6.21.0
+Version: 6.22.0
 Summary: OSUbot in NoneBot2
 License: AGPL-3.0
 Author-email: yaowan233 <572473053@qq.com>

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/api.py

@@ -8,8 +8,9 @@ from typing import Union, Literal, Optional
 from nonebot.log import logger
 from expiringdict import ExpiringDict
 from nonebot import get_plugin_config
-from httpx import Response, AsyncClient
+from httpx import Response
 
+from .network.manager import network_manager
 from .utils import FGM
 from .config import Config
 from .mods import get_mods
@@ -25,7 +26,6 @@ api = "https://osu.ppy.sh/api/v2"
 sayoapi = "https://api.sayobot.cn"
 cache = ExpiringDict(max_len=1, max_age_seconds=86400)
 plugin_config = get_plugin_config(Config)
-proxy = plugin_config.osu_proxy
 
 key = plugin_config.osu_key
 client_id = plugin_config.osu_client
@@ -34,15 +34,15 @@ bg_url = plugin_config.info_bg
 
 @auto_retry
 async def safe_async_get(url, headers: Optional[dict] = None, params: Optional[dict] = None) -> Response:
-    async with AsyncClient(proxy=proxy, follow_redirects=True) as client:
-        req = await client.get(url, headers=headers, params=params)
+    client = await network_manager.get_client()
+    req = await client.get(url, headers=headers, params=params)
     return req
 
 
 @auto_retry
 async def safe_async_post(url, headers=None, data=None, json=None) -> Response:
-    async with AsyncClient(proxy=proxy) as client:
-        req = await client.post(url, headers=headers, data=data, json=json)
+    client = await network_manager.get_client()
+    req = await client.post(url, headers=headers, data=data, json=json)
     return req
 
 
@@ -105,8 +105,10 @@ async def fetch_score_batch(
             statistics=i.statistics,
             legacy_total_score=i.legacy_total_score,
             passed=i.passed,
+            pp=i.pp,
             beatmap=UnifiedBeatmap(
                 id=i.beatmap_id,
+                user_id=i.beatmap.user_id,
                 set_id=i.beatmapset.id,
                 artist=i.beatmapset.artist,
                 title=i.beatmapset.title,
@@ -198,6 +200,7 @@ async def get_user_scores(
                 ),
                 beatmap=UnifiedBeatmap(
                     id=i.beatmap.id,
+                    user_id=i.beatmap.user_id,
                     set_id=i.beatmap.set_id,
                     artist=i.beatmap.artist,
                     title=i.beatmap.title,

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/draw/catch_preview_templates/pic.html

@@ -41,7 +41,7 @@
 
         const createImg = function () {
             const self = this;
-            const osufile = `{{ osu_file }}`;
+            const osufile = {{ osu_file|tojson }};
             let SPEED = 1;
             let mods = {
                 HR: {{ is_hr }},
@@ -85,4 +85,4 @@
     </script>
 </body>
 
-</html>
+</html>

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/draw/score.py

@@ -45,6 +45,8 @@ from .static import (
     Torus_SemiBold_30,
     osufile,
     extra_30,
+    Stardiff,
+    Stars,
 )
 
 
@@ -234,14 +236,19 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         fill=(255, 255, 255, 255),
     )
     # 难度星星
-    stars_bg = stars_diff(pp_info.difficulty.stars)
+    stars_bg = stars_diff(pp_info.difficulty.stars, Stars)
     stars_img = stars_bg.resize((85, 37))
     im.alpha_composite(stars_img, (552, 67))
+    # 难度竖条
+    star_bg = stars_diff(pp_info.difficulty.stars, Stardiff)
+    star_img = star_bg.resize((20, 271))
+    im.alpha_composite(star_img, (0, 50))
+    # 星级
     if pp_info.difficulty.stars < 6.5:
         color = (0, 0, 0, 255)
     else:
         color = (255, 217, 102, 255)
-    # 星级
+
     draw.text(
         (556, 85),
         f"★{pp_info.difficulty.stars:.2f}",
@@ -417,7 +424,7 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         fill=(255, 255, 255, 255),
     )
     # setid
-    draw.text((20, 25), f"Setid：{mapinfo.beatmapset_id}", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((32, 25), f"Setid：{mapinfo.beatmapset_id}", font=Torus_SemiBold_20, anchor="lm")
     # mapid
     draw.text((650, 25), f"Mapid: {mapinfo.id}", font=Torus_SemiBold_20, anchor="rm")
     # 曲名
@@ -477,11 +484,11 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         anchor="lm",
     )
     # 时间
-    draw.text((883, 260), "达成时间：", font=Torus_SemiBold_20, anchor="lm")
-    draw.text((985, 260), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
+    draw.text((883, 230), "达成时间：", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((985, 230), score_info.ended_at.strftime("%Y-%m-%d %H:%M:%S"), font=Torus_SemiBold_20, anchor="lm")
     # 全球排名
-    draw.text((715, 300), "全球排行：" if grank else "", font=Torus_SemiBold_20, anchor="lm")
-    draw.text((817, 300), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="lm")
+    draw.text((883, 260), "全球排行：" if grank else "", font=Torus_SemiBold_20, anchor="lm")
+    draw.text((985, 260), f"#{grank}" if grank else "", font=Torus_SemiBold_25, anchor="lm")
     # 左下玩家名
     draw.text((208, 550), info.username, font=Torus_SemiBold_30, anchor="lm")
     # 国内排名

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/draw/static.py

@@ -37,6 +37,7 @@ MapBg = Image.open(osufile / "beatmapinfo.png").convert("RGBA")
 MapBg1 = Image.open(osufile / "maniabeatmapinfo.png").convert("RGBA")
 BarImg = Image.open(osufile / "work" / "bmap.png").convert("RGBA")
 Stars = Image.open(osufile / "work" / "stars.png").convert("RGBA")
+Stardiff = Image.open(osufile / "work" / "stardiff.png").convert("RGBA")
 TeamBlue = Image.open(osufile / "match" / "team_blue.png").convert("RGBA")
 TeamRed = Image.open(osufile / "match" / "team_red.png").convert("RGBA")
 MpLink = Image.open(osufile / "match" / "mplink.png").convert("RGBA")

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/draw/templates/bpa_chart.html

@@ -43,7 +43,7 @@
           xAxis: [
             {
               type: 'category',
-              data: Array.from({ length: 100 }, (_, i) => i),
+              data: Array.from({ length: 200 }, (_, i) => i),
               axisLabel: {
                   interval: 9
               }

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/draw/utils.py

@@ -6,13 +6,14 @@ from io import BytesIO
 from typing import Union, Optional
 from difflib import SequenceMatcher
 
+from PIL.ImageFile import ImageFile
 from matplotlib.figure import Figure
 from PIL import ImageDraw, ImageFilter, ImageEnhance, UnidentifiedImageError
 
 from ..schema.user import UnifiedUser
 from ..schema import SeasonalBackgrounds
 from ..api import safe_async_get, get_seasonal_bg
-from .static import Path, Image, Stars, ColorArr, np, osufile
+from .static import Path, Image, ColorArr, np, osufile
 from ..file import map_path, download_osu, get_projectimg, user_cache_path, team_cache_path
 
 
@@ -183,7 +184,7 @@ async def crop_bg(size: tuple[int, int], path: Union[str, Path, BytesIO, Image.I
         return sf
 
 
-def stars_diff(stars: float):
+def stars_diff(stars: float, stars_bg: ImageFile):
     if stars < 0.1:
         r, g, b = 170, 170, 170
     elif stars >= 9:
@@ -192,10 +193,10 @@ def stars_diff(stars: float):
         # 颜色取色参考 https://github.com/ppy/osu-web/blob/97997d9c7b7f9c49f9b3cdd776c71afb9872c34b/resources/js/utils/beatmap-helper.ts#L20
         r, g, b, _a = ColorArr[int(stars * 100)]
     # 打开底图
-    xx, yy = Stars.size
+    xx, yy = stars_bg.size
     # 填充背景
-    img = Image.new("RGBA", Stars.size, (r, g, b))
-    img.paste(Stars, (0, 0, xx, yy), Stars)
+    img = Image.new("RGBA", stars_bg.size, (r, g, b))
+    img.paste(stars_bg, (0, 0, xx, yy), stars_bg)
     # 把白色变透明
     arr = np.array(img)
     # 创建mask，将白色替换为True，其他颜色替换为False

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/matcher/bp_analyze.py

@@ -7,9 +7,8 @@ from nonebot_plugin_alconna import UniMessage
 
 from ..utils import NGM
 from .utils import split_msg
-from ..schema import NewScore
 from ..database import UserData
-from ..api import osu_api, get_users
+from ..api import get_user_scores, get_users
 from ..exceptions import NetworkError
 from ..draw.score import cal_score_info
 from ..draw.echarts import draw_bpa_plot
@@ -35,17 +34,11 @@ async def _(event: Event, state: T_State):
     uid = state["user"]
     lazer_mode = "lazer模式下" if state["is_lazer"] else "stable模式下"
     try:
-        bp_info = await osu_api(
-            "bp",
-            uid,
-            NGM[state["mode"]],
-            legacy_only=int(not user.lazer_mode),
-        )
+        score_ls = await get_user_scores(uid, NGM[state["mode"]], "best", legacy_only=not state["is_lazer"])
     except NetworkError as e:
         await UniMessage.text(
             f"在查找用户：{state['username']} {NGM[state['mode']]}模式 {lazer_mode}时 {str(e)}"
         ).finish(reply_to=True)
-    score_ls = [NewScore(**i) for i in bp_info]
     for score in score_ls:
         for mod in score.mods:
             if mod.acronym == "DT" or mod.acronym == "NC":
@@ -106,6 +99,6 @@ async def _(event: Event, state: T_State):
         mapper_pp_data.append({"name": user_dic.get(mapper, ""), "value": round(pp, 2)})
     if len(mapper_pp_data) > 20:
         mapper_pp_data = mapper_pp_data[:20]
-    name = f"{score_ls[0].user.username} {NGM[state['mode']]} 模式 "
+    name = f"{state['username']} {NGM[state['mode']]} 模式 "
     byt = await draw_bpa_plot(name, pp_ls, length_ls, pp_data, mapper_pp_data)
     await UniMessage.image(raw=byt).finish(reply_to=True)

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/matcher/guess.py

@@ -16,6 +16,8 @@ from nonebot.internal.rule import Rule, Event
 from nonebot_plugin_alconna import At, UniMsg, UniMessage
 from nonebot_plugin_session import SessionId, SessionIdType
 
+from ..draw.taiko_preview import parse_map, map_to_image
+from ..schema.score import UnifiedScore
 from ..utils import NGM
 from ..info import get_bg
 from .utils import split_msg
@@ -23,7 +25,7 @@ from ..schema import NewScore
 from ..exceptions import NetworkError
 from ..database.models import UserData
 from ..mania import generate_preview_pic
-from ..api import osu_api, safe_async_get
+from ..api import safe_async_get, get_user_scores
 from ..file import map_path, download_tmp_osu
 from ..draw.catch_preview import draw_cath_preview
 
@@ -46,23 +48,27 @@ data_path = Path() / "data" / "osu"
 pcm_path = data_path / "out.pcm"
 
 
-async def get_random_beatmap_set(binded_id, group_id, ttl=10) -> (NewScore, str):
-    if ttl == 0:
-        return
-    selected_user = random.choice(binded_id)
-    if not selected_user:
-        return
-    user = await UserData.filter(user_id=selected_user).first()
-    try:
-        bp_info = await osu_api("bp", user.osu_id, NGM[str(user.osu_mode)])
-    except NetworkError:
-        return await get_random_beatmap_set(binded_id, group_id, ttl - 1)
-    selected_score = random.choice([NewScore(**i) for i in bp_info])
-    if selected_score.beatmapset.id not in guess_song_cache[group_id]:
-        guess_song_cache[group_id].add(selected_score.beatmapset.id)
-    else:
-        return await get_random_beatmap_set(binded_id, group_id, ttl - 1)
-    return selected_score, user.osu_name
+async def get_random_beatmap_set(binded_id, group_id) -> (UnifiedScore, str):
+    # 获取已猜过的歌曲集合
+    guessed_songs = guess_song_cache[group_id]
+    available_scores = []
+    for user_id in binded_id:
+        try:
+            user = await UserData.filter(user_id=user_id).first()
+            if not user:
+                continue
+            bp_info = await get_user_scores(user.osu_id, NGM[str(user.osu_mode)], "best")
+            # 过滤掉已猜过的歌曲
+            unguessed_scores = [(score, user.osu_name) for score in bp_info if score.beatmapset.id not in guessed_songs]
+            available_scores.extend(unguessed_scores)
+        except NetworkError:
+            continue  # 跳过网络错误的用户，继续尝试其他用户
+    if not available_scores:
+        return None, None  # 所有歌曲都被猜过了
+    # 随机选择一个未猜过的成绩
+    selected_score, osu_name = random.choice(available_scores)
+    guess_song_cache[group_id].add(selected_score.beatmapset.id)
+    return selected_score, osu_name
 
 
 @guess_audio.handle(parameterless=[split_msg()])
@@ -89,12 +95,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -103,12 +108,11 @@ async def _(
         selected_user = user_data.osu_name
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[group_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -354,12 +358,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -368,12 +371,11 @@ async def _(
         selected_user = user_data.osu_name
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -422,7 +424,7 @@ async def _(
         await UniMessage.text("由于未绑定OSU账号，本次随机选择模式进行猜歌\n" + state["error"]).send(reply_to=True)
     else:
         mode = state["mode"]
-    if mode == "0" or mode == "1":
+    if mode == "0":
         await UniMessage.text("该模式暂不支持猜歌").finish(reply_to=True)
     binded_id = await UserData.filter(osu_mode=mode).values_list("user_id", flat=True)
     if not binded_id:
@@ -435,12 +437,11 @@ async def _(
         if not user_data:
             await UniMessage.text("该用户未绑定osu账号").finish(reply_to=True)
         try:
-            bp_info = await osu_api("bp", user_data.osu_id, NGM[state["mode"]])
+            bp_ls = await get_user_scores(user_data.osu_id, NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -449,12 +450,11 @@ async def _(
         guess_song_cache[session_id].add(selected_score.beatmapset.id)
     elif state["user"]:
         try:
-            bp_info = await osu_api("bp", state["user"], NGM[state["mode"]])
+            bp_ls = await get_user_scores(state["user"], NGM[state["mode"]], "best")
         except NetworkError as e:
             await UniMessage.text(f"在查找用户：{state['username']} {NGM[state['mode']]}模式bp时 {str(e)}").finish(
                 reply_to=True
             )
-        bp_ls = [NewScore(**i) for i in bp_info]
         filtered_bp_ls = [i for i in bp_ls if i.beatmapset.id not in guess_song_cache[session_id]]
         if not filtered_bp_ls:
             await UniMessage.text(state["username"] + "的bp已经被你们猜过一遍了 －_－").finish(reply_to=True)
@@ -471,18 +471,18 @@ async def _(
     chart_set_timeout(matcher, session_id)
     if mode == "3":
         osu = await download_tmp_osu(selected_score.beatmap.id)
-        byt = await generate_preview_pic(osu)
-        await (
-            UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
-            + UniMessage.image(raw=byt)
-        ).finish()
+        pic = await generate_preview_pic(osu)
+    elif mode == "1":
+        osu = await download_tmp_osu(selected_score.beatmap.id)
+        beatmap = parse_map(osu)
+        pic = map_to_image(beatmap)
     else:
         mods = [i.acronym for i in selected_score.mods]
         pic = await draw_cath_preview(selected_score.beatmap.id, selected_score.beatmapset.id, mods)
-        await (
-            UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
-            + UniMessage.image(raw=pic)
-        ).finish()
+    await (
+        UniMessage.text(f"开始谱面猜歌游戏，猜猜下面谱面的曲名吧，该曲抽选自 {selected_user} 的bp")
+        + UniMessage.image(raw=pic)
+    ).finish()
 
 
 @chart_word_matcher.handle()

nonebot-plugin-osubot-6.22.0/nonebot_plugin_osubot/network/manager.py

@@ -0,0 +1,30 @@
+import httpx
+import asyncio
+from ..config import Config
+from httpx import AsyncClient
+from nonebot import get_plugin_config
+
+
+plugin_config = get_plugin_config(Config)
+proxy = plugin_config.osu_proxy
+
+
+class NetworkManager:
+    def __init__(self):
+        self._client = None
+        self._lock = asyncio.Lock()
+
+    async def get_client(self) -> AsyncClient:
+        if self._client is None:
+            async with self._lock:
+                if self._client is None:
+                    self._client = AsyncClient(
+                        proxy=proxy,
+                        follow_redirects=True,
+                        limits=httpx.Limits(max_keepalive_connections=20, max_connections=100, keepalive_expiry=30),
+                        timeout=httpx.Timeout(30.0),
+                    )
+        return self._client
+
+
+network_manager = NetworkManager()

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/nonebot_plugin_osubot/schema/score.py

@@ -113,6 +113,7 @@ class UnifiedBeatmap(Base):
     ar: float
     hp: float
     stars: float
+    user_id: int
 
 
 class UnifiedScore(Base):
@@ -127,3 +128,4 @@ class UnifiedScore(Base):
     statistics: NewStatistics
     beatmap: Optional[UnifiedBeatmap] = None
     passed: bool
+    pp: Optional[float] = None

{nonebot-plugin-osubot-6.21.0 → nonebot-plugin-osubot-6.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.21.0"
+version = "6.22.0"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },