9c6c477f55
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 2m22s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 2m24s
CI/CD Pipeline / Integration Tests (pull_request) Failing after 37s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 4m3s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
P0 关键修复: - P0-1: 注册接口添加 RateLimitMiddleware 限流保护 - P0-3: /metrics 端点添加 JWT 认证(移除匿名访问) - P0-4: 修复 Celery 任务名冲突(generation_task vs generate_video) - P1-5: JWT logout token 黑名单机制 P1 修复: - P1-1: forgot_password 硬编码 localhost → 使用 settings.APP_BASE_URL - P1-2: generation.py 直接创建 DB 连接 → 使用依赖注入 - P1-6: Image.open() 未关闭 → 统一使用 with 语句 - P1-7: 订阅续费事务修复 P2 代码质量: - P2-1: 修复 EditingMode 枚举重复定义 → 统一引用 shared 包 - P2-2: 修复 SMTP_FRON_NAME → SMTP_FROM_NAME 拼写 - P2-3: UserModel subscription_quota 类型统一为 float - P2-4: .env.production DATABASE_MAX_OVERFLOW 30 → 10 - 清理 15 处 except:pass(保留 2 处有注释说明的) - 禁用 SVG 上传(XSS 风险) - 删除 decode_token_unsafe() 不安全函数 - 简化 /ready 端点 - 删除 8 处死代码、10 个空文件/模块 - 合并 3 对 100% 重复函数 - 对齐 6 个废弃环境变量 v2 修复(代码审查后): - 修复密码重置路由路径: /password/forgot → /forgot-password, /password/reset → /reset-password(与前端 API 对齐) - 合并 _check_project_access: asset_libraries.py 和 edit_plans.py 中的重复函数统一到 _helpers.py(含空字符串守卫 + 中文错误信息) - 顺手修复: HTTPException 统一从 fastapi 导入(替换 starlette 导入) - OSS_ENDPOINT 拼写修复拆分为单独 PR,本 PR 不包含
103 lines
2.5 KiB
Python
103 lines
2.5 KiB
Python
"""
|
||
通用分页器
|
||
"""
|
||
|
||
from math import ceil
|
||
from typing import Generic, List, TypeVar
|
||
|
||
from pydantic import BaseModel, Field
|
||
|
||
T = TypeVar("T")
|
||
|
||
|
||
class PaginationParams(BaseModel):
|
||
"""分页参数"""
|
||
|
||
page: int = Field(1, ge=1, description="页码(从 1 开始)")
|
||
page_size: int = Field(20, ge=1, le=100, description="每页数量(最大 100)")
|
||
|
||
@property
|
||
def offset(self) -> int:
|
||
"""计算偏移量"""
|
||
return (self.page - 1) * self.page_size
|
||
|
||
@property
|
||
def limit(self) -> int:
|
||
"""返回限制数量"""
|
||
return self.page_size
|
||
|
||
|
||
class PaginationMeta(BaseModel):
|
||
"""分页元数据"""
|
||
|
||
page: int = Field(..., description="当前页码")
|
||
page_size: int = Field(..., description="每页数量")
|
||
total: int = Field(..., description="总记录数")
|
||
total_pages: int = Field(..., description="总页数")
|
||
has_next: bool = Field(..., description="是否有下一页")
|
||
has_prev: bool = Field(..., description="是否有上一页")
|
||
|
||
@classmethod
|
||
def from_params(
|
||
cls,
|
||
params: PaginationParams,
|
||
total: int,
|
||
) -> "PaginationMeta":
|
||
"""从参数和总数创建元数据"""
|
||
total_pages = ceil(total / params.page_size) if total > 0 else 0
|
||
|
||
return cls(
|
||
page=params.page,
|
||
page_size=params.page_size,
|
||
total=total,
|
||
total_pages=total_pages,
|
||
has_next=params.page < total_pages,
|
||
has_prev=params.page > 1,
|
||
)
|
||
|
||
|
||
class PaginatedResponse(BaseModel, Generic[T]):
|
||
"""分页响应"""
|
||
|
||
data: List[T] = Field(..., description="数据列表")
|
||
pagination: PaginationMeta = Field(..., description="分页信息")
|
||
|
||
@classmethod
|
||
def create(
|
||
cls,
|
||
data: List[T],
|
||
params: PaginationParams,
|
||
total: int,
|
||
) -> "PaginatedResponse[T]":
|
||
"""创建分页响应"""
|
||
return cls(
|
||
data=data,
|
||
pagination=PaginationMeta.from_params(params, total),
|
||
)
|
||
|
||
|
||
def paginate(
|
||
items: List[T],
|
||
params: PaginationParams,
|
||
) -> PaginatedResponse[T]:
|
||
"""
|
||
内存分页(适用于 InMemory Repository)
|
||
|
||
Args:
|
||
items: 完整列表
|
||
params: 分页参数
|
||
|
||
Returns:
|
||
分页响应
|
||
"""
|
||
total = len(items)
|
||
start = params.offset
|
||
end = start + params.limit
|
||
page_data = items[start:end]
|
||
|
||
return PaginatedResponse.create(
|
||
data=page_data,
|
||
params=params,
|
||
total=total,
|
||
)
|