remove some unnecessary deps

pyproject.toml

@@ -11,9 +11,7 @@ sslog = "0.0.0a28"
 litestar = { version = "^2.11.0", extras = ['jinja'] }
 redis = { extras = ["hiredis"], version = "^5.0.8" }
 uvicorn = { version = "^0.30.6" }
-pydash = "^8.0.3"
 uuid-utils = "^0.9.0"
-frozendict = "^2.4.4"
 regex = "^2024.9.11"
 bgm-tv-wiki = "^0.0.23"
 

server/base.py

@@ -1,13 +1,13 @@
 import asyncio
 import time
+from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any
 from uuid import UUID
 
 import asyncpg
 import httpx
 import litestar
-from frozendict import frozendict
 from litestar.exceptions import ClientException
 from litestar.status_codes import HTTP_400_BAD_REQUEST
 from redis.asyncio import Redis
@@ -83,13 +83,12 @@ class BadRequestException(ClientException):
     status_code = HTTP_400_BAD_REQUEST
 
 
-patch_keys: frozendict[str, str] = frozendict(
-    {
-        "name": "标题",
-        "name_cn": "简体中文标题",
-        "duration": "时长",
-        "airdate": "放送日期",
-        "description": "简介",
-    }
-)
+patch_keys: Mapping[str, str] = {
+    "name": "标题",
+    "name_cn": "简体中文标题",
+    "duration": "时长",
+    "airdate": "放送日期",
+    "description": "简介",
+}
+
 disable_cookies_opt = {"skip_session": True, "exclude_from_auth": True, "exclude_from_csrf": True}

server/model.py

@@ -4,6 +4,7 @@
 from uuid import UUID
 
 import msgspec
+from typing_extensions import Self
 
 
 class PatchState(enum.IntEnum):
@@ -29,7 +30,7 @@ class PatchBase(msgspec.Struct, kw_only=True, frozen=True):
     patch_desc: str  # extra description from user will not be included in commit message
 
     @classmethod
-    def from_dict(cls: type[T], d: Any) -> T:
+    def from_dict(cls, d: Any) -> Self:
         # will remove extra fields and do field level instance checking
         return msgspec.convert(d, cls)
 

server/review.py

@@ -7,7 +7,7 @@
 from uuid import UUID
 
 import litestar
-import pydash
+import msgspec.structs
 from asyncpg import Record
 from litestar import Controller, Response
 from litestar.enums import RequestEncodingType
@@ -78,6 +78,8 @@ async def review_patch(
 
                 patch = SubjectPatch.from_dict(p)
 
+                msgspec.structs.replace(patch)
+
                 if patch.state != PatchState.Pending:
                     raise BadRequestException("patch already reviewed")
 
@@ -146,14 +148,15 @@ async def __accept_patch(
             headers={"Authorization": f"Bearer {request.auth.access_token}"},
             json={
                 "commitMessage": f"{patch.reason} [patch https://patch.bgm38.tv/subject/{patch.id}]",
-                "expectedRevision": pydash.pick(
-                    {
-                        "infobox": patch.original_infobox,
-                        "name": patch.original_name,
-                        "summary": patch.original_summary,
-                    },
-                    *subject.keys(),
-                ),
+                "expectedRevision": {
+                    key: value
+                    for key, value in [
+                        ("infobox", patch.original_infobox),
+                        ("name", patch.original_name),
+                        ("summary", patch.original_summary),
+                    ]
+                    if key in subject
+                },
                 "subject": subject,
             },
         )