Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ca5f8085f |
@ -3,172 +3,91 @@ name: Build and Deploy
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- master
|
||||
- dev
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
git clone --depth=1 --branch=${{ github.ref_name }} https://gitea.airlabs.art/${{ github.repository }}.git .
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set environment by branch
|
||||
run: |
|
||||
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
|
||||
BUILD_DATE=$(date +%Y%m%d)
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
with:
|
||||
config-inline: |
|
||||
[registry."docker.io"]
|
||||
mirrors = ["https://docker.m.daocloud.io", "https://docker.1panel.live", "https://hub.rat.dev"]
|
||||
|
||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||
echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||
echo "CR_SERVER_ACTIVE=gitea-prod-cn-shanghai.cr.volces.com" >> $GITHUB_ENV
|
||||
echo "CR_USERNAME_ACTIVE=seaislee@76339115" >> $GITHUB_ENV
|
||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
|
||||
echo "CR_ORG=prod" >> $GITHUB_ENV
|
||||
echo "DEPLOY_ENV=production" >> $GITHUB_ENV
|
||||
echo "DOMAIN_API=airflow-studio-api.airlabs.art" >> $GITHUB_ENV
|
||||
echo "DOMAIN_WEB=airflow-studio.airlabs.art" >> $GITHUB_ENV
|
||||
echo "REDIS_URL=redis://zyc:Zyc188208@redis-shzlf5t46gjvow7ua.redis.ivolces.com:6379/0" >> $GITHUB_ENV
|
||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||
echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||
echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
|
||||
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
|
||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
|
||||
echo "CR_ORG=dev" >> $GITHUB_ENV
|
||||
echo "DEPLOY_ENV=development" >> $GITHUB_ENV
|
||||
echo "DOMAIN_API=airflow-studio-api.test.airlabs.art" >> $GITHUB_ENV
|
||||
echo "DOMAIN_WEB=airflow-studio.test.airlabs.art" >> $GITHUB_ENV
|
||||
echo "REDIS_URL=redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.ivolces.com:6379/0" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
- name: Login to Volcano Engine CR
|
||||
run: |
|
||||
echo "${{ env.CR_PASSWORD_ACTIVE }}" | docker login --username "${{ env.CR_USERNAME_ACTIVE }}" --password-stdin ${{ env.CR_SERVER_ACTIVE }}
|
||||
- name: Login to Huawei Cloud SWR
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ${{ secrets.SWR_SERVER }}
|
||||
username: ${{ secrets.SWR_USERNAME }}
|
||||
password: ${{ secrets.SWR_PASSWORD }}
|
||||
|
||||
- name: Build and Push Backend
|
||||
id: build_backend
|
||||
run: |
|
||||
set -o pipefail
|
||||
for attempt in 1 2 3; do
|
||||
echo "Build backend attempt $attempt/3..."
|
||||
DOCKER_BUILDKIT=0 docker build \
|
||||
--tag ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-backend:${{ env.IMAGE_TAG }} \
|
||||
--tag ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-backend:latest \
|
||||
./backend 2>&1 | tee /tmp/build.log && break
|
||||
echo "Attempt $attempt failed, retrying in 10s..." && sleep 10
|
||||
done
|
||||
for attempt in 1 2 3; do
|
||||
docker push ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-backend:${{ env.IMAGE_TAG }} && \
|
||||
docker push ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-backend:latest && break
|
||||
echo "Push attempt $attempt failed, retrying in 10s..." && sleep 10
|
||||
done
|
||||
docker buildx build \
|
||||
--push \
|
||||
--provenance=false \
|
||||
--tag ${{ secrets.SWR_SERVER }}/${{ secrets.SWR_ORG }}/video-backend:latest \
|
||||
./backend 2>&1 | tee /tmp/build.log
|
||||
|
||||
- name: Build and Push Web
|
||||
id: build_web
|
||||
run: |
|
||||
set -o pipefail
|
||||
for attempt in 1 2 3; do
|
||||
echo "Build web attempt $attempt/3..."
|
||||
DOCKER_BUILDKIT=0 docker build \
|
||||
--tag ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-web:${{ env.IMAGE_TAG }} \
|
||||
--tag ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-web:latest \
|
||||
./web 2>&1 | tee -a /tmp/build.log && break
|
||||
echo "Attempt $attempt failed, retrying in 10s..." && sleep 10
|
||||
done
|
||||
for attempt in 1 2 3; do
|
||||
docker push ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-web:${{ env.IMAGE_TAG }} && \
|
||||
docker push ${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}/video-web:latest && break
|
||||
echo "Push attempt $attempt failed, retrying in 10s..." && sleep 10
|
||||
done
|
||||
docker buildx build \
|
||||
--push \
|
||||
--provenance=false \
|
||||
--tag ${{ secrets.SWR_SERVER }}/${{ secrets.SWR_ORG }}/video-web:latest \
|
||||
./web 2>&1 | tee -a /tmp/build.log
|
||||
|
||||
- name: Setup Kubectl
|
||||
run: |
|
||||
if ! command -v kubectl &>/dev/null; then
|
||||
for attempt in 1 2 3; do
|
||||
curl -LO "https://files.m.daocloud.io/dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl" && break
|
||||
echo "Download attempt $attempt failed, retrying in 5s..." && sleep 5
|
||||
done
|
||||
chmod +x kubectl && mv kubectl /usr/bin/kubectl
|
||||
fi
|
||||
kubectl version --client
|
||||
|
||||
- name: Set kubeconfig
|
||||
run: |
|
||||
mkdir -p $HOME/.kube
|
||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||
printf '%s\n' '${{ secrets.VOLCANO_PROD_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||
printf '%s\n' '${{ secrets.VOLCANO_TEST_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||
fi
|
||||
chmod 600 $HOME/.kube/config
|
||||
echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
|
||||
grep server $HOME/.kube/config || echo "WARNING: no server found in kubeconfig"
|
||||
curl -LO "https://dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl" || \
|
||||
curl -LO "https://cdn.dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl"
|
||||
chmod +x kubectl
|
||||
mv kubectl /usr/local/bin/
|
||||
|
||||
- name: Deploy to K3s
|
||||
uses: Azure/k8s-set-context@v3
|
||||
with:
|
||||
method: kubeconfig
|
||||
kubeconfig: ${{ secrets.KUBE_CONFIG }}
|
||||
|
||||
- name: Create or Update Secrets
|
||||
run: |
|
||||
kubectl create secret generic video-backend-secrets \
|
||||
--from-literal=ARK_API_KEY=${{ secrets.ARK_API_KEY }} \
|
||||
--from-literal=TOS_ACCESS_KEY=${{ secrets.TOS_ACCESS_KEY }} \
|
||||
--from-literal=TOS_SECRET_KEY=${{ secrets.TOS_SECRET_KEY }} \
|
||||
--from-literal=DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }} \
|
||||
--from-literal=DB_HOST=${{ secrets.DB_HOST }} \
|
||||
--from-literal=DB_USER=${{ secrets.DB_USER }} \
|
||||
--from-literal=DB_PASSWORD=${{ secrets.DB_PASSWORD }} \
|
||||
--dry-run=client -o yaml | kubectl apply -f -
|
||||
|
||||
- name: Apply K8s Manifests
|
||||
id: deploy
|
||||
run: |
|
||||
echo "Environment: ${{ env.DEPLOY_ENV }}"
|
||||
CR_IMAGE="${{ env.CR_SERVER_ACTIVE }}/${{ env.CR_ORG }}"
|
||||
|
||||
# Replace image placeholders
|
||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-backend:latest|${CR_IMAGE}/video-backend:${{ env.IMAGE_TAG }}|g" k8s/backend-deployment.yaml
|
||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-backend:latest|${CR_IMAGE}/video-backend:${{ env.IMAGE_TAG }}|g" k8s/celery-deployment.yaml
|
||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-web:latest|${CR_IMAGE}/video-web:${{ env.IMAGE_TAG }}|g" k8s/web-deployment.yaml
|
||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-backend:latest|${{ secrets.SWR_SERVER }}/${{ secrets.SWR_ORG }}/video-backend:latest|g" k8s/backend-deployment.yaml
|
||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-web:latest|${{ secrets.SWR_SERVER }}/${{ secrets.SWR_ORG }}/video-web:latest|g" k8s/web-deployment.yaml
|
||||
|
||||
# Replace domain placeholders in ingress
|
||||
sed -i "s|airflow-studio-api.airlabs.art|${{ env.DOMAIN_API }}|g" k8s/ingress.yaml
|
||||
sed -i "s|airflow-studio.airlabs.art|${{ env.DOMAIN_WEB }}|g" k8s/ingress.yaml
|
||||
|
||||
# Replace DB config for production
|
||||
if [[ "${{ env.DEPLOY_ENV }}" == "production" ]]; then
|
||||
sed -i "s|mysql8351f937d637.rds.ivolces.com|mysqld9bb4e81696d.rds.ivolces.com|g" k8s/backend-deployment.yaml
|
||||
sed -i "s|mysql8351f937d637.rds.ivolces.com|mysqld9bb4e81696d.rds.ivolces.com|g" k8s/celery-deployment.yaml
|
||||
fi
|
||||
|
||||
# Replace CORS origin
|
||||
sed -i "s|https://airflow-studio.airlabs.art|https://${{ env.DOMAIN_WEB }}|g" k8s/backend-deployment.yaml
|
||||
|
||||
# Replace Redis URL by environment
|
||||
sed -i "s|redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.ivolces.com:6379/0|${{ env.REDIS_URL }}|g" k8s/backend-deployment.yaml
|
||||
sed -i "s|redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.ivolces.com:6379/0|${{ env.REDIS_URL }}|g" k8s/celery-deployment.yaml
|
||||
|
||||
# All kubectl operations with retry (K3s 内网连接可能抖动)
|
||||
for attempt in 1 2 3; do
|
||||
echo "Deploy attempt $attempt/3..."
|
||||
{
|
||||
# Create/update image pull secret for CR
|
||||
kubectl create secret docker-registry cr-pull-secret \
|
||||
--docker-server="${{ env.CR_SERVER_ACTIVE }}" \
|
||||
--docker-username="${{ env.CR_USERNAME_ACTIVE }}" \
|
||||
--docker-password="${{ env.CR_PASSWORD_ACTIVE }}" \
|
||||
--dry-run=client -o yaml | kubectl apply -f -
|
||||
|
||||
# Create/update secrets (业务密钥,DB 已写在 yaml 里)
|
||||
kubectl create secret generic video-backend-secrets \
|
||||
--from-literal=ARK_API_KEY='${{ secrets.ARK_API_KEY }}' \
|
||||
--from-literal=TOS_ACCESS_KEY='${{ secrets.TOS_ACCESS_KEY }}' \
|
||||
--from-literal=TOS_SECRET_KEY='${{ secrets.TOS_SECRET_KEY }}' \
|
||||
--from-literal=DJANGO_SECRET_KEY='${{ secrets.DJANGO_SECRET_KEY }}' \
|
||||
--from-literal=ALIYUN_SMS_ACCESS_KEY='${{ secrets.ALIYUN_SMS_ACCESS_KEY }}' \
|
||||
--from-literal=ALIYUN_SMS_ACCESS_SECRET='${{ secrets.ALIYUN_SMS_ACCESS_SECRET }}' \
|
||||
--dry-run=client -o yaml | kubectl apply -f -
|
||||
|
||||
# Apply manifests
|
||||
kubectl apply -f k8s/backend-deployment.yaml
|
||||
kubectl apply -f k8s/celery-deployment.yaml
|
||||
kubectl apply -f k8s/web-deployment.yaml
|
||||
kubectl apply -f k8s/ingress.yaml
|
||||
|
||||
# Preserve real client IP
|
||||
kubectl patch svc traefik -n kube-system -p '{"spec":{"externalTrafficPolicy":"Local"}}' 2>/dev/null || true
|
||||
|
||||
kubectl rollout restart deployment/video-backend
|
||||
kubectl rollout restart deployment/celery-worker
|
||||
kubectl rollout restart deployment/video-web
|
||||
} 2>&1 | tee /tmp/deploy.log && break
|
||||
echo "Attempt $attempt failed, retrying in 10s..."
|
||||
sleep 10
|
||||
done
|
||||
# Apply all manifests
|
||||
set -o pipefail
|
||||
{
|
||||
kubectl apply -f k8s/backend-deployment.yaml
|
||||
kubectl apply -f k8s/web-deployment.yaml
|
||||
kubectl apply -f k8s/ingress.yaml
|
||||
kubectl rollout restart deployment/video-backend
|
||||
kubectl rollout restart deployment/video-web
|
||||
} 2>&1 | tee /tmp/deploy.log
|
||||
|
||||
# ===== Log Center: failure reporting =====
|
||||
- name: Report failure to Log Center
|
||||
@ -207,7 +126,7 @@ jobs:
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{
|
||||
\"project_id\": \"video_backend\",
|
||||
\"environment\": \"${{ env.DEPLOY_ENV }}\",
|
||||
\"environment\": \"${{ github.ref_name }}\",
|
||||
\"level\": \"ERROR\",
|
||||
\"source\": \"${SOURCE}\",
|
||||
\"commit_hash\": \"${{ github.sha }}\",
|
||||
@ -228,13 +147,3 @@ jobs:
|
||||
\"run_url\": \"https://gitea.airlabs.art/${{ github.repository }}/actions/runs/${{ github.run_number }}\"
|
||||
}
|
||||
}" || true
|
||||
|
||||
# ===== Cleanup: remove unused Docker resources =====
|
||||
- name: Docker Cleanup
|
||||
if: always()
|
||||
run: |
|
||||
docker container prune -f
|
||||
docker image prune -a -f
|
||||
docker builder prune -a -f
|
||||
echo "Disk usage after cleanup:"
|
||||
df -h / | tail -1
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@ -31,9 +31,6 @@ test-screenshots/
|
||||
|
||||
# === Screenshots & prototype images ===
|
||||
*.png
|
||||
# Allow web assets and public PNGs
|
||||
!web/src/assets/*.png
|
||||
!web/public/*.png
|
||||
|
||||
# === Environment ===
|
||||
.env
|
||||
|
||||
78
CLAUDE.md
78
CLAUDE.md
@ -52,8 +52,6 @@ jimeng-clone/
|
||||
│ ├── apps/
|
||||
│ │ ├── accounts/ # User auth: models, views, serializers, urls
|
||||
│ │ └── generation/ # Video generation: models, views, serializers, urls
|
||||
│ ├── utils/ # Shared utilities (geo_client, anomaly_detector, alert_service, tos_client)
|
||||
│ ├── data/ # Offline data files (ip2region.xdb)
|
||||
│ ├── requirements.txt # Python dependencies
|
||||
│ └── Dockerfile # Python 3.12 + gunicorn
|
||||
├── web/ # React 18 + Vite frontend
|
||||
@ -123,11 +121,10 @@ jimeng-clone/
|
||||
### Auth (`/api/v1/auth/`)
|
||||
| Method | Endpoint | Description |
|
||||
|--------|----------|-------------|
|
||||
| POST | `/api/v1/auth/register` | User registration (disabled) |
|
||||
| POST | `/api/v1/auth/login` | JWT login (returns access + refresh tokens, creates ActiveSession) |
|
||||
| POST | `/api/v1/auth/register` | User registration |
|
||||
| POST | `/api/v1/auth/login` | JWT login (returns access + refresh tokens) |
|
||||
| POST | `/api/v1/auth/token/refresh` | Refresh JWT access token |
|
||||
| GET | `/api/v1/auth/me` | Get current user info + quota + team + must_change_password |
|
||||
| POST | `/api/v1/auth/change-password` | Change own password (clears must_change_password) |
|
||||
| GET | `/api/v1/auth/me` | Get current user info |
|
||||
|
||||
### Video Generation (`/api/v1/`)
|
||||
| Method | Endpoint | Description |
|
||||
@ -154,20 +151,7 @@ jimeng-clone/
|
||||
| POST | `/api/v1/admin/teams/<id>/topup` | Add seconds to team pool |
|
||||
| PUT | `/api/v1/admin/teams/<id>/set-pool` | Directly set team total seconds pool |
|
||||
| POST | `/api/v1/admin/teams/<id>/admin` | Create team admin user |
|
||||
| GET | `/api/v1/admin/anomalies` | Login anomaly records (filter by team/rule/level/date) |
|
||||
| POST | `/api/v1/admin/test-feishu` | Send test Feishu alert message |
|
||||
| POST | `/api/v1/admin/teams/<id>/auto-learn` | Auto-learn expected regions from login history |
|
||||
| POST | `/api/v1/admin/teams/<id>/apply-learned-regions` | Apply auto-learned regions to team |
|
||||
| GET | `/api/v1/admin/logs` | Audit logs (filter by action/operator/date) |
|
||||
| GET | `/api/v1/admin/assets/overview` | Content assets: global stats + per-team summary |
|
||||
| GET | `/api/v1/admin/assets/team/<id>/members` | Content assets: team members with video stats |
|
||||
| GET | `/api/v1/admin/assets/user/<id>/videos` | Content assets: user's completed videos (paginated) |
|
||||
|
||||
### Team Admin Assets (`/api/v1/team/assets/`)
|
||||
| Method | Endpoint | Description |
|
||||
|--------|----------|-------------|
|
||||
| GET | `/api/v1/team/assets/overview` | Team stats + per-member video summary |
|
||||
| GET | `/api/v1/team/assets/member/<id>/videos` | Member's completed videos (paginated) |
|
||||
|
||||
### Profile (`/api/v1/profile/`)
|
||||
| Method | Endpoint | Description |
|
||||
@ -179,15 +163,8 @@ jimeng-clone/
|
||||
|
||||
### User (extends AbstractUser)
|
||||
- `email` (unique), `daily_seconds_limit` (default: 600), `monthly_seconds_limit` (default: 6000)
|
||||
- `must_change_password` (default: True) — forces password change on first login
|
||||
- `team` (FK to Team), `is_team_admin`, `disabled_by` (''|'admin'|'system')
|
||||
- `created_at`, `updated_at`
|
||||
|
||||
### Team
|
||||
- `name`, `total_seconds_pool`, `total_seconds_used`, `monthly_seconds_limit`, `daily_member_limit_default`
|
||||
- `expected_regions` (CharField 500, comma-separated cities for anomaly detection R1)
|
||||
- `disabled_by` (''|'admin'|'system'), `is_active`
|
||||
|
||||
### GenerationRecord
|
||||
- `user` (FK), `task_id` (UUID), `ark_task_id`, `prompt`, `mode` (universal|keyframe)
|
||||
- `model` (seedance_2.0|seedance_2.0_fast), `aspect_ratio`, `duration`, `seconds_consumed`
|
||||
@ -199,34 +176,9 @@ jimeng-clone/
|
||||
- `target_type`, `target_id`, `target_name`, `before` (JSON), `after` (JSON)
|
||||
- `ip_address`, `created_at` (indexed)
|
||||
|
||||
### ActiveSession
|
||||
- `user` (FK), `session_id` (UUID, unique), `device_type` (desktop|mobile|unknown)
|
||||
- `user_agent`, `created_at`
|
||||
- Used for concurrent session limiting via JWT session_id claim
|
||||
|
||||
### LoginRecord
|
||||
- `user` (FK), `team` (FK, redundant for efficient R4/R5 queries), `ip_address`, `user_agent`
|
||||
- `geo_country`, `geo_province`, `geo_city`, `geo_source` ('online'|'offline'|'skip'|'failed')
|
||||
- `created_at` (indexed)
|
||||
|
||||
### TeamAnomalyConfig (OneToOne → Team)
|
||||
- Per-team anomaly detection thresholds (null = use global default)
|
||||
- `r1_enabled`, `r2_enabled`/`r2_window_seconds`, `r3_enabled`/`r3_window_seconds`/`r3_max_count`
|
||||
- `r4_enabled`/`r4_window_seconds`/`r4_city_count`, `r5_enabled`/`r5_days`/`r5_country_count`
|
||||
|
||||
### LoginAnomaly
|
||||
- `team` (FK), `user` (FK), `login_record` (FK)
|
||||
- `level` (warning|critical), `rule` (region_mismatch|impossible_travel|login_frequency|multi_city|overseas_ip_diversity)
|
||||
- `detail` (JSON), `alerted`, `auto_disabled`, `disabled_target` (user|team|'')
|
||||
- `created_at` (indexed)
|
||||
|
||||
### QuotaConfig (Singleton, pk=1)
|
||||
- `default_daily_seconds_limit`, `default_monthly_seconds_limit`
|
||||
- `announcement`, `announcement_enabled`
|
||||
- `max_desktop_sessions` (default: 1), `max_mobile_sessions` (default: 0)
|
||||
- Anomaly detection global defaults: `anomaly_detection_enabled`, R1-R5 enabled/thresholds
|
||||
- `feishu_alert_mobiles`, `sms_alert_mobiles`, `alert_cooldown_seconds`
|
||||
- `updated_at`
|
||||
- `announcement`, `announcement_enabled`, `updated_at`
|
||||
|
||||
## Frontend Routes
|
||||
|
||||
@ -238,11 +190,8 @@ jimeng-clone/
|
||||
| `/admin/dashboard` | DashboardPage | Admin | Stats & charts |
|
||||
| `/admin/users` | UsersPage | Admin | User management |
|
||||
| `/admin/records` | RecordsPage | Admin | Generation records |
|
||||
| `/admin/settings` | SettingsPage | Admin | Global quota, announcement & anomaly detection config |
|
||||
| `/admin/security` | AnomalyLogPage | Admin | Login anomaly records (security log) |
|
||||
| `/admin/settings` | SettingsPage | Admin | Global quota & announcement |
|
||||
| `/admin/logs` | AuditLogsPage | Admin | Admin operation audit logs |
|
||||
| `/admin/assets` | AdminAssetsPage | Admin | Content assets (team→member→video hierarchy) |
|
||||
| `/team/assets` | TeamAssetsPage | TeamAdmin | Team content assets (member→video hierarchy) |
|
||||
|
||||
## Incremental Development Guide
|
||||
|
||||
@ -384,16 +333,14 @@ npx tsx src/index.ts --resume /Users/maidong/Desktop/zyc/研究openclaw/视频
|
||||
| `TOS_CDN_DOMAIN` | TOS CDN domain for permanent URLs (default: `https://airdrama-media.tos-cn-beijing.volces.com`) | Yes (upload) |
|
||||
| `ARK_API_KEY` | Volcano Engine ARK API key for Seedance | Yes (video gen) |
|
||||
| `ARK_BASE_URL` | ARK API base URL (default: `https://ark.cn-beijing.volces.com/api/v3`) | No |
|
||||
| `ALIYUN_IP_GEO_APPCODE` | Aliyun marketplace IP geolocation API AppCode | Yes (anomaly detection) |
|
||||
| `FEISHU_APP_SECRET` | Feishu bot app secret for alert notifications | Yes (anomaly alerts) |
|
||||
|
||||
## Deployment
|
||||
|
||||
- **CI/CD**: Gitea Actions (`.gitea/workflows/deploy.yaml`)
|
||||
- **Registry**: Huawei Cloud SWR
|
||||
- **Orchestration**: Kubernetes (`k8s/` directory)
|
||||
- **Backend URL**: `airflow-studio-api.airlabs.art`
|
||||
- **Frontend URL**: `airflow-studio.airlabs.art`
|
||||
- **Backend URL**: `video-huoshan-api.airlabs.art`
|
||||
- **Frontend URL**: `video-huoshan-web.airlabs.art`
|
||||
- **Database**: Aliyun RDS MySQL (`rm-7xv1uaw910558p1788o.mysql.rds.aliyuncs.com:3306`)
|
||||
|
||||
## Testing
|
||||
@ -434,17 +381,6 @@ npx tsx src/index.ts --resume /Users/maidong/Desktop/zyc/研究openclaw/视频
|
||||
| 2026-03-16 | v0.8.2: 管理后台 UI 修复 — DatePicker/Select 暗色主题、公告跑马灯、Toast 全局化、失败原因 tooltip | Full stack |
|
||||
| 2026-03-16 | v0.8.3: 团队详情抽屉→弹窗重构(VideoDetailModal 规范) + 修改秒数池功能 + member_count 修复 | Full stack |
|
||||
| 2026-03-16 | v0.8.4: 管理员操作审计日志 — AdminAuditLog 模型 + 12 处埋点 + 日志查询页面 | Full stack |
|
||||
| 2026-03-18 | v0.9.0: 首次登录强制改密 — must_change_password 字段 + ForceChangePasswordModal | Full stack |
|
||||
| 2026-03-18 | v0.9.0: 并发会话限制 — ActiveSession + SessionJWT + 可配置桌面/移动端会话数 | Full stack |
|
||||
| 2026-03-18 | v0.9.0: 登录记录 — LoginRecord 模型(IP + User-Agent)为异常检测打基础 | Backend |
|
||||
| 2026-03-18 | v0.9.0: Token 生命周期缩短 — access 30min, refresh 1天 | Backend |
|
||||
| 2026-03-18 | v0.9.0: 内容资产页 — 超管/团队管三级折叠式资产浏览(团队→成员→视频) | Full stack |
|
||||
| 2026-03-18 | v0.9.1: 登录风控第二期 — IP归属地解析 + 5条异常检测规则(R1-R5) + 飞书告警 + 自动封禁 | Full stack |
|
||||
| 2026-03-18 | v0.9.1: 安全日志页面 — LoginAnomaly 记录列表,按团队/规则/级别/时间筛选 | Frontend |
|
||||
| 2026-03-18 | v0.9.1: 系统设置页 — 异常检测总开关、R1-R5默认阈值、飞书接收人+测试、告警冷却 | Frontend |
|
||||
| 2026-03-18 | v0.9.1: 团队管理 — 预期登录城市(必填) + 自动学习 + disabled_by 来源标签 | Full stack |
|
||||
| 2026-03-18 | v0.9.1: 前端拦截器 — user_disabled/team_disabled 错误码处理,弹窗提示后跳登录 | Frontend |
|
||||
| 2026-03-19 | fix: LoginRecord 创建时显式传 geo 空字段,修复 MySQL 严格模式 IntegrityError | Backend |
|
||||
|
||||
### Phase 4 Details (2026-03-13)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM docker.m.daocloud.io/python:3.12-slim
|
||||
FROM python:3.12-slim
|
||||
|
||||
ENV PYTHONDONTWRITEBYTECODE=1
|
||||
ENV PYTHONUNBUFFERED=1
|
||||
@ -11,7 +11,6 @@ RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debia
|
||||
gcc \
|
||||
default-libmysqlclient-dev \
|
||||
pkg-config \
|
||||
ffmpeg \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Python dependencies
|
||||
@ -30,4 +29,4 @@ RUN chmod +x /app/entrypoint.sh
|
||||
EXPOSE 8000
|
||||
|
||||
ENTRYPOINT ["/app/entrypoint.sh"]
|
||||
CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--workers", "2", "--worker-class", "gevent", "--worker-connections", "200", "--timeout", "120", "--access-logfile", "-", "--error-logfile", "-", "config.wsgi:application"]
|
||||
CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--workers", "2", "--timeout", "120", "--access-logfile", "-", "--error-logfile", "-", "config.wsgi:application"]
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
"""Custom JWT authentication — validates session_id against ActiveSession table."""
|
||||
|
||||
from rest_framework_simplejwt.authentication import JWTAuthentication
|
||||
from rest_framework_simplejwt.exceptions import InvalidToken
|
||||
|
||||
|
||||
class SessionJWTAuthentication(JWTAuthentication):
|
||||
"""
|
||||
Extends JWTAuthentication to check that the session_id in the token
|
||||
still exists in the ActiveSession table.
|
||||
|
||||
Legacy tokens (without session_id) are allowed through for backward compatibility.
|
||||
"""
|
||||
|
||||
def get_user(self, validated_token):
|
||||
user = super().get_user(validated_token)
|
||||
|
||||
# 检查用户是否被封禁
|
||||
if not user.is_active:
|
||||
raise InvalidToken({
|
||||
'detail': '您的账号已被禁用,请联系团队管理员',
|
||||
'code': 'user_disabled',
|
||||
})
|
||||
|
||||
# 检查团队是否被封禁
|
||||
if user.team_id:
|
||||
try:
|
||||
from .models import Team
|
||||
team = Team.objects.get(pk=user.team_id)
|
||||
if not team.is_active:
|
||||
raise InvalidToken({
|
||||
'detail': '您所在的团队已被禁用,请联系平台管理员',
|
||||
'code': 'team_disabled',
|
||||
})
|
||||
except Team.DoesNotExist:
|
||||
pass
|
||||
|
||||
session_id = validated_token.get('session_id')
|
||||
if session_id is None:
|
||||
# Legacy token without session_id — allow through
|
||||
return user
|
||||
|
||||
from .models import ActiveSession
|
||||
if not ActiveSession.objects.filter(user=user, session_id=session_id).exists():
|
||||
raise InvalidToken({
|
||||
'detail': '您的账号已在其他设备登录',
|
||||
'code': 'session_expired_other_device',
|
||||
})
|
||||
|
||||
return user
|
||||
@ -1,57 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-17 16:23
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0005_adminauditlog'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='must_change_password',
|
||||
field=models.BooleanField(default=True, verbose_name='必须修改密码'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='adminauditlog',
|
||||
name='action',
|
||||
field=models.CharField(choices=[('team_create', '创建团队'), ('team_update', '更新团队'), ('team_topup', '团队充值'), ('team_set_pool', '设置团队额度池'), ('team_create_admin', '创建团队管理员'), ('user_create', '创建用户'), ('user_quota_update', '更新用户额度'), ('user_status_toggle', '切换用户状态'), ('settings_update', '更新系统设置'), ('member_create', '创建团队成员'), ('member_quota_update', '更新成员额度'), ('member_status_toggle', '切换成员状态'), ('user_password_reset', '重置用户密码')], max_length=30, verbose_name='操作类型'),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='LoginRecord',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('ip_address', models.GenericIPAddressField(blank=True, null=True, verbose_name='IP地址')),
|
||||
('user_agent', models.TextField(blank=True, default='', verbose_name='User-Agent')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='登录时间')),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='login_records', to=settings.AUTH_USER_MODEL, verbose_name='用户')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '登录记录',
|
||||
'verbose_name_plural': '登录记录',
|
||||
'ordering': ['-created_at'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ActiveSession',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('session_id', models.UUIDField(db_index=True, default=uuid.uuid4, unique=True, verbose_name='会话ID')),
|
||||
('device_type', models.CharField(choices=[('desktop', '桌面端'), ('mobile', '移动端'), ('unknown', '未知')], default='unknown', max_length=10, verbose_name='设备类型')),
|
||||
('user_agent', models.TextField(blank=True, default='', verbose_name='User-Agent')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='active_sessions', to=settings.AUTH_USER_MODEL, verbose_name='用户')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '活跃会话',
|
||||
'verbose_name_plural': '活跃会话',
|
||||
'ordering': ['created_at'],
|
||||
},
|
||||
),
|
||||
]
|
||||
@ -1,20 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-17 16:23
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def set_existing_users_false(apps, schema_editor):
|
||||
"""现有用户不需要强制改密,只有新创建的用户才需要。"""
|
||||
User = apps.get_model('accounts', 'User')
|
||||
User.objects.all().update(must_change_password=False)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0006_user_must_change_password_alter_adminauditlog_action_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(set_existing_users_false, migrations.RunPython.noop),
|
||||
]
|
||||
@ -1,99 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-18 12:11
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0007_set_existing_users_must_change_password_false'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='loginrecord',
|
||||
name='geo_city',
|
||||
field=models.CharField(blank=True, default='', max_length=50, verbose_name='城市'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='loginrecord',
|
||||
name='geo_country',
|
||||
field=models.CharField(blank=True, default='', max_length=50, verbose_name='国家'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='loginrecord',
|
||||
name='geo_province',
|
||||
field=models.CharField(blank=True, default='', max_length=50, verbose_name='省份'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='loginrecord',
|
||||
name='geo_source',
|
||||
field=models.CharField(blank=True, default='', max_length=10, verbose_name='归属地来源'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='loginrecord',
|
||||
name='team',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='login_records', to='accounts.team', verbose_name='所属团队'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='disabled_by',
|
||||
field=models.CharField(blank=True, default='', max_length=10, verbose_name='禁用来源'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='expected_regions',
|
||||
field=models.CharField(blank=True, default='', max_length=500, verbose_name='预期登录城市(逗号分隔)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='disabled_by',
|
||||
field=models.CharField(blank=True, default='', max_length=10, verbose_name='禁用来源'),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='TeamAnomalyConfig',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('r1_enabled', models.BooleanField(blank=True, null=True, verbose_name='R1 开关')),
|
||||
('r2_enabled', models.BooleanField(blank=True, null=True, verbose_name='R2 开关')),
|
||||
('r2_window_seconds', models.IntegerField(blank=True, null=True, verbose_name='R2 时间窗口(秒)')),
|
||||
('r3_enabled', models.BooleanField(blank=True, null=True, verbose_name='R3 开关')),
|
||||
('r3_window_seconds', models.IntegerField(blank=True, null=True, verbose_name='R3 时间窗口(秒)')),
|
||||
('r3_max_count', models.IntegerField(blank=True, null=True, verbose_name='R3 最大登录次数')),
|
||||
('r4_enabled', models.BooleanField(blank=True, null=True, verbose_name='R4 开关')),
|
||||
('r4_window_seconds', models.IntegerField(blank=True, null=True, verbose_name='R4 时间窗口(秒)')),
|
||||
('r4_city_count', models.IntegerField(blank=True, null=True, verbose_name='R4 预期外城市数阈值')),
|
||||
('r5_enabled', models.BooleanField(blank=True, null=True, verbose_name='R5 开关')),
|
||||
('r5_days', models.IntegerField(blank=True, null=True, verbose_name='R5 统计天数')),
|
||||
('r5_country_count', models.IntegerField(blank=True, null=True, verbose_name='R5 海外国家数阈值')),
|
||||
('team', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='anomaly_config', to='accounts.team', verbose_name='团队')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '团队异常检测配置',
|
||||
'verbose_name_plural': '团队异常检测配置',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='LoginAnomaly',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('level', models.CharField(choices=[('warning', '警告'), ('critical', '严重')], max_length=10, verbose_name='严重程度')),
|
||||
('rule', models.CharField(choices=[('region_mismatch', '登录地区不对'), ('impossible_travel', '不可能的旅行'), ('login_frequency', '登录太频繁'), ('multi_city', '团队遍地开花'), ('overseas_ip_diversity', '海外IP太杂')], max_length=30, verbose_name='触发规则')),
|
||||
('detail', models.JSONField(default=dict, verbose_name='详情')),
|
||||
('alerted', models.BooleanField(default=False, verbose_name='已发告警')),
|
||||
('auto_disabled', models.BooleanField(default=False, verbose_name='已自动封禁')),
|
||||
('disabled_target', models.CharField(blank=True, default='', max_length=10, verbose_name='封禁对象')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='创建时间')),
|
||||
('login_record', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='anomalies', to='accounts.loginrecord', verbose_name='触发登录记录')),
|
||||
('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='login_anomalies', to='accounts.team', verbose_name='团队')),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='login_anomalies', to=settings.AUTH_USER_MODEL, verbose_name='用户')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '登录异常',
|
||||
'verbose_name_plural': '登录异常',
|
||||
'ordering': ['-created_at'],
|
||||
},
|
||||
),
|
||||
]
|
||||
@ -1,53 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-20 11:53
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0008_anomaly_detection_phase2'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='balance',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='团队余额(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='daily_member_spending_default',
|
||||
field=models.DecimalField(decimal_places=2, default=50, max_digits=12, verbose_name='新成员默认每日消费限额(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='frozen_amount',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='冻结金额(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='markup_percentage',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=5, verbose_name='加价百分比'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='monthly_spending_limit',
|
||||
field=models.DecimalField(decimal_places=2, default=-1, max_digits=12, verbose_name='每月消费上限(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='total_spent',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='已消费总额(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='daily_generation_limit',
|
||||
field=models.IntegerField(default=50, verbose_name='每日生成次数上限'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='monthly_generation_limit',
|
||||
field=models.IntegerField(default=1500, verbose_name='每月生成次数上限'),
|
||||
),
|
||||
]
|
||||
@ -1,52 +0,0 @@
|
||||
# Data migration: populate new billing fields from existing seconds-based data
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def forward(apps, schema_editor):
|
||||
Team = apps.get_model('accounts', 'Team')
|
||||
User = apps.get_model('accounts', 'User')
|
||||
QuotaConfig = apps.get_model('generation', 'QuotaConfig')
|
||||
|
||||
# Teams: set balance=0 (admin will manually top up), spending limit=-1 (unlimited)
|
||||
for team in Team.objects.all():
|
||||
team.balance = 0
|
||||
team.total_spent = 0
|
||||
team.monthly_spending_limit = -1
|
||||
team.daily_member_spending_default = 50
|
||||
team.frozen_amount = 0
|
||||
team.markup_percentage = 0
|
||||
team.save(update_fields=[
|
||||
'balance', 'total_spent', 'monthly_spending_limit',
|
||||
'daily_member_spending_default', 'frozen_amount', 'markup_percentage',
|
||||
])
|
||||
|
||||
# Users: set generation limits
|
||||
User.objects.all().update(
|
||||
daily_generation_limit=50,
|
||||
monthly_generation_limit=1500,
|
||||
)
|
||||
|
||||
# QuotaConfig: set defaults
|
||||
config, _ = QuotaConfig.objects.get_or_create(pk=1)
|
||||
config.default_daily_generation_limit = 50
|
||||
config.default_monthly_generation_limit = 1500
|
||||
config.base_token_price = 46
|
||||
config.save(update_fields=[
|
||||
'default_daily_generation_limit', 'default_monthly_generation_limit', 'base_token_price',
|
||||
])
|
||||
|
||||
|
||||
def backward(apps, schema_editor):
|
||||
pass # No rollback needed, old seconds fields are untouched
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0009_billing_system_v010'),
|
||||
('generation', '0007_billing_system_v010'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(forward, backward),
|
||||
]
|
||||
@ -1,23 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-22 10:02
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0010_billing_data_migration'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='team',
|
||||
name='max_concurrent_tasks',
|
||||
field=models.IntegerField(default=5, verbose_name='最大并发任务数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='spending_limit',
|
||||
field=models.DecimalField(decimal_places=2, default=-1, max_digits=12, verbose_name='用户总消费额度(元)'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-23 12:28
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0011_team_max_concurrent_tasks_user_spending_limit'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='last_read_announcement',
|
||||
field=models.DateTimeField(blank=True, null=True, verbose_name='最后阅读公告时间'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-24 03:34
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0012_user_last_read_announcement'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='is_team_owner',
|
||||
field=models.BooleanField(default=False, verbose_name='团队主管理员'),
|
||||
),
|
||||
]
|
||||
@ -1,19 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-24 03:34
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def set_admins_as_owners(apps, schema_editor):
|
||||
User = apps.get_model('accounts', 'User')
|
||||
User.objects.filter(is_team_admin=True).update(is_team_owner=True)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0013_user_is_team_owner'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(set_admins_as_owners, migrations.RunPython.noop),
|
||||
]
|
||||
@ -1,5 +1,3 @@
|
||||
import uuid
|
||||
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
|
||||
@ -11,17 +9,7 @@ class Team(models.Model):
|
||||
total_seconds_used = models.FloatField(default=0, verbose_name='已消耗总秒数')
|
||||
monthly_seconds_limit = models.IntegerField(default=6000, verbose_name='每月消费上限(秒)')
|
||||
daily_member_limit_default = models.IntegerField(default=600, verbose_name='新成员默认每日限额(秒)')
|
||||
# ── 金额计费字段(v0.10.0 新增) ──
|
||||
balance = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='团队余额(元)')
|
||||
total_spent = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='已消费总额(元)')
|
||||
monthly_spending_limit = models.DecimalField(max_digits=12, decimal_places=2, default=-1, verbose_name='每月消费上限(元)')
|
||||
daily_member_spending_default = models.DecimalField(max_digits=12, decimal_places=2, default=50, verbose_name='新成员默认每日消费限额(元)')
|
||||
frozen_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='冻结金额(元)')
|
||||
markup_percentage = models.DecimalField(max_digits=5, decimal_places=2, default=0, verbose_name='加价百分比')
|
||||
max_concurrent_tasks = models.IntegerField(default=5, verbose_name='最大并发任务数')
|
||||
is_active = models.BooleanField(default=True, verbose_name='启用状态')
|
||||
expected_regions = models.CharField(max_length=500, blank=True, default='', verbose_name='预期登录城市(逗号分隔)')
|
||||
disabled_by = models.CharField(max_length=10, blank=True, default='', verbose_name='禁用来源')
|
||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
|
||||
@ -36,10 +24,6 @@ class Team(models.Model):
|
||||
def remaining_seconds(self):
|
||||
return self.total_seconds_pool - self.total_seconds_used
|
||||
|
||||
@property
|
||||
def available_balance(self):
|
||||
return self.balance - self.frozen_amount
|
||||
|
||||
|
||||
class User(AbstractUser):
|
||||
"""Extended user model — Phase 5: team-based quota."""
|
||||
@ -51,16 +35,8 @@ class User(AbstractUser):
|
||||
verbose_name='所属团队',
|
||||
)
|
||||
is_team_admin = models.BooleanField(default=False, verbose_name='团队管理员')
|
||||
is_team_owner = models.BooleanField(default=False, verbose_name='团队主管理员')
|
||||
daily_seconds_limit = models.IntegerField(default=600, verbose_name='每日秒数上限')
|
||||
monthly_seconds_limit = models.IntegerField(default=6000, verbose_name='每月秒数上限')
|
||||
# ── 次数限额(v0.10.0 新增) ──
|
||||
daily_generation_limit = models.IntegerField(default=50, verbose_name='每日生成次数上限')
|
||||
monthly_generation_limit = models.IntegerField(default=1500, verbose_name='每月生成次数上限')
|
||||
spending_limit = models.DecimalField(max_digits=12, decimal_places=2, default=-1, verbose_name='用户总消费额度(元)')
|
||||
must_change_password = models.BooleanField(default=True, verbose_name='必须修改密码')
|
||||
disabled_by = models.CharField(max_length=10, blank=True, default='', verbose_name='禁用来源')
|
||||
last_read_announcement = models.DateTimeField(null=True, blank=True, verbose_name='最后阅读公告时间')
|
||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
|
||||
@ -95,7 +71,6 @@ class AdminAuditLog(models.Model):
|
||||
('member_create', '创建团队成员'),
|
||||
('member_quota_update', '更新成员额度'),
|
||||
('member_status_toggle', '切换成员状态'),
|
||||
('user_password_reset', '重置用户密码'),
|
||||
]
|
||||
|
||||
operator = models.ForeignKey(
|
||||
@ -122,127 +97,9 @@ class AdminAuditLog(models.Model):
|
||||
return f'{self.operator_name} - {self.get_action_display()} - {self.target_name}'
|
||||
|
||||
|
||||
class ActiveSession(models.Model):
|
||||
"""活跃会话 — 用于并发登录设备限制。"""
|
||||
DEVICE_TYPE_CHOICES = [
|
||||
('desktop', '桌面端'),
|
||||
('mobile', '移动端'),
|
||||
('unknown', '未知'),
|
||||
]
|
||||
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='active_sessions', verbose_name='用户')
|
||||
session_id = models.UUIDField(default=uuid.uuid4, unique=True, db_index=True, verbose_name='会话ID')
|
||||
device_type = models.CharField(max_length=10, choices=DEVICE_TYPE_CHOICES, default='unknown', verbose_name='设备类型')
|
||||
user_agent = models.TextField(blank=True, default='', verbose_name='User-Agent')
|
||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '活跃会话'
|
||||
verbose_name_plural = '活跃会话'
|
||||
ordering = ['created_at']
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.user.username} - {self.device_type} - {self.session_id}'
|
||||
|
||||
|
||||
class LoginRecord(models.Model):
|
||||
"""登录记录 — 含 IP 归属地,供异常检测使用。"""
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='login_records', verbose_name='用户')
|
||||
team = models.ForeignKey(Team, on_delete=models.SET_NULL, null=True, blank=True, related_name='login_records', verbose_name='所属团队')
|
||||
ip_address = models.GenericIPAddressField(null=True, blank=True, verbose_name='IP地址')
|
||||
user_agent = models.TextField(blank=True, default='', verbose_name='User-Agent')
|
||||
geo_country = models.CharField(max_length=50, blank=True, default='', verbose_name='国家')
|
||||
geo_province = models.CharField(max_length=50, blank=True, default='', verbose_name='省份')
|
||||
geo_city = models.CharField(max_length=50, blank=True, default='', verbose_name='城市')
|
||||
geo_source = models.CharField(max_length=10, blank=True, default='', verbose_name='归属地来源')
|
||||
created_at = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='登录时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '登录记录'
|
||||
verbose_name_plural = '登录记录'
|
||||
ordering = ['-created_at']
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.user.username} - {self.ip_address} - {self.geo_city} - {self.created_at}'
|
||||
|
||||
|
||||
class TeamAnomalyConfig(models.Model):
|
||||
"""团队级异常检测阈值配置 — 未设置的字段使用全局默认值。"""
|
||||
team = models.OneToOneField(Team, on_delete=models.CASCADE, related_name='anomaly_config', verbose_name='团队')
|
||||
r1_enabled = models.BooleanField(null=True, blank=True, verbose_name='R1 开关')
|
||||
r2_enabled = models.BooleanField(null=True, blank=True, verbose_name='R2 开关')
|
||||
r2_window_seconds = models.IntegerField(null=True, blank=True, verbose_name='R2 时间窗口(秒)')
|
||||
r3_enabled = models.BooleanField(null=True, blank=True, verbose_name='R3 开关')
|
||||
r3_window_seconds = models.IntegerField(null=True, blank=True, verbose_name='R3 时间窗口(秒)')
|
||||
r3_max_count = models.IntegerField(null=True, blank=True, verbose_name='R3 最大登录次数')
|
||||
r4_enabled = models.BooleanField(null=True, blank=True, verbose_name='R4 开关')
|
||||
r4_window_seconds = models.IntegerField(null=True, blank=True, verbose_name='R4 时间窗口(秒)')
|
||||
r4_city_count = models.IntegerField(null=True, blank=True, verbose_name='R4 预期外城市数阈值')
|
||||
r5_enabled = models.BooleanField(null=True, blank=True, verbose_name='R5 开关')
|
||||
r5_days = models.IntegerField(null=True, blank=True, verbose_name='R5 统计天数')
|
||||
r5_country_count = models.IntegerField(null=True, blank=True, verbose_name='R5 海外国家数阈值')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '团队异常检测配置'
|
||||
verbose_name_plural = '团队异常检测配置'
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.team.name} 异常检测配置'
|
||||
|
||||
|
||||
class LoginAnomaly(models.Model):
|
||||
"""登录异常记录。"""
|
||||
LEVEL_CHOICES = [
|
||||
('warning', '警告'),
|
||||
('critical', '严重'),
|
||||
]
|
||||
RULE_CHOICES = [
|
||||
('region_mismatch', '登录地区不对'),
|
||||
('impossible_travel', '不可能的旅行'),
|
||||
('login_frequency', '登录太频繁'),
|
||||
('multi_city', '团队遍地开花'),
|
||||
('overseas_ip_diversity', '海外IP太杂'),
|
||||
]
|
||||
|
||||
team = models.ForeignKey(Team, on_delete=models.CASCADE, related_name='login_anomalies', verbose_name='团队')
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='login_anomalies', verbose_name='用户')
|
||||
login_record = models.ForeignKey(LoginRecord, on_delete=models.CASCADE, related_name='anomalies', verbose_name='触发登录记录')
|
||||
level = models.CharField(max_length=10, choices=LEVEL_CHOICES, verbose_name='严重程度')
|
||||
rule = models.CharField(max_length=30, choices=RULE_CHOICES, verbose_name='触发规则')
|
||||
detail = models.JSONField(default=dict, verbose_name='详情')
|
||||
alerted = models.BooleanField(default=False, verbose_name='已发告警')
|
||||
auto_disabled = models.BooleanField(default=False, verbose_name='已自动封禁')
|
||||
disabled_target = models.CharField(max_length=10, blank=True, default='', verbose_name='封禁对象')
|
||||
created_at = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='创建时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '登录异常'
|
||||
verbose_name_plural = '登录异常'
|
||||
ordering = ['-created_at']
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.team.name} - {self.get_rule_display()} - {self.get_level_display()}'
|
||||
|
||||
|
||||
def get_client_ip(request):
|
||||
"""从请求中提取客户端 IP 地址。"""
|
||||
return request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')[0].strip() or request.META.get('REMOTE_ADDR')
|
||||
|
||||
|
||||
def parse_device_type(user_agent):
|
||||
"""根据 User-Agent 判断设备类型。"""
|
||||
ua_lower = (user_agent or '').lower()
|
||||
mobile_keywords = ['iphone', 'ipad', 'android', 'mobile', 'ipod', 'windows phone']
|
||||
if any(kw in ua_lower for kw in mobile_keywords):
|
||||
return 'mobile'
|
||||
if ua_lower:
|
||||
return 'desktop'
|
||||
return 'unknown'
|
||||
|
||||
|
||||
def log_admin_action(request, action, target_type, target_id=None, target_name='', before=None, after=None):
|
||||
"""记录管理员操作日志"""
|
||||
ip = get_client_ip(request)
|
||||
ip = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')[0].strip() or request.META.get('REMOTE_ADDR')
|
||||
AdminAuditLog.objects.create(
|
||||
operator=request.user,
|
||||
operator_name=request.user.username,
|
||||
|
||||
@ -11,7 +11,7 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ('id', 'username', 'email', 'is_staff', 'is_team_admin', 'is_team_owner', 'role', 'team_name', 'must_change_password')
|
||||
fields = ('id', 'username', 'email', 'is_staff', 'is_team_admin', 'role', 'team_name')
|
||||
|
||||
|
||||
class RegisterSerializer(serializers.Serializer):
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
"""Custom JWT token — embeds session_id for concurrent session management."""
|
||||
|
||||
from rest_framework_simplejwt.tokens import RefreshToken
|
||||
|
||||
|
||||
class SessionRefreshToken(RefreshToken):
|
||||
"""RefreshToken subclass that writes session_id into JWT claims."""
|
||||
|
||||
@classmethod
|
||||
def for_user_session(cls, user, session_id):
|
||||
token = cls.for_user(user)
|
||||
token['session_id'] = str(session_id)
|
||||
return token
|
||||
@ -8,6 +8,4 @@ urlpatterns = [
|
||||
path('login', views.login_view, name='login'),
|
||||
path('token/refresh', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('me', views.me_view, name='me'),
|
||||
path('logout', views.logout_view, name='logout'),
|
||||
path('change-password', views.change_password_view, name='change_password'),
|
||||
]
|
||||
|
||||
@ -3,14 +3,12 @@ from rest_framework.decorators import api_view, permission_classes, throttle_cla
|
||||
from rest_framework.permissions import AllowAny, IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.throttling import ScopedRateThrottle
|
||||
from rest_framework_simplejwt.tokens import RefreshToken
|
||||
from django.contrib.auth import authenticate, get_user_model
|
||||
from django.utils import timezone
|
||||
from django.db.models import Sum, Count
|
||||
from django.db.models import Sum
|
||||
|
||||
from .serializers import UserSerializer
|
||||
from .models import ActiveSession, LoginRecord, get_client_ip, parse_device_type
|
||||
from .tokens import SessionRefreshToken
|
||||
from django.contrib.auth.hashers import check_password
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
@ -29,36 +27,6 @@ def register_view(request):
|
||||
)
|
||||
|
||||
|
||||
def _enforce_session_limit(user, device_type):
|
||||
"""Enforce concurrent session limits: remove oldest sessions if over limit."""
|
||||
from apps.generation.models import QuotaConfig
|
||||
config = QuotaConfig.objects.filter(pk=1).first()
|
||||
if device_type == 'desktop':
|
||||
max_sessions = config.max_desktop_sessions if config else 1
|
||||
elif device_type == 'mobile':
|
||||
max_sessions = config.max_mobile_sessions if config else 0
|
||||
else:
|
||||
max_sessions = 1
|
||||
|
||||
if max_sessions <= 0:
|
||||
# 0 means no sessions allowed for this device type — but still allow login
|
||||
# (treat as unlimited for unknown device types)
|
||||
if device_type == 'unknown':
|
||||
return
|
||||
# For mobile with limit 0, still allow (no mobile enforcement yet)
|
||||
return
|
||||
|
||||
existing = ActiveSession.objects.filter(
|
||||
user=user, device_type=device_type
|
||||
).order_by('created_at')
|
||||
|
||||
# If at or over limit, delete oldest sessions to make room for the new one
|
||||
over_count = existing.count() - max_sessions + 1
|
||||
if over_count > 0:
|
||||
ids_to_remove = list(existing.values_list('id', flat=True)[:over_count])
|
||||
ActiveSession.objects.filter(id__in=ids_to_remove).delete()
|
||||
|
||||
|
||||
@api_view(['POST'])
|
||||
@permission_classes([AllowAny])
|
||||
@throttle_classes([LoginRateThrottle])
|
||||
@ -84,67 +52,7 @@ def login_view(request):
|
||||
status=status.HTTP_401_UNAUTHORIZED
|
||||
)
|
||||
|
||||
# Check if user or team is disabled
|
||||
if not user.is_active:
|
||||
code = 'user_disabled'
|
||||
return Response(
|
||||
{'code': code, 'message': '您的账号已被禁用,请联系团队管理员'},
|
||||
status=status.HTTP_401_UNAUTHORIZED
|
||||
)
|
||||
if user.team and not user.team.is_active:
|
||||
code = 'team_disabled'
|
||||
return Response(
|
||||
{'code': code, 'message': '您所在的团队已被禁用,请联系平台管理员'},
|
||||
status=status.HTTP_403_FORBIDDEN
|
||||
)
|
||||
|
||||
# Record login IP and User-Agent
|
||||
ip = get_client_ip(request)
|
||||
user_agent = request.META.get('HTTP_USER_AGENT', '')
|
||||
login_record = LoginRecord.objects.create(
|
||||
user=user, team=user.team, ip_address=ip, user_agent=user_agent,
|
||||
geo_country='', geo_province='', geo_city='', geo_source='',
|
||||
)
|
||||
|
||||
# IP 归属地解析 + 异常检测(不阻塞登录)
|
||||
try:
|
||||
from utils.geo_client import resolve_ip_location
|
||||
country, province, city, source = resolve_ip_location(ip)
|
||||
login_record.geo_country = country
|
||||
login_record.geo_province = province
|
||||
login_record.geo_city = city
|
||||
login_record.geo_source = source
|
||||
login_record.save(update_fields=['geo_country', 'geo_province', 'geo_city', 'geo_source'])
|
||||
|
||||
from utils.anomaly_detector import check_login_anomaly, process_anomalies
|
||||
anomalies = check_login_anomaly(login_record)
|
||||
if anomalies:
|
||||
process_anomalies(login_record, anomalies)
|
||||
|
||||
# 封禁后重新检查(anomaly_detector 可能刚封禁了用户/团队)
|
||||
user.refresh_from_db()
|
||||
if not user.is_active:
|
||||
return Response(
|
||||
{'code': 'user_disabled', 'message': '您的账号已被禁用,请联系团队管理员'},
|
||||
status=status.HTTP_401_UNAUTHORIZED
|
||||
)
|
||||
if user.team:
|
||||
user.team.refresh_from_db()
|
||||
if not user.team.is_active:
|
||||
return Response(
|
||||
{'code': 'team_disabled', 'message': '您所在的团队已被禁用,请联系平台管理员'},
|
||||
status=status.HTTP_403_FORBIDDEN
|
||||
)
|
||||
except Exception:
|
||||
import logging
|
||||
logging.getLogger(__name__).exception('Anomaly detection failed for login %s', login_record.pk)
|
||||
|
||||
# Concurrent session management
|
||||
device_type = parse_device_type(user_agent)
|
||||
_enforce_session_limit(user, device_type)
|
||||
session = ActiveSession.objects.create(user=user, device_type=device_type, user_agent=user_agent)
|
||||
|
||||
refresh = SessionRefreshToken.for_user_session(user, session.session_id)
|
||||
refresh = RefreshToken.for_user(user)
|
||||
return Response({
|
||||
'user': UserSerializer(user).data,
|
||||
'tokens': {
|
||||
@ -154,19 +62,6 @@ def login_view(request):
|
||||
})
|
||||
|
||||
|
||||
@api_view(['POST'])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def logout_view(request):
|
||||
"""POST /api/v1/auth/logout — 清除当前会话,标记用户离线。"""
|
||||
session_id = getattr(request, 'session_id', None)
|
||||
if session_id:
|
||||
ActiveSession.objects.filter(user=request.user, session_id=session_id).delete()
|
||||
else:
|
||||
# fallback: 清除该用户所有会话
|
||||
ActiveSession.objects.filter(user=request.user).delete()
|
||||
return Response({'detail': 'ok'})
|
||||
|
||||
|
||||
@api_view(['GET'])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def me_view(request):
|
||||
@ -183,46 +78,24 @@ def me_view(request):
|
||||
created_at__date__gte=first_of_month
|
||||
).aggregate(total=Sum('seconds_consumed'))['total'] or 0
|
||||
|
||||
# Count-based usage
|
||||
daily_generation_used = user.generation_records.filter(
|
||||
created_at__date=today
|
||||
).count()
|
||||
|
||||
monthly_generation_used = user.generation_records.filter(
|
||||
created_at__date__gte=first_of_month
|
||||
).count()
|
||||
|
||||
data = UserSerializer(user).data
|
||||
data['quota'] = {
|
||||
'daily_seconds_limit': user.daily_seconds_limit,
|
||||
'daily_seconds_used': daily_seconds_used,
|
||||
'monthly_seconds_limit': user.monthly_seconds_limit,
|
||||
'monthly_seconds_used': monthly_seconds_used,
|
||||
'daily_generation_limit': user.daily_generation_limit,
|
||||
'daily_generation_used': daily_generation_used,
|
||||
'monthly_generation_limit': user.monthly_generation_limit,
|
||||
'monthly_generation_used': monthly_generation_used,
|
||||
}
|
||||
|
||||
# Team info
|
||||
team = user.team
|
||||
if team:
|
||||
# Team monthly consumption
|
||||
from apps.generation.models import GenerationRecord, QuotaConfig
|
||||
from apps.generation.models import GenerationRecord
|
||||
team_monthly_used = GenerationRecord.objects.filter(
|
||||
user__team=team,
|
||||
created_at__date__gte=first_of_month,
|
||||
).aggregate(total=Sum('seconds_consumed'))['total'] or 0
|
||||
|
||||
team_monthly_spent = GenerationRecord.objects.filter(
|
||||
user__team=team,
|
||||
created_at__date__gte=first_of_month,
|
||||
).aggregate(total=Sum('cost_amount'))['total'] or 0
|
||||
|
||||
config = QuotaConfig.objects.get_or_create(pk=1)[0]
|
||||
markup_mult = 1 + float(team.markup_percentage) / 100
|
||||
token_price = float(config.base_token_price) * markup_mult
|
||||
|
||||
data['team'] = {
|
||||
'id': team.id,
|
||||
'name': team.name,
|
||||
@ -231,16 +104,6 @@ def me_view(request):
|
||||
'remaining_seconds': team.remaining_seconds,
|
||||
'monthly_seconds_limit': team.monthly_seconds_limit,
|
||||
'monthly_seconds_used': team_monthly_used,
|
||||
'balance': float(team.balance),
|
||||
'total_spent': float(team.total_spent),
|
||||
'available_balance': float(team.available_balance),
|
||||
'monthly_spending_limit': float(team.monthly_spending_limit),
|
||||
'monthly_spent': float(team_monthly_spent),
|
||||
'frozen_amount': float(team.frozen_amount),
|
||||
'token_price': token_price,
|
||||
'token_price_video': float(config.base_token_price_video) * markup_mult,
|
||||
'token_price_fast': float(config.base_token_price_fast) * markup_mult,
|
||||
'token_price_fast_video': float(config.base_token_price_fast_video) * markup_mult,
|
||||
'is_active': team.is_active,
|
||||
}
|
||||
data['team_disabled'] = not team.is_active
|
||||
@ -249,37 +112,3 @@ def me_view(request):
|
||||
data['team_disabled'] = False
|
||||
|
||||
return Response(data)
|
||||
|
||||
|
||||
@api_view(['POST'])
|
||||
@permission_classes([IsAuthenticated])
|
||||
def change_password_view(request):
|
||||
"""POST /api/v1/auth/change-password — user changes own password."""
|
||||
old_password = request.data.get('old_password', '')
|
||||
new_password = request.data.get('new_password', '')
|
||||
|
||||
if not old_password or not new_password:
|
||||
return Response(
|
||||
{'error': 'missing_fields', 'message': '请填写旧密码和新密码'},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
|
||||
if len(new_password) < 8:
|
||||
return Response(
|
||||
{'error': 'password_too_short', 'message': '新密码至少8位'},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
|
||||
if not check_password(old_password, request.user.password):
|
||||
return Response(
|
||||
{'error': 'wrong_password', 'message': '旧密码错误'},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
|
||||
request.user.set_password(new_password)
|
||||
request.user.must_change_password = False
|
||||
request.user.save(update_fields=['password', 'must_change_password'])
|
||||
return Response({
|
||||
'message': '密码修改成功',
|
||||
'user': UserSerializer(request.user).data,
|
||||
})
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
"""Management command to poll stuck tasks and update their status.
|
||||
|
||||
This is a fallback for when Celery workers miss tasks or aren't running.
|
||||
Run via cron or K8s CronJob: python manage.py poll_stuck_tasks
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.utils import timezone
|
||||
|
||||
from apps.generation.models import GenerationRecord
|
||||
from utils.airdrama_client import query_task, map_status, extract_video_url, ERROR_MESSAGES
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Poll Volcano API for stuck queued/processing tasks and update their status.'
|
||||
|
||||
def handle(self, *args, **options):
|
||||
stuck = GenerationRecord.objects.filter(status__in=['queued', 'processing'])
|
||||
count = stuck.count()
|
||||
|
||||
if count == 0:
|
||||
self.stdout.write('No stuck tasks found.')
|
||||
return
|
||||
|
||||
self.stdout.write(f'Found {count} stuck task(s), polling...')
|
||||
|
||||
resolved = 0
|
||||
for record in stuck:
|
||||
ark_task_id = record.ark_task_id
|
||||
|
||||
# No ark_task_id means API submission failed — mark as failed
|
||||
if not ark_task_id:
|
||||
record.status = 'failed'
|
||||
record.error_message = '任务提交失败(系统清理)'
|
||||
record.completed_at = timezone.now()
|
||||
record.save(update_fields=['status', 'error_message', 'completed_at'])
|
||||
from apps.generation.views import _release_freeze
|
||||
_release_freeze(record)
|
||||
resolved += 1
|
||||
self.stdout.write(f' [{record.id}] no ark_task_id -> marked failed')
|
||||
continue
|
||||
|
||||
# Poll Volcano API
|
||||
try:
|
||||
ark_resp = query_task(ark_task_id)
|
||||
new_status = map_status(ark_resp.get('status', ''))
|
||||
except Exception as e:
|
||||
self.stdout.write(f' [{record.id}] ark={ark_task_id} API error: {e}')
|
||||
continue
|
||||
|
||||
if new_status in ('queued', 'processing'):
|
||||
self.stdout.write(f' [{record.id}] ark={ark_task_id} still {new_status}')
|
||||
continue
|
||||
|
||||
# Terminal state — process
|
||||
record.status = new_status
|
||||
returned_seed = ark_resp.get('seed')
|
||||
if returned_seed is not None:
|
||||
record.seed = returned_seed
|
||||
|
||||
if new_status == 'completed':
|
||||
video_url = extract_video_url(ark_resp)
|
||||
if video_url:
|
||||
try:
|
||||
from utils.tos_client import upload_from_url
|
||||
record.result_url = upload_from_url(video_url, folder='results')
|
||||
except Exception:
|
||||
logger.exception('Failed to persist video to TOS')
|
||||
record.result_url = video_url
|
||||
|
||||
usage = ark_resp.get('usage', {})
|
||||
total_tokens = usage.get('total_tokens', 0) if isinstance(usage, dict) else 0
|
||||
if total_tokens > 0:
|
||||
from apps.generation.views import _settle_payment
|
||||
_settle_payment(record, total_tokens)
|
||||
else:
|
||||
from apps.generation.views import _release_freeze
|
||||
_release_freeze(record)
|
||||
|
||||
elif new_status == 'failed':
|
||||
error = ark_resp.get('error', {})
|
||||
code = error.get('code', '') if isinstance(error, dict) else ''
|
||||
raw_msg = error.get('message', '') if isinstance(error, dict) else str(error)
|
||||
record.error_message = ERROR_MESSAGES.get(code, raw_msg)
|
||||
record.raw_error = f'{code}: {raw_msg}' if code else raw_msg
|
||||
|
||||
usage = ark_resp.get('usage', {})
|
||||
total_tokens = usage.get('total_tokens', 0) if isinstance(usage, dict) else 0
|
||||
if total_tokens > 0:
|
||||
from apps.generation.views import _settle_payment
|
||||
_settle_payment(record, total_tokens)
|
||||
else:
|
||||
from apps.generation.views import _release_freeze
|
||||
_release_freeze(record)
|
||||
|
||||
record.completed_at = timezone.now()
|
||||
record.save(update_fields=[
|
||||
'status', 'result_url', 'error_message', 'raw_error',
|
||||
'seed', 'completed_at',
|
||||
])
|
||||
resolved += 1
|
||||
self.stdout.write(f' [{record.id}] ark={ark_task_id} -> {new_status}')
|
||||
|
||||
self.stdout.write(f'Done. Resolved {resolved}/{count} tasks.')
|
||||
@ -1,4 +1,4 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-16 07:00
|
||||
# Generated by Django 4.2 on 2026-03-15 21:45
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
@ -6,13 +6,20 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0003_generationrecord_ark_task_id_and_more'),
|
||||
("generation", "0003_generationrecord_ark_task_id_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='generationrecord',
|
||||
name='model',
|
||||
field=models.CharField(choices=[('seedance_2.0', 'AirDrama'), ('seedance_2.0_fast', 'AirDrama Fast')], max_length=30, verbose_name='模型'),
|
||||
model_name="generationrecord",
|
||||
name="model",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("seedance_2.0", "AirDrama"),
|
||||
("seedance_2.0_fast", "AirDrama Fast"),
|
||||
],
|
||||
max_length=30,
|
||||
verbose_name="模型",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
26
backend/apps/generation/migrations/0005_convert_utf8mb4.py
Normal file
26
backend/apps/generation/migrations/0005_convert_utf8mb4.py
Normal file
@ -0,0 +1,26 @@
|
||||
"""Convert GenerationRecord table to utf8mb4 to support emoji/4-byte Unicode in prompt field.
|
||||
|
||||
Bug #65: OperationalError (1366) "Incorrect string value" when prompt contains emoji characters.
|
||||
"""
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0004_alter_generationrecord_model'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunSQL(
|
||||
sql=[
|
||||
"ALTER TABLE generation_generationrecord CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;",
|
||||
"ALTER TABLE generation_quotaconfig CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;",
|
||||
],
|
||||
reverse_sql=[
|
||||
"ALTER TABLE generation_generationrecord CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;",
|
||||
"ALTER TABLE generation_quotaconfig CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;",
|
||||
],
|
||||
),
|
||||
]
|
||||
@ -1,23 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-17 16:23
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0004_alter_generationrecord_model'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='max_desktop_sessions',
|
||||
field=models.IntegerField(default=1, verbose_name='每用户最大桌面端会话数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='max_mobile_sessions',
|
||||
field=models.IntegerField(default=0, verbose_name='每用户最大移动端会话数'),
|
||||
),
|
||||
]
|
||||
@ -1,93 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-18 12:11
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0005_quotaconfig_max_desktop_sessions_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='alert_cooldown_seconds',
|
||||
field=models.IntegerField(default=1800, verbose_name='告警冷却时间(秒)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='anomaly_detection_enabled',
|
||||
field=models.BooleanField(default=False, verbose_name='异常检测总开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='feishu_alert_mobiles',
|
||||
field=models.CharField(blank=True, default='', max_length=500, verbose_name='飞书告警接收人手机号'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r1_enabled_default',
|
||||
field=models.BooleanField(default=True, verbose_name='R1 默认开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r2_enabled_default',
|
||||
field=models.BooleanField(default=True, verbose_name='R2 默认开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r2_window_seconds',
|
||||
field=models.IntegerField(default=3600, verbose_name='R2 默认时间窗口(秒)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r3_enabled_default',
|
||||
field=models.BooleanField(default=True, verbose_name='R3 默认开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r3_max_count',
|
||||
field=models.IntegerField(default=10, verbose_name='R3 默认最大登录次数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r3_window_seconds',
|
||||
field=models.IntegerField(default=3600, verbose_name='R3 默认时间窗口(秒)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r4_city_count',
|
||||
field=models.IntegerField(default=5, verbose_name='R4 默认预期外城市数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r4_enabled_default',
|
||||
field=models.BooleanField(default=True, verbose_name='R4 默认开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r4_window_seconds',
|
||||
field=models.IntegerField(default=3600, verbose_name='R4 默认时间窗口(秒)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r5_country_count',
|
||||
field=models.IntegerField(default=10, verbose_name='R5 默认海外国家数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r5_days',
|
||||
field=models.IntegerField(default=7, verbose_name='R5 默认统计天数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='r5_enabled_default',
|
||||
field=models.BooleanField(default=True, verbose_name='R5 默认开关'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='sms_alert_mobiles',
|
||||
field=models.CharField(blank=True, default='', max_length=500, verbose_name='短信告警手机号(预留)'),
|
||||
),
|
||||
]
|
||||
@ -1,53 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-20 11:53
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0006_anomaly_detection_phase2'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='base_cost_amount',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='平台成本(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='cost_amount',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='用户费用(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='frozen_amount',
|
||||
field=models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='冻结金额(元)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='resolution',
|
||||
field=models.CharField(blank=True, default='', max_length=10, verbose_name='分辨率'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='tokens_consumed',
|
||||
field=models.IntegerField(default=0, verbose_name='消耗tokens'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='base_token_price',
|
||||
field=models.DecimalField(decimal_places=2, default=46, max_digits=10, verbose_name='基础token单价(元/百万tokens)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='default_daily_generation_limit',
|
||||
field=models.IntegerField(default=50, verbose_name='默认每日生成次数'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='default_monthly_generation_limit',
|
||||
field=models.IntegerField(default=1500, verbose_name='默认每月生成次数'),
|
||||
),
|
||||
]
|
||||
@ -1,53 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-21 09:44
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('accounts', '0010_billing_data_migration'),
|
||||
('generation', '0007_billing_system_v010'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='AssetGroup',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('remote_group_id', models.CharField(default='', max_length=100, verbose_name='火山Group ID')),
|
||||
('name', models.CharField(default='', max_length=100, verbose_name='角色名')),
|
||||
('description', models.CharField(blank=True, default='', max_length=300, verbose_name='描述')),
|
||||
('thumbnail_url', models.CharField(blank=True, default='', max_length=1000, verbose_name='缩略图URL')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
|
||||
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_asset_groups', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
|
||||
('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='asset_groups', to='accounts.team', verbose_name='所属团队')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '素材组',
|
||||
'verbose_name_plural': '素材组',
|
||||
'ordering': ['-created_at'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Asset',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('remote_asset_id', models.CharField(default='', max_length=100, verbose_name='火山Asset ID')),
|
||||
('name', models.CharField(default='', max_length=100, verbose_name='素材名称')),
|
||||
('url', models.CharField(blank=True, default='', max_length=1000, verbose_name='图片URL')),
|
||||
('status', models.CharField(choices=[('processing', '处理中'), ('active', '可用'), ('failed', '失败')], default='processing', max_length=20, verbose_name='状态')),
|
||||
('error_message', models.CharField(blank=True, default='', max_length=500, verbose_name='错误信息')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
|
||||
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='generation.assetgroup', verbose_name='所属素材组')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '素材',
|
||||
'verbose_name_plural': '素材',
|
||||
'ordering': ['-created_at'],
|
||||
},
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-22 11:56
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0008_asset_library'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='is_favorited',
|
||||
field=models.BooleanField(default=False, verbose_name='已收藏'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-22 14:27
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0009_generationrecord_is_favorited'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='seed',
|
||||
field=models.BigIntegerField(default=-1, verbose_name='种子值'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-24 17:01
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0010_generationrecord_seed'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='completed_at',
|
||||
field=models.DateTimeField(blank=True, null=True, verbose_name='完成时间'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-25 02:39
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0011_add_completed_at'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='raw_error',
|
||||
field=models.TextField(blank=True, default='', verbose_name='原始错误信息'),
|
||||
),
|
||||
]
|
||||
@ -1,23 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-26 13:29
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0012_add_raw_error'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='base_token_price_video',
|
||||
field=models.DecimalField(decimal_places=2, default=28, max_digits=10, verbose_name='基础token单价-含视频(元/百万tokens)'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='quotaconfig',
|
||||
name='base_token_price',
|
||||
field=models.DecimalField(decimal_places=2, default=46, max_digits=10, verbose_name='基础token单价-不含视频(元/百万tokens)'),
|
||||
),
|
||||
]
|
||||
@ -1,16 +0,0 @@
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0013_add_video_token_price'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='updated_at',
|
||||
field=models.DateTimeField(auto_now=True, verbose_name='更新时间'),
|
||||
),
|
||||
]
|
||||
@ -1,23 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-29 13:30
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0014_add_updated_at_to_record'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='base_token_price_fast',
|
||||
field=models.DecimalField(decimal_places=2, default=37, max_digits=10, verbose_name='Fast单价-不含视频(元/百万tokens)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quotaconfig',
|
||||
name='base_token_price_fast_video',
|
||||
field=models.DecimalField(decimal_places=2, default=22, max_digits=10, verbose_name='Fast单价-含视频(元/百万tokens)'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-03-31 05:03
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0015_add_fast_token_price'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='is_deleted',
|
||||
field=models.BooleanField(default=False, verbose_name='用户已删除'),
|
||||
),
|
||||
]
|
||||
@ -1,23 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-04-04 05:39
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0016_add_is_deleted_to_generationrecord'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='asset',
|
||||
name='asset_type',
|
||||
field=models.CharField(choices=[('Image', '图像'), ('Video', '视频'), ('Audio', '音频')], default='Image', max_length=10, verbose_name='素材类型'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='asset',
|
||||
name='url',
|
||||
field=models.CharField(blank=True, default='', max_length=1000, verbose_name='素材URL'),
|
||||
),
|
||||
]
|
||||
@ -1,28 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-04-04 09:02
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0017_add_asset_type'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='asset',
|
||||
name='duration',
|
||||
field=models.FloatField(default=0, verbose_name='时长(秒)'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='asset',
|
||||
name='thumbnail_url',
|
||||
field=models.CharField(blank=True, default='', max_length=1000, verbose_name='缩略图URL'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generationrecord',
|
||||
name='thumbnail_url',
|
||||
field=models.CharField(blank=True, default='', max_length=1000, verbose_name='视频缩略图URL'),
|
||||
),
|
||||
]
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.29 on 2026-04-04 17:59
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('generation', '0018_add_thumbnail_and_duration'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='asset',
|
||||
name='duration',
|
||||
field=models.FloatField(default=None, null=True, verbose_name='时长(秒)'),
|
||||
),
|
||||
]
|
||||
@ -34,31 +34,18 @@ class GenerationRecord(models.Model):
|
||||
aspect_ratio = models.CharField(max_length=10, verbose_name='宽高比')
|
||||
duration = models.IntegerField(verbose_name='视频时长(秒)')
|
||||
seconds_consumed = models.FloatField(default=0, verbose_name='消费秒数')
|
||||
# ── 金额计费字段(v0.10.0 新增) ──
|
||||
tokens_consumed = models.IntegerField(default=0, verbose_name='消耗tokens')
|
||||
cost_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='用户费用(元)')
|
||||
base_cost_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='平台成本(元)')
|
||||
frozen_amount = models.DecimalField(max_digits=12, decimal_places=2, default=0, verbose_name='冻结金额(元)')
|
||||
resolution = models.CharField(max_length=10, blank=True, default='', verbose_name='分辨率')
|
||||
status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='queued', verbose_name='状态')
|
||||
result_url = models.CharField(max_length=1000, blank=True, default='', verbose_name='生成结果URL')
|
||||
thumbnail_url = models.CharField(max_length=1000, blank=True, default='', verbose_name='视频缩略图URL')
|
||||
error_message = models.TextField(blank=True, default='', verbose_name='错误信息')
|
||||
raw_error = models.TextField(blank=True, default='', verbose_name='原始错误信息')
|
||||
reference_urls = models.JSONField(default=list, blank=True, verbose_name='参考素材信息')
|
||||
is_favorited = models.BooleanField(default=False, verbose_name='已收藏')
|
||||
is_deleted = models.BooleanField(default=False, verbose_name='用户已删除')
|
||||
seed = models.BigIntegerField(default=-1, verbose_name='种子值')
|
||||
created_at = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='创建时间')
|
||||
updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间')
|
||||
completed_at = models.DateTimeField(null=True, blank=True, verbose_name='完成时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '生成记录'
|
||||
verbose_name_plural = '生成记录'
|
||||
ordering = ['-created_at']
|
||||
indexes = [
|
||||
models.Index(fields=['user', 'created_at']),
|
||||
models.Index(fields=['user', 'created_at'], name='generation__user_id_371350_idx'),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
@ -66,37 +53,11 @@ class GenerationRecord(models.Model):
|
||||
|
||||
|
||||
class QuotaConfig(models.Model):
|
||||
"""Global quota configuration (singleton) — Phase 3: seconds + announcement + anomaly detection."""
|
||||
"""Global quota configuration (singleton) — Phase 3: seconds + announcement."""
|
||||
default_daily_seconds_limit = models.IntegerField(default=600, verbose_name='默认每日秒数上限')
|
||||
default_monthly_seconds_limit = models.IntegerField(default=6000, verbose_name='默认每月秒数上限')
|
||||
announcement = models.TextField(blank=True, default='', verbose_name='系统公告')
|
||||
announcement_enabled = models.BooleanField(default=False, verbose_name='启用公告')
|
||||
max_desktop_sessions = models.IntegerField(default=1, verbose_name='每用户最大桌面端会话数')
|
||||
max_mobile_sessions = models.IntegerField(default=0, verbose_name='每用户最大移动端会话数')
|
||||
# ── 异常检测全局默认配置 ──
|
||||
anomaly_detection_enabled = models.BooleanField(default=False, verbose_name='异常检测总开关')
|
||||
r1_enabled_default = models.BooleanField(default=True, verbose_name='R1 默认开关')
|
||||
r2_enabled_default = models.BooleanField(default=True, verbose_name='R2 默认开关')
|
||||
r2_window_seconds = models.IntegerField(default=3600, verbose_name='R2 默认时间窗口(秒)')
|
||||
r3_enabled_default = models.BooleanField(default=True, verbose_name='R3 默认开关')
|
||||
r3_window_seconds = models.IntegerField(default=3600, verbose_name='R3 默认时间窗口(秒)')
|
||||
r3_max_count = models.IntegerField(default=10, verbose_name='R3 默认最大登录次数')
|
||||
r4_enabled_default = models.BooleanField(default=True, verbose_name='R4 默认开关')
|
||||
r4_window_seconds = models.IntegerField(default=3600, verbose_name='R4 默认时间窗口(秒)')
|
||||
r4_city_count = models.IntegerField(default=5, verbose_name='R4 默认预期外城市数')
|
||||
r5_enabled_default = models.BooleanField(default=True, verbose_name='R5 默认开关')
|
||||
r5_days = models.IntegerField(default=7, verbose_name='R5 默认统计天数')
|
||||
r5_country_count = models.IntegerField(default=10, verbose_name='R5 默认海外国家数')
|
||||
feishu_alert_mobiles = models.CharField(max_length=500, blank=True, default='', verbose_name='飞书告警接收人手机号')
|
||||
sms_alert_mobiles = models.CharField(max_length=500, blank=True, default='', verbose_name='短信告警手机号(预留)')
|
||||
alert_cooldown_seconds = models.IntegerField(default=1800, verbose_name='告警冷却时间(秒)')
|
||||
# ── 计费全局配置(v0.10.0 新增) ──
|
||||
default_daily_generation_limit = models.IntegerField(default=50, verbose_name='默认每日生成次数')
|
||||
default_monthly_generation_limit = models.IntegerField(default=1500, verbose_name='默认每月生成次数')
|
||||
base_token_price = models.DecimalField(max_digits=10, decimal_places=2, default=46, verbose_name='基础token单价-不含视频(元/百万tokens)')
|
||||
base_token_price_video = models.DecimalField(max_digits=10, decimal_places=2, default=28, verbose_name='基础token单价-含视频(元/百万tokens)')
|
||||
base_token_price_fast = models.DecimalField(max_digits=10, decimal_places=2, default=37, verbose_name='Fast单价-不含视频(元/百万tokens)')
|
||||
base_token_price_fast_video = models.DecimalField(max_digits=10, decimal_places=2, default=22, verbose_name='Fast单价-含视频(元/百万tokens)')
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
@ -109,64 +70,3 @@ class QuotaConfig(models.Model):
|
||||
|
||||
def __str__(self):
|
||||
return f'全局配额: {self.default_daily_seconds_limit}s/日, {self.default_monthly_seconds_limit}s/月'
|
||||
|
||||
|
||||
class AssetGroup(models.Model):
|
||||
"""虚拟人像素材组 — 一个角色对应一个组。"""
|
||||
team = models.ForeignKey(
|
||||
'accounts.Team', on_delete=models.CASCADE,
|
||||
related_name='asset_groups', verbose_name='所属团队',
|
||||
)
|
||||
remote_group_id = models.CharField(max_length=100, default='', verbose_name='火山Group ID')
|
||||
name = models.CharField(max_length=100, default='', verbose_name='角色名')
|
||||
description = models.CharField(max_length=300, blank=True, default='', verbose_name='描述')
|
||||
thumbnail_url = models.CharField(max_length=1000, blank=True, default='', verbose_name='缩略图URL')
|
||||
created_by = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.SET_NULL,
|
||||
null=True, blank=True, related_name='created_asset_groups', verbose_name='创建人',
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '素材组'
|
||||
verbose_name_plural = '素材组'
|
||||
ordering = ['-created_at']
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.team.name} - {self.name}'
|
||||
|
||||
|
||||
class Asset(models.Model):
|
||||
"""虚拟人像素材 — 图片/视频/音频。"""
|
||||
STATUS_CHOICES = [
|
||||
('processing', '处理中'),
|
||||
('active', '可用'),
|
||||
('failed', '失败'),
|
||||
]
|
||||
ASSET_TYPE_CHOICES = [
|
||||
('Image', '图像'),
|
||||
('Video', '视频'),
|
||||
('Audio', '音频'),
|
||||
]
|
||||
|
||||
group = models.ForeignKey(
|
||||
AssetGroup, on_delete=models.CASCADE,
|
||||
related_name='assets', verbose_name='所属素材组',
|
||||
)
|
||||
remote_asset_id = models.CharField(max_length=100, default='', verbose_name='火山Asset ID')
|
||||
name = models.CharField(max_length=100, default='', verbose_name='素材名称')
|
||||
url = models.CharField(max_length=1000, blank=True, default='', verbose_name='素材URL')
|
||||
asset_type = models.CharField(max_length=10, choices=ASSET_TYPE_CHOICES, default='Image', verbose_name='素材类型')
|
||||
thumbnail_url = models.CharField(max_length=1000, blank=True, default='', verbose_name='缩略图URL')
|
||||
duration = models.FloatField(null=True, default=None, verbose_name='时长(秒)')
|
||||
status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='processing', verbose_name='状态')
|
||||
error_message = models.CharField(max_length=500, blank=True, default='', verbose_name='错误信息')
|
||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
|
||||
|
||||
class Meta:
|
||||
verbose_name = '素材'
|
||||
verbose_name_plural = '素材'
|
||||
ordering = ['-created_at']
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.group.name} - {self.name}'
|
||||
|
||||
@ -11,9 +11,8 @@ class VideoGenerateSerializer(serializers.Serializer):
|
||||
|
||||
|
||||
class QuotaUpdateSerializer(serializers.Serializer):
|
||||
daily_generation_limit = serializers.IntegerField(min_value=-1)
|
||||
monthly_generation_limit = serializers.IntegerField(min_value=-1)
|
||||
spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||||
daily_seconds_limit = serializers.IntegerField(min_value=-1)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=-1)
|
||||
|
||||
|
||||
class UserStatusSerializer(serializers.Serializer):
|
||||
@ -26,41 +25,14 @@ class AdminCreateUserSerializer(serializers.Serializer):
|
||||
password = serializers.CharField(min_length=6)
|
||||
daily_seconds_limit = serializers.IntegerField(min_value=-1, required=False, default=600)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=-1, required=False, default=6000)
|
||||
daily_generation_limit = serializers.IntegerField(min_value=-1, required=False, default=50)
|
||||
monthly_generation_limit = serializers.IntegerField(min_value=-1, required=False, default=1500)
|
||||
is_staff = serializers.BooleanField(required=False, default=False)
|
||||
|
||||
|
||||
class SystemSettingsSerializer(serializers.Serializer):
|
||||
default_daily_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||||
default_monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||||
default_daily_generation_limit = serializers.IntegerField(min_value=0, required=False)
|
||||
default_monthly_generation_limit = serializers.IntegerField(min_value=0, required=False)
|
||||
base_token_price = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||||
base_token_price_video = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||||
base_token_price_fast = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||||
base_token_price_fast_video = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||||
default_daily_seconds_limit = serializers.IntegerField(min_value=0)
|
||||
default_monthly_seconds_limit = serializers.IntegerField(min_value=0)
|
||||
announcement = serializers.CharField(required=False, allow_blank=True, default='')
|
||||
announcement_enabled = serializers.BooleanField(required=False, default=False)
|
||||
max_desktop_sessions = serializers.IntegerField(min_value=1, required=False, default=1)
|
||||
max_mobile_sessions = serializers.IntegerField(min_value=0, required=False, default=0)
|
||||
# 异常检测配置
|
||||
anomaly_detection_enabled = serializers.BooleanField(required=False, default=False)
|
||||
r1_enabled_default = serializers.BooleanField(required=False, default=True)
|
||||
r2_enabled_default = serializers.BooleanField(required=False, default=True)
|
||||
r2_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||||
r3_enabled_default = serializers.BooleanField(required=False, default=True)
|
||||
r3_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||||
r3_max_count = serializers.IntegerField(min_value=1, required=False, default=10)
|
||||
r4_enabled_default = serializers.BooleanField(required=False, default=True)
|
||||
r4_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||||
r4_city_count = serializers.IntegerField(min_value=1, required=False, default=5)
|
||||
r5_enabled_default = serializers.BooleanField(required=False, default=True)
|
||||
r5_days = serializers.IntegerField(min_value=1, required=False, default=7)
|
||||
r5_country_count = serializers.IntegerField(min_value=1, required=False, default=10)
|
||||
feishu_alert_mobiles = serializers.CharField(required=False, allow_blank=True, default='')
|
||||
sms_alert_mobiles = serializers.CharField(required=False, allow_blank=True, default='')
|
||||
alert_cooldown_seconds = serializers.IntegerField(min_value=0, required=False, default=1800)
|
||||
|
||||
|
||||
# ── Team serializers ──
|
||||
@ -69,42 +41,17 @@ class TeamCreateSerializer(serializers.Serializer):
|
||||
name = serializers.CharField(max_length=100)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False, default=6000)
|
||||
daily_member_limit_default = serializers.IntegerField(min_value=0, required=False, default=600)
|
||||
markup_percentage = serializers.DecimalField(max_digits=5, decimal_places=2, min_value=0, required=True)
|
||||
monthly_spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False, default=-1)
|
||||
daily_member_spending_default = serializers.DecimalField(max_digits=12, decimal_places=2, required=False, default=50)
|
||||
max_concurrent_tasks = serializers.IntegerField(min_value=0, required=False, default=5)
|
||||
expected_regions = serializers.CharField(max_length=500, required=True)
|
||||
|
||||
|
||||
class TeamUpdateSerializer(serializers.Serializer):
|
||||
name = serializers.CharField(max_length=100, required=False)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||||
daily_member_limit_default = serializers.IntegerField(min_value=0, required=False)
|
||||
markup_percentage = serializers.DecimalField(max_digits=5, decimal_places=2, min_value=0, required=False)
|
||||
monthly_spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||||
daily_member_spending_default = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||||
max_concurrent_tasks = serializers.IntegerField(min_value=0, required=False)
|
||||
is_active = serializers.BooleanField(required=False)
|
||||
expected_regions = serializers.CharField(max_length=500, required=False, allow_blank=True)
|
||||
|
||||
|
||||
class TeamAnomalyConfigSerializer(serializers.Serializer):
|
||||
r1_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||
r2_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||
r2_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||||
r3_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||
r3_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||||
r3_max_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||||
r4_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||
r4_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||||
r4_city_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||||
r5_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||||
r5_days = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||||
r5_country_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||||
|
||||
|
||||
class TeamTopUpSerializer(serializers.Serializer):
|
||||
amount = serializers.DecimalField(max_digits=12, decimal_places=2, min_value=0.01)
|
||||
seconds = serializers.IntegerField(min_value=1)
|
||||
|
||||
|
||||
class TeamAdminCreateSerializer(serializers.Serializer):
|
||||
@ -120,11 +67,8 @@ class TeamMemberCreateSerializer(serializers.Serializer):
|
||||
password = serializers.CharField(min_length=6)
|
||||
daily_seconds_limit = serializers.IntegerField(min_value=-1, required=False)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=-1, required=False)
|
||||
daily_generation_limit = serializers.IntegerField(min_value=-1, required=False)
|
||||
monthly_generation_limit = serializers.IntegerField(min_value=-1, required=False)
|
||||
|
||||
|
||||
class MemberQuotaSerializer(serializers.Serializer):
|
||||
daily_generation_limit = serializers.IntegerField(min_value=-1)
|
||||
monthly_generation_limit = serializers.IntegerField(min_value=-1)
|
||||
spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||||
daily_seconds_limit = serializers.IntegerField(min_value=-1)
|
||||
monthly_seconds_limit = serializers.IntegerField(min_value=-1)
|
||||
|
||||
@ -1,215 +0,0 @@
|
||||
"""Celery tasks for async video generation polling."""
|
||||
|
||||
import logging
|
||||
|
||||
from celery import shared_task
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@shared_task(ignore_result=True)
|
||||
def poll_video_task(record_id):
|
||||
"""Poll Volcano API once for a video generation task.
|
||||
|
||||
一次性任务:查一次 API,更新 DB,结束。
|
||||
由 recover_stuck_tasks(beat 每10秒调度)统一驱动,不再自己 retry。
|
||||
用 Redis 锁防止 _handle_completed 期间被重复 dispatch。
|
||||
"""
|
||||
from django.core.cache import cache
|
||||
|
||||
# Redis 锁:防止同一 record 被并发处理(_handle_completed 耗时较长)
|
||||
lock_key = f'poll_lock:{record_id}'
|
||||
if not cache.add(lock_key, '1', timeout=120):
|
||||
return
|
||||
|
||||
try:
|
||||
_do_poll(record_id)
|
||||
except Exception:
|
||||
logger.exception('poll_video_task: unexpected error for record=%s', record_id)
|
||||
finally:
|
||||
cache.delete(lock_key)
|
||||
|
||||
|
||||
def _do_poll(record_id):
|
||||
"""实际轮询逻辑,由 poll_video_task 调用。"""
|
||||
from django.utils import timezone
|
||||
from apps.generation.models import GenerationRecord
|
||||
from utils.airdrama_client import query_task, map_status
|
||||
|
||||
try:
|
||||
record = GenerationRecord.objects.get(pk=record_id)
|
||||
except GenerationRecord.DoesNotExist:
|
||||
logger.warning('poll_video_task: record %s not found', record_id)
|
||||
return
|
||||
|
||||
if record.status not in ('queued', 'processing'):
|
||||
return
|
||||
|
||||
ark_task_id = record.ark_task_id
|
||||
if not ark_task_id:
|
||||
logger.warning('poll_video_task: record %s has no ark_task_id', record_id)
|
||||
return
|
||||
|
||||
# Poll Volcano API
|
||||
try:
|
||||
ark_resp = query_task(ark_task_id)
|
||||
new_status = map_status(ark_resp.get('status', ''))
|
||||
except Exception:
|
||||
logger.exception('poll_video_task: API query failed for record=%s ark=%s', record_id, ark_task_id)
|
||||
return
|
||||
|
||||
if new_status in ('queued', 'processing'):
|
||||
record.status = new_status
|
||||
record.save(update_fields=['status', 'updated_at'])
|
||||
return
|
||||
|
||||
# Terminal state reached — process result
|
||||
record.status = new_status
|
||||
|
||||
returned_seed = ark_resp.get('seed')
|
||||
if returned_seed is not None:
|
||||
record.seed = returned_seed
|
||||
|
||||
if new_status == 'completed':
|
||||
_handle_completed(record, ark_resp)
|
||||
elif new_status == 'failed':
|
||||
_handle_failed(record, ark_resp)
|
||||
|
||||
record.completed_at = timezone.now()
|
||||
record.save(update_fields=[
|
||||
'status', 'result_url', 'thumbnail_url', 'error_message', 'raw_error',
|
||||
'seed', 'completed_at',
|
||||
])
|
||||
|
||||
logger.info(
|
||||
'poll_video_task: record=%s ark=%s final_status=%s',
|
||||
record_id, ark_task_id, new_status,
|
||||
)
|
||||
|
||||
|
||||
def _handle_completed(record, ark_resp):
|
||||
"""Process a completed task: persist video to TOS, extract thumbnail, settle payment."""
|
||||
import os
|
||||
from utils.airdrama_client import extract_video_url
|
||||
|
||||
video_url = extract_video_url(ark_resp)
|
||||
if video_url:
|
||||
# Download once to temp file, reuse for TOS upload + thumbnail extraction
|
||||
tmp_path = None
|
||||
try:
|
||||
from utils.media_utils import download_to_temp, extract_video_info_from_file
|
||||
from utils.tos_client import upload_from_file_path, upload_file
|
||||
|
||||
tmp_path = download_to_temp(video_url, '.mp4')
|
||||
|
||||
# Upload video to TOS from file (streaming, no full memory load)
|
||||
record.result_url = upload_from_file_path(tmp_path, folder='results', content_type='video/mp4')
|
||||
|
||||
# Extract thumbnail from the same local file (no second download)
|
||||
thumb_file, _ = extract_video_info_from_file(tmp_path)
|
||||
if thumb_file:
|
||||
record.thumbnail_url = upload_file(thumb_file, folder='thumbnails')
|
||||
except Exception:
|
||||
logger.exception('poll_video_task: failed to persist video / extract thumbnail')
|
||||
if not record.result_url:
|
||||
record.result_url = video_url
|
||||
record.error_message = '视频保存失败,临时链接将在24小时后过期,请联系管理员'
|
||||
finally:
|
||||
if tmp_path and os.path.exists(tmp_path):
|
||||
os.unlink(tmp_path)
|
||||
|
||||
# 结算:按实际 tokens 扣费
|
||||
usage = ark_resp.get('usage', {})
|
||||
total_tokens = usage.get('total_tokens', 0) if isinstance(usage, dict) else 0
|
||||
if total_tokens > 0:
|
||||
from apps.generation.views import _settle_payment
|
||||
_settle_payment(record, total_tokens)
|
||||
else:
|
||||
from apps.generation.views import _release_freeze
|
||||
_release_freeze(record)
|
||||
|
||||
|
||||
@shared_task(ignore_result=True)
|
||||
def recover_stuck_tasks():
|
||||
"""每30秒扫一次所有进行中的任务,统一派发轮询。
|
||||
|
||||
poll_video_task 是一次性任务,不再自己 retry,由这里统一驱动。
|
||||
"""
|
||||
from apps.generation.models import GenerationRecord
|
||||
|
||||
active_records = GenerationRecord.objects.filter(
|
||||
status__in=('queued', 'processing'),
|
||||
ark_task_id__isnull=False,
|
||||
).exclude(ark_task_id='').values_list('id', flat=True)
|
||||
|
||||
count = 0
|
||||
for record_id in active_records:
|
||||
try:
|
||||
poll_video_task.delay(record_id)
|
||||
count += 1
|
||||
except Exception:
|
||||
logger.error('recover_stuck_tasks: failed to dispatch record=%s', record_id)
|
||||
|
||||
if count:
|
||||
logger.info('recover_stuck_tasks: dispatched %d active tasks', count)
|
||||
|
||||
|
||||
def _handle_failed(record, ark_resp):
|
||||
"""Process a failed task: record error and release frozen amount."""
|
||||
from utils.airdrama_client import ERROR_MESSAGES
|
||||
|
||||
error = ark_resp.get('error', {})
|
||||
code = error.get('code', '') if isinstance(error, dict) else ''
|
||||
raw_msg = error.get('message', '') if isinstance(error, dict) else str(error)
|
||||
record.error_message = ERROR_MESSAGES.get(code, raw_msg)
|
||||
record.raw_error = f'{code}: {raw_msg}' if code else raw_msg
|
||||
|
||||
usage = ark_resp.get('usage', {})
|
||||
total_tokens = usage.get('total_tokens', 0) if isinstance(usage, dict) else 0
|
||||
if total_tokens > 0:
|
||||
from apps.generation.views import _settle_payment
|
||||
_settle_payment(record, total_tokens)
|
||||
else:
|
||||
from apps.generation.views import _release_freeze
|
||||
_release_freeze(record)
|
||||
|
||||
|
||||
@shared_task(ignore_result=True)
|
||||
def process_asset_media(asset_id):
|
||||
"""Extract thumbnail + duration for video/audio assets asynchronously."""
|
||||
from apps.generation.models import Asset
|
||||
try:
|
||||
asset = Asset.objects.select_related('group').get(pk=asset_id)
|
||||
except Asset.DoesNotExist:
|
||||
logger.warning('process_asset_media: asset %s not found', asset_id)
|
||||
return
|
||||
|
||||
from utils.media_utils import extract_video_info, get_audio_duration
|
||||
from utils.tos_client import upload_file
|
||||
|
||||
if asset.asset_type == 'Video':
|
||||
thumb_file, dur = extract_video_info(asset.url)
|
||||
if thumb_file:
|
||||
try:
|
||||
asset.thumbnail_url = upload_file(thumb_file, folder='thumbnails')
|
||||
except Exception:
|
||||
logger.exception('process_asset_media: thumbnail upload failed for asset %s', asset_id)
|
||||
asset.duration = dur if dur > 0 else None # None = ffprobe failed, frontend skips duration check
|
||||
asset.save(update_fields=['thumbnail_url', 'duration'])
|
||||
# Atomic update: only set group thumbnail if still empty (concurrent-safe)
|
||||
from apps.generation.models import AssetGroup
|
||||
from django.db import transaction
|
||||
try:
|
||||
with transaction.atomic():
|
||||
group = AssetGroup.objects.select_for_update().get(pk=asset.group_id)
|
||||
if not group.thumbnail_url and asset.thumbnail_url:
|
||||
group.thumbnail_url = asset.thumbnail_url
|
||||
group.save(update_fields=['thumbnail_url'])
|
||||
except AssetGroup.DoesNotExist:
|
||||
logger.warning('process_asset_media: group %s deleted, skipping thumbnail update', asset.group_id)
|
||||
elif asset.asset_type == 'Audio':
|
||||
dur = get_audio_duration(asset.url)
|
||||
asset.duration = dur if dur > 0 else None
|
||||
asset.save(update_fields=['duration'])
|
||||
|
||||
logger.info('process_asset_media: asset %s done (type=%s, dur=%s)', asset_id, asset.asset_type, asset.duration)
|
||||
@ -8,10 +8,8 @@ urlpatterns = [
|
||||
path('video/generate', views.video_generate_view, name='video_generate'),
|
||||
path('video/tasks', views.video_tasks_list_view, name='video_tasks_list'),
|
||||
path('video/tasks/<uuid:task_id>', views.video_task_detail_view, name='video_task_detail'),
|
||||
path('video/tasks/<uuid:task_id>/favorite', views.video_task_toggle_favorite_view, name='video_task_toggle_favorite'),
|
||||
# Public announcement
|
||||
path('announcement', views.announcement_view, name='announcement'),
|
||||
path('announcement/read', views.announcement_read_view, name='announcement_read'),
|
||||
|
||||
# ── Super Admin: Dashboard ──
|
||||
path('admin/stats', views.admin_stats_view, name='admin_stats'),
|
||||
@ -23,7 +21,6 @@ urlpatterns = [
|
||||
path('admin/teams/<int:team_id>/topup', views.admin_team_topup_view, name='admin_team_topup'),
|
||||
path('admin/teams/<int:team_id>/set-pool', views.admin_team_set_pool_view, name='admin_team_set_pool'),
|
||||
path('admin/teams/<int:team_id>/admin', views.admin_team_create_admin_view, name='admin_team_create_admin'),
|
||||
path('admin/teams/<int:team_id>/members/<int:member_id>/role', views.admin_team_member_role_view, name='admin_team_member_role'),
|
||||
|
||||
# ── Super Admin: User management ──
|
||||
path('admin/users', views.admin_users_list_view, name='admin_users_list'),
|
||||
@ -31,28 +28,12 @@ urlpatterns = [
|
||||
path('admin/users/<int:user_id>', views.admin_user_detail_view, name='admin_user_detail'),
|
||||
path('admin/users/<int:user_id>/quota', views.admin_user_quota_view, name='admin_user_quota'),
|
||||
path('admin/users/<int:user_id>/status', views.admin_user_status_view, name='admin_user_status'),
|
||||
path('admin/users/<int:user_id>/reset-password', views.admin_reset_password_view, name='admin_reset_password'),
|
||||
|
||||
# ── Super Admin: Records, Settings & Audit Logs ──
|
||||
path('admin/records', views.admin_records_view, name='admin_records'),
|
||||
path('admin/settings', views.admin_settings_view, name='admin_settings'),
|
||||
path('admin/logs', views.admin_audit_logs_view, name='admin_audit_logs'),
|
||||
|
||||
# ── Super Admin: Login Records ──
|
||||
path('admin/login-records', views.admin_login_records_view, name='admin_login_records'),
|
||||
|
||||
# ── Super Admin: Anomaly Detection ──
|
||||
path('admin/anomalies', views.admin_login_anomalies_view, name='admin_login_anomalies'),
|
||||
path('admin/test-feishu', views.admin_test_feishu_view, name='admin_test_feishu'),
|
||||
path('admin/test-sms', views.admin_test_sms_view, name='admin_test_sms'),
|
||||
path('admin/teams/<int:team_id>/auto-learn', views.admin_team_auto_learn_view, name='admin_team_auto_learn'),
|
||||
path('admin/teams/<int:team_id>/apply-learned-regions', views.admin_team_apply_learned_regions_view, name='admin_team_apply_learned_regions'),
|
||||
|
||||
# ── Super Admin: Content Assets ──
|
||||
path('admin/assets/overview', views.admin_assets_overview, name='admin_assets_overview'),
|
||||
path('admin/assets/team/<int:team_id>/members', views.admin_assets_team_members, name='admin_assets_team_members'),
|
||||
path('admin/assets/user/<int:user_id>/videos', views.admin_assets_user_videos, name='admin_assets_user_videos'),
|
||||
|
||||
# ── Team Admin: Team management ──
|
||||
path('team/info', views.team_info_view, name='team_info'),
|
||||
path('team/stats', views.team_stats_view, name='team_stats'),
|
||||
@ -61,24 +42,8 @@ urlpatterns = [
|
||||
path('team/members/<int:member_id>', views.team_member_detail_view, name='team_member_detail'),
|
||||
path('team/members/<int:member_id>/quota', views.team_member_quota_view, name='team_member_quota'),
|
||||
path('team/members/<int:member_id>/status', views.team_member_status_view, name='team_member_status'),
|
||||
path('team/members/<int:member_id>/role', views.team_member_role_view, name='team_member_role'),
|
||||
|
||||
# ── Team Admin: Consumption Records ──
|
||||
path('team/records', views.team_records_view, name='team_records'),
|
||||
|
||||
# ── Team Admin: Content Assets ──
|
||||
path('team/assets/overview', views.team_assets_overview, name='team_assets_overview'),
|
||||
path('team/assets/member/<int:member_id>/videos', views.team_assets_member_videos, name='team_assets_member_videos'),
|
||||
|
||||
# ── Profile: User's own data ──
|
||||
path('profile/overview', views.profile_overview_view, name='profile_overview'),
|
||||
path('profile/records', views.profile_records_view, name='profile_records'),
|
||||
|
||||
# ── Assets API (Virtual Avatar Library) ──
|
||||
path('assets/groups', views.asset_groups_view, name='asset_groups'),
|
||||
path('assets/groups/<int:group_id>', views.asset_group_detail_view, name='asset_group_detail'),
|
||||
path('assets/groups/<int:group_id>/assets', views.asset_group_add_asset_view, name='asset_group_add_asset'),
|
||||
path('assets/<int:asset_id>', views.asset_update_view, name='asset_update'),
|
||||
path('assets/<int:asset_id>/status', views.asset_poll_status_view, name='asset_poll_status'),
|
||||
path('assets/search', views.asset_search_view, name='asset_search'),
|
||||
]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,3 @@ try:
|
||||
pymysql.install_as_MySQLdb()
|
||||
except ImportError:
|
||||
pass # Docker uses mysqlclient natively
|
||||
|
||||
# Celery app — import so that @shared_task uses this app
|
||||
try:
|
||||
from .celery import app as celery_app
|
||||
__all__ = ('celery_app',)
|
||||
except ImportError:
|
||||
pass # celery not installed (local dev without redis)
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
"""Celery configuration for AirDrama backend."""
|
||||
|
||||
import os
|
||||
from celery import Celery
|
||||
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
|
||||
app = Celery('airdrama')
|
||||
app.config_from_object('django.conf:settings', namespace='CELERY')
|
||||
app.autodiscover_tasks(['apps.generation'])
|
||||
@ -6,23 +6,6 @@ from datetime import timedelta
|
||||
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
# 自动加载 .env.local(本地开发用,不进 git)
|
||||
_env_local = BASE_DIR / '.env.local'
|
||||
if _env_local.exists():
|
||||
with open(_env_local, encoding='utf-8') as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if not line or line.startswith('#'):
|
||||
continue
|
||||
# 去掉 export 前缀
|
||||
if line.startswith('export '):
|
||||
line = line[7:]
|
||||
key, _, value = line.partition('=')
|
||||
if key and _ == '=':
|
||||
# 去掉引号
|
||||
value = value.strip().strip('"').strip("'")
|
||||
os.environ.setdefault(key.strip(), value)
|
||||
|
||||
SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', '')
|
||||
if not SECRET_KEY:
|
||||
import warnings
|
||||
@ -42,7 +25,6 @@ INSTALLED_APPS = [
|
||||
'django.contrib.staticfiles',
|
||||
# Third party
|
||||
'rest_framework',
|
||||
'rest_framework_simplejwt.token_blacklist',
|
||||
'corsheaders',
|
||||
# Local apps
|
||||
'apps.accounts',
|
||||
@ -105,7 +87,7 @@ elif os.environ.get('USE_MYSQL', 'false').lower() in ('true', '1', 'yes'):
|
||||
'PORT': os.environ.get('DB_PORT', '3306'),
|
||||
'OPTIONS': {
|
||||
'charset': 'utf8mb4',
|
||||
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
|
||||
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'; SET NAMES utf8mb4;",
|
||||
},
|
||||
}
|
||||
}
|
||||
@ -128,7 +110,7 @@ AUTH_PASSWORD_VALIDATORS = [
|
||||
# REST Framework
|
||||
REST_FRAMEWORK = {
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': (
|
||||
'apps.accounts.authentication.SessionJWTAuthentication',
|
||||
'rest_framework_simplejwt.authentication.JWTAuthentication',
|
||||
),
|
||||
'DEFAULT_PERMISSION_CLASSES': (
|
||||
'rest_framework.permissions.IsAuthenticated',
|
||||
@ -150,10 +132,9 @@ REST_FRAMEWORK = {
|
||||
|
||||
# JWT settings
|
||||
SIMPLE_JWT = {
|
||||
'ACCESS_TOKEN_LIFETIME': timedelta(minutes=30),
|
||||
'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
|
||||
'ROTATE_REFRESH_TOKENS': True,
|
||||
'BLACKLIST_AFTER_ROTATION': False,
|
||||
'ACCESS_TOKEN_LIFETIME': timedelta(hours=2),
|
||||
'REFRESH_TOKEN_LIFETIME': timedelta(days=7),
|
||||
'ROTATE_REFRESH_TOKENS': False,
|
||||
'AUTH_HEADER_TYPES': ('Bearer',),
|
||||
}
|
||||
|
||||
@ -170,38 +151,16 @@ CORS_ALLOW_CREDENTIALS = True
|
||||
|
||||
CSRF_TRUSTED_ORIGINS = [o for o in CORS_ALLOWED_ORIGINS if o.startswith('https://')]
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# Celery (async task queue)
|
||||
# ──────────────────────────────────────────────
|
||||
CELERY_BROKER_URL = os.environ.get('REDIS_URL', 'redis://:vAhRnAA6VMco@redis-cngzyc2r77ka16g7a.redis.ivolces.com:6379/0')
|
||||
CELERY_RESULT_BACKEND = CELERY_BROKER_URL
|
||||
CELERY_ACCEPT_CONTENT = ['json']
|
||||
CELERY_TASK_SERIALIZER = 'json'
|
||||
CELERY_RESULT_SERIALIZER = 'json'
|
||||
CELERY_TIMEZONE = 'Asia/Shanghai'
|
||||
CELERY_BEAT_SCHEDULE = {
|
||||
'recover-stuck-tasks': {
|
||||
'task': 'apps.generation.tasks.recover_stuck_tasks',
|
||||
'schedule': 10, # 每 10 秒
|
||||
},
|
||||
}
|
||||
|
||||
LANGUAGE_CODE = 'zh-hans'
|
||||
TIME_ZONE = 'Asia/Shanghai'
|
||||
USE_I18N = True
|
||||
USE_TZ = False
|
||||
USE_TZ = True
|
||||
|
||||
STATIC_URL = 'static/'
|
||||
STATIC_ROOT = BASE_DIR / 'staticfiles'
|
||||
|
||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# IP Geolocation
|
||||
# ──────────────────────────────────────────────
|
||||
ALIYUN_IP_GEO_APPCODE = os.environ.get('ALIYUN_IP_GEO_APPCODE', '93a86e9dfc9e4c71bcd44baa4008e662')
|
||||
IP2REGION_DB_PATH = BASE_DIR / 'data' / 'ip2region.xdb'
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# Security headers (production)
|
||||
# ──────────────────────────────────────────────
|
||||
@ -226,18 +185,5 @@ TOS_CDN_DOMAIN = os.environ.get('TOS_CDN_DOMAIN', 'https://airdrama-media.tos-cn
|
||||
# ──────────────────────────────────────────────
|
||||
ARK_API_KEY = os.environ.get('ARK_API_KEY', '')
|
||||
ARK_BASE_URL = os.environ.get('ARK_BASE_URL', 'https://ark.cn-beijing.volces.com/api/v3')
|
||||
# 推理接入点 ID(优先使用,为空时降级到模型 ID)
|
||||
ARK_ENDPOINT_SEEDANCE = os.environ.get('ARK_ENDPOINT_SEEDANCE', '')
|
||||
ARK_ENDPOINT_SEEDANCE_FAST = os.environ.get('ARK_ENDPOINT_SEEDANCE_FAST', '')
|
||||
# Set to True when Seedance model is activated on ARK platform
|
||||
SEEDANCE_ENABLED = os.environ.get('SEEDANCE_ENABLED', 'false').lower() == 'true'
|
||||
# Set to True to enable the Assets API (virtual avatar library)
|
||||
ASSETS_API_ENABLED = os.environ.get('ASSETS_API_ENABLED', 'false').lower() == 'true'
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# Aliyun SMS (短信告警)
|
||||
# ──────────────────────────────────────────────
|
||||
ALIYUN_SMS_ACCESS_KEY = os.environ.get('ALIYUN_SMS_ACCESS_KEY', '')
|
||||
ALIYUN_SMS_ACCESS_SECRET = os.environ.get('ALIYUN_SMS_ACCESS_SECRET', '')
|
||||
ALIYUN_SMS_SIGN_NAME = os.environ.get('ALIYUN_SMS_SIGN_NAME', '广州气元科技')
|
||||
ALIYUN_SMS_TEMPLATE_CODE = os.environ.get('ALIYUN_SMS_TEMPLATE_CODE', 'SMS_503445109')
|
||||
|
||||
Binary file not shown.
@ -6,9 +6,3 @@ mysqlclient>=2.2,<3.0
|
||||
gunicorn>=21.2,<23.0
|
||||
tos>=2.7,<3.0
|
||||
requests>=2.31,<3.0
|
||||
ip-region>=1.0
|
||||
volcengine>=1.0.218
|
||||
Pillow>=10.0
|
||||
celery>=5.3,<6.0
|
||||
gevent>=24.2
|
||||
redis>=5.0,<6.0
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
"""
|
||||
临时替换 airdrama_client,让 query_task 始终返回 running。
|
||||
worker 启动时会 import 这个 mock 版本。
|
||||
"""
|
||||
import os
|
||||
import time
|
||||
import redis
|
||||
|
||||
# 用 Redis 做跨进程计数器
|
||||
_redis_url = os.environ.get('REDIS_URL', 'redis://localhost:6379/1')
|
||||
_r = redis.from_url(_redis_url)
|
||||
COUNTER_KEY = 'bench:poll_count'
|
||||
ACTIVE_KEY = 'bench:active'
|
||||
PEAK_KEY = 'bench:peak'
|
||||
TASKS_KEY = 'bench:tasks_seen'
|
||||
|
||||
|
||||
def query_task(task_id):
|
||||
"""始终返回 running,通过 Redis 统计并发"""
|
||||
pipe = _r.pipeline()
|
||||
pipe.incr(COUNTER_KEY)
|
||||
pipe.incr(ACTIVE_KEY)
|
||||
pipe.sadd(TASKS_KEY, task_id)
|
||||
pipe.execute()
|
||||
|
||||
# 检查并更新峰值
|
||||
active = int(_r.get(ACTIVE_KEY) or 0)
|
||||
peak = int(_r.get(PEAK_KEY) or 0)
|
||||
if active > peak:
|
||||
_r.set(PEAK_KEY, active)
|
||||
|
||||
time.sleep(0.2) # 模拟 200ms 网络延迟
|
||||
|
||||
_r.decr(ACTIVE_KEY)
|
||||
|
||||
return {'status': 'running'}
|
||||
|
||||
|
||||
def map_status(ark_status):
|
||||
mapping = {
|
||||
'running': 'processing',
|
||||
'submitted': 'queued',
|
||||
'queued': 'queued',
|
||||
'succeeded': 'completed',
|
||||
'failed': 'failed',
|
||||
}
|
||||
return mapping.get(ark_status, 'processing')
|
||||
|
||||
|
||||
def extract_video_url(resp):
|
||||
return None
|
||||
|
||||
|
||||
class AirDramaAPIError(Exception):
|
||||
def __init__(self, code, message, status_code=400):
|
||||
self.code = code
|
||||
self.api_message = message
|
||||
self.user_message = message
|
||||
super().__init__(f'{code}: {message}')
|
||||
|
||||
|
||||
ERROR_MESSAGES = {}
|
||||
|
||||
|
||||
def create_task(**kwargs):
|
||||
"""mock create_task"""
|
||||
return {'id': 'mock-task-id'}
|
||||
|
||||
|
||||
def download_video(url):
|
||||
return b''
|
||||
@ -1,179 +0,0 @@
|
||||
# Celery 轮询并发测试报告
|
||||
|
||||
> 测试日期:2026-04-04
|
||||
> 测试环境:本地 macOS → 火山云外网 Redis + MySQL
|
||||
|
||||
---
|
||||
|
||||
## 一、测试目的
|
||||
|
||||
验证 `poll_video_task` 从 `while True` + `time.sleep` 改为 `self.retry(countdown=5)` + gevent 协程池后,并发轮询能力的提升,目标支撑 1000 并发。
|
||||
|
||||
## 二、测试环境
|
||||
|
||||
| 项目 | 配置 |
|
||||
|------|------|
|
||||
| 本地机器 | Mac Studio, Apple Silicon |
|
||||
| Python | 3.14 |
|
||||
| Celery | 5.6.2 |
|
||||
| Worker 模式 | gevent, concurrency=200 |
|
||||
| Redis | 火山云外网 `redis-shzlsczo52dft8mia.redis.volces.com:6379/1` |
|
||||
| MySQL | 火山云外网 `mysql-8351f937d637-public.rds.volces.com:3306` |
|
||||
| 火山 API | Mock(始终返回 `running`,模拟 200ms 网络延迟) |
|
||||
|
||||
**注意**:本地通过公网访问火山云 Redis/MySQL,延迟较线上内网环境高约 30-50ms/次,实际线上性能会显著更好。
|
||||
|
||||
## 三、测试方法
|
||||
|
||||
1. 启动 mock worker:替换 `utils.airdrama_client` 为 mock 模块,`query_task` 始终返回 `running`
|
||||
2. 在 MySQL 中创建 N 条 `status=processing` 的测试记录
|
||||
3. 批量派发 `poll_video_task.delay(record.id)` 到 Redis
|
||||
4. 通过 Redis 计数器实时统计:总查询次数、当前并发、峰值并发、任务覆盖率
|
||||
5. 观察指定时长后输出结果
|
||||
|
||||
## 四、测试结果
|
||||
|
||||
### 测试 1:100 个并发任务(30 秒)
|
||||
|
||||
```
|
||||
时间 总查询 当前并发 峰值并发 QPS 任务覆盖
|
||||
------ -------- -------- -------- -------- ----------
|
||||
1s 44 3 6 44 45/100
|
||||
2s 52 2 6 8 53/100
|
||||
3s 63 3 6 11 64/100
|
||||
4s 86 5 8 23 70/100
|
||||
5s 101 4 8 15 80/100
|
||||
6s 115 4 8 14 91/100
|
||||
7s 129 4 8 14 100/100
|
||||
...
|
||||
30s 450 3 8 14 100/100
|
||||
```
|
||||
|
||||
| 指标 | 结果 |
|
||||
|------|------|
|
||||
| 总查询次数 | 451 |
|
||||
| 平均 QPS | 15.0 |
|
||||
| 峰值并发 | 8 |
|
||||
| 任务覆盖率 | **100/100 (100%)** |
|
||||
| 全覆盖耗时 | **7 秒** |
|
||||
| 结果 | **PASS** |
|
||||
|
||||
### 测试 2:500 个并发任务(30 秒)
|
||||
|
||||
```
|
||||
时间 总查询 当前并发 峰值并发 QPS 任务覆盖
|
||||
------ -------- -------- -------- -------- ----------
|
||||
1s 180 -1 2 180 139/500
|
||||
5s 234 -1 2 14 182/500
|
||||
10s 300 -1 2 13 232/500
|
||||
15s 368 -1 2 13 279/500
|
||||
20s 436 -1 2 13 331/500
|
||||
25s 504 0 2 14 381/500
|
||||
30s 572 -1 2 14 432/500
|
||||
```
|
||||
|
||||
| 指标 | 结果 |
|
||||
|------|------|
|
||||
| 总查询次数 | 573 |
|
||||
| 平均 QPS | 19.1 |
|
||||
| 峰值并发 | 2 |
|
||||
| 任务覆盖率 | **432/500 (86%)** |
|
||||
| 预估全覆盖 | ~35 秒 |
|
||||
| 结果 | **PASS** |
|
||||
|
||||
### 测试 3:1000 个并发任务(60 秒)
|
||||
|
||||
```
|
||||
时间 总查询 当前并发 峰值并发 QPS 任务覆盖
|
||||
------ -------- -------- -------- -------- ----------
|
||||
1s 323 0 3 323 254/1000
|
||||
5s 375 1 3 14 291/1000
|
||||
10s 439 -1 3 13 337/1000
|
||||
15s 504 1 3 13 387/1000
|
||||
20s 569 1 3 13 437/1000
|
||||
25s 632 0 3 12 485/1000
|
||||
30s 697 0 3 14 534/1000
|
||||
35s 761 -1 3 13 584/1000
|
||||
40s 826 1 3 13 634/1000
|
||||
45s 891 0 3 13 683/1000
|
||||
50s 955 0 3 12 732/1000
|
||||
55s 1020 1 3 13 782/1000
|
||||
60s 1085 0 3 14 830/1000
|
||||
```
|
||||
|
||||
| 指标 | 结果 |
|
||||
|------|------|
|
||||
| 总查询次数 | 1086 |
|
||||
| 平均 QPS | 18.1 |
|
||||
| 峰值并发 | 3 |
|
||||
| 任务覆盖率 | **831/1000 (83%)** |
|
||||
| 预估全覆盖 | ~75 秒(受公网延迟限制) |
|
||||
| 协程利用率 | 3/200 (1.5%) |
|
||||
| 结果 | **PASS**(稳定运行,无异常,无 OOM) |
|
||||
|
||||
**关键发现**:200 个协程峰值只用了 3 个,说明瓶颈完全在公网网络延迟,不在资源。
|
||||
|
||||
## 五、性能对比
|
||||
|
||||
| 指标 | 旧方案(while True + fork) | 新方案(self.retry + gevent) | 提升 |
|
||||
|------|---|---|---|
|
||||
| 最大并发轮询数 | **4**(= concurrency) | **1000+**(已验证) | **250x** |
|
||||
| Worker 占用方式 | 持续占用(sleep 期间不释放) | 每次查询仅占用毫秒级 | - |
|
||||
| Worker 重启后 | 任务丢失 | Redis 中自动恢复 | - |
|
||||
| 内存模式 | 4 进程常驻 ~280Mi | 1 进程 + 200 协程 ~100Mi | 节省 64% |
|
||||
| 最坏恢复时间 | ~20 分钟 | ~6 分钟(3 分钟 beat + 3 分钟门槛) | **3x** |
|
||||
|
||||
## 六、线上性能预估
|
||||
|
||||
本次测试受公网延迟影响,QPS 约 14-19。线上内网环境预估:
|
||||
|
||||
| 因素 | 本地测试(公网) | 线上预估(内网) |
|
||||
|------|---------|---------|
|
||||
| Redis RTT | ~30ms | ~1ms |
|
||||
| MySQL RTT | ~30ms | ~1ms |
|
||||
| 火山 API 延迟 | 200ms(mock) | 200-300ms(真实) |
|
||||
| 单次查询总耗时 | ~260ms | ~202ms |
|
||||
| 预估 QPS | 14-19 | **40-60** |
|
||||
| 1000 任务全覆盖 | ~75 秒 | **~20 秒** |
|
||||
|
||||
### 资源需求验证
|
||||
|
||||
```
|
||||
1000 任务 × 每 5 秒查一次 = 需要 200 QPS
|
||||
200 协程 × (1000ms / 202ms) = 可提供 990 QPS
|
||||
990 >> 200 → 当前配置绰绰有余
|
||||
```
|
||||
|
||||
| 项目 | 当前值 | 1000 并发是否足够 |
|
||||
|------|--------|-----------------|
|
||||
| gevent concurrency | 200 | 足够(只用了 1.5%) |
|
||||
| 内存 | 1Gi | 足够 |
|
||||
| CPU | 1000m | 足够 |
|
||||
| retry countdown | 5 秒 | 合适 |
|
||||
|
||||
## 七、测试文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `tests/test_poll_concurrency.py` | 测试脚本(worker + bench 两步执行) |
|
||||
| `tests/mock_airdrama.py` | Mock 火山 API 模块(通过 Redis 跨进程计数) |
|
||||
|
||||
### 运行方式
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
|
||||
# 终端 1:启动 mock worker
|
||||
python tests/test_poll_concurrency.py worker --concurrency 200
|
||||
|
||||
# 终端 2:派发任务 + 监控(可调整 --tasks 和 --duration)
|
||||
python tests/test_poll_concurrency.py bench --tasks 1000 --duration 60
|
||||
```
|
||||
|
||||
## 八、结论
|
||||
|
||||
1. 新方案在 **1000 个并发任务**下稳定运行 60 秒,无异常、无 OOM、无任务丢失
|
||||
2. 相比旧方案最大并发从 4 提升到 1000+,**提升 250 倍**
|
||||
3. 200 个协程峰值只用了 3 个,**当前配置无需加资源**即可支撑 1000 并发
|
||||
4. Worker 重启不再丢失任务,通过 Redis 队列自动恢复
|
||||
5. 公网测试 QPS 受延迟限制(~18),线上内网预估可达 40-60 QPS,1000 任务约 20 秒全覆盖
|
||||
@ -1,183 +0,0 @@
|
||||
"""
|
||||
Celery poll_video_task 并发压测(两步执行)
|
||||
|
||||
步骤 1:启动 worker(mock 火山 API)
|
||||
步骤 2:派发任务 + 监控
|
||||
|
||||
用法:
|
||||
cd backend && source venv/bin/activate
|
||||
|
||||
# 终端 1:启动 mock worker
|
||||
python tests/test_poll_concurrency.py worker
|
||||
|
||||
# 终端 2:派发 + 监控
|
||||
python tests/test_poll_concurrency.py bench --tasks 100 --duration 30
|
||||
"""
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
# 公共环境变量
|
||||
REDIS_URL = os.environ.get('REDIS_URL',
|
||||
'redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.volces.com:6379/1')
|
||||
os.environ['REDIS_URL'] = REDIS_URL
|
||||
os.environ['USE_MYSQL'] = 'true'
|
||||
os.environ.setdefault('DB_HOST', 'mysql-8351f937d637-public.rds.volces.com')
|
||||
os.environ.setdefault('DB_NAME', 'video_auto')
|
||||
os.environ.setdefault('DB_USER', 'zyc')
|
||||
os.environ.setdefault('DB_PASSWORD', 'Zyc188208')
|
||||
os.environ.setdefault('DB_PORT', '3306')
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
|
||||
|
||||
def cmd_worker(args):
|
||||
"""启动 worker,用 mock 替换真实 airdrama_client"""
|
||||
# gevent monkey-patch 必须在所有 import 之前
|
||||
from gevent import monkey
|
||||
monkey.patch_all()
|
||||
|
||||
# 用 mock 模块替换真实 airdrama_client
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
|
||||
import mock_airdrama
|
||||
sys.modules['utils.airdrama_client'] = mock_airdrama
|
||||
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
print(f'[worker] 启动中... (mock 火山 API, concurrency={args.concurrency})')
|
||||
print(f'[worker] Redis: {REDIS_URL}')
|
||||
|
||||
from config.celery import app
|
||||
app.Worker(
|
||||
pool='gevent',
|
||||
concurrency=args.concurrency,
|
||||
loglevel='INFO',
|
||||
without_heartbeat=True,
|
||||
without_mingle=True,
|
||||
without_gossip=True,
|
||||
).start()
|
||||
|
||||
|
||||
def cmd_bench(args):
|
||||
"""派发任务 + 监控"""
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
import redis as redis_lib
|
||||
r = redis_lib.from_url(REDIS_URL)
|
||||
|
||||
from apps.accounts.models import User, Team
|
||||
from apps.generation.models import GenerationRecord
|
||||
from apps.generation.tasks import poll_video_task
|
||||
|
||||
num_tasks = args.tasks
|
||||
duration = args.duration
|
||||
|
||||
print(f'\n{"="*60}')
|
||||
print(f' Celery gevent 轮询并发压测')
|
||||
print(f' 任务数: {num_tasks}')
|
||||
print(f' 观察时长: {duration} 秒')
|
||||
print(f' Redis: {REDIS_URL}')
|
||||
print(f'{"="*60}\n')
|
||||
|
||||
# 清空计数器
|
||||
for key in ['bench:poll_count', 'bench:active', 'bench:peak', 'bench:tasks_seen']:
|
||||
r.delete(key)
|
||||
|
||||
# 准备测试数据
|
||||
team, _ = Team.objects.get_or_create(name='压测团队', defaults={'total_seconds_pool': 999999})
|
||||
user, _ = User.objects.get_or_create(username='bench_user', defaults={
|
||||
'email': 'bench@test.com', 'team': team,
|
||||
})
|
||||
GenerationRecord.objects.filter(prompt__startswith='压测任务').delete()
|
||||
|
||||
records = []
|
||||
for i in range(num_tasks):
|
||||
record = GenerationRecord.objects.create(
|
||||
user=user,
|
||||
prompt=f'压测任务 {i}',
|
||||
mode='universal',
|
||||
model='seedance_2.0',
|
||||
aspect_ratio='16:9',
|
||||
duration=5,
|
||||
status='processing',
|
||||
ark_task_id=f'bench-{i:04d}',
|
||||
)
|
||||
records.append(record)
|
||||
print(f'[准备] 已创建 {num_tasks} 个测试记录')
|
||||
|
||||
# 清空队列
|
||||
r.delete('celery')
|
||||
print(f'[准备] 已清空 Redis 队列\n')
|
||||
|
||||
# 派发
|
||||
print(f'[派发] 正在派发 {num_tasks} 个轮询任务...')
|
||||
t0 = time.time()
|
||||
for record in records:
|
||||
poll_video_task.delay(record.id)
|
||||
print(f'[派发] 完成,耗时 {time.time()-t0:.1f} 秒\n')
|
||||
|
||||
# 监控
|
||||
print(f'[监控] 开始观察 {duration} 秒...\n')
|
||||
print(f' {"时间":>6s} {"总查询":>8s} {"当前并发":>8s} {"峰值并发":>8s} {"QPS":>8s} {"任务覆盖":>10s}')
|
||||
print(f' {"-"*6} {"-"*8} {"-"*8} {"-"*8} {"-"*8} {"-"*10}')
|
||||
|
||||
last_count = 0
|
||||
for sec in range(1, duration + 1):
|
||||
time.sleep(1)
|
||||
ct = int(r.get('bench:poll_count') or 0)
|
||||
ca = int(r.get('bench:active') or 0)
|
||||
cp = int(r.get('bench:peak') or 0)
|
||||
tp = r.scard('bench:tasks_seen')
|
||||
qps = ct - last_count
|
||||
last_count = ct
|
||||
print(f' {sec:>5d}s {ct:>8d} {ca:>8d} {cp:>8d} {qps:>8d} {tp:>9d}/{num_tasks}')
|
||||
|
||||
# 结果
|
||||
ft = int(r.get('bench:poll_count') or 0)
|
||||
fp = int(r.get('bench:peak') or 0)
|
||||
tp = r.scard('bench:tasks_seen')
|
||||
|
||||
print(f'\n{"="*60}')
|
||||
print(f' 测试结果')
|
||||
print(f'{"="*60}')
|
||||
print(f' 总查询次数: {ft}')
|
||||
print(f' 平均 QPS: {ft / duration:.1f}')
|
||||
print(f' 峰值并发查询: {fp}')
|
||||
print(f' 任务覆盖率: {tp}/{num_tasks} ({tp*100//num_tasks}%)')
|
||||
print(f'{"="*60}\n')
|
||||
|
||||
if tp == num_tasks:
|
||||
print(f' PASS: 所有 {num_tasks} 个任务都被成功轮询')
|
||||
else:
|
||||
print(f' WARNING: 只有 {tp}/{num_tasks} 个任务被轮询到')
|
||||
|
||||
# 清理(只清 Redis 计数器,DB 记录保留给 worker 查询)
|
||||
# 测试结束后手动清理:
|
||||
# python -c "import os,django;os.environ['DJANGO_SETTINGS_MODULE']='config.settings';os.environ['USE_MYSQL']='true';os.environ['DB_HOST']='mysql-8351f937d637-public.rds.volces.com';os.environ['DB_NAME']='video_auto';os.environ['DB_USER']='zyc';os.environ['DB_PASSWORD']='Zyc188208';django.setup();from apps.generation.models import GenerationRecord;print(GenerationRecord.objects.filter(prompt__startswith='压测任务').delete())"
|
||||
for key in ['bench:poll_count', 'bench:active', 'bench:peak', 'bench:tasks_seen']:
|
||||
r.delete(key)
|
||||
print(f' 已清理 Redis 计数器(DB 记录保留给 worker)')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description='Celery 轮询并发压测')
|
||||
sub = parser.add_subparsers(dest='cmd')
|
||||
|
||||
p_worker = sub.add_parser('worker', help='启动 mock worker')
|
||||
p_worker.add_argument('--concurrency', type=int, default=200)
|
||||
|
||||
p_bench = sub.add_parser('bench', help='派发任务 + 监控')
|
||||
p_bench.add_argument('--tasks', type=int, default=100)
|
||||
p_bench.add_argument('--duration', type=int, default=30)
|
||||
|
||||
args = parser.parse_args()
|
||||
if args.cmd == 'worker':
|
||||
cmd_worker(args)
|
||||
elif args.cmd == 'bench':
|
||||
cmd_bench(args)
|
||||
else:
|
||||
parser.print_help()
|
||||
@ -6,45 +6,12 @@ from django.conf import settings
|
||||
|
||||
# API error code → user-friendly Chinese message
|
||||
ERROR_MESSAGES = {
|
||||
# Input content moderation — 人脸/敏感内容
|
||||
'InputImageSensitiveContentDetected.PrivacyInformation': '参考图片中检测到真实人脸,请使用虚拟人像素材替代真人照片',
|
||||
'InputImageSensitiveContentDetected.PrivacyInformation': '参考图片中检测到真实人脸,系统不允许处理包含真人面部的图片',
|
||||
'InputImageSensitiveContentDetected': '参考图片包含敏感内容,请更换图片后重试',
|
||||
'InputVideoSensitiveContentDetected.PrivacyInformation': '参考视频中检测到真实人脸,请使用虚拟人像素材替代真人视频',
|
||||
'InputVideoSensitiveContentDetected': '参考视频包含敏感内容,请更换视频后重试',
|
||||
'InputTextSensitiveContentDetected': '提示词包含敏感内容,请修改后重试',
|
||||
'InputAudioSensitiveContentDetected': '参考音频包含敏感内容,请更换音频后重试',
|
||||
# Output content moderation
|
||||
'OutputVideoSensitiveContentDetected': '生成的视频包含敏感内容,已被系统拦截,请修改提示词后重试',
|
||||
'OutputImageSensitiveContentDetected': '生成的图片包含敏感内容,已被系统拦截',
|
||||
# Parameter errors
|
||||
'InvalidParameter': '请求参数无效,请检查输入内容',
|
||||
'InvalidImage': '图片格式或尺寸不符合要求,请检查后重试',
|
||||
'InvalidVideo': '视频格式或尺寸不符合要求,请检查后重试',
|
||||
'InvalidAudio': '音频格式不符合要求,请检查后重试',
|
||||
'AudioDurationExceeded': '音频总时长超过15秒限制,请缩短音频后重试',
|
||||
'AudioFormatNotSupported': '音频格式不支持,请使用 MP3 或 WAV 格式',
|
||||
# Rate limit
|
||||
'RateLimitExceeded': '请求过于频繁,请稍后重试',
|
||||
'ConcurrencyLimitExceeded': '当前生成任务过多,请稍后重试',
|
||||
# Account & billing
|
||||
'InsufficientBalance': '平台账户余额不足,请联系管理员',
|
||||
# Asset errors
|
||||
'AssetNotFound': '引用的素材不存在或已被删除,请检查素材库',
|
||||
# Server errors
|
||||
'ServerOverloaded': '服务器繁忙,请稍后重试',
|
||||
'InternalError': '视频生成服务异常,请稍后重试',
|
||||
'Timeout': '生成超时,请重试',
|
||||
}
|
||||
|
||||
# 关键词匹配:API 返回的 message 中包含这些关键词时,映射为对应中文提示
|
||||
_MESSAGE_KEYWORDS = {
|
||||
'face': '检测到真实人脸,请使用虚拟人像素材替代真人照片',
|
||||
'privacy': '检测到真实人脸,请使用虚拟人像素材替代真人照片',
|
||||
'sensitive': '内容包含敏感信息,请修改后重试',
|
||||
'not found': '引用的素材不存在或已被删除,请检查素材库',
|
||||
'not valid': '请求参数无效,请检查输入内容',
|
||||
'audio duration': '音频总时长超过15秒限制,请缩短音频后重试',
|
||||
'audio': '音频不符合要求(支持MP3/WAV,单条2-15秒,总时长≤15秒)',
|
||||
'InvalidParameter': '请求参数无效,请检查输入',
|
||||
'RateLimitExceeded': 'API 调用频率超限,请稍后重试',
|
||||
'InsufficientBalance': '账户余额不足,请联系管理员充值',
|
||||
}
|
||||
|
||||
|
||||
@ -54,16 +21,8 @@ class AirDramaAPIError(Exception):
|
||||
self.code = code
|
||||
self.api_message = message
|
||||
self.status_code = status_code
|
||||
# 1. 精确匹配 error code
|
||||
friendly = ERROR_MESSAGES.get(code)
|
||||
if not friendly:
|
||||
# 2. 关键词匹配 message 内容
|
||||
msg_lower = (message or '').lower()
|
||||
for keyword, hint in _MESSAGE_KEYWORDS.items():
|
||||
if keyword in msg_lower:
|
||||
friendly = hint
|
||||
break
|
||||
self.user_message = friendly or '生成失败,请重试'
|
||||
# Use friendly message if available, otherwise use API message
|
||||
self.user_message = ERROR_MESSAGES.get(code, message)
|
||||
super().__init__(self.user_message)
|
||||
|
||||
|
||||
@ -72,17 +31,6 @@ MODEL_MAP = {
|
||||
'seedance_2.0_fast': 'doubao-seedance-2-0-fast-260128',
|
||||
}
|
||||
|
||||
# 推理接入点优先:有 EP 用 EP,没有降级到模型 ID
|
||||
def _resolve_model(model):
|
||||
ep_map = {
|
||||
'seedance_2.0': settings.ARK_ENDPOINT_SEEDANCE,
|
||||
'seedance_2.0_fast': settings.ARK_ENDPOINT_SEEDANCE_FAST,
|
||||
}
|
||||
ep = ep_map.get(model, '')
|
||||
if ep:
|
||||
return ep
|
||||
return MODEL_MAP.get(model, model)
|
||||
|
||||
|
||||
def _headers():
|
||||
return {
|
||||
@ -91,8 +39,7 @@ def _headers():
|
||||
}
|
||||
|
||||
|
||||
def create_task(prompt, model, content_items, aspect_ratio, duration,
|
||||
generate_audio=True, search_mode='off', seed=-1):
|
||||
def create_task(prompt, model, content_items, aspect_ratio, duration, generate_audio=True):
|
||||
"""Create a video generation task.
|
||||
|
||||
Args:
|
||||
@ -102,7 +49,6 @@ def create_task(prompt, model, content_items, aspect_ratio, duration,
|
||||
aspect_ratio: Video aspect ratio ('16:9', '9:16', etc.).
|
||||
duration: Video duration in seconds.
|
||||
generate_audio: Whether to generate audio with the video.
|
||||
search_mode: 'smart' to enable internet search, 'off' to disable.
|
||||
|
||||
Returns:
|
||||
dict: API response with task id and status.
|
||||
@ -115,26 +61,14 @@ def create_task(prompt, model, content_items, aspect_ratio, duration,
|
||||
content.extend(content_items)
|
||||
|
||||
payload = {
|
||||
'model': _resolve_model(model),
|
||||
'model': MODEL_MAP.get(model, model),
|
||||
'content': content,
|
||||
'generate_audio': generate_audio,
|
||||
'ratio': aspect_ratio,
|
||||
'duration': duration,
|
||||
'watermark': False,
|
||||
'seed': seed,
|
||||
}
|
||||
|
||||
if search_mode and search_mode != 'off':
|
||||
payload['tools'] = [{'type': 'web_search'}]
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.info('AirDrama API payload: %s', {k: v for k, v in payload.items() if k != 'content'})
|
||||
# 记录 content 中的非文本项,方便排查素材引用问题
|
||||
media_items = [ci for ci in content if ci.get('type') != 'text']
|
||||
if media_items:
|
||||
logger.info('AirDrama content media items (%d): %s', len(media_items), media_items)
|
||||
|
||||
resp = requests.post(url, json=payload, headers=_headers(), timeout=60)
|
||||
if resp.status_code != 200:
|
||||
# Extract human-readable error from API response
|
||||
@ -142,10 +76,8 @@ def create_task(prompt, model, content_items, aspect_ratio, duration,
|
||||
err = resp.json().get('error', {})
|
||||
code = err.get('code', '')
|
||||
message = err.get('message', resp.text)
|
||||
logger.error('AirDrama API error: status=%s code=%s message=%s', resp.status_code, code, message)
|
||||
except Exception:
|
||||
code, message = '', resp.text
|
||||
logger.error('AirDrama API error: status=%s body=%s', resp.status_code, resp.text)
|
||||
raise AirDramaAPIError(code, message, resp.status_code)
|
||||
return resp.json()
|
||||
|
||||
|
||||
@ -1,427 +0,0 @@
|
||||
"""告警服务 — 飞书 interactive 卡片私信 + 辅助指标。"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
from datetime import timedelta
|
||||
|
||||
import requests
|
||||
from django.utils import timezone
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 小毛球机器人
|
||||
FEISHU_APP_ID = 'cli_a90478156bf85bd7'
|
||||
FEISHU_APP_SECRET = '87N2nnx6Yv56TPjl2GraLdKOjFiGOSGp'
|
||||
|
||||
_RULE_NAMES = {
|
||||
'region_mismatch': '登录地区不对 (R1)',
|
||||
'impossible_travel': '不可能的旅行 (R2)',
|
||||
'login_frequency': '登录太频繁 (R3)',
|
||||
'multi_city': '团队遍地开花 (R4)',
|
||||
'overseas_ip_diversity': '海外IP太杂 (R5)',
|
||||
}
|
||||
|
||||
_LEVEL_COLORS = {
|
||||
'warning': 'orange',
|
||||
'critical': 'red',
|
||||
}
|
||||
|
||||
_LEVEL_LABELS = {
|
||||
'warning': '⚠️ 警告',
|
||||
'critical': '🚨 严重',
|
||||
}
|
||||
|
||||
|
||||
def _get_tenant_access_token():
|
||||
"""获取飞书 tenant_access_token。"""
|
||||
import os
|
||||
app_secret = os.environ.get('FEISHU_APP_SECRET', FEISHU_APP_SECRET)
|
||||
if not app_secret:
|
||||
raise RuntimeError('FEISHU_APP_SECRET not configured')
|
||||
|
||||
resp = requests.post(
|
||||
'https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal',
|
||||
json={'app_id': FEISHU_APP_ID, 'app_secret': app_secret},
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('code') != 0:
|
||||
raise RuntimeError(f'Feishu token error: {data}')
|
||||
return data['tenant_access_token']
|
||||
|
||||
|
||||
def _get_open_id_by_mobile(token, mobile):
|
||||
"""通过手机号查询飞书 open_id。"""
|
||||
resp = requests.post(
|
||||
'https://open.feishu.cn/open-apis/contact/v3/users/batch_get_id',
|
||||
headers={'Authorization': f'Bearer {token}'},
|
||||
json={'mobiles': [mobile]},
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('code') != 0:
|
||||
raise RuntimeError(f'Feishu user lookup error: {data}')
|
||||
user_list = data.get('data', {}).get('user_list', [])
|
||||
if user_list and user_list[0].get('user_id'):
|
||||
return user_list[0]['user_id']
|
||||
return None
|
||||
|
||||
|
||||
def _compute_auxiliary_metrics(team):
|
||||
"""计算辅助指标:最近 7 天并发踢出次数 + 非工作时间登录占比。"""
|
||||
from apps.accounts.models import LoginRecord
|
||||
|
||||
since = timezone.now() - timedelta(days=7)
|
||||
|
||||
# 并发踢出次数:ActiveSession 被删除的次数无法直接统计,
|
||||
# 用 LoginAnomaly 中 rule=impossible_travel 的次数近似
|
||||
from apps.accounts.models import LoginAnomaly
|
||||
kick_count = LoginAnomaly.objects.filter(
|
||||
team=team,
|
||||
auto_disabled=True,
|
||||
created_at__gte=since,
|
||||
).count()
|
||||
|
||||
# 非工作时间登录占比 (22:00-08:00)
|
||||
total_logins = LoginRecord.objects.filter(
|
||||
team=team,
|
||||
created_at__gte=since,
|
||||
).count()
|
||||
|
||||
if total_logins > 0:
|
||||
night_logins = 0
|
||||
for record in LoginRecord.objects.filter(team=team, created_at__gte=since).only('created_at'):
|
||||
hour = record.created_at.hour
|
||||
if hour >= 22 or hour < 8:
|
||||
night_logins += 1
|
||||
night_ratio = round(night_logins / total_logins * 100, 1)
|
||||
else:
|
||||
night_ratio = 0
|
||||
|
||||
return kick_count, night_ratio
|
||||
|
||||
|
||||
def _build_card(anomaly):
|
||||
"""构建飞书 interactive 卡片。"""
|
||||
team = anomaly.team
|
||||
user = anomaly.user
|
||||
record = anomaly.login_record
|
||||
level = anomaly.level
|
||||
rule = anomaly.rule
|
||||
detail = anomaly.detail
|
||||
|
||||
color = _LEVEL_COLORS.get(level, 'blue')
|
||||
level_label = _LEVEL_LABELS.get(level, level)
|
||||
rule_name = _RULE_NAMES.get(rule, rule)
|
||||
|
||||
kick_count, night_ratio = _compute_auxiliary_metrics(team)
|
||||
|
||||
# 基本信息行
|
||||
info_lines = [
|
||||
f'**团队:** {team.name}',
|
||||
f'**用户:** {user.username}',
|
||||
f'**IP:** {record.ip_address}',
|
||||
f'**归属地:** {record.geo_country} {record.geo_province} {record.geo_city}',
|
||||
f'**规则:** {rule_name}',
|
||||
]
|
||||
|
||||
# 根据规则添加详情
|
||||
if rule == 'region_mismatch':
|
||||
info_lines.append(f'**预期城市:** {", ".join(detail.get("expected", []))}')
|
||||
info_lines.append(f'**实际城市:** {detail.get("city", "")}')
|
||||
elif rule == 'impossible_travel':
|
||||
info_lines.append(f'**当前城市:** {detail.get("current_city", "")}')
|
||||
info_lines.append(f'**之前城市:** {detail.get("previous_city", "")}')
|
||||
elif rule == 'login_frequency':
|
||||
info_lines.append(f'**登录次数:** {detail.get("count", 0)} 次 / {detail.get("window_seconds", 0)}s')
|
||||
elif rule == 'multi_city':
|
||||
info_lines.append(f'**预期外城市:** {", ".join(detail.get("unexpected_cities", []))}')
|
||||
elif rule == 'overseas_ip_diversity':
|
||||
info_lines.append(f'**海外国家:** {", ".join(detail.get("countries", []))}')
|
||||
|
||||
# 自动封禁标注
|
||||
if anomaly.auto_disabled:
|
||||
target_label = '该用户' if anomaly.disabled_target == 'user' else '整个团队'
|
||||
info_lines.append(f'\n🔒 **已自动封禁{target_label}**')
|
||||
|
||||
# 辅助指标
|
||||
info_lines.append(f'\n---\n📊 **辅助指标(近7天):**')
|
||||
info_lines.append(f'并发踢出次数:{kick_count}')
|
||||
info_lines.append(f'非工作时间登录占比:{night_ratio}%')
|
||||
|
||||
card = {
|
||||
'config': {'wide_screen_mode': True},
|
||||
'header': {
|
||||
'title': {'tag': 'plain_text', 'content': f'{level_label} {rule_name}'},
|
||||
'template': color,
|
||||
},
|
||||
'elements': [
|
||||
{
|
||||
'tag': 'div',
|
||||
'text': {
|
||||
'tag': 'lark_md',
|
||||
'content': '\n'.join(info_lines),
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
return card
|
||||
|
||||
|
||||
def send_feishu_alert(anomaly):
|
||||
"""发送飞书告警卡片到配置的接收人。"""
|
||||
from apps.generation.models import QuotaConfig
|
||||
|
||||
try:
|
||||
config = QuotaConfig.objects.get(pk=1)
|
||||
except QuotaConfig.DoesNotExist:
|
||||
logger.warning('QuotaConfig not found, skip alert')
|
||||
return
|
||||
|
||||
mobiles_str = config.feishu_alert_mobiles
|
||||
if not mobiles_str:
|
||||
logger.info('No feishu alert mobiles configured, skip alert')
|
||||
return
|
||||
|
||||
mobiles = [m.strip() for m in mobiles_str.split(',') if m.strip()]
|
||||
if not mobiles:
|
||||
return
|
||||
|
||||
try:
|
||||
token = _get_tenant_access_token()
|
||||
except Exception as e:
|
||||
logger.error('Failed to get feishu token: %s', e)
|
||||
return
|
||||
|
||||
card = _build_card(anomaly)
|
||||
|
||||
for mobile in mobiles:
|
||||
try:
|
||||
open_id = _get_open_id_by_mobile(token, mobile)
|
||||
if not open_id:
|
||||
logger.warning('No feishu user found for mobile %s', mobile)
|
||||
continue
|
||||
|
||||
resp = requests.post(
|
||||
'https://open.feishu.cn/open-apis/im/v1/messages',
|
||||
headers={'Authorization': f'Bearer {token}'},
|
||||
params={'receive_id_type': 'open_id'},
|
||||
json={
|
||||
'receive_id': open_id,
|
||||
'msg_type': 'interactive',
|
||||
'content': json.dumps(card, ensure_ascii=False),
|
||||
},
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('code') != 0:
|
||||
logger.error('Feishu send failed to %s: %s', mobile, data)
|
||||
else:
|
||||
logger.info('Feishu alert sent to %s for rule %s', mobile, anomaly.rule)
|
||||
except Exception as e:
|
||||
logger.error('Feishu alert error for %s: %s', mobile, e)
|
||||
|
||||
|
||||
def send_sms_alert(anomaly):
|
||||
"""发送短信告警到配置的接收人。"""
|
||||
from apps.generation.models import QuotaConfig
|
||||
from django.conf import settings as django_settings
|
||||
|
||||
try:
|
||||
config = QuotaConfig.objects.get(pk=1)
|
||||
except QuotaConfig.DoesNotExist:
|
||||
logger.warning('QuotaConfig not found, skip SMS alert')
|
||||
return
|
||||
|
||||
mobiles = [m.strip() for m in config.sms_alert_mobiles.split(',') if m.strip()]
|
||||
if not mobiles:
|
||||
return
|
||||
|
||||
access_key = django_settings.ALIYUN_SMS_ACCESS_KEY
|
||||
access_secret = django_settings.ALIYUN_SMS_ACCESS_SECRET
|
||||
sign_name = django_settings.ALIYUN_SMS_SIGN_NAME
|
||||
template_code = django_settings.ALIYUN_SMS_TEMPLATE_CODE
|
||||
|
||||
if not all([access_key, access_secret, template_code]):
|
||||
logger.warning('Aliyun SMS credentials not configured, skip SMS alert')
|
||||
return
|
||||
|
||||
rule_name = _RULE_NAMES.get(anomaly.rule, anomaly.rule)
|
||||
auto_action = '已自动封禁' if anomaly.auto_disabled else '仅告警'
|
||||
|
||||
template_param = json.dumps({
|
||||
'team_name': anomaly.team.name[:20],
|
||||
'rule_name': rule_name[:20],
|
||||
'username': anomaly.user.username[:20],
|
||||
'city': anomaly.login_record.geo_city or '未知',
|
||||
'auto_action': auto_action,
|
||||
}, ensure_ascii=False)
|
||||
|
||||
# 使用阿里云 SMS HTTP API
|
||||
import hashlib
|
||||
import hmac
|
||||
import base64
|
||||
import urllib.parse
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
def _percent_encode(s):
|
||||
return urllib.parse.quote(s, safe='', encoding='utf-8')
|
||||
|
||||
for mobile in mobiles:
|
||||
try:
|
||||
params = {
|
||||
'AccessKeyId': access_key,
|
||||
'Action': 'SendSms',
|
||||
'Format': 'JSON',
|
||||
'PhoneNumbers': mobile,
|
||||
'RegionId': 'cn-hangzhou',
|
||||
'SignName': sign_name,
|
||||
'SignatureMethod': 'HMAC-SHA1',
|
||||
'SignatureNonce': str(uuid.uuid4()),
|
||||
'SignatureVersion': '1.0',
|
||||
'TemplateCode': template_code,
|
||||
'TemplateParam': template_param,
|
||||
'Timestamp': datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'),
|
||||
'Version': '2017-05-25',
|
||||
}
|
||||
|
||||
sorted_params = sorted(params.items())
|
||||
query_string = '&'.join(f'{_percent_encode(k)}={_percent_encode(v)}' for k, v in sorted_params)
|
||||
string_to_sign = f'GET&{_percent_encode("/")}&{_percent_encode(query_string)}'
|
||||
|
||||
sign_key = (access_secret + '&').encode('utf-8')
|
||||
signature = base64.b64encode(
|
||||
hmac.new(sign_key, string_to_sign.encode('utf-8'), hashlib.sha1).digest()
|
||||
).decode('utf-8')
|
||||
|
||||
params['Signature'] = signature
|
||||
|
||||
resp = requests.get(
|
||||
'https://dysmsapi.aliyuncs.com/',
|
||||
params=params,
|
||||
timeout=10,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('Code') == 'OK':
|
||||
logger.info('SMS alert sent to %s for rule %s', mobile, anomaly.rule)
|
||||
else:
|
||||
logger.error('SMS send failed to %s: %s', mobile, data)
|
||||
except Exception as e:
|
||||
logger.error('SMS alert error for %s: %s', mobile, e)
|
||||
|
||||
|
||||
def send_sms_test(mobile):
|
||||
"""发送短信测试到指定手机号。Returns (success, message)。"""
|
||||
from django.conf import settings as django_settings
|
||||
|
||||
access_key = django_settings.ALIYUN_SMS_ACCESS_KEY
|
||||
access_secret = django_settings.ALIYUN_SMS_ACCESS_SECRET
|
||||
sign_name = django_settings.ALIYUN_SMS_SIGN_NAME
|
||||
template_code = django_settings.ALIYUN_SMS_TEMPLATE_CODE
|
||||
|
||||
if not all([access_key, access_secret, template_code]):
|
||||
return False, '阿里云短信密钥未配置(ALIYUN_SMS_ACCESS_KEY / ALIYUN_SMS_ACCESS_SECRET)'
|
||||
|
||||
template_param = json.dumps({
|
||||
'team_name': '测试团队',
|
||||
'rule_name': '告警测试',
|
||||
'username': '测试用户',
|
||||
'city': '测试城市',
|
||||
'auto_action': '仅测试',
|
||||
}, ensure_ascii=False)
|
||||
|
||||
import hashlib
|
||||
import hmac
|
||||
import base64
|
||||
import urllib.parse
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
|
||||
def _percent_encode(s):
|
||||
return urllib.parse.quote(s, safe='', encoding='utf-8')
|
||||
|
||||
try:
|
||||
params = {
|
||||
'AccessKeyId': access_key,
|
||||
'Action': 'SendSms',
|
||||
'Format': 'JSON',
|
||||
'PhoneNumbers': mobile,
|
||||
'RegionId': 'cn-hangzhou',
|
||||
'SignName': sign_name,
|
||||
'SignatureMethod': 'HMAC-SHA1',
|
||||
'SignatureNonce': str(uuid.uuid4()),
|
||||
'SignatureVersion': '1.0',
|
||||
'TemplateCode': template_code,
|
||||
'TemplateParam': template_param,
|
||||
'Timestamp': datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'),
|
||||
'Version': '2017-05-25',
|
||||
}
|
||||
|
||||
sorted_params = sorted(params.items())
|
||||
query_string = '&'.join(f'{_percent_encode(k)}={_percent_encode(v)}' for k, v in sorted_params)
|
||||
string_to_sign = f'GET&{_percent_encode("/")}&{_percent_encode(query_string)}'
|
||||
|
||||
sign_key = (access_secret + '&').encode('utf-8')
|
||||
signature = base64.b64encode(
|
||||
hmac.new(sign_key, string_to_sign.encode('utf-8'), hashlib.sha1).digest()
|
||||
).decode('utf-8')
|
||||
|
||||
params['Signature'] = signature
|
||||
|
||||
resp = requests.get(
|
||||
'https://dysmsapi.aliyuncs.com/',
|
||||
params=params,
|
||||
timeout=10,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('Code') == 'OK':
|
||||
return True, '测试短信已发送'
|
||||
return False, f'发送失败: {data.get("Message", data.get("Code", "未知错误"))}'
|
||||
except Exception as e:
|
||||
return False, str(e)
|
||||
|
||||
|
||||
def send_feishu_test(mobile):
|
||||
"""发送测试消息到指定手机号。Returns (success, message)。"""
|
||||
try:
|
||||
token = _get_tenant_access_token()
|
||||
open_id = _get_open_id_by_mobile(token, mobile)
|
||||
if not open_id:
|
||||
return False, f'未找到手机号 {mobile} 对应的飞书用户'
|
||||
|
||||
card = {
|
||||
'config': {'wide_screen_mode': True},
|
||||
'header': {
|
||||
'title': {'tag': 'plain_text', 'content': '🔔 AirDrama 告警测试'},
|
||||
'template': 'blue',
|
||||
},
|
||||
'elements': [
|
||||
{
|
||||
'tag': 'div',
|
||||
'text': {
|
||||
'tag': 'lark_md',
|
||||
'content': '这是一条测试消息,说明飞书告警通道配置正常。',
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
import json
|
||||
resp = requests.post(
|
||||
'https://open.feishu.cn/open-apis/im/v1/messages',
|
||||
headers={'Authorization': f'Bearer {token}'},
|
||||
params={'receive_id_type': 'open_id'},
|
||||
json={
|
||||
'receive_id': open_id,
|
||||
'msg_type': 'interactive',
|
||||
'content': json.dumps(card, ensure_ascii=False),
|
||||
},
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get('code') != 0:
|
||||
return False, f'发送失败: {data.get("msg", "")}'
|
||||
return True, '测试消息已发送'
|
||||
except Exception as e:
|
||||
return False, str(e)
|
||||
@ -1,312 +0,0 @@
|
||||
"""登录异常检测引擎 — R1-R5 规则检测 + 封禁 + 告警冷却。"""
|
||||
|
||||
import logging
|
||||
import threading
|
||||
from datetime import timedelta
|
||||
|
||||
from django.utils import timezone
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _is_domestic(record) -> bool:
|
||||
"""国内 IP:有国家且为中国。"""
|
||||
return record.geo_country in ('中国', 'CN', 'China') and record.geo_city != ''
|
||||
|
||||
|
||||
def _is_overseas(record) -> bool:
|
||||
"""海外 IP:有国家且不是中国。"""
|
||||
return record.geo_country != '' and record.geo_country not in ('中国', 'CN', 'China', '')
|
||||
|
||||
|
||||
def _is_skip(record) -> bool:
|
||||
"""内网 IP 或归属地解析失败。"""
|
||||
return record.geo_source in ('skip', 'failed', '')
|
||||
|
||||
|
||||
def _get_config(team, global_config):
|
||||
"""获取团队级或全局默认的阈值配置。"""
|
||||
from apps.accounts.models import TeamAnomalyConfig
|
||||
|
||||
team_cfg = None
|
||||
try:
|
||||
team_cfg = team.anomaly_config
|
||||
except TeamAnomalyConfig.DoesNotExist:
|
||||
pass
|
||||
|
||||
def _val(team_field, global_field):
|
||||
if team_cfg:
|
||||
v = getattr(team_cfg, team_field, None)
|
||||
if v is not None:
|
||||
return v
|
||||
return getattr(global_config, global_field)
|
||||
|
||||
return {
|
||||
'r1_enabled': _val('r1_enabled', 'r1_enabled_default'),
|
||||
'r2_enabled': _val('r2_enabled', 'r2_enabled_default'),
|
||||
'r2_window': _val('r2_window_seconds', 'r2_window_seconds'),
|
||||
'r3_enabled': _val('r3_enabled', 'r3_enabled_default'),
|
||||
'r3_window': _val('r3_window_seconds', 'r3_window_seconds'),
|
||||
'r3_max_count': _val('r3_max_count', 'r3_max_count'),
|
||||
'r4_enabled': _val('r4_enabled', 'r4_enabled_default'),
|
||||
'r4_window': _val('r4_window_seconds', 'r4_window_seconds'),
|
||||
'r4_city_count': _val('r4_city_count', 'r4_city_count'),
|
||||
'r5_enabled': _val('r5_enabled', 'r5_enabled_default'),
|
||||
'r5_days': _val('r5_days', 'r5_days'),
|
||||
'r5_country_count': _val('r5_country_count', 'r5_country_count'),
|
||||
}
|
||||
|
||||
|
||||
def check_login_anomaly(login_record):
|
||||
"""检测登录异常,返回 [(level, rule, detail), ...]。"""
|
||||
from apps.accounts.models import LoginRecord
|
||||
from apps.generation.models import QuotaConfig
|
||||
|
||||
user = login_record.user
|
||||
team = login_record.team
|
||||
|
||||
if not team:
|
||||
return []
|
||||
|
||||
# 用户或团队已被封禁 → 跳过检测
|
||||
if not user.is_active or not team.is_active:
|
||||
return []
|
||||
|
||||
try:
|
||||
global_config = QuotaConfig.objects.get(pk=1)
|
||||
except QuotaConfig.DoesNotExist:
|
||||
return []
|
||||
|
||||
if not global_config.anomaly_detection_enabled:
|
||||
return []
|
||||
|
||||
cfg = _get_config(team, global_config)
|
||||
anomalies = []
|
||||
|
||||
is_domestic = _is_domestic(login_record)
|
||||
is_overseas = _is_overseas(login_record)
|
||||
is_skip_ip = _is_skip(login_record)
|
||||
|
||||
if is_skip_ip:
|
||||
# 内网 IP 跳过所有规则
|
||||
return []
|
||||
|
||||
# ── R1:登录地区不对 ──
|
||||
if cfg['r1_enabled'] and is_domestic:
|
||||
expected = team.expected_regions
|
||||
if expected:
|
||||
expected_cities = [c.strip() for c in expected.split(',') if c.strip()]
|
||||
if expected_cities and login_record.geo_city not in expected_cities:
|
||||
anomalies.append((
|
||||
'warning', 'region_mismatch',
|
||||
{
|
||||
'ip': login_record.ip_address,
|
||||
'city': login_record.geo_city,
|
||||
'province': login_record.geo_province,
|
||||
'expected': expected_cities,
|
||||
}
|
||||
))
|
||||
|
||||
# ── R2:不可能的旅行 ──
|
||||
if cfg['r2_enabled'] and is_domestic:
|
||||
window = timezone.now() - timedelta(seconds=cfg['r2_window'])
|
||||
recent = LoginRecord.objects.filter(
|
||||
user=user,
|
||||
created_at__gte=window,
|
||||
geo_source__in=['online', 'offline'],
|
||||
).exclude(pk=login_record.pk).exclude(
|
||||
geo_city=''
|
||||
).values_list('geo_city', flat=True).distinct()
|
||||
|
||||
for prev_city in recent:
|
||||
if prev_city and login_record.geo_city and prev_city != login_record.geo_city:
|
||||
# 只在双方都是国内 IP 时比较
|
||||
anomalies.append((
|
||||
'critical', 'impossible_travel',
|
||||
{
|
||||
'ip': login_record.ip_address,
|
||||
'current_city': login_record.geo_city,
|
||||
'previous_city': prev_city,
|
||||
'window_seconds': cfg['r2_window'],
|
||||
}
|
||||
))
|
||||
break # 只报一次
|
||||
|
||||
# ── R3:登录太频繁 ──
|
||||
if cfg['r3_enabled']:
|
||||
window = timezone.now() - timedelta(seconds=cfg['r3_window'])
|
||||
count = LoginRecord.objects.filter(
|
||||
user=user,
|
||||
created_at__gte=window,
|
||||
).count()
|
||||
if count > cfg['r3_max_count']:
|
||||
anomalies.append((
|
||||
'warning', 'login_frequency',
|
||||
{
|
||||
'ip': login_record.ip_address,
|
||||
'count': count,
|
||||
'window_seconds': cfg['r3_window'],
|
||||
'threshold': cfg['r3_max_count'],
|
||||
}
|
||||
))
|
||||
|
||||
# ── R4:团队遍地开花 ──
|
||||
if cfg['r4_enabled'] and is_domestic:
|
||||
expected = team.expected_regions
|
||||
expected_cities = [c.strip() for c in expected.split(',') if c.strip()] if expected else []
|
||||
window = timezone.now() - timedelta(seconds=cfg['r4_window'])
|
||||
|
||||
team_cities = LoginRecord.objects.filter(
|
||||
team=team,
|
||||
created_at__gte=window,
|
||||
geo_source__in=['online', 'offline'],
|
||||
).exclude(
|
||||
geo_city=''
|
||||
).exclude(
|
||||
geo_country__in=['', '0']
|
||||
).filter(
|
||||
geo_country__in=['中国', 'CN', 'China']
|
||||
).values_list('geo_city', flat=True).distinct()
|
||||
|
||||
unexpected_cities = [c for c in team_cities if c not in expected_cities]
|
||||
if len(unexpected_cities) >= cfg['r4_city_count']:
|
||||
anomalies.append((
|
||||
'critical', 'multi_city',
|
||||
{
|
||||
'unexpected_cities': unexpected_cities,
|
||||
'expected_cities': expected_cities,
|
||||
'count': len(unexpected_cities),
|
||||
'threshold': cfg['r4_city_count'],
|
||||
'window_seconds': cfg['r4_window'],
|
||||
}
|
||||
))
|
||||
|
||||
# ── R5:海外IP太杂 ──
|
||||
if cfg['r5_enabled'] and is_overseas:
|
||||
since = timezone.now() - timedelta(days=cfg['r5_days'])
|
||||
overseas_countries = LoginRecord.objects.filter(
|
||||
team=team,
|
||||
created_at__gte=since,
|
||||
geo_source__in=['online', 'offline'],
|
||||
).exclude(
|
||||
geo_country__in=['中国', 'CN', 'China', '', '0']
|
||||
).values_list('geo_country', flat=True).distinct()
|
||||
|
||||
country_list = list(overseas_countries)
|
||||
if len(country_list) >= cfg['r5_country_count']:
|
||||
anomalies.append((
|
||||
'warning', 'overseas_ip_diversity',
|
||||
{
|
||||
'countries': country_list,
|
||||
'count': len(country_list),
|
||||
'threshold': cfg['r5_country_count'],
|
||||
'days': cfg['r5_days'],
|
||||
}
|
||||
))
|
||||
|
||||
return anomalies
|
||||
|
||||
|
||||
def _disable_user(user):
|
||||
"""封禁用户 — 设 is_active=False + 清除所有会话。"""
|
||||
from apps.accounts.models import ActiveSession
|
||||
|
||||
user.is_active = False
|
||||
user.disabled_by = 'system'
|
||||
user.save(update_fields=['is_active', 'disabled_by'])
|
||||
ActiveSession.objects.filter(user=user).delete()
|
||||
logger.info('User %s disabled by anomaly detection', user.username)
|
||||
|
||||
|
||||
def _disable_team(team):
|
||||
"""封禁团队 — 团队 is_active=False + 全员踢下线。"""
|
||||
from apps.accounts.models import ActiveSession
|
||||
|
||||
team.is_active = False
|
||||
team.disabled_by = 'system'
|
||||
team.save(update_fields=['is_active', 'disabled_by'])
|
||||
ActiveSession.objects.filter(user__team=team).delete()
|
||||
logger.info('Team %s disabled by anomaly detection', team.name)
|
||||
|
||||
|
||||
def _is_in_cooldown(team, rule, cooldown_seconds):
|
||||
"""检查告警冷却:同团队+同规则在冷却窗口内是否已告警。"""
|
||||
from apps.accounts.models import LoginAnomaly
|
||||
|
||||
since = timezone.now() - timedelta(seconds=cooldown_seconds)
|
||||
return LoginAnomaly.objects.filter(
|
||||
team=team,
|
||||
rule=rule,
|
||||
alerted=True,
|
||||
created_at__gte=since,
|
||||
).exists()
|
||||
|
||||
|
||||
def process_anomalies(login_record, anomalies):
|
||||
"""保存异常记录 + 发告警 + 封禁。"""
|
||||
from apps.accounts.models import LoginAnomaly
|
||||
from apps.generation.models import QuotaConfig
|
||||
|
||||
if not anomalies:
|
||||
return
|
||||
|
||||
try:
|
||||
global_config = QuotaConfig.objects.get(pk=1)
|
||||
except QuotaConfig.DoesNotExist:
|
||||
return
|
||||
|
||||
cooldown = global_config.alert_cooldown_seconds
|
||||
team = login_record.team
|
||||
user = login_record.user
|
||||
|
||||
for level, rule, detail in anomalies:
|
||||
# 确定是否需要封禁
|
||||
auto_disabled = False
|
||||
disabled_target = ''
|
||||
|
||||
if rule == 'impossible_travel':
|
||||
_disable_user(user)
|
||||
auto_disabled = True
|
||||
disabled_target = 'user'
|
||||
elif rule == 'multi_city':
|
||||
_disable_team(team)
|
||||
auto_disabled = True
|
||||
disabled_target = 'team'
|
||||
|
||||
# 检查告警冷却
|
||||
should_alert = not _is_in_cooldown(team, rule, cooldown)
|
||||
|
||||
# 保存异常记录
|
||||
anomaly = LoginAnomaly.objects.create(
|
||||
team=team,
|
||||
user=user,
|
||||
login_record=login_record,
|
||||
level=level,
|
||||
rule=rule,
|
||||
detail=detail,
|
||||
alerted=should_alert,
|
||||
auto_disabled=auto_disabled,
|
||||
disabled_target=disabled_target,
|
||||
)
|
||||
|
||||
# 异步发送告警(不阻塞登录)
|
||||
if should_alert:
|
||||
thread = threading.Thread(
|
||||
target=_send_alert_safe,
|
||||
args=(anomaly.pk,),
|
||||
daemon=True,
|
||||
)
|
||||
thread.start()
|
||||
|
||||
|
||||
def _send_alert_safe(anomaly_pk):
|
||||
"""安全地发送告警,捕获所有异常。"""
|
||||
try:
|
||||
from apps.accounts.models import LoginAnomaly
|
||||
anomaly = LoginAnomaly.objects.select_related('team', 'user', 'login_record').get(pk=anomaly_pk)
|
||||
|
||||
from utils.alert_service import send_feishu_alert, send_sms_alert
|
||||
send_feishu_alert(anomaly)
|
||||
send_sms_alert(anomaly)
|
||||
except Exception as e:
|
||||
logger.error('Failed to send alert for anomaly %s: %s', anomaly_pk, e)
|
||||
@ -1,227 +0,0 @@
|
||||
"""Volcano Engine Assets API client — uses volcengine SDK for AK/SK auth.
|
||||
|
||||
All functions are synchronous and raise ``AssetsAPIError`` on API errors.
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
|
||||
from django.conf import settings
|
||||
from volcengine.ApiInfo import ApiInfo
|
||||
from volcengine.base.Service import Service
|
||||
from volcengine.Credentials import Credentials
|
||||
from volcengine.ServiceInfo import ServiceInfo
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
SERVICE = 'ark'
|
||||
REGION = 'cn-beijing'
|
||||
API_VERSION = '2024-01-01'
|
||||
HOST = 'open.volcengineapi.com'
|
||||
PROJECT_NAME = 'int_dev_Airlabs'
|
||||
|
||||
|
||||
_ASSETS_ERROR_MESSAGES = {
|
||||
'ConfigError': '素材服务未配置,请联系管理员',
|
||||
'RequestError': '素材服务暂时不可用,请稍后重试',
|
||||
'InvalidParameter': '素材参数无效,请检查输入',
|
||||
'NotFound': '素材不存在或已被删除',
|
||||
'NotExist': '素材不存在或已被删除',
|
||||
'InternalError': '素材服务异常,请稍后重试',
|
||||
'Forbidden': '没有权限操作该素材',
|
||||
'RateLimitExceeded': '操作过于频繁,请稍后重试',
|
||||
}
|
||||
|
||||
_ASSETS_MESSAGE_KEYWORDS = {
|
||||
'dimension': '图片尺寸不符合要求(宽高需在 300~6000 像素之间)',
|
||||
'size': '文件大小超出限制',
|
||||
'format': '不支持的文件格式',
|
||||
'not found': '素材不存在或已被删除',
|
||||
'permission': '没有权限操作该素材',
|
||||
}
|
||||
|
||||
|
||||
class AssetsAPIError(Exception):
|
||||
"""Raised when the Assets API returns an error."""
|
||||
def __init__(self, code, message, status_code=400):
|
||||
self.code = code
|
||||
self.api_message = message
|
||||
self.status_code = status_code
|
||||
# 中文友好提示
|
||||
friendly = _ASSETS_ERROR_MESSAGES.get(code)
|
||||
if not friendly:
|
||||
msg_lower = (message or '').lower()
|
||||
for keyword, hint in _ASSETS_MESSAGE_KEYWORDS.items():
|
||||
if keyword in msg_lower:
|
||||
friendly = hint
|
||||
break
|
||||
self.user_message = friendly or '素材操作失败,请稍后重试'
|
||||
super().__init__(f'[{code}] {message}')
|
||||
|
||||
|
||||
def _get_service():
|
||||
"""Build a volcengine Service instance with AK/SK credentials."""
|
||||
ak = settings.TOS_ACCESS_KEY
|
||||
sk = settings.TOS_SECRET_KEY
|
||||
if not ak or not sk:
|
||||
raise AssetsAPIError('ConfigError', 'TOS_ACCESS_KEY / TOS_SECRET_KEY not configured')
|
||||
|
||||
service_info = ServiceInfo(
|
||||
HOST,
|
||||
{'Accept': 'application/json', 'Content-Type': 'application/json'},
|
||||
Credentials(ak, sk, SERVICE, REGION),
|
||||
10, 30,
|
||||
)
|
||||
|
||||
api_info = {
|
||||
'CreateAssetGroup': ApiInfo('POST', '/', {'Action': 'CreateAssetGroup', 'Version': API_VERSION}, {}, {}),
|
||||
'CreateAsset': ApiInfo('POST', '/', {'Action': 'CreateAsset', 'Version': API_VERSION}, {}, {}),
|
||||
'ListAssetGroups': ApiInfo('POST', '/', {'Action': 'ListAssetGroups', 'Version': API_VERSION}, {}, {}),
|
||||
'ListAssets': ApiInfo('POST', '/', {'Action': 'ListAssets', 'Version': API_VERSION}, {}, {}),
|
||||
'GetAsset': ApiInfo('POST', '/', {'Action': 'GetAsset', 'Version': API_VERSION}, {}, {}),
|
||||
'GetAssetGroup': ApiInfo('POST', '/', {'Action': 'GetAssetGroup', 'Version': API_VERSION}, {}, {}),
|
||||
'UpdateAssetGroup': ApiInfo('POST', '/', {'Action': 'UpdateAssetGroup', 'Version': API_VERSION}, {}, {}),
|
||||
'UpdateAsset': ApiInfo('POST', '/', {'Action': 'UpdateAsset', 'Version': API_VERSION}, {}, {}),
|
||||
'DeleteAsset': ApiInfo('POST', '/', {'Action': 'DeleteAsset', 'Version': API_VERSION}, {}, {}),
|
||||
}
|
||||
|
||||
return Service(service_info, api_info)
|
||||
|
||||
|
||||
def _do_request(action: str, body_dict: dict) -> dict:
|
||||
"""Send a signed POST to the Assets API and return the Result dict."""
|
||||
service = _get_service()
|
||||
body = json.dumps(body_dict, ensure_ascii=False)
|
||||
|
||||
try:
|
||||
resp = service.json(action, {}, body)
|
||||
except Exception as e:
|
||||
# SDK raises Exception(resp.text.encode("utf-8")) on non-200;
|
||||
# str(e) becomes b'...' which isn't valid JSON. Decode it first.
|
||||
raw = e.args[0] if e.args else ''
|
||||
error_str = raw.decode('utf-8') if isinstance(raw, bytes) else str(raw)
|
||||
logger.warning('Assets API %s raw error: %s', action, error_str)
|
||||
try:
|
||||
error_data = json.loads(error_str)
|
||||
err_meta = error_data.get('ResponseMetadata', {}).get('Error', {})
|
||||
if err_meta:
|
||||
raise AssetsAPIError(err_meta.get('Code', 'Unknown'), err_meta.get('Message', error_str))
|
||||
err = error_data.get('error', {})
|
||||
raise AssetsAPIError(err.get('code', 'Unknown'), err.get('message', error_str))
|
||||
except (json.JSONDecodeError, AssetsAPIError):
|
||||
raise
|
||||
except Exception:
|
||||
pass
|
||||
raise AssetsAPIError('RequestError', error_str or 'Empty response from API')
|
||||
|
||||
data = json.loads(resp) if isinstance(resp, str) else resp
|
||||
|
||||
meta = data.get('ResponseMetadata', {})
|
||||
error = meta.get('Error', {})
|
||||
if error:
|
||||
raise AssetsAPIError(
|
||||
error.get('Code', 'Unknown'),
|
||||
error.get('Message', str(data)),
|
||||
)
|
||||
|
||||
return data.get('Result', {})
|
||||
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# Public helpers
|
||||
# ──────────────────────────────────────────────
|
||||
|
||||
def create_asset_group(name: str, description: str = '', group_type: str = 'AIGC') -> str:
|
||||
"""Create an asset group. Returns the remote group id."""
|
||||
body = {
|
||||
'Name': name,
|
||||
'Description': description,
|
||||
'GroupType': group_type,
|
||||
'ProjectName': PROJECT_NAME,
|
||||
}
|
||||
result = _do_request('CreateAssetGroup', body)
|
||||
return result.get('Id', '')
|
||||
|
||||
|
||||
def create_asset(group_id: str, image_url: str, name: str = '', asset_type: str = 'Image') -> str:
|
||||
"""Create an asset inside an existing group. Returns the remote asset id."""
|
||||
body = {
|
||||
'GroupId': group_id,
|
||||
'URL': image_url,
|
||||
'Name': name,
|
||||
'AssetType': asset_type,
|
||||
'ProjectName': PROJECT_NAME,
|
||||
}
|
||||
result = _do_request('CreateAsset', body)
|
||||
return result.get('Id', '')
|
||||
|
||||
|
||||
def list_asset_groups(page: int = 1, page_size: int = 20, name: str = None) -> tuple:
|
||||
"""List asset groups. Returns (items_list, total_count)."""
|
||||
filter_dict = {'GroupType': 'AIGC'}
|
||||
if name:
|
||||
filter_dict['Name'] = name
|
||||
body = {
|
||||
'Filter': filter_dict,
|
||||
'PageNumber': page,
|
||||
'PageSize': page_size,
|
||||
'ProjectName': PROJECT_NAME,
|
||||
}
|
||||
result = _do_request('ListAssetGroups', body)
|
||||
return result.get('Items', []), result.get('TotalCount', 0)
|
||||
|
||||
|
||||
def list_assets(group_ids: list = None, status: str = None,
|
||||
name: str = None, page: int = 1, page_size: int = 20) -> tuple:
|
||||
"""List assets with optional filters. Returns (items_list, total_count)."""
|
||||
filter_dict = {'GroupType': 'AIGC'}
|
||||
if group_ids:
|
||||
filter_dict['GroupIds'] = group_ids
|
||||
if status:
|
||||
filter_dict['Statuses'] = [status]
|
||||
if name:
|
||||
filter_dict['Name'] = name
|
||||
body = {
|
||||
'Filter': filter_dict,
|
||||
'PageNumber': page,
|
||||
'PageSize': page_size,
|
||||
'ProjectName': PROJECT_NAME,
|
||||
}
|
||||
result = _do_request('ListAssets', body)
|
||||
return result.get('Items', []), result.get('TotalCount', 0)
|
||||
|
||||
|
||||
def get_asset(asset_id: str) -> dict:
|
||||
"""Get single asset details including processing status."""
|
||||
body = {'Id': asset_id, 'ProjectName': PROJECT_NAME}
|
||||
return _do_request('GetAsset', body)
|
||||
|
||||
|
||||
def get_asset_group(group_id: str) -> dict:
|
||||
"""Get single asset group details."""
|
||||
body = {'Id': group_id, 'ProjectName': PROJECT_NAME}
|
||||
return _do_request('GetAssetGroup', body)
|
||||
|
||||
|
||||
def update_asset_group(group_id: str, name: str = None, description: str = None):
|
||||
"""Update an asset group's name and/or description."""
|
||||
body = {'Id': group_id, 'ProjectName': PROJECT_NAME}
|
||||
if name is not None:
|
||||
body['Name'] = name
|
||||
if description is not None:
|
||||
body['Description'] = description
|
||||
_do_request('UpdateAssetGroup', body)
|
||||
|
||||
|
||||
def update_asset(asset_id: str, name: str = None):
|
||||
"""Update an asset's name."""
|
||||
body = {'Id': asset_id, 'ProjectName': PROJECT_NAME}
|
||||
if name is not None:
|
||||
body['Name'] = name
|
||||
_do_request('UpdateAsset', body)
|
||||
|
||||
|
||||
def delete_asset(asset_id: str):
|
||||
"""Delete a single asset from the remote API."""
|
||||
body = {'Id': asset_id, 'ProjectName': PROJECT_NAME}
|
||||
_do_request('DeleteAsset', body)
|
||||
@ -1,69 +0,0 @@
|
||||
"""
|
||||
计费工具模块 — 分辨率映射 + token/费用计算
|
||||
|
||||
Token 预估公式(火山官方):(宽 × 高 × 帧率 × 时长) / 1024
|
||||
单价:元 / 百万 tokens
|
||||
"""
|
||||
from decimal import Decimal, ROUND_HALF_UP
|
||||
|
||||
# 分辨率 → 像素映射(来自 Seedance 2.0 API 文档)
|
||||
RESOLUTION_MAP = {
|
||||
# 720p
|
||||
('720p', '16:9'): (1280, 720),
|
||||
('720p', '9:16'): (720, 1280),
|
||||
('720p', '4:3'): (1112, 834),
|
||||
('720p', '1:1'): (960, 960),
|
||||
('720p', '3:4'): (834, 1112),
|
||||
('720p', '21:9'): (1470, 630),
|
||||
# 480p
|
||||
('480p', '16:9'): (864, 496),
|
||||
('480p', '9:16'): (496, 864),
|
||||
('480p', '4:3'): (752, 560),
|
||||
('480p', '1:1'): (640, 640),
|
||||
('480p', '3:4'): (560, 752),
|
||||
('480p', '21:9'): (992, 432),
|
||||
}
|
||||
|
||||
# 默认帧率
|
||||
DEFAULT_FPS = 24
|
||||
|
||||
|
||||
def get_resolution(aspect_ratio: str, tier: str = '720p') -> tuple:
|
||||
"""根据宽高比和分辨率档位返回 (width, height) 像素值。"""
|
||||
return RESOLUTION_MAP.get((tier, aspect_ratio), (1280, 720))
|
||||
|
||||
|
||||
def estimate_tokens(width: int, height: int, duration: int, fps: int = DEFAULT_FPS) -> int:
|
||||
"""预估视频生成消耗的 tokens。"""
|
||||
return round(width * height * fps * duration / 1024)
|
||||
|
||||
|
||||
def calculate_cost(tokens: int, base_price, markup_percentage) -> Decimal:
|
||||
"""计算用户费用(加价后)。
|
||||
|
||||
Args:
|
||||
tokens: 消耗的 tokens 数
|
||||
base_price: 成本价(元/百万tokens)
|
||||
markup_percentage: 加价百分比,如 20 表示 20%
|
||||
Returns:
|
||||
Decimal: 加价后费用,保留 2 位小数
|
||||
"""
|
||||
base_price = Decimal(str(base_price))
|
||||
markup = Decimal(str(markup_percentage))
|
||||
team_price = base_price * (1 + markup / 100)
|
||||
cost = Decimal(str(tokens)) * team_price / Decimal('1000000')
|
||||
return cost.quantize(Decimal('0.01'), rounding=ROUND_HALF_UP)
|
||||
|
||||
|
||||
def calculate_base_cost(tokens: int, base_price) -> Decimal:
|
||||
"""计算平台成本(不加价)。
|
||||
|
||||
Args:
|
||||
tokens: 消耗的 tokens 数
|
||||
base_price: 成本价(元/百万tokens)
|
||||
Returns:
|
||||
Decimal: 成本费用,保留 2 位小数
|
||||
"""
|
||||
base_price = Decimal(str(base_price))
|
||||
cost = Decimal(str(tokens)) * base_price / Decimal('1000000')
|
||||
return cost.quantize(Decimal('0.01'), rounding=ROUND_HALF_UP)
|
||||
@ -1,135 +0,0 @@
|
||||
"""IP 归属地解析 — 阿里云市场在线 API + ip2region 离线库 + 熔断降级。"""
|
||||
|
||||
import ipaddress
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
|
||||
import requests
|
||||
from django.conf import settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# ── 熔断状态 ──
|
||||
_circuit_open_until = 0 # 在线 API 失败后,此时间戳之前直接走离线
|
||||
_CIRCUIT_COOLDOWN = 60 # 熔断冷却 60 秒
|
||||
|
||||
# ── ip2region 搜索器缓存 ──
|
||||
_ip2region_searcher = None
|
||||
|
||||
|
||||
def _is_private_ip(ip: str) -> bool:
|
||||
"""判断是否为私有/本地 IP。"""
|
||||
try:
|
||||
addr = ipaddress.ip_address(ip)
|
||||
return addr.is_private or addr.is_loopback or addr.is_reserved
|
||||
except (ValueError, TypeError):
|
||||
return True
|
||||
|
||||
|
||||
def _normalize_city(name: str) -> str:
|
||||
"""标准化城市名:去掉「市」后缀。"""
|
||||
if name and name.endswith('市'):
|
||||
return name[:-1]
|
||||
return name
|
||||
|
||||
|
||||
def _normalize_province(name: str) -> str:
|
||||
"""标准化省份名:去掉「省」「自治区」「壮族自治区」等后缀。"""
|
||||
if not name:
|
||||
return name
|
||||
for suffix in ['壮族自治区', '回族自治区', '维吾尔自治区', '自治区', '省']:
|
||||
if name.endswith(suffix):
|
||||
return name[:-len(suffix)]
|
||||
return name
|
||||
|
||||
|
||||
def _resolve_online(ip: str) -> tuple:
|
||||
"""阿里云市场 IP138 归属地 API(超时 2s)。
|
||||
|
||||
Returns: (country, province, city) or raises Exception.
|
||||
"""
|
||||
appcode = settings.ALIYUN_IP_GEO_APPCODE
|
||||
if not appcode:
|
||||
raise RuntimeError('ALIYUN_IP_GEO_APPCODE not configured')
|
||||
|
||||
url = f'https://ali.ip138.com/ip/?ip={ip}&datatype=json'
|
||||
headers = {'Authorization': f'APPCODE {appcode}'}
|
||||
resp = requests.get(url, headers=headers, timeout=2)
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
|
||||
if data.get('ret') != 'ok':
|
||||
raise RuntimeError(f'IP138 API error: {data.get("msg", data)}')
|
||||
|
||||
# data.data = ["国家", "省份", "城市", "运营商", "邮编", "区号"]
|
||||
parts = data.get('data', [])
|
||||
country = parts[0] if len(parts) > 0 else ''
|
||||
province = _normalize_province(parts[1] if len(parts) > 1 else '')
|
||||
city = _normalize_city(parts[2] if len(parts) > 2 else '')
|
||||
|
||||
return country, province, city
|
||||
|
||||
|
||||
def _resolve_offline(ip: str) -> tuple:
|
||||
"""ip2region 离线库解析。
|
||||
|
||||
Returns: (country, province, city) or ('', '', '').
|
||||
"""
|
||||
global _ip2region_searcher
|
||||
|
||||
if _ip2region_searcher is None:
|
||||
try:
|
||||
import ipregion, os
|
||||
from ipregion import XdbSearcher
|
||||
pkg_dir = os.path.dirname(ipregion.__file__)
|
||||
db_path = os.path.join(pkg_dir, 'ip2region.xdb')
|
||||
content = XdbSearcher.loadContentFromFile(dbfile=db_path)
|
||||
_ip2region_searcher = XdbSearcher(contentBuff=content)
|
||||
except Exception as e:
|
||||
logger.warning('ip2region init failed: %s', e)
|
||||
return '', '', ''
|
||||
|
||||
try:
|
||||
region_str = _ip2region_searcher.searchByIPStr(ip)
|
||||
# 格式: "中国|0|广东省|广州市|电信"
|
||||
parts = region_str.split('|') if region_str else []
|
||||
country = parts[0] if len(parts) > 0 and parts[0] != '0' else ''
|
||||
province = _normalize_province(parts[2] if len(parts) > 2 and parts[2] != '0' else '')
|
||||
city = _normalize_city(parts[3] if len(parts) > 3 and parts[3] != '0' else '')
|
||||
return country, province, city
|
||||
except Exception as e:
|
||||
logger.warning('ip2region lookup failed for %s: %s', ip, e)
|
||||
return '', '', ''
|
||||
|
||||
|
||||
def resolve_ip_location(ip: str) -> tuple:
|
||||
"""解析 IP 归属地。
|
||||
|
||||
Returns: (country, province, city, source)
|
||||
source: 'online' / 'offline' / 'skip' / 'failed'
|
||||
"""
|
||||
if not ip or _is_private_ip(ip):
|
||||
return '', '', '', 'skip'
|
||||
|
||||
global _circuit_open_until
|
||||
|
||||
# 尝试在线 API(熔断期间跳过)
|
||||
now = time.time()
|
||||
if now >= _circuit_open_until and settings.ALIYUN_IP_GEO_APPCODE:
|
||||
try:
|
||||
country, province, city = _resolve_online(ip)
|
||||
return country, province, city, 'online'
|
||||
except Exception as e:
|
||||
logger.warning('Online IP geo failed for %s: %s — circuit open for %ds', ip, e, _CIRCUIT_COOLDOWN)
|
||||
_circuit_open_until = now + _CIRCUIT_COOLDOWN
|
||||
|
||||
# 降级到离线库
|
||||
try:
|
||||
country, province, city = _resolve_offline(ip)
|
||||
if country or province or city:
|
||||
return country, province, city, 'offline'
|
||||
except Exception as e:
|
||||
logger.warning('Offline IP geo failed for %s: %s', ip, e)
|
||||
|
||||
return '', '', '', 'failed'
|
||||
@ -1,134 +0,0 @@
|
||||
"""Media utilities: extract video thumbnails and durations using ffmpeg/ffprobe.
|
||||
|
||||
WARNING: These functions download files and run subprocess commands.
|
||||
They MUST only be called from Celery tasks, NEVER from HTTP request handlers.
|
||||
Calling from gunicorn (especially with gevent workers) will block the worker pool.
|
||||
"""
|
||||
|
||||
import logging
|
||||
import subprocess
|
||||
import tempfile
|
||||
import os
|
||||
import requests
|
||||
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
MAX_DOWNLOAD_SIZE = 100 * 1024 * 1024 # 100MB safety limit
|
||||
|
||||
|
||||
def download_to_temp(url: str, suffix: str) -> str:
|
||||
"""Download a URL to a temporary file. Returns the temp file path.
|
||||
Only accepts http/https URLs to prevent SSRF.
|
||||
"""
|
||||
if not url.startswith(('http://', 'https://')):
|
||||
raise ValueError(f'Invalid URL scheme: {url[:30]}')
|
||||
resp = requests.get(url, timeout=30, stream=True)
|
||||
resp.raise_for_status()
|
||||
tmp = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
|
||||
downloaded = 0
|
||||
try:
|
||||
for chunk in resp.iter_content(8192):
|
||||
downloaded += len(chunk)
|
||||
if downloaded > MAX_DOWNLOAD_SIZE:
|
||||
tmp.close()
|
||||
os.unlink(tmp.name)
|
||||
raise ValueError(f'File too large: {downloaded} bytes')
|
||||
tmp.write(chunk)
|
||||
tmp.close()
|
||||
except Exception:
|
||||
tmp.close()
|
||||
if os.path.exists(tmp.name):
|
||||
os.unlink(tmp.name)
|
||||
raise
|
||||
return tmp.name
|
||||
|
||||
|
||||
def _get_duration_ffprobe(file_path: str) -> float:
|
||||
"""Get media duration in seconds using ffprobe."""
|
||||
try:
|
||||
result = subprocess.run(
|
||||
['ffprobe', '-v', 'quiet', '-show_entries', 'format=duration',
|
||||
'-of', 'default=noprint_wrappers=1:nokey=1', file_path],
|
||||
capture_output=True, text=True, timeout=15,
|
||||
)
|
||||
return float(result.stdout.strip())
|
||||
except Exception as e:
|
||||
logger.warning('ffprobe duration failed: %s', e)
|
||||
return 0
|
||||
|
||||
|
||||
def _extract_first_frame(video_path: str, output_path: str) -> bool:
|
||||
"""Extract the first frame of a video as JPEG using ffmpeg."""
|
||||
try:
|
||||
subprocess.run(
|
||||
['ffmpeg', '-y', '-i', video_path, '-vframes', '1',
|
||||
'-f', 'image2', '-q:v', '2', output_path],
|
||||
capture_output=True, timeout=15,
|
||||
)
|
||||
return os.path.exists(output_path) and os.path.getsize(output_path) > 0
|
||||
except Exception as e:
|
||||
logger.warning('ffmpeg frame extraction failed: %s', e)
|
||||
return False
|
||||
|
||||
|
||||
def extract_video_info_from_file(video_path: str) -> tuple:
|
||||
"""Extract first frame thumbnail + duration from a local video file.
|
||||
Returns (thumbnail_file: SimpleUploadedFile | None, duration: float).
|
||||
Does NOT delete the input file — caller is responsible for cleanup.
|
||||
"""
|
||||
tmp_thumb = None
|
||||
try:
|
||||
duration = _get_duration_ffprobe(video_path)
|
||||
tmp_thumb = video_path + '_thumb.jpg'
|
||||
if _extract_first_frame(video_path, tmp_thumb):
|
||||
with open(tmp_thumb, 'rb') as f:
|
||||
thumb_file = SimpleUploadedFile(
|
||||
'thumbnail.jpg', f.read(), content_type='image/jpeg'
|
||||
)
|
||||
return thumb_file, duration
|
||||
return None, duration
|
||||
except Exception as e:
|
||||
logger.warning('extract_video_info_from_file failed: %s', e)
|
||||
return None, 0
|
||||
finally:
|
||||
if tmp_thumb and os.path.exists(tmp_thumb):
|
||||
os.unlink(tmp_thumb)
|
||||
|
||||
|
||||
def extract_video_info(video_url: str) -> tuple:
|
||||
"""Extract first frame thumbnail + duration from a video URL.
|
||||
Returns (thumbnail_file: SimpleUploadedFile | None, duration: float).
|
||||
NOTE: This function downloads the full video. For large files, call from
|
||||
Celery tasks only — never from HTTP request handlers.
|
||||
"""
|
||||
tmp_video = None
|
||||
try:
|
||||
suffix = '.mp4'
|
||||
if '.mov' in video_url.lower():
|
||||
suffix = '.mov'
|
||||
tmp_video = download_to_temp(video_url, suffix)
|
||||
return extract_video_info_from_file(tmp_video)
|
||||
except Exception as e:
|
||||
logger.warning('extract_video_info failed for %s: %s', video_url, e)
|
||||
return None, 0
|
||||
finally:
|
||||
if tmp_video and os.path.exists(tmp_video):
|
||||
os.unlink(tmp_video)
|
||||
|
||||
|
||||
def get_audio_duration(audio_url: str) -> float:
|
||||
"""Get audio duration in seconds from a URL."""
|
||||
tmp_audio = None
|
||||
try:
|
||||
suffix = '.wav' if '.wav' in audio_url.lower() else '.mp3'
|
||||
tmp_audio = download_to_temp(audio_url, suffix)
|
||||
return _get_duration_ffprobe(tmp_audio)
|
||||
except Exception as e:
|
||||
logger.warning('get_audio_duration failed for %s: %s', audio_url, e)
|
||||
return 0
|
||||
finally:
|
||||
if tmp_audio and os.path.exists(tmp_audio):
|
||||
os.unlink(tmp_audio)
|
||||
@ -47,7 +47,7 @@ def upload_file(file_obj, folder='uploads'):
|
||||
content = file_obj.read()
|
||||
|
||||
# Use content hash as key for dedup
|
||||
content_hash = hashlib.sha256(content).hexdigest()
|
||||
content_hash = hashlib.md5(content).hexdigest()
|
||||
key = f'{folder}/{content_hash}.{ext}'
|
||||
url = f'{settings.TOS_CDN_DOMAIN}/{key}'
|
||||
|
||||
@ -56,10 +56,8 @@ def upload_file(file_obj, folder='uploads'):
|
||||
client.head_object(bucket=settings.TOS_BUCKET, key=key)
|
||||
logger.info('TOS dedup hit: %s', key)
|
||||
return url
|
||||
except Exception as e:
|
||||
err_str = str(e).lower()
|
||||
if '404' not in err_str and 'not found' not in err_str and 'nosuchkey' not in err_str:
|
||||
logger.warning('TOS head_object unexpected error (proceeding with upload): %s', e)
|
||||
except Exception:
|
||||
pass # Object doesn't exist, proceed with upload
|
||||
|
||||
client.put_object(
|
||||
bucket=settings.TOS_BUCKET,
|
||||
@ -71,44 +69,6 @@ def upload_file(file_obj, folder='uploads'):
|
||||
return url
|
||||
|
||||
|
||||
def upload_from_file_path(file_path, folder='uploads', content_type=None):
|
||||
"""Upload a local file to TOS by path (streaming, no full memory load).
|
||||
Returns the permanent CDN URL.
|
||||
"""
|
||||
ext = file_path.rsplit('.', 1)[-1].lower() if '.' in file_path else 'bin'
|
||||
if not content_type:
|
||||
content_type = CONTENT_TYPE_MAP.get(ext, 'application/octet-stream')
|
||||
|
||||
# Use content hash for dedup
|
||||
h = hashlib.sha256()
|
||||
with open(file_path, 'rb') as f:
|
||||
for chunk in iter(lambda: f.read(8192), b''):
|
||||
h.update(chunk)
|
||||
content_hash = h.hexdigest()
|
||||
key = f'{folder}/{content_hash}.{ext}'
|
||||
url = f'{settings.TOS_CDN_DOMAIN}/{key}'
|
||||
|
||||
client = get_tos_client()
|
||||
try:
|
||||
client.head_object(bucket=settings.TOS_BUCKET, key=key)
|
||||
logger.info('TOS dedup hit: %s', key)
|
||||
return url
|
||||
except Exception as e:
|
||||
# Only proceed if object not found (404). Re-raise on auth/config errors.
|
||||
err_str = str(e).lower()
|
||||
if '404' not in err_str and 'not found' not in err_str and 'nosuchkey' not in err_str:
|
||||
logger.warning('TOS head_object unexpected error (proceeding with upload): %s', e)
|
||||
|
||||
with open(file_path, 'rb') as f:
|
||||
client.put_object(
|
||||
bucket=settings.TOS_BUCKET,
|
||||
key=key,
|
||||
content=f,
|
||||
content_type=content_type,
|
||||
)
|
||||
return url
|
||||
|
||||
|
||||
def upload_from_url(source_url, folder='results'):
|
||||
"""Download a file from a URL and upload to TOS, return permanent CDN URL."""
|
||||
import requests as req
|
||||
|
||||
@ -1,961 +0,0 @@
|
||||
# 【申请权限填客户名称】Seedance 2.0 & 2.0 fast API文档(邀测用户版)
|
||||
|
||||
该文档目前仅限开白客户使用,发送前请和销管确认客户是否在开白名单内
|
||||
|
||||
***【❗️❗️❗️】该文档限制客户申请权限,只有返回了服务协议的客户方可申请***
|
||||
|
||||
本文介绍 Seedance 2.0 & 2.0 fast 模型相较于存量模型 **新增/配置有区别 **的 API 参数介绍,存量 API 参数的完整介绍参见 [视频生成 API](https://www.volcengine.com/docs/82379/1520758?lang=zh)。
|
||||
|
||||
> 本文档仅限预览及邀测用户使用:
|
||||
>
|
||||
> * 不承诺正式API上线100%一致。
|
||||
>
|
||||
> * 仅限邀测用户阅读,请勿截图/分享给其他人员。
|
||||
>
|
||||
> * 您上传的内容请确保由您原创或已取得授权。
|
||||
|
||||
# 模型能力
|
||||
|
||||
> **Seedance 2.0 和 Seedance 2.0 fast 提供的模型能力一致,**追求最高生成品质,推荐使用 **Seedance 2.0**;更注重成本与生成速度,不要求极限品质,推荐使用 **Seedance 2.0 fast**。
|
||||
|
||||
**Seedance 2.0 & 2.0 fast (有声视频/无声视频)**
|
||||
|
||||
* **多模态参考生视频**:输入参考图片(0\~9)+参考视频(0\~3)+ 参考音频(0\~3)+ 文本提示词(可选)生成 1 个目标视频。支持生成全新视频、编辑视频、延长视频。
|
||||
|
||||
> **注意:不可单独输入音频,应至少包含 1 个参考视频或图片。**
|
||||
|
||||
* **图生视频-首尾帧**:输入首帧图片+尾帧图片+文本提示词(可选)生成 1 个目标视频。
|
||||
|
||||
* **图生视频-首帧**:输入首帧图片+文本提示词(可选)生成 1 个目标视频。
|
||||
|
||||
* **文生视频**:输入文本提示词生成 1 个目标视频。
|
||||
|
||||
|
||||
|
||||
**模型能力对比表:**
|
||||
|
||||
| 模型名称 | | [Seedance 2.0](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-2-0) | [Seedance 2.0 fast](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-2-0-fast\&projectName=default) | [Seedance 1.5 pro](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-5-pro\&projectName=default) | [Seedance 1.0 pro ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-pro\&projectName=default) | [Seedance 1.0 pro fast ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-pro-fast\&projectName=default) | [Seedance 1.0 lite i2v](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-lite-i2v\&projectName=default) | [Seedance-1.0 lite t2v ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-lite-t2v) |
|
||||
| ------------ | -------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Model ID | | doubao-seedance-2-0-260128 | doubao-seedance-2-0-fast-260128 | doubao-seedance-1-5-pro-251215 | doubao-seedance-1-0-pro-250528 | doubao-seedance-1-0-pro-fast-251015 | doubao-seedance-1-0-lite-i2v-250428 | doubao-seedance-1-0-lite-t2v-250428 |
|
||||
| 文生视频 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 图生视频-首帧 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ❌ |
|
||||
| 图生视频-首尾帧 | | ✅ | | ✅ | ✅ | ❌ | ✅ | ❌ |
|
||||
| 多模态参考【New】 | 图片参考 | ✅ | | ❌ | ❌ | ❌ | ✅ | ❌ |
|
||||
| | 视频参考 | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| | 组合参考 | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 编辑视频【New】 | | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 延长视频【New】 | | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 生成有声视频 | | ✅ | | ✅ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 联网搜索增强【New】 | | ✅ | | ❌ | [❌](https://p9-arcosite.byteimg.com/obj/tos-cn-i-goo7wpa0wc/f359753773c94d97885008ca1223c9bc) | ❌ | ❌ | ❌ |
|
||||
| 样片模式 | | ❌ | | ✅ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 返回视频尾帧 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 输出视频规格 | 输出分辨率 | 480p, 720p | | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p |
|
||||
| | 输出宽高比 | 21:9, 16:9, 4:3, 1:1, 3:4, 9:16 | | | | | | |
|
||||
| | 输出时长 | 4\~15 秒 | | 4\~12 秒 | 2\~12 秒 | 2\~12 秒 | 2\~12 秒 | 2\~12 秒 |
|
||||
| | 输出视频格式 | mp4 | | mp4 | mp4 | mp4 | mp4 | mp4 |
|
||||
| 离线推理 | | [❌](https://p9-arcosite.byteimg.com/obj/tos-cn-i-goo7wpa0wc/f359753773c94d97885008ca1223c9bc) | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 在线推理限流 | RPM | 600 | | 600 | 600 | 600 | 300 | 300 |
|
||||
| | 并发数 | 10 | | 10 | 10 | 10 | 5 | 5 |
|
||||
| 离线推理限流 | TPD | - | | 5000亿 | 5000亿 | 5000亿 | 2500亿 | 2500亿 |
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Creat-创建视频生成任务
|
||||
|
||||
> POST https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks
|
||||
|
||||
## 请求参数
|
||||
|
||||
|
||||
|
||||
#### **content** `object[]` `必选`
|
||||
|
||||
输入给模型,生成视频的信息,支持文本、图片、音频、视频、样片任务 ID。支持以下几种组合:
|
||||
|
||||
* **文本**
|
||||
|
||||
* **文本(可选)+ 图片**
|
||||
|
||||
* **文本(可选)+ 视频**
|
||||
|
||||
* **文本(可选)+ 图片 + 音频**
|
||||
|
||||
* **文本(可选)+ 图片 + 视频**
|
||||
|
||||
* **文本(可选)+ 视频 + 音频**
|
||||
|
||||
* **文本(可选)+ 图片 + 视频 + 音频**
|
||||
|
||||
***
|
||||
|
||||
**信息类型:**
|
||||
|
||||
* **文本信息**`object`
|
||||
|
||||
输入给模型的提示词信息。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **text**。
|
||||
|
||||
***
|
||||
|
||||
content.**text **`string` `必选`
|
||||
|
||||
输入给模型的文本提示词,描述期望生成的视频。
|
||||
|
||||
支持中英文。建议中文不超过500字,英文不超过1000词。字数过多信息容易分散,模型可能因此忽略细节,只关注重点,造成视频缺失部分元素。提示词的更多使用技巧请参见 [Seedance 提示词指南](https://www.volcengine.com/docs/82379/1587797)。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **图片信息** `object`
|
||||
|
||||
输入给模型的图片信息。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **image\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**image\_url **`object` `必选`
|
||||
|
||||
输入给模型的图片对象。
|
||||
|
||||
***
|
||||
|
||||
content.image\_url.**url **`string` `必选`
|
||||
|
||||
图片 URL 、图片 Base64 编码、素材 ID。
|
||||
|
||||
* 图片 URL:填入图片的公网 URL。
|
||||
|
||||
* Base64 编码:将本地文件转换为 Base64 编码字符串,然后提交给大模型。遵循格式:data:image/<图片格式>;base64,\<Base64编码>,注意 <图片格式> 需小写,如 data:image/png;base64,{base64\_image}。
|
||||
|
||||
* 素材 ID:用于视频生成的预置素材及虚拟人像的 ID,遵循格式:asset://\<ASSET\_ID>,可从 [素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128) 获取,详细使用请参见[文档](https://www.volcengine.com/docs/82379/2223965?lang=zh)。
|
||||
|
||||
> **传入单张图片要求**
|
||||
>
|
||||
> * 格式:jpeg、png、webp、bmp、tiff、gif
|
||||
>
|
||||
> * 宽高比(宽/高): (0.4, 2.5) 
|
||||
>
|
||||
> * 宽高长度(px):(300, 6000)
|
||||
>
|
||||
> * 大小:单张图片小于 30 MB。请求体大小不超过 64 MB。大文件请勿使用Base64编码。
|
||||
>
|
||||
> * 图片数量:
|
||||
>
|
||||
> * 图生视频-首帧:1 张
|
||||
>
|
||||
> * 图生视频-首尾帧:2 张
|
||||
>
|
||||
> * Seedance 2.0 & 2.0 fast 多模态参考生视频:1\~9 张
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
图片的位置或用途。
|
||||
|
||||
> **注意**
|
||||
>
|
||||
> * **图生视频-首帧**、**图生视频-首尾帧**、**多模态参考生视频**(包括参考图、视频、音频)为 3 种互斥场景,**不可混用**。
|
||||
>
|
||||
> * **多模态参考生视频**可通过提示词指定参考图片作为首帧/尾帧,间接实现“首尾帧+多模态参考”效果。若需严格保障首尾帧和指定图片一致,**优先使用图生视频-首尾帧**(配置 role 为 **first\_frame / last\_frame**)。
|
||||
|
||||
***
|
||||
|
||||
**图生视频-首帧**
|
||||
|
||||
> 需要传入1个 image\_url 对象
|
||||
|
||||
* **字段role取值:**
|
||||
|
||||
* **first\_frame 或不填**
|
||||
|
||||
***
|
||||
|
||||
**图生视频-首尾帧**
|
||||
|
||||
> 需要传入2个 image\_url 对象
|
||||
|
||||
* **字段role取值:**
|
||||
|
||||
* 首帧图片对应的字段 role 为:**first\_frame**,必填
|
||||
|
||||
* 尾帧图片对应的字段 role 为:**last\_frame**,必填
|
||||
|
||||
***
|
||||
|
||||
**图生视频-参考图 **
|
||||
|
||||
> 可传入 1\~9 个 image\_url 对象
|
||||
|
||||
* **字段role取值**:
|
||||
|
||||
* 每张参考图对应的字段 role 均为:**reference\_image**,必填
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **视频信息** `object` 
|
||||
|
||||
输入给模型的视频信息。仅 Seedance 2.0 & 2.0 fast 支持输入视频。2026年3月11日起,支持使用本账号下 Seedance 2.0 & 2.0 fast 模型产出的视频作为输入素材,进行视频编辑或延长,其中的真人人脸可正常使用,不会触发审核拦截。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **video\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**video\_url **`object` `必选`
|
||||
|
||||
输入给模型的视频对象。
|
||||
|
||||
***
|
||||
|
||||
content.video\_url.**url **`string` `必选`
|
||||
|
||||
视频URL、素材 ID。
|
||||
|
||||
* 视频 URL:填入视频的公网 URL。
|
||||
|
||||
* 素材 ID:用于视频生成的预置素材及虚拟人像视频的 ID,遵循格式:asset://\<ASSET\_ID>。可从[素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128)获取。
|
||||
|
||||
> **传入单个视频要求**
|
||||
>
|
||||
> * 视频格式:mp4、mov。
|
||||
>
|
||||
> * 分辨率:480p、720p
|
||||
>
|
||||
> * 时长:单个视频时长 \[2, 15] s,最多传入 3 个参考视频,所有视频总时长不超过 15s。
|
||||
>
|
||||
> * 尺寸:
|
||||
>
|
||||
> * 宽高比(宽/高):\[0.4, 2.5]
|
||||
>
|
||||
> * 宽高长度(px):\[300, 6000]
|
||||
>
|
||||
> * 画面像素(宽 × 高):\[409600, 927408] ,示例:
|
||||
>
|
||||
> * 画面尺寸 640×640=409600 满足最小值 ;
|
||||
>
|
||||
> * 画面尺寸 834×1112=927408 满足最大值。
|
||||
>
|
||||
> * 大小:单个视频不超过 50 MB。
|
||||
>
|
||||
> * 帧率 (FPS):\[24, 60] 
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
视频的位置或用途。当前仅支持 **reference\_video**。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **音频信息 **`object` 
|
||||
|
||||
输入给模型的音频信息。仅 Seedance 2.0 & 2.0 fast 支持输入音频。注意不可单独输入音频,应至少包含 1 个参考视频或图片。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **audio\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**audio\_url **`object` `必选`
|
||||
|
||||
输入给模型的音频对象。
|
||||
|
||||
***
|
||||
|
||||
content.audio\_url.**url **`string` `必选`
|
||||
|
||||
音频 URL 、音频 Base64 编码、素材 ID。
|
||||
|
||||
* 音频 URL:填入音频的公网 URL。
|
||||
|
||||
* Base64 编码:将本地文件转换为 Base64 编码字符串,然后提交给大模型。遵循格式:data:audio/<音频格式>;base64,\<Base64编码>,注意 <音频格式> 需小写,如 data:audio/wav;base64,{base64\_audio}。
|
||||
|
||||
* 素材 ID:用于视频生成的虚拟人的音频素材 ID,遵循格式:asset://\<ASSET\_ID>。可从[素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128)获取。
|
||||
|
||||
> **传入单个音频要求**
|
||||
>
|
||||
> * 格式:wav、mp3
|
||||
>
|
||||
> * 时长:单个音频时长 \[2, 15] s,最多传入 3 段参考音频,所有音频总时长不超过 15 s。
|
||||
>
|
||||
> * 大小:单个音频不超过 15 MB,请求体大小不超过 64 MB。大文件请勿使用Base64编码。
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
音频的位置或用途。当前仅支持 **reference\_audio** 。
|
||||
|
||||
|
||||
|
||||
#### **service\_tier** `string`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **generate\_audio **`boolean` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值: true
|
||||
|
||||
控制生成的视频是否包含与画面同步的声音。
|
||||
|
||||
* true:模型输出的视频包含同步音频。模型会基于文本提示词与视觉内容,自动生成与之匹配的人声、音效及背景音乐。建议将对话部分置于双引号内,以优化音频生成效果。例如:男人叫住女人说:“你记住,以后不可以用手指指月亮。”
|
||||
|
||||
* false:模型输出的视频为无声视频。
|
||||
|
||||
> **说明**
|
||||
>
|
||||
> 生成的有声视频均为单声道,和传入的音频声道数无关。
|
||||
|
||||
####
|
||||
|
||||
#### **draft **`boolean`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **tools **`object[]`
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
配置模型要调用的工具。
|
||||
|
||||
***
|
||||
|
||||
tools.**type **`string`
|
||||
|
||||
指定使用的工具类型。
|
||||
|
||||
* web\_search:联网搜索工具。当前仅文生视频支持。
|
||||
|
||||
> **说明**
|
||||
>
|
||||
> * 开启联网搜索后,模型会根据用户的提示词自主判断是否搜索互联网内容(如商品、天气等)。可提升生成视频的时效性,但也会增加一定的时延。
|
||||
>
|
||||
> * 实际搜索次数可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 usage.tool\_usage.**web\_search** 字段获取,如果为 0 表示未搜索。
|
||||
|
||||
|
||||
|
||||
#### **resolution ** `string`
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值:720p
|
||||
|
||||
视频分辨率,取值范围:
|
||||
|
||||
* 480p
|
||||
|
||||
* 720p
|
||||
|
||||
|
||||
|
||||
#### **ratio **`string` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值: adaptive
|
||||
|
||||
生成视频的宽高比例。不同宽高比对应的宽高像素值见下方表格。
|
||||
|
||||
* 16:9 
|
||||
|
||||
* 4:3
|
||||
|
||||
* 1:1
|
||||
|
||||
* 3:4
|
||||
|
||||
* 9:16
|
||||
|
||||
* 21:9
|
||||
|
||||
* adaptive:根据输入自动选择最合适的宽高比
|
||||
|
||||
> **adaptive 适配规则**
|
||||
>
|
||||
> 当配置 **ratio** 为 adaptive 时,模型会根据生成场景自动适配宽高比;实际生成的视频宽高比可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **ratio** 字段获取。
|
||||
>
|
||||
> * 文生视频:根据输入的提示词,智能选择最合适的宽高比。
|
||||
>
|
||||
> * 首帧 / 首尾帧生视频:根据上传的首帧图片比例,自动选择最接近的宽高比。
|
||||
>
|
||||
> * 多模态参考生视频:根据用户提示词意图判断,如果是首帧生视频/编辑视频/延长视频,以该图片/视频为准选择最接近的宽高比;否则,以传入的第一个媒体文件为准(优先级:视频>图片)选择最接近的宽高比。
|
||||
|
||||
***
|
||||
|
||||
**不同宽高比对应的宽高像素值:**
|
||||
|
||||
| 分辨率 | 宽高比 | 宽高像素值 |
|
||||
| ---- | ---- | -------- |
|
||||
| 480p | 16:9 | 864×496 |
|
||||
| | 4:3 | 752×560 |
|
||||
| | 1:1 | 640×640 |
|
||||
| | 3:4 | 560×752 |
|
||||
| | 9:16 | 496×864 |
|
||||
| | 21:9 | 992×432 |
|
||||
| 720p | 16:9 | 1280×720 |
|
||||
| | 4:3 | 1112×834 |
|
||||
| | 1:1 | 960×960 |
|
||||
| | 3:4 | 834×1112 |
|
||||
| | 9:16 | 720×1280 |
|
||||
| | 21:9 | 1470×630 |
|
||||
|
||||
|
||||
|
||||
#### **duration** `integer` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值:5
|
||||
|
||||
生成视频时长,仅支持整数,单位:秒。
|
||||
|
||||
取值范围:
|
||||
|
||||
* \[4,15] 或设置为-1
|
||||
|
||||
> **配置方法**
|
||||
>
|
||||
> * 指定具体时长:支持有效范围内的任一整数。
|
||||
>
|
||||
> * 智能指定:设置为 -1,表示由模型在有效范围内自主选择合适的视频长度(整数秒)。实际生成视频的时长可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **duration** 字段获取。注意视频时长与计费相关,请谨慎设置。
|
||||
|
||||
|
||||
|
||||
#### **frames** `integer` 
|
||||
|
||||
Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **camera\_fixed** `boolean`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
# Get/List-查询视频生成任务/列表
|
||||
|
||||
> [查询视频生成任务](https://www.volcengine.com/docs/82379/1521309?lang=zh):GET https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks/{id}
|
||||
>
|
||||
> [查询视频生成任务列表](https://www.volcengine.com/docs/82379/1521675?lang=zh):GET https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks?page\_num={page\_num}\&page\_size={page\_size}\&filter.status={filter.status}\&filter.task\_ids={filter.task\_ids}\&filter.model={filter.model}
|
||||
|
||||
## 响应参数
|
||||
|
||||
#### **tools **`object[]` 
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
配置模型要调用的工具。
|
||||
|
||||
***
|
||||
|
||||
tools.**type **`string`
|
||||
|
||||
指定使用的工具类型。
|
||||
|
||||
* web\_search:联网搜索工具。
|
||||
|
||||
|
||||
|
||||
#### **usage** `object`
|
||||
|
||||
本次请求的 token 用量。
|
||||
|
||||
***
|
||||
|
||||
usage.**completion\_tokens** `integer`
|
||||
|
||||
模型输出视频花费的 token 数量。
|
||||
|
||||
***
|
||||
|
||||
usage.**total\_tokens** `integer`
|
||||
|
||||
本次请求消耗的总 token 数量。
|
||||
|
||||
***
|
||||
|
||||
usage.**tool\_usage **`object` 
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
使用工具的用量信息。
|
||||
|
||||
***
|
||||
|
||||
usage.tool\_usage.**web\_search **`integer` 
|
||||
|
||||
实际调用联网搜索工具的次数,仅开启联网搜索时返回。
|
||||
|
||||
|
||||
|
||||
# 调用简介及示例
|
||||
|
||||
## 流程简介
|
||||
|
||||
任务接口是异步接口,视频生成任务流程
|
||||
|
||||
1. 创建视频生成任务接口创建视频生成任务
|
||||
|
||||
2. 定时使用查询接口查询视频生成任务状态
|
||||
|
||||
1. 任务 running,过段时间再查询任务状态
|
||||
|
||||
2. 任务完成,返回视频链接,在24小时内下载生成的视频文件
|
||||
|
||||
## 1. 创建视频生成任务
|
||||
|
||||
> 以下示例仅展示 Seedance 2.0 & 2.0 fast 新增能力,更多视频生成示例详见 [创建视频生成任务 API](https://www.volcengine.com/docs/82379/1520757)。
|
||||
|
||||
### 多模态参考
|
||||
|
||||
```bash
|
||||
curl https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $ARK_API_KEY" \
|
||||
-d '{
|
||||
"model": "doubao-seedance-2-0-260128",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "全程使用视频1的第一视角构图,全程使用音频1作为背景音乐。第一人称视角果茶宣传广告,seedance牌「苹苹安安」苹果果茶限定款;首帧为图片1,你的手摘下一颗带晨露的阿克苏红苹果,轻脆的苹果碰撞声;2-4 秒:快速切镜,你的手将苹果块投入雪克杯,加入冰块与茶底,用力摇晃,冰块碰撞声与摇晃声卡点轻快鼓点,背景音:「鲜切现摇」;4-6 秒:第一人称成品特写,分层果茶倒入透明杯,你的手轻挤奶盖在顶部铺展,在杯身贴上粉红包标,镜头拉近看奶盖与果茶的分层纹理;6-8 秒:第一人称手持举杯,你将图片2中的果茶举到镜头前(模拟递到观众面前的视角),杯身标签清晰可见,背景音「来一口鲜爽」,尾帧定格为图片2。背景声音统一为女生音色。"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/r2v_tea_pic1.jpg"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/r2v_tea_pic2.jpg"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_video/r2v_tea_video1.mp4"
|
||||
},
|
||||
"role": "reference_video"
|
||||
},
|
||||
{
|
||||
"type": "audio_url",
|
||||
"audio_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_audio/r2v_tea_audio1.mp3"
|
||||
},
|
||||
"role": "reference_audio"
|
||||
}
|
||||
],
|
||||
"generate_audio":true,
|
||||
"ratio": "16:9",
|
||||
"duration": 11,
|
||||
"watermark": false
|
||||
}'
|
||||
```
|
||||
|
||||
### 编辑视频
|
||||
|
||||
```bash
|
||||
curl https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $ARK_API_KEY" \
|
||||
-d '{
|
||||
"model": "doubao-seedance-2-0-260128",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "将视频1礼盒中的香水替换成图片1中的面霜,运镜不变"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/r2v_edit_pic1.jpg"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_video/r2v_edit_video1.mp4"
|
||||
},
|
||||
"role": "reference_video"
|
||||
}
|
||||
],
|
||||
"generate_audio": true,
|
||||
"ratio": "16:9",
|
||||
"duration": 5,
|
||||
"watermark": true
|
||||
}'
|
||||
```
|
||||
|
||||
### 延长视频
|
||||
|
||||
```bash
|
||||
curl https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $ARK_API_KEY" \
|
||||
-d '{
|
||||
"model": "doubao-seedance-2-0-260128",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "视频1中的拱形窗户打开,进入美术馆室内,接视频2,之后镜头进入画内,接视频3"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_video/r2v_extend_video1.mp4"
|
||||
},
|
||||
"role": "reference_video"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_video/r2v_extend_video2.mp4"
|
||||
},
|
||||
"role": "reference_video"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_video/r2v_extend_video3.mp4"
|
||||
},
|
||||
"role": "reference_video"
|
||||
}
|
||||
],
|
||||
"generate_audio": true,
|
||||
"ratio": "16:9",
|
||||
"duration": 8,
|
||||
"watermark": true
|
||||
}'
|
||||
```
|
||||
|
||||
### 使用联网搜索
|
||||
|
||||
仅支持文本生视频
|
||||
|
||||
```bash
|
||||
curl https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $ARK_API_KEY" \
|
||||
-d '{
|
||||
"model": "doubao-seedance-2-0-260128",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "微距镜头对准叶片上翠绿的玻璃蛙。焦点逐渐从它光滑的皮肤,转移到它完全透明的腹部,一颗鲜红的心脏正在有力地、规律地收缩扩张。"
|
||||
}
|
||||
],
|
||||
"generate_audio":true,
|
||||
"ratio": "16:9",
|
||||
"duration": 11,
|
||||
"watermark": true,
|
||||
"tools": [
|
||||
{
|
||||
"type": "web_search"
|
||||
}
|
||||
]
|
||||
}'
|
||||
```
|
||||
|
||||
## 2. 查询视频生成任务
|
||||
|
||||
```bash
|
||||
//请将 cgt-2026****hzc2z 替换为创建视频生成任务时获得的任务ID
|
||||
curl -X GET https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks/cgt-2026****hzc2z \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $ARK_API_KEY"
|
||||
```
|
||||
|
||||
|
||||
|
||||
# 最佳实践
|
||||
|
||||
## 使用公共虚拟人像生成视频
|
||||
|
||||
平台提供公共虚拟人像素材库,目前您可以使用其中的图像素材来创建一个统一、完备的视频主角。帮助您更好地控制主角,并确保其形象在多段视频中保持一致,避免因为真人人脸限制导致角色无法统一的问题。
|
||||
|
||||
素材模态目前包含图片,并提供人物背景描述。每个素材对应一个独立素材 ID (asset ID),在体验中心的视频生成任务中,指定角色人脸生成视频。
|
||||
|
||||
1. 在浏览器中打开[体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo),点击输入框下方的 **虚拟人像库** 页签。
|
||||
|
||||
2. 检索需要使用的人像,支持使用自然语言检索及筛选框组合筛选。
|
||||
|
||||
| 输入:文本 | 输入:虚拟人像、图片 | 输出 |
|
||||
| ---------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -- |
|
||||
| **图片1**中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持**图片2**的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。 |  | |
|
||||
|
||||
|
||||
|
||||
在 [Video Generation API](https://www.volcengine.com/docs/82379/1520758) 的 **content.<模态>\_url.url** 字段中使用 素材 URI 生成视频。
|
||||
|
||||
> 输入的参考内容,包括人像素材,需符合视频生成限制,具体信息请查看使用限制。
|
||||
>
|
||||
> **注意**:
|
||||
>
|
||||
> * 首次在 API 中使用虚拟人像素材 Asset URI 前,需先在[方舟体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo)提交一次视频生成任务,阅读并同意弹出的 **虚拟人像库使用协议**。
|
||||
>
|
||||
> * 体验中心支持体验视频生成能力。默认单次生成 4 段视频,为节约成本,建议设置为每次生成 1 条,具体方式可参考[虚拟人像库](https://www.volcengine.com/docs/82379/2223965?lang=zh)。
|
||||
|
||||
同意协议的操作方式如下:
|
||||
|
||||

|
||||
|
||||
示例代码:
|
||||
|
||||
> **注意:**
|
||||
> 在传入给模型的 Prompt 中,需要使用**图片 1**、**视频 1 **的方式指代参考素材,素材序号为素材在请求体中的顺序。请勿直接在 Prompt 中直接使用 Asset ID。
|
||||
> 例:“**图片1 **里的女孩身着**图片2**中的服装,正在整理柜台上的物品。**图片3**中的男孩是一位顾客,他走上前,想要向女孩索要联系方式。” 
|
||||
>
|
||||
> 调用示例请参考[常见问题 4](https://bytedance.larkoffice.com/wiki/RtHgwpJgviwFXLkQ9hLcRooEnVe#share-YOKvdYHjro8EjtxucWaczf6vneg)
|
||||
|
||||
```python
|
||||
import os
|
||||
import time
|
||||
# Install SDK: pip install 'volcengine-python-sdk[ark]'
|
||||
from volcenginesdkarkruntime import Ark
|
||||
client = Ark(
|
||||
# The base URL for model invocation
|
||||
base_url='https://ark.cn-beijing.volces.com/api/v3',
|
||||
# Get API Key:https://console.volcengine.com/ark/region:ark+cn-beijing/apikey
|
||||
api_key=os.environ.get("ARK_API_KEY"),
|
||||
)
|
||||
if __name__ == "__main__":
|
||||
print("----- create request -----")
|
||||
create_result = client.content_generation.tasks.create(
|
||||
model="doubao-seedance-2-0-260128", # Replace with Model ID
|
||||
content=[
|
||||
{
|
||||
"type": "text",
|
||||
# 注意:素材图片指代需使用“图片N”( N 表示传入素材图片/图片的序号,如“图片1”、“图片2”)
|
||||
"text": "图片1中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持图片2的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "asset://asset-20260224200602-qn7wr"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/r2v_edit_pic1.jpg"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
],
|
||||
generate_audio=True,
|
||||
ratio="16:9",
|
||||
duration=11,
|
||||
watermark=True,
|
||||
)
|
||||
print(create_result)
|
||||
print("----- polling task status -----")
|
||||
task_id = create_result.id
|
||||
while True:
|
||||
get_result = client.content_generation.tasks.get(task_id=task_id)
|
||||
status = get_result.status
|
||||
if status == "succeeded":
|
||||
print("----- task succeeded -----")
|
||||
print(get_result)
|
||||
break
|
||||
elif status == "failed":
|
||||
print("----- task failed -----")
|
||||
print(f"Error: {get_result.error}")
|
||||
break
|
||||
else:
|
||||
print(f"Current status: {status}, Retrying after 30 seconds...")
|
||||
time.sleep(30)
|
||||
```
|
||||
|
||||
***
|
||||
|
||||
## 使用自有虚拟人像素材生成视频
|
||||
|
||||
Seedance 2.0 及 2.0 fast 模型具有完备的防范 Deepfake 和侵犯版权风险能力。在生成视频时,会对有风险的参考素材输入进行拦截,最大限度保证生成视频合规和安全性。
|
||||
|
||||
为确保创作者能充分利用 Seedance 2.0 系列模型强大的视频生成能力高效生成视频内容,同时规避 AI 生成内容的潜在风险,方舟推出了私域可信素材库,支持创作者自助上传虚拟人像素材。完成入库的可信素材将进入您的私域素材库,在视频生成中使用。
|
||||
|
||||
> 具体信息请参考文档:[ 「⚠️保密信息」【申请权限填客户名称】私域虚拟人像素材资产库使用指南(邀测用户版)](https://bytedance.larkoffice.com/wiki/RtHgwpJgviwFXLkQ9hLcRooEnVe)。
|
||||
|
||||
***
|
||||
|
||||
## 使用模型产物进行二创
|
||||
|
||||
Seedance 2.0 及 2.0 fast 模型生成的视频为受信素材。您可使用**本账号下**由上述模型生成的视频,进行视频编辑、视频延长等二次创作,素材中的人脸可正常参与生成,不会触发审核拦截。
|
||||
|
||||
> 2026年3月11日起,使用 Seedance 2.0 及 2.0 fast 模型生成的视频,支持二次创作。
|
||||
|
||||
| 输入:文本 | 输入:虚拟人像、图片 | 第一次输出视频 | 二次编辑后视频 |
|
||||
| ---------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ------- |
|
||||
| **图片1**中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持**图片2**的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。 |  | | |
|
||||
|
||||
1. 首次生视频,并获取视频 URL。
|
||||
|
||||
> **注意:**
|
||||
> 在传入给模型的 Prompt 中,需要使用**图片 1**、**视频 1 **的方式指代参考素材,素材序号为素材在请求体中的顺序。
|
||||
>
|
||||
> 请勿直接在 Prompt 中直接使用 Asset ID。
|
||||
> 例:“**图片1 **里的女孩身着**图片2**中的服装,正在整理柜台上的物品。**图片3**中的男孩是一位顾客,他走上前,想要向女孩索要联系方式。”
|
||||
|
||||
```python
|
||||
import os
|
||||
import time
|
||||
# Install SDK: pip install 'volcengine-python-sdk[ark]'
|
||||
from volcenginesdkarkruntime import Ark
|
||||
client = Ark(
|
||||
# The base URL for model invocation
|
||||
base_url='https://ark.cn-beijing.volces.com/api/v3',
|
||||
# Get API Key:https://console.volcengine.com/ark/region:ark+cn-beijing/apikey
|
||||
api_key=os.environ.get("ARK_API_KEY"),
|
||||
)
|
||||
if __name__ == "__main__":
|
||||
print("----- create request -----")
|
||||
create_result = client.content_generation.tasks.create(
|
||||
model="doubao-seedance-2-0-260128", # Replace with Model ID
|
||||
content=[
|
||||
{
|
||||
"type": "text",
|
||||
# 注意:素材图片指代需使用“图片N”( N 表示传入素材图片/图片的序号,如“图片1”、“图片2”)
|
||||
"text": "图片1中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持图片2的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "asset://asset-20260224200602-qn7wr"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://ark-project.tos-cn-beijing.volces.com/doc_image/r2v_edit_pic1.jpg"
|
||||
},
|
||||
"role": "reference_image"
|
||||
},
|
||||
],
|
||||
generate_audio=True,
|
||||
ratio="16:9",
|
||||
duration=11,
|
||||
watermark=True,
|
||||
)
|
||||
print(create_result)
|
||||
print("----- polling task status -----")
|
||||
task_id = create_result.id
|
||||
while True:
|
||||
get_result = client.content_generation.tasks.get(task_id=task_id)
|
||||
status = get_result.status
|
||||
if status == "succeeded":
|
||||
print("----- task succeeded -----")
|
||||
print(get_result)
|
||||
break
|
||||
elif status == "failed":
|
||||
print("----- task failed -----")
|
||||
print(f"Error: {get_result.error}")
|
||||
break
|
||||
else:
|
||||
print(f"Current status: {status}, Retrying after 30 seconds...")
|
||||
time.sleep(30)
|
||||
```
|
||||
|
||||
* 对首次生成的视频进行再次编辑。为直观展示效果,本示例中直接使用视频原始 URL。
|
||||
|
||||
> 视频原始 URL 的有效期仅 24 小时,实际使用时,建议您提前转存视频文件(例如上传至火山引擎TOS)。
|
||||
|
||||
```python
|
||||
import os
|
||||
import time
|
||||
# Install SDK: pip install 'volcengine-python-sdk[ark]'
|
||||
from volcenginesdkarkruntime import Ark
|
||||
client = Ark(
|
||||
# The base URL for model invocation
|
||||
base_url='https://ark.cn-beijing.volces.com/api/v3',
|
||||
# Get API Key:https://console.volcengine.com/ark/region:ark+cn-beijing/apikey
|
||||
api_key=os.environ.get("ARK_API_KEY"),
|
||||
)
|
||||
if __name__ == "__main__":
|
||||
print("----- create request -----")
|
||||
create_result = client.content_generation.tasks.create(
|
||||
model="doubao-seedance-2-0-260128", # Replace with Model ID
|
||||
content=[
|
||||
{
|
||||
"type": "text",
|
||||
"text": "将视频1中的背景修改为室内,房间布置温馨,包括白色的沙发,梳妆台和鲜花。"
|
||||
},
|
||||
{
|
||||
"type": "video_url",
|
||||
"video_url": {
|
||||
"url": "https://ark-acg-cn-beijing.tos-cn-beijing.volces.com/doubao-seedance-2-0/02177390693606300000000000000000000ffffc0a88a7fb18e5d.mp4?X-Tos-Algorithm=TOS4-HMAC-SHA256&X-Tos-Credential=AKLTMjQyZTA4MzFjYTY0NGE5YzgzNTIzMTQzYWI5MmVjMDY%2F20260319%2Fcn-beijing%2Ftos%2Frequest&X-Tos-Date=20260319T075900Z&X-Tos-Expires=86400&X-Tos-Signature=204c1d922d7f563ab0fe2bdf28fe3764df52b3404827acf11c9f3dead82aa3db&X-Tos-SignedHeaders=host"
|
||||
},
|
||||
"role": "reference_video"
|
||||
},
|
||||
],
|
||||
generate_audio=True,
|
||||
ratio="16:9",
|
||||
duration=11,
|
||||
watermark=True,
|
||||
)
|
||||
print(create_result)
|
||||
print("----- polling task status -----")
|
||||
task_id = create_result.id
|
||||
while True:
|
||||
get_result = client.content_generation.tasks.get(task_id=task_id)
|
||||
status = get_result.status
|
||||
if status == "succeeded":
|
||||
print("----- task succeeded -----")
|
||||
print(get_result)
|
||||
break
|
||||
elif status == "failed":
|
||||
print("----- task failed -----")
|
||||
print(f"Error: {get_result.error}")
|
||||
break
|
||||
else:
|
||||
print(f"Current status: {status}, Retrying after 30 seconds...")
|
||||
time.sleep(30)
|
||||
```
|
||||
|
||||
|
||||
|
||||
## 私域素材资产上传最佳案例
|
||||
|
||||
> 在上传素材资产时,**若将目标人脸图、全身参考图及细节参考图合并为同一张图片,可能导致各参考元素在画面中占比较小,从而增加模型识别难度**,造成生成视频中的人物形象与所上传素材资产出现偏差,或造成生成视频中素人脸被误识别为明星脸而触发风控拦截。
|
||||
|
||||
建议在上传素材资产时,将人物面部特写、服装细节等关键内容独立分割为单独的图片进行上传。具体可参考如下规则及示例:
|
||||
|
||||
| | 应该 | 不应该 | |
|
||||
| ---- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| 输入内容 | 给出背景参考图、人物妆造三视图、人物面部无表情特写图、提示词 | 给出背景参考图、人物妆造三视图、提示词 | |
|
||||
| 输出内容 | | | |
|
||||
| 总结 | 同样是古风打斗剧情:左边输入内容包括:背景参考图、**人物妆造三视图**、**人物面部无表情特写图**、提示词;中间输入内容包括:背景参考图、人物妆造三视图、提示词;右边输入内容包括:背景参考图、人物妆造正视图、提示词。左边的输出视频更加还原人物面部特征;右边的人物面部特征一致性遵循不佳。 | | |
|
||||
| 输入内容 | 给出背景参考图、人物妆造三视图、人物面部无表情特写图、提示词 | 给出背景参考图、人物妆造三视图、提示词 | 给出背景参考图、人物妆造正视图、提示词 |
|
||||
| 输出内容 | | | |
|
||||
| 总结 | 同样是温馨亲子剧情:左边输入内容包括:背景参考图、**人物妆造三视图、人物面部无表情特写图**、提示词;中间输入内容包括:背景参考图、人物妆造三视图、提示词;右边输入内容包括:背景参考图、人物妆造正面图、提示词。左边的输出视频更加还原人物面部特征;中间的输出视频人物面部特征一致性遵循不佳;右边人物妆造、面部特征一致性遵循不佳。 | | |
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,692 +0,0 @@
|
||||
# 【申请权限填客户名称】Seedance 2.0 & 2.0 fast API文档(邀测用户版)
|
||||
|
||||
该文档目前仅限开白客户使用,发送前请和销管确认客户是否在开白名单内
|
||||
|
||||
***【❗️❗️❗️】该文档限制客户申请权限,只有返回了服务协议的客户方可申请***
|
||||
|
||||
本文介绍 Seedance 2.0 & 2.0 fast 模型相较于存量模型 **新增/配置有区别 **的 API 参数介绍,存量 API 参数的完整介绍参见 [视频生成 API](https://www.volcengine.com/docs/82379/1520758?lang=zh)。
|
||||
|
||||
> 本文档仅限预览及邀测用户使用:
|
||||
>
|
||||
> * 不承诺正式API上线100%一致。
|
||||
>
|
||||
> * 仅限邀测用户阅读,请勿截图/分享给其他人员。
|
||||
>
|
||||
> * 您上传的内容请确保由您原创或已取得授权。
|
||||
|
||||
# 模型能力
|
||||
|
||||
> **Seedance 2.0 和 Seedance 2.0 fast 提供的模型能力一致,**追求最高生成品质,推荐使用 **Seedance 2.0**;更注重成本与生成速度,不要求极限品质,推荐使用 **Seedance 2.0 fast**。
|
||||
|
||||
**Seedance 2.0 & 2.0 fast (有声视频/无声视频)**
|
||||
|
||||
* **多模态参考生视频**:输入参考图片(0\~9)+参考视频(0\~3)+ 参考音频(0\~3)+ 文本提示词(可选)生成 1 个目标视频。支持生成全新视频、编辑视频、延长视频。
|
||||
|
||||
> **注意:不可单独输入音频,应至少包含 1 个参考视频或图片。**
|
||||
|
||||
* **图生视频-首尾帧**:输入首帧图片+尾帧图片+文本提示词(可选)生成 1 个目标视频。
|
||||
|
||||
* **图生视频-首帧**:输入首帧图片+文本提示词(可选)生成 1 个目标视频。
|
||||
|
||||
* **文生视频**:输入文本提示词生成 1 个目标视频。
|
||||
|
||||
|
||||
|
||||
**模型能力对比表:**
|
||||
|
||||
| 模型名称 | | [Seedance 2.0](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-2-0) | [Seedance 2.0 fast](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-2-0-fast\&projectName=default) | [Seedance 1.5 pro](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-5-pro\&projectName=default) | [Seedance 1.0 pro ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-pro\&projectName=default) | [Seedance 1.0 pro fast ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-pro-fast\&projectName=default) | [Seedance 1.0 lite i2v](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-lite-i2v\&projectName=default) | [Seedance-1.0 lite t2v ](https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seedance-1-0-lite-t2v) |
|
||||
| ------------ | -------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Model ID | | doubao-seedance-2-0-260128 | doubao-seedance-2-0-fast-260128 | doubao-seedance-1-5-pro-251215 | doubao-seedance-1-0-pro-250528 | doubao-seedance-1-0-pro-fast-251015 | doubao-seedance-1-0-lite-i2v-250428 | doubao-seedance-1-0-lite-t2v-250428 |
|
||||
| 文生视频 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 图生视频-首帧 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ❌ |
|
||||
| 图生视频-首尾帧 | | ✅ | | ✅ | ✅ | ❌ | ✅ | ❌ |
|
||||
| 多模态参考【New】 | 图片参考 | ✅ | | ❌ | ❌ | ❌ | ✅ | ❌ |
|
||||
| | 视频参考 | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| | 组合参考 | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 编辑视频【New】 | | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 延长视频【New】 | | ✅ | | ❌ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 生成有声视频 | | ✅ | | ✅ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 联网搜索增强【New】 | | ✅ | | ❌ | [❌](https://p9-arcosite.byteimg.com/obj/tos-cn-i-goo7wpa0wc/f359753773c94d97885008ca1223c9bc) | ❌ | ❌ | ❌ |
|
||||
| 样片模式 | | ❌ | | ✅ | ❌ | ❌ | ❌ | ❌ |
|
||||
| 返回视频尾帧 | | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 输出视频规格 | 输出分辨率 | 480p, 720p | | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p | 480p, 720p, 1080p |
|
||||
| | 输出宽高比 | 21:9, 16:9, 4:3, 1:1, 3:4, 9:16 | | | | | | |
|
||||
| | 输出时长 | 4\~15 秒 | | 4\~12 秒 | 2\~12 秒 | 2\~12 秒 | 2\~12 秒 | 2\~12 秒 |
|
||||
| | 输出视频格式 | mp4 | | mp4 | mp4 | mp4 | mp4 | mp4 |
|
||||
| 离线推理 | | [❌](https://p9-arcosite.byteimg.com/obj/tos-cn-i-goo7wpa0wc/f359753773c94d97885008ca1223c9bc) | | ✅ | ✅ | ✅ | ✅ | ✅ |
|
||||
| 在线推理限流 | RPM | 600 | | 600 | 600 | 600 | 300 | 300 |
|
||||
| | 并发数 | 10 | | 10 | 10 | 10 | 5 | 5 |
|
||||
| 离线推理限流 | TPD | - | | 5000亿 | 5000亿 | 5000亿 | 2500亿 | 2500亿 |
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Creat-创建视频生成任务
|
||||
|
||||
> POST https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks
|
||||
|
||||
## 请求参数
|
||||
|
||||
|
||||
|
||||
#### **content** `object[]` `必选`
|
||||
|
||||
输入给模型,生成视频的信息,支持文本、图片、音频、视频、样片任务 ID。支持以下几种组合:
|
||||
|
||||
* **文本**
|
||||
|
||||
* **文本(可选)+ 图片**
|
||||
|
||||
* **文本(可选)+ 视频**
|
||||
|
||||
* **文本(可选)+ 图片 + 音频**
|
||||
|
||||
* **文本(可选)+ 图片 + 视频**
|
||||
|
||||
* **文本(可选)+ 视频 + 音频**
|
||||
|
||||
* **文本(可选)+ 图片 + 视频 + 音频**
|
||||
|
||||
***
|
||||
|
||||
**信息类型:**
|
||||
|
||||
* **文本信息**`object`
|
||||
|
||||
输入给模型的提示词信息。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **text**。
|
||||
|
||||
***
|
||||
|
||||
content.**text **`string` `必选`
|
||||
|
||||
输入给模型的文本提示词,描述期望生成的视频。
|
||||
|
||||
支持中英文。建议中文不超过500字,英文不超过1000词。字数过多信息容易分散,模型可能因此忽略细节,只关注重点,造成视频缺失部分元素。提示词的更多使用技巧请参见 [Seedance 提示词指南](https://www.volcengine.com/docs/82379/1587797)。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **图片信息** `object`
|
||||
|
||||
输入给模型的图片信息。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **image\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**image\_url **`object` `必选`
|
||||
|
||||
输入给模型的图片对象。
|
||||
|
||||
***
|
||||
|
||||
content.image\_url.**url **`string` `必选`
|
||||
|
||||
图片 URL 、图片 Base64 编码、素材 ID。
|
||||
|
||||
* 图片 URL:填入图片的公网 URL。
|
||||
|
||||
* Base64 编码:将本地文件转换为 Base64 编码字符串,然后提交给大模型。遵循格式:data:image/<图片格式>;base64,\<Base64编码>,注意 <图片格式> 需小写,如 data:image/png;base64,{base64\_image}。
|
||||
|
||||
* 素材 ID:用于视频生成的预置素材及虚拟人像的 ID,遵循格式:asset://\<ASSET\_ID>,可从 [素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128) 获取,详细使用请参见[文档](https://www.volcengine.com/docs/82379/2223965?lang=zh)。
|
||||
|
||||
> **传入单张图片要求**
|
||||
>
|
||||
> * 格式:jpeg、png、webp、bmp、tiff、gif
|
||||
>
|
||||
> * 宽高比(宽/高): (0.4, 2.5) 
|
||||
>
|
||||
> * 宽高长度(px):(300, 6000)
|
||||
>
|
||||
> * 大小:单张图片小于 30 MB。请求体大小不超过 64 MB。大文件请勿使用Base64编码。
|
||||
>
|
||||
> * 图片数量:
|
||||
>
|
||||
> * 图生视频-首帧:1 张
|
||||
>
|
||||
> * 图生视频-首尾帧:2 张
|
||||
>
|
||||
> * Seedance 2.0 & 2.0 fast 多模态参考生视频:1\~9 张
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
图片的位置或用途。
|
||||
|
||||
> **注意**
|
||||
>
|
||||
> * **图生视频-首帧**、**图生视频-首尾帧**、**多模态参考生视频**(包括参考图、视频、音频)为 3 种互斥场景,**不可混用**。
|
||||
>
|
||||
> * **多模态参考生视频**可通过提示词指定参考图片作为首帧/尾帧,间接实现“首尾帧+多模态参考”效果。若需严格保障首尾帧和指定图片一致,**优先使用图生视频-首尾帧**(配置 role 为 **first\_frame / last\_frame**)。
|
||||
|
||||
***
|
||||
|
||||
**图生视频-首帧**
|
||||
|
||||
> 需要传入1个 image\_url 对象
|
||||
|
||||
* **字段role取值:**
|
||||
|
||||
* **first\_frame 或不填**
|
||||
|
||||
***
|
||||
|
||||
**图生视频-首尾帧**
|
||||
|
||||
> 需要传入2个 image\_url 对象
|
||||
|
||||
* **字段role取值:**
|
||||
|
||||
* 首帧图片对应的字段 role 为:**first\_frame**,必填
|
||||
|
||||
* 尾帧图片对应的字段 role 为:**last\_frame**,必填
|
||||
|
||||
***
|
||||
|
||||
**图生视频-参考图 **
|
||||
|
||||
> 可传入 1\~9 个 image\_url 对象
|
||||
|
||||
* **字段role取值**:
|
||||
|
||||
* 每张参考图对应的字段 role 均为:**reference\_image**,必填
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **视频信息** `object` 
|
||||
|
||||
输入给模型的视频信息。仅 Seedance 2.0 & 2.0 fast 支持输入视频。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **video\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**video\_url **`object` `必选`
|
||||
|
||||
输入给模型的视频对象。
|
||||
|
||||
***
|
||||
|
||||
content.video\_url.**url **`string` `必选`
|
||||
|
||||
视频URL、素材 ID。
|
||||
|
||||
* 视频 URL:填入视频的公网 URL。
|
||||
|
||||
* 素材 ID:用于视频生成的预置素材及虚拟人像视频的 ID,遵循格式:asset://\<ASSET\_ID>。可从[素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128)获取。
|
||||
|
||||
> **传入单个视频要求**
|
||||
>
|
||||
> * 视频格式:mp4、mov。
|
||||
>
|
||||
> * 分辨率:480p、720p
|
||||
>
|
||||
> * 时长:单个视频时长 \[2, 15] s,最多传入 3 个参考视频,所有视频总时长不超过 15s。
|
||||
>
|
||||
> * 尺寸:
|
||||
>
|
||||
> * 宽高比(宽/高):\[0.4, 2.5]
|
||||
>
|
||||
> * 宽高长度(px):\[300, 6000]
|
||||
>
|
||||
> * 画面像素(宽 × 高):\[409600, 927408] ,示例:
|
||||
>
|
||||
> * 画面尺寸 640×640=409600 满足最小值 ;
|
||||
>
|
||||
> * 画面尺寸 834×1112=927408 满足最大值。
|
||||
>
|
||||
> * 大小:单个视频不超过 50 MB。
|
||||
>
|
||||
> * 帧率 (FPS):\[24, 60] 
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
视频的位置或用途。当前仅支持 **reference\_video**。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* **音频信息 **`object` 
|
||||
|
||||
输入给模型的音频信息。仅 Seedance 2.0 & 2.0 fast 支持输入音频。注意不可单独输入音频,应至少包含 1 个参考视频或图片。
|
||||
|
||||
***
|
||||
|
||||
content.**type **`string` `必选`
|
||||
|
||||
输入内容的类型,此处应为 **audio\_url**。
|
||||
|
||||
***
|
||||
|
||||
content.**audio\_url **`object` `必选`
|
||||
|
||||
输入给模型的音频对象。
|
||||
|
||||
***
|
||||
|
||||
content.audio\_url.**url **`string` `必选`
|
||||
|
||||
音频 URL 、音频 Base64 编码、素材 ID。
|
||||
|
||||
* 音频 URL:填入音频的公网 URL。
|
||||
|
||||
* Base64 编码:将本地文件转换为 Base64 编码字符串,然后提交给大模型。遵循格式:data:audio/<音频格式>;base64,\<Base64编码>,注意 <音频格式> 需小写,如 data:audio/wav;base64,{base64\_audio}。
|
||||
|
||||
* 素材 ID:用于视频生成的虚拟人的音频素材 ID,遵循格式:asset://\<ASSET\_ID>。可从[素材&虚拟人像库](https://console.volcengine.com/ark-stg/region:ark-stg+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128)获取。
|
||||
|
||||
> **传入单个音频要求**
|
||||
>
|
||||
> * 格式:wav、mp3
|
||||
>
|
||||
> * 时长:单个音频时长 \[2, 15] s,最多传入 3 段参考音频,所有音频总时长不超过 15 s。
|
||||
>
|
||||
> * 大小:单个音频不超过 15 MB,请求体大小不超过 64 MB。大文件请勿使用Base64编码。
|
||||
|
||||
***
|
||||
|
||||
content.**role **`string` `条件必填`
|
||||
|
||||
音频的位置或用途。当前仅支持 **reference\_audio** 。
|
||||
|
||||
|
||||
|
||||
#### **service\_tier** `string`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **generate\_audio **`boolean` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值: true
|
||||
|
||||
控制生成的视频是否包含与画面同步的声音。
|
||||
|
||||
* true:模型输出的视频包含同步音频。模型会基于文本提示词与视觉内容,自动生成与之匹配的人声、音效及背景音乐。建议将对话部分置于双引号内,以优化音频生成效果。例如:男人叫住女人说:“你记住,以后不可以用手指指月亮。”
|
||||
|
||||
* false:模型输出的视频为无声视频。
|
||||
|
||||
> **说明**
|
||||
>
|
||||
> 生成的有声视频均为单声道,和传入的音频声道数无关。
|
||||
|
||||
####
|
||||
|
||||
#### **draft **`boolean`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **tools **`object[]`
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
配置模型要调用的工具。
|
||||
|
||||
***
|
||||
|
||||
tools.**type **`string`
|
||||
|
||||
指定使用的工具类型。
|
||||
|
||||
* web\_search:联网搜索工具。
|
||||
|
||||
> **说明**
|
||||
>
|
||||
> * 开启联网搜索后,模型会根据用户的提示词自主判断是否搜索互联网内容(如商品、天气等)。可提升生成视频的时效性,但也会增加一定的时延。
|
||||
>
|
||||
> * 实际搜索次数可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 usage.tool\_usage.**web\_search** 字段获取,如果为 0 表示未搜索。
|
||||
|
||||
|
||||
|
||||
#### **resolution ** `string`
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值:720p
|
||||
|
||||
视频分辨率,取值范围:
|
||||
|
||||
* 480p
|
||||
|
||||
* 720p
|
||||
|
||||
|
||||
|
||||
#### **ratio **`string` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值: adaptive
|
||||
|
||||
生成视频的宽高比例。不同宽高比对应的宽高像素值见下方表格。
|
||||
|
||||
* 16:9 
|
||||
|
||||
* 4:3
|
||||
|
||||
* 1:1
|
||||
|
||||
* 3:4
|
||||
|
||||
* 9:16
|
||||
|
||||
* 21:9
|
||||
|
||||
* adaptive:根据输入自动选择最合适的宽高比
|
||||
|
||||
> **adaptive 适配规则**
|
||||
>
|
||||
> 当配置 **ratio** 为 adaptive 时,模型会根据生成场景自动适配宽高比;实际生成的视频宽高比可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **ratio** 字段获取。
|
||||
>
|
||||
> * 文生视频:根据输入的提示词,智能选择最合适的宽高比。
|
||||
>
|
||||
> * 首帧 / 首尾帧生视频:根据上传的首帧图片比例,自动选择最接近的宽高比。
|
||||
>
|
||||
> * 多模态参考生视频:根据用户提示词意图判断,如果是首帧生视频/编辑视频/延长视频,以该图片/视频为准选择最接近的宽高比;否则,以传入的第一个媒体文件为准(优先级:视频>图片)选择最接近的宽高比。
|
||||
|
||||
***
|
||||
|
||||
**不同宽高比对应的宽高像素值:**
|
||||
|
||||
| 分辨率 | 宽高比 | 宽高像素值 |
|
||||
| ---- | ---- | -------- |
|
||||
| 480p | 16:9 | 864×496 |
|
||||
| | 4:3 | 752×560 |
|
||||
| | 1:1 | 640×640 |
|
||||
| | 3:4 | 560×752 |
|
||||
| | 9:16 | 496×864 |
|
||||
| | 21:9 | 992×432 |
|
||||
| 720p | 16:9 | 1280×720 |
|
||||
| | 4:3 | 1112×834 |
|
||||
| | 1:1 | 960×960 |
|
||||
| | 3:4 | 834×1112 |
|
||||
| | 9:16 | 720×1280 |
|
||||
| | 21:9 | 1470×630 |
|
||||
|
||||
|
||||
|
||||
#### **duration** `integer` 
|
||||
|
||||
> Seedance 2.0 & 2.0 fast 默认值:5
|
||||
|
||||
生成视频时长,仅支持整数,单位:秒。
|
||||
|
||||
取值范围:
|
||||
|
||||
* \[4,15] 或设置为-1
|
||||
|
||||
> **配置方法**
|
||||
>
|
||||
> * 指定具体时长:支持有效范围内的任一整数。
|
||||
>
|
||||
> * 智能指定:设置为 -1,表示由模型在有效范围内自主选择合适的视频长度(整数秒)。实际生成视频的时长可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **duration** 字段获取。注意视频时长与计费相关,请谨慎设置。
|
||||
|
||||
|
||||
|
||||
#### **frames** `integer` 
|
||||
|
||||
Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
#### **camera\_fixed** `boolean`
|
||||
|
||||
 Seedance 2.0 & 2.0 fast 暂不支持
|
||||
|
||||
|
||||
|
||||
# Get/List-查询视频生成任务/列表
|
||||
|
||||
> 查询视频生成任务:GET https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks/{id}
|
||||
>
|
||||
> 查询视频生成任务列表:GET https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks?page\_num={page\_num}\&page\_size={page\_size}\&filter.status={filter.status}\&filter.task\_ids={filter.task\_ids}\&filter.model={filter.model}
|
||||
|
||||
## 响应参数
|
||||
|
||||
#### **tools **`object[]` 
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
配置模型要调用的工具。
|
||||
|
||||
***
|
||||
|
||||
tools.**type **`string`
|
||||
|
||||
指定使用的工具类型。
|
||||
|
||||
* web\_search:联网搜索工具。
|
||||
|
||||
|
||||
|
||||
#### **usage** `object`
|
||||
|
||||
本次请求的 token 用量。
|
||||
|
||||
***
|
||||
|
||||
usage.**completion\_tokens** `integer`
|
||||
|
||||
模型输出视频花费的 token 数量。
|
||||
|
||||
***
|
||||
|
||||
usage.**total\_tokens** `integer`
|
||||
|
||||
本次请求消耗的总 token 数量。
|
||||
|
||||
***
|
||||
|
||||
usage.**tool\_usage **`object` 
|
||||
|
||||
> 仅 Seedance 2.0 & 2.0 fast 支持
|
||||
|
||||
使用工具的用量信息。
|
||||
|
||||
***
|
||||
|
||||
usage.tool\_usage.**web\_search **`integer` 
|
||||
|
||||
实际调用联网搜索工具的次数,仅开启联网搜索时返回。
|
||||
|
||||
|
||||
|
||||
# 调用简介及示例
|
||||
|
||||
## 流程简介
|
||||
|
||||
任务接口是异步接口,视频生成任务流程
|
||||
|
||||
1. 创建视频生成任务接口创建视频生成任务
|
||||
|
||||
2. 定时使用查询接口查询视频生成任务状态
|
||||
|
||||
1. 任务 running,过段时间再查询任务状态
|
||||
|
||||
2. 任务完成,返回视频链接,在24小时内下载生成的视频文件
|
||||
|
||||
## 1. 创建视频生成任务
|
||||
|
||||
> 以下示例仅展示 Seedance 2.0 & 2.0 fast 新增能力,更多视频生成示例详见 [创建视频生成任务 API](https://www.volcengine.com/docs/82379/1520757)。
|
||||
|
||||
### 多模态参考
|
||||
|
||||
### 编辑视频
|
||||
|
||||
### 延长视频
|
||||
|
||||
### 使用联网搜索
|
||||
|
||||
仅支持文本生视频
|
||||
|
||||
## 2. 查询视频生成任务
|
||||
|
||||
# 最佳实践-使用公共虚拟人像生成视频
|
||||
|
||||
平台提供公共虚拟人像素材库,目前您可以使用其中的图像素材来创建一个统一、完备的视频主角。帮助您更好地控制主角,并确保其形象在多段视频中保持一致,避免因为真人人脸限制导致角色无法统一的问题。
|
||||
|
||||
素材模态目前包含图片,并提供人物背景描述。每个素材对应一个独立素材 ID (asset ID),在体验中心的视频生成任务中,指定角色人脸生成视频。
|
||||
|
||||
1. 在浏览器中打开[体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo),点击输入框下方的 **虚拟人像库** 页签。
|
||||
|
||||
2. 检索需要使用的人像,支持使用自然语言检索及筛选框组合筛选。
|
||||
|
||||
| 输入:文本 | 输入:虚拟人像、图片 | 输出 |
|
||||
| ---------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -- |
|
||||
| **图片1**中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持**图片2**的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。 |  | |
|
||||
|
||||
|
||||
|
||||
在 [Video Generation API](https://www.volcengine.com/docs/82379/1520758) 的 **content.<模态>\_url.url** 字段中使用 素材 URI 生成视频。
|
||||
|
||||
> 输入的参考内容,包括人像素材,需符合视频生成限制,具体信息请查看使用限制。
|
||||
>
|
||||
> **注意**:
|
||||
>
|
||||
> * 首次在 API 中使用虚拟人像素材 Asset URI 前,需先在[方舟体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo)提交一次视频生成任务,阅读并同意弹出的 **虚拟人像库使用协议**。
|
||||
>
|
||||
> * 体验中心支持体验视频生成能力。默认单次生成 4 段视频,为节约成本,建议设置为每次生成 1 条,具体方式可参考[虚拟人像库](https://www.volcengine.com/docs/82379/2223965?lang=zh)。
|
||||
|
||||
同意协议的操作方式如下:
|
||||
|
||||

|
||||
|
||||
示例代码:
|
||||
|
||||
# 使用自有虚拟人像素材生成视频(线下提交)
|
||||
|
||||
方舟提供私域人像素材库,您可在视频生成中使用自有虚拟人物或真人(仅限素人)素材,生成短剧等更定制化的视频内容。平台将对您提供的素材进行审核,规避可能产生的法律风险。
|
||||
|
||||
* 自有素材需入库后使用,您可将虚拟人像或真人素材发送给销售代表,同时完成合规承诺函及其他证明材料的准备。
|
||||
|
||||
* 入库后,您可使用素材的 Asset ID,在视频生成 API 中使用自有素材。
|
||||
|
||||
> **重要**:
|
||||
>
|
||||
> * 对虚拟人像素材,您需签署虚拟人像素材合规承诺函,并提供签署承诺函所需的材料。
|
||||
>
|
||||
> * 对真实人物素材,除承诺函外,您还需额外提供真人授权材料。
|
||||
>
|
||||
> * 具体流程及所需材料,请和您的销售代表确认。
|
||||
|
||||
提交自有人像素材时,需按人物将素材分组:
|
||||
|
||||
* 每个人物为一个素材组。
|
||||
|
||||
* 每组可包含多个素材文件,素材文件对应唯一 ID (asset ID)。
|
||||
|
||||
## 入库流程
|
||||
|
||||
提交自有虚拟人像素材方式大致如下,请联系您的销售代表了解详情。
|
||||
|
||||
1. 准备素材文件,完成承诺函签署,并准备其他证明材料。
|
||||
|
||||
2. 准备素材文件,完成承诺函签署,并准备其他证明材料。
|
||||
|
||||
* 每个人物素材需至少提供一张正面图片文件。此外,您可按需提供该人物的其他图片、视频素材。
|
||||
|
||||
* 需确保每个人物组中的素材与该正面图片为同一人物。
|
||||
|
||||
* 每个人物创建一个文件夹(命名:“*虚拟人像 1-<人像名>*”)
|
||||
|
||||
提交素材文件夹示例:
|
||||
|
||||

|
||||
|
||||
> **注意**:
|
||||
>
|
||||
> * 以上示例仅供参考,您可根据视频创作需求,提交虚拟人物素材。
|
||||
>
|
||||
> * 您仅需上传视频生成任务中需要使用的素材。
|
||||
|
||||
* 素材文件需满足视频生成 API 对输入文件的要求:
|
||||
|
||||
> **传入单张图片要求**
|
||||
>
|
||||
> * 格式:jpeg、png、webp、bmp、tiff、gif
|
||||
>
|
||||
> * 宽高比(宽/高): (0.4, 2.5) 
|
||||
>
|
||||
> * 宽高长度(px):(300, 6000)
|
||||
>
|
||||
> * 大小:单张图片小于 30 MB。请求体大小不超过 64 MB。大文件请勿使用Base64编码。
|
||||
|
||||
|
||||
|
||||
> **传入单个视频要求**
|
||||
>
|
||||
> * 视频格式:mp4、mov。
|
||||
>
|
||||
> * 分辨率:480p、720p
|
||||
>
|
||||
> * 时长:单个视频时长 \[2, 15] s,最多传入 3 个参考视频,所有视频总时长不超过 15s。
|
||||
>
|
||||
> * 尺寸:
|
||||
>
|
||||
> * 宽高比(宽/高):\[0.4, 2.5]
|
||||
>
|
||||
> * 宽高长度(px):\[300, 6000]
|
||||
>
|
||||
> * 画面像素(宽 × 高):\[409600, 927408] ,示例:
|
||||
>
|
||||
> * 画面尺寸 640×640=409600 满足最小值 ;
|
||||
>
|
||||
> * 画面尺寸 834×1112=927408 满足最大值。
|
||||
>
|
||||
> * 大小:单个视频不超过 50 MB。
|
||||
>
|
||||
> * 帧率 (FPS):\[24, 60] 
|
||||
|
||||
|
||||
|
||||
> **注意**:
|
||||
>
|
||||
> 有关提交流程、承诺函签署所需材料的具体信息,请联系您的销售代表了解详情。
|
||||
|
||||
3. 方舟将对您提供的素材进行审核,通过审核的素材将被上传至虚拟人像库。
|
||||
|
||||
4. 入库后,每个人物组素材将通过以下示例中的形式返回,您可解压后查看:
|
||||
|
||||

|
||||
|
||||
示例中:
|
||||
|
||||
* Andy 为您提交的人物名称
|
||||
|
||||
* group-20260310035119-9mzqn 为该人物组的 ID
|
||||
|
||||
* 解压后,可查看每张素材的 Asset ID,如:
|
||||
|
||||

|
||||
|
||||
* 您可按 `asset: //<asset_id>` 规则拼接 URI,在 API 中使用对应素材生成视频:
|
||||
|
||||
具体调用方式请参考 [最佳实践-使用虚拟人像生成视频](https://bytedance.larkoffice.com/wiki/SANpwJ9bgiKgrykLaMTcAB0InWc#share-YurKdrLfAocLErxsTWDcKidPnGd)。
|
||||
|
||||
## **注意事项**
|
||||
|
||||
1. 首次在 API 中使用虚拟人像素材 Asset URI 前,需先在[方舟体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo)提交一次视频生成任务,阅读并同意弹出的 **虚拟人像库使用协议**,操作方式如下:
|
||||
|
||||

|
||||
|
||||
* 仅支持使用已入库素材生成视频。
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,128 +0,0 @@
|
||||
# 「⚠️保密信息」【申请权限填客户名称】控制台上传自有虚拟人像至素材资产库(邀测用户版)
|
||||
|
||||
> 请注意,仅开白用户在控制台可见**《上传虚拟人像素材合规承诺函》**的签署入口,若仅可见**《素材资产功能使用规则》**,则需申请开白
|
||||
|
||||
# 1. 介绍
|
||||
|
||||
3月19日起功能上线后,火山方舟会在控制台支持完成开白的B端客户批量上传和管理虚拟人资产,同时支持使用API创建、管理,允许企业上传**自有AIGC虚拟人**(含品牌定制 IP、自制数字人、采购的合规虚拟人等),在线勾选确认**《上传虚拟人像素材合规承诺函》**,承诺上传的虚拟人像为企业合法所有、未侵犯任何第三方权益、不与任何自然人的肖像形象相同或相似、仅用于合规用途,即可完成确权,将虚拟人像上传入库,在推理中使用,仅可使用已入库的素材资产进行视频生成,未入库素材,即使为已入库同一角色的不同妆造,也无法使用。
|
||||
|
||||
|
||||
|
||||
# 2. 使用流程
|
||||
|
||||

|
||||
|
||||
| | 释义 | 举例 |
|
||||
| --------------- | ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| **素材资产(Asset)** | 一个素材文件(本期**仅支持图片**),是方舟Seedance系列模型可直接用于推理的可信资产 |  |
|
||||
| **资产组合(Group)** | 将原子化的资产(Asset)组合起来,可以人物、工作室、项目组等维度将素材进行分组管理 |  |
|
||||
|
||||
## 2.1 方舟控制台
|
||||
|
||||
1. **首次使用签署使用承诺函**:开白用户可见**火山方舟体验中心-视觉模型-视频生成页面顶部【我的素材资产】**,点击进入素材资产管理界面,首次使用前需签署《上传虚拟人像素材合规承诺函》《素材资产功能使用规则》(仅需授权一次)
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
* **创建素材资产组合(Group)**:可通过控制台上传单个或多个资产文件批量创建素材资产组合(Group),**当前仅支持上传的每个文件分别创建资产组,暂不支持创建一个资产组,同时注入多个资产**
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
* 单次创建上限为**100个资产组合(Group)**,单账号允许的资产组合(Group)数量本期不设限
|
||||
|
||||
* 单个素材上传要求:
|
||||
|
||||
> - **图片格式**:控制台本期仅支持文件后缀为`.jpg`、`.jpeg`、`.png`(与API有差异)
|
||||
>
|
||||
> - **文件大小**:单张图片小于30M
|
||||
>
|
||||
> - **宽高比(宽/高)**:(0.4, 2.5)
|
||||
>
|
||||
> - **宽高长度(px)**:(300, 6000)
|
||||
|
||||
* 资产组合标题/描述/资产名称字段:
|
||||
|
||||
| **资产组合名称(Group Name)** | 必填,最大字符12(与API有差异) |
|
||||
| ----------------------------- | ------------------- |
|
||||
| **资产组合描述(Group Description)** | 选填,最大字符100(与API有差异) |
|
||||
| **资产名称(Asset Name)** | 必填,最大字符12(与API有差异) |
|
||||
|
||||

|
||||
|
||||
* 控制台上传时暂不支持直接编辑上述字段, 支持通过文件命名自动解析
|
||||
|
||||
> 命名规范:`{AssetName1}&&{GroupName1}&&{GroupDescription1(选填)}.jpg`
|
||||
>
|
||||
> 若无`&&`连接符,则文件名=`GroupName`=`AssetName`
|
||||
|
||||
* `GroupName`**或**`GroupDescription`**被审核拦截时,Group会创建失败**
|
||||
|
||||
* 创建完成后支持修改上述字段
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
* **批量新增素材**:可点击进入某个资产组合(Group),在当前资产组合(Group)下新增资产(Asset)
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
* 单次新增素材上限为**500个资产**,单账号允许的资产(Asset)数量本期**不设限**
|
||||
|
||||
* 单个素材上传要求:
|
||||
|
||||
> - **图片格式**:控制台本期仅支持文件后缀为`.jpg`、`.jpeg`、`.png`(与API有差异)
|
||||
>
|
||||
> - **文件大小**:单张图片小于30M
|
||||
>
|
||||
> - **宽高比(宽/高)**:(0.4, 2.5)
|
||||
>
|
||||
> - **宽高长度(px)**:(300, 6000)
|
||||
|
||||
* 文件名会自动解析填入AssetName
|
||||
|
||||
| **资产名称(Asset Name)** | 必填,最大字符12(与API有差异) |
|
||||
| -------------------- | ------------------ |
|
||||
|
||||
* **文件内容或**`AssetName`**被审核拦截时,Asset列表会展示失败状态,有对应报错信息。**
|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
* **库内资产使用**:可在体验中心界面查看已上传的资产组合(Group)和对应组合下的资产(Asset),一键填入体验中心输入框,或一键复制URI通过API传入
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
## 2.2 API入库 
|
||||
|
||||
1. **首次使用签署使用承诺函**:通过火山方舟控制台开通管理,点击右上角的【开通素材资产库权限】,勾选同意协议,进行功能开通使用
|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
* **通过Asset API创建、管理素材资产:**
|
||||
|
||||
> **【对客材料】**
|
||||
>
|
||||
> * **素材资产库实践手册:**[ 【申请权限填客户名称】私域虚拟人像素材资产库(邀测用户版)](https://bytedance.larkoffice.com/wiki/RtHgwpJgviwFXLkQ9hLcRooEnVe)
|
||||
>
|
||||
> * **Asset API文档:**[ 【申请权限填客户名称】Asset API 参考文档(邀测用户版)](https://bytedance.larkoffice.com/wiki/FtqVwjinYisraGkT5uncWyd0nEb)
|
||||
@ -1,314 +0,0 @@
|
||||
# 「⚠️保密信息」【申请权限填客户名称】私域虚拟人像素材资产库使用指南(邀测用户版)
|
||||
|
||||
> 本文档仅限预览及邀测用户使用:
|
||||
>
|
||||
> * 不承诺正式 API 上线100%一致。
|
||||
>
|
||||
> * 仅限邀测用户阅读,请勿截图/分享给其他人员。
|
||||
>
|
||||
> * 您需确保上传的虚拟人像符合以下条件:
|
||||
>
|
||||
> * 您合法拥有该素材,并享有完整的使用及处分权限。素材不包含未获授权的第三方商标、标识类内容。
|
||||
>
|
||||
> * 素材不得与任何自然人肖像或形象雷同,素材不存在抄袭、盗用情形,不会侵害任何第三方的人格权、知识产权等合法权益。
|
||||
>
|
||||
> * 素材不包含违反法规、违背公序良俗、危害国家安全的内容。
|
||||
|
||||
Seedance 2.0 系列模型具有完备的防范 Deepfake 和侵犯版权风险能力。在生成视频时,会对有风险的参考素材输入进行拦截,最大限度保证生成视频合规和安全性。
|
||||
|
||||
为确保创作者能充分利用 Seedance 2.0 强大的视频生成能力高效生成视频内容,同时规避 AI 生成内容的潜在风险,方舟推出了私域可信素材库。完成入库的可信素材将进入您的私域素材库,在视频生成中使用。
|
||||
|
||||
私域素材库使用流程如下:
|
||||
|
||||

|
||||
|
||||
## 素材资产库结构说明
|
||||
|
||||
> 单个素材文件为一个 Asset(素材资产),每个 Asset 属于一个 Group(素材组合)。
|
||||
>
|
||||
> * 可使用素材组自由管理素材。例如,可将同一人物、工作室或项目组的素材放入一个素材组合进行管理。
|
||||
>
|
||||
> * **仅可使用已入库素材的 ID (Asset ID)进行视频生成,同一形象未入库素材无法使用。**
|
||||
>
|
||||
> * 仅需入库推理需使用的素材,不需使用的素材请勿入库。
|
||||
|
||||
以单人物形象为一素材组合为例:
|
||||
|
||||
* 素材资产:一个素材文件(图片),是方舟 Seedance 2.0 系列模型可直接用于推理的可信资产。
|
||||
|
||||
* 举例:一张人物装造。
|
||||
|
||||
* 文件类型:图片
|
||||
|
||||
> **单张图片要求**
|
||||
>
|
||||
> * 格式:jpeg、png、webp、bmp、tiff、gif、heic/heif
|
||||
>
|
||||
> * 宽高比(宽/高): (0.4, 2.5) 
|
||||
>
|
||||
> * 宽高长度(px):(300, 6000)
|
||||
>
|
||||
> * 大小:单张图片小于 30 MB。
|
||||
|
||||
* 资产 ID 示例:`asset-20260310035119-h8tq4`
|
||||
|
||||

|
||||
|
||||
* 素材资产组:
|
||||
|
||||
* 可自由组合素材,以人物、工作室、项目组等维度将素材进行分组管理。
|
||||
|
||||
* Group ID 示例:`group-20260310035119-*****`
|
||||
|
||||
* 示例:
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
## 上传素材至私域虚拟人像库 (API & 控制台)
|
||||
|
||||
您可将自有的虚拟形象上传至私域虚拟人像库。
|
||||
|
||||
> **警告:**
|
||||
>
|
||||
> 您需确保上传的虚拟人像符合以下条件:
|
||||
>
|
||||
> * 您合法拥有该素材,并享有完整的使用及处分权限。素材不包含未获授权的第三方商标、标识类内容。
|
||||
>
|
||||
> * 素材不得与任何自然人肖像或形象雷同,素材不存在抄袭、盗用情形,不会侵害任何第三方的人格权、知识产权等合法权益。
|
||||
>
|
||||
> * 素材不包含违反法规、违背公序良俗、危害国家安全的内容。
|
||||
|
||||
方舟将对您上传的素材进行安全审核。审核通过后,即可在体验中心和 API 中使用素材生成视频。
|
||||
|
||||
您可使用 OpenAPI 或在体验中心上传虚拟素材。
|
||||
|
||||
### 阅读并同意协议
|
||||
|
||||
首次入库前,需打开 [控制台](https://console.volcengine.com/ark/region:ark+cn-beijing/overview?briefPage=0\&briefType=introduce\&type=new) > **开通管理** > **开通素材资产库权限,**阅读和同意相关规则和协议:
|
||||
|
||||

|
||||
|
||||
先创建 Asset Group, 再向 Group 中添加虚拟人像素材。
|
||||
|
||||
> 素材格式的具体要求,请参考[素材库结构说明](https://bytedance.larkoffice.com/docx/MpHOdxYbwobmIWxk5rucBLranJb#share-V4mMdM92woylBlxML62c5Aelneh)。
|
||||
|
||||
### 使用控制台
|
||||
|
||||
1. 打开 [方舟控制台](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo) > **我的素材资产** > **我的虚拟人像 > 添加虚拟人像**,或左上方 **我的资产**。
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
|
||||
|
||||
2. 创建素材组合。
|
||||
|
||||
3. 向素材组合中上传素材。
|
||||
|
||||
### 使用 API
|
||||
|
||||
先使用 `CreateAssetGroup` API 创建素材组合,再使用 `CreateAsset` API 向组合中上传素材。请求示例:
|
||||
|
||||
1. **创建素材组合**
|
||||
|
||||
> **注意**:
|
||||
>
|
||||
> * 调用素材资产(Assets)API 接口需使用 Access Key 鉴权,详情参考 [API访问密钥管理](https://www.volcengine.com/docs/6257/64983?lang=zh)。
|
||||
>
|
||||
> * API 参数信息请参考[ Asset API 参考 (WIP) 副本](https://bytedance.larkoffice.com/wiki/FtqVwjinYisraGkT5uncWyd0nEb)。
|
||||
|
||||
使用** POST` `**`CreateAssetGroup` 接口创建素材组合。
|
||||
|
||||
在请求中传入:
|
||||
|
||||
* **Name**:素材组合的名称。
|
||||
|
||||
* **Description**: 素材组合的文字描述。
|
||||
|
||||
* **GroupType**: 选填,默认为 AIGC(虚拟人像素材)。
|
||||
|
||||
* **ProjectName**:选填,指定资源项目名称,默认为 default。一个项目中的资源仅可被该项目下的推理接入点使用,获取项目名称请参考[文档](https://www.volcengine.com/docs/82379/1359411?lang=zh#03ec4a65)。
|
||||
|
||||
> **注意**
|
||||
>
|
||||
> 如果请求中不指定 **ProjectName**,默认将创建素材组至 **default** 项目中。
|
||||
|
||||
请求示例:
|
||||
|
||||
**注意**:需使用 AK/SK 鉴权,详情参考 [API访问密钥管理](https://www.volcengine.com/docs/6257/64983?lang=zh)。
|
||||
|
||||
返回示例:
|
||||
|
||||
* **上传素材**
|
||||
|
||||
使用 **POST **`CreateAsset`接口上传素材。
|
||||
|
||||
在请求中提供:
|
||||
|
||||
* **GroupId**:必填,素材组合 ID
|
||||
|
||||
* **URL**: 必填,图片可访问的 URL
|
||||
|
||||
* **AssetType**: 必填,仅支持上传图片类型素材,需指定为 **Image**
|
||||
|
||||
* **Name**: 选填,素材名称,可用于管理素材,如素材文件名。
|
||||
|
||||
* **ProjectName**:选填,指定资源项目名称,默认为 **default**。一个项目中的资源仅可被该项目下的推理接入点使用,获取项目名称请参考[文档](https://www.volcengine.com/docs/82379/1359411?lang=zh#03ec4a65)。
|
||||
|
||||
> **注意**
|
||||
>
|
||||
> 如果请求中不指定 **ProjectName**,则默认上传素材至 **default** 项目中。您需使用该字段确保将素材上传至对应的项目中。
|
||||
|
||||
**注意**:
|
||||
|
||||
* 每次请求上传一个素材文件。
|
||||
|
||||
* 该请求返回素材 ID,可使用 GetAsset API 查看是否上传成功。
|
||||
|
||||
返回示例:
|
||||
|
||||
## 检索虚拟人像资产 (API & 控制台)
|
||||
|
||||
您可使用以下方式检索虚拟人像资产。
|
||||
|
||||
* **控制台**:您可在 [方舟控制台](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128\&tab=GenVideo) >** 我的** > **我的虚拟人像 **中搜索和查看已上传的虚拟人像资产。
|
||||
|
||||
* **API**:
|
||||
|
||||
* **POST **`GetAsset `获取单个素材
|
||||
|
||||
* **POST **`ListAssets` 查询素材
|
||||
|
||||
* **POST **`ListAssetGroups` 查询素材组合信息
|
||||
|
||||
|
||||
|
||||
### 获取单个素材信息
|
||||
|
||||
可使用 **POST **GetAsset 获取单个素材信息,指定素材资产 ID。
|
||||
|
||||
> **注意**:要获取完整的 API 参数、限流等信息,请查看[ Asset API 参考 (WIP) 副本](https://bytedance.larkoffice.com/docx/DZdUd9J3lo6JTGxDrjscv1g9nVg)。
|
||||
|
||||
返回示例:
|
||||
|
||||
### 查询素材资产
|
||||
|
||||
可使用 **POST **ListAssets 查询 Assets。
|
||||
|
||||
* 支持根据组合 ID (GroupId)、素材状态(Statuses)和素材名称(Name)查询。筛选出符合所有条件的素材。
|
||||
|
||||
* 支持使用 Name 进行模糊搜索,同时使用 GroupId 精确搜索,便于检索所需的素材。
|
||||
|
||||
支持使用 SortBy,SortOrder 对结果进行排序
|
||||
|
||||
> **注意**:获取完整的 API 参考文档,请查看[ Asset API 参考 (WIP) 副本](https://bytedance.larkoffice.com/docx/DZdUd9J3lo6JTGxDrjscv1g9nVg)。
|
||||
|
||||
返回示例:
|
||||
|
||||
### 查询素材组
|
||||
|
||||
使用 **POST **ListAssetGroups 查询素材组合信息。
|
||||
|
||||
支持模糊搜索素材组合名称(Name)或提供多个素材组合(GroupId)。
|
||||
|
||||
如有多个素材组,可使用 Name 字段进行模糊搜索。
|
||||
|
||||
> **注意**:要获取完整的 API 参考文档,请查看[ Asset API 参考 (WIP) 副本](https://bytedance.larkoffice.com/docx/DZdUd9J3lo6JTGxDrjscv1g9nVg)。
|
||||
|
||||
返回示例:
|
||||
|
||||
## 示例:上传素材并使用 GetAsset 获取素材信息
|
||||
|
||||
以下示例创建素材资产后,查询资产 Status 并根据状态,判断是否继续查询或返回对应结果。
|
||||
|
||||
代码执行以下逻辑:
|
||||
|
||||
1. createAsset: 上传资源,获取 AssetId
|
||||
|
||||
2. waitForAssetActive:开始查询,循环调用 getAssetStatus 查询当前资产状态
|
||||
|
||||
3. 根据 Status 判断
|
||||
|
||||
* Processing → 继续轮询
|
||||
|
||||
* Active → 返回 URL(结束)状态为 **Active** 后,可使用该素材 Asset ID (URI格式) 进行视频生成,如何使用人像素材生成视频,详见[下文](https://bytedance.larkoffice.com/wiki/RtHgwpJgviwFXLkQ9hLcRooEnVe#share-GrbXdVvYjonbMkxQWHEcGf2Inlf)。
|
||||
|
||||
* Failed → 返回错误(结束)
|
||||
|
||||
4. 返回结果并打印结果
|
||||
|
||||
查询结果示意如下:
|
||||
|
||||
|
||||
|
||||
## 使用人像素材生成视频
|
||||
|
||||
在获取素材 Asset ID后,可使用私域人像素材生成视频。效果预览及使用方式请参考下文。
|
||||
|
||||
### 效果预览
|
||||
|
||||
| 输入:文本 | 输入:虚拟人像、图片 | 输出 |
|
||||
| ---------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -- |
|
||||
| **图片1**中美妆博主用中文进行介绍,妆容改为明艳大气,去掉脸部反光,笑容甜美,近景镜头,手持**图片2**的面霜面向镜头展示,清新简约背景,元气甜美风格。博主台词:挖到本命面霜了!质地像云朵一样软糯,一抹就吸收,熬夜急救、补水保湿全搞定,素颜都自带柔光感。 |  | |
|
||||
|
||||
### 视频生成
|
||||
|
||||
在 Video Generation API 的 **content.<模态>\_url.url** 字段中使用 素材 URI 生成视频。
|
||||
|
||||
> 资产 URI 拼接方式:`Asset://<asset_ID`**`>`**
|
||||
|
||||
具体方式请参考[ 【申请权限填客户名称】Seedance 2.0 & 2.0 fast API文档(邀测用户版)](https://bytedance.larkoffice.com/wiki/SANpwJ9bgiKgrykLaMTcAB0InWc#share-ONSwd51ezoXCJqxkAm2cIC61nMX)。
|
||||
|
||||
示例代码:
|
||||
|
||||
## 常见问题
|
||||
|
||||
### 1. 为什么素材上传成功后,无法使用素材生成视频或获取素材信息?
|
||||
|
||||
素材库按**[项目](https://www.volcengine.com/docs/82379/1359411?lang=zh#03ec4a65)(Project)隔离**。
|
||||
|
||||
* 在视频生成时,必须使用**素材所在项目**中的推理接入点进行推理。
|
||||
|
||||
* 如果素材上传成功,但使用获取素材接口获取素材失败,可能是因为调用上传素材(CreateAsset)和获取素材接口时传入了不同的 **ProjectName**。
|
||||
|
||||
* **ProjectName** 默认值为 `default`,即如果不指定该字段,则默认将资源创建至 `default` 项目中。
|
||||
|
||||
* 建议在同一个项目中管理素材。
|
||||
|
||||
### 2. 怎样管理用户对素材库的权限?
|
||||
|
||||
您可使用[访问控制](https://console.volcengine.com/iam/identitymanage/user) (IAM)精细化管理用户操作素材库的权限。可按以下方式设置:
|
||||
|
||||
1. **创建自定义策略**
|
||||
|
||||
1. 打开[访问控制](https://console.volcengine.com/iam/policymanage) >** 新建自定义策略**
|
||||
|
||||
2. 输入策略名称。
|
||||
|
||||
3. 切换到 **JSON编辑器**,将下方自定义策略粘贴至编辑器中,点击 **提交** 保存。
|
||||
|
||||

|
||||
|
||||
* **为用户/用户组赋权**
|
||||
|
||||
1. 点击 **用户管理** > **用户**/**用户组**,选择需要赋权的用户或用户组,点击右侧的 **添加权限。**
|
||||
|
||||
2. 在 **授权策略** 中选择**步骤 1** 中创建的策略。
|
||||
|
||||
3. (可选)在 **限制到项目资源 **中选择策略应用的项目。
|
||||
|
||||
4. 点击 **提交。**
|
||||
|
||||
完成上述操作后,该用户/用户组即可在对应项目中管理素材。
|
||||
|
||||
关于 IAM 的更多信息,请参考[访问控制](http://volcengine.com/docs/6257?lang=zh)。
|
||||
|
||||
|
||||
|
||||
@ -1,487 +0,0 @@
|
||||
`POST https://ark.cn-beijing.volces.com/api/v3/contents/generations/tasks` [ ](https://api.volcengine.com/api-explorer/?action=CreateContentsGenerationsTasks&data=%7B%7D&groupName=%E8%A7%86%E9%A2%91%E7%94%9F%E6%88%90API&query=%7B%7D&serviceCode=ark&version=2024-01-01)[运行](https://api.volcengine.com/api-explorer/?action=CreateContentsGenerationsTasks&data=%7B%7D&groupName=%E8%A7%86%E9%A2%91%E7%94%9F%E6%88%90API&query=%7B%7D&serviceCode=ark&version=2024-01-01)
|
||||
本文介绍创建视频生成任务 API 的输入输出参数,供您使用接口时查阅字段含义。模型会依据传入的图片及文本信息生成视频,待生成完成后,您可以按条件查询任务并获取生成的视频。
|
||||
:::warning
|
||||
Seedance 2.0 模型目前仅支持 [控制台体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision?modelId=doubao-seedance-2-0-260128&tab=GenVideo) 在免费额度内体验,暂不支持 API 调用,敬请期待。
|
||||
|
||||
:::
|
||||
**不同模型支持的视频生成能力简介**
|
||||
|
||||
* **Seedance 1.5 pro==^new^==** ** ** **==^有声视频^==** **(自定义是否包含音频)**
|
||||
* 图生视频\-首尾帧,根据您输入的++首帧图片+尾帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 图生视频\-首帧,根据您输入的++首帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 文生视频,根据您输入的++文本提示词+参数(可选)++ 生成目标视频。
|
||||
* **Seedance 1.0 pro**
|
||||
* 图生视频\-首尾帧,根据您输入的++首帧图片+尾帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 图生视频\-首帧,根据您输入的++首帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 文生视频,根据您输入的++文本提示词+参数(可选)++ 生成目标视频。
|
||||
* **Seedance 1.0 pro fast**
|
||||
* 图生视频\-首帧,根据您输入的++首帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 文生视频,根据您输入的++文本提示词+参数(可选)++ 生成目标视频。
|
||||
* **Seedance 1.0 lite**
|
||||
* **doubao\-seedance\-1\-0\-lite\-t2v:** 文生视频,根据您输入的++文本提示词+参数(可选)++ 生成目标视频。
|
||||
* **doubao\-seedance\-1\-0\-lite\-i2v:**
|
||||
* 图生视频\-参考图,根据您输入的**++参考图片(1\-4张)++ ** +++文本提示词(可选)+ 参数(可选)++ 生成目标视频。
|
||||
* 图生视频\-首尾帧,根据您输入的++首帧图片+尾帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
* 图生视频\-首帧,根据您输入的++首帧图片+文本提示词(可选)+参数(可选)++ 生成目标视频。
|
||||
|
||||
|
||||
Tips:一键展开折叠,快速检索内容
|
||||
打开页面右上角开关,**ctrl ** + **f** 可检索页面内所有内容。
|
||||
<span> </span>
|
||||
|
||||
|
||||
```mixin-react
|
||||
return (<Tabs>
|
||||
<Tabs.TabPane title="在线调试" key="cKmdyIjR"><RenderMd content={`<APILink link="https://api.volcengine.com/api-explorer/?action=CreateContentsGenerationsTasks&data=%7B%7D&groupName=%E8%A7%86%E9%A2%91%E7%94%9F%E6%88%90API&query=%7B%7D&serviceCode=ark&version=2024-01-01" description="API Explorer 您可以通过 API Explorer 在线发起调用,无需关注签名生成过程,快速获取调用结果。"></APILink>
|
||||
`}></RenderMd></Tabs.TabPane>
|
||||
<Tabs.TabPane title="鉴权说明" key="vRJT6oJZ"><RenderMd content={`本接口仅支持 API Key 鉴权,请在 [获取 API Key](https://console.volcengine.com/ark/region:ark+cn-beijing/apiKey) 页面,获取长效 API Key。
|
||||
`}></RenderMd></Tabs.TabPane>
|
||||
<Tabs.TabPane title="快速入口" key="MlbBRTbjal"><RenderMd content={` [ ](#)[体验中心](https://console.volcengine.com/ark/region:ark+cn-beijing/experience/vision) <span> </span>[模型列表](https://www.volcengine.com/docs/82379/1330310?lang=zh#2705b333) <span> </span>[模型计费](https://www.volcengine.com/docs/82379/1544106?redirect=1&lang=zh#02affcb8) <span> </span>[API Key](https://console.volcengine.com/ark/region:ark+cn-beijing/apiKey?apikey=%7B%7D)
|
||||
<span> </span>[调用教程](https://www.volcengine.com/docs/82379/1366799) <span> </span>[接口文档](https://www.volcengine.com/docs/82379/1520758) <span> </span>[常见问题](https://www.volcengine.com/docs/82379/1359411) <span> </span>[开通模型](https://console.volcengine.com/ark/region:ark+cn-beijing/openManagement?LLM=%7B%7D&OpenTokenDrawer=false)
|
||||
`}></RenderMd></Tabs.TabPane></Tabs>);
|
||||
```
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
<span id="RxN8G2nH"></span>
|
||||
## 请求参数
|
||||
> 跳转 [响应参数](#y2hhTyHB)
|
||||
|
||||
<span id="BJ5XLFqM"></span>
|
||||
### 请求体
|
||||
|
||||
---
|
||||
|
||||
|
||||
**model** `string` %%require%%
|
||||
您需要调用的模型的 ID (Model ID),[开通模型服务](https://console.volcengine.com/ark/region:ark+cn-beijing/openManagement?LLM=%7B%7D&OpenTokenDrawer=false),并[查询 Model ID](https://www.volcengine.com/docs/82379/1330310) 。
|
||||
您也可通过 Endpoint ID 来调用模型,获得限流、计费类型(前付费/后付费)、运行状态查询、监控、安全等高级能力,可参考[获取 Endpoint ID](https://www.volcengine.com/docs/82379/1099522)。
|
||||
|
||||
---
|
||||
|
||||
|
||||
**content** `object[]` %%require%%
|
||||
输入给模型,生成视频的信息,支持文本、图片和视频(样片,Draft 视频)格式。支持以下几种组合:
|
||||
|
||||
* 文本
|
||||
* 文本+图片
|
||||
* 视频:其中视频指已成功生成的样片视频,模型可基于样片生成高质量正式视频。
|
||||
|
||||
|
||||
信息类型
|
||||
|
||||
---
|
||||
|
||||
|
||||
**文本信息** `object`
|
||||
输入给模型生成视频的内容,文本内容部分。
|
||||
|
||||
属性
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**type ** `string` %%require%%
|
||||
输入内容的类型,此处应为 `text`。
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**text ** `string` %%require%%
|
||||
输入给模型的文本提示词,描述期望生成的视频。
|
||||
支持中英文。建议中文不超过500字,英文不超过1000词。字数过多信息容易分散,模型可能因此忽略细节,只关注重点,造成视频缺失部分元素。提示词的更多使用技巧请参见 [Seedance 提示词指南](https://www.volcengine.com/docs/82379/1587797)。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**图片信息** `object`
|
||||
输入给模型生成视频的内容,图片信息部分。
|
||||
|
||||
属性
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**type ** `string` %%require%%
|
||||
输入内容的类型,此处应为 `image_url`。支持图片URL或图片 Base64 编码。
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**image_url ** `object` %%require%%
|
||||
输入给模型的图片对象。
|
||||
|
||||
属性
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.image_url.**url ** `string` %%require%%
|
||||
图片信息,可以是图片URL或图片 Base64 编码。
|
||||
|
||||
* 图片URL:请确保图片URL可被访问。
|
||||
* Base64编码:请遵循此格式`data:image/<图片格式>;base64,<Base64编码>`,注意 `<图片格式>` 需小写,如 `data:image/png;base64,{base64_image}`。
|
||||
|
||||
:::tip
|
||||
传入图片需要满足以下条件:
|
||||
|
||||
* 图片格式:jpeg、png、webp、bmp、tiff、gif。其中,Seedance 1.5 pro 新增支持 heic 和 heif。
|
||||
* 宽高比(宽/高): (0.4, 2.5)
|
||||
* 宽高长度(px):(300, 6000)
|
||||
* 大小:小于 30 MB
|
||||
|
||||
:::
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**role ** `string` `条件必填`
|
||||
图片的位置或用途。
|
||||
:::warning
|
||||
首帧图生视频、首尾帧图生视频、参考图生视频为 3 种互斥的场景,不支持混用。
|
||||
|
||||
:::
|
||||
图生视频\-首帧
|
||||
|
||||
* **支持模型:** 所有图生视频模型
|
||||
* **字段role取值:** 需要传入1个image_url对象,且字段role可不填,或字段role为:first_frame
|
||||
|
||||
|
||||
图生视频\-首尾帧
|
||||
|
||||
* **支持模型:** Seedance 1.5 pro、Seedance 1.0 pro、Seedance 1.0 lite i2v
|
||||
* **字段role取值:** 需要传入2个image_url对象,且字段role必填。
|
||||
* 首帧图片对应的字段role为:first_frame
|
||||
* 尾帧图片对应的字段role为:last_frame
|
||||
|
||||
:::tip
|
||||
传入的首尾帧图片可相同。首尾帧图片的宽高比不一致时,以首帧图片为主,尾帧图片会自动裁剪适配。
|
||||
|
||||
:::
|
||||
|
||||
图生视频\-参考图
|
||||
|
||||
* **支持模型:** Seedance 1.0 lite i2v
|
||||
* **字段role取值:** 需要传入1~4个image_url对象,且字段role必填。
|
||||
* 每张参考图片对应的字段role均为:reference_image
|
||||
|
||||
:::tip
|
||||
参考图生视频功能的文本提示词,可以用自然语言指定多张图片的组合。但若想有更好的指令遵循效果,**推荐使用“[图1]xxx,[图2]xxx”的方式来指定图片**。
|
||||
示例1:戴着眼镜穿着蓝色T恤的男生和柯基小狗,坐在草坪上,3D卡通风格
|
||||
示例2:[图1]戴着眼镜穿着蓝色T恤的男生和[图2]的柯基小狗,坐在[图3]的草坪上,3D卡通风格
|
||||
|
||||
:::
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**样片信息==^new^==** ** ** `object`
|
||||
基于样片任务 ID,生成正式视频。仅 Seedance 1.5 pro 支持该功能。[阅读](https://www.volcengine.com/docs/82379/1366799?lang=zh#5acd28c8)[文档](https://www.volcengine.com/docs/82379/1366799?lang=zh#5acd28c8) 获取 draft 功能的使用教程和注意事项。
|
||||
|
||||
属性
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**type ** `string` %%require%%
|
||||
输入内容的类型,此处应为 `draft_task`。
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.**draft_task** ** ** `object` %%require%%
|
||||
输入给模型的样片任务。
|
||||
|
||||
属性
|
||||
|
||||
---
|
||||
|
||||
|
||||
content.draft_task.**id ** `string` %%require%%
|
||||
样片任务 ID。平台将自动复用 Draft 视频使用的用户输入(**model、** content.**text、** content.**image_url、generate_audio、seed、ratio、duration、camera_fixed ** ),生成正式视频。其余参数支持指定,不指定将使用本模型的默认值。
|
||||
使用分为两步:Step1: 调用本接口生成 Draft 视频。Step2: 如果确认 Draft 视频符合预期,可基于 Step1 返回的 Draft 视频任务 ID,调用本接口生成最终视频。[阅读文档](https://www.volcengine.com/docs/82379/1366799?lang=zh#5acd28c8) 获取详细教程。
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**callback_url** `string`
|
||||
填写本次生成任务结果的回调通知地址。当视频生成任务有状态变化时,方舟将向此地址推送 POST 请求。
|
||||
回调请求内容结构与[查询任务API](https://www.volcengine.com/docs/82379/1521309)的返回体一致。
|
||||
回调返回的 status 包括以下状态:
|
||||
|
||||
* queued:排队中。
|
||||
* running:任务运行中。
|
||||
* succeeded: 任务成功。(如发送失败,即5秒内没有接收到成功发送的信息,回调三次)
|
||||
* failed:任务失败。(如发送失败,即5秒内没有接收到成功发送的信息,回调三次)
|
||||
* expired:任务超时,即任务处于**运行中或排队中**状态超过过期时间。可通过 **execution_expires_after ** 字段设置过期时间。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**return_last_frame** `boolean` `默认值 false`
|
||||
|
||||
* true:返回生成视频的尾帧图像。设置为 `true` 后,可通过 [查询视频生成任务接口](https://www.volcengine.com/docs/82379/1521309) 获取视频的尾帧图像。尾帧图像的格式为 png,宽高像素值与生成的视频保持一致,无水印。
|
||||
使用该参数可实现生成多个连续视频:以上一个生成视频的尾帧作为下一个视频任务的首帧,快速生成多个连续视频,调用示例详见 [教程](https://www.volcengine.com/docs/82379/1366799?lang=zh#141cf7fa)。
|
||||
* false:不返回生成视频的尾帧图像。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**service_tier** `string` `默认值 default`
|
||||
> 不支持修改已提交任务的服务等级
|
||||
|
||||
指定处理本次请求的服务等级类型,枚举值:
|
||||
|
||||
* default:在线推理模式,RPM 和并发数配额较低(详见 [模型列表](https://www.volcengine.com/docs/82379/1330310?lang=zh#2705b333)),适合对推理时效性要求较高的场景。
|
||||
* flex:离线推理模式,TPD 配额更高(详见 [模型列表](https://www.volcengine.com/docs/82379/1330310?lang=zh#2705b333)),价格为在线推理的 50%, 适合对推理时延要求不高的场景。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**execution_expires_after** ** ** `integer` `默认值 172800`
|
||||
任务超时阈值。指定任务提交后的过期时间(单位:秒),从 **created at** 时间戳开始计算。默认值 172800 秒,即 48 小时。取值范围:[3600,259200]。
|
||||
不论使用哪种 **service_tier**,都建议根据业务场景设置合适的超时时间。超过该时间后任务会被自动终止,并标记为`expired`状态。
|
||||
|
||||
---
|
||||
|
||||
|
||||
**generate_audio==^new^==** ** ** `boolean` `默认值 true`
|
||||
> 仅 Seedance 1.5 pro 支持
|
||||
|
||||
控制生成的视频是否包含与画面同步的声音。
|
||||
|
||||
* true:模型输出的视频包含同步音频。Seedance 1.5 pro 能够基于文本提示词与视觉内容,自动生成与之匹配的人声、音效及背景音乐。建议将对话部分置于双引号内,以优化音频生成效果。例如:男人叫住女人说:“你记住,以后不可以用手指指月亮。”
|
||||
* false:模型输出的视频为无声视频。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**draft==^new^==** ** ** `boolean` `默认值 false`
|
||||
> 仅 Seedance 1.5 pro 支持
|
||||
|
||||
控制是否开启样片模式。[阅读文档](https://www.volcengine.com/docs/82379/1366799?lang=zh#5acd28c8) 获取使用教程和注意事项。
|
||||
|
||||
* true:开启样片模式,生成一段预览视频,快速验证场景结构、镜头调度、主体动作与 prompt 意图是否符合预期。消耗 token 数较正常视频更少,使用成本更低。
|
||||
* false:关闭样片模式,正常生成一段视频。
|
||||
|
||||
:::tip
|
||||
开启样片模式后,将使用 480p 分辨率生成 Draft 视频(使用其他分辨率会报错),不支持返回尾帧功能,不支持离线推理功能。
|
||||
|
||||
:::
|
||||
---
|
||||
|
||||
|
||||
:::warning 部分参数升级说明
|
||||
|
||||
* **对于 resolution、ratio、duration、frames、seed、camera_fixed、watermark 参数,平台升级了参数传入方式,示例如下。Seedance 1.0\-1.5 系列模型依然兼容支持旧方式。**
|
||||
* 不同模型,可能对应支持不同的参数与取值,详见 [输出视频格式](https://www.volcengine.com/docs/82379/1366799?lang=zh#9fe4cce0)。当输入的参数或取值不符合所选的模型时,该参数将被忽略或触发报错:
|
||||
* 新方式:在 request body 中直接传入参数。此方式为**强校验,** 若参数填写错误,模型会返回错误提示。
|
||||
* 旧方式:在文本提示词后追加 \-\-[parameters]。此方式为**弱校验,** 若参数填写错误,模型将自动使用默认值且不会报错。
|
||||
|
||||
|
||||
:::
|
||||
**新方式(推荐):在 request body 中直接传入参数**
|
||||
```JSON
|
||||
...
|
||||
// Specify the aspect ratio of the generated video as 16:9, duration as 5 seconds, resolution as 720p, seed as 11, and include a watermark. The camera is not fixed.
|
||||
"model": "doubao-seedance-1-5-pro-251215",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "小猫对着镜头打哈欠"
|
||||
}
|
||||
],
|
||||
// All parameters must be written in full; abbreviations are not supported
|
||||
"resolution": "720p",
|
||||
"ratio":"16:9",
|
||||
"duration": 5,
|
||||
// "frames": 29, Either duration or frames is required
|
||||
"seed": 11,
|
||||
"camera_fixed": false,
|
||||
"watermark": true
|
||||
...
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
**旧方式:在文本提示词后追加 \-\-[parameters]**
|
||||
```JSON
|
||||
...
|
||||
// Specify the aspect ratio of the generated video as 16:9, duration as 5 seconds, resolution as 720p, seed as 11, and include a watermark. The camera is not fixed.
|
||||
"model": "doubao-seedance-1-5-pro-251215",
|
||||
"content": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "小猫对着镜头打哈欠 --rs 720p --rt 16:9 --dur 5 --seed 11 --cf false --wm true"
|
||||
// "text": "小猫对着镜头打哈欠 --resolution 720p --ratio 16:9 --duration 5 --seed 11 --camerafixed false --watermark true"
|
||||
}
|
||||
]
|
||||
...
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**resolution ** `string`
|
||||
> Seedance 1.5 pro、Seedance 1.0 lite 默认值:`720p`
|
||||
> Seedance 1.0 pro & pro\-fast 默认值:`1080p`
|
||||
|
||||
视频分辨率,枚举值:
|
||||
|
||||
* 480p
|
||||
* 720p
|
||||
* 1080p:参考图场景不支持
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**ratio ** `string`
|
||||
> 文生视频:默认值 `16:9`( Seedance 1.5 Pro 默认值为 `adaptive`)
|
||||
> 图生视频:默认值 `adaptive`(参考图生视频场景默认值为 `16:9`)
|
||||
|
||||
生成视频的宽高比例。不同宽高比对应的宽高像素值见下方表格。
|
||||
|
||||
* 16:9
|
||||
* 4:3
|
||||
* 1:1
|
||||
* 3:4
|
||||
* 9:16
|
||||
* 21:9
|
||||
* adaptive:根据输入自动选择最合适的宽高比(详见下文说明)
|
||||
|
||||
:::warning **adaptive ** 适配规则
|
||||
当配置 **ratio** 为 `adaptive` 时,模型会根据生成场景自动适配宽高比;实际生成的视频宽高比可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **ratio** 字段获取。
|
||||
|
||||
* 文生视频场景:根据输入的提示词,自动选择最合适的宽高比(仅 Seedance 1.5 Pro 支持)。
|
||||
* 图生视频场景:
|
||||
* 参考图生视频:不支持配置 **ratio** 为 `adaptive`。
|
||||
* 首帧 / 首尾帧生视频:根据上传的首帧图片比例,自动选择最合适的宽高比。
|
||||
|
||||
|
||||
:::
|
||||
**不同宽高比对应的宽高像素值**
|
||||
Note:图生视频,选择的宽高比与您上传的图片宽高比不一致时,方舟会对您的图片进行裁剪,裁剪时会居中裁剪,详细规则见 [图片裁剪规则](https://www.volcengine.com/docs/82379/1366799?lang=zh#f76aafc8)。
|
||||
|
||||
|分辨率 |宽高比|宽高像素值|宽高像素值|\
|
||||
| | |Seedance 1.0 系列 |Seedance 1.5 pro |
|
||||
|---|---|---|---|
|
||||
|480p |16:9 |864×480 |864×496 |
|
||||
|^^|4:3 |736×544 |752×560 |
|
||||
|^^|1:1 |640×640 |640×640 |
|
||||
|^^|3:4 |544×736 |560×752 |
|
||||
|^^|9:16 |480×864 |496×864 |
|
||||
|^^|21:9 |960×416 |992×432 |
|
||||
|720p |16:9 |1248×704 |1280×720 |
|
||||
|^^|4:3 |1120×832 |1112×834 |
|
||||
|^^|1:1 |960×960 |960×960 |
|
||||
|^^|3:4 |832×1120 |834×1112 |
|
||||
|^^|9:16 |704×1248 |720×1280 |
|
||||
|^^|21:9 |1504×640 |1470×630 |
|
||||
|1080p |16:9 |1920×1088 |1920×1080 |\
|
||||
|> 1.0 lite 参考图场景不支持 | | | |
|
||||
|^^|4:3 |1664×1248 |1664×1248 |
|
||||
|^^|1:1 |1440×1440 |1440×1440 |
|
||||
|^^|3:4 |1248×1664 |1248×1664 |
|
||||
|^^|9:16 |1088×1920 |1080×1920 |
|
||||
|^^|21:9 |2176×928 |2206×946 |
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**duration** `integer` `默认值 5`
|
||||
> duration 和 frames 二选一即可,frames 的优先级高于 duration。如果您希望生成整数秒的视频,建议指定 duration。
|
||||
|
||||
生成视频时长,单位:秒。支持 2~12 秒。
|
||||
:::warning
|
||||
Seedance 1.5 pro 支持两种配置方法
|
||||
|
||||
* 指定具体时长:支持 [4,12] 范围内的任一整数。
|
||||
* 不指定具体生成时长:设置为 `-1`,表示由模型在 [4,12] 范围内自主选择合适的视频长度(整数秒)。实际生成视频的时长可通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309?lang=zh) 返回的 **duration** 字段获取。注意视频时长与计费相关,请谨慎设置。
|
||||
|
||||
|
||||
:::
|
||||
---
|
||||
|
||||
|
||||
**frames** `integer`
|
||||
> Seedance 1.5 pro 暂不支持
|
||||
> duration 和 frames 二选一即可,frames 的优先级高于 duration。如果您希望生成小数秒的视频,建议指定 frames。
|
||||
|
||||
生成视频的帧数。通过指定帧数,可以灵活控制生成视频的长度,生成小数秒的视频。
|
||||
由于 frames 的取值限制,仅能支持有限小数秒,您需要根据公式推算最接近的帧数。
|
||||
|
||||
* 计算公式:帧数 = 时长 × 帧率(24)。
|
||||
* 取值范围:支持 [29, 289] 区间内所有满足 `25 + 4n` 格式的整数值,其中 n 为正整数。
|
||||
|
||||
例如:假设需要生成 2.4 秒的视频,帧数=2.4×24=57.6。由于 frames 不支持 57.6,此时您只能选择一个最接近的值。根据 25+4n 计算出最接近的帧数为 57,实际生成的视频为 57/24=2.375 秒。
|
||||
|
||||
---
|
||||
|
||||
|
||||
**seed** `integer` `默认值 -1`
|
||||
种子整数,用于控制生成内容的随机性。
|
||||
取值范围:[\-1, 2^32\-1]之间的整数。
|
||||
:::warning
|
||||
|
||||
* 相同的请求下,模型收到不同的seed值,如:不指定seed值或令seed取值为\-1(会使用随机数替代)、或手动变更seed值,将生成不同的结果。
|
||||
* 相同的请求下,模型收到相同的seed值,会生成类似的结果,但不保证完全一致。
|
||||
|
||||
|
||||
:::
|
||||
---
|
||||
|
||||
|
||||
**camera_fixed** `boolean` `默认值 false`
|
||||
> 参考图场景不支持
|
||||
|
||||
是否固定摄像头。枚举值:
|
||||
|
||||
* true:固定摄像头。平台会在用户提示词中追加固定摄像头,实际效果不保证。
|
||||
* false:不固定摄像头。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
**watermark** `boolean` `默认值 false`
|
||||
生成视频是否包含水印。枚举值:
|
||||
|
||||
* false:不含水印。
|
||||
* true:含有水印。
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
<span id="y2hhTyHB"></span>
|
||||
## 响应参数
|
||||
> 跳转 [请求参数](#RxN8G2nH)
|
||||
|
||||
**id ** `string`
|
||||
视频生成任务 ID 。仅保存 7 天(从 **created at** 时间戳开始计算),超时后将自动清除。
|
||||
|
||||
* 设置`"draft": true`,为 Draft 视频任务 ID。
|
||||
* 设置 `"draft": false`,为正常视频任务 ID。
|
||||
|
||||
创建视频生成任务为异步接口,获取 ID 后,需要通过 [查询视频生成任务 API](https://www.volcengine.com/docs/82379/1521309) 来查询视频生成任务的状态。任务成功后,会输出生成视频的`video_url`。
|
||||
|
||||
|
||||
1074
docs/API文档/推理节点.md
1074
docs/API文档/推理节点.md
File diff suppressed because it is too large
Load Diff
@ -1,134 +0,0 @@
|
||||
# Celery 轮询机制修复报告
|
||||
|
||||
> 日期:2026-04-04
|
||||
> 版本:v0.16.0
|
||||
> 影响范围:backend/apps/generation/tasks.py, backend/config/settings.py
|
||||
|
||||
---
|
||||
|
||||
## 一、问题现象
|
||||
|
||||
2026/4/1 下午,大量用户反馈视频生成任务长时间卡在"生成中",前端显示耗时 60~65 分钟。
|
||||
火山引擎侧确认视频实际生成仅需约 10 分钟,结果已就绪但未被平台及时同步。
|
||||
|
||||
**截图数据**(4/1 下午完成的任务):
|
||||
|
||||
| 提交时间 | 显示耗时 |
|
||||
|---------|---------|
|
||||
| 2026/4/1 16:57:28 | 63 分 33 秒 |
|
||||
| 2026/4/1 16:58:41 | 62 分 37 秒 |
|
||||
| 2026/4/1 16:59:16 | 62 分 7 秒 |
|
||||
| 2026/4/1 17:00:36 | 64 分 24 秒 |
|
||||
| 2026/4/1 17:04:53 | 64 分 2 秒 |
|
||||
|
||||
## 二、根因分析
|
||||
|
||||
### 2.1 状态同步链路
|
||||
|
||||
```
|
||||
用户提交任务
|
||||
→ 后端调 create_task(火山 API)
|
||||
→ 获得 ark_task_id
|
||||
→ 派发 Celery 任务 poll_video_task
|
||||
→ Celery worker 每 5 秒查一次火山 API
|
||||
→ 火山返回完成 → 写 DB + 上传 TOS + 结算
|
||||
→ 前端轮询 DB → 展示结果
|
||||
```
|
||||
|
||||
前端只读 DB 状态,**不直接调火山 API**。整个链路完全依赖 Celery worker 轮询。
|
||||
|
||||
### 2.2 旧实现缺陷
|
||||
|
||||
`poll_video_task` 使用 `while True` + `time.sleep(5)` 长驻循环:
|
||||
|
||||
```python
|
||||
# 旧代码
|
||||
while True:
|
||||
time.sleep(POLL_INTERVAL) # 5 秒
|
||||
ark_resp = query_task(...) # 查一次
|
||||
if terminal:
|
||||
break
|
||||
```
|
||||
|
||||
**三个致命问题:**
|
||||
|
||||
| 问题 | 影响 |
|
||||
|------|------|
|
||||
| 每个任务占死一个 worker 进程 | `concurrency=4` 最多同时轮询 4 个任务,第 5 个排队 |
|
||||
| worker 重启后循环直接丢失 | 内存中的 `while True` 不可持久化,OOM/重启 = 任务丢失 |
|
||||
| `time.sleep` 浪费进程资源 | worker 99% 时间在 sleep,实际有用工作不到 1% |
|
||||
|
||||
### 2.3 OOM 重启链
|
||||
|
||||
```
|
||||
4 个任务同时轮询
|
||||
→ 某些任务完成,触发 TOS 上传(下载视频 + 上传对象存储)
|
||||
→ 内存飙升超过 512Mi 限制
|
||||
→ K8s OOM Kill → worker 重启(共重启 15 次)
|
||||
→ 4 个进程中的 while True 循环全部丢失
|
||||
→ 等 recover_stuck_tasks(每 10 分钟)重新派发
|
||||
→ 重新派发后 worker 又被占满 → 又 OOM → 循环
|
||||
→ 实际恢复耗时 ≈ 50~60 分钟
|
||||
```
|
||||
|
||||
## 三、修复方案
|
||||
|
||||
### 3.1 核心改动:self.retry 替代 while True
|
||||
|
||||
```python
|
||||
# 新代码
|
||||
@shared_task(bind=True, max_retries=None, ignore_result=True)
|
||||
def poll_video_task(self, record_id):
|
||||
record = GenerationRecord.objects.get(pk=record_id)
|
||||
|
||||
ark_resp = query_task(record.ark_task_id)
|
||||
new_status = map_status(ark_resp.get('status', ''))
|
||||
|
||||
if new_status in ('queued', 'processing'):
|
||||
record.save(update_fields=['status', 'updated_at'])
|
||||
raise self.retry(countdown=5) # 5 秒后重新入队
|
||||
|
||||
# 到达终态 → 处理结果
|
||||
...
|
||||
```
|
||||
|
||||
**原理对比:**
|
||||
|
||||
| | 旧方式(while True) | 新方式(self.retry) |
|
||||
|---|---|---|
|
||||
| 任务生命周期 | 在 worker 进程内存中 | 在 Redis 队列中 |
|
||||
| worker 占用 | 持续占用直到完成(分钟级) | 每次查询仅占用毫秒级 |
|
||||
| worker 重启 | 任务丢失 | Redis 中的任务自动恢复 |
|
||||
| 并发能力 | 最多 4 个(= concurrency) | 数百个(受 API RPM 限制) |
|
||||
|
||||
### 3.2 recover_stuck_tasks 间隔缩短
|
||||
|
||||
| | 旧值 | 新值 |
|
||||
|---|---|---|
|
||||
| Beat 调度间隔 | 600 秒(10 分钟) | 180 秒(3 分钟) |
|
||||
| stuck 判定门槛 | 10 分钟 | 3 分钟 |
|
||||
| 最坏恢复时间 | ~20 分钟 | ~6 分钟 |
|
||||
|
||||
### 3.3 变更文件
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `backend/apps/generation/tasks.py` | `poll_video_task`: while True → self.retry;`recover_stuck_tasks`: 门槛 10 → 3 分钟 |
|
||||
| `backend/config/settings.py` | Beat schedule: 600 → 180 秒 |
|
||||
|
||||
## 四、效果预估
|
||||
|
||||
| 指标 | 修复前 | 修复后 |
|
||||
|------|--------|--------|
|
||||
| 同时轮询任务数上限 | 4 | 数百 |
|
||||
| worker 重启后任务恢复 | 丢失,等 10 分钟兜底 | 自动恢复,无需兜底 |
|
||||
| 最坏同步延迟 | 60+ 分钟 | ~15 秒(= 查询间隔 + 网络延迟) |
|
||||
| 内存占用 | 持续占满(sleep 期间不释放) | 脉冲式占用(查完释放) |
|
||||
| OOM 风险 | 高(4 进程常驻 + TOS 上传峰值) | 低(进程闲置时内存极小) |
|
||||
|
||||
## 五、部署注意
|
||||
|
||||
1. **无需数据库迁移** — 仅修改 Python 代码
|
||||
2. **部署后旧的 while True 任务会自然消亡** — 不需要手动干预
|
||||
3. **Redis 中可能有旧格式的任务** — 兼容无问题,新旧 `poll_video_task` 签名一致(`record_id` 参数不变)
|
||||
4. **建议同步部署**:先部署代码,再重启 Celery worker(`kubectl rollout restart deployment celery-worker`)
|
||||
@ -4,91 +4,6 @@
|
||||
|
||||
---
|
||||
|
||||
## 2026-03-19 — v0.9.7: 登录风控第二期 — IP归属地解析 + 异常检测 + 飞书告警 + 自动封禁
|
||||
|
||||
**状态**: ✅ 已完成 | **验收**: ✅ 通过(本地验证,IP138 在线 API 需部署至阿里云后验证)
|
||||
|
||||
### 变更内容
|
||||
|
||||
#### 后端
|
||||
1. **IP 归属地解析** — 新建 `geo_client.py`,主通道阿里云市场 IP138 API(精确到市),备通道 ip2region 离线库,60 秒熔断降级策略,私有 IP 自动跳过
|
||||
2. **异常检测引擎** — 新建 `anomaly_detector.py`,5 条规则:
|
||||
- R1 登录地区不对(警告)— 单账号从非预期城市登录
|
||||
- R2 不可能的旅行(严重)— 单账号短时间内从两个不同城市登录,自动封禁该用户
|
||||
- R3 登录太频繁(警告)— 单账号短时间内登录次数过多
|
||||
- R4 团队遍地开花(严重)— 整个团队短时间内出现大量异地登录,自动封禁整个团队
|
||||
- R5 海外IP太杂(警告)— 整个团队短期内出现大量不同国家的登录
|
||||
3. **飞书告警服务** — 新建 `alert_service.py`,通过飞书 Open API 发送 interactive 卡片私信,红色头=严重/橙色头=警告,附带辅助指标(7天并发踢出次数、非工作时间登录占比)
|
||||
4. **告警冷却** — 同团队+同规则 30 分钟内不重复告警(可配置)
|
||||
5. **封禁机制** — R2 封用户 + R4 封团队,封禁即踢下线(清 ActiveSession),前端拦截 user_disabled/team_disabled 错误码弹窗提示
|
||||
6. **团队级阈值配置** — TeamAnomalyConfig 模型(OneToOne → Team),未配置时取全局默认值
|
||||
7. **自动学习预期地区** — 统计团队最近 30 天登录城市,频次 ≥ 3 的城市纳入预期列表
|
||||
8. **LoginRecord 扩展** — 新增 team FK、geo_country/province/city/source 字段
|
||||
9. **SessionJWT 双重检查** — 认证层同时检查 user.is_active 和 team.is_active
|
||||
|
||||
#### 前端
|
||||
10. **系统设置页** — 异常检测总开关、R1-R5 默认阈值编辑(三段按钮组 默认|开|关)、飞书接收人手机号+测试按钮、短信(灰色 Coming soon)、告警冷却时间
|
||||
11. **团队管理页** — 预期登录城市编辑+自动学习按钮、R1-R5 团队级阈值覆盖、disabled_by 来源标签(系统/管理员)
|
||||
12. **安全日志页面** — `/admin/security` LoginAnomaly 记录列表,按团队/规则/级别/时间筛选
|
||||
13. **用户管理页** — disabled_by 来源标签(系统自动禁用/管理员手动禁用)
|
||||
14. **管理员修改密码** — AdminLayout 侧栏底部新增修改密码入口+弹窗
|
||||
15. **前端拦截器** — user_disabled/team_disabled 错误码弹窗提示后跳登录页
|
||||
|
||||
### 新增/变更 API
|
||||
| Method | Endpoint | Description |
|
||||
|--------|----------|-------------|
|
||||
| GET | `/api/v1/admin/anomalies` | 登录异常记录(筛选:team/rule/level/date) |
|
||||
| POST | `/api/v1/admin/test-feishu` | 发送飞书测试消息 |
|
||||
| POST | `/api/v1/admin/teams/<id>/auto-learn` | 自动学习预期登录地区 |
|
||||
| POST | `/api/v1/admin/teams/<id>/apply-learned-regions` | 应用学习到的预期地区 |
|
||||
|
||||
### 新增文件
|
||||
| 文件 | 用途 |
|
||||
|------|------|
|
||||
| `backend/utils/geo_client.py` | IP 归属地解析(IP138 在线 + ip2region 离线) |
|
||||
| `backend/utils/anomaly_detector.py` | 异常检测引擎(R1-R5 规则) |
|
||||
| `backend/utils/alert_service.py` | 告警服务(飞书 interactive 卡片) |
|
||||
| `backend/apps/accounts/migrations/0008_anomaly_detection_phase2.py` | 账号模型迁移 |
|
||||
| `backend/apps/generation/migrations/0006_anomaly_detection_phase2.py` | 配额模型迁移 |
|
||||
| `web/src/pages/AnomalyLogPage.tsx` | 安全日志页面 |
|
||||
|
||||
### 变更文件
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `CLAUDE.md` | 新增异常检测相关模型/API/路由/环境变量文档 |
|
||||
| `backend/apps/accounts/authentication.py` | SessionJWT 认证增加 team.is_active 检查 |
|
||||
| `backend/apps/accounts/models.py` | 新增 LoginAnomaly/TeamAnomalyConfig 模型,User/Team 新增 disabled_by |
|
||||
| `backend/apps/accounts/views.py` | login_view 增加 geo 解析 + 异常检测调用 |
|
||||
| `backend/apps/generation/models.py` | QuotaConfig 新增异常检测全局配置字段 |
|
||||
| `backend/apps/generation/serializers.py` | 新增异常检测相关 Serializer |
|
||||
| `backend/apps/generation/urls.py` | 新增 4 条路由 |
|
||||
| `backend/apps/generation/views.py` | 新增 anomalies/test-feishu/auto-learn/apply-learned-regions 视图 |
|
||||
| `backend/config/settings.py` | 新增 ALIYUN_IP_GEO_APPCODE / FEISHU_APP_SECRET 配置 |
|
||||
| `backend/requirements.txt` | 新增 ip2region>=2.7.0 |
|
||||
| `web/src/App.tsx` | 新增 /admin/security 路由 |
|
||||
| `web/src/lib/api.ts` | 新增 getLoginAnomalies/testFeishu/teamAutoLearn/applyLearnedRegions |
|
||||
| `web/src/pages/AdminLayout.tsx` | 侧栏新增"安全日志"导航 + 修改密码弹窗 |
|
||||
| `web/src/pages/SettingsPage.tsx` | 新增异常检测配置卡片 |
|
||||
| `web/src/pages/TeamsPage.tsx` | 预期地区编辑/自动学习 + 团队级阈值配置 |
|
||||
| `web/src/pages/TeamsPage.module.css` | membersTitle 间距调整 |
|
||||
| `web/src/pages/UsersPage.tsx` | disabled_by 来源标签 |
|
||||
| `web/src/types/index.ts` | 新增 LoginAnomaly/TeamAnomalyConfig 接口 |
|
||||
|
||||
### 触发原因
|
||||
- 火山引擎明确禁止 C 端使用 Seedance API,需要防止团队私自将账号开放给 C 端个人用户
|
||||
- 第一期已完成并发会话限制 + Token 缩短 + 登录记录,第二期基于 IP 归属地做异常检测
|
||||
|
||||
### 关键设计决策
|
||||
- 异常检测不阻塞登录(try/except 包裹)
|
||||
- 在线 API 熔断 60 秒自动降级离线库
|
||||
- R2 城市名直接比较(不算距离),空城市跳过(防误封)
|
||||
- R4 只统计预期城市列表之外的城市
|
||||
- R5 统计国家数而非 IP 数(VPN 轮换 IP 但出口国家固定)
|
||||
- 飞书告警异步发送(daemon thread),不拖慢登录
|
||||
- TeamAnomalyConfig 独立模型,不污染 Team
|
||||
|
||||
---
|
||||
|
||||
## 2026-03-16 — v0.9.1: 首页 + 播放器修复
|
||||
|
||||
**状态**: ✅ 已完成 | **验收**: ✅ 通过(本地验证)
|
||||
@ -170,7 +85,7 @@
|
||||
3. **H2: 登录限流** — DRF `ScopedRateThrottle` 实现 `login: 5/min`,全局匿名 30/min、认证用户 120/min
|
||||
4. **H4: Django Admin 限制** — 仅在 `DEBUG=True` 时注册 `/admin/` URL
|
||||
5. **H6: XSS 防护** — 安装 DOMPurify,`PromptInput.tsx` 的 `innerHTML` 赋值前进行 HTML 消毒
|
||||
6. **H7: ALLOWED_HOSTS 收紧** — 从 `"*"` 改为 `airflow-studio-api.airlabs.art,localhost`
|
||||
6. **H7: ALLOWED_HOSTS 收紧** — 从 `"*"` 改为 `video-huoshan-api.airlabs.art,localhost`
|
||||
7. **H9: Nginx 安全头** — `server_tokens off` + X-Frame-Options/X-Content-Type-Options/X-XSS-Protection/Referrer-Policy/Permissions-Policy
|
||||
8. **M1: 密码策略加强** — 最小 8 位 + 常见密码检测 + 纯数字密码检测
|
||||
9. **M5: Django 安全头** — 生产环境启用 XSS Filter/Content-Type-Nosniff/X-Frame-Options/SSL Proxy Header
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
# 部署操作手册
|
||||
|
||||
> 本文档说明如何将代码推送到测试环境和生产环境。
|
||||
> 日常开发在 `dev` 分支,生产发布通过合并到 `master` 分支触发。
|
||||
|
||||
---
|
||||
|
||||
## 环境说明
|
||||
|
||||
| 环境 | 触发分支 | 镜像仓库 | K3s 集群 | 域名 |
|
||||
|------|---------|---------|---------|------|
|
||||
| 测试(development) | `dev` | `cr.volces.com/zyc/...` | `192.168.0.129:6443` | `airflow-studio.test.airlabs.art` |
|
||||
| 生产(production) | `master` | `gitea-prod-cn-shanghai.cr.volces.com/prod/...` | `192.168.0.130:6443` | `airflow-studio.airlabs.art` |
|
||||
|
||||
---
|
||||
|
||||
## 推送到测试环境
|
||||
|
||||
只需要把代码推到 `dev` 分支,CI/CD 自动触发。
|
||||
|
||||
```bash
|
||||
# 确认当前在 dev 分支
|
||||
git checkout dev
|
||||
|
||||
# 提交代码
|
||||
git add .
|
||||
git commit -m "feat: 你的改动描述"
|
||||
|
||||
# 推送触发构建
|
||||
git push origin dev
|
||||
```
|
||||
|
||||
构建完成后在 Gitea Actions 查看进度:
|
||||
- Build and Push Backend ✅
|
||||
- Build and Push Web ✅
|
||||
- Setup Kubectl ✅
|
||||
- Deploy to K3s ✅
|
||||
|
||||
---
|
||||
|
||||
## 推送到生产环境
|
||||
|
||||
> ⚠️ **注意**:操作完成后必须切回 `dev` 分支,不要在 `master` 上继续开发。
|
||||
|
||||
### 完整流程
|
||||
|
||||
```bash
|
||||
# 1. 确保 dev 分支代码是最新的
|
||||
git checkout dev
|
||||
git pull origin dev
|
||||
|
||||
# 2. 切换到 master 分支
|
||||
git checkout master
|
||||
|
||||
# 3. 合并 dev 的代码
|
||||
git merge dev
|
||||
|
||||
# 4. 推送到远程,触发生产构建
|
||||
git push origin master
|
||||
|
||||
# 5. ⚠️ 立刻切回 dev,不要停留在 master
|
||||
git checkout dev
|
||||
```
|
||||
|
||||
### 如果有合并冲突
|
||||
|
||||
```bash
|
||||
# 解决冲突后
|
||||
git add .
|
||||
git commit -m "merge: dev into master"
|
||||
git push origin master
|
||||
git checkout dev
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 构建失败排查
|
||||
|
||||
### Build and Push 失败(docker pull 超时)
|
||||
Docker 镜像拉取超时,CI 会自动重试 3 次。如仍失败,检查构建机网络。
|
||||
|
||||
### Setup Kubectl 失败(command not found)
|
||||
kubectl 未安装或下载失败,CI 会自动从 daocloud 镜像安装。
|
||||
|
||||
### Deploy to K3s 失败(i/o timeout)
|
||||
K3s API Server 连接超时,CI 会自动重试 3 次(每次间隔 10 秒)。
|
||||
- 若持续失败,检查 K3s 节点状态:`kubectl get nodes`
|
||||
- 确认 kubeconfig secret(`VOLCANO_TEST_KUBE_CONFIG` / `VOLCANO_PROD_KUBE_CONFIG`)有值
|
||||
|
||||
---
|
||||
|
||||
## 快速检查部署状态
|
||||
|
||||
```bash
|
||||
# 测试环境
|
||||
ssh root@14.103.63.199
|
||||
kubectl get pods -n default
|
||||
|
||||
# 生产环境
|
||||
ssh root@118.196.0.100
|
||||
kubectl get pods -n default
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Celery Worker 监控
|
||||
|
||||
Celery worker 负责轮询火山 API 的视频生成状态。
|
||||
|
||||
```bash
|
||||
# 查看 worker 日志(测试环境)
|
||||
kubectl logs -f deployment/celery-worker -n default
|
||||
|
||||
# 查看队列积压(测试环境 Redis)
|
||||
redis-cli -h redis-shzlsczo52dft8mia.redis.ivolces.com -p 6379 -a Zyc188208 llen celery
|
||||
```
|
||||
|
||||
`recover_stuck_tasks` 定时任务每 3 分钟自动扫描卡住的任务并重新入队,无需手动干预。
|
||||
@ -1,92 +0,0 @@
|
||||
# 版本发布与回滚操作文档
|
||||
|
||||
## 流程概览
|
||||
|
||||
```
|
||||
开发新版本 → 创建版本分支 → 推送到远程 → 合并到 main → 推送 main 触发滚动发布
|
||||
```
|
||||
|
||||
## 操作步骤
|
||||
|
||||
### 1. 切换到 main 分支,拉取最新代码
|
||||
|
||||
```bash
|
||||
git checkout main
|
||||
git pull origin main
|
||||
```
|
||||
|
||||
### 2. 创建版本分支
|
||||
|
||||
```bash
|
||||
# 命名规范:release/vX.Y.Z
|
||||
git checkout -b release/v2.0.0
|
||||
```
|
||||
|
||||
### 3. 在版本分支上开发、提交
|
||||
|
||||
```bash
|
||||
git add <files>
|
||||
git commit -m "feat: 新功能描述"
|
||||
```
|
||||
|
||||
### 4. 推送版本分支到远程
|
||||
|
||||
```bash
|
||||
git push origin release/v2.0.0
|
||||
```
|
||||
|
||||
### 5. 合并到 main
|
||||
|
||||
```bash
|
||||
git checkout main
|
||||
git pull origin main
|
||||
git merge release/v2.0.0
|
||||
```
|
||||
|
||||
### 6. 推送 main,触发 CI/CD 滚动发布
|
||||
|
||||
```bash
|
||||
git push origin main
|
||||
```
|
||||
|
||||
CI/CD 会自动构建 Docker 镜像并部署到 K8s 集群。
|
||||
|
||||
## 版本回滚
|
||||
|
||||
如果新版本上线后出现问题,回滚到上一个稳定版本:
|
||||
|
||||
### 方式一:代码回滚(推荐)
|
||||
|
||||
```bash
|
||||
git checkout main
|
||||
git revert --no-commit HEAD..release/v1.0.0
|
||||
git commit -m "revert: 回滚到 v1.0.0"
|
||||
git push origin main
|
||||
```
|
||||
|
||||
> revert 会生成新提交,不会丢失任何历史代码,新版本随时可以恢复。
|
||||
|
||||
### 方式二:K8s 快速回滚(最快)
|
||||
|
||||
```bash
|
||||
# 回滚到上一个部署版本
|
||||
kubectl rollout undo deployment/<deployment-name> -n <namespace>
|
||||
|
||||
# 或指定具体版本
|
||||
kubectl rollout undo deployment/<deployment-name> --to-revision=<N> -n <namespace>
|
||||
```
|
||||
|
||||
## 分支命名规范
|
||||
|
||||
| 类型 | 命名格式 | 示例 |
|
||||
|------|---------|------|
|
||||
| 主分支 | `main` | `main` |
|
||||
| 版本分支 | `release/vX.Y.Z` | `release/v1.0.0` |
|
||||
| 功能分支 | `feature/功能名` | `feature/user-auth` |
|
||||
| 修复分支 | `hotfix/vX.Y.Z` | `hotfix/v1.0.1` |
|
||||
|
||||
## 当前版本分支
|
||||
|
||||
| 分支 | 状态 | 说明 |
|
||||
|------|------|------|
|
||||
| `v1.0.0` | 稳定 | 首个正式版本 |
|
||||
@ -14,8 +14,6 @@ spec:
|
||||
labels:
|
||||
app: video-backend
|
||||
spec:
|
||||
imagePullSecrets:
|
||||
- name: cr-pull-secret
|
||||
containers:
|
||||
- name: video-backend
|
||||
image: ${CI_REGISTRY_IMAGE}/video-backend:latest
|
||||
@ -28,29 +26,35 @@ spec:
|
||||
- name: DJANGO_DEBUG
|
||||
value: "False"
|
||||
- name: DJANGO_ALLOWED_HOSTS
|
||||
value: "*"
|
||||
value: "video-huoshan-api.airlabs.art,localhost"
|
||||
- name: DJANGO_SECRET_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: DJANGO_SECRET_KEY
|
||||
# Database (Volcano Engine RDS - 默认测试环境,生产环境通过 CI 替换)
|
||||
# Database (Aliyun RDS)
|
||||
- name: DB_HOST
|
||||
value: "mysql8351f937d637.rds.ivolces.com"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: DB_HOST
|
||||
- name: DB_NAME
|
||||
value: "video_auto"
|
||||
- name: DB_USER
|
||||
value: "zyc"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: DB_USER
|
||||
- name: DB_PASSWORD
|
||||
value: "Zyc188208"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: DB_PASSWORD
|
||||
- name: DB_PORT
|
||||
value: "3306"
|
||||
# Redis (Celery broker)
|
||||
- name: REDIS_URL
|
||||
value: "redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.ivolces.com:6379/0"
|
||||
# CORS
|
||||
- name: CORS_ALLOWED_ORIGINS
|
||||
value: "https://airflow-studio.airlabs.art"
|
||||
value: "https://video-huoshan-web.airlabs.art"
|
||||
# Log Center
|
||||
- name: LOG_CENTER_URL
|
||||
value: "https://qiyuan-log-center-api.airlabs.art"
|
||||
@ -83,36 +87,12 @@ spec:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: ARK_API_KEY
|
||||
- name: ARK_ENDPOINT_SEEDANCE
|
||||
value: "ep-m-20260315211214-z9dp6"
|
||||
- name: ARK_ENDPOINT_SEEDANCE_FAST
|
||||
value: "ep-m-20260329211530-68999"
|
||||
- name: SEEDANCE_ENABLED
|
||||
value: "true"
|
||||
- name: ASSETS_API_ENABLED
|
||||
value: "true"
|
||||
# Aliyun SMS
|
||||
- name: ALIYUN_SMS_ACCESS_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: ALIYUN_SMS_ACCESS_KEY
|
||||
- name: ALIYUN_SMS_ACCESS_SECRET
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: ALIYUN_SMS_ACCESS_SECRET
|
||||
- name: ALIYUN_SMS_SIGN_NAME
|
||||
value: "广州气元科技"
|
||||
- name: ALIYUN_SMS_TEMPLATE_CODE
|
||||
value: "SMS_503445109"
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /healthz/
|
||||
port: 8000
|
||||
httpHeaders:
|
||||
- name: Host
|
||||
value: localhost
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 5
|
||||
@ -121,9 +101,6 @@ spec:
|
||||
httpGet:
|
||||
path: /healthz/
|
||||
port: 8000
|
||||
httpHeaders:
|
||||
- name: Host
|
||||
value: localhost
|
||||
initialDelaySeconds: 15
|
||||
periodSeconds: 5
|
||||
timeoutSeconds: 3
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: celery-worker
|
||||
labels:
|
||||
app: celery-worker
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: celery-worker
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: celery-worker
|
||||
spec:
|
||||
imagePullSecrets:
|
||||
- name: cr-pull-secret
|
||||
containers:
|
||||
- name: celery-worker
|
||||
image: ${CI_REGISTRY_IMAGE}/video-backend:latest
|
||||
imagePullPolicy: Always
|
||||
command: ["celery", "-A", "config", "worker", "--loglevel=info", "--pool=gevent", "--concurrency=200"]
|
||||
env: &shared-env
|
||||
- name: USE_MYSQL
|
||||
value: "true"
|
||||
- name: DJANGO_DEBUG
|
||||
value: "False"
|
||||
- name: DJANGO_ALLOWED_HOSTS
|
||||
value: "*"
|
||||
- name: DJANGO_SECRET_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: DJANGO_SECRET_KEY
|
||||
# Redis
|
||||
- name: REDIS_URL
|
||||
value: "redis://zyc:Zyc188208@redis-shzlsczo52dft8mia.redis.ivolces.com:6379/0"
|
||||
# Database (Volcano Engine RDS)
|
||||
- name: DB_HOST
|
||||
value: "mysql8351f937d637.rds.ivolces.com"
|
||||
- name: DB_NAME
|
||||
value: "video_auto"
|
||||
- name: DB_USER
|
||||
value: "zyc"
|
||||
- name: DB_PASSWORD
|
||||
value: "Zyc188208"
|
||||
- name: DB_PORT
|
||||
value: "3306"
|
||||
# TOS (from Secret)
|
||||
- name: TOS_ACCESS_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: TOS_ACCESS_KEY
|
||||
- name: TOS_SECRET_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: TOS_SECRET_KEY
|
||||
- name: TOS_BUCKET
|
||||
value: "airdrama-media"
|
||||
- name: TOS_ENDPOINT
|
||||
value: "https://tos-cn-beijing.volces.com"
|
||||
- name: TOS_REGION
|
||||
value: "cn-beijing"
|
||||
- name: TOS_CDN_DOMAIN
|
||||
value: "https://airdrama-media.tos-cn-beijing.volces.com"
|
||||
# Seedance API (from Secret)
|
||||
- name: ARK_API_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: video-backend-secrets
|
||||
key: ARK_API_KEY
|
||||
- name: ARK_ENDPOINT_SEEDANCE
|
||||
value: "ep-m-20260315211214-z9dp6"
|
||||
- name: ARK_ENDPOINT_SEEDANCE_FAST
|
||||
value: "ep-m-20260329211530-68999"
|
||||
- name: SEEDANCE_ENABLED
|
||||
value: "true"
|
||||
resources:
|
||||
requests:
|
||||
memory: "256Mi"
|
||||
cpu: "200m"
|
||||
limits:
|
||||
memory: "1Gi"
|
||||
cpu: "1000m"
|
||||
- name: celery-beat
|
||||
image: ${CI_REGISTRY_IMAGE}/video-backend:latest
|
||||
imagePullPolicy: Always
|
||||
command: ["celery", "-A", "config", "beat", "--loglevel=info"]
|
||||
env: *shared-env
|
||||
resources:
|
||||
requests:
|
||||
memory: "64Mi"
|
||||
cpu: "50m"
|
||||
limits:
|
||||
memory: "128Mi"
|
||||
cpu: "100m"
|
||||
@ -1,15 +0,0 @@
|
||||
# ClusterIssuer for Let's Encrypt automatic certificate generation & renewal
|
||||
apiVersion: cert-manager.io/v1
|
||||
kind: ClusterIssuer
|
||||
metadata:
|
||||
name: letsencrypt-prod
|
||||
spec:
|
||||
acme:
|
||||
server: https://acme-v02.api.letsencrypt.org/directory
|
||||
email: airlabsv001@gmail.com
|
||||
privateKeySecretRef:
|
||||
name: letsencrypt-prod-key
|
||||
solvers:
|
||||
- http01:
|
||||
ingress:
|
||||
class: traefik
|
||||
@ -1,18 +1,20 @@
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: airflow-studio-ingress
|
||||
name: video-huoshan-ingress
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: "traefik"
|
||||
cert-manager.io/cluster-issuer: "letsencrypt-prod"
|
||||
spec:
|
||||
tls:
|
||||
- hosts:
|
||||
- airflow-studio-api.airlabs.art
|
||||
- airflow-studio.airlabs.art
|
||||
secretName: airflow-studio-tls
|
||||
- video-huoshan-api.airlabs.art
|
||||
secretName: video-huoshan-api-tls
|
||||
- hosts:
|
||||
- video-huoshan-web.airlabs.art
|
||||
secretName: video-huoshan-web-tls
|
||||
rules:
|
||||
- host: airflow-studio-api.airlabs.art
|
||||
- host: video-huoshan-api.airlabs.art
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
@ -22,7 +24,7 @@ spec:
|
||||
name: video-backend
|
||||
port:
|
||||
number: 8000
|
||||
- host: airflow-studio.airlabs.art
|
||||
- host: video-huoshan-web.airlabs.art
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
||||
@ -14,8 +14,6 @@ spec:
|
||||
labels:
|
||||
app: video-web
|
||||
spec:
|
||||
imagePullSecrets:
|
||||
- name: cr-pull-secret
|
||||
containers:
|
||||
- name: video-web
|
||||
image: ${CI_REGISTRY_IMAGE}/video-web:latest
|
||||
|
||||
84
repair_test_bug_65.py
Normal file
84
repair_test_bug_65.py
Normal file
@ -0,0 +1,84 @@
|
||||
"""
|
||||
Test for Bug #65 fix: OperationalError (1366) Incorrect string value for emoji in prompt.
|
||||
|
||||
Verifies that GenerationRecord.prompt can store 4-byte UTF-8 characters (emoji).
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
# Setup Django
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'backend'))
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
os.environ.setdefault('TESTING', 'true')
|
||||
django.setup()
|
||||
|
||||
from django.test import TestCase
|
||||
from django.contrib.auth import get_user_model
|
||||
from apps.generation.models import GenerationRecord
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class Bug65EmojiPromptTest(TestCase):
|
||||
"""Test that prompts with emoji characters can be saved to the database."""
|
||||
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(
|
||||
username='testuser_bug65',
|
||||
email='bug65@test.com',
|
||||
password='testpass123',
|
||||
)
|
||||
|
||||
def test_prompt_with_emoji_saves_successfully(self):
|
||||
"""Bug #65: prompt containing 🔊 (4-byte UTF-8) should not raise OperationalError."""
|
||||
emoji_prompt = '🔊 这是一个包含emoji的提示词 🎬🎥✨'
|
||||
record = GenerationRecord.objects.create(
|
||||
user=self.user,
|
||||
prompt=emoji_prompt,
|
||||
mode='universal',
|
||||
model='seedance_2.0',
|
||||
aspect_ratio='16:9',
|
||||
duration=5,
|
||||
)
|
||||
record.refresh_from_db()
|
||||
self.assertEqual(record.prompt, emoji_prompt)
|
||||
|
||||
def test_prompt_with_mixed_unicode(self):
|
||||
"""Prompt with mixed CJK + emoji + ASCII should save correctly."""
|
||||
mixed_prompt = '🔊 大象在草原上奔跑 🐘 — cinematic 4K, slow-motion 🎬'
|
||||
record = GenerationRecord.objects.create(
|
||||
user=self.user,
|
||||
prompt=mixed_prompt,
|
||||
mode='universal',
|
||||
model='seedance_2.0',
|
||||
aspect_ratio='16:9',
|
||||
duration=5,
|
||||
)
|
||||
record.refresh_from_db()
|
||||
self.assertEqual(record.prompt, mixed_prompt)
|
||||
|
||||
def test_prompt_with_only_basic_text(self):
|
||||
"""Ensure basic text still works after the charset change."""
|
||||
basic_prompt = '一只猫在跑步'
|
||||
record = GenerationRecord.objects.create(
|
||||
user=self.user,
|
||||
prompt=basic_prompt,
|
||||
mode='universal',
|
||||
model='seedance_2.0',
|
||||
aspect_ratio='16:9',
|
||||
duration=5,
|
||||
)
|
||||
record.refresh_from_db()
|
||||
self.assertEqual(record.prompt, basic_prompt)
|
||||
|
||||
def test_settings_mysql_charset(self):
|
||||
"""Verify MySQL OPTIONS includes utf8mb4 charset and SET NAMES utf8mb4."""
|
||||
from django.conf import settings
|
||||
# Only check if MySQL config is present (prod uses MySQL, test uses SQLite)
|
||||
db_config = settings.DATABASES.get('default', {})
|
||||
if db_config.get('ENGINE', '').endswith('mysql'):
|
||||
options = db_config.get('OPTIONS', {})
|
||||
self.assertEqual(options.get('charset'), 'utf8mb4')
|
||||
self.assertIn('SET NAMES utf8mb4', options.get('init_command', ''))
|
||||
129
repair_test_bug_66.py
Normal file
129
repair_test_bug_66.py
Normal file
@ -0,0 +1,129 @@
|
||||
"""
|
||||
Verification script for Bug #66: CrashLoopBackOff fix.
|
||||
|
||||
Root cause: Two uncommitted changes caused Django migration drift in the
|
||||
Docker container:
|
||||
1. MODEL_CHOICES labels changed from 'Seedance 2.0' to 'AirDrama' in models.py
|
||||
but migration 0004 (which records this change) was untracked by git.
|
||||
2. Index name='generation__user_id_371350_idx' was added to models.py but not
|
||||
committed — the migration already had this name.
|
||||
|
||||
Without migration 0004 in the Docker image, Django detected model-migration
|
||||
mismatch at startup, causing the pod to enter CrashLoopBackOff.
|
||||
|
||||
Fix: Commit both models.py (with explicit index name) and migration 0004.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
# Ensure we're in the backend directory
|
||||
BACKEND_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
if os.path.basename(BACKEND_DIR) != 'backend':
|
||||
BACKEND_DIR = os.path.join(BACKEND_DIR, 'backend')
|
||||
|
||||
os.chdir(BACKEND_DIR)
|
||||
sys.path.insert(0, BACKEND_DIR)
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
|
||||
|
||||
def test_django_check():
|
||||
"""Verify Django system check passes with no issues."""
|
||||
result = subprocess.run(
|
||||
[sys.executable, 'manage.py', 'check'],
|
||||
capture_output=True, text=True, cwd=BACKEND_DIR,
|
||||
)
|
||||
assert result.returncode == 0, f"Django check failed:\n{result.stderr}"
|
||||
print("PASS: Django system check — no issues found")
|
||||
|
||||
|
||||
def test_no_pending_migrations():
|
||||
"""Verify there are no pending migrations (the root cause of Bug #66)."""
|
||||
result = subprocess.run(
|
||||
[sys.executable, 'manage.py', 'makemigrations', '--check', '--dry-run'],
|
||||
capture_output=True, text=True, cwd=BACKEND_DIR,
|
||||
)
|
||||
assert result.returncode == 0, (
|
||||
f"Pending migrations detected (this was the Bug #66 root cause):\n"
|
||||
f"{result.stdout}\n{result.stderr}"
|
||||
)
|
||||
print("PASS: No pending migrations detected")
|
||||
|
||||
|
||||
def test_index_name_matches_migration():
|
||||
"""Verify the model index name matches what's in the migration file."""
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
from apps.generation.models import GenerationRecord
|
||||
|
||||
meta_indexes = GenerationRecord._meta.indexes
|
||||
assert len(meta_indexes) >= 1, "GenerationRecord should have at least 1 index"
|
||||
|
||||
user_created_index = meta_indexes[0]
|
||||
assert user_created_index.name == 'generation__user_id_371350_idx', (
|
||||
f"Index name mismatch: got '{user_created_index.name}', "
|
||||
f"expected 'generation__user_id_371350_idx'"
|
||||
)
|
||||
print("PASS: Index name matches migration file")
|
||||
|
||||
|
||||
def test_migration_0004_exists():
|
||||
"""Verify migration 0004 for model choice label change exists."""
|
||||
migration_path = os.path.join(
|
||||
BACKEND_DIR, 'apps', 'generation', 'migrations',
|
||||
'0004_alter_generationrecord_model.py'
|
||||
)
|
||||
assert os.path.exists(migration_path), (
|
||||
f"Migration 0004 not found at {migration_path}"
|
||||
)
|
||||
print("PASS: Migration 0004 exists")
|
||||
|
||||
|
||||
def test_model_choices_match_migration():
|
||||
"""Verify MODEL_CHOICES values match what migration 0004 expects."""
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
from apps.generation.models import GenerationRecord
|
||||
|
||||
choices_dict = dict(GenerationRecord.MODEL_CHOICES)
|
||||
assert choices_dict.get('seedance_2.0') == 'AirDrama', (
|
||||
f"Expected 'AirDrama', got {choices_dict.get('seedance_2.0')!r}"
|
||||
)
|
||||
assert choices_dict.get('seedance_2.0_fast') == 'AirDrama Fast', (
|
||||
f"Expected 'AirDrama Fast', got {choices_dict.get('seedance_2.0_fast')!r}"
|
||||
)
|
||||
print("PASS: MODEL_CHOICES labels match migration 0004")
|
||||
|
||||
|
||||
def test_wsgi_loads():
|
||||
"""Verify WSGI application loads (gunicorn entrypoint)."""
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
from config.wsgi import application
|
||||
assert application is not None, "WSGI application failed to load"
|
||||
print("PASS: WSGI application loads successfully")
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
tests = [
|
||||
test_django_check,
|
||||
test_no_pending_migrations,
|
||||
test_index_name_matches_migration,
|
||||
test_migration_0004_exists,
|
||||
test_model_choices_match_migration,
|
||||
test_wsgi_loads,
|
||||
]
|
||||
passed = failed = 0
|
||||
for test in tests:
|
||||
try:
|
||||
test()
|
||||
passed += 1
|
||||
except Exception as e:
|
||||
print(f"FAIL: {test.__name__}: {e}")
|
||||
failed += 1
|
||||
|
||||
print(f"\nResults: {passed} passed, {failed} failed")
|
||||
sys.exit(1 if failed else 0)
|
||||
127
repair_test_bug_67_66.py
Normal file
127
repair_test_bug_67_66.py
Normal file
@ -0,0 +1,127 @@
|
||||
"""
|
||||
Verification script for Bug #67 (DockerBuildError) and Bug #66 (CrashLoopBackOff).
|
||||
|
||||
Bug #67: AdminLayout.tsx (and 3 other files) imported '../assets/logo_32.png'
|
||||
which didn't exist, causing Vite build failure.
|
||||
Fix: Created the missing logo_32.png asset file.
|
||||
|
||||
Bug #66: GenerationRecord model's index lacked an explicit name, causing
|
||||
Django to detect a model-migration mismatch on every container start.
|
||||
Fix: Added name='generation__user_id_371350_idx' to the index, plus
|
||||
created migration 0004 for MODEL_CHOICES display name change.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
||||
BACKEND_DIR = os.path.join(PROJECT_ROOT, 'backend')
|
||||
WEB_DIR = os.path.join(PROJECT_ROOT, 'web')
|
||||
|
||||
|
||||
def test_bug_67_logo_asset_exists():
|
||||
"""Bug #67: Verify logo_32.png asset file exists."""
|
||||
logo_path = os.path.join(WEB_DIR, 'src', 'assets', 'logo_32.png')
|
||||
assert os.path.isfile(logo_path), f"Missing file: {logo_path}"
|
||||
assert os.path.getsize(logo_path) > 0, f"File is empty: {logo_path}"
|
||||
# Verify it's a valid PNG (magic bytes)
|
||||
with open(logo_path, 'rb') as f:
|
||||
header = f.read(8)
|
||||
assert header[:4] == b'\x89PNG', f"Not a valid PNG file: {logo_path}"
|
||||
print("PASS: logo_32.png exists and is a valid PNG")
|
||||
|
||||
|
||||
def test_bug_67_no_missing_imports():
|
||||
"""Bug #67: Verify all files importing logo_32.png can resolve the asset."""
|
||||
files_using_logo = [
|
||||
'src/pages/AdminLayout.tsx',
|
||||
'src/pages/TeamAdminLayout.tsx',
|
||||
'src/components/Sidebar.tsx',
|
||||
'src/components/LoginModal.tsx',
|
||||
]
|
||||
logo_path = os.path.join(WEB_DIR, 'src', 'assets', 'logo_32.png')
|
||||
for f in files_using_logo:
|
||||
full_path = os.path.join(WEB_DIR, f)
|
||||
if not os.path.isfile(full_path):
|
||||
print(f"SKIP: {f} does not exist")
|
||||
continue
|
||||
with open(full_path, 'r') as fh:
|
||||
content = fh.read()
|
||||
if 'logo_32.png' in content:
|
||||
assert os.path.isfile(logo_path), \
|
||||
f"{f} imports logo_32.png but asset doesn't exist"
|
||||
print(f"PASS: {f} imports logo_32.png and asset exists")
|
||||
else:
|
||||
print(f"INFO: {f} no longer imports logo_32.png")
|
||||
|
||||
|
||||
def test_bug_66_no_pending_migrations():
|
||||
"""Bug #66: Verify Django detects no pending migration changes."""
|
||||
result = subprocess.run(
|
||||
[sys.executable, 'manage.py', 'makemigrations', '--check'],
|
||||
capture_output=True, text=True, cwd=BACKEND_DIR
|
||||
)
|
||||
assert result.returncode == 0, \
|
||||
f"Pending migrations detected:\nstdout: {result.stdout}\nstderr: {result.stderr}"
|
||||
print("PASS: No pending migrations detected")
|
||||
|
||||
|
||||
def test_bug_66_index_has_name():
|
||||
"""Bug #66: Verify GenerationRecord index has explicit name."""
|
||||
models_path = os.path.join(BACKEND_DIR, 'apps', 'generation', 'models.py')
|
||||
with open(models_path, 'r') as f:
|
||||
content = f.read()
|
||||
assert "name='generation__user_id_371350_idx'" in content, \
|
||||
"Index name not found in models.py"
|
||||
print("PASS: GenerationRecord index has explicit name")
|
||||
|
||||
|
||||
def test_bug_66_django_check():
|
||||
"""Bug #66: Verify Django system check passes."""
|
||||
result = subprocess.run(
|
||||
[sys.executable, 'manage.py', 'check'],
|
||||
capture_output=True, text=True, cwd=BACKEND_DIR
|
||||
)
|
||||
assert result.returncode == 0, \
|
||||
f"Django check failed:\nstdout: {result.stdout}\nstderr: {result.stderr}"
|
||||
print("PASS: Django system check passed")
|
||||
|
||||
|
||||
def test_bug_66_migration_file_exists():
|
||||
"""Bug #66: Verify migration 0004 exists for MODEL_CHOICES change."""
|
||||
migration_path = os.path.join(
|
||||
BACKEND_DIR, 'apps', 'generation', 'migrations',
|
||||
'0004_alter_generationrecord_model.py'
|
||||
)
|
||||
assert os.path.isfile(migration_path), \
|
||||
f"Migration 0004 not found: {migration_path}"
|
||||
print("PASS: Migration 0004 exists")
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
tests = [
|
||||
test_bug_67_logo_asset_exists,
|
||||
test_bug_67_no_missing_imports,
|
||||
test_bug_66_no_pending_migrations,
|
||||
test_bug_66_index_has_name,
|
||||
test_bug_66_django_check,
|
||||
test_bug_66_migration_file_exists,
|
||||
]
|
||||
failed = 0
|
||||
for test in tests:
|
||||
try:
|
||||
test()
|
||||
except AssertionError as e:
|
||||
print(f"FAIL: {test.__name__}: {e}")
|
||||
failed += 1
|
||||
except Exception as e:
|
||||
print(f"ERROR: {test.__name__}: {e}")
|
||||
failed += 1
|
||||
|
||||
print(f"\n{'='*40}")
|
||||
print(f"Results: {len(tests) - failed}/{len(tests)} passed")
|
||||
if failed:
|
||||
sys.exit(1)
|
||||
else:
|
||||
print("All verification tests passed!")
|
||||
7888
video_auto copy.sql
7888
video_auto copy.sql
File diff suppressed because one or more lines are too long
7888
video_auto.sql
7888
video_auto.sql
File diff suppressed because one or more lines are too long
10642
video_auto4.4prod.sql
10642
video_auto4.4prod.sql
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
# ---- Build Stage ----
|
||||
FROM docker.m.daocloud.io/node:18-alpine AS builder
|
||||
FROM node:18-alpine AS builder
|
||||
|
||||
RUN npm config set registry https://registry.npmmirror.com
|
||||
|
||||
@ -10,7 +10,7 @@ COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# ---- Runtime Stage ----
|
||||
FROM docker.m.daocloud.io/nginx:alpine
|
||||
FROM nginx:alpine
|
||||
|
||||
RUN sed -i 's#dl-cdn.alpinelinux.org#mirrors.aliyun.com#g' /etc/apk/repositories
|
||||
|
||||
|
||||
@ -24,15 +24,14 @@ server {
|
||||
client_max_body_size 50m;
|
||||
}
|
||||
|
||||
# Cache static assets (JS/CSS/images built by Vite into dist/assets/)
|
||||
# Use regex to only match actual files with extensions, not bare /assets path
|
||||
location ~* ^/assets/.+\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|mp4|webm)$ {
|
||||
expires 30d;
|
||||
add_header Cache-Control "public, immutable";
|
||||
}
|
||||
|
||||
# SPA fallback — real files served directly, all other paths return index.html
|
||||
# SPA fallback
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
# Cache static assets
|
||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
|
||||
expires 30d;
|
||||
add_header Cache-Control "public, immutable";
|
||||
}
|
||||
}
|
||||
|
||||
24
web/package-lock.json
generated
24
web/package-lock.json
generated
@ -172,6 +172,7 @@
|
||||
"integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@babel/code-frame": "^7.29.0",
|
||||
"@babel/generator": "^7.29.0",
|
||||
@ -533,6 +534,7 @@
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=20.19.0"
|
||||
},
|
||||
@ -573,6 +575,7 @@
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=20.19.0"
|
||||
}
|
||||
@ -1562,8 +1565,7 @@
|
||||
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
|
||||
"integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/babel__core": {
|
||||
"version": "7.20.5",
|
||||
@ -1665,6 +1667,7 @@
|
||||
"integrity": "sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==",
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@types/prop-types": "*",
|
||||
"csstype": "^3.2.2"
|
||||
@ -1676,6 +1679,7 @@
|
||||
"integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"peerDependencies": {
|
||||
"@types/react": "^18.0.0"
|
||||
}
|
||||
@ -1858,7 +1862,6 @@
|
||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
@ -1869,7 +1872,6 @@
|
||||
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
@ -1969,6 +1971,7 @@
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"baseline-browser-mapping": "^2.9.0",
|
||||
"caniuse-lite": "^1.0.30001759",
|
||||
@ -2228,8 +2231,7 @@
|
||||
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
|
||||
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/dom-helpers": {
|
||||
"version": "5.2.1",
|
||||
@ -2708,6 +2710,7 @@
|
||||
"integrity": "sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@acemir/cssom": "^0.9.31",
|
||||
"@asamuzakjp/dom-selector": "^6.8.1",
|
||||
@ -2803,7 +2806,6 @@
|
||||
"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"lz-string": "bin/bin.js"
|
||||
}
|
||||
@ -2957,6 +2959,7 @@
|
||||
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
@ -3046,7 +3049,6 @@
|
||||
"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"ansi-regex": "^5.0.1",
|
||||
"ansi-styles": "^5.0.0",
|
||||
@ -3061,8 +3063,7 @@
|
||||
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
|
||||
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/prop-types": {
|
||||
"version": "15.8.1",
|
||||
@ -3102,6 +3103,7 @@
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
|
||||
"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"loose-envify": "^1.1.0"
|
||||
},
|
||||
@ -3126,6 +3128,7 @@
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
|
||||
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"scheduler": "^0.23.2"
|
||||
@ -3621,6 +3624,7 @@
|
||||
"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"esbuild": "^0.25.0",
|
||||
"fdir": "^6.4.4",
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
import { defineConfig } from '@playwright/test';
|
||||
|
||||
export default defineConfig({
|
||||
testDir: './test/e2e',
|
||||
timeout: 30000,
|
||||
retries: 0,
|
||||
use: {
|
||||
baseURL: 'https://airflow-studio.test.airlabs.art',
|
||||
headless: true,
|
||||
screenshot: 'only-on-failure',
|
||||
},
|
||||
});
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
@ -13,17 +13,12 @@ import { UsersPage } from './pages/UsersPage';
|
||||
import { RecordsPage } from './pages/RecordsPage';
|
||||
import { SettingsPage } from './pages/SettingsPage';
|
||||
import { AuditLogsPage } from './pages/AuditLogsPage';
|
||||
import { AnomalyLogPage } from './pages/AnomalyLogPage';
|
||||
import { LoginRecordsPage } from './pages/LoginRecordsPage';
|
||||
import { ProfilePage } from './pages/ProfilePage';
|
||||
import { AssetsPage } from './pages/AssetsPage';
|
||||
|
||||
import { TeamAdminLayout } from './pages/TeamAdminLayout';
|
||||
import { TeamDashboardPage } from './pages/TeamDashboardPage';
|
||||
import { TeamMembersPage } from './pages/TeamMembersPage';
|
||||
import { TeamRecordsPage } from './pages/TeamRecordsPage';
|
||||
import { AdminAssetsPage } from './pages/AdminAssetsPage';
|
||||
import { TeamAssetsPage } from './pages/TeamAssetsPage';
|
||||
|
||||
import { useAuthStore } from './store/auth';
|
||||
|
||||
@ -50,7 +45,7 @@ export default function App() {
|
||||
}
|
||||
/>
|
||||
<Route
|
||||
path="/user-assets"
|
||||
path="/assets"
|
||||
element={
|
||||
<ProtectedRoute requireTeamMember>
|
||||
<AssetsPage />
|
||||
@ -80,10 +75,7 @@ export default function App() {
|
||||
<Route path="users" element={<UsersPage />} />
|
||||
<Route path="records" element={<RecordsPage />} />
|
||||
<Route path="settings" element={<SettingsPage />} />
|
||||
<Route path="security" element={<AnomalyLogPage />} />
|
||||
<Route path="login-records" element={<LoginRecordsPage />} />
|
||||
<Route path="logs" element={<AuditLogsPage />} />
|
||||
<Route path="assets" element={<AdminAssetsPage />} />
|
||||
</Route>
|
||||
{/* Team Admin routes */}
|
||||
<Route
|
||||
@ -97,8 +89,6 @@ export default function App() {
|
||||
<Route index element={<Navigate to="/team/dashboard" replace />} />
|
||||
<Route path="dashboard" element={<TeamDashboardPage />} />
|
||||
<Route path="members" element={<TeamMembersPage />} />
|
||||
<Route path="records" element={<TeamRecordsPage />} />
|
||||
<Route path="assets" element={<TeamAssetsPage />} />
|
||||
</Route>
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 181 KiB |
@ -1,86 +0,0 @@
|
||||
.overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 300;
|
||||
}
|
||||
|
||||
.modal {
|
||||
background: #16161e;
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: var(--radius-card);
|
||||
max-width: 520px;
|
||||
width: 90vw;
|
||||
max-height: 75vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 20px 32px 12px;
|
||||
flex-shrink: 0;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.closeBtn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--color-text-secondary);
|
||||
cursor: pointer;
|
||||
padding: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
transition: color 0.15s;
|
||||
}
|
||||
|
||||
.closeBtn:hover {
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.content {
|
||||
font-size: 14px;
|
||||
line-height: 1.8;
|
||||
color: var(--color-text-primary);
|
||||
word-break: break-word;
|
||||
padding: 16px 40px;
|
||||
overflow-y: auto;
|
||||
scrollbar-width: none;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.content::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
padding: 16px 0 20px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.confirmBtn {
|
||||
padding: 8px 32px;
|
||||
background: var(--color-primary);
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
transition: opacity 0.15s;
|
||||
}
|
||||
|
||||
.confirmBtn:hover {
|
||||
opacity: 0.85;
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
import { useEffect, useState, useCallback } from 'react';
|
||||
import { videoApi } from '../lib/api';
|
||||
import styles from './AnnouncementModal.module.css';
|
||||
|
||||
interface Props {
|
||||
/** If true, force show even if already read (for manual open) */
|
||||
forceOpen?: boolean;
|
||||
onClose?: () => void;
|
||||
}
|
||||
|
||||
export function AnnouncementModal({ forceOpen, onClose }: Props) {
|
||||
const [content, setContent] = useState('');
|
||||
const [visible, setVisible] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
videoApi.getAnnouncement().then(({ data }) => {
|
||||
if (data.enabled && data.announcement) {
|
||||
setContent(data.announcement);
|
||||
if (forceOpen || !data.is_read) {
|
||||
setVisible(true);
|
||||
}
|
||||
}
|
||||
}).catch(() => {});
|
||||
}, [forceOpen]);
|
||||
|
||||
const handleClose = useCallback(() => {
|
||||
videoApi.readAnnouncement().catch(() => {});
|
||||
setVisible(false);
|
||||
onClose?.();
|
||||
}, [onClose]);
|
||||
|
||||
if (!visible || !content) return null;
|
||||
|
||||
return (
|
||||
<div className={styles.overlay} onMouseDown={(e) => { if (e.target === e.currentTarget) handleClose(); }}>
|
||||
<div className={styles.modal}>
|
||||
<div className={styles.header}>
|
||||
<span className={styles.title}>公告</span>
|
||||
<button className={styles.closeBtn} onClick={handleClose}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
|
||||
<line x1="18" y1="6" x2="6" y2="18" />
|
||||
<line x1="6" y1="6" x2="18" y2="18" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div
|
||||
className={styles.content}
|
||||
dangerouslySetInnerHTML={{ __html: `<style>li{margin-left:16px}</style>${content}` }}
|
||||
/>
|
||||
<div className={styles.footer}>
|
||||
<button className={styles.confirmBtn} onClick={handleClose}>
|
||||
我知道了
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@ -1,442 +0,0 @@
|
||||
.overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 300;
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.modal {
|
||||
width: 90vw;
|
||||
max-width: 1400px;
|
||||
height: 85vh;
|
||||
background: #16161e;
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 20px 24px 16px;
|
||||
border-bottom: 1px solid var(--color-border-card);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.headerLeft {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.backBtn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--color-text-secondary);
|
||||
cursor: pointer;
|
||||
padding: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
transition: color 0.15s;
|
||||
}
|
||||
|
||||
.backBtn:hover {
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.closeBtn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--color-text-secondary);
|
||||
cursor: pointer;
|
||||
padding: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
transition: color 0.15s;
|
||||
}
|
||||
|
||||
.closeBtn:hover {
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.body {
|
||||
padding: 20px 24px;
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.actionBtn {
|
||||
padding: 6px 14px;
|
||||
background: var(--color-primary);
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
color: #fff;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: filter 0.15s;
|
||||
}
|
||||
|
||||
.actionBtn:hover {
|
||||
filter: brightness(1.15);
|
||||
}
|
||||
|
||||
.actionBtnOutline {
|
||||
padding: 6px 14px;
|
||||
background: transparent;
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 8px;
|
||||
color: var(--color-text-secondary);
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: all 0.15s;
|
||||
}
|
||||
|
||||
.actionBtnOutline:hover {
|
||||
background: var(--color-bg-hover);
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.card {
|
||||
background: var(--color-bg-card);
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.15s, transform 0.15s;
|
||||
}
|
||||
|
||||
.card:hover {
|
||||
border-color: var(--color-primary);
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.cardThumb {
|
||||
width: 100%;
|
||||
height: 120px;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
background: #1a1a2e;
|
||||
}
|
||||
|
||||
.cardInfo {
|
||||
padding: 10px 12px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.cardName {
|
||||
flex: 1;
|
||||
font-size: 13px;
|
||||
color: var(--color-text-primary);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.editBtn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--color-text-secondary);
|
||||
cursor: pointer;
|
||||
padding: 2px;
|
||||
font-size: 12px;
|
||||
flex-shrink: 0;
|
||||
transition: color 0.15s;
|
||||
}
|
||||
|
||||
.editBtn:hover {
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.inlineEditWrap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.inlineInput {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
padding: 2px 6px;
|
||||
background: rgba(255, 255, 255, 0.08);
|
||||
border: 1px solid var(--color-primary);
|
||||
border-radius: 4px;
|
||||
color: var(--color-text-primary);
|
||||
font-size: 13px;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
/* Detail view - asset cards */
|
||||
.assetGrid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.assetCard {
|
||||
position: relative;
|
||||
background: var(--color-bg-card);
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.assetDeleteBtn {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.assetCard:hover .assetDeleteBtn {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.addAssetCard {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 6px;
|
||||
border: 1.5px dashed #3a3a48;
|
||||
border-radius: 12px;
|
||||
cursor: pointer;
|
||||
color: var(--color-text-disabled);
|
||||
font-size: 12px;
|
||||
transition: all 0.2s;
|
||||
background: transparent;
|
||||
/* match assetThumb height + assetInfo height */
|
||||
min-height: 180px;
|
||||
}
|
||||
|
||||
.addAssetCard:hover {
|
||||
border-color: var(--color-primary);
|
||||
color: var(--color-primary);
|
||||
background: rgba(108, 99, 255, 0.04);
|
||||
}
|
||||
|
||||
.assetThumb {
|
||||
width: 100%;
|
||||
height: 140px;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
background: #1a1a2e;
|
||||
}
|
||||
|
||||
.assetInfo {
|
||||
padding: 10px 12px;
|
||||
}
|
||||
|
||||
.assetName {
|
||||
font-size: 13px;
|
||||
color: var(--color-text-primary);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.statusBadge {
|
||||
display: inline-block;
|
||||
font-size: 11px;
|
||||
padding: 1px 6px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.statusActive {
|
||||
color: var(--color-success);
|
||||
background: rgba(0, 184, 148, 0.12);
|
||||
}
|
||||
|
||||
.statusProcessing {
|
||||
color: var(--color-warning);
|
||||
background: rgba(243, 156, 18, 0.12);
|
||||
}
|
||||
|
||||
.statusFailed {
|
||||
color: var(--color-danger);
|
||||
background: rgba(231, 76, 60, 0.12);
|
||||
}
|
||||
|
||||
/* Upload view */
|
||||
.uploadForm {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
max-width: 560px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.inputLabel {
|
||||
font-size: 13px;
|
||||
color: var(--color-text-secondary);
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.textInput {
|
||||
width: 100%;
|
||||
padding: 10px 14px;
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 8px;
|
||||
color: var(--color-text-primary);
|
||||
font-size: 14px;
|
||||
outline: none;
|
||||
transition: border-color 0.15s;
|
||||
}
|
||||
|
||||
.textInput:focus {
|
||||
border-color: var(--color-primary);
|
||||
}
|
||||
|
||||
.dropZone {
|
||||
border: 2px dashed var(--color-border-card);
|
||||
border-radius: 12px;
|
||||
padding: 40px 24px;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.15s, background 0.15s;
|
||||
}
|
||||
|
||||
.dropZone:hover {
|
||||
border-color: var(--color-primary);
|
||||
background: rgba(108, 99, 255, 0.04);
|
||||
}
|
||||
|
||||
.dropZoneActive {
|
||||
border-color: var(--color-primary);
|
||||
background: rgba(108, 99, 255, 0.08);
|
||||
}
|
||||
|
||||
.dropZoneText {
|
||||
font-size: 14px;
|
||||
color: var(--color-text-secondary);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.dropZoneHint {
|
||||
font-size: 12px;
|
||||
color: var(--color-text-disabled);
|
||||
}
|
||||
|
||||
.dropZoneWarning {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #ff4d4f;
|
||||
margin-top: 12px;
|
||||
padding: 8px 12px;
|
||||
background: rgba(255, 77, 79, 0.08);
|
||||
border: 1px solid rgba(255, 77, 79, 0.25);
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.dropZonePreview {
|
||||
max-width: 200px;
|
||||
max-height: 160px;
|
||||
object-fit: contain;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
padding: 10px 0;
|
||||
background: var(--color-primary);
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
transition: filter 0.15s;
|
||||
}
|
||||
|
||||
.submitBtn:hover {
|
||||
filter: brightness(1.15);
|
||||
}
|
||||
|
||||
.submitBtn:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.pageBtn {
|
||||
padding: 6px 12px;
|
||||
background: transparent;
|
||||
border: 1px solid var(--color-border-card);
|
||||
border-radius: 6px;
|
||||
color: var(--color-text-secondary);
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: all 0.15s;
|
||||
}
|
||||
|
||||
.pageBtn:hover {
|
||||
background: var(--color-bg-hover);
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.pageBtn:disabled {
|
||||
opacity: 0.4;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.pageInfo {
|
||||
font-size: 13px;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
|
||||
.empty {
|
||||
text-align: center;
|
||||
padding: 40px 0;
|
||||
color: var(--color-text-secondary);
|
||||
font-size: 14px;
|
||||
}
|
||||
@ -1,562 +0,0 @@
|
||||
import { useState, useEffect, useCallback } from 'react';
|
||||
import { useAssetLibraryStore } from '../store/assetLibrary';
|
||||
import { assetsApi, tosThumb } from '../lib/api';
|
||||
import { showToast } from './Toast';
|
||||
import { ImageLightbox } from './ImageLightbox';
|
||||
import type { AssetGroup, AssetItem } from '../types';
|
||||
import styles from './AssetLibraryModal.module.css';
|
||||
|
||||
/** Validate asset file before upload. Returns error message or null if valid. */
|
||||
async function validateAssetFile(file: File): Promise<string | null> {
|
||||
const ct = file.type || '';
|
||||
|
||||
if (ct.startsWith('image/')) {
|
||||
// Format: accept all image/* since backend checks ext
|
||||
if (file.size > 30 * 1024 * 1024) return '图片文件不能超过 30MB';
|
||||
// Dimension check
|
||||
try {
|
||||
const dims = await new Promise<{ w: number; h: number }>((resolve, reject) => {
|
||||
const img = new Image();
|
||||
const url = URL.createObjectURL(file);
|
||||
img.onload = () => { resolve({ w: img.naturalWidth, h: img.naturalHeight }); URL.revokeObjectURL(url); };
|
||||
img.onerror = () => { reject(); URL.revokeObjectURL(url); };
|
||||
img.src = url;
|
||||
});
|
||||
if (dims.w <= 300 || dims.h <= 300) return `图片尺寸过小(${dims.w}×${dims.h}),宽高需在 300~6000 像素之间`;
|
||||
if (dims.w >= 6000 || dims.h >= 6000) return `图片尺寸过大(${dims.w}×${dims.h}),宽高需在 300~6000 像素之间`;
|
||||
const ratio = dims.w / dims.h;
|
||||
if (ratio <= 0.4 || ratio >= 2.5) return `图片比例不支持(${dims.w}×${dims.h}),宽高比需在 0.4~2.5 之间`;
|
||||
} catch {
|
||||
// Can't read dimensions (e.g. HEIC), skip — backend will validate
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
if (ct.startsWith('video/')) {
|
||||
if (ct !== 'video/mp4' && ct !== 'video/quicktime') return '仅支持 MP4 和 MOV 格式的视频';
|
||||
if (file.size > 50 * 1024 * 1024) return '视频文件不能超过 50MB';
|
||||
// Duration + dimension check
|
||||
try {
|
||||
const info = await new Promise<{ dur: number; w: number; h: number }>((resolve, reject) => {
|
||||
const vid = document.createElement('video');
|
||||
const url = URL.createObjectURL(file);
|
||||
const timeout = setTimeout(() => { reject(); URL.revokeObjectURL(url); }, 10000);
|
||||
vid.addEventListener('loadedmetadata', () => {
|
||||
clearTimeout(timeout);
|
||||
resolve({ dur: vid.duration, w: vid.videoWidth, h: vid.videoHeight });
|
||||
URL.revokeObjectURL(url);
|
||||
});
|
||||
vid.addEventListener('error', () => { clearTimeout(timeout); reject(); URL.revokeObjectURL(url); });
|
||||
vid.src = url;
|
||||
});
|
||||
if (info.dur < 2 || info.dur > 15.4) return `视频时长需在 2~15 秒之间(当前 ${info.dur.toFixed(1)} 秒)`;
|
||||
if (info.w < 300 || info.h < 300) return `视频尺寸过小(${info.w}×${info.h}),宽高需在 300~6000 像素之间`;
|
||||
if (info.w > 6000 || info.h > 6000) return `视频尺寸过大(${info.w}×${info.h}),宽高需在 300~6000 像素之间`;
|
||||
const ratio = info.w / info.h;
|
||||
if (ratio < 0.4 || ratio > 2.5) return `视频比例不支持(${info.w}×${info.h}),宽高比需在 0.4~2.5 之间`;
|
||||
const pixels = info.w * info.h;
|
||||
if (pixels < 409600) return `视频像素过低(${info.w}×${info.h}=${pixels.toLocaleString()}),需在 409,600~927,408 之间`;
|
||||
if (pixels > 927408) return `视频像素过高(${info.w}×${info.h}=${pixels.toLocaleString()}),需在 409,600~927,408 之间`;
|
||||
} catch {
|
||||
// Can't read metadata, skip — backend will validate
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
if (ct.startsWith('audio/')) {
|
||||
if (ct !== 'audio/mpeg' && ct !== 'audio/wav') return '仅支持 MP3 和 WAV 格式的音频';
|
||||
if (file.size > 15 * 1024 * 1024) return '音频文件不能超过 15MB';
|
||||
// Duration check
|
||||
try {
|
||||
const dur = await new Promise<number>((resolve, reject) => {
|
||||
const audio = new Audio();
|
||||
const url = URL.createObjectURL(file);
|
||||
const timeout = setTimeout(() => { reject(); URL.revokeObjectURL(url); }, 10000);
|
||||
audio.addEventListener('loadedmetadata', () => {
|
||||
clearTimeout(timeout);
|
||||
resolve(audio.duration);
|
||||
URL.revokeObjectURL(url);
|
||||
});
|
||||
audio.addEventListener('error', () => { clearTimeout(timeout); reject(); URL.revokeObjectURL(url); });
|
||||
audio.src = url;
|
||||
});
|
||||
if (dur < 2 || dur > 15.4) return `音频时长需在 2~15 秒之间(当前 ${dur.toFixed(1)} 秒)`;
|
||||
} catch {
|
||||
// Can't read metadata, skip
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
return '不支持的文件类型';
|
||||
}
|
||||
|
||||
interface Props {
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function AssetLibraryModal({ open, onClose }: Props) {
|
||||
const [view, setView] = useState<'list' | 'detail' | 'upload'>('list');
|
||||
const [selectedGroup, setSelectedGroup] = useState<AssetGroup | null>(null);
|
||||
const [groupAssets, setGroupAssets] = useState<AssetItem[]>([]);
|
||||
const [newName, setNewName] = useState('');
|
||||
const [uploading, setUploading] = useState(false);
|
||||
const [editingName, setEditingName] = useState<{ id: number; value: string } | null>(null);
|
||||
const [lightboxSrc, setLightboxSrc] = useState<string | null>(null);
|
||||
|
||||
const groups = useAssetLibraryStore((s) => s.groups);
|
||||
const loading = useAssetLibraryStore((s) => s.loading);
|
||||
const total = useAssetLibraryStore((s) => s.total);
|
||||
const page = useAssetLibraryStore((s) => s.page);
|
||||
const loadGroups = useAssetLibraryStore((s) => s.loadGroups);
|
||||
const createGroup = useAssetLibraryStore((s) => s.createGroup);
|
||||
|
||||
const totalPages = Math.ceil(total / 20);
|
||||
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
loadGroups(1);
|
||||
setView('list');
|
||||
setSelectedGroup(null);
|
||||
}
|
||||
}, [open, loadGroups]);
|
||||
|
||||
const handleGroupClick = useCallback(async (group: AssetGroup) => {
|
||||
setSelectedGroup(group);
|
||||
try {
|
||||
const { data } = await assetsApi.getGroupDetail(group.id);
|
||||
const assets: AssetItem[] = data.assets || [];
|
||||
setGroupAssets(assets);
|
||||
// 对所有素材检查一次云端状态(处理中的更新状态,被删的清理掉)
|
||||
let needRefresh = false;
|
||||
const checks = assets.map((asset) =>
|
||||
assetsApi.pollStatus(asset.id).then(({ data: statusData }) => {
|
||||
if (statusData.status !== asset.status || statusData.status as string === 'deleted') {
|
||||
needRefresh = true;
|
||||
}
|
||||
}).catch(() => {})
|
||||
);
|
||||
Promise.all(checks).then(() => {
|
||||
if (needRefresh) {
|
||||
assetsApi.getGroupDetail(group.id).then(({ data: refreshed }) => {
|
||||
setGroupAssets(refreshed.assets || []);
|
||||
}).catch(() => {});
|
||||
}
|
||||
});
|
||||
} catch {
|
||||
setGroupAssets([]);
|
||||
}
|
||||
setView('detail');
|
||||
}, []);
|
||||
|
||||
const handleBackToList = useCallback(() => {
|
||||
setView('list');
|
||||
setSelectedGroup(null);
|
||||
setGroupAssets([]);
|
||||
setEditingName(null);
|
||||
loadGroups(page);
|
||||
}, [loadGroups, page]);
|
||||
|
||||
const handleRenameGroup = useCallback(async (id: number, name: string) => {
|
||||
try {
|
||||
await assetsApi.updateGroup(id, { name });
|
||||
showToast('重命名成功');
|
||||
setEditingName(null);
|
||||
loadGroups(page);
|
||||
if (selectedGroup && selectedGroup.id === id) {
|
||||
setSelectedGroup({ ...selectedGroup, name });
|
||||
}
|
||||
} catch {
|
||||
showToast('重命名失败');
|
||||
}
|
||||
}, [loadGroups, page, selectedGroup]);
|
||||
|
||||
const handleUploadSubmit = useCallback(async () => {
|
||||
const trimmed = newName.trim();
|
||||
if (!trimmed) return;
|
||||
if (trimmed.length > 64) { showToast('角色名称不能超过64个字符'); return; }
|
||||
if (trimmed.includes('&&')) { showToast('角色名称不能包含 &&'); return; }
|
||||
setUploading(true);
|
||||
const result = await createGroup(trimmed, null);
|
||||
setUploading(false);
|
||||
if (result) {
|
||||
setNewName('');
|
||||
// 创建成功后直接进入详情页
|
||||
const group: AssetGroup = { id: result.id, name: trimmed, thumbnail_url: '', asset_count: 0, remote_group_id: result.remote_group_id || '', description: '', created_at: new Date().toISOString() };
|
||||
setSelectedGroup(group);
|
||||
setGroupAssets([]);
|
||||
setView('detail');
|
||||
loadGroups(page);
|
||||
}
|
||||
}, [newName, createGroup, loadGroups, page]);
|
||||
|
||||
const refreshGroupDetail = useCallback(async () => {
|
||||
if (!selectedGroup) return;
|
||||
try {
|
||||
const { data } = await assetsApi.getGroupDetail(selectedGroup.id);
|
||||
setGroupAssets(data.assets || []);
|
||||
} catch { /* ignore */ }
|
||||
}, [selectedGroup]);
|
||||
|
||||
const handleAddAsset = useCallback(async (file: File) => {
|
||||
if (!selectedGroup) return;
|
||||
const error = await validateAssetFile(file);
|
||||
if (error) { showToast(error); return; }
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
try {
|
||||
const { data } = await assetsApi.addAsset(selectedGroup.id, formData);
|
||||
setGroupAssets((prev) => [...prev, data]);
|
||||
// 轮询状态,完成后刷新详情
|
||||
const pollId = data.id;
|
||||
const pollInterval = setInterval(async () => {
|
||||
try {
|
||||
const { data: statusData } = await assetsApi.pollStatus(pollId);
|
||||
if (statusData.status !== 'processing') {
|
||||
clearInterval(pollInterval);
|
||||
if (statusData.status === 'active') showToast('素材已就绪');
|
||||
else if (statusData.status === 'deleted') showToast('素材在云端已被删除');
|
||||
else showToast('素材处理失败');
|
||||
refreshGroupDetail();
|
||||
}
|
||||
} catch {
|
||||
clearInterval(pollInterval);
|
||||
}
|
||||
}, 3000);
|
||||
const typeLabel = file.type.startsWith('video/') ? '视频' : file.type.startsWith('audio/') ? '音频' : '图片';
|
||||
showToast(`${typeLabel}已上传,处理中...`);
|
||||
} catch {
|
||||
showToast('上传失败,请重试');
|
||||
}
|
||||
}, [selectedGroup, refreshGroupDetail]);
|
||||
|
||||
if (!open) return null;
|
||||
|
||||
return (
|
||||
<div className={styles.overlay} onMouseDown={(e) => { if (e.target === e.currentTarget) onClose(); }}>
|
||||
<div className={styles.modal}>
|
||||
{/* Header */}
|
||||
<div className={styles.header}>
|
||||
<div className={styles.headerLeft}>
|
||||
{view !== 'list' && (
|
||||
<button className={styles.backBtn} onClick={handleBackToList}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
|
||||
<polyline points="15 18 9 12 15 6" />
|
||||
</svg>
|
||||
</button>
|
||||
)}
|
||||
<span className={styles.title}>
|
||||
{view === 'list' && '人物素材库'}
|
||||
{view === 'detail' && (selectedGroup?.name || '角色详情')}
|
||||
{view === 'upload' && '上传新角色'}
|
||||
</span>
|
||||
</div>
|
||||
<button className={styles.closeBtn} onClick={onClose}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
|
||||
<line x1="18" y1="6" x2="6" y2="18" />
|
||||
<line x1="6" y1="6" x2="18" y2="18" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Body */}
|
||||
<div className={styles.body}>
|
||||
{/* List View */}
|
||||
{view === 'list' && (
|
||||
<>
|
||||
<div className={styles.actions}>
|
||||
<button className={styles.actionBtn} onClick={() => setView('upload')}>
|
||||
+ 上传新角色
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{loading ? (
|
||||
<div className={styles.empty}>加载中...</div>
|
||||
) : groups.length === 0 ? (
|
||||
<div className={styles.empty}>暂无素材,点击上方按钮上传</div>
|
||||
) : (
|
||||
<div className={styles.grid}>
|
||||
{groups.map((group) => (
|
||||
<div key={group.id} className={styles.card} onClick={() => handleGroupClick(group)}>
|
||||
{group.asset_count === 0 ? (
|
||||
<div className={styles.cardThumb} style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', color: 'var(--color-text-disabled)', fontSize: 12 }}>暂无素材</div>
|
||||
) : (
|
||||
<img src={tosThumb(group.thumbnail_url, 300)} alt={group.name} className={styles.cardThumb} />
|
||||
)}
|
||||
<div className={styles.cardInfo}>
|
||||
{editingName && editingName.id === group.id ? (
|
||||
<div className={styles.inlineEditWrap} onClick={(e) => e.stopPropagation()}>
|
||||
<input
|
||||
className={styles.inlineInput}
|
||||
value={editingName.value}
|
||||
onChange={(e) => setEditingName({ ...editingName, value: e.target.value })}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') handleRenameGroup(group.id, editingName.value);
|
||||
if (e.key === 'Escape') setEditingName(null);
|
||||
}}
|
||||
autoFocus
|
||||
/>
|
||||
<button
|
||||
className={styles.editBtn}
|
||||
onClick={() => handleRenameGroup(group.id, editingName.value)}
|
||||
style={{ fontSize: 12, padding: '4px 10px', whiteSpace: 'nowrap' }}
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
<button
|
||||
className={styles.editBtn}
|
||||
onClick={() => setEditingName(null)}
|
||||
style={{ fontSize: 12, padding: '4px 10px', whiteSpace: 'nowrap' }}
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<span className={styles.cardName}>{group.name}</span>
|
||||
<button
|
||||
className={styles.editBtn}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setEditingName({ id: group.id, value: group.name });
|
||||
}}
|
||||
>
|
||||
✎
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{totalPages > 1 && (
|
||||
<div className={styles.pagination}>
|
||||
<button
|
||||
className={styles.pageBtn}
|
||||
disabled={page <= 1}
|
||||
onClick={() => loadGroups(page - 1)}
|
||||
>
|
||||
上一页
|
||||
</button>
|
||||
<span className={styles.pageInfo}>{page} / {totalPages}</span>
|
||||
<button
|
||||
className={styles.pageBtn}
|
||||
disabled={page >= totalPages}
|
||||
onClick={() => loadGroups(page + 1)}
|
||||
>
|
||||
下一页
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* Detail View */}
|
||||
{view === 'detail' && selectedGroup && (
|
||||
<>
|
||||
<div className={styles.actions}>
|
||||
<button
|
||||
className={styles.actionBtnOutline}
|
||||
onClick={() => setEditingName({ id: selectedGroup.id, value: selectedGroup.name })}
|
||||
>
|
||||
✎ 改名
|
||||
</button>
|
||||
<button
|
||||
className={styles.actionBtnOutline}
|
||||
style={{ color: '#ef4444', borderColor: '#ef4444' }}
|
||||
onClick={() => {
|
||||
if (confirm('确认删除整个素材组?组内所有素材将被删除,此操作不可撤销。')) {
|
||||
assetsApi.deleteGroup(selectedGroup.id).then(() => {
|
||||
showToast('素材组已删除');
|
||||
handleBackToList();
|
||||
}).catch(() => showToast('删除失败,请重试'));
|
||||
}
|
||||
}}
|
||||
>
|
||||
删除素材组
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{editingName && editingName.id === selectedGroup.id && (
|
||||
<div style={{ display: 'flex', gap: 8, marginBottom: 16, alignItems: 'center' }}>
|
||||
<input
|
||||
className={styles.textInput}
|
||||
style={{ flex: 1 }}
|
||||
value={editingName.value}
|
||||
onChange={(e) => setEditingName({ ...editingName, value: e.target.value })}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') handleRenameGroup(selectedGroup.id, editingName.value);
|
||||
if (e.key === 'Escape') setEditingName(null);
|
||||
}}
|
||||
autoFocus
|
||||
/>
|
||||
<button
|
||||
className={styles.actionBtn}
|
||||
onClick={() => handleRenameGroup(selectedGroup.id, editingName.value)}
|
||||
style={{ fontSize: 12, padding: '4px 10px', whiteSpace: 'nowrap' }}
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
<button
|
||||
className={styles.actionBtnOutline}
|
||||
onClick={() => setEditingName(null)}
|
||||
style={{ fontSize: 12, padding: '4px 10px', whiteSpace: 'nowrap' }}
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ── 按类型分区显示 ── */}
|
||||
{(['Image', 'Video', 'Audio'] as const).map((assetType) => {
|
||||
const typeAssets = groupAssets.filter((a) => (a.asset_type || 'Image') === assetType);
|
||||
const typeLabel = assetType === 'Image' ? '肖像(图片)' : assetType === 'Video' ? '视频' : '音频';
|
||||
const acceptMap = { Image: 'image/*', Video: 'video/mp4,video/quicktime', Audio: 'audio/mpeg,audio/wav' };
|
||||
const hintMap = {
|
||||
Image: '支持 JPG、PNG、WEBP、HEIC,单张不超过 30MB',
|
||||
Video: '支持 MP4、MOV,单个不超过 50MB',
|
||||
Audio: '支持 MP3、WAV,单个不超过 15MB',
|
||||
};
|
||||
const warningMap = {
|
||||
Image: '⚠️ 宽高 300~6000 像素,宽高比 0.4~2.5',
|
||||
Video: '⚠️ 时长 2~15 秒,宽高 300~6000 像素,帧率 24~60 FPS',
|
||||
Audio: '⚠️ 时长 2~15 秒',
|
||||
};
|
||||
return (
|
||||
<div key={assetType} style={{ marginBottom: 20 }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 4 }}>
|
||||
<span style={{ fontSize: 13, fontWeight: 600, color: 'var(--color-text-primary)' }}>{typeLabel}</span>
|
||||
</div>
|
||||
<div style={{ fontSize: 11, color: 'var(--color-text-disabled)', marginBottom: 2 }}>{hintMap[assetType]}</div>
|
||||
<div style={{ fontSize: 11, color: '#e8952e', marginBottom: 8 }}>{warningMap[assetType]}</div>
|
||||
<div className={styles.assetGrid}>
|
||||
{typeAssets.map((asset) => (
|
||||
<div key={asset.id} className={styles.assetCard}>
|
||||
{assetType === 'Video' ? (
|
||||
<img src={tosThumb(asset.thumbnail_url || asset.url, 300)} alt={asset.name} className={styles.assetThumb} />
|
||||
) : assetType === 'Audio' ? (
|
||||
<div className={styles.assetThumb} style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', fontSize: 32, background: '#1a1a2e' }}>♫</div>
|
||||
) : (
|
||||
<img
|
||||
src={tosThumb(asset.url, 300)}
|
||||
alt={asset.name}
|
||||
className={styles.assetThumb}
|
||||
style={{ cursor: 'zoom-in' }}
|
||||
onClick={() => setLightboxSrc(asset.url)}
|
||||
/>
|
||||
)}
|
||||
<button
|
||||
className={styles.assetDeleteBtn}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
if (confirm('确认删除此素材?删除后无法恢复。')) {
|
||||
assetsApi.deleteAsset(asset.id).then(() => {
|
||||
showToast('素材已删除');
|
||||
if (selectedGroup) {
|
||||
assetsApi.getGroupDetail(selectedGroup.id).then(({ data }) => {
|
||||
setGroupAssets(data.assets || []);
|
||||
});
|
||||
}
|
||||
loadGroups(page);
|
||||
}).catch(() => showToast('删除失败,请重试'));
|
||||
}
|
||||
}}
|
||||
title="删除素材"
|
||||
>×</button>
|
||||
<div className={styles.assetInfo}>
|
||||
<div className={styles.assetName}>{asset.name}</div>
|
||||
<span
|
||||
className={`${styles.statusBadge} ${
|
||||
asset.status === 'active' ? styles.statusActive
|
||||
: asset.status === 'processing' ? styles.statusProcessing
|
||||
: styles.statusFailed
|
||||
}`}
|
||||
title={asset.status === 'failed' ? (asset.error_message || '素材处理失败,请删除后重新上传') : undefined}
|
||||
>
|
||||
{asset.status === 'active' && '可用'}
|
||||
{asset.status === 'processing' && '处理中'}
|
||||
{asset.status === 'failed' && '失败'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
{/* 拖拽上传卡片 — 和素材卡片同大小,始终在最后 */}
|
||||
<label
|
||||
className={styles.addAssetCard}
|
||||
onDragOver={(e) => e.preventDefault()}
|
||||
onDrop={(e) => {
|
||||
e.preventDefault();
|
||||
const file = e.dataTransfer.files[0];
|
||||
if (!file) return;
|
||||
// 检查文件类型是否匹配当前分区
|
||||
const ft = file.type || '';
|
||||
const matchesSection =
|
||||
(assetType === 'Image' && ft.startsWith('image/')) ||
|
||||
(assetType === 'Video' && ft.startsWith('video/')) ||
|
||||
(assetType === 'Audio' && ft.startsWith('audio/'));
|
||||
if (!matchesSection) {
|
||||
const expected = assetType === 'Image' ? '图片' : assetType === 'Video' ? '视频' : '音频';
|
||||
showToast(`请将${expected}文件拖到此区域`);
|
||||
return;
|
||||
}
|
||||
handleAddAsset(file);
|
||||
}}
|
||||
>
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round">
|
||||
<line x1="12" y1="5" x2="12" y2="19" />
|
||||
<line x1="5" y1="12" x2="19" y2="12" />
|
||||
</svg>
|
||||
<span>上传</span>
|
||||
<input
|
||||
type="file"
|
||||
accept={acceptMap[assetType]}
|
||||
style={{ display: 'none' }}
|
||||
onChange={(e) => {
|
||||
const file = e.target.files?.[0];
|
||||
if (file) handleAddAsset(file);
|
||||
e.target.value = '';
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* Upload View — only name, no file */}
|
||||
{view === 'upload' && (
|
||||
<div className={styles.uploadForm}>
|
||||
<div>
|
||||
<div className={styles.inputLabel}>角色名称</div>
|
||||
<input
|
||||
className={styles.textInput}
|
||||
placeholder="请输入角色名称,如:林峰"
|
||||
maxLength={64}
|
||||
value={newName}
|
||||
onChange={(e) => setNewName(e.target.value)}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter') handleUploadSubmit(); }}
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
<div style={{ fontSize: 12, color: 'var(--color-text-disabled)', marginTop: 4 }}>
|
||||
创建后可在详情页上传图片、视频、音频素材
|
||||
</div>
|
||||
<button
|
||||
className={styles.submitBtn}
|
||||
disabled={!newName.trim() || uploading}
|
||||
onClick={handleUploadSubmit}
|
||||
>
|
||||
{uploading ? '创建中...' : '创建角色'}
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<ImageLightbox src={lightboxSrc} onClose={() => setLightboxSrc(null)} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@ -1,147 +0,0 @@
|
||||
.overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 60;
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
animation: overlayIn 0.3s ease-out;
|
||||
}
|
||||
|
||||
@keyframes overlayIn {
|
||||
from { opacity: 0; }
|
||||
to { opacity: 1; }
|
||||
}
|
||||
|
||||
.panel {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
max-width: 420px;
|
||||
margin: 0 20px;
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
backdrop-filter: blur(24px) saturate(180%);
|
||||
-webkit-backdrop-filter: blur(24px) saturate(180%);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 16px;
|
||||
padding: 36px 32px 32px;
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(255, 255, 255, 0.05) inset;
|
||||
animation: panelIn 0.3s ease-out;
|
||||
}
|
||||
|
||||
@keyframes panelIn {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(20px);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.headerLogo {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
.headerTitle {
|
||||
font-family: 'Space Grotesk', sans-serif;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
color: #f1f0ff;
|
||||
letter-spacing: 0.05em;
|
||||
}
|
||||
|
||||
.notice {
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
color: #8b8ea8;
|
||||
margin-bottom: 24px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 18px;
|
||||
}
|
||||
|
||||
.field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 13px;
|
||||
color: #8b8ea8;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.input {
|
||||
height: 44px;
|
||||
padding: 0 14px;
|
||||
background: rgba(255, 255, 255, 0.04);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 10px;
|
||||
color: #f1f0ff;
|
||||
font-size: 14px;
|
||||
outline: none;
|
||||
transition: border-color 0.2s;
|
||||
}
|
||||
|
||||
.input::placeholder {
|
||||
color: #4c4f6b;
|
||||
}
|
||||
|
||||
.input:focus {
|
||||
border-color: rgba(126, 220, 200, 0.5);
|
||||
}
|
||||
|
||||
.error {
|
||||
color: #ff4d4f;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
padding: 8px;
|
||||
background: rgba(255, 77, 79, 0.08);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
height: 44px;
|
||||
width: 55%;
|
||||
align-self: center;
|
||||
margin-top: 18px;
|
||||
background: rgba(120, 220, 200, 0.08);
|
||||
border: 1px solid rgba(120, 220, 200, 0.3);
|
||||
color: #7edcc8;
|
||||
border-radius: 10px;
|
||||
font-family: 'Space Grotesk', sans-serif;
|
||||
font-size: 15px;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
}
|
||||
|
||||
.submitBtn:hover {
|
||||
background: rgba(120, 220, 200, 0.18);
|
||||
box-shadow: 0 0 24px rgba(120, 220, 200, 0.12);
|
||||
}
|
||||
|
||||
.submitBtn:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
import { useState, useCallback } from 'react';
|
||||
import { useAuthStore } from '../store/auth';
|
||||
import { authApi } from '../lib/api';
|
||||
import logoImg from '../assets/logo_32.png';
|
||||
import styles from './ForceChangePasswordModal.module.css';
|
||||
|
||||
interface Props {
|
||||
onSuccess: () => void;
|
||||
}
|
||||
|
||||
export function ForceChangePasswordModal({ onSuccess }: Props) {
|
||||
const clearMustChangePassword = useAuthStore((s) => s.clearMustChangePassword);
|
||||
const [oldPassword, setOldPassword] = useState('');
|
||||
const [newPassword, setNewPassword] = useState('');
|
||||
const [confirmPassword, setConfirmPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const handleSubmit = useCallback(async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setError('');
|
||||
|
||||
if (!oldPassword) { setError('请输入当前密码'); return; }
|
||||
if (newPassword.length < 8) { setError('新密码至少8位'); return; }
|
||||
if (newPassword !== confirmPassword) { setError('两次输入的新密码不一致'); return; }
|
||||
if (oldPassword === newPassword) { setError('新密码不能与当前密码相同'); return; }
|
||||
|
||||
setLoading(true);
|
||||
try {
|
||||
await authApi.changePassword(oldPassword, newPassword);
|
||||
clearMustChangePassword();
|
||||
onSuccess();
|
||||
} catch (err: any) {
|
||||
const msg = err.response?.data?.message || err.response?.data?.error || '密码修改失败,请重试';
|
||||
setError(msg);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [oldPassword, newPassword, confirmPassword, clearMustChangePassword, onSuccess]);
|
||||
|
||||
return (
|
||||
<div className={styles.overlay}>
|
||||
<div className={styles.panel}>
|
||||
<div className={styles.header}>
|
||||
<img src={logoImg} alt="" className={styles.headerLogo} />
|
||||
<span className={styles.headerTitle}>Air Drama</span>
|
||||
</div>
|
||||
|
||||
<p className={styles.notice}>
|
||||
首次登录请修改密码后继续使用
|
||||
</p>
|
||||
|
||||
<form onSubmit={handleSubmit} className={styles.form}>
|
||||
<div className={styles.field}>
|
||||
<label className={styles.label}>当前密码</label>
|
||||
<input
|
||||
type="password"
|
||||
className={styles.input}
|
||||
value={oldPassword}
|
||||
onChange={(e) => setOldPassword(e.target.value)}
|
||||
placeholder="请输入当前密码"
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={styles.field}>
|
||||
<label className={styles.label}>新密码</label>
|
||||
<input
|
||||
type="password"
|
||||
className={styles.input}
|
||||
value={newPassword}
|
||||
onChange={(e) => setNewPassword(e.target.value)}
|
||||
placeholder="至少8位"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={styles.field}>
|
||||
<label className={styles.label}>确认新密码</label>
|
||||
<input
|
||||
type="password"
|
||||
className={styles.input}
|
||||
value={confirmPassword}
|
||||
onChange={(e) => setConfirmPassword(e.target.value)}
|
||||
placeholder="再次输入新密码"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{error && <div className={styles.error}>{error}</div>}
|
||||
|
||||
<button type="submit" className={styles.submitBtn} disabled={loading}>
|
||||
{loading ? '修改中...' : '修改密码'}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
padding: 20px 0;
|
||||
max-width: 1024px;
|
||||
max-width: 800px;
|
||||
width: 100%;
|
||||
animation: cardFadeIn 0.3s ease-out;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
|
||||
@ -17,10 +17,8 @@
|
||||
/* Header */
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin-bottom: 12px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.refColumn {
|
||||
@ -42,7 +40,7 @@
|
||||
}
|
||||
|
||||
.refThumb {
|
||||
height: 56px;
|
||||
height: 48px;
|
||||
aspect-ratio: 3 / 4;
|
||||
border-radius: 6px;
|
||||
overflow: hidden;
|
||||
@ -78,66 +76,53 @@
|
||||
line-height: 1.6;
|
||||
word-break: break-word;
|
||||
max-height: calc(1.6em * 2);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* hover 展开黑底:基于 .header 定位,左边距图片 4px */
|
||||
.promptExpanded {
|
||||
.promptTooltip {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
top: 100%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 10;
|
||||
font-size: 14px;
|
||||
background: #1e1e2a;
|
||||
border: 1px solid #2a2a38;
|
||||
border-radius: 10px;
|
||||
padding: 12px;
|
||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
|
||||
animation: tooltipFadeIn 0.15s ease-out;
|
||||
}
|
||||
|
||||
@keyframes tooltipFadeIn {
|
||||
from { opacity: 0; transform: translateY(-4px); }
|
||||
to { opacity: 1; transform: translateY(0); }
|
||||
}
|
||||
|
||||
.promptTooltipText {
|
||||
font-size: 13px;
|
||||
color: var(--color-text-primary);
|
||||
line-height: 1.6;
|
||||
margin-bottom: 8px;
|
||||
word-break: break-word;
|
||||
background: rgba(13, 13, 26, 0.95);
|
||||
backdrop-filter: blur(12px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.10);
|
||||
padding: 6px 8px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
.mentionTag {
|
||||
display: inline;
|
||||
padding: 1px 5px;
|
||||
border-radius: 4px;
|
||||
background: rgba(108, 99, 255, 0.12);
|
||||
color: rgba(108, 99, 255, 0.7);
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.mentionPreview {
|
||||
position: fixed;
|
||||
z-index: 9999;
|
||||
transform: translate(-50%, -100%);
|
||||
background: #1e1e2e;
|
||||
border: 1px solid #2a2a3a;
|
||||
border-radius: 10px;
|
||||
padding: 6px;
|
||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.mentionPreviewImg {
|
||||
display: block;
|
||||
width: 160px;
|
||||
height: 100px;
|
||||
object-fit: cover;
|
||||
.copyBtn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 4px 12px;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
color: var(--color-primary);
|
||||
background: rgba(108, 99, 255, 0.1);
|
||||
border: 1px solid rgba(108, 99, 255, 0.2);
|
||||
cursor: pointer;
|
||||
transition: background 0.15s;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.mentionPreviewLabel {
|
||||
text-align: center;
|
||||
color: #8a8a9a;
|
||||
font-size: 11px;
|
||||
margin-top: 4px;
|
||||
.copyBtn:hover {
|
||||
background: rgba(108, 99, 255, 0.18);
|
||||
}
|
||||
|
||||
|
||||
/* Inline labels after prompt text */
|
||||
.labelsInline {
|
||||
display: inline;
|
||||
@ -145,7 +130,6 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
|
||||
.label {
|
||||
display: inline-flex;
|
||||
font-size: 12px;
|
||||
@ -236,10 +220,8 @@
|
||||
inset: 0;
|
||||
background: transparent;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
justify-content: flex-start;
|
||||
gap: 8px;
|
||||
align-items: flex-start;
|
||||
justify-content: flex-end;
|
||||
padding: 12px;
|
||||
animation: overlayFadeIn 0.15s ease-out;
|
||||
}
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
import { useRef, useState, useEffect, useCallback } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
import type { GenerationTask } from '../types';
|
||||
import { useGenerationStore } from '../store/generation';
|
||||
import { showToast } from './Toast';
|
||||
import { ConfirmModal } from './ConfirmModal';
|
||||
import { tosThumb } from '../lib/api';
|
||||
import styles from './GenerationCard.module.css';
|
||||
|
||||
const EditIcon = () => (
|
||||
@ -36,93 +34,6 @@ const DownloadIcon = () => (
|
||||
</svg>
|
||||
);
|
||||
|
||||
// Mention tag with thumbnail + hover preview
|
||||
function MentionTag({ label, thumbUrl, assetType }: { label: string; thumbUrl?: string; assetType?: string }) {
|
||||
const [hover, setHover] = useState(false);
|
||||
const ref = useRef<HTMLSpanElement>(null);
|
||||
const [pos, setPos] = useState({ top: 0, left: 0 });
|
||||
const isAudio = assetType === 'Audio' || assetType === 'audio';
|
||||
|
||||
return (
|
||||
<>
|
||||
<span
|
||||
ref={ref}
|
||||
className={styles.mentionTag}
|
||||
onMouseEnter={() => {
|
||||
if (!isAudio && thumbUrl && ref.current) {
|
||||
const rect = ref.current.getBoundingClientRect();
|
||||
setPos({ top: rect.top - 8, left: rect.left + rect.width / 2 });
|
||||
setHover(true);
|
||||
}
|
||||
}}
|
||||
onMouseLeave={() => setHover(false)}
|
||||
>
|
||||
{isAudio ? (
|
||||
<span style={{ marginRight: 3, fontSize: 13, verticalAlign: 'middle' }}>♫</span>
|
||||
) : thumbUrl ? (
|
||||
<img
|
||||
src={tosThumb(thumbUrl, 28)}
|
||||
alt=""
|
||||
style={{ width: 14, height: 14, borderRadius: 3, objectFit: 'cover', verticalAlign: 'middle', marginRight: 3 }}
|
||||
/>
|
||||
) : null}
|
||||
{label}
|
||||
</span>
|
||||
{hover && thumbUrl && createPortal(
|
||||
<div className={styles.mentionPreview} style={{ top: pos.top, left: pos.left }}>
|
||||
<img src={tosThumb(thumbUrl, 200)} alt={label} className={styles.mentionPreviewImg} />
|
||||
<div className={styles.mentionPreviewLabel}>{label}</div>
|
||||
</div>,
|
||||
document.body
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
// Render prompt text with @mentions as styled tags (thumbnail + hover preview)
|
||||
export function renderPromptWithMentions(
|
||||
text: string,
|
||||
assetMentions: Record<string, unknown>[],
|
||||
references: { label: string; previewUrl?: string }[]
|
||||
) {
|
||||
// Build lookup: label → { thumbUrl, assetType }
|
||||
const thumbMap = new Map<string, { thumbUrl: string; assetType: string }>();
|
||||
for (const am of assetMentions) {
|
||||
if (am.label) thumbMap.set(am.label as string, {
|
||||
thumbUrl: (am.thumbUrl as string) || '',
|
||||
assetType: (am.assetType as string) || 'image',
|
||||
});
|
||||
}
|
||||
for (const r of references) {
|
||||
if (r.label && !thumbMap.has(r.label)) thumbMap.set(r.label, {
|
||||
thumbUrl: r.previewUrl || '',
|
||||
assetType: (r as Record<string, unknown>).type as string || 'image',
|
||||
});
|
||||
}
|
||||
|
||||
const labels = [...thumbMap.keys()];
|
||||
if (labels.length === 0) return text;
|
||||
|
||||
// Build regex: match @label patterns, longest first
|
||||
labels.sort((a, b) => b.length - a.length);
|
||||
const escaped = labels.map((l) => l.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
|
||||
const regex = new RegExp(`(@(?:${escaped.join('|')}))`, 'g');
|
||||
|
||||
const parts = text.split(regex);
|
||||
if (parts.length === 1) return text;
|
||||
|
||||
return parts.map((part, i) => {
|
||||
if (regex.test(part)) {
|
||||
regex.lastIndex = 0;
|
||||
const label = part.slice(1); // remove @
|
||||
const info = thumbMap.get(label);
|
||||
return <MentionTag key={i} label={label} thumbUrl={info?.thumbUrl} assetType={info?.assetType} />;
|
||||
}
|
||||
regex.lastIndex = 0;
|
||||
return part;
|
||||
});
|
||||
}
|
||||
|
||||
interface Props {
|
||||
task: GenerationTask;
|
||||
onOpenDetail?: (task: GenerationTask) => void;
|
||||
@ -132,14 +43,11 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
const removeTask = useGenerationStore((s) => s.removeTask);
|
||||
const reEdit = useGenerationStore((s) => s.reEdit);
|
||||
const regenerate = useGenerationStore((s) => s.regenerate);
|
||||
const toggleFavorite = useGenerationStore((s) => s.toggleFavorite);
|
||||
|
||||
const videoRef = useRef<HTMLVideoElement>(null);
|
||||
const moreRef = useRef<HTMLDivElement>(null);
|
||||
const promptLineRef = useRef<HTMLDivElement>(null);
|
||||
const promptWrapperRef = useRef<HTMLDivElement>(null);
|
||||
const labelsRef = useRef<HTMLSpanElement>(null);
|
||||
const refColumnRef = useRef<HTMLDivElement>(null);
|
||||
const [videoHover, setVideoHover] = useState(false);
|
||||
const [promptHover, setPromptHover] = useState(false);
|
||||
const [showMore, setShowMore] = useState(false);
|
||||
@ -148,16 +56,6 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
const [detailHover, setDetailHover] = useState(false);
|
||||
const [detailPos, setDetailPos] = useState({ top: 0, right: 0 });
|
||||
const detailLinkRef = useRef<HTMLSpanElement>(null);
|
||||
const detailLeaveTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
const [refPreview, setRefPreview] = useState<{ url: string; label: string; type: string; top: number; left: number } | null>(null);
|
||||
|
||||
const startDetailLeave = useCallback(() => {
|
||||
if (detailLeaveTimer.current) clearTimeout(detailLeaveTimer.current);
|
||||
detailLeaveTimer.current = setTimeout(() => setDetailHover(false), 200);
|
||||
}, []);
|
||||
const cancelDetailLeave = useCallback(() => {
|
||||
if (detailLeaveTimer.current) clearTimeout(detailLeaveTimer.current);
|
||||
}, []);
|
||||
|
||||
// Close more menu on click outside
|
||||
useEffect(() => {
|
||||
@ -182,39 +80,47 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
|
||||
const style = getComputedStyle(container);
|
||||
const font = `${style.fontSize} ${style.fontFamily}`;
|
||||
const labelsWidth = labelsEl.offsetWidth + 8;
|
||||
// Account for mention tags (thumbnails) taking extra width vs plain text
|
||||
const mentionCount = (task.assetMentions?.length || 0) + (task.references?.length || 0);
|
||||
const mentionExtraWidth = mentionCount * 24; // ~24px extra per mention (thumbnail + padding)
|
||||
const totalAvailable = containerWidth * 2 - labelsWidth - 24 - mentionExtraWidth;
|
||||
|
||||
// Measure labels width
|
||||
const labelsWidth = labelsEl.offsetWidth + 8; // +8 for gap
|
||||
|
||||
// Two lines of available width, minus labels on line 2
|
||||
const totalAvailable = containerWidth * 2 - labelsWidth;
|
||||
|
||||
const canvas = document.createElement('canvas');
|
||||
const ctx = canvas.getContext('2d')!;
|
||||
ctx.font = font;
|
||||
|
||||
const prompt = task.prompt || '';
|
||||
let totalWidth = 0;
|
||||
let needsTruncation = false;
|
||||
|
||||
// Check if prompt fits
|
||||
const fullWidth = ctx.measureText(prompt).width;
|
||||
if (fullWidth <= totalAvailable) {
|
||||
setTruncatedPrompt(prompt);
|
||||
return;
|
||||
}
|
||||
|
||||
// Truncate character by character
|
||||
let truncated = '';
|
||||
let totalWidth = 0;
|
||||
const ellipsisWidth = ctx.measureText('…').width;
|
||||
for (const char of prompt) {
|
||||
const charWidth = ctx.measureText(char).width;
|
||||
if (totalWidth + charWidth + ellipsisWidth > totalAvailable) {
|
||||
needsTruncation = true;
|
||||
break;
|
||||
}
|
||||
truncated += char;
|
||||
totalWidth += charWidth;
|
||||
}
|
||||
setTruncatedPrompt(truncated + '…');
|
||||
|
||||
setTruncatedPrompt(needsTruncation ? truncated + '…' : prompt);
|
||||
}, [task.prompt]);
|
||||
|
||||
useEffect(() => {
|
||||
computeTruncation();
|
||||
|
||||
const container = promptLineRef.current;
|
||||
if (!container) return;
|
||||
const ro = new ResizeObserver(() => computeTruncation());
|
||||
@ -286,18 +192,9 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
<div className={styles.header}>
|
||||
{/* Left: reference thumbnails */}
|
||||
{task.references.length > 0 && (
|
||||
<div ref={refColumnRef} className={styles.refColumn}>
|
||||
<div className={styles.refColumn}>
|
||||
{task.references.map((ref) => (
|
||||
<div
|
||||
key={ref.id}
|
||||
className={styles.refThumb}
|
||||
onMouseEnter={(e) => {
|
||||
if (ref.type === 'audio') return;
|
||||
const rect = e.currentTarget.getBoundingClientRect();
|
||||
setRefPreview({ url: ref.previewUrl, label: ref.label, type: ref.type, top: rect.top - 8, left: rect.left + rect.width / 2 });
|
||||
}}
|
||||
onMouseLeave={() => setRefPreview(null)}
|
||||
>
|
||||
<div key={ref.id} className={styles.refThumb}>
|
||||
{ref.type === 'video' ? (
|
||||
<video src={ref.previewUrl} className={styles.refMedia} muted />
|
||||
) : ref.type === 'audio' ? (
|
||||
@ -309,7 +206,7 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
</svg>
|
||||
</div>
|
||||
) : (
|
||||
<img src={tosThumb(ref.previewUrl, 112)} alt={ref.label} className={styles.refMedia} />
|
||||
<img src={ref.previewUrl} alt={ref.label} className={styles.refMedia} />
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
@ -318,30 +215,23 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
{/* Right: prompt + inline labels */}
|
||||
<div className={styles.headerRight}>
|
||||
<div
|
||||
ref={promptWrapperRef}
|
||||
className={styles.promptWrapper}
|
||||
onMouseLeave={() => { setPromptHover(false); startDetailLeave(); }}
|
||||
onMouseLeave={() => setPromptHover(false)}
|
||||
>
|
||||
{/* 默认状态:截断提示词 + inline 标签 */}
|
||||
<div ref={promptLineRef} className={styles.promptLine}>
|
||||
<span onMouseEnter={() => setPromptHover(true)}>
|
||||
{renderPromptWithMentions(truncatedPrompt || '(无文字描述)', task.assetMentions || [], task.references)}
|
||||
</span>
|
||||
<span
|
||||
ref={labelsRef}
|
||||
className={styles.labelsInline}
|
||||
onMouseEnter={() => setPromptHover(false)}
|
||||
>
|
||||
onMouseEnter={() => setPromptHover(true)}
|
||||
>{truncatedPrompt || '(无文字描述)'}</span>
|
||||
<span ref={labelsRef} className={styles.labelsInline} onMouseEnter={() => setPromptHover(false)}>
|
||||
<span className={styles.label}>
|
||||
{task.model === 'seedance_2.0' ? 'AirDrama' : 'AirDrama Fast'}
|
||||
</span>
|
||||
<span className={styles.label}>{task.duration}s</span>
|
||||
<span className={styles.label}>{task.aspectRatio}</span>
|
||||
<span className={styles.label}>{task.aspectRatio === 'adaptive' ? '自适应' : task.aspectRatio}</span>
|
||||
<span
|
||||
ref={detailLinkRef}
|
||||
className={styles.detailLink}
|
||||
onMouseEnter={() => {
|
||||
cancelDetailLeave();
|
||||
const el = detailLinkRef.current;
|
||||
if (el) {
|
||||
const rect = el.getBoundingClientRect();
|
||||
@ -352,85 +242,43 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
}
|
||||
setDetailHover(true);
|
||||
}}
|
||||
onMouseLeave={startDetailLeave}
|
||||
onMouseLeave={() => setDetailHover(false)}
|
||||
>
|
||||
详细信息 ⓘ
|
||||
{detailHover && (
|
||||
<div className={styles.detailTooltip} style={{ top: detailPos.top, right: detailPos.right }}>
|
||||
<div className={styles.detailRow}>
|
||||
<span>视频比例</span><span>{task.aspectRatio === 'adaptive' ? '自适应' : task.aspectRatio}</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>时长</span><span>{task.duration}s</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>分辨率</span><span>720p</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>模型</span>
|
||||
<span>{task.model === 'seedance_2.0' ? 'AirDrama' : 'AirDrama Fast'}</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>生成时间</span>
|
||||
<span>{new Date(task.createdAt).toLocaleString('zh-CN')}</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
{promptHover && task.prompt && (
|
||||
<div className={styles.promptTooltip}>
|
||||
<p className={styles.promptTooltipText}>{task.prompt}</p>
|
||||
<button className={styles.copyBtn} onClick={handleCopyPrompt}>复制</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{/* 详细信息弹窗 — 放在 promptWrapper 外,鼠标可以移到弹窗上 */}
|
||||
{detailHover && (
|
||||
<div
|
||||
className={styles.detailTooltip}
|
||||
style={{ top: detailPos.top, right: detailPos.right }}
|
||||
onMouseEnter={() => { cancelDetailLeave(); setDetailHover(true); }}
|
||||
onMouseLeave={startDetailLeave}
|
||||
>
|
||||
<div className={styles.detailRow}>
|
||||
<span>视频比例</span><span>{task.aspectRatio}</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>时长</span><span>{task.duration}s</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>分辨率</span><span>720p</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>模型</span>
|
||||
<span>{task.model === 'seedance_2.0' ? 'AirDrama' : 'AirDrama Fast'}</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>生成时间</span>
|
||||
<span>{new Date(task.createdAt).toLocaleString('zh-CN')}</span>
|
||||
</div>
|
||||
{(task.tokensConsumed ?? 0) > 0 && (
|
||||
<>
|
||||
<div className={styles.detailRow}>
|
||||
<span>消耗 Tokens</span>
|
||||
<span>{(task.tokensConsumed ?? 0).toLocaleString()}</span>
|
||||
</div>
|
||||
<div className={styles.detailRow}>
|
||||
<span>费用</span>
|
||||
<span>¥{(task.costAmount ?? 0).toFixed(2)}</span>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
{(task.seed ?? -1) > 0 && (
|
||||
<div className={styles.detailRow}>
|
||||
<span>种子值</span>
|
||||
<span>{task.seed}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{/* hover 展开黑底:基于 header 定位,左边距图片 4px */}
|
||||
{promptHover && task.prompt && (
|
||||
<div
|
||||
className={styles.promptExpanded}
|
||||
style={{ left: refColumnRef.current ? refColumnRef.current.offsetWidth + 4 : 0 }}
|
||||
onMouseEnter={() => setPromptHover(true)}
|
||||
onMouseLeave={() => setPromptHover(false)}
|
||||
>
|
||||
{renderPromptWithMentions(task.prompt, task.assetMentions || [], task.references)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Reference thumbnail hover preview */}
|
||||
{refPreview && createPortal(
|
||||
<div className={styles.mentionPreview} style={{ top: refPreview.top, left: refPreview.left }}>
|
||||
{refPreview.type === 'video' ? (
|
||||
<video src={refPreview.url} className={styles.mentionPreviewImg} autoPlay loop muted playsInline />
|
||||
) : (
|
||||
<img src={tosThumb(refPreview.url, 300)} alt={refPreview.label} className={styles.mentionPreviewImg} />
|
||||
)}
|
||||
<div className={styles.mentionPreviewLabel}>{refPreview.label}</div>
|
||||
</div>,
|
||||
document.body
|
||||
)}
|
||||
|
||||
{/* Video / result area */}
|
||||
<div className={styles.content}>
|
||||
{isGenerating ? (
|
||||
@ -470,11 +318,6 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
<button className={styles.downloadBtn} onClick={handleDownload}>
|
||||
<DownloadIcon />
|
||||
</button>
|
||||
<button className={styles.downloadBtn} onClick={(e) => { e.stopPropagation(); toggleFavorite(task.id); }}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill={task.isFavorited ? '#faad14' : 'none'} stroke={task.isFavorited ? '#faad14' : 'currentColor'} strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@ -489,13 +332,6 @@ export function GenerationCard({ task, onOpenDetail }: Props) {
|
||||
</div>
|
||||
|
||||
{/* Bottom action buttons */}
|
||||
{isGenerating && (
|
||||
<div className={styles.actions}>
|
||||
<button className={styles.actionBtn} onClick={() => reEdit(task.id)}>
|
||||
<EditIcon /> <span>重新编辑</span>
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
{!isGenerating && (
|
||||
<div className={styles.actions}>
|
||||
<button className={styles.actionBtn} onClick={() => reEdit(task.id)}>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user