diff --git a/backend/apps/generation/views.py b/backend/apps/generation/views.py index 36ec146..ed9db0d 100644 --- a/backend/apps/generation/views.py +++ b/backend/apps/generation/views.py @@ -1,4 +1,5 @@ import logging +import re from rest_framework import status from rest_framework.decorators import api_view, permission_classes, parser_classes @@ -90,6 +91,17 @@ def _format_prompt_for_ark(prompt, label_placeholders): return result +_ORPHAN_MATERIAL_MENTION_RE = re.compile(r'@(?:图片|视频|音频|素材)[^\s,。!?、;:,.!?;:))]*') + + +def _find_orphan_material_mention(prompt, references): + """Return a material @mention in prompt when no reference payload arrived.""" + if not prompt or references: + return None + match = _ORPHAN_MATERIAL_MENTION_RE.search(prompt) + return match.group(0) if match else None + + def _get_token_price(config, model, has_video_ref, resolution): """根据模型、是否含视频、分辨率选择单价。 @@ -226,9 +238,22 @@ def video_generate_view(request): aspect_ratio = serializer.validated_data['aspect_ratio'] # serializer 已设 default='720p' + choices 约束,validated_data 必有合法值 resolution = serializer.validated_data['resolution'] + references = serializer.validated_data.get('references', []) search_mode = request.data.get('search_mode', 'off') seed = _safe_int(request.data.get('seed', -1), -1) + orphan_mention = _find_orphan_material_mention(prompt, references) + if orphan_mention: + logger.warning( + 'Blocked generate with material @mention but empty references (user=%s prompt=%s)', + user.id, + prompt[:120], + ) + return Response({ + 'error': 'missing_references', + 'message': f'{orphan_mention} 对应的内容为空', + }, status=status.HTTP_400_BAD_REQUEST) + # 1080P 仅 Seedance 2.0 支持,Fast 不支持 if resolution == '1080p' and model == 'seedance_2.0_fast': return Response({ @@ -238,7 +263,6 @@ def video_generate_view(request): # ── 预估 token 和费用 ── config = QuotaConfig.objects.get_or_create(pk=1)[0] - references = request.data.get('references', []) w, h = get_resolution(aspect_ratio, resolution) has_video_ref = _has_video_reference(references) input_video_dur = _sum_video_duration(references) if has_video_ref else 0 @@ -335,9 +359,12 @@ def video_generate_view(request): }, status=status.HTTP_429_TOO_MANY_REQUESTS) # 构建参考素材 - references = request.data.get('references', []) - # 火山限制最多 9 张参考图片 - image_count = sum(1 for r in references if r.get('type', 'image') == 'image') + # 直接上传的参考图片最多 9 张;素材库 asset:// 引用不计入该上传槽位限制。 + image_count = sum( + 1 for r in references + if r.get('type', 'image') == 'image' + and not str(r.get('url', '')).startswith('asset://') + ) if image_count > 9: return Response({ 'error': 'too_many_references', diff --git a/backend/tests/test_ark_prompt_format.py b/backend/tests/test_ark_prompt_format.py index 6922cfe..6e5b536 100644 --- a/backend/tests/test_ark_prompt_format.py +++ b/backend/tests/test_ark_prompt_format.py @@ -146,6 +146,16 @@ class TestVideoGenerateArkPrompt(TestCase): 'references': references, }, format='json') + @mock.patch('apps.generation.views.create_task') + def test_reject_material_mention_without_references(self, mock_create_task): + """事故回归:prompt 含 @图片 但 references 为空时,不能创建 refs=0 脏任务。""" + resp = self._post_generate('@图片1 走过来', []) + self.assertEqual(resp.status_code, 400, resp.content) + self.assertEqual(resp.json().get('error'), 'missing_references') + self.assertEqual(resp.json().get('message'), '@图片1 对应的内容为空') + self.assertFalse(mock_create_task.called) + self.assertFalse(GenerationRecord.objects.filter(user=self.user).exists()) + @mock.patch('apps.generation.tasks.poll_video_task') @mock.patch('apps.generation.views.create_task') def test_view_converts_prompt_for_local_assets(self, mock_create_task, mock_poll): diff --git a/web/src/components/PromptInput.tsx b/web/src/components/PromptInput.tsx index 1fa225a..7666071 100644 --- a/web/src/components/PromptInput.tsx +++ b/web/src/components/PromptInput.tsx @@ -416,14 +416,15 @@ export function PromptInput() { }, [extractText]); const insertAssetMention = useCallback((asset: AssetSearchResult) => { - // Instant check: count limit + // Instant check: count limit. Image assets from the library do not consume + // the 9 direct-upload image slots. const stats = editorRef.current ? parseAssetMentionsFromDOM(editorRef.current) : { counts: { image: 0, video: 0, audio: 0 }, durations: { video: 0, audio: 0 } }; const refs = useInputBarStore.getState().references; const refCounts = { image: 0, video: 0, audio: 0 }; refs.forEach((r) => refCounts[r.type]++); const typeKey = asset.asset_type === 'Video' ? 'video' : asset.asset_type === 'Audio' ? 'audio' : 'image'; - const maxMap = { image: 9, video: 3, audio: 3 }; - if (refCounts[typeKey] + stats.counts[typeKey] >= maxMap[typeKey]) { + const maxMap = { video: 3, audio: 3 }; + if (typeKey !== 'image' && refCounts[typeKey] + stats.counts[typeKey] >= maxMap[typeKey]) { const typeLabel = asset.asset_type === 'Video' ? '视频' : asset.asset_type === 'Audio' ? '音频' : '图片'; showToast(`${typeLabel}已达上限`); return; @@ -715,12 +716,16 @@ export function PromptInput() { }} >
- {ref.type === 'video' ? ( + {ref.uploading ? ( + ... + ) : ref.type === 'video' && ref.previewUrl ? (
{ref.label} diff --git a/web/src/components/UniversalUpload.module.css b/web/src/components/UniversalUpload.module.css index 09a1ba0..c3d69cc 100644 --- a/web/src/components/UniversalUpload.module.css +++ b/web/src/components/UniversalUpload.module.css @@ -282,6 +282,16 @@ color: var(--color-text-secondary); } +.uploadPlaceholder { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + background: var(--color-overlay-soft); + color: var(--color-text-secondary); +} + /* Upload status overlay */ .uploadOverlay { position: absolute; diff --git a/web/src/components/UniversalUpload.tsx b/web/src/components/UniversalUpload.tsx index 5e23475..6939657 100644 --- a/web/src/components/UniversalUpload.tsx +++ b/web/src/components/UniversalUpload.tsx @@ -142,28 +142,29 @@ export function UniversalUpload() { }} >
- {ref.type === 'video' ? ( + {ref.uploading ? ( +
+ +
+ ) : ref.uploadError ? ( +
{ e.stopPropagation(); retryUpload(ref.id); }} + title="点击重试" + > + +
+ ) : ref.type === 'video' && ref.previewUrl ? (