ffmpeg-skill 3.6.4 → 3.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/docs/contract.md CHANGED
@@ -21,7 +21,7 @@ The contract is derived from the code that runs, not maintained beside it:
21
21
  | Field | Meaning | Changes when |
22
22
  |---|---|---|
23
23
  | `contract_version` | shape of this document (`2.0`) | a key is renamed, removed or changes meaning |
24
- | `skill.version` | the npm / package.json version (`3.6.4`) | any release |
24
+ | `skill.version` | the npm / package.json version (`3.6.5`) | any release |
25
25
 
26
26
  A release that adds a tool or a flag keeps `contract_version`; a breaking change to the
27
27
  ToolSpec shape bumps it. Consumers pin on `contract_version` and read `skill.version`
@@ -149,7 +149,7 @@ JSON would have been rewritten for that. The flat keys, typed per tool in `outpu
149
149
  "deprecated": [],
150
150
  "removed": [{"what": "...", "since": "1.10.0", "replacement": "...", "removed_in": "2.0.0", "where": "cli | json | mcp | behaviour"},
151
151
  {"what": "running on FFmpeg 5.x (the requirements.ffmpeg floor)", "since": "2.14.0", "replacement": "FFmpeg 6.1 or later; ...", "removed_in": "3.0.0", "where": "behaviour"}],
152
- "skill": {"id": "ffmpeg-skill", "version": "3.6.4", "execution_mode": "local", "kind": "execution",
152
+ "skill": {"id": "ffmpeg-skill", "version": "3.6.5", "execution_mode": "local", "kind": "execution",
153
153
  "entrypoints": {"cli": "...", "mcp": "...", "contract": "...", "doctor": "..."},
154
154
  "not_provided": ["AI reasoning", "decisions", "production plans", "project IR", "approvals", "network access", "transcription engine"]},
155
155
  "requirements": {"python": ">=3.10 (standard library only)", "ffmpeg": ">=6.1", "ffprobe": ">=6.1"},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ffmpeg-skill",
3
- "version": "3.6.4",
3
+ "version": "3.6.5",
4
4
  "mcpName": "io.github.kajisho5/ffmpeg-skill",
5
5
  "description": "Agent Skill that gives coding agents (Claude Code, Cursor, Codex) a local video editor: 42 FFmpeg tools with a machine-readable contract, contract-derived MCP server, FFmpeg capability detection, probe-first / verify-last workflow. Cut, join, silence removal, fit, captions and karaoke, overlays, motion graphics, HDR to SDR, LUTs, audio clean-up and typed dynamics, sync with drift correction, multicam, loudness, delivery checks, project rendering, batch. No API keys, no cloud, no dependencies.",
6
6
  "keywords": [
@@ -9,7 +9,7 @@ why it is its own file.
9
9
  """
10
10
  from __future__ import annotations
11
11
 
12
- import json
12
+ import math
13
13
  import os
14
14
  import re
15
15
  import unicodedata
@@ -18,7 +18,7 @@ from typing import Any, Dict, List, NamedTuple, Optional, Tuple
18
18
 
19
19
  from _common.decision import _unspaced_script, fmt_srt_time, parse_time
20
20
  from _common.emit import die, info, warn
21
- from _common.runner import read_text_or_die
21
+ from _common.runner import parse_json, read_json, read_text_or_die
22
22
 
23
23
  # The engines this skill knows how to drive, and how to install each -- one string, so every
24
24
  # tool that needs a transcript refuses in the same words. The two Parakeet engines are
@@ -85,26 +85,60 @@ class Transcription:
85
85
  f"facts={self.facts!r}, notes={self.notes!r})")
86
86
 
87
87
 
88
+ # A line that starts a cue even with no blank line before it: a clock time, "-->", a clock time,
89
+ # then nothing or whitespace (ffmpeg's position fields, X1:.. Y1:..). ffmpeg's SRT demuxer starts
90
+ # an event at every such line; the first line of a block holding "-->" is a timing line whatever
91
+ # its shape.
92
+ _SRT_CUE_START = re.compile(r"^\s*\d+:\d+[\d:.,]*\s*-->\s*\d+:\d+[\d:.,]*(\s|$)")
93
+
94
+
95
+ def srt_blocks(text: str) -> List[Tuple[str, List[str]]]:
96
+ """(timing line, text lines) of every cue in SRT text whose line ends are already `\\n`.
97
+
98
+ A blank (or whitespace-only) line ends a cue, and the first line holding "-->" in a run of
99
+ lines is its timing line; the lines before it (the index) are not text. Inside a run, a later
100
+ line shaped like a timing line (_SRT_CUE_START) starts the next cue, and a bare number just
101
+ before it is that cue's index, so an SRT written without blank lines between cues reads as
102
+ ffmpeg reads it rather than as one cue. A later line that merely contains "-->" is text."""
103
+ out: List[Tuple[str, List[str]]] = []
104
+ for run in re.split(r"\n\s*\n", text):
105
+ lines = [ln for ln in run.split("\n") if ln.strip()]
106
+ first = next((i for i, ln in enumerate(lines) if "-->" in ln), None)
107
+ if first is None:
108
+ continue
109
+ timing, body = lines[first], []
110
+ for ln in lines[first + 1:]:
111
+ if _SRT_CUE_START.match(ln):
112
+ if body and body[-1].strip().isdigit():
113
+ body.pop()
114
+ out.append((timing, body))
115
+ timing, body = ln, []
116
+ else:
117
+ body.append(ln)
118
+ out.append((timing, body))
119
+ return out
120
+
121
+
122
+ def srt_timing_times(line: str) -> Tuple[str, str]:
123
+ """The start and end tokens of an SRT timing line: what is before the first "-->", and the
124
+ first word after it. ffmpeg reads the two times and ignores the rest (position fields
125
+ `X1:.. X2:.. Y1:.. Y2:..`, or a stray second "-->")."""
126
+ a, _sep, b = line.partition("-->")
127
+ words = b.split()
128
+ return a.strip(), words[0] if words else ""
129
+
130
+
88
131
  def parse_srt(path: str) -> List[Tuple[float, float, str]]:
89
132
  cues: List[Tuple[float, float, str]] = []
90
- block: List[str] = []
91
- content = read_text_or_die(path, "--srt").lstrip("\ufeff").replace("\r\n", "\n") + "\n\n"
92
- for line in content.split("\n"):
93
- if line.strip():
94
- block.append(line)
95
- continue
96
- if block:
97
- times = next((b for b in block if "-->" in b), None)
98
- if times:
99
- a, b = times.split("-->")
100
- text = "\n".join(block[block.index(times) + 1:]).strip()
101
- try:
102
- cues.append((parse_time(a), parse_time(b), text))
103
- except ValueError as e: # includes MissingFpsError: SRT timings are hh:mm:ss,ms, never frames
104
- die(f"{path}: cannot read the timing line {times.strip()!r}: {e}")
105
- block = []
133
+ for times, body in srt_blocks(read_text_or_die(path, "--srt")):
134
+ a, b = srt_timing_times(times)
135
+ text = "\n".join(body).strip()
136
+ try:
137
+ cues.append((parse_time(a), parse_time(b), text))
138
+ except ValueError as e: # includes MissingFpsError: SRT timings are hh:mm:ss,ms, never frames
139
+ die(f"{path}: cannot read the timing line {times.strip()!r}: {e}", kind="input")
106
140
  if not cues:
107
- die(f"no cues found in {path}")
141
+ die(f"no cues found in {path}", kind="input")
108
142
  return cues
109
143
 
110
144
 
@@ -204,8 +238,9 @@ def write_srt(cues: List[Tuple[float, float, str]], path: str) -> None:
204
238
  # line with two adjacent pipes ("a||b") becomes "a\n\nb" -- and writing that blank line
205
239
  # raw would split one cue into two malformed half-blocks (the second missing its own
206
240
  # index/timecode). Collapse any run of blank lines within the cue text to a single
207
- # newline so the cue's own text can never fake the format's block boundary.
208
- t = re.sub(r"\n{2,}", "\n", t).strip("\n")
241
+ # newline so the cue's own text can never fake the format's block boundary. A line of
242
+ # only spaces or tabs is blank to every SRT reader too, so it goes the same way.
243
+ t = "\n".join(ln for ln in t.split("\n") if ln.strip())
209
244
  fh.write(f"{i}\n{fmt_srt_time(s)} --> {fmt_srt_time(e)}\n{t}\n\n")
210
245
  # under batch.py: this SRT as written is the run's own (an edit made after it is not)
211
246
  from _common.runner import report_committed
@@ -476,20 +511,24 @@ def whisper_word_timings(srt_path: Optional[str]) -> List[Tuple[float, float, st
476
511
  if not os.path.exists(cand):
477
512
  continue
478
513
  try:
479
- data = json.loads(Path(cand).read_text(encoding="utf-8"))
514
+ data = read_json(cand)
480
515
  except (OSError, ValueError):
481
516
  continue
517
+ # the shape is not checked first: a segment that is a string or a list, or "segments" that
518
+ # is a number, is simply no words, as _dicts() reads every engine's JSON
482
519
  raw = []
483
520
  if isinstance(data, dict):
484
- raw = list(data.get("words") or [])
485
- for seg in data.get("segments") or []:
486
- raw.extend((seg or {}).get("words") or [])
521
+ raw = _dicts(data.get("words"))
522
+ for seg in _dicts(data.get("segments")):
523
+ raw.extend(_dicts(seg.get("words")))
487
524
  words = []
488
525
  for w in raw:
489
526
  try:
490
527
  text = str(w.get("word") or w.get("text") or "").strip()
491
- if text:
492
- words.append((float(w["start"]), float(w["end"]), text))
528
+ start, end = float(w["start"]), float(w["end"])
529
+ # NaN / Infinity are valid to json.loads and place no word anywhere
530
+ if text and math.isfinite(start) and math.isfinite(end):
531
+ words.append((start, end, text))
493
532
  except (AttributeError, KeyError, TypeError, ValueError):
494
533
  continue
495
534
  if words:
@@ -519,12 +558,12 @@ def _words_from_whisper_cpp_json(path: str) -> "List[Dict[str, Any]]":
519
558
  boundaries). A token that is part of a character (U+FFFD) is still glued.
520
559
  """
521
560
  try:
522
- doc = json.loads(Path(path).read_text(encoding="utf-8"))
561
+ doc = read_json(path)
523
562
  except (OSError, ValueError):
524
563
  return []
525
564
  out: "List[Dict[str, Any]]" = []
526
- for seg in (doc.get("transcription") or []):
527
- for tok in (seg.get("tokens") or []):
565
+ for seg in _dicts(doc.get("transcription")) if isinstance(doc, dict) else []:
566
+ for tok in _dicts(seg.get("tokens")):
528
567
  text = str(tok.get("text") or "")
529
568
  if not text.strip() or text.strip().startswith("[_"):
530
569
  continue
@@ -552,7 +591,7 @@ def _whisper_json_language(path: str) -> Optional[str]:
552
591
  """The language a Whisper engine's JSON says it decoded: whisper.cpp's `result.language`, or
553
592
  openai-whisper's top-level `language`. None when the file has neither."""
554
593
  try:
555
- doc = json.loads(Path(path).read_text(encoding="utf-8")) or {}
594
+ doc = read_json(path) or {}
556
595
  lang = str(((doc.get("result") or {}).get("language")) or doc.get("language") or "").strip().lower()
557
596
  except (OSError, ValueError, AttributeError):
558
597
  return None
@@ -568,12 +607,12 @@ def _heard_language(heard: list) -> Optional[str]:
568
607
  def _words_from_openai_whisper_json(path: str) -> "List[Dict[str, Any]]":
569
608
  """openai-whisper --word_timestamps True --output_format json: segments[].words[]."""
570
609
  try:
571
- doc = json.loads(Path(path).read_text(encoding="utf-8"))
610
+ doc = read_json(path)
572
611
  except (OSError, ValueError):
573
612
  return []
574
613
  out: "List[Dict[str, Any]]" = []
575
- for seg in (doc.get("segments") or []):
576
- for w in (seg.get("words") or []):
614
+ for seg in _dicts(doc.get("segments")) if isinstance(doc, dict) else []:
615
+ for w in _dicts(seg.get("words")):
577
616
  try:
578
617
  out.append({"word": str(w.get("word") or w.get("text") or "").strip(),
579
618
  "start": float(w["start"]), "end": float(w["end"])})
@@ -592,7 +631,7 @@ def _words_from_parakeet_mlx_json(path: str) -> "List[Dict[str, Any]]":
592
631
  after it starts a word too (" m" "is" "ter" " " "Q" "u" "il" "ter" -> "mister", "Quilter").
593
632
  """
594
633
  try:
595
- doc = json.loads(Path(path).read_text(encoding="utf-8"))
634
+ doc = read_json(path)
596
635
  except (OSError, ValueError):
597
636
  return []
598
637
  out: "List[Dict[str, Any]]" = []
@@ -619,7 +658,7 @@ def _words_from_parakeet_mlx_json(path: str) -> "List[Dict[str, Any]]":
619
658
  def _cues_from_parakeet_mlx_json(path: str) -> List[Tuple[float, float, str]]:
620
659
  """parakeet-mlx's own sentence segmentation, as cues."""
621
660
  try:
622
- doc = json.loads(Path(path).read_text(encoding="utf-8"))
661
+ doc = read_json(path)
623
662
  except (OSError, ValueError):
624
663
  return []
625
664
  cues: List[Tuple[float, float, str]] = []
@@ -642,7 +681,7 @@ def _dicts(value: Any) -> "List[Dict[str, Any]]":
642
681
  def _words_from_parakeet_cpp_json(text: str) -> "List[Dict[str, Any]]":
643
682
  """parakeet-cli transcribe --json: {"words": [{"w", "start", "end", "conf"}]}, times in seconds."""
644
683
  try:
645
- doc = json.loads(text)
684
+ doc = parse_json(text)
646
685
  except ValueError:
647
686
  return []
648
687
  out: "List[Dict[str, Any]]" = []
@@ -978,7 +1017,7 @@ def _heard_nothing(text: str, key: str) -> bool:
978
1017
  Anything else that yields no words -- not JSON, the wrong shape, entries that do not parse --
979
1018
  is output that could not be read, not a finding that nobody spoke."""
980
1019
  try:
981
- doc = json.loads(text)
1020
+ doc = parse_json(text)
982
1021
  except ValueError:
983
1022
  return False
984
1023
  return isinstance(doc, dict) and doc.get(key) == []
@@ -990,7 +1029,7 @@ def _whisper_heard_nothing(path: str, key: str) -> bool:
990
1029
  no speech (#414). A document with text and no word timings is a build without them, not
991
1030
  silence, and stays the "no word-level timings" refusal."""
992
1031
  try:
993
- doc = json.loads(Path(path).read_text(encoding="utf-8"))
1032
+ doc = read_json(path)
994
1033
  except (OSError, ValueError):
995
1034
  return False
996
1035
  if not isinstance(doc, dict) or not isinstance(doc.get(key), list):
@@ -6,7 +6,6 @@ and encoder-selection rules testable on their own.
6
6
  """
7
7
  from __future__ import annotations
8
8
 
9
- import json
10
9
  import math
11
10
  import os
12
11
  import re
@@ -17,6 +16,7 @@ from typing import Any, Dict, List, Optional, Sequence, Tuple
17
16
  from _common.color import (as_limited, bt709_label_filter, bt709_matrix_args, bt709_matrix_filter, bt709_tag_args, drawn_stream_format,
18
17
  is_neutral_color, limited_range_filter, rgb_island, rgb_to_bt709_filter, _sdr_bt709)
19
18
  from _common.emit import die, record_fallback, refuse, warn
19
+ from _common.runner import read_json
20
20
  from _common.runner import CODECS, STATE, ffmpeg_encoders, ffmpeg_list_error, ffmpeg_version, hw_platform_reason
21
21
 
22
22
 
@@ -1025,13 +1025,29 @@ def load_brand(path: Optional[str]) -> Dict[str, Any]:
1025
1025
  if not path:
1026
1026
  return brand
1027
1027
  if not os.path.exists(path):
1028
- die(f"brand file not found: {path}")
1028
+ die(f"brand file not found: {path}", kind="input")
1029
1029
  try:
1030
- data = json.loads(Path(path).read_text(encoding="utf-8"))
1031
- except ValueError as exc:
1032
- die(f"brand file is not valid JSON: {exc}")
1030
+ data = read_json(path)
1031
+ except OSError as exc:
1032
+ die(f"brand file {path} cannot be read: {exc.strerror or exc}", kind="input")
1033
+ except ValueError as exc: # malformed, not UTF-8, or nested too deep (read_json)
1034
+ die(f"brand file is not valid JSON: {exc}", kind="input")
1035
+ if not isinstance(data, dict):
1036
+ die(f"brand file {path} must be a JSON object {{...}}, got {type(data).__name__}", kind="input")
1037
+ # the shapes the readers below and brand_caption_style() walk: a block that is not an object,
1038
+ # and a path that is not a string, were a traceback there
1039
+ for key, value in (*data.items(), ("styles.caption", (data.get("styles") or {}).get("caption")
1040
+ if isinstance(data.get("styles"), dict) else None)):
1041
+ if value is None:
1042
+ continue
1043
+ if (isinstance(BRAND_DEFAULTS.get(key), dict) or key == "styles.caption") and not isinstance(value, dict):
1044
+ die(f'brand file {path}: "{key}" must be an object {{...}}, got {type(value).__name__}', kind="input")
1045
+ if key in ("logo", "font_file", "font") and not isinstance(value, str):
1046
+ die(f'brand file {path}: "{key}" must be a string, got {type(value).__name__}', kind="input")
1033
1047
  base = Path(path).resolve().parent
1034
1048
  for k, v in data.items():
1049
+ if v is None and isinstance(brand.get(k), dict):
1050
+ continue # a null block keeps its defaults: readers walk it as an object (#483 review)
1035
1051
  if isinstance(v, dict) and isinstance(brand.get(k), dict):
1036
1052
  brand[k].update(v)
1037
1053
  else:
@@ -2487,15 +2487,27 @@ def _read_ff_list(flag: str, pattern: str) -> set:
2487
2487
  return names
2488
2488
 
2489
2489
 
2490
+ _LINE_END = re.compile(r"\r*\n|\r")
2491
+
2492
+
2493
+ def normalize_text(text: str) -> str:
2494
+ """A caller's text as every reader here takes it: a leading UTF-8 BOM dropped, and every line
2495
+ ending `\\n`. `\\r\\r\\n` is one line end, as ffmpeg's text demuxers read it (a CRLF file passed
2496
+ through a second CRLF conversion); a lone `\\r` (classic Mac) is one too. Only these: a line is
2497
+ never split at U+2028, U+0085, \\v or \\f, which str.splitlines() also splits at."""
2498
+ return _LINE_END.sub("\n", text.lstrip("\ufeff"))
2499
+
2500
+
2490
2501
  def read_text_or_die(path: str, flag: str) -> str:
2491
2502
  """Read a caller-supplied UTF-8 text file (a cue list, chapters, notes) or fail as kind input
2492
- with the flag named, instead of a FileNotFoundError / UnicodeDecodeError traceback."""
2503
+ with the flag named, instead of a FileNotFoundError / UnicodeDecodeError traceback. The text
2504
+ comes back through normalize_text(): no BOM, `\\n` line ends."""
2493
2505
  if os.path.isdir(path):
2494
2506
  # checked first: Windows raises PermissionError, not IsADirectoryError, for a directory
2495
2507
  die(f"{flag}: {path} is a directory, not a text file")
2496
2508
  try:
2497
- with open(path, "r", encoding="utf-8") as fh:
2498
- return fh.read()
2509
+ with open(path, "r", encoding="utf-8", newline="") as fh:
2510
+ return normalize_text(fh.read())
2499
2511
  except FileNotFoundError:
2500
2512
  die(f"{flag}: {path} does not exist")
2501
2513
  except IsADirectoryError:
@@ -2507,6 +2519,44 @@ def read_text_or_die(path: str, flag: str) -> str:
2507
2519
  return "" # unreachable
2508
2520
 
2509
2521
 
2522
+ # Deeper than any project, recipe, brand, plan or transcript this skill reads (those are four or
2523
+ # five levels); a file nested past it is refused before code that walks it recursively
2524
+ # (copy.deepcopy, json.dumps) can raise RecursionError.
2525
+ JSON_MAX_DEPTH = 64
2526
+
2527
+
2528
+ class JsonTooDeep(ValueError):
2529
+ """parse_json()'s refusal of a document nested past JSON_MAX_DEPTH: a ValueError, so callers
2530
+ that catch ValueError refuse it as malformed JSON; one that falls back on a non-JSON file (a
2531
+ media file) can tell this apart, since the file was JSON."""
2532
+
2533
+
2534
+ def parse_json(text: str) -> Any:
2535
+ """json.loads for a caller's file: a BOM is dropped, and every way the text can fail to be a
2536
+ document this skill can walk raises ValueError -- malformed JSON (json's own ValueError),
2537
+ nesting too deep for the parser (RecursionError) or deeper than JSON_MAX_DEPTH. Callers that
2538
+ already catch ValueError therefore refuse all three as they refuse malformed JSON."""
2539
+ try:
2540
+ data = json.loads(text.lstrip("\ufeff"))
2541
+ except RecursionError:
2542
+ raise JsonTooDeep(f"nested more than {JSON_MAX_DEPTH} levels deep") from None
2543
+ stack = [(data, 1)]
2544
+ while stack:
2545
+ value, depth = stack.pop()
2546
+ if isinstance(value, (dict, list)):
2547
+ if depth > JSON_MAX_DEPTH:
2548
+ raise JsonTooDeep(f"nested more than {JSON_MAX_DEPTH} levels deep")
2549
+ stack.extend((v, depth + 1) for v in (value.values() if isinstance(value, dict) else value))
2550
+ return data
2551
+
2552
+
2553
+ def read_json(path: "os.PathLike[str] | str") -> Any:
2554
+ """parse_json() of a UTF-8 file. Raises OSError for a file that cannot be read and ValueError
2555
+ (UnicodeDecodeError is one) for anything else, so `except (OSError, ValueError)` covers it."""
2556
+ with open(path, "r", encoding="utf-8") as fh:
2557
+ return parse_json(fh.read())
2558
+
2559
+
2510
2560
  # Deferred to the foot of the module on purpose. runner is the first module the package loads and
2511
2561
  # emit needs runner's Context/STATE/ERROR_CODE, so the two form a cycle that has to be cut
2512
2562
  # somewhere: by the time this line runs every name emit reads from runner above is defined, and
@@ -443,6 +443,8 @@ ERROR_REASONS = {
443
443
  "plan_unknown_tool": "render.py PLAN: the plan names no tool render.py can run; details: {plan, plan_sha256, checked_at, tool, audit_log}",
444
444
  "plan_cwd_missing": "render.py PLAN: the directory the plan was made in is gone; details: {plan, plan_sha256, checked_at, cwd, audit_log}",
445
445
  "plan_argv_invalid": "render.py PLAN: argv is not a list; details: {plan, plan_sha256, checked_at, argv_type, audit_log}",
446
+ "plan_field_invalid": "render.py PLAN: inputs, unbound_inputs, verify (objects), commands (strings) or cwd has the wrong JSON type; "
447
+ "details: {plan, plan_sha256, checked_at, field, field_type, audit_log}",
446
448
  "decoder_missing": "color.py / graphics.py / overlay.py: a VP9 source or --video layer stored with an alpha layer, on a build with no libvpx-vp9 decoder (FFmpeg's own VP9 decoder drops the alpha), kind missing_tool; details: {name}",
447
449
  "encoder_missing": "--codec av1/prores: the build's encoder list was read and has no encoder for the codec (kind missing_tool; details: {codec, encoders}); or ffmpeg itself reported \"Unknown encoder\" for the encoder the command named (kind ffmpeg; details: {name}; the hint points at doctor)",
448
450
  "asr_engine_missing": "kind missing_tool: --transcribe (caption.py; silence.py with --filler or a sentence flag) found no local speech-to-text engine; the message lists the install lines; details: {}",
package/scripts/batch.py CHANGED
@@ -33,7 +33,7 @@ from pathlib import Path
33
33
  from typing import Any, Dict, List, Optional
34
34
 
35
35
  from _common import STATE, add_common, apply_common, child_args, die, emit, info, run_tool, MEDIA_EXT as _MEDIA_EXT
36
- from _common.runner import (HW_FORCED_ENV, OWNED_ENV, _OutputLock, add_hw_orchestrator_args, copy_to_sibling, env_hw,
36
+ from _common.runner import (HW_FORCED_ENV, OWNED_ENV, _OutputLock, add_hw_orchestrator_args, copy_to_sibling, env_hw, read_json,
37
37
  owned_identity, stop_children)
38
38
  from _common.emit import absorb_stage_hw, audit, note, shown, steps_encoder_report, warn
39
39
  from _common.decision import rebase_project_paths
@@ -235,6 +235,39 @@ def intermediate_ext(src: Path) -> str:
235
235
  return src.suffix.lstrip(".") if src.suffix.lower() in (".wav", ".mp3", ".m4a", ".flac") else "mp4"
236
236
 
237
237
 
238
+ # the recipe keys the run reads as a string: a path, a glob, a file-name part
239
+ RECIPE_STRINGS = ("glob", "project", "output_dir", "suffix", "ext")
240
+
241
+
242
+ def check_recipe_types(recipe: Dict[str, Any]) -> None:
243
+ """Refuse a recipe value of the wrong JSON type before anything runs (A18): a number where a
244
+ path or glob goes, an absolute glob (pathlib refuses it), a step that is not a list. Each was
245
+ a traceback, or a failure of every item naming the step's first character."""
246
+ for key in RECIPE_STRINGS:
247
+ value = recipe.get(key)
248
+ if value is not None and not isinstance(value, str):
249
+ die(f'recipe "{key}" must be a string, got {type(value).__name__} {value!r:.60}', kind="input")
250
+ glob = recipe.get("glob")
251
+ if glob and (os.path.isabs(glob) or glob.startswith(("/", "\\"))):
252
+ die(f'recipe "glob" {glob!r} is an absolute path: it matches names inside the batch folder, e.g. "*.mp4" '
253
+ 'or "sub/*.mov"', kind="input")
254
+ key = recipe.get("clip_key")
255
+ try:
256
+ index = int(key) if key is not None and not isinstance(key, (bool, float)) else (0 if key is None else -1)
257
+ except (TypeError, ValueError):
258
+ index = -1
259
+ if index < 0:
260
+ die(f'recipe "clip_key" must be a clip index (0, 1, ...), got {key!r:.60}', kind="input")
261
+ steps = recipe.get("steps")
262
+ if steps is not None and not isinstance(steps, list):
263
+ die(f'recipe "steps" must be a list of steps, each ["script.py", args...], got {type(steps).__name__}',
264
+ kind="input")
265
+ for i, st in enumerate(steps or []):
266
+ if not isinstance(st, list) or not st:
267
+ die(f'recipe step {i} must be a list ["script.py", args...], got {type(st).__name__} {st!r:.60}',
268
+ kind="input")
269
+
270
+
238
271
  def step_writes(step: Any) -> bool:
239
272
  """Whether a recipe step writes a file: it names {out} (check.py and probe.py do not)."""
240
273
  return isinstance(step, list) and any("{out}" in str(a) for a in step[1:])
@@ -382,14 +415,14 @@ def process(src: Path, recipe: Dict[str, Any], outdir: Path, work: Path,
382
415
  return max(1.0, deadline - time.monotonic())
383
416
  if recipe.get("project"):
384
417
  try:
385
- proj = json.loads(Path(str(recipe["project"])).read_text(encoding="utf-8"))
418
+ proj = read_json(str(recipe["project"])) # too deep is a ValueError too (A20)
386
419
  except (OSError, ValueError) as e:
387
420
  raise ItemError({"step": None, "tool": "render.py", "kind": "input", "reason": "recipe_project_unreadable",
388
421
  "message": f"recipe.project: {recipe['project']} could not be read as JSON: {e}"})
389
422
  if not isinstance(proj, dict):
390
423
  raise ItemError({"step": None, "tool": "render.py", "kind": "input", "reason": "recipe_project_unreadable",
391
424
  "message": f"recipe.project: {recipe['project']} is not a JSON object"})
392
- idx = int(recipe.get("clip_key", 0))
425
+ idx = int(recipe.get("clip_key") or 0) # null is clip 0, as check_recipe_types() reads it
393
426
  proj.setdefault("clips", [{}])
394
427
  while len(proj["clips"]) <= idx:
395
428
  proj["clips"].append({})
@@ -539,11 +572,12 @@ def main() -> int:
539
572
  if not folder.is_dir():
540
573
  die(f"not a folder: {folder}")
541
574
  try:
542
- recipe = json.loads(Path(args.recipe).read_text(encoding="utf-8"))
575
+ recipe = read_json(args.recipe) # too deep is a ValueError too (A20)
543
576
  except (OSError, ValueError) as exc:
544
- die(f"cannot read recipe: {exc}")
577
+ die(f"cannot read recipe: {exc}", kind="input")
545
578
  if not isinstance(recipe, dict):
546
- die("cannot read recipe: not a JSON object")
579
+ die("cannot read recipe: not a JSON object", kind="input")
580
+ check_recipe_types(recipe)
547
581
  if recipe.get("project") and not os.path.isabs(recipe["project"]):
548
582
  recipe["project"] = str((Path(args.recipe).resolve().parent / recipe["project"]))
549
583
  # a recipe error is the same for every item: refuse it once, before any item runs, rather than
@@ -59,6 +59,8 @@ from _common.runner import subtitle_codec_for, subtitle_container_holds
59
59
  from _common.fonts import font_choice, record_font_choice
60
60
  from _common import (ASR_INSTALL_HINT, die_no_engine, parse_srt, transcribe, whisper_word_timings,
61
61
  write_srt)
62
+ from _common.asr import srt_blocks
63
+ from _common.runner import normalize_text
62
64
  from _common import (SAFE_WIDTH_FRACTION, ORPHAN_MIN_EM, WRAP_MODES, wrap_text, wrap_variants, best_break,
63
65
  fit_size, line_em_for_size, MIN_CAPTION_FRACTION,
64
66
  break_penalty, _is_weak_line, _atoms, _join, _break_spaced, _bare_word, _function_words,
@@ -83,10 +85,21 @@ ALIGN = {"bottom": 2, "top": 8, "center": 5, "bottom-left": 1, "bottom-right": 3
83
85
  FORCE_STYLE_ALIGN = {"bottom": 2, "top": 6, "center": 10, "bottom-left": 1, "bottom-right": 3, "top-left": 5, "top-right": 7}
84
86
 
85
87
  TIME_RE = re.compile(
86
- r"^\s*(?P<a>[\d:.,@]+)\s*(?:-->|-|–|to)\s*(?P<b>[\d:.,@]+)\s+(?P<text>.+)$" # @ = the 1.9 @fps suffix
88
+ r"^\s*(?P<a>[\d:.,@]+)\s*(?P<sep>-->|-|–|to)\s*(?P<b>[\d:.,@]+)\s+(?P<text>.+)$" # @ = the 1.9 @fps suffix
87
89
  )
88
90
 
89
91
 
92
+ def cue_times_match(line: str) -> "Optional[re.Match[str]]":
93
+ """TIME_RE's match of a --text line, or None when the line is caption text. The documented
94
+ separators are "-" and "-->", and with them bare seconds are times ("0-1.5 Hello"). "to" is
95
+ also an English word: "3 to 5 apples" is text, so with "to" both sides must be clock times
96
+ (a ':' in each, "0:03 to 0:05 Hello")."""
97
+ m = TIME_RE.match(line)
98
+ if m and m.group("sep") == "to" and not (":" in m.group("a") and ":" in m.group("b")):
99
+ return None
100
+ return m
101
+
102
+
90
103
  # an SRT timing line: the times alone, the cue text on the lines after it
91
104
  DROP_FRAME_RE = re.compile(r"^\s*\d+:\d{2}:\d{2};\d+")
92
105
  SRT_TIMING_RE = re.compile(r"^\s*\d+:\d{2}:\d{2}[,.]\d+\s*-->\s*\d+:\d{2}:\d{2}[,.]\d+\s*$")
@@ -95,9 +108,11 @@ SRT_TIMING_RE = re.compile(r"^\s*\d+:\d{2}:\d{2}[,.]\d+\s*-->\s*\d+:\d{2}:\d{2}[
95
108
  def parse_text_cues(path: str, auto_seconds: float, gap: float, fps: Optional[float] = None) -> List[Tuple[float, float, str]]:
96
109
  cues: List[Tuple[float, float, str]] = []
97
110
  cursor = 0.0
98
- lines = read_text_or_die(path, "--text").lstrip("\ufeff").splitlines(True)
111
+ # split at "\n" only: splitlines() also breaks a cue at U+2028, U+0085, \v and \f, which
112
+ # made the rest of the line an auto-timed cue of its own
113
+ lines = read_text_or_die(path, "--text").split("\n")
99
114
  for n, raw in enumerate(lines, 1):
100
- if SRT_TIMING_RE.match(raw.rstrip("\r\n")):
115
+ if SRT_TIMING_RE.match(raw):
101
116
  # a cue file puts the text on the line with its times; this line has the times alone, so
102
117
  # the file is an SRT. Read as a cue file, its numbers and timing lines would be burned in
103
118
  # as captions, auto-timed 3 s apart (#396)
@@ -107,11 +122,10 @@ def parse_text_cues(path: str, auto_seconds: float, gap: float, fps: Optional[fl
107
122
  # TIME_RE has no ';', so the line would be burned as caption text, auto-timed
108
123
  die(f"--text: line {n} has a drop-frame timecode (';'), which is not read: write it as "
109
124
  "hh:mm:ss:ff@29.97 or in seconds", kind="input")
110
- for raw in lines:
111
- line = raw.rstrip("\n")
125
+ for line in lines:
112
126
  if not line.strip():
113
127
  continue
114
- m = TIME_RE.match(line)
128
+ m = cue_times_match(line)
115
129
  if m:
116
130
  try:
117
131
  start, end = parse_time(m.group("a"), fps), parse_time(m.group("b"), fps)
@@ -535,7 +549,7 @@ def max_line_em(args, play_w: Optional[int], play_h: Optional[int]) -> Optional[
535
549
  def parse_ass_dialogue(path: str) -> str:
536
550
  """The spoken text of an ASS file, for script detection -- style/override blocks stripped."""
537
551
  text = []
538
- for line in read_text_or_die(path, "--ass").lstrip("\ufeff").splitlines():
552
+ for line in read_text_or_die(path, "--ass").split("\n"):
539
553
  if not line.startswith("Dialogue:"):
540
554
  continue
541
555
  fields = line.split(",", 9)
@@ -557,7 +571,7 @@ def parse_ass_cues(path: str, stats: Optional[dict] = None) -> List[Tuple[float,
557
571
  # the [Events] Format line names the columns; Text is always last (libass reads it the same
558
572
  # way), and a file without one gets the standard ten
559
573
  names = ["layer", "start", "end", "style", "name", "marginl", "marginr", "marginv", "effect", "text"]
560
- for line in read_text_or_die(path, "--ass").lstrip("\ufeff").splitlines():
574
+ for line in read_text_or_die(path, "--ass").split("\n"):
561
575
  if line.startswith("Format:") and "text" in line.lower():
562
576
  names = [n.strip().lower() for n in line.partition(":")[2].split(",")]
563
577
  continue
@@ -601,7 +615,8 @@ def count_visible_cues(cues, duration) -> Tuple[int, int]:
601
615
  def shift_ass_file(src: str, dst: str, offset: float) -> Tuple[int, int]:
602
616
  """Copy an ASS file with every Dialogue start/end moved by `offset` seconds; (lines shifted,
603
617
  Dialogue lines copied unshifted because their timestamps could not be read)."""
604
- text, n, unshifted = shift_ass_text(Path(src).read_text(encoding="utf-8-sig"), offset)
618
+ # read as the dry run reads it: a file that is not UTF-8 is refused as kind input on both
619
+ text, n, unshifted = shift_ass_text(read_text_or_die(src, "--ass"), offset)
605
620
  Path(dst).write_text(text, encoding="utf-8-sig")
606
621
  return n, unshifted
607
622
 
@@ -621,7 +636,9 @@ def shift_ass_text(source: str, offset: float) -> Tuple[str, int, int]:
621
636
 
622
637
  n = unshifted = 0
623
638
  out = []
624
- for line in source.splitlines():
639
+ # lines end at "\n" only (libass reads them so); a U+2028 inside a Dialogue's text is text
640
+ body = normalize_text(source)
641
+ for line in (body[:-1] if body.endswith("\n") else body).split("\n"):
625
642
  if line.startswith("Dialogue:"):
626
643
  head, sep, rest = line.partition(":")
627
644
  fields = rest.split(",")
@@ -929,12 +946,9 @@ def srt_timings_shared_grammar(path: str) -> bool:
929
946
  """True when every timing line of the SRT at `path` reads the same to ffmpeg's SRT demuxer as
930
947
  to parse_srt(). ffmpeg refuses `00:01,000` (no hours) and reads `00:00:01,5` as 1.005 s, where
931
948
  parse_srt() reads 1.5 s (#414); such a file is handed to ffmpeg as a rewritten copy."""
932
- text = read_text_or_die(path, "--srt").lstrip("\ufeff").replace("\r\n", "\n")
933
- # a cue's timing line is its first line with "-->", as parse_srt() reads it (and ffmpeg too);
934
- # a later line holding "-->" is dialogue, not a timing this check should judge
935
- blocks = [[ln for ln in b.split("\n") if ln.strip()] for b in re.split(r"\n\s*\n", text)]
936
- timings = [next((ln for ln in b if "-->" in ln), None) for b in blocks]
937
- return all(_SHARED_SRT_TIMING.match(line) for line in timings if line is not None)
949
+ # the timing lines parse_srt() reads, grouped as it groups them (srt_blocks()): a later line
950
+ # that only holds "-->" is dialogue, not a timing this check should judge
951
+ return all(_SHARED_SRT_TIMING.match(times) for times, _body in srt_blocks(read_text_or_die(path, "--srt")))
938
952
 
939
953
 
940
954
  def mux_subtitle_codec(output: str) -> str:
@@ -1461,7 +1475,7 @@ def main() -> int:
1461
1475
  if args.ass and args.offset and os.path.exists(args.ass):
1462
1476
  shifted = os.path.splitext(output)[0] + "_offset.ass"
1463
1477
  if STATE.dry_run:
1464
- _text, n, unshifted = shift_ass_text(read_text_or_die(args.ass, "--ass").lstrip("\ufeff"), args.offset)
1478
+ _text, n, unshifted = shift_ass_text(read_text_or_die(args.ass, "--ass"), args.offset)
1465
1479
  info(f"[dry-run] would write {shifted} ({n} cues shifted by {args.offset:+g} s)")
1466
1480
  else:
1467
1481
  n, unshifted = shift_ass_file(args.ass, shifted, args.offset)
package/scripts/cut.py CHANGED
@@ -58,7 +58,7 @@ import tempfile
58
58
  import zlib
59
59
  from typing import List, Tuple
60
60
 
61
- from _common.runner import fail_if_classified
61
+ from _common.runner import JsonTooDeep, fail_if_classified, read_json
62
62
  from _common import (beat_grid, snap_points, decode_pcm_mono, rms_envelope, BEAT_MIN_CONFIDENCE)
63
63
  from _common import require_tool
64
64
  from _common.probe import TS_EXTS, signatures_match, stream_signature
@@ -1199,11 +1199,15 @@ def _grid_from_source(path: str, min_confidence: float) -> "dict":
1199
1199
  """The beat grid of `path`: a scenes.py --json document if that is what it is, otherwise a
1200
1200
  media file to measure. Reading a document is how a caller avoids a second decode."""
1201
1201
  try:
1202
- with open(path, "r", encoding="utf-8") as fh:
1203
- doc = json.load(fh)
1202
+ doc = read_json(path) # a media file is not UTF-8 or not JSON: a ValueError, then measured
1203
+ except JsonTooDeep as exc:
1204
+ die(f"--snap-source {path}: {exc}", kind="input")
1204
1205
  except (OSError, ValueError):
1205
1206
  doc = None
1206
1207
  if isinstance(doc, dict) and doc.get("beat_grid"):
1208
+ if not isinstance(doc["beat_grid"], dict) or not isinstance(doc.get("beats") or [], list):
1209
+ die(f"--snap-source {path}: beat_grid must be an object and beats a list "
1210
+ "(regenerate it with `scenes.py MUSIC --beats --json`)", kind="input")
1207
1211
  grid = dict(doc["beat_grid"])
1208
1212
  grid["beats"] = doc.get("beats") or []
1209
1213
  # A scenes.py document carries the supported subset since 1.17; one written by an older
package/scripts/join.py CHANGED
@@ -44,6 +44,7 @@ from fractions import Fraction
44
44
  from typing import Any, Dict, List, Optional, Tuple
45
45
 
46
46
  from _common.probe import SILENT_PEAK_DBFS, signatures_match, stream_signature
47
+ from _common.runner import read_text_or_die
47
48
  from _common import STATE, AUDIO_MEDIA_EXT, concat_list_line, guard_sidecar, place_output, refuse, sibling_temp, as_limited, draws_chroma, drawn_chain, label_chain, matrix_chain, range_chain, video_args, aac_args, add_common, apply_common, audio_codec_for, default_output, die, dry_run_input_pending, emit, ffmpeg_base, info, measured_level_dbfs, is_audio_output, probe, require_tool, run, validate_color, X264_PRESETS, fmt_secs
48
49
  from _common.emit import note, warn
49
50
  from _common.decision import av_clip_length, av_trim, stream_starts
@@ -280,13 +281,12 @@ def read_list(path: str) -> List[str]:
280
281
  """--list FILE: one segment per line, in order, relative to the list file's own folder.
281
282
  Blank lines and # comments are ignored, and ffmpeg's concat-demuxer spelling
282
283
  (`file 'part 01.wav'`) is accepted, so a list written for `ffmpeg -f concat` works as is."""
283
- try:
284
- text = open(path, encoding="utf-8").read()
285
- except OSError as exc:
286
- die(f"cannot read --list {path}: {exc}")
284
+ # the shared reader: a BOM, CRLF and a file that is not UTF-8 are read or refused as every
285
+ # other text input is, and a line ends at "\n" only
286
+ text = read_text_or_die(path, "--list")
287
287
  base = os.path.dirname(os.path.abspath(path))
288
288
  entries: List[str] = []
289
- for line in text.splitlines():
289
+ for line in text.split("\n"):
290
290
  line = line.strip()
291
291
  if not line or line.startswith("#"):
292
292
  continue
@@ -43,7 +43,7 @@ def parse_chapters(path: str, duration: float) -> List[Dict[str, Any]]:
43
43
  start inside the file, the last chapter running to the file's end."""
44
44
  text = read_text_or_die(path, "--chapters")
45
45
  entries: List[Dict[str, Any]] = []
46
- for n, raw in enumerate(text.splitlines(), start=1):
46
+ for n, raw in enumerate(text.split("\n"), start=1): # not splitlines(): a title may hold U+2028
47
47
  line = raw.strip()
48
48
  if not line or line.startswith("#"):
49
49
  continue
package/scripts/render.py CHANGED
@@ -75,7 +75,7 @@ from typing import Any, Dict, List, Optional, Sequence
75
75
  from export import PRESETS, PLATFORM_OF
76
76
  from _platforms import PLATFORMS, caption_defaults, resolve as resolve_platform
77
77
  from _common import guard_sidecar, STATE, add_common, aspect_ratio, brand_caption_style, load_brand, apply_common, child_args, die, emit, info, option_args, probe, require_tool, run, run_tool, place_output, refuse_output_is_input, _check_existing_output, _check_output_path, fingerprint, PLAN_VERSION, ffmpeg_version, X264_PRESETS
78
- from _common.runner import HW_ENV, HW_FORCED_ENV, add_hw_orchestrator_args, child_exit_code, found_exe, kept_clause, kept_deliverables, mark_delivered, remember_written
78
+ from _common.runner import HW_ENV, HW_FORCED_ENV, add_hw_orchestrator_args, child_exit_code, found_exe, kept_clause, kept_deliverables, mark_delivered, read_json, remember_written
79
79
  from _common.emit import absorb_stage, audit, record_fallback, record_skip, refuse, warn
80
80
  from _common.decision import rebase_project_paths
81
81
  import subprocess
@@ -182,7 +182,7 @@ def load_template(name: str) -> Dict[str, Any]:
182
182
  if not path.is_file():
183
183
  die(f"unknown template {name!r}", hint="templates: " + ", ".join(template_names()) + " (or 'all')")
184
184
  try:
185
- return json.loads(path.read_text(encoding="utf-8"))
185
+ return read_json(path)
186
186
  except (OSError, ValueError) as exc:
187
187
  die(f"cannot read template {path}: {exc}")
188
188
  return {}
@@ -504,7 +504,7 @@ def project_input_files(proj: Dict[str, Any], rel: Any) -> List[str]:
504
504
  # the brand's own logo and font_file are read by the overlay and caption stages, resolved
505
505
  # against the brand file as load_brand() resolves them; an unreadable brand is left to them
506
506
  try:
507
- data = json.loads(Path(rel(brand)).read_text(encoding="utf-8"))
507
+ data = read_json(rel(brand))
508
508
  except (OSError, ValueError):
509
509
  data = None
510
510
  if isinstance(data, dict):
@@ -565,6 +565,14 @@ def validate_project(proj: Dict[str, Any], timeline: bool = False, stop_after: O
565
565
  require_object(proj.get(name), name)
566
566
  check_keys(proj.get(name), name, name)
567
567
  check_keys((proj.get("audio") or {}).get("stems"), "audio.stems", "audio.stems")
568
+ # the values the run reads with .get() or as a dict key: a list there was a traceback (A13)
569
+ audio = proj.get("audio")
570
+ if "audio" in read and isinstance(audio, dict):
571
+ require_object(audio.get("stems"), "audio.stems")
572
+ export = proj.get("export")
573
+ if "export" in read and isinstance(export, dict) and export.get("preset") and not isinstance(export["preset"], str):
574
+ die(f"export.preset: must be a preset name (a string), got {type(export['preset']).__name__} "
575
+ f"{export['preset']!r:.60}")
568
576
  if isinstance(proj.get("chapters"), list):
569
577
  # Every other project error is raised here, before the first ffmpeg call; a chapter typo
570
578
  # found inside the last stage costs a whole render and leaves an unchaptered file behind.
@@ -590,6 +598,14 @@ def validate_project(proj: Dict[str, Any], timeline: bool = False, stop_after: O
590
598
  # every clip stage starts from rel(c["src"]): without one it was a KeyError traceback
591
599
  if not item.get("src"):
592
600
  die(f"clips[{i}]: no src")
601
+ if item.get("speed") and not timeline:
602
+ # the clips stage reads float(speed): "fast" or [2] was a traceback there (A13)
603
+ try:
604
+ spd = float(item["speed"])
605
+ except (TypeError, ValueError):
606
+ spd = float("nan")
607
+ if not (0 < spd < float("inf")):
608
+ die(f"clips[{i}]: speed must be a positive number, got {item['speed']!r:.60}")
593
609
  if item.get("snap") is not None:
594
610
  # the render reads a clip's snap only on a clip it cuts (in/out), the export never
595
611
  if not timeline and (item.get("in") is not None or item.get("out") is not None):
@@ -984,6 +1000,19 @@ def execute_plan(plan: Dict[str, Any], path: str) -> int:
984
1000
  _reject_plan(path, digest, "plan_version_unsupported",
985
1001
  f"{path}: plan_version {plan.get('plan_version')!r} is not {PLAN_VERSION}",
986
1002
  plan_version=plan.get("plan_version"), supported=[PLAN_VERSION])
1003
+ # the fields below are walked as lists of objects or strings: a wrong type was a traceback
1004
+ # with no audit record (A14), and is refused like every other plan error
1005
+ for field, want, item in (("inputs", list, None), ("unbound_inputs", list, None), ("verify", list, dict),
1006
+ ("commands", list, str), ("cwd", str, None)):
1007
+ value = plan.get(field)
1008
+ if value is None:
1009
+ continue
1010
+ bad = not isinstance(value, want) or (item is not None and not all(isinstance(v, item) for v in value))
1011
+ if bad:
1012
+ shape = {"inputs": "a list", "unbound_inputs": "a list", "verify": "a list of objects",
1013
+ "commands": "a list of strings", "cwd": "a string"}[field]
1014
+ _reject_plan(path, digest, "plan_field_invalid", f"{path}: {field} must be {shape}, got {type(value).__name__}",
1015
+ field=field, field_type=type(value).__name__)
987
1016
  tool = str(plan.get("tool") or "")
988
1017
  script = HERE / f"{tool}.py"
989
1018
  if not re.fullmatch(r"[a-z][a-z0-9_]*", tool) or not script.exists() or tool == "render":
@@ -1238,9 +1267,10 @@ def main() -> int:
1238
1267
  if value:
1239
1268
  die(f"{flag} belongs to --template NAME INPUT; a project.json states it in the project itself")
1240
1269
  try:
1241
- proj = json.loads(Path(args.project).read_text(encoding="utf-8"))
1270
+ # read_json(): nesting too deep is a ValueError too, refused here, not a RecursionError
1271
+ proj = read_json(args.project)
1242
1272
  except (OSError, ValueError) as exc:
1243
- die(f"cannot read project: {exc}")
1273
+ die(f"cannot read project: {exc}", kind="input")
1244
1274
  if not isinstance(proj, dict):
1245
1275
  die(f"{args.project}: not a project or plan object (top level is {type(proj).__name__})")
1246
1276
  if "plan_version" in proj:
package/scripts/report.py CHANGED
@@ -126,7 +126,7 @@ def pack_report(args) -> int:
126
126
  text = read_text_or_die(args.pack, "--pack")
127
127
  rows: List[List[str]] = []
128
128
  header: List[str] = []
129
- for line in text.splitlines():
129
+ for line in text.split("\n"):
130
130
  line = line.strip()
131
131
  if not line.startswith("|"):
132
132
  continue
@@ -233,7 +233,9 @@ def main() -> int:
233
233
  if meta and meta.get("video"):
234
234
  sheets[which], why = sheet_b64(path)
235
235
  section("contact_sheet", which, why, f"{which} contact sheet")
236
- commands = read_text_or_die(args.commands, "--commands").splitlines() if args.commands else []
236
+ # one per line, split at "\n" only (a command may hold U+2028 or \f; splitlines() split it)
237
+ command_text = read_text_or_die(args.commands, "--commands") if args.commands else ""
238
+ commands = command_text.removesuffix("\n").split("\n") if command_text else []
237
239
  notes = read_text_or_die(args.notes, "--notes") if args.notes else ""
238
240
  title = args.title or f"Delivery report — {Path(args.after).name}"
239
241
 
@@ -28,7 +28,8 @@ from _common import (filler_spans, FILLER_WORDS, FILLER_AMBIGUOUS, FILLER_DISCOU
28
28
  FILLER_PAD, read_text_or_die)
29
29
  from _common import asr as _asr
30
30
  from _common.emit import warn
31
- from _common.runner import replace_checked
31
+ from _common.asr import _dicts
32
+ from _common.runner import parse_json, replace_checked
32
33
  from _common import guard_sidecar, refuse_existing_outputs, refuse_output_is_input, _check_output_path
33
34
  from _common.emit import refuse
34
35
  from _common import detect_silences as detect, STATE, add_common, apply_common, default_output, die, emit, info, is_audio_output, print_json, probe, X264_PRESETS, measured_level_dbfs, fmt_secs
@@ -115,7 +116,7 @@ def sentence_words(args) -> "Tuple[list, str]":
115
116
  return usable(args._words, args._words_source)
116
117
  if args.words:
117
118
  try:
118
- raw = json.loads(read_text_or_die(args.words, "--words"))
119
+ raw = parse_json(read_text_or_die(args.words, "--words"))
119
120
  except ValueError as exc:
120
121
  die(f"--words {args.words}: not readable JSON ({exc})", kind="input")
121
122
  words, _had_segments, _untimed = _words_from_transcript(raw)
@@ -348,7 +349,7 @@ def resolve_filler(args, meta):
348
349
  untimed: list = [] # transcript words without a usable timing (a --words file can carry them)
349
350
  if args.words:
350
351
  try:
351
- raw = json.loads(read_text_or_die(args.words, "--words"))
352
+ raw = parse_json(read_text_or_die(args.words, "--words"))
352
353
  except ValueError as exc:
353
354
  die(f"--words {args.words}: not readable JSON ({exc})", kind="input")
354
355
  source = f"whisper-json:{args.words}"
@@ -484,11 +485,13 @@ def _words_from_transcript(data):
484
485
  listed word it could not cut instead of dropping it unseen."""
485
486
  raw, had_segments = [], False
486
487
  if isinstance(data, dict):
487
- raw = list(data.get("words") or [])
488
- segments = data.get("segments") or []
488
+ # a "words" or "segments" that is not a list, and a segment that is not an object, carry no
489
+ # words: the file is then refused for having none, not by a traceback
490
+ raw = _dicts(data.get("words"))
491
+ segments = _dicts(data.get("segments"))
489
492
  had_segments = bool(segments)
490
493
  for seg in segments:
491
- raw.extend((seg or {}).get("words") or [])
494
+ raw.extend(_dicts(seg.get("words")))
492
495
  elif isinstance(data, list):
493
496
  raw = list(data)
494
497
  out, untimed = [], []