Merge pull request #286 from VirtualLiveLab/sushichan044-202603241246-py313

feat: use Python3.13

Author: sushichan044

.python-version

@@ -1 +1 @@
-3.11
+3.13

Dockerfile

@@ -1,4 +1,7 @@
-FROM python:3.11-bookworm AS builder
+# syntax=docker/dockerfile:1
+# check=error=true
+
+FROM python:3.13-slim-trixie AS builder
 
 WORKDIR /app
 ENV UV_SYSTEM_PYTHON=true \
@@ -7,16 +10,16 @@ ENV UV_SYSTEM_PYTHON=true \
     UV_LINK_MODE=copy
 
 # Install dependencies
-RUN --mount=from=ghcr.io/astral-sh/uv:0.4.17,source=/uv,target=/bin/uv \
+RUN --mount=from=ghcr.io/astral-sh/uv:0.11.0,source=/uv,target=/bin/uv \
     --mount=type=cache,target=${UV_CACHE_DIR} \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv export --frozen --no-dev --format requirements-txt > requirements.txt \
     && uv pip install -r requirements.txt --target /app/.uv-pip/site-packages
 
 # https://github.com/GoogleContainerTools/distroless/blob/main/python3/BUILD
-# distroless/python3-debian12のPythonは3.11
-FROM gcr.io/distroless/python3-debian12:nonroot AS runner
+# distroless/python3-debian13のPythonは3.13
+FROM gcr.io/distroless/python3-debian13:nonroot AS runner
 WORKDIR /app
 
 # distrolessのPythonはデフォルトではsite-packagesを参照しない

pyproject.toml

@@ -11,10 +11,10 @@ dependencies = [
     "asyncer>=0.0.8",
     "result>=0.17.0",
     "notion-client>=2.5.0",
-    "glom>=25.12.0"
+    "glom>=25.12.0",
 ]
 readme = "README.md"
-requires-python = ">= 3.11"
+requires-python = ">= 3.13"
 
 [dependency-groups]
 dev = ["mypy>=1.17.1", "python-dotenv>=1.2.2", "ruff>=0.13.2"]
@@ -29,7 +29,7 @@ package = false
 
 [tool.ruff]
 # https://qiita.com/yuji38kwmt/items/63e82126076204923520
-target-version = "py311"
+target-version = "py313"
 line-length = 125
 
 [tool.ruff.lint]
@@ -43,7 +43,6 @@ ignore = [
     "ERA",     # : 役立つこともあるが、コメントアウトしていないコードも警告されるので無視する
     "COM812",  # recommended by ruff formatter
     "ISC001",  # recommended by ruff formatter
-    "UP040",   # discord.py can not understand new type syntax
 ]
 select = ["ALL"]
 
@@ -69,7 +68,7 @@ line-ending = "auto"
 
 
 [tool.mypy]
-python_version = "3.11"
+python_version = "3.13"
 exclude = [".venv"]
 follow_imports = "normal"
 warn_redundant_casts = true

src/app/core/chat/cog.py

@@ -1,6 +1,6 @@
 import asyncio
 import secrets
-from typing import TYPE_CHECKING, Literal, TypeAlias
+from typing import TYPE_CHECKING, Literal
 
 import discord
 from discord import app_commands
@@ -50,7 +50,7 @@ async def call_miku(self, interaction: discord.Interaction) -> None:
         await interaction.followup.send("MIKU!")
 
 
-OmikujiResult: TypeAlias = Literal["大吉", "中吉", "小吉", "吉", "末吉", "凶", "大凶"]
+type OmikujiResult = Literal["大吉", "中吉", "小吉", "吉", "末吉", "凶", "大凶"]
 OMKIJI_RESULT_DICT: dict[OmikujiResult, str] = {
     "大吉": "大吉だよ！",
     "中吉": "中吉だよ！",

src/app/help/const.py

@@ -1,6 +1,6 @@
-from typing import Literal, TypeAlias
+from typing import Literal
 
-FeatureLabel: TypeAlias = Literal["メッセージ展開", "投票", "その他", "ヘルプ"]
+type FeatureLabel = Literal["メッセージ展開", "投票", "その他", "ヘルプ"]
 FEATURE_LABEL_LIST: list[FeatureLabel] = [
     "メッセージ展開",
     "投票",

src/app/vote/manager.py

@@ -1,10 +1,10 @@
-from typing import Annotated, TypeAlias
+from typing import Annotated
 from uuid import uuid4
 
 from pydantic import UUID4, BaseModel, Field
 
-OptionId: TypeAlias = Annotated[UUID4, "OptionId"]
-VotedUserId: TypeAlias = Annotated[int, "VotedUserId"]
+type OptionId = Annotated[UUID4, "OptionId"]
+type VotedUserId = Annotated[int, "VotedUserId"]
 
 
 class VoteOption(BaseModel):

src/app/wol/fn.py

@@ -1,11 +1,11 @@
 import os
 from enum import Enum
-from typing import Literal, TypeAlias, TypedDict
+from typing import Literal, TypedDict
 
 import aiohttp
 
 # https://www.notion.so/virtual-live-lab/ddf6d9708a2e45469f675c37e6d09e28
-ComputerType: TypeAlias = Literal["left", "right", "stream"]
+type ComputerType = Literal["left", "right", "stream"]
 
 
 class ComputerStatus(TypedDict):

src/packages/url_extractor/extractor.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Generic, LiteralString, TypeVar
+from typing import TYPE_CHECKING, LiteralString
 
 from asyncer import asyncify
 from result import Err, Ok
@@ -12,25 +12,22 @@
 
     from result import Result
 
-_K = TypeVar("_K", bound=LiteralString)
-_PLUGIN = TypeVar("_PLUGIN", bound=IUrlExtractorPlugin)
 
-
-class UrlExtractor(Generic[_K, _PLUGIN]):
+class UrlExtractor[K: LiteralString, PLUGIN: IUrlExtractorPlugin]:
     """A class for extracting URLs using plugins."""
 
-    def __init__(self, plugins: dict[_K, _PLUGIN], /) -> None:
+    def __init__(self, plugins: dict[K, PLUGIN], /) -> None:
         self.__plugins = {k: InternalPlugin(k, p, index=i) for i, (k, p) in enumerate(plugins.items())}
         self.__logger = get_my_logger(self.__class__.__name__)
 
-    def find_all(self, string: str) -> "dict[_K, set[Match[str]] | None]":
+    def find_all(self, string: str) -> "dict[K, set[Match[str]] | None]":
         """Find all occurrences of URLs in the given string using the registered plugins.
 
         Args:
             string `str`: The input string to search for URLs.
 
         Returns:
-            `dict[_K, set[Match[str]] | None]`: A dictionary containing the plugin keys as keys and
+            `dict[K, set[Match[str]] | None]`: A dictionary containing the plugin keys as keys and
                 a set of matches or None as values. Each set of matches represents the URLs found
                 by the corresponding plugin.
         """
@@ -39,14 +36,14 @@ def find_all(self, string: str) -> "dict[_K, set[Match[str]] | None]":
             for k, plugin in self.__plugins.items()
         }
 
-    async def find_all_async(self, string: str) -> "dict[_K, set[Match[str]] | None]":
+    async def find_all_async(self, string: str) -> "dict[K, set[Match[str]] | None]":
         """Find all occurrences of URLs in the given string using the registered plugins asynchronously.
 
         Args:
             string `str`: The input string to search for URLs.
 
         Returns:
-            `dict[_K, set[Match[str]] | None]`: A dictionary containing the plugin keys as keys and
+            `dict[K, set[Match[str]] | None]`: A dictionary containing the plugin keys as keys and
                 a set of matches or None as values. Each set of matches represents the URLs found
                 by the corresponding plugin.
         """

src/packages/url_extractor/internal/interface.py

@@ -1,12 +1,10 @@
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Generic, TypeVar
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
     from re import Match, Pattern
 
-_R = TypeVar("_R")
-
 
 class IUrlExtractorPlugin(ABC):
     """
@@ -21,26 +19,26 @@ def url_pattern(self) -> "Pattern[str] | str":
         raise NotImplementedError
 
 
-class IUrlSyncProcessor(ABC, Generic[_R]):
+class IUrlSyncProcessor[R](ABC):
     """
     Interface for URL processors.
     """
 
     @abstractmethod
-    def from_matches_sync(self, matches: "Iterable[Match[str]]") -> list[_R]:
+    def from_matches_sync(self, matches: "Iterable[Match[str]]") -> list[R]:
         """
         Extracts information from the given matches.
         """
         raise NotImplementedError
 
 
-class IUrlAsyncProcessor(ABC, Generic[_R]):
+class IUrlAsyncProcessor[R](ABC):
     """
     Interface for URL processors. For asynchronous processing.
     """
 
     @abstractmethod
-    async def from_matches_async(self, matches: "Iterable[Match[str]]") -> list[_R]:
+    async def from_matches_async(self, matches: "Iterable[Match[str]]") -> list[R]:
         """
         Extracts information from the given matches.
         """

src/utils/chunk.py

@@ -1,10 +1,8 @@
 from collections.abc import Generator, Iterable
-from typing import LiteralString, TypeVar
+from typing import LiteralString
 
-_T = TypeVar("_T")
 
-
-def chunks(iterable: list[_T], *, size: int) -> Generator[list[_T], None, None]:
+def chunks[T](iterable: list[T], *, size: int) -> Generator[list[T]]:
     """Yield successive chunks from iterable of size."""
     for i in range(0, len(iterable), size):
         yield iterable[i : i + size]
@@ -31,7 +29,7 @@ def chunk_str_iter_with_max_length(
     max_length: int,
     separator: LiteralString,
     ignore_oversize_fragment: bool = True,
-) -> Generator[str, None, None]:
+) -> Generator[str]:
     """
     Chunk the iterable of strings into strings with a maximum length.