Support per-chunk timeline durations
This commit is contained in:
+42
-14
@@ -143,7 +143,27 @@ def _parse_timeline(script,chunks,chunk_seconds,*,ignore_list_separators=False):
|
||||
scored.sort(reverse=True,key=lambda row:(row[0],row[1])); selected=scored[0][2]; prompts.append(selected["prompt"]); previous_prompt=selected["prompt"]; previous_source=f"{selected['source']} at line {selected['line_number']}"
|
||||
diagnostics.append({"level":"info","code":"H3C-P000","message":f"Chunk {chunk_index} source: {previous_source}"})
|
||||
if len(scored)>1 and abs(scored[0][0]-scored[1][0])<1e-9: notes.append(f"chunk {chunk_index} had an equal-overlap timeline tie; used the earlier section")
|
||||
return prompts,notes,diagnostics
|
||||
time_sections = [item for item in sections if item["kind"] == "time"]
|
||||
durations = None
|
||||
if len(time_sections) >= chunks:
|
||||
candidate = sorted(time_sections, key=lambda item: (item["start"], item["end"]))[:chunks]
|
||||
contiguous = abs(candidate[0]["start"]) <= 1e-6 and all(
|
||||
abs(candidate[index]["start"] - candidate[index - 1]["end"]) <= 1e-6
|
||||
for index in range(1, len(candidate))
|
||||
)
|
||||
if contiguous:
|
||||
durations = [round(item["end"] - item["start"], 6) for item in candidate]
|
||||
if any(value < CHUNK_SECONDS_MIN or value > CHUNK_SECONDS_MAX for value in durations):
|
||||
raise PromptPlanError(
|
||||
f"timeline chunk durations must be between {CHUNK_SECONDS_MIN:.1f} and {CHUNK_SECONDS_MAX:.1f} seconds"
|
||||
)
|
||||
prompts = [item["prompt"] for item in candidate]
|
||||
diagnostics.extend(
|
||||
{"level": "info", "code": "H3C-P000", "message": f"Chunk {index + 1} source: {item['source']}"}
|
||||
for index, item in enumerate(candidate)
|
||||
)
|
||||
notes.append("derived per-chunk durations from timeline headers")
|
||||
return prompts,notes,diagnostics,durations
|
||||
def _has_timeline_header(script):
|
||||
return any(_TIMELINE_HEADER.match(line) or _CHUNK_HEADER.match(line) for line in str(script).splitlines())
|
||||
def _has_list_separator(script):
|
||||
@@ -168,28 +188,28 @@ def resolve_prompt_mode(mode,script):
|
||||
def make_prompt_plan(*,mode,script,chunks,chunk_seconds):
|
||||
chunks=int(chunks); chunk_seconds=float(chunk_seconds)
|
||||
if not 1<=chunks<=16: raise PromptPlanError("chunks must be between 1 and 16")
|
||||
if not CHUNK_SECONDS_MIN<=chunk_seconds<=CHUNK_SECONDS_MAX: raise PromptPlanError(f"chunk_seconds must be between {CHUNK_SECONDS_MIN:.1f} and {CHUNK_SECONDS_MAX:.1f}")
|
||||
notes=[]; diagnostics=[]
|
||||
if not CHUNK_SECONDS_MIN<=chunk_seconds<=CHUNK_SECONDS_MAX: raise PromptPlanError(f"chunk_seconds must be between {CHUNK_SECONDS_MIN:.1f} and {CHUNK_SECONDS_MAX:.1f}")
|
||||
notes=[]; diagnostics=[]; durations=[chunk_seconds]*chunks
|
||||
try:
|
||||
resolved_mode=resolve_prompt_mode(mode,script)
|
||||
if mode==PROMPT_FORMAT_AUTO:
|
||||
detected={PROMPT_MODE_FIXED:PROMPT_FORMAT_FIXED,PROMPT_MODE_LIST:PROMPT_FORMAT_LIST,PROMPT_MODE_TIMELINE:PROMPT_FORMAT_TIMELINE}[resolved_mode]; notes.append(f"Auto detected {detected}")
|
||||
if resolved_mode==PROMPT_MODE_FIXED: prompt=_normalize_prompt(script,label="fixed prompt"); prompts=[prompt]*chunks
|
||||
if resolved_mode==PROMPT_MODE_FIXED: prompt=_normalize_prompt(script,label="fixed prompt"); prompts=[prompt]*chunks; durations=[chunk_seconds]*chunks
|
||||
elif resolved_mode==PROMPT_MODE_LIST:
|
||||
prompts,parse_notes,list_sources=_parse_list(script,chunks); notes.extend(parse_notes)
|
||||
if _has_timeline_header(script):
|
||||
diagnostics.append(_mixed_syntax_diagnostic(timeline_active=False))
|
||||
diagnostics.extend({"level":"info","code":"H3C-P000","message":f"Chunk {index+1} source: List section {source}"} for index,source in enumerate(list_sources))
|
||||
elif resolved_mode==PROMPT_MODE_TIMELINE:
|
||||
mixed_syntax=_has_list_separator(script)
|
||||
prompts,parse_notes,diagnostics=_parse_timeline(script,chunks,chunk_seconds,ignore_list_separators=mixed_syntax); notes.extend(parse_notes)
|
||||
elif resolved_mode==PROMPT_MODE_TIMELINE:
|
||||
mixed_syntax=_has_list_separator(script)
|
||||
prompts,parse_notes,diagnostics,durations=_parse_timeline(script,chunks,chunk_seconds,ignore_list_separators=mixed_syntax); notes.extend(parse_notes)
|
||||
if mixed_syntax: diagnostics.insert(0,_mixed_syntax_diagnostic(timeline_active=True))
|
||||
else: raise PromptPlanError(f"unknown prompt mode: {resolved_mode!r}")
|
||||
except (PromptPlanError,TypeError,ValueError) as exc:
|
||||
resolved_mode=PROMPT_MODE_FIXED; prompts=[_normalize_prompt(script,label="fixed prompt")]*chunks
|
||||
resolved_mode=PROMPT_MODE_FIXED; prompts=[_normalize_prompt(script,label="fixed prompt")]*chunks; durations=[chunk_seconds]*chunks
|
||||
notes.append("Prompt syntax was not recognized; used Fixed prompt fallback")
|
||||
diagnostics=[{"level":"warning","code":"H3C-P100","message":str(exc)}]
|
||||
result={"magic":PROMPT_PLAN_MAGIC,"schema_version":PROMPT_PLAN_SCHEMA_VERSION,"mode":resolved_mode,"chunks":chunks,"chunk_seconds":chunk_seconds,"prompts":prompts,"hashes":[prompt_hash(p) for p in prompts],"notes":notes}
|
||||
result={"magic":PROMPT_PLAN_MAGIC,"schema_version":PROMPT_PLAN_SCHEMA_VERSION,"mode":resolved_mode,"chunks":chunks,"chunk_seconds":chunk_seconds,"chunk_durations":durations,"prompts":prompts,"hashes":[prompt_hash(p) for p in prompts],"notes":notes}
|
||||
if diagnostics: result["diagnostics"]=diagnostics
|
||||
return result
|
||||
def validate_prompt_plan(plan):
|
||||
@@ -197,9 +217,14 @@ def validate_prompt_plan(plan):
|
||||
if int(plan.get("schema_version",-1))!=PROMPT_PLAN_SCHEMA_VERSION: raise PromptPlanError(f"unsupported prompt-plan schema {plan.get('schema_version')}; expected {PROMPT_PLAN_SCHEMA_VERSION}")
|
||||
chunks=int(plan.get("chunks",0)); prompts=plan.get("prompts"); hashes=plan.get("hashes")
|
||||
if not 1<=chunks<=16: raise PromptPlanError("prompt-plan chunks are invalid")
|
||||
try: chunk_seconds=float(plan.get("chunk_seconds"))
|
||||
try: chunk_seconds=float(plan.get("chunk_seconds"))
|
||||
except (TypeError,ValueError): raise PromptPlanError("prompt-plan chunk_seconds is invalid") from None
|
||||
if not CHUNK_SECONDS_MIN<=chunk_seconds<=CHUNK_SECONDS_MAX: raise PromptPlanError(f"prompt-plan chunk_seconds must be between {CHUNK_SECONDS_MIN:.1f} and {CHUNK_SECONDS_MAX:.1f}")
|
||||
if not CHUNK_SECONDS_MIN<=chunk_seconds<=CHUNK_SECONDS_MAX: raise PromptPlanError(f"prompt-plan chunk_seconds must be between {CHUNK_SECONDS_MIN:.1f} and {CHUNK_SECONDS_MAX:.1f}")
|
||||
durations=plan.get("chunk_durations")
|
||||
if durations is None: durations=[chunk_seconds]*chunks
|
||||
if not isinstance(durations,list) or len(durations)!=chunks: raise PromptPlanError("prompt-plan chunk duration count does not match chunks")
|
||||
durations=[float(value) for value in durations]
|
||||
if any(value<CHUNK_SECONDS_MIN or value>CHUNK_SECONDS_MAX for value in durations): raise PromptPlanError("prompt-plan contains an invalid chunk duration")
|
||||
if not isinstance(prompts,list) or len(prompts)!=chunks: raise PromptPlanError("prompt-plan prompt count does not match chunks")
|
||||
if not isinstance(hashes,list) or len(hashes)!=chunks: raise PromptPlanError("prompt-plan hash count does not match chunks")
|
||||
for index,prompt in enumerate(prompts):
|
||||
@@ -207,7 +232,8 @@ def validate_prompt_plan(plan):
|
||||
if hashes[index]!=prompt_hash(prompt): raise PromptPlanError(f"prompt-plan hash mismatch at chunk {index+1}")
|
||||
diagnostics=plan.get("diagnostics")
|
||||
if diagnostics is not None and (not isinstance(diagnostics,list) or not all(isinstance(item,dict) for item in diagnostics)): raise PromptPlanError("prompt-plan diagnostics are invalid")
|
||||
return plan
|
||||
plan["chunk_durations"]=durations
|
||||
return plan
|
||||
def build_sampler_prompt_plan(*,prompt_mode,prompt_script,sequence_prompt,prompt_plan,chunks,chunk_seconds):
|
||||
chunks=int(chunks); chunk_seconds=float(chunk_seconds)
|
||||
if sequence_prompt is not None: return make_prompt_plan(mode=prompt_mode,script=sequence_prompt,chunks=chunks,chunk_seconds=chunk_seconds)
|
||||
@@ -216,7 +242,8 @@ def build_sampler_prompt_plan(*,prompt_mode,prompt_script,sequence_prompt,prompt
|
||||
prompts=list(plan["prompts"])
|
||||
if len(prompts)<chunks: prompts.extend([prompts[-1] if prompts else ""]*(chunks-len(prompts)))
|
||||
elif len(prompts)>chunks: prompts=prompts[:chunks]
|
||||
result=dict(plan); result["chunks"]=chunks; result["chunk_seconds"]=chunk_seconds; result["prompts"]=prompts; result["hashes"]=[prompt_hash(p) for p in prompts]
|
||||
result=dict(plan); result["chunks"]=chunks; result["chunk_seconds"]=chunk_seconds; result["chunk_durations"]=list(plan.get("chunk_durations") or [chunk_seconds]*int(plan["chunks"]))[:chunks]; result["prompts"]=prompts; result["hashes"]=[prompt_hash(p) for p in prompts]
|
||||
if len(result["chunk_durations"])<chunks: result["chunk_durations"].extend([chunk_seconds]*(chunks-len(result["chunk_durations"])))
|
||||
if int(plan["chunks"])!=chunks or abs(float(plan["chunk_seconds"])-chunk_seconds)>1e-6: result["notes"]=list(plan.get("notes") or [])+["adapted connected prompt plan to Sampler chunk settings"]
|
||||
return validate_prompt_plan(result)
|
||||
return make_prompt_plan(mode=prompt_mode,script=prompt_script,chunks=chunks,chunk_seconds=chunk_seconds)
|
||||
@@ -230,7 +257,8 @@ def apply_prompt_overrides(plan,overrides):
|
||||
return validate_prompt_plan(result)
|
||||
def prompt_plan_report(plan):
|
||||
plan=validate_prompt_plan(plan); unique=len(set(plan["hashes"])); note="; ".join(plan.get("notes") or [])
|
||||
result=f"Prompt plan: {plan['mode']}; {plan['chunks']} chunks; {unique} unique prompt(s); {plan['chunk_seconds']:.3f}s per chunk."
|
||||
durations=plan.get("chunk_durations") or [plan["chunk_seconds"]]*plan["chunks"]
|
||||
result=f"Prompt plan: {plan['mode']}; {plan['chunks']} chunks; durations [{', '.join(f'{value:g}s' for value in durations)}]; total {sum(durations):g}s; {unique} unique prompt(s)."
|
||||
if note: result+=" "+note+"."
|
||||
diagnostics=list(plan.get("diagnostics") or [])
|
||||
if not diagnostics: return result+"\nPrompt Preflight: OK."
|
||||
|
||||
Reference in New Issue
Block a user