Author SHA1 Message Date
xhgit c92a807c87 fix(ai): 重叠平移挤开旧片段时补生成 update 操作
实测:新建片段插入旧时间轴间隙、把旧片段挤开时,净化层只在
模拟里移动了旧片段,没有生成对应 update 操作——模拟通过校验、
实际应用时旧片段仍在原位,applyOperations 报「视频片段重叠」。
现在挤开旧片段时自动补一条 update 操作,模拟与实装一致。
新增回归测试(旧片段被挤开必须生成 update)。
2026-11-14 18:36:41 +08:00
xhgit 2b8cc45023 Merge pull request 'fix(ai): 新建模式下规划数据不再携带旧时间轴' (#16) from fix/fresh-no-old-timeline into main 2026-11-14 10:02:40 +00:00
xhgit 90502dc27e fix(ai): 新建模式下规划数据不再携带旧时间轴
实测 V2 规划失败:fresh 模式提示词要求先 remove 重建,但数据里
仍带着旧时间轴(含重复片段),模型把注意力放在旧片段的
「重复与逻辑混乱」上,最终返回空方案。
新建模式下 clips 置空、timelineDuration 归零,模型只看到素材与
新要求;应用侧仍会自动补上 remove 全部旧片段的操作。
新增测试:fresh 数据无旧片段、modify 数据保留旧片段。
2026-11-14 18:01:52 +08:00
xhgit 2aa0e50f73 Merge pull request 'fix(ai): 净化层去重同源片段,禁止重复使用相同 in/out 范围' (#15) from fix/dedupe-source-range into main 2026-11-14 09:55:14 +00:00
4 changed files with 21 additions and 5 deletions

No files matched your search

+2 -1
View File
@@ -140,7 +140,8 @@ export function sanitizeOperations(p,operations){
if(vids[i].start<end-.02){
const at=Math.round(end*100)/100;
const add=addBySim.get(vids[i].id);if(add)add.clip.start=at;
else{const upd=updById.get(vids[i].id);if(upd)upd.changes.start=at;}
else{const upd=updById.get(vids[i].id);if(upd)upd.changes.start=at;
else{const entry={type:'update',id:vids[i].id,changes:{start:at}};ops.push(entry);updById.set(vids[i].id,entry);}}
vids[i].start=at;
note('视频片段重叠,已自动后移至 '+at.toFixed(1)+' 秒');
}
+4 -4
View File
@@ -88,7 +88,7 @@ const PLACEHOLDER=/尚未|等待|采样窗口|时间采样|语义或动作/;
const TITLE_CARD=/标题画面|演职员|职员表|片头|片尾|字幕卡|制作人员/;
const SEG_CAP=60,PER_MEDIA_CAP=8,DESC_MAX=90;
const round2=n=>Math.round(n*100)/100;
function buildProjectData(p,budget){
function buildProjectData(p,budget,fresh){
const media=p.media.map(m=>{
const seen=new Set();
const all=(m.analysis?.segments||[]).filter(s=>s&&Number.isFinite(s.score)&&s.score!==null&&typeof s.description==='string'&&s.description&&!PLACEHOLDER.test(s.description)&&!TITLE_CARD.test(s.description)&&!seen.has(s.description)&&(seen.add(s.description),true))
@@ -99,10 +99,10 @@ function buildProjectData(p,budget){
media.sort((a,b)=>(b.segments[0]?.score??-1)-(a.segments[0]?.score??-1));
const kept=new Map();let cap=SEG_CAP;
for(const m of media){const out=[];for(const s of m.segments){const n=kept.get(m.id)||0;if(n>=PER_MEDIA_CAP||!cap)break;kept.set(m.id,n+1);cap--;out.push(s);}m.segments=out;}
const clips=p.clips.map(c=>({id:c.id,...(c.mediaId?{mediaId:c.mediaId}:{}),track:c.track,start:round2(c.start),in:round2(c.in),out:round2(c.out),speed:c.speed??1,volume:c.volume??1,
const clips=fresh?[]:p.clips.map(c=>({id:c.id,...(c.mediaId?{mediaId:c.mediaId}:{}),track:c.track,start:round2(c.start),in:round2(c.in),out:round2(c.out),speed:c.speed??1,volume:c.volume??1,
...(c.fade!==undefined?{fade:c.fade}:{}),...(c.text?{text:c.text.slice(0,200)}:{}),...(c.color?{color:c.color}:{}),...(c.fontSize?{fontSize:c.fontSize}:{}),
...(c.brightness!==undefined?{brightness:c.brightness}:{}),...(c.contrast!==undefined?{contrast:c.contrast}:{}),...(c.saturation!==undefined?{saturation:c.saturation}:{}),...(c.fit?{fit:c.fit}:{})}));
const data={settings:p.settings,timelineDuration:round2(Math.max(0,...p.clips.map(c=>c.start+(c.out-c.in)/(c.speed||1)))),media,clips};
const data={settings:p.settings,timelineDuration:fresh?0:round2(Math.max(0,...p.clips.map(c=>c.start+(c.out-c.in)/(c.speed||1)))),media,clips};
const steps=[
d=>{for(const m of d.media)m.segments=m.segments.slice(0,6);},
d=>{for(const m of d.media)for(const s of m.segments)s.description=s.description.slice(0,60);},
@@ -138,7 +138,7 @@ function buildHistoryBlock(history,budget){
}
export function plannerPrompt(p,instruction,{fresh=false,target=0,style=null,budget=9000,history=[]}={}){
const historyBlock=buildHistoryBlock(history,Math.max(400,Math.round(budget*.35)));
const data=buildProjectData(p,Math.max(1200,budget-historyBlock.length));
const data=buildProjectData(p,Math.max(1200,budget-historyBlock.length),fresh);
const hasSegments=data.media.some(m=>m.segments.length);
const mode=fresh?'用户要求创作新的时间轴:先 remove 现有全部片段,再按新要求重新 add;内容全部重新编排,不要保留旧镜头。':'时间轴需要保留:只修改用户明确提到的片段与字段,其余片段保持原样;不要删除未提及的片段,不要重建整个时间轴。';
const styleBlock=style?`风格参数(仅用于新添加的片段,不要改动现有片段):${JSON.stringify(style)}`:'';
+9
View File
@@ -64,6 +64,15 @@ test('AI 操作净化:越界数值截断、无效引用忽略、视频轨重
assert.ok(r.notes.length>=5);
const applied=applyOperations(p,r.operations); // 净化后的操作必须能直接通过校验
assert.equal(applied.clips.filter(c=>c.track==='video').length,3);
// 新增片段把旧片段挤开时,必须生成对应的 update 操作(否则模拟与实装不一致)
const p2=newProject('旧片段平移');p2.media=[{id:'v',type:'video',duration:60,name:'v',tags:[]}];
p2.clips=[{id:'o1',mediaId:'v',track:'video',start:0,in:0,out:5,speed:1,volume:1},{id:'o2',mediaId:'v',track:'video',start:8,in:20,out:25,speed:1,volume:1}];
const r2=sanitizeOperations(p2,[{type:'add',clip:{mediaId:'v',track:'video',start:0,in:5,out:15,speed:1}}]);
const shiftUpdate=r2.operations.find(o=>o.type==='update'&&o.id==='o2');
assert.ok(shiftUpdate,'旧片段被挤开时必须生成 update 操作');
assert.equal(shiftUpdate.changes.start,15);
const applied2=applyOperations(p2,r2.operations);
assert.equal(applied2.clips.find(c=>c.id==='o2').start,15);
});
test('按参数组接:只使用已分析素材、按素材轮转保证多样性、忽略未分析素材',()=>{
const p=newProject('组接测试');p.media=[
+6
View File
@@ -50,11 +50,17 @@ test('规划提示词:按评分筛选片段、丢弃占位描述、区分新
assert.ok(!fresh.includes('motion'));
assert.ok(fresh.includes('先 remove 现有全部片段'));
assert.ok(fresh.includes('45'));
// 新建模式:数据中不带旧时间轴(避免模型被旧片段干扰)
const freshData=JSON.parse(fresh.slice(fresh.indexOf('{',fresh.indexOf('项目数据'))));
assert.equal(freshData.clips.length,0);
assert.equal(freshData.timelineDuration,0);
assert.ok(fresh.includes('score'));
assert.ok(fresh.length<12000);
const modify=plannerPrompt(p,'把第一个镜头缩短一点',{fresh:false,budget:9000});
assert.ok(modify.includes('时间轴需要保留'));
assert.ok(modify.includes('c1'));
const modifyData=JSON.parse(modify.slice(modify.indexOf('{',modify.indexOf('项目数据'))));
assert.equal(modifyData.clips.length,1);
// 大数据量下仍受预算约束
const big={settings:p.settings,media:Array.from({length:40},(_,i)=>({id:'m'+i,name:'素材'+i,type:'video',duration:300,tags:['t'],analysis:{segments:Array.from({length:10},(_,j)=>({start:j*30,end:j*30+28,description:'第'+j+'段:这是很长的一段语义描述内容用来填充上下文窗口测试预算裁剪是否生效',score:99-j}))}})),clips:Array.from({length:60},(_,i)=>({id:'c'+i,mediaId:'m0',track:'video',start:i*5,in:0,out:5,speed:1,volume:1}))};
const small=plannerPrompt(big,'重新剪一遍',{fresh:true,budget:3800});