♻️ Refactor type hints and update dependencies in various files

Author: Paillat-dev

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.8
+    rev: v0.12.1
     hooks:
       # Run the linter.
       - id: ruff

pdm.lock

@@ -6,7 +6,6 @@ authors = [
     {name = "Paillat-dev", email = "me@paillat.dev"},
 ]
 dependencies = [
-    "py-cord @ git+https://github.com/Pycord-Development/pycord.git@refs/pull/2707/head",
     "aiohttp>=3.9.5",
     "pyyaml>=6.0.1",
     "python-dotenv>=1.0.1",
@@ -108,7 +107,8 @@ extend-ignore = [
     "FBT002",
     "PLR2004",
     "PLR0913",
-    "C901"
+    "C901",
+    "RUF200"
 ]
 
 [tool.aerich]

pyproject.toml

@@ -15,7 +15,7 @@ async def main() -> None:
     await load_and_run_patches()
     # we import main here to apply patches before importing as many things we can
     # and allow the patches to be applied to later imported modules
-    from src.start import start
+    from src.start import start  # noqa: PLC0415
 
     await start()
 

src/__main__.py

@@ -13,10 +13,10 @@
 async def patch(config: dict[str, Any]) -> None:
     sentry_sdk = None
     if config.get("sentry", {}).get("dsn"):
-        import sentry_sdk
-        from sentry_sdk.integrations.asyncio import AsyncioIntegration
-        from sentry_sdk.integrations.logging import LoggingIntegration
-        from sentry_sdk.scrubber import (
+        import sentry_sdk  # noqa: PLC0415
+        from sentry_sdk.integrations.asyncio import AsyncioIntegration  # noqa: PLC0415
+        from sentry_sdk.integrations.logging import LoggingIntegration  # noqa: PLC0415
+        from sentry_sdk.scrubber import (  # noqa: PLC0415
             DEFAULT_DENYLIST,
             DEFAULT_PII_DENYLIST,
             EventScrubber,
@@ -35,11 +35,11 @@ async def patch(config: dict[str, Any]) -> None:
         )
         logger.success("Sentry SDK initialized")
 
-    from discord.ui import View
+    from discord.ui import View  # noqa: PLC0415
 
     if TYPE_CHECKING:
-        from discord import Interaction
-        from discord.ui import Item
+        from discord import Interaction  # noqa: PLC0415
+        from discord.ui import Item  # noqa: PLC0415
 
     async def on_error(
         self: View,  # noqa: ARG001

src/extensions/nice_errors/patch.py

@@ -1,7 +1,7 @@
 # Copyright (c) NiceBots.xyz
 # SPDX-License-Identifier: MIT
 
-from typing import TYPE_CHECKING, TypeVar
+from typing import TYPE_CHECKING
 
 import discord
 import yaml
@@ -20,11 +20,7 @@
 logger = main_logger.getChild("i18n")
 
 
-T = TypeVar("T")
-V = TypeVar("V")
-
-
-def remove_none(d: dict[T, V]) -> dict[T, V]:
+def remove_none[T, V](d: dict[T, V]) -> dict[T, V]:
     """Remove None values from a dictionary.
 
     Args:
@@ -70,18 +66,16 @@ def merge_command_translations(
     return result
 
 
-CommandT = TypeVar(
-    "CommandT",
-    discord.ApplicationCommand,  # pyright: ignore[reportMissingTypeArgument]
-    discord.SlashCommand,
-    discord.SlashCommandGroup,
-    prefixed.Command,  # pyright: ignore[reportMissingTypeArgument]
-    discord.MessageCommand,
-)
-
-
-def localize_commands(  # noqa: PLR0912
-    commands: list[CommandT],
+def localize_commands[  # noqa: PLR0912
+    T: (
+        discord.ApplicationCommand,  # pyright: ignore[reportMissingTypeArgument]
+        discord.SlashCommand,
+        discord.SlashCommandGroup,
+        prefixed.Command,  # pyright: ignore[reportMissingTypeArgument]
+        discord.MessageCommand,
+    )
+](
+    commands: list[T],
     translations: ExtensionTranslation
     | Deg1CommandTranslation
     | Deg2CommandTranslation

src/i18n/utils.py

@@ -53,9 +53,9 @@ async def start_bot(bot: custom.Bot, token: str, rest_config: RestConfig, public
 
 
 async def start_backend(app: Quart, bot: discord.Bot, token: str) -> None:
-    from hypercorn.asyncio import serve  # pyright: ignore [reportUnknownVariableType]
-    from hypercorn.config import Config
-    from hypercorn.logging import Logger as HypercornLogger
+    from hypercorn.asyncio import serve  # pyright: ignore [reportUnknownVariableType]  # noqa: PLC0415
+    from hypercorn.config import Config  # noqa: PLC0415
+    from hypercorn.logging import Logger as HypercornLogger  # noqa: PLC0415
 
     class CustomLogger(HypercornLogger):
         def __init__(
@@ -202,7 +202,7 @@ async def start(run_bot: bool | None = None, run_backend: bool | None = None) ->
         logger.critical("No bot token provided in config, exiting...")
         return
     if config.db.enabled:
-        from src.database.config import init
+        from src.database.config import init  # noqa: PLC0415
 
         logger.info("Initializing database...")
         await init()

src/start.py

@@ -2,13 +2,9 @@
 # SPDX-License-Identifier: MIT
 
 from collections.abc import Iterator
-from typing import TypeVar
 
-T = TypeVar("T")
-V = TypeVar("V")
 
-
-def next_default(iterator: Iterator[T], default: V = None) -> T | V:
+def next_default[T, V](iterator: Iterator[T], default: V = None) -> T | V:
     try:
         return next(iterator)
     except StopIteration:

src/utils/iterator.py

@@ -1,7 +1,7 @@
 # Copyright (c) NiceBots.xyz
 # SPDX-License-Identifier: MIT
 
-# ruff: noqa: S101, S105
+# ruff: noqa: S105
 
 import os
 from typing import Any