style: auto-format with black + isort + ruff + prettier [skip ci-format-check]
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m2s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m48s
CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled
CI/CD Pipeline / Validate - Security (pull_request) Has been cancelled
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Has been cancelled
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been cancelled
CI/CD Pipeline / PR Build API Image (pull_request) Has been cancelled
CI/CD Pipeline / PR Build Web Image (pull_request) Has been cancelled
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Staging API Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been cancelled
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been cancelled
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been cancelled
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been cancelled
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been cancelled
CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled
CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been cancelled
CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled
CI/CD Pipeline / CI Gate (pull_request) Has been cancelled
AI Code Review / AI Code Review (pull_request) Has been cancelled
PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been cancelled

This commit is contained in:
CI Bot
2026-09-15 17:18:58 +00:00
parent b5a593feb9
commit 0cedf2f6b8
7 changed files with 26 additions and 14 deletions
@@ -8,7 +8,6 @@ from __future__ import annotations
import logging
from app.auth import AuthenticatedUser, get_current_user
from packages.middleware.points_gate import points_gate
from app.core.storage import get_storage_service
from app.core.task_enqueue import (
GLOBAL_PENDING_LIMIT,
@@ -44,6 +43,7 @@ from packages.application import (
GetGenerationTaskUseCase,
ListGeneratedVideosByTaskUseCase,
)
from packages.middleware.points_gate import points_gate
logger = logging.getLogger(__name__)
+1 -1
View File
@@ -4,7 +4,6 @@ from typing import Any
from app.api.routes._helpers import check_project_access
from app.auth import AuthenticatedUser, get_current_user
from packages.middleware.points_gate import points_gate
from app.core.storage import OSSStorageService, get_storage_service
from app.core.task_enqueue import (
GLOBAL_PENDING_LIMIT,
@@ -43,6 +42,7 @@ from packages.application import (
ListGeneratedVideosByTaskUseCase,
)
from packages.domain.smart_match import smart_select_assets
from packages.middleware.points_gate import points_gate
logger = logging.getLogger(__name__)
+4 -2
View File
@@ -91,13 +91,16 @@ def points_gate(
is_async = asyncio.iscoroutinefunction(func)
if is_async:
async def wrapper(*args: Any, **kwargs: Any) -> Any:
if not _pg_enabled(): # noqa: F821
return await func(*args, **kwargs)
return await _pg_execute( # noqa: F821
func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, True
)
else:
def wrapper(*args: Any, **kwargs: Any) -> Any:
if not _pg_enabled(): # noqa: F821
return func(*args, **_pg_filter(func, kwargs)) # noqa: F821
@@ -126,8 +129,7 @@ def points_gate(
# 为稳妥起见,直接把 wrapper code 的 co_names 映射到新名——复杂度过高,
# 这里采用「确保短名没冲突」策略:如果冲突就抛异常让开发者改名。
raise RuntimeError(
f"points_gate: name collision in {func.__module__}.{func.__name__}: "
f"'{k}' already defined"
f"points_gate: name collision in {func.__module__}.{func.__name__}: " f"'{k}' already defined"
)
merged_globals[k] = v
-1
View File
@@ -583,7 +583,6 @@ def _disable_points_gate(monkeypatch):
yield
def _make_user(user_id="test_user_001"):
"""构造 mock AuthenticatedUser"""
mock_user = MagicMock()
+7 -2
View File
@@ -1,4 +1,5 @@
"""视频预览生成 积分扣点单元测试 (#1895 P2 step 2.5)"""
from __future__ import annotations
from unittest.mock import MagicMock, patch
@@ -17,13 +18,14 @@ def _enable(monkeypatch):
class TestGenerationPreviewPoints:
def test_ai_video_cost(self):
from packages.domain.points_rules import calculate_points_cost
assert calculate_points_cost("ai_video", is_member=False) == 4
assert calculate_points_cost("ai_video", is_member=True, member_type="monthly") == 2
def test_insufficient_raises_402(self):
from fastapi import HTTPException
from app.api.routes.generation_preview import create_preview_generation_task
from app.schemas.generation_task import CreatePreviewGenerationTaskRequest
from fastapi import HTTPException
db = MagicMock()
cu = MagicMock()
@@ -38,7 +40,9 @@ class TestGenerationPreviewPoints:
MS.return_value = svc
with pytest.raises(HTTPException) as ei:
create_preview_generation_task(
request=req, authenticated_user=cu, db=db,
request=req,
authenticated_user=cu,
db=db,
generation_task_repository=MagicMock(),
asset_repo=MagicMock(),
)
@@ -46,4 +50,5 @@ class TestGenerationPreviewPoints:
def test_decorator_attached(self):
from app.api.routes.generation_preview import create_preview_generation_task
assert hasattr(create_preview_generation_task, "__wrapped__"), "missing @points_gate"
+1 -3
View File
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock
import pytest
import packages.middleware.points_gate as _pg_module
from packages.application.generation_tasks import (
CreateGenerationTaskCommand,
CreateGenerationTaskUseCase,
@@ -17,8 +18,6 @@ from packages.application.generation_tasks import (
)
from packages.domain import GenerationTask
import packages.middleware.points_gate as _pg_module
@pytest.fixture(autouse=True)
def _disable_points_gate(monkeypatch):
@@ -27,7 +26,6 @@ def _disable_points_gate(monkeypatch):
yield
@pytest.fixture
def mock_repo():
return MagicMock()
+12 -4
View File
@@ -1,4 +1,5 @@
"""视频生成 积分扣点单元测试 (#1895 P2 step 2.4)"""
from __future__ import annotations
from unittest.mock import MagicMock, patch
@@ -17,19 +18,21 @@ def _enable(monkeypatch):
class TestGenerationTasksPoints:
def test_ai_video_base_cost(self):
from packages.domain.points_rules import calculate_points_cost
assert calculate_points_cost("ai_video", is_member=False) == 4
assert calculate_points_cost("ai_video", is_member=True, member_type="monthly") == 2
def test_ai_video_quantity_scales(self):
from packages.domain.points_rules import calculate_points_cost
c1 = calculate_points_cost("ai_video", is_member=False, quantity=1)
c3 = calculate_points_cost("ai_video", is_member=False, quantity=3)
assert c3 > c1
def test_insufficient_raises_402(self):
from fastapi import HTTPException
from app.api.routes.generation_tasks import create_generation_task
from app.schemas.generation_task import CreateGenerationTaskRequest
from fastapi import HTTPException
db = MagicMock()
cu = MagicMock()
@@ -44,12 +47,17 @@ class TestGenerationTasksPoints:
MS.return_value = svc
with pytest.raises(HTTPException) as ei:
create_generation_task(
request=req, authenticated_user=cu, db=db,
generation_task_repository=MagicMock(), project_repository=MagicMock(),
asset_library_repository=MagicMock(), asset_repository=MagicMock(),
request=req,
authenticated_user=cu,
db=db,
generation_task_repository=MagicMock(),
project_repository=MagicMock(),
asset_library_repository=MagicMock(),
asset_repository=MagicMock(),
)
assert ei.value.status_code == 402
def test_decorator_attached(self):
from app.api.routes.generation_tasks import create_generation_task
assert hasattr(create_generation_task, "__wrapped__"), "missing @points_gate"