| | 激活{siteTitle}账户 | | 亲爱的{userName}： | | 感谢您注册{siteTitle},请点击下方按钮完成账户激活。 | | 激活账户 | | 感谢您选择{siteTitle}。 |
|
| |
""", type=SettingsType.MAIL_TEMPLATE),
+ Setting(name="mail_activation_template", value=""" | | 重设{siteTitle}密码 | | 亲爱的{userName}： | | 请点击下方按钮完成密码重设。如果非你本人操作，请忽略此邮件。 | | 重设密码 | | 感谢您选择{siteTitle}。 |
|
| |
""", type=SettingsType.MAIL_TEMPLATE),
Setting(name=f"db_version_{BackendVersion}", value="installed", type=SettingsType.VERSION),
Setting(name="hot_share_num", value="10", type=SettingsType.SHARE),
Setting(name="gravatar_server", value="https://www.gravatar.com/", type=SettingsType.AVATAR),
- Setting(name="defaultTheme", value="#3f51b5", type=SettingsType.BASIC),
- Setting(name="themes", value=ThemeResponse().model_dump_json(), type=SettingsType.BASIC),
Setting(name="aria2_token", value="", type=SettingsType.ARIA2),
Setting(name="aria2_rpcurl", value="", type=SettingsType.ARIA2),
Setting(name="aria2_temp_path", value="", type=SettingsType.ARIA2),
@@ -327,4 +313,32 @@ async def init_default_policy() -> None:
storage_service = LocalStorageService(local_policy)
await storage_service.ensure_base_directory()
- log.info('已创建默认本地存储策略，存储目录：./data')
\ No newline at end of file
+ log.info('已创建默认本地存储策略，存储目录：./data')
+
+
+async def init_default_theme_presets() -> None:
+ from .color import ChromaticColor, NeutralColor
+ from .theme_preset import ThemePreset
+ from .database_connection import DatabaseManager
+
+ log.info('初始化默认主题预设...')
+
+ async for session in DatabaseManager.get_session():
+ # 已存在预设则跳过
+ existing_count = await ThemePreset.count(session)
+ if existing_count > 0:
+ return
+
+ default_preset = ThemePreset(
+ name="默认主题",
+ is_default=True,
+ primary=ChromaticColor.GREEN,
+ secondary=ChromaticColor.BLUE,
+ success=ChromaticColor.GREEN,
+ info=ChromaticColor.BLUE,
+ warning=ChromaticColor.YELLOW,
+ error=ChromaticColor.RED,
+ neutral=NeutralColor.ZINC,
+ )
+ await default_preset.save(session)
+ log.info('已创建默认主题预设')
\ No newline at end of file
diff --git a/sqlmodels/object.py b/sqlmodels/object.py
index 114a800..5752596 100644
--- a/sqlmodels/object.py
+++ b/sqlmodels/object.py
@@ -5,7 +5,7 @@ from uuid import UUID
from enum import StrEnum
from sqlalchemy import BigInteger
-from sqlmodel import Field, Relationship, UniqueConstraint, CheckConstraint, Index, text
+from sqlmodel import Field, Relationship, CheckConstraint, Index, text
from .base import SQLModelBase
from .mixin import UUIDTableBaseMixin
@@ -195,8 +195,13 @@ class Object(ObjectBase, UUIDTableBaseMixin):
"""
__table_args__ = (
- # 同一父目录下名称唯一（包括 parent_id 为 NULL 的情况）
- UniqueConstraint("owner_id", "parent_id", "name", name="uq_object_parent_name"),
+ # 同一父目录下名称唯一（仅对未删除记录生效）
+ Index(
+ "uq_object_parent_name_active",
+ "owner_id", "parent_id", "name",
+ unique=True,
+ postgresql_where=text("deleted_at IS NULL"),
+ ),
# 名称不能包含斜杠（根目录 parent_id IS NULL 除外，因为根目录 name="/"）
CheckConstraint(
"parent_id IS NULL OR (name NOT LIKE '%/%' AND name NOT LIKE '%\\%')",
@@ -207,6 +212,8 @@ class Object(ObjectBase, UUIDTableBaseMixin):
Index("ix_object_parent_updated", "parent_id", "updated_at"),
Index("ix_object_owner_type", "owner_id", "type"),
Index("ix_object_owner_size", "owner_id", "size"),
+ # 回收站查询索引
+ Index("ix_object_owner_deleted", "owner_id", "deleted_at"),
)
# ==================== 基础字段 ====================
@@ -280,6 +287,18 @@ class Object(ObjectBase, UUIDTableBaseMixin):
ban_reason: str | None = Field(default=None, max_length=500)
"""封禁原因"""
+ # ==================== 软删除相关字段 ====================
+
+ deleted_at: datetime | None = Field(default=None, index=True)
+ """软删除时间戳，NULL 表示未删除"""
+
+ deleted_original_parent_id: UUID | None = Field(
+ default=None,
+ foreign_key="object.id",
+ ondelete="SET NULL",
+ )
+ """软删除前的原始父目录UUID（恢复时用于还原位置）"""
+
# ==================== 关系 ====================
owner: "User" = Relationship(
@@ -299,13 +318,19 @@ class Object(ObjectBase, UUIDTableBaseMixin):
# 自引用关系
parent: "Object" = Relationship(
back_populates="children",
- sa_relationship_kwargs={"remote_side": "Object.id"},
+ sa_relationship_kwargs={
+ "remote_side": "Object.id",
+ "foreign_keys": "[Object.parent_id]",
+ },
)
"""父目录"""
children: list["Object"] = Relationship(
back_populates="parent",
- sa_relationship_kwargs={"cascade": "all, delete-orphan"}
+ sa_relationship_kwargs={
+ "cascade": "all, delete-orphan",
+ "foreign_keys": "[Object.parent_id]",
+ },
)
"""子对象（文件和子目录）"""
@@ -367,7 +392,7 @@ class Object(ObjectBase, UUIDTableBaseMixin):
"""
return await cls.get(
session,
- (cls.owner_id == user_id) & (cls.parent_id == None)
+ (cls.owner_id == user_id) & (cls.parent_id == None) & (cls.deleted_at == None)
)
@classmethod
@@ -416,7 +441,8 @@ class Object(ObjectBase, UUIDTableBaseMixin):
session,
(cls.owner_id == user_id) &
(cls.parent_id == current.id) &
- (cls.name == part)
+ (cls.name == part) &
+ (cls.deleted_at == None)
)
return current
@@ -424,7 +450,23 @@ class Object(ObjectBase, UUIDTableBaseMixin):
@classmethod
async def get_children(cls, session, user_id: UUID, parent_id: UUID) -> list["Object"]:
"""
- 获取目录下的所有子对象
+ 获取目录下的所有子对象（不包含已软删除的）
+
+ :param session: 数据库会话
+ :param user_id: 用户UUID
+ :param parent_id: 父目录UUID
+ :return: 子对象列表
+ """
+ return await cls.get(
+ session,
+ (cls.owner_id == user_id) & (cls.parent_id == parent_id) & (cls.deleted_at == None),
+ fetch_mode="all"
+ )
+
+ @classmethod
+ async def get_all_children(cls, session, user_id: UUID, parent_id: UUID) -> list["Object"]:
+ """
+ 获取目录下的所有子对象（包含已软删除的，用于永久删除场景）
:param session: 数据库会话
:param user_id: 用户UUID
@@ -437,6 +479,24 @@ class Object(ObjectBase, UUIDTableBaseMixin):
fetch_mode="all"
)
+ @classmethod
+ async def get_trash_items(cls, session, user_id: UUID) -> list["Object"]:
+ """
+ 获取用户回收站中的顶层对象
+
+ 只返回被直接软删除的顶层对象（deleted_at 非 NULL），
+ 不返回其子对象（子对象的 deleted_at 为 NULL，通过 parent 关系间接处于回收站中）。
+
+ :param session: 数据库会话
+ :param user_id: 用户UUID
+ :return: 回收站顶层对象列表
+ """
+ return await cls.get(
+ session,
+ (cls.owner_id == user_id) & (cls.deleted_at != None),
+ fetch_mode="all"
+ )
+
@classmethod
async def resolve_uri(
cls,
@@ -805,3 +865,41 @@ class AdminFileListResponse(SQLModelBase):
total: int = 0
"""总数"""
+
+
+# ==================== 回收站相关 DTO ====================
+
+class TrashItemResponse(SQLModelBase):
+ """回收站对象响应 DTO"""
+
+ id: UUID
+ """对象UUID"""
+
+ name: str
+ """对象名称"""
+
+ type: ObjectType
+ """对象类型"""
+
+ size: int
+ """文件大小（字节）"""
+
+ deleted_at: datetime
+ """删除时间"""
+
+ original_parent_id: UUID | None
+ """原始父目录UUID"""
+
+
+class TrashRestoreRequest(SQLModelBase):
+ """恢复对象请求 DTO"""
+
+ ids: list[UUID]
+ """待恢复对象UUID列表"""
+
+
+class TrashDeleteRequest(SQLModelBase):
+ """永久删除对象请求 DTO"""
+
+ ids: list[UUID]
+ """待永久删除对象UUID列表"""
diff --git a/sqlmodels/report.py b/sqlmodels/report.py
index f7a9b2e..c928bdf 100644
--- a/sqlmodels/report.py
+++ b/sqlmodels/report.py
@@ -1,5 +1,6 @@
from enum import StrEnum
from typing import TYPE_CHECKING
+from uuid import UUID
from sqlmodel import Field, Relationship
@@ -24,7 +25,7 @@ class Report(SQLModelBase, TableBaseMixin):
description: str | None = Field(default=None, max_length=255, description="补充描述")
# 外键
- share_id: int = Field(
+ share_id: UUID = Field(
foreign_key="share.id",
index=True,
ondelete="CASCADE"
diff --git a/sqlmodels/share.py b/sqlmodels/share.py
index a3cd946..8e757be 100644
--- a/sqlmodels/share.py
+++ b/sqlmodels/share.py
@@ -6,7 +6,9 @@ from uuid import UUID
from sqlmodel import Field, Relationship, text, UniqueConstraint, Index
from .base import SQLModelBase
-from .mixin import TableBaseMixin
+from .model_base import ResponseBase
+from .mixin import UUIDTableBaseMixin
+from .object import ObjectType
if TYPE_CHECKING:
from .user import User
@@ -34,13 +36,13 @@ class ShareBase(SQLModelBase):
preview_enabled: bool = True
"""是否允许预览"""
- score: int = 0
+ score: int = Field(default=0, ge=0)
"""兑换此分享所需的积分"""
# ==================== 数据库模型 ====================
-class Share(SQLModelBase, TableBaseMixin):
+class Share(SQLModelBase, UUIDTableBaseMixin):
"""分享模型"""
__table_args__ = (
@@ -81,7 +83,7 @@ class Share(SQLModelBase, TableBaseMixin):
source_name: str | None = Field(default=None, max_length=255)
"""源名称（冗余字段，便于展示）"""
- score: int = Field(default=0, sa_column_kwargs={"server_default": "0"})
+ score: int = Field(default=0, ge=0)
"""兑换此分享所需的积分"""
# 外键
@@ -119,10 +121,17 @@ class ShareCreateRequest(ShareBase):
pass
-class ShareResponse(SQLModelBase):
- """分享响应 DTO"""
+class CreateShareResponse(ResponseBase):
+ """创建分享响应 DTO"""
- id: int
+ share_id: UUID
+ """新创建的分享记录 ID"""
+
+
+class ShareResponse(SQLModelBase):
+ """查看分享响应 DTO"""
+
+ id: UUID
"""分享ID"""
code: str
@@ -162,10 +171,67 @@ class ShareResponse(SQLModelBase):
"""是否有密码"""
+class ShareOwnerInfo(SQLModelBase):
+ """分享者公开信息 DTO"""
+
+ nickname: str | None
+ """昵称"""
+
+ avatar: str
+ """头像"""
+
+
+class ShareObjectItem(SQLModelBase):
+ """分享中的文件/文件夹信息 DTO"""
+
+ id: UUID
+ """对象UUID"""
+
+ name: str
+ """名称"""
+
+ type: ObjectType
+ """类型：file 或 folder"""
+
+ size: int
+ """文件大小（字节），目录为 0"""
+
+ created_at: datetime
+ """创建时间"""
+
+ updated_at: datetime
+ """修改时间"""
+
+
+class ShareDetailResponse(SQLModelBase):
+ """获取分享详情响应 DTO（面向访客，隐藏内部统计数据）"""
+
+ expires: datetime | None
+ """过期时间"""
+
+ preview_enabled: bool
+ """是否允许预览"""
+
+ score: int
+ """积分"""
+
+ created_at: datetime
+ """创建时间"""
+
+ owner: ShareOwnerInfo
+ """分享者信息"""
+
+ object: ShareObjectItem
+ """分享的根对象"""
+
+ children: list[ShareObjectItem]
+ """子文件/文件夹列表（仅目录分享有内容）"""
+
+
class ShareListItemBase(SQLModelBase):
"""分享列表项基础字段"""
- id: int
+ id: UUID
"""分享ID"""
code: str
diff --git a/sqlmodels/theme_preset.py b/sqlmodels/theme_preset.py
new file mode 100644
index 0000000..bfec1fc
--- /dev/null
+++ b/sqlmodels/theme_preset.py
@@ -0,0 +1,117 @@
+from datetime import datetime
+from uuid import UUID
+
+from sqlmodel import Field
+
+from .base import SQLModelBase
+from .color import ChromaticColor, NeutralColor, ThemeColorsBase
+from .mixin import UUIDTableBaseMixin
+
+
+class ThemePresetBase(SQLModelBase):
+ """主题预设基础字段"""
+
+ name: str = Field(max_length=100)
+ """预设名称"""
+
+ is_default: bool = False
+ """是否为默认预设"""
+
+ primary: ChromaticColor
+ """主色调"""
+
+ secondary: ChromaticColor
+ """辅助色"""
+
+ success: ChromaticColor
+ """成功色"""
+
+ info: ChromaticColor
+ """信息色"""
+
+ warning: ChromaticColor
+ """警告色"""
+
+ error: ChromaticColor
+ """错误色"""
+
+ neutral: NeutralColor
+ """中性色"""
+
+
+class ThemePreset(ThemePresetBase, UUIDTableBaseMixin):
+ """主题预设表"""
+
+ name: str = Field(max_length=100, unique=True)
+ """预设名称（唯一约束）"""
+
+
+# ==================== DTO ====================
+
+class ThemePresetCreateRequest(SQLModelBase):
+ """创建主题预设请求 DTO"""
+
+ name: str = Field(max_length=100)
+ """预设名称"""
+
+ colors: ThemeColorsBase
+ """颜色配置"""
+
+
+class ThemePresetUpdateRequest(SQLModelBase):
+ """更新主题预设请求 DTO"""
+
+ name: str | None = Field(default=None, max_length=100)
+ """预设名称（可选）"""
+
+ colors: ThemeColorsBase | None = None
+ """颜色配置（可选）"""
+
+
+class ThemePresetResponse(SQLModelBase):
+ """主题预设响应 DTO"""
+
+ id: UUID
+ """预设UUID"""
+
+ name: str
+ """预设名称"""
+
+ is_default: bool
+ """是否为默认预设"""
+
+ colors: ThemeColorsBase
+ """颜色配置"""
+
+ created_at: datetime
+ """创建时间"""
+
+ updated_at: datetime
+ """更新时间"""
+
+ @classmethod
+ def from_preset(cls, preset: ThemePreset) -> 'ThemePresetResponse':
+ """从数据库模型转换为响应 DTO（平铺列 → 嵌套 colors 对象）"""
+ return cls(
+ id=preset.id,
+ name=preset.name,
+ is_default=preset.is_default,
+ colors=ThemeColorsBase(
+ primary=preset.primary,
+ secondary=preset.secondary,
+ success=preset.success,
+ info=preset.info,
+ warning=preset.warning,
+ error=preset.error,
+ neutral=preset.neutral,
+ ),
+ created_at=preset.created_at,
+ updated_at=preset.updated_at,
+ )
+
+
+class ThemePresetListResponse(SQLModelBase):
+ """主题预设列表响应 DTO"""
+
+ themes: list[ThemePresetResponse]
+ """主题预设列表"""
diff --git a/sqlmodels/user.py b/sqlmodels/user.py
index b5210fc..1dade14 100644
--- a/sqlmodels/user.py
+++ b/sqlmodels/user.py
@@ -10,6 +10,7 @@ from sqlmodel.ext.asyncio.session import AsyncSession
from sqlmodel.main import RelationshipInfo
from .base import SQLModelBase
+from .color import ChromaticColor, NeutralColor, ThemeColorsBase
from .model_base import ResponseBase
from .mixin import UUIDTableBaseMixin, TableViewRequest, ListResponse
@@ -34,13 +35,6 @@ class AvatarType(StrEnum):
GRAVATAR = "gravatar"
FILE = "file"
-class ThemeType(StrEnum):
- """主题类型枚举"""
-
- LIGHT = "light"
- DARK = "dark"
- SYSTEM = "system"
-
class UserStatus(StrEnum):
"""用户状态枚举"""
@@ -99,7 +93,7 @@ class LoginRequest(SQLModelBase):
captcha: str | None = None
"""验证码"""
- two_fa_code: int | None = Field(default=None, min_length=6, max_length=6)
+ two_fa_code: str | None = Field(default=None, min_length=6, max_length=6)
"""两步验证代码"""
@@ -297,6 +291,29 @@ class UserSettingResponse(SQLModelBase):
two_factor: bool = False
"""是否启用两步验证"""
+ theme_preset_id: UUID | None = None
+ """选用的主题预设UUID"""
+
+ theme_colors: ThemeColorsBase | None = None
+ """当前生效的颜色配置"""
+
+
+class UserThemeUpdateRequest(SQLModelBase):
+ """用户更新主题请求 DTO"""
+
+ theme_preset_id: UUID | None = None
+ """主题预设UUID"""
+
+ theme_colors: ThemeColorsBase | None = None
+ """颜色配置"""
+
+
+class UserTwoFactorResponse(SQLModelBase):
+ """用户两步验证信息 DTO"""
+
+ two_factor_key: str
+ """两步验证密钥"""
+
# ==================== 管理员用户管理 DTO ====================
@@ -428,8 +445,31 @@ class User(UserBase, UUIDTableBaseMixin):
"""当前用户组过期时间"""
# Option 相关字段
- # theme: ThemeType = Field(default=ThemeType.SYSTEM)
- # """主题类型: light/dark/system"""
+ theme_preset_id: UUID | None = Field(
+ default=None, foreign_key="themepreset.id", ondelete="SET NULL"
+ )
+ """选用的主题预设UUID"""
+
+ color_primary: ChromaticColor | None = None
+ """颜色快照：主色调"""
+
+ color_secondary: ChromaticColor | None = None
+ """颜色快照：辅助色"""
+
+ color_success: ChromaticColor | None = None
+ """颜色快照：成功色"""
+
+ color_info: ChromaticColor | None = None
+ """颜色快照：信息色"""
+
+ color_warning: ChromaticColor | None = None
+ """颜色快照：警告色"""
+
+ color_error: ChromaticColor | None = None
+ """颜色快照：错误色"""
+
+ color_neutral: NeutralColor | None = None
+ """颜色快照：中性色"""
language: str = Field(default="zh-CN", max_length=5)
"""语言偏好"""
diff --git a/utils/http/http_exceptions.py b/utils/http/http_exceptions.py
index e76f83a..d7a594f 100644
--- a/utils/http/http_exceptions.py
+++ b/utils/http/http_exceptions.py
@@ -4,64 +4,64 @@ from fastapi import HTTPException, status
# --- 400 ---
-def ensure_request_param(to_check: Any, *args, **kwargs) -> None:
+def ensure_request_param(to_check: Any, detail: str | None = None) -> None:
"""
Ensures a parameter exists. If not, raises a 400 Bad Request.
This function returns None if the check passes.
"""
if not to_check:
- raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=detail)
-def raise_bad_request(*args, **kwargs) -> NoReturn:
+def raise_bad_request(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 400 Bad Request exception."""
- raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=detail)
-def raise_unauthorized(detail: str | None = None, *args, **kwargs) -> NoReturn:
+def raise_unauthorized(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 401 Unauthorized exception."""
- raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=detail)
-def raise_insufficient_quota(detail: str | None = None, *args, **kwargs) -> NoReturn:
+def raise_insufficient_quota(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 402 Payment Required exception."""
- raise HTTPException(status_code=status.HTTP_402_PAYMENT_REQUIRED, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_402_PAYMENT_REQUIRED, detail=detail)
-def raise_forbidden(detail: str | None = None, *args, **kwargs) -> NoReturn:
+def raise_forbidden(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 403 Forbidden exception."""
- raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=detail)
-def raise_banned(detail: str = "此文件已被管理员封禁，仅允许删除操作", *args, **kwargs) -> NoReturn:
+def raise_banned(detail: str = "此文件已被管理员封禁，仅允许删除操作") -> NoReturn:
"""Raises an HTTP 403 Forbidden exception for banned objects."""
- raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=detail)
-def raise_not_found(detail: str | None = None, *args, **kwargs) -> NoReturn:
+def raise_not_found(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 404 Not Found exception."""
- raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=detail)
-def raise_conflict(*args, **kwargs) -> NoReturn:
+def raise_conflict(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 409 Conflict exception."""
- raise HTTPException(status_code=status.HTTP_409_CONFLICT, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=detail)
-def raise_precondition_required(*args, **kwargs) -> NoReturn:
+def raise_precondition_required(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 428 Precondition required exception."""
- raise HTTPException(status_code=status.HTTP_428_PRECONDITION_REQUIRED, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_428_PRECONDITION_REQUIRED, detail=detail)
-def raise_too_many_requests(*args, **kwargs) -> NoReturn:
+def raise_too_many_requests(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 429 Too Many Requests exception."""
- raise HTTPException(status_code=status.HTTP_429_TOO_MANY_REQUESTS, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_429_TOO_MANY_REQUESTS, detail=detail)
# --- 500 ---
-def raise_internal_error(detail: str = "服务器出现故障，请稍后再试或联系管理员", *args, **kwargs) -> NoReturn:
+def raise_internal_error(detail: str = "服务器出现故障，请稍后再试或联系管理员") -> NoReturn:
"""Raises an HTTP 500 Internal Server Error exception."""
- raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=detail)
-def raise_not_implemented(detail: str = "尚未支持这种方法", *args, **kwargs) -> NoReturn:
+def raise_not_implemented(detail: str = "尚未支持这种方法") -> NoReturn:
"""Raises an HTTP 501 Not Implemented exception."""
- raise HTTPException(status_code=status.HTTP_501_NOT_IMPLEMENTED, detail=detail, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_501_NOT_IMPLEMENTED, detail=detail)
-def raise_service_unavailable(*args, **kwargs) -> NoReturn:
+def raise_service_unavailable(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 503 Service Unavailable exception."""
- raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=detail)
-def raise_gateway_timeout(*args, **kwargs) -> NoReturn:
+def raise_gateway_timeout(detail: str | None = None) -> NoReturn:
"""Raises an HTTP 504 Gateway Timeout exception."""
- raise HTTPException(status_code=status.HTTP_504_GATEWAY_TIMEOUT, *args, **kwargs)
+ raise HTTPException(status_code=status.HTTP_504_GATEWAY_TIMEOUT, detail=detail)
diff --git a/utils/password/pwd.py b/utils/password/pwd.py
index 9b5a33d..a428264 100644
--- a/utils/password/pwd.py
+++ b/utils/password/pwd.py
@@ -3,13 +3,13 @@ from typing import Literal
from loguru import logger
from argon2 import PasswordHasher
-from argon2.exceptions import VerifyMismatchError
+from argon2.exceptions import VerifyMismatchError, VerificationError
from enum import StrEnum
import pyotp
from itsdangerous import URLSafeTimedSerializer
from pydantic import BaseModel, Field
-from utils.JWT import SECRET_KEY
+from utils import JWT
from utils.conf import appmeta
# FIRST RECOMMENDED option per RFC 9106.
@@ -57,7 +57,7 @@ class TwoFactorResponse(TwoFactorBase):
class TwoFactorVerifyRequest(TwoFactorBase):
"""两步验证-验证请求 DTO"""
- code: int = Field(..., ge=100000, le=999999)
+ code: str = Field(..., min_length=6, max_length=6, pattern=r'^\d{6}$')
"""6 位验证码"""
class Password:
@@ -126,6 +126,9 @@ class Password:
return PasswordStatus.VALID
except VerifyMismatchError:
return PasswordStatus.INVALID
+ except VerificationError:
+ logger.warning("密码哈希格式无效，无法解码，可能需要删库重建。")
+ return PasswordStatus.INVALID
@staticmethod
async def generate_totp(
@@ -138,7 +141,7 @@ class Password:
:return: 包含 TOTP 密钥和 URI 的元组
"""
- serializer = URLSafeTimedSerializer(SECRET_KEY)
+ serializer = URLSafeTimedSerializer(JWT.SECRET_KEY)
secret = pyotp.random_base32()
@@ -159,7 +162,7 @@ class Password:
@staticmethod
def verify_totp(
secret: str,
- code: int,
+ code: str,
*args, **kwargs
) -> PasswordStatus:
"""
@@ -173,7 +176,7 @@ class Password:
:return: 验证是否成功
"""
totp = pyotp.TOTP(secret)
- if totp.verify(otp=str(code), *args, **kwargs):
+ if totp.verify(otp=code, *args, **kwargs):
return PasswordStatus.VALID
else:
return PasswordStatus.INVALID
\ No newline at end of file
diff --git a/uv.lock b/uv.lock
index ca54b67..21da638 100644
--- a/uv.lock
+++ b/uv.lock
@@ -245,6 +245,18 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/2c/fc/1d7b80d0eb7b714984ce40efc78859c022cd930e402f599d8ca9e39c78a4/cachetools-6.2.4-py3-none-any.whl", hash = "sha256:69a7a52634fed8b8bf6e24a050fb60bff1c9bd8f6d24572b99c32d4e71e62a51", size = 11551, upload-time = "2025-12-15T18:24:52.332Z" },
]
+[[package]]
+name = "captcha"
+version = "0.7.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+ { name = "pillow" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b4/65/8e186bb798f33ba390eab897c995b0fcee92bc030e0f40cb8ea01f34dd07/captcha-0.7.1.tar.gz", hash = "sha256:a1b462bcc633a64d8db5efa7754548a877c698d98f87716c620a707364cabd6b", size = 226561, upload-time = "2025-03-01T05:00:13.395Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/da/ff/3f0982ecd37c2d6a7266c22e7ea2e47d0773fe449984184c5316459d2776/captcha-0.7.1-py3-none-any.whl", hash = "sha256:8b73b5aba841ad1e5bdb856205bf5f09560b728ee890eb9dae42901219c8c599", size = 147606, upload-time = "2025-03-01T05:00:10.433Z" },
+]
+
[[package]]
name = "cbor2"
version = "5.7.1"
@@ -473,6 +485,7 @@ dependencies = [
{ name = "argon2-cffi" },
{ name = "asyncpg" },
{ name = "cachetools" },
+ { name = "captcha" },
{ name = "fastapi", extra = ["standard"] },
{ name = "httpx" },
{ name = "itsdangerous" },
@@ -500,6 +513,7 @@ requires-dist = [
{ name = "argon2-cffi", specifier = ">=25.1.0" },
{ name = "asyncpg", specifier = ">=0.31.0" },
{ name = "cachetools", specifier = ">=6.2.4" },
+ { name = "captcha", specifier = ">=0.7.1" },
{ name = "fastapi", extras = ["standard"], specifier = ">=0.122.0" },
{ name = "httpx", specifier = ">=0.27.0" },
{ name = "itsdangerous", specifier = ">=2.2.0" },
@@ -1094,6 +1108,64 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" },
]
+[[package]]
+name = "pillow"
+version = "12.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1f/42/5c74462b4fd957fcd7b13b04fb3205ff8349236ea74c7c375766d6c82288/pillow-12.1.1.tar.gz", hash = "sha256:9ad8fa5937ab05218e2b6a4cff30295ad35afd2f83ac592e68c0d871bb0fdbc4", size = 46980264, upload-time = "2026-02-11T04:23:07.146Z" }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/d5/11/6db24d4bd7685583caeae54b7009584e38da3c3d4488ed4cd25b439de486/pillow-12.1.1-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:d242e8ac078781f1de88bf823d70c1a9b3c7950a44cdf4b7c012e22ccbcd8e4e", size = 4062689, upload-time = "2026-02-11T04:21:06.804Z" },
+ { url = "https://files.pythonhosted.org/packages/33/c0/ce6d3b1fe190f0021203e0d9b5b99e57843e345f15f9ef22fcd43842fd21/pillow-12.1.1-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:02f84dfad02693676692746df05b89cf25597560db2857363a208e393429f5e9", size = 4138535, upload-time = "2026-02-11T04:21:08.452Z" },
+ { url = "https://files.pythonhosted.org/packages/a0/c6/d5eb6a4fb32a3f9c21a8c7613ec706534ea1cf9f4b3663e99f0d83f6fca8/pillow-12.1.1-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:e65498daf4b583091ccbb2556c7000abf0f3349fcd57ef7adc9a84a394ed29f6", size = 3601364, upload-time = "2026-02-11T04:21:10.194Z" },
+ { url = "https://files.pythonhosted.org/packages/14/a1/16c4b823838ba4c9c52c0e6bbda903a3fe5a1bdbf1b8eb4fff7156f3e318/pillow-12.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:6c6db3b84c87d48d0088943bf33440e0c42370b99b1c2a7989216f7b42eede60", size = 5262561, upload-time = "2026-02-11T04:21:11.742Z" },
+ { url = "https://files.pythonhosted.org/packages/bb/ad/ad9dc98ff24f485008aa5cdedaf1a219876f6f6c42a4626c08bc4e80b120/pillow-12.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8b7e5304e34942bf62e15184219a7b5ad4ff7f3bb5cca4d984f37df1a0e1aee2", size = 4657460, upload-time = "2026-02-11T04:21:13.786Z" },
+ { url = "https://files.pythonhosted.org/packages/9e/1b/f1a4ea9a895b5732152789326202a82464d5254759fbacae4deea3069334/pillow-12.1.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:18e5bddd742a44b7e6b1e773ab5db102bd7a94c32555ba656e76d319d19c3850", size = 6232698, upload-time = "2026-02-11T04:21:15.949Z" },
+ { url = "https://files.pythonhosted.org/packages/95/f4/86f51b8745070daf21fd2e5b1fe0eb35d4db9ca26e6d58366562fb56a743/pillow-12.1.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fc44ef1f3de4f45b50ccf9136999d71abb99dca7706bc75d222ed350b9fd2289", size = 8041706, upload-time = "2026-02-11T04:21:17.723Z" },
+ { url = "https://files.pythonhosted.org/packages/29/9b/d6ecd956bb1266dd1045e995cce9b8d77759e740953a1c9aad9502a0461e/pillow-12.1.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5a8eb7ed8d4198bccbd07058416eeec51686b498e784eda166395a23eb99138e", size = 6346621, upload-time = "2026-02-11T04:21:19.547Z" },
+ { url = "https://files.pythonhosted.org/packages/71/24/538bff45bde96535d7d998c6fed1a751c75ac7c53c37c90dc2601b243893/pillow-12.1.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:47b94983da0c642de92ced1702c5b6c292a84bd3a8e1d1702ff923f183594717", size = 7038069, upload-time = "2026-02-11T04:21:21.378Z" },
+ { url = "https://files.pythonhosted.org/packages/94/0e/58cb1a6bc48f746bc4cb3adb8cabff73e2742c92b3bf7a220b7cf69b9177/pillow-12.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:518a48c2aab7ce596d3bf79d0e275661b846e86e4d0e7dec34712c30fe07f02a", size = 6460040, upload-time = "2026-02-11T04:21:23.148Z" },
+ { url = "https://files.pythonhosted.org/packages/6c/57/9045cb3ff11eeb6c1adce3b2d60d7d299d7b273a2e6c8381a524abfdc474/pillow-12.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a550ae29b95c6dc13cf69e2c9dc5747f814c54eeb2e32d683e5e93af56caa029", size = 7164523, upload-time = "2026-02-11T04:21:25.01Z" },
+ { url = "https://files.pythonhosted.org/packages/73/f2/9be9cb99f2175f0d4dbadd6616ce1bf068ee54a28277ea1bf1fbf729c250/pillow-12.1.1-cp313-cp313-win32.whl", hash = "sha256:a003d7422449f6d1e3a34e3dd4110c22148336918ddbfc6a32581cd54b2e0b2b", size = 6332552, upload-time = "2026-02-11T04:21:27.238Z" },
+ { url = "https://files.pythonhosted.org/packages/3f/eb/b0834ad8b583d7d9d42b80becff092082a1c3c156bb582590fcc973f1c7c/pillow-12.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:344cf1e3dab3be4b1fa08e449323d98a2a3f819ad20f4b22e77a0ede31f0faa1", size = 7040108, upload-time = "2026-02-11T04:21:29.462Z" },
+ { url = "https://files.pythonhosted.org/packages/d5/7d/fc09634e2aabdd0feabaff4a32f4a7d97789223e7c2042fd805ea4b4d2c2/pillow-12.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:5c0dd1636633e7e6a0afe7bf6a51a14992b7f8e60de5789018ebbdfae55b040a", size = 2453712, upload-time = "2026-02-11T04:21:31.072Z" },
+ { url = "https://files.pythonhosted.org/packages/19/2a/b9d62794fc8a0dd14c1943df68347badbd5511103e0d04c035ffe5cf2255/pillow-12.1.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:0330d233c1a0ead844fc097a7d16c0abff4c12e856c0b325f231820fee1f39da", size = 5264880, upload-time = "2026-02-11T04:21:32.865Z" },
+ { url = "https://files.pythonhosted.org/packages/26/9d/e03d857d1347fa5ed9247e123fcd2a97b6220e15e9cb73ca0a8d91702c6e/pillow-12.1.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:5dae5f21afb91322f2ff791895ddd8889e5e947ff59f71b46041c8ce6db790bc", size = 4660616, upload-time = "2026-02-11T04:21:34.97Z" },
+ { url = "https://files.pythonhosted.org/packages/f7/ec/8a6d22afd02570d30954e043f09c32772bfe143ba9285e2fdb11284952cd/pillow-12.1.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2e0c664be47252947d870ac0d327fea7e63985a08794758aa8af5b6cb6ec0c9c", size = 6269008, upload-time = "2026-02-11T04:21:36.623Z" },
+ { url = "https://files.pythonhosted.org/packages/3d/1d/6d875422c9f28a4a361f495a5f68d9de4a66941dc2c619103ca335fa6446/pillow-12.1.1-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:691ab2ac363b8217f7d31b3497108fb1f50faab2f75dfb03284ec2f217e87bf8", size = 8073226, upload-time = "2026-02-11T04:21:38.585Z" },
+ { url = "https://files.pythonhosted.org/packages/a1/cd/134b0b6ee5eda6dc09e25e24b40fdafe11a520bc725c1d0bbaa5e00bf95b/pillow-12.1.1-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e9e8064fb1cc019296958595f6db671fba95209e3ceb0c4734c9baf97de04b20", size = 6380136, upload-time = "2026-02-11T04:21:40.562Z" },
+ { url = "https://files.pythonhosted.org/packages/7a/a9/7628f013f18f001c1b98d8fffe3452f306a70dc6aba7d931019e0492f45e/pillow-12.1.1-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:472a8d7ded663e6162dafdf20015c486a7009483ca671cece7a9279b512fcb13", size = 7067129, upload-time = "2026-02-11T04:21:42.521Z" },
+ { url = "https://files.pythonhosted.org/packages/1e/f8/66ab30a2193b277785601e82ee2d49f68ea575d9637e5e234faaa98efa4c/pillow-12.1.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:89b54027a766529136a06cfebeecb3a04900397a3590fd252160b888479517bf", size = 6491807, upload-time = "2026-02-11T04:21:44.22Z" },
+ { url = "https://files.pythonhosted.org/packages/da/0b/a877a6627dc8318fdb84e357c5e1a758c0941ab1ddffdafd231983788579/pillow-12.1.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:86172b0831b82ce4f7877f280055892b31179e1576aa00d0df3bb1bbf8c3e524", size = 7190954, upload-time = "2026-02-11T04:21:46.114Z" },
+ { url = "https://files.pythonhosted.org/packages/83/43/6f732ff85743cf746b1361b91665d9f5155e1483817f693f8d57ea93147f/pillow-12.1.1-cp313-cp313t-win32.whl", hash = "sha256:44ce27545b6efcf0fdbdceb31c9a5bdea9333e664cda58a7e674bb74608b3986", size = 6336441, upload-time = "2026-02-11T04:21:48.22Z" },
+ { url = "https://files.pythonhosted.org/packages/3b/44/e865ef3986611bb75bfabdf94a590016ea327833f434558801122979cd0e/pillow-12.1.1-cp313-cp313t-win_amd64.whl", hash = "sha256:a285e3eb7a5a45a2ff504e31f4a8d1b12ef62e84e5411c6804a42197c1cf586c", size = 7045383, upload-time = "2026-02-11T04:21:50.015Z" },
+ { url = "https://files.pythonhosted.org/packages/a8/c6/f4fb24268d0c6908b9f04143697ea18b0379490cb74ba9e8d41b898bd005/pillow-12.1.1-cp313-cp313t-win_arm64.whl", hash = "sha256:cc7d296b5ea4d29e6570dabeaed58d31c3fea35a633a69679fb03d7664f43fb3", size = 2456104, upload-time = "2026-02-11T04:21:51.633Z" },
+ { url = "https://files.pythonhosted.org/packages/03/d0/bebb3ffbf31c5a8e97241476c4cf8b9828954693ce6744b4a2326af3e16b/pillow-12.1.1-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:417423db963cb4be8bac3fc1204fe61610f6abeed1580a7a2cbb2fbda20f12af", size = 4062652, upload-time = "2026-02-11T04:21:53.19Z" },
+ { url = "https://files.pythonhosted.org/packages/2d/c0/0e16fb0addda4851445c28f8350d8c512f09de27bbb0d6d0bbf8b6709605/pillow-12.1.1-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:b957b71c6b2387610f556a7eb0828afbe40b4a98036fc0d2acfa5a44a0c2036f", size = 4138823, upload-time = "2026-02-11T04:22:03.088Z" },
+ { url = "https://files.pythonhosted.org/packages/6b/fb/6170ec655d6f6bb6630a013dd7cf7bc218423d7b5fa9071bf63dc32175ae/pillow-12.1.1-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:097690ba1f2efdeb165a20469d59d8bb03c55fb6621eb2041a060ae8ea3e9642", size = 3601143, upload-time = "2026-02-11T04:22:04.909Z" },
+ { url = "https://files.pythonhosted.org/packages/59/04/dc5c3f297510ba9a6837cbb318b87dd2b8f73eb41a43cc63767f65cb599c/pillow-12.1.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2815a87ab27848db0321fb78c7f0b2c8649dee134b7f2b80c6a45c6831d75ccd", size = 5266254, upload-time = "2026-02-11T04:22:07.656Z" },
+ { url = "https://files.pythonhosted.org/packages/05/30/5db1236b0d6313f03ebf97f5e17cda9ca060f524b2fcc875149a8360b21c/pillow-12.1.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f7ed2c6543bad5a7d5530eb9e78c53132f93dfa44a28492db88b41cdab885202", size = 4657499, upload-time = "2026-02-11T04:22:09.613Z" },
+ { url = "https://files.pythonhosted.org/packages/6f/18/008d2ca0eb612e81968e8be0bbae5051efba24d52debf930126d7eaacbba/pillow-12.1.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:652a2c9ccfb556235b2b501a3a7cf3742148cd22e04b5625c5fe057ea3e3191f", size = 6232137, upload-time = "2026-02-11T04:22:11.434Z" },
+ { url = "https://files.pythonhosted.org/packages/70/f1/f14d5b8eeb4b2cd62b9f9f847eb6605f103df89ef619ac68f92f748614ea/pillow-12.1.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d6e4571eedf43af33d0fc233a382a76e849badbccdf1ac438841308652a08e1f", size = 8042721, upload-time = "2026-02-11T04:22:13.321Z" },
+ { url = "https://files.pythonhosted.org/packages/5a/d6/17824509146e4babbdabf04d8171491fa9d776f7061ff6e727522df9bd03/pillow-12.1.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b574c51cf7d5d62e9be37ba446224b59a2da26dc4c1bb2ecbe936a4fb1a7cb7f", size = 6347798, upload-time = "2026-02-11T04:22:15.449Z" },
+ { url = "https://files.pythonhosted.org/packages/d1/ee/c85a38a9ab92037a75615aba572c85ea51e605265036e00c5b67dfafbfe2/pillow-12.1.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a37691702ed687799de29a518d63d4682d9016932db66d4e90c345831b02fb4e", size = 7039315, upload-time = "2026-02-11T04:22:17.24Z" },
+ { url = "https://files.pythonhosted.org/packages/ec/f3/bc8ccc6e08a148290d7523bde4d9a0d6c981db34631390dc6e6ec34cacf6/pillow-12.1.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:f95c00d5d6700b2b890479664a06e754974848afaae5e21beb4d83c106923fd0", size = 6462360, upload-time = "2026-02-11T04:22:19.111Z" },
+ { url = "https://files.pythonhosted.org/packages/f6/ab/69a42656adb1d0665ab051eec58a41f169ad295cf81ad45406963105408f/pillow-12.1.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:559b38da23606e68681337ad74622c4dbba02254fc9cb4488a305dd5975c7eeb", size = 7165438, upload-time = "2026-02-11T04:22:21.041Z" },
+ { url = "https://files.pythonhosted.org/packages/02/46/81f7aa8941873f0f01d4b55cc543b0a3d03ec2ee30d617a0448bf6bd6dec/pillow-12.1.1-cp314-cp314-win32.whl", hash = "sha256:03edcc34d688572014ff223c125a3f77fb08091e4607e7745002fc214070b35f", size = 6431503, upload-time = "2026-02-11T04:22:22.833Z" },
+ { url = "https://files.pythonhosted.org/packages/40/72/4c245f7d1044b67affc7f134a09ea619d4895333d35322b775b928180044/pillow-12.1.1-cp314-cp314-win_amd64.whl", hash = "sha256:50480dcd74fa63b8e78235957d302d98d98d82ccbfac4c7e12108ba9ecbdba15", size = 7176748, upload-time = "2026-02-11T04:22:24.64Z" },
+ { url = "https://files.pythonhosted.org/packages/e4/ad/8a87bdbe038c5c698736e3348af5c2194ffb872ea52f11894c95f9305435/pillow-12.1.1-cp314-cp314-win_arm64.whl", hash = "sha256:5cb1785d97b0c3d1d1a16bc1d710c4a0049daefc4935f3a8f31f827f4d3d2e7f", size = 2544314, upload-time = "2026-02-11T04:22:26.685Z" },
+ { url = "https://files.pythonhosted.org/packages/6c/9d/efd18493f9de13b87ede7c47e69184b9e859e4427225ea962e32e56a49bc/pillow-12.1.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:1f90cff8aa76835cba5769f0b3121a22bd4eb9e6884cfe338216e557a9a548b8", size = 5268612, upload-time = "2026-02-11T04:22:29.884Z" },
+ { url = "https://files.pythonhosted.org/packages/f8/f1/4f42eb2b388eb2ffc660dcb7f7b556c1015c53ebd5f7f754965ef997585b/pillow-12.1.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1f1be78ce9466a7ee64bfda57bdba0f7cc499d9794d518b854816c41bf0aa4e9", size = 4660567, upload-time = "2026-02-11T04:22:31.799Z" },
+ { url = "https://files.pythonhosted.org/packages/01/54/df6ef130fa43e4b82e32624a7b821a2be1c5653a5fdad8469687a7db4e00/pillow-12.1.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:42fc1f4677106188ad9a55562bbade416f8b55456f522430fadab3cef7cd4e60", size = 6269951, upload-time = "2026-02-11T04:22:33.921Z" },
+ { url = "https://files.pythonhosted.org/packages/a9/48/618752d06cc44bb4aae8ce0cd4e6426871929ed7b46215638088270d9b34/pillow-12.1.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:98edb152429ab62a1818039744d8fbb3ccab98a7c29fc3d5fcef158f3f1f68b7", size = 8074769, upload-time = "2026-02-11T04:22:35.877Z" },
+ { url = "https://files.pythonhosted.org/packages/c3/bd/f1d71eb39a72fa088d938655afba3e00b38018d052752f435838961127d8/pillow-12.1.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d470ab1178551dd17fdba0fef463359c41aaa613cdcd7ff8373f54be629f9f8f", size = 6381358, upload-time = "2026-02-11T04:22:37.698Z" },
+ { url = "https://files.pythonhosted.org/packages/64/ef/c784e20b96674ed36a5af839305f55616f8b4f8aa8eeccf8531a6e312243/pillow-12.1.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6408a7b064595afcab0a49393a413732a35788f2a5092fdc6266952ed67de586", size = 7068558, upload-time = "2026-02-11T04:22:39.597Z" },
+ { url = "https://files.pythonhosted.org/packages/73/cb/8059688b74422ae61278202c4e1ad992e8a2e7375227be0a21c6b87ca8d5/pillow-12.1.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5d8c41325b382c07799a3682c1c258469ea2ff97103c53717b7893862d0c98ce", size = 6493028, upload-time = "2026-02-11T04:22:42.73Z" },
+ { url = "https://files.pythonhosted.org/packages/c6/da/e3c008ed7d2dd1f905b15949325934510b9d1931e5df999bb15972756818/pillow-12.1.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:c7697918b5be27424e9ce568193efd13d925c4481dd364e43f5dff72d33e10f8", size = 7191940, upload-time = "2026-02-11T04:22:44.543Z" },
+ { url = "https://files.pythonhosted.org/packages/01/4a/9202e8d11714c1fc5951f2e1ef362f2d7fbc595e1f6717971d5dd750e969/pillow-12.1.1-cp314-cp314t-win32.whl", hash = "sha256:d2912fd8114fc5545aa3a4b5576512f64c55a03f3ebcca4c10194d593d43ea36", size = 6438736, upload-time = "2026-02-11T04:22:46.347Z" },
+ { url = "https://files.pythonhosted.org/packages/f3/ca/cbce2327eb9885476b3957b2e82eb12c866a8b16ad77392864ad601022ce/pillow-12.1.1-cp314-cp314t-win_amd64.whl", hash = "sha256:4ceb838d4bd9dab43e06c363cab2eebf63846d6a4aeaea283bbdfd8f1a8ed58b", size = 7182894, upload-time = "2026-02-11T04:22:48.114Z" },
+ { url = "https://files.pythonhosted.org/packages/ec/d2/de599c95ba0a973b94410477f8bf0b6f0b5e67360eb89bcb1ad365258beb/pillow-12.1.1-cp314-cp314t-win_arm64.whl", hash = "sha256:7b03048319bfc6170e93bd60728a1af51d3dd7704935feb228c4d4faab35d334", size = 2546446, upload-time = "2026-02-11T04:22:50.342Z" },
+]
+
[[package]]
name = "pluggy"
version = "1.6.0"