Compare commits

...

3 Commits

Author SHA1 Message Date
xiaoxia 20cac6fd68 fix(ci): 修复pip --break-system-packages兼容性问题
CI/CD Pipeline / Unit Tests (pull_request) Failing after 1m8s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m38s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m51s
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 E2E Tests (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 / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Integration Tests (pull_request) Failing after 23m15s
旧Runner使用pip 22.0.2不支持--break-system-packages参数。
动态检测pip版本,兼容新旧Runner环境。
2026-07-13 17:25:05 +08:00
CI Bot 8be3ca033d fix: flake8 E303 too many blank lines in assets.py
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 9s
CI/CD Pipeline / Integration Tests (pull_request) Failing after 4s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m31s
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 E2E Tests (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 / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Unit Tests (pull_request) Failing after 8m50s
2026-07-13 17:05:51 +08:00
CI Bot 3d08e93d3d fix: black + isort format fixes for Phase 3 code cleanup 2026-07-13 17:05:51 +08:00
10 changed files with 42 additions and 27 deletions
+34 -10
View File
@@ -91,10 +91,16 @@ jobs:
- name: Install dependencies
shell: sh
run: |
# Detect pip --break-system-packages support (pip >= 23.0 / PEP 668)
PIP_BREAK_FLAG=""
if python3 -m pip install --help 2>/dev/null | grep -q "break-system-packages"; then
PIP_BREAK_FLAG="--break-system-packages"
fi
echo "PIP_BREAK_FLAG=$PIP_BREAK_FLAG" >> "$GITHUB_ENV"
set -eu
python3 -m pip install --break-system-packages -q -r requirements-base.txt
python3 -m pip install --break-system-packages -q -r requirements.txt
python3 -m pip install --break-system-packages -q -r requirements-dev.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-base.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-dev.txt
python3 -m black --version
python3 -m isort --version-number
python3 -m flake8 --version
@@ -220,10 +226,16 @@ jobs:
- name: Install dependencies
shell: sh
run: |
# Detect pip --break-system-packages support (pip >= 23.0 / PEP 668)
PIP_BREAK_FLAG=""
if python3 -m pip install --help 2>/dev/null | grep -q "break-system-packages"; then
PIP_BREAK_FLAG="--break-system-packages"
fi
echo "PIP_BREAK_FLAG=$PIP_BREAK_FLAG" >> "$GITHUB_ENV"
set -eu
python3 -m pip install --break-system-packages -q -r requirements-base.txt
python3 -m pip install --break-system-packages -q -r requirements.txt
python3 -m pip install --break-system-packages -q -r requirements-dev.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-base.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-dev.txt
pytest --version
- name: Run unit tests with coverage
@@ -319,10 +331,16 @@ jobs:
- name: Install dependencies
shell: sh
run: |
# Detect pip --break-system-packages support (pip >= 23.0 / PEP 668)
PIP_BREAK_FLAG=""
if python3 -m pip install --help 2>/dev/null | grep -q "break-system-packages"; then
PIP_BREAK_FLAG="--break-system-packages"
fi
echo "PIP_BREAK_FLAG=$PIP_BREAK_FLAG" >> "$GITHUB_ENV"
set -eu
python3 -m pip install --break-system-packages -q -r requirements-base.txt
python3 -m pip install --break-system-packages -q -r requirements.txt
python3 -m pip install --break-system-packages -q -r requirements-dev.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-base.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements.txt
python3 -m pip install $PIP_BREAK_FLAG -q -r requirements-dev.txt
pytest --version
- name: Start Redis
@@ -394,7 +412,7 @@ jobs:
shell: sh
run: |
set -eu
pip install --break-system-packages -q pytest-rerunfailures
pip install $PIP_BREAK_FLAG -q pytest-rerunfailures
PYTHONPATH="$PWD/apps/api:$PWD" python3 -m coverage run --append \
--source=apps/api/app,packages \
--omit="*/migrations/*,*/tests/*,*/test_*.py,*/site-packages/*" \
@@ -536,6 +554,12 @@ jobs:
- name: Install dependencies
shell: sh
run: |
# Detect pip --break-system-packages support (pip >= 23.0 / PEP 668)
PIP_BREAK_FLAG=""
if python3 -m pip install --help 2>/dev/null | grep -q "break-system-packages"; then
PIP_BREAK_FLAG="--break-system-packages"
fi
echo "PIP_BREAK_FLAG=$PIP_BREAK_FLAG" >> "$GITHUB_ENV"
set -eu
docker run --rm \
-v "$PWD:/workspace" \
+1 -3
View File
@@ -1,6 +1,7 @@
import logging
from typing import Any, Optional
from app.api.routes._helpers import check_project_access
from app.auth import AuthenticatedUser, get_current_user
from app.core.storage import get_storage_service
from app.dependencies import (
@@ -27,8 +28,6 @@ from packages.application import (
)
from packages.domain import AssetStatus, ClassificationStatus
from app.api.routes._helpers import check_project_access
logger = logging.getLogger(__name__)
router = APIRouter()
@@ -74,7 +73,6 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse:
)
@router.get("", response_model=ListAssetsResponse)
def list_assets(
library_id: Optional[str] = Query(None),
+1 -2
View File
@@ -13,6 +13,7 @@ from pathlib import Path
from typing import Any
from uuid import uuid4
from app.api.routes._helpers import require_project_and_library
from app.auth import AuthenticatedUser, get_current_user
from app.core.celery_app import celery_app
from app.core.storage import OSSStorageService, get_storage_service
@@ -34,8 +35,6 @@ from fastapi.params import File
from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase
from app.api.routes._helpers import require_project_and_library
router = APIRouter()
logger = logging.getLogger(__name__)
+2 -2
View File
@@ -45,11 +45,11 @@ from packages.application.generation_tasks import (
CreateGenerationTaskCommand,
CreateGenerationTaskUseCase,
)
from ._helpers import check_project_access
from packages.domain.config_schemas import normalize_plan_config
from packages.domain.edit_plan import EditPlan, EditPlanStatus
from ._helpers import check_project_access
logger = logging.getLogger(__name__)
router = APIRouter()
+1 -2
View File
@@ -3,6 +3,7 @@ import random
import uuid
from typing import Any
from app.api.routes._helpers import check_project_access
from app.auth import AuthenticatedUser, get_current_user
from app.core.storage import OSSStorageService, get_storage_service
from app.core.task_enqueue import (
@@ -31,8 +32,6 @@ from app.schemas.generation_task import (
)
from fastapi import APIRouter, Depends, HTTPException
from app.api.routes._helpers import check_project_access
from packages.application import (
CreateGenerationTaskCommand,
CreateGenerationTaskUseCase,
+1 -2
View File
@@ -4,6 +4,7 @@ from __future__ import annotations
from typing import Optional
from app.api.routes._helpers import get_user_plan
from app.auth import AuthenticatedUser, get_current_user
from app.dependencies import get_db_session, get_user_repository
from app.schemas.title_library import (
@@ -28,8 +29,6 @@ from packages.application.title_library.use_cases import (
)
from packages.ports.user_repository import UserRepository
from app.api.routes._helpers import get_user_plan
router = APIRouter()
+1 -2
View File
@@ -2,6 +2,7 @@ import logging
from typing import Any
from uuid import uuid4
from app.api.routes._helpers import require_project_and_library
from app.auth import AuthenticatedUser, get_current_user
from app.config import get_settings
from app.core.celery_app import celery_app
@@ -23,8 +24,6 @@ from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, s
from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
from app.api.routes._helpers import require_project_and_library
logger = logging.getLogger(__name__)
router = APIRouter()
+1 -2
View File
@@ -7,6 +7,7 @@ from __future__ import annotations
from typing import Literal, Optional
from app.api.routes._helpers import get_user_plan
from app.auth import AuthenticatedUser, get_current_user
from app.dependencies import get_audio_url_signer, get_db_session, get_user_repository
from app.schemas.voice import (
@@ -39,8 +40,6 @@ from packages.application.voice_library.use_cases import (
from packages.domain.preset_voices import PRESET_VOICES
from packages.ports.user_repository import UserRepository
from app.api.routes._helpers import get_user_plan
router = APIRouter()
-1
View File
@@ -13,7 +13,6 @@ from __future__ import annotations
import logging
from typing import Any
from packages.application.jobs import (
CancelJobUseCase,
CompleteJobCommand,
-1
View File
@@ -247,4 +247,3 @@ def main() -> int:
if __name__ == "__main__":
sys.exit(main())