refactor(database): use a new 'On-Demand' design (#86)

Technical Details: https://blog.mxgame.top/2025/11/22/An-On-Demand-Design-Within-SQLModel/
This commit is contained in:
MingxuanGame
2025-11-23 21:41:02 +08:00
committed by GitHub
parent 42f1d53d3e
commit 40da994ae8
46 changed files with 4396 additions and 2354 deletions

View File

@@ -1,13 +1,40 @@
from app.database.beatmap import BeatmapResp
from app.database.beatmap import BeatmapDict, BeatmapModel
from app.log import fetcher_logger
from ._base import BaseFetcher
from pydantic import TypeAdapter
logger = fetcher_logger("BeatmapFetcher")
adapter = TypeAdapter(
BeatmapModel.generate_typeddict(
(
"checksum",
"accuracy",
"ar",
"bpm",
"convert",
"count_circles",
"count_sliders",
"count_spinners",
"cs",
"deleted_at",
"drain",
"hit_length",
"is_scoreable",
"last_updated",
"mode_int",
"ranked",
"url",
"max_combo",
"beatmapset",
)
)
)
class BeatmapFetcher(BaseFetcher):
async def get_beatmap(self, beatmap_id: int | None = None, beatmap_checksum: str | None = None) -> BeatmapResp:
async def get_beatmap(self, beatmap_id: int | None = None, beatmap_checksum: str | None = None) -> BeatmapDict:
if beatmap_id:
params = {"id": beatmap_id}
elif beatmap_checksum:
@@ -16,7 +43,7 @@ class BeatmapFetcher(BaseFetcher):
raise ValueError("Either beatmap_id or beatmap_checksum must be provided.")
logger.opt(colors=True).debug(f"get_beatmap: <y>{params}</y>")
return BeatmapResp.model_validate(
return adapter.validate_python( # pyright: ignore[reportReturnType]
await self.request_api(
"https://osu.ppy.sh/api/v2/beatmaps/lookup",
params=params,

View File

@@ -3,7 +3,7 @@ import base64
import hashlib
import json
from app.database.beatmapset import BeatmapsetResp, SearchBeatmapsetsResp
from app.database import BeatmapsetDict, BeatmapsetModel, SearchBeatmapsetsResp
from app.helpers.rate_limiter import osu_api_rate_limiter
from app.log import fetcher_logger
from app.models.beatmap import SearchQueryModel
@@ -13,6 +13,7 @@ from app.utils import bg_tasks
from ._base import BaseFetcher
from httpx import AsyncClient
from pydantic import TypeAdapter
import redis.asyncio as redis
@@ -26,6 +27,46 @@ logger = fetcher_logger("BeatmapsetFetcher")
MAX_RETRY_ATTEMPTS = 3
adapter = TypeAdapter(
BeatmapsetModel.generate_typeddict(
(
"availability",
"bpm",
"last_updated",
"ranked",
"ranked_date",
"submitted_date",
"tags",
"storyboard",
"description",
"genre",
"language",
*[
f"beatmaps.{inc}"
for inc in (
"checksum",
"accuracy",
"ar",
"bpm",
"convert",
"count_circles",
"count_sliders",
"count_spinners",
"cs",
"deleted_at",
"drain",
"hit_length",
"is_scoreable",
"last_updated",
"mode_int",
"ranked",
"url",
"max_combo",
)
],
)
)
)
class BeatmapsetFetcher(BaseFetcher):
@@ -139,10 +180,9 @@ class BeatmapsetFetcher(BaseFetcher):
except Exception:
return {}
async def get_beatmapset(self, beatmap_set_id: int) -> BeatmapsetResp:
async def get_beatmapset(self, beatmap_set_id: int) -> BeatmapsetDict:
logger.opt(colors=True).debug(f"get_beatmapset: <y>{beatmap_set_id}</y>")
return BeatmapsetResp.model_validate(
return adapter.validate_python( # pyright: ignore[reportReturnType]
await self.request_api(f"https://osu.ppy.sh/api/v2/beatmapsets/{beatmap_set_id}")
)