Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

refactor: report located time instead of tidying it

kashorin52c0ada02af1
diff --git a/examples/echo-pro-aroll/svml.packages.lock b/examples/echo-pro-aroll/svml.packages.lock
index d71263d7..b3ae3583 100644
--- a/examples/echo-pro-aroll/svml.packages.lock
+++ b/examples/echo-pro-aroll/svml.packages.lock
@@ -14,7 +14,7 @@
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6db06978a4f877a78bcea9d44e0470b3580fff01f4be723b9e364431cef79a67"
+ "digest": "sha256:81e7e401a34856a5c0bdaeb0b14a587dccd90b89d06cf2c01c4234c8addfad6c"
},
{
"name": "@narratage/component-kit",
@@ -129,7 +129,7 @@
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:51a531dfb1e7342a0b5a4e714f9f89642f295a18f19d13a6aa9c47e8cfbef1df"
+ "digest": "sha256:418cd97bbc9be56a677da7ea78c97174127cf9c8858f7577eb86e13d743e890d"
},
{
"name": "@narratage/source",
@@ -139,7 +139,7 @@
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:ea916939fa15e434c799cc7914eedea06a521902e6523c11809a98b69f807836"
+ "digest": "sha256:e0345266c4ddefa0aed80619d315d74d1d7e8a44936e2bc6e30698bf5da4a103"
},
{
"name": "@narratage/speech-basis",
@@ -203,8 +203,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f5745238a85fe4571792b27e15a5dc5cc958fb165d0d72951f13c4dfbe8f6c67",
- "closureDigest": "sha256:cdab28c4b5596b48ea867bfe14ad62bf349c8740124d2da2c2c65e700b1bf168"
+ "facetsDigest": "sha256:86b692dc498c7d51fb87aab99ceb88464f2e3a86ac48a8abf64349dcc38fb7d0",
+ "closureDigest": "sha256:85e86fbcc8fde5dc64808e42fac53c83ede6a671a6a3fd5a80dcdb507529d865"
},
{
"specifier": "@narratage/caption-gemini",
@@ -212,8 +212,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6ae1f54415d7b6fa4ce5993dd3e1255615cd17e54e8a62cf34ebf17a534453e3",
- "closureDigest": "sha256:8d3683a5d160118c2ccad1402fff0406051409b92518623d61c4102e14bf960f"
+ "facetsDigest": "sha256:bee8a4fce6b8213bd1ca1a94811cdcf261b71ecc39ecbf1593afa67f203b7cd5",
+ "closureDigest": "sha256:2c3351b8f7e91c1a2cc59fc67a8f1f06cce8e7308aa93d11c1050884071cd735"
},
{
"specifier": "@narratage/composition",
@@ -356,8 +356,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:368118044ef91df01ac2f92a3a7acd443cd256904a99b01ee1a9451b8c822305",
- "closureDigest": "sha256:52979d37ffef941461bcec99a5873bea634f921e1194a44a7316cd64b9483d79"
+ "facetsDigest": "sha256:4f041c5844a3eb9a70e8472d4cf4f534de960a77745819366dac0061ec600e76",
+ "closureDigest": "sha256:8d526afa5f3356e58a5ff4b6d912b3bd9466c1214aea0caa85ee6cb7502df5a4"
},
{
"specifier": "@narratage/speech",
@@ -374,8 +374,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6b274580dadbfc4b79a0df00bbd87683ba91143be08bf4b1736a85c8d0b658fd",
- "closureDigest": "sha256:86d76f2023484ace331efff9d4aa56845e5f7c600c318efae946a1ccf899a7a8"
+ "facetsDigest": "sha256:b3f48d736480bd0e1911a9195d9143ffb5c38a91bdcc55584845d6488cccc14f",
+ "closureDigest": "sha256:70610ff9a7bf41b764f878d2c8f551f6369d737be616564db84fcaf2ab7093e5"
},
{
"specifier": "@narratage/speech-basis",
@@ -428,9 +428,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6ba179530bbf53e7e3cce1c1ef8b37280bb6a4ac558fe2dc8ec2fada3ba57636",
- "closureDigest": "sha256:a183d236eba0fff7b15c2f186475041b6c5101ef5949af40e853471119be5b7d"
+ "facetsDigest": "sha256:0eb8b7e5605851c873e0d37385577242a761e23d6eae9b0a495a2667ba71a082",
+ "closureDigest": "sha256:a38f468ae458b66da1340cc6fe88ef695ccff51c6a82ca3fbd4284879a44581f"
}
],
- "digest": "sha256:6b4e80a647150ca1e00a29f6e8370041724ea456b25ef81eb20301f3b1f9ed26"
+ "digest": "sha256:ad5fb2012a395b6a84fa9f36dde0d1897bec70cdd93a115b38d74448763878c9"
}
diff --git a/examples/echo-pro-aroll/svml.runtime-packages.lock b/examples/echo-pro-aroll/svml.runtime-packages.lock
index 41e7f24b..548aae00 100644
--- a/examples/echo-pro-aroll/svml.runtime-packages.lock
+++ b/examples/echo-pro-aroll/svml.runtime-packages.lock
@@ -39,7 +39,7 @@
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6db06978a4f877a78bcea9d44e0470b3580fff01f4be723b9e364431cef79a67"
+ "digest": "sha256:81e7e401a34856a5c0bdaeb0b14a587dccd90b89d06cf2c01c4234c8addfad6c"
},
{
"name": "@narratage/component-kit",
@@ -154,7 +154,7 @@
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:51a531dfb1e7342a0b5a4e714f9f89642f295a18f19d13a6aa9c47e8cfbef1df"
+ "digest": "sha256:418cd97bbc9be56a677da7ea78c97174127cf9c8858f7577eb86e13d743e890d"
},
{
"name": "@narratage/source",
@@ -164,7 +164,7 @@
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:ea916939fa15e434c799cc7914eedea06a521902e6523c11809a98b69f807836"
+ "digest": "sha256:e0345266c4ddefa0aed80619d315d74d1d7e8a44936e2bc6e30698bf5da4a103"
},
{
"name": "@narratage/speech-evidence",
@@ -850,7 +850,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:d142cd5ad96b6be6df287724e137d0c36dd9077f27e00237a7feaf2693d1d56e"
+ "closureDigest": "sha256:5fd699a33ac7215075c4ffbd023ed59b80730356f1bf480017be8f9feb774090"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -886,8 +886,8 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:dcf4679193545527961bb610d29047ee86964acf0e708cea02b612e51f4d4843"
+ "closureDigest": "sha256:14db2383738515add6a4d4d8c91e345e2e8b67d47cce43810f7a732016d8f3e4"
}
],
- "digest": "sha256:ee0292bcf627ecdb06bc42d89affa9ae45a43d2b2cd98cbb4841593319fee479"
+ "digest": "sha256:9dcca00dcf02deb59c1679e20921e668ed05d997515259c0d0235c33b5657226"
}
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
index 5f4c2c4d..7e1aa2bc 100644
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ b/examples/talking-film-graph-check/svml.packages.lock
@@ -19,7 +19,7 @@
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6db06978a4f877a78bcea9d44e0470b3580fff01f4be723b9e364431cef79a67"
+ "digest": "sha256:81e7e401a34856a5c0bdaeb0b14a587dccd90b89d06cf2c01c4234c8addfad6c"
},
{
"name": "@narratage/component-kit",
@@ -119,7 +119,7 @@
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:51a531dfb1e7342a0b5a4e714f9f89642f295a18f19d13a6aa9c47e8cfbef1df"
+ "digest": "sha256:418cd97bbc9be56a677da7ea78c97174127cf9c8858f7577eb86e13d743e890d"
},
{
"name": "@narratage/source",
@@ -129,7 +129,7 @@
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:ea916939fa15e434c799cc7914eedea06a521902e6523c11809a98b69f807836"
+ "digest": "sha256:e0345266c4ddefa0aed80619d315d74d1d7e8a44936e2bc6e30698bf5da4a103"
},
{
"name": "@narratage/speech-basis",
@@ -198,8 +198,8 @@
"name": "@narratage/broll",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:ed40135914248d05319936bf1dde42126e6aa7783a070e02a207dbe775af2af1",
- "closureDigest": "sha256:26ddc751dfe9cfaa31ba53a70bee02f6ed9d830ae87d12995987e379e1b264d3"
+ "facetsDigest": "sha256:a30c9a993e7f24f39a78b80f8262022ca8d6250b4d454fc8de91c8922bf8d45a",
+ "closureDigest": "sha256:fda5a82565390c91678b06c8143c16e90fe6edaeed0a15bc046e2f6f27ff6821"
},
{
"specifier": "@narratage/caption",
@@ -207,8 +207,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f5745238a85fe4571792b27e15a5dc5cc958fb165d0d72951f13c4dfbe8f6c67",
- "closureDigest": "sha256:cdab28c4b5596b48ea867bfe14ad62bf349c8740124d2da2c2c65e700b1bf168"
+ "facetsDigest": "sha256:86b692dc498c7d51fb87aab99ceb88464f2e3a86ac48a8abf64349dcc38fb7d0",
+ "closureDigest": "sha256:85e86fbcc8fde5dc64808e42fac53c83ede6a671a6a3fd5a80dcdb507529d865"
},
{
"specifier": "@narratage/caption-gemini",
@@ -216,8 +216,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6ae1f54415d7b6fa4ce5993dd3e1255615cd17e54e8a62cf34ebf17a534453e3",
- "closureDigest": "sha256:8d3683a5d160118c2ccad1402fff0406051409b92518623d61c4102e14bf960f"
+ "facetsDigest": "sha256:bee8a4fce6b8213bd1ca1a94811cdcf261b71ecc39ecbf1593afa67f203b7cd5",
+ "closureDigest": "sha256:2c3351b8f7e91c1a2cc59fc67a8f1f06cce8e7308aa93d11c1050884071cd735"
},
{
"specifier": "@narratage/composition",
@@ -333,8 +333,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:368118044ef91df01ac2f92a3a7acd443cd256904a99b01ee1a9451b8c822305",
- "closureDigest": "sha256:52979d37ffef941461bcec99a5873bea634f921e1194a44a7316cd64b9483d79"
+ "facetsDigest": "sha256:4f041c5844a3eb9a70e8472d4cf4f534de960a77745819366dac0061ec600e76",
+ "closureDigest": "sha256:8d526afa5f3356e58a5ff4b6d912b3bd9466c1214aea0caa85ee6cb7502df5a4"
},
{
"specifier": "@narratage/speech",
@@ -351,8 +351,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6b274580dadbfc4b79a0df00bbd87683ba91143be08bf4b1736a85c8d0b658fd",
- "closureDigest": "sha256:86d76f2023484ace331efff9d4aa56845e5f7c600c318efae946a1ccf899a7a8"
+ "facetsDigest": "sha256:b3f48d736480bd0e1911a9195d9143ffb5c38a91bdcc55584845d6488cccc14f",
+ "closureDigest": "sha256:70610ff9a7bf41b764f878d2c8f551f6369d737be616564db84fcaf2ab7093e5"
},
{
"specifier": "@narratage/speech-basis",
@@ -396,8 +396,8 @@
"name": "@narratage/text-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c008378a21699a6ec62f9ea03b9bbd307841f6bbe37d06279574174c229ca8bf",
- "closureDigest": "sha256:f66e494ecfb5f44b1090c06aa398acaf0e017c868c99ca3e56de519dabc24fc7"
+ "facetsDigest": "sha256:9384a365dc85a38dcbd32fa316b9ecca1f226587494bb958a285d797f7babac6",
+ "closureDigest": "sha256:f93d5bb0370eaac00e7510d621e302e55a1f69543584174ec89795564f28242c"
},
{
"specifier": "@narratage/visual-ir",
@@ -414,9 +414,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6ba179530bbf53e7e3cce1c1ef8b37280bb6a4ac558fe2dc8ec2fada3ba57636",
- "closureDigest": "sha256:a183d236eba0fff7b15c2f186475041b6c5101ef5949af40e853471119be5b7d"
+ "facetsDigest": "sha256:0eb8b7e5605851c873e0d37385577242a761e23d6eae9b0a495a2667ba71a082",
+ "closureDigest": "sha256:a38f468ae458b66da1340cc6fe88ef695ccff51c6a82ca3fbd4284879a44581f"
}
],
- "digest": "sha256:a03db9110ee580f539ac0bda92dc1147cff9c3aa2dcc3fb2e23f2a626676d8d4"
+ "digest": "sha256:8433f850ff933acd18e99373d35f41be655f966d7a4e511e91d2a13a9e78b121"
}
diff --git a/packages/caption/src/temporalize.ts b/packages/caption/src/temporalize.ts
index 8d56da20..a1195e4d 100644
--- a/packages/caption/src/temporalize.ts
+++ b/packages/caption/src/temporalize.ts
@@ -1,4 +1,5 @@
import type { Narrative } from "@narratage/narrative";
+import { tokenSpanSeconds } from "@narratage/semantic-map";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { CaptionProjectionError } from "./error.js";
@@ -18,22 +19,19 @@ export function temporalizeCaption(
narrative: Narrative,
map: CompleteSemanticMap,
): TimedCaptionProjection {
- const timingByToken = new Map(map.tokens.map((token) => [token.tokenId, token]));
const sourceTiming = (startToken: number, endTokenExclusive: number, owner: string) => {
const source = narrative.tokens.slice(startToken, endTokenExclusive);
- const timed = source.map((token) => timingByToken.get(token.id));
- if (!timed.length || timed.some((token) => token === undefined)) {
+ const window = tokenSpanSeconds(map, source.map((token) => token.id));
+ if (window === undefined) {
throw new CaptionProjectionError(
"CAPTION_SPEECH_COVERAGE",
`${owner} is not covered by the complete speech time map.`,
);
}
- const first = timed[0]!;
- const last = timed.at(-1)!;
return {
sourceTokenIds: source.map((token) => token.id),
- startSec: first.startSec,
- endSec: last.endSec,
+ startSec: window.startSec,
+ endSec: window.endSec,
};
};
@@ -77,7 +75,6 @@ export function temporalizeCaptionPlan(
assertCaptionProgramForNarrative(program, narrative);
assertCaptionPlanForProgram(plan, program);
const atomById = new Map(program.atoms.map((atom) => [atom.id, atom]));
- const timingById = new Map(map.tokens.map((token) => [token.tokenId, token]));
const regionById = new Map(narrative.captionProjection.regions.map((region) => [region.id, region]));
const atomsByRegion = new Map<string, CaptionDisplayAtom[]>();
for (const atom of program.atoms) {
@@ -86,29 +83,24 @@ export function temporalizeCaptionPlan(
atomsByRegion.set(atom.regionId, values);
}
const atomWindow = (atom: CaptionDisplayAtom) => {
- const firstSource = narrative.tokens[atom.sourceTokenStart];
- const lastSource = narrative.tokens[atom.sourceTokenEndExclusive - 1];
- const first = firstSource === undefined ? undefined : timingById.get(firstSource.id);
- const last = lastSource === undefined ? undefined : timingById.get(lastSource.id);
- if (first === undefined || last === undefined) {
+ const sourceIds = narrative.tokens
+ .slice(atom.sourceTokenStart, atom.sourceTokenEndExclusive)
+ .map((token) => token.id);
+ const window = tokenSpanSeconds(map, sourceIds);
+ if (window === undefined) {
throw new CaptionProjectionError("CAPTION_SPEECH_COVERAGE", `Caption display atom ${atom.id} is absent from the complete speech map.`);
}
- if (atom.correspondence === "exact") {
- return {
- startSec: first.startSec,
- endSec: last.endSec,
- };
- }
+ if (atom.correspondence === "exact") return window;
const region = regionById.get(atom.regionId);
if (region === undefined || region.display.length === 0) {
throw new CaptionProjectionError("CAPTION_DISPLAY_REGION", `Caption display atom ${atom.id} has no owning display region.`);
}
const siblings = atomsByRegion.get(atom.regionId) ?? [];
const next = siblings.find((candidate) => candidate.displayStart > atom.displayStart);
- const duration = last.endSec - first.startSec;
+ const duration = window.endSec - window.startSec;
return {
- startSec: first.startSec + duration * atom.displayStart / region.display.length,
- endSec: first.startSec + duration * (next?.displayStart ?? region.display.length) / region.display.length,
+ startSec: window.startSec + duration * atom.displayStart / region.display.length,
+ endSec: window.startSec + duration * (next?.displayStart ?? region.display.length) / region.display.length,
};
};
const visible = new Set(program.atoms.map((atom) => atom.id));
@@ -147,8 +139,8 @@ export function temporalizeCaptionPlan(
(_, offset) => atom.sourceTokenStart + offset,
)))].sort((left, right) => left - right);
const sourceTokens = sourceIndexes.map((index) => narrative.tokens[index]);
- const timed = sourceTokens.map((token) => token === undefined ? undefined : timingById.get(token.id));
- if (timed.length === 0 || timed.some((token) => token === undefined)) {
+ if (sourceTokens.some((token) => token === undefined)
+ || tokenSpanSeconds(map, sourceTokens.map((token) => token!.id)) === undefined) {
throw new CaptionProjectionError("CAPTION_SPEECH_COVERAGE", `Caption Cue ${cue.id} is absent from the complete speech map.`);
}
const firstWindow = atomWindow(atoms[0]!);
diff --git a/packages/semantic-map/src/index.ts b/packages/semantic-map/src/index.ts
index 343c3c25..f01755d2 100644
--- a/packages/semantic-map/src/index.ts
+++ b/packages/semantic-map/src/index.ts
@@ -4,6 +4,7 @@ export {
assertNarrativeSelectionIdentity,
momentFrames,
selectionFrameSpans,
+ tokenSpanSeconds,
} from "./location.js";
export { completeSemanticMapSchema, semanticMapDependency, semanticMapManifest, semanticMapManifestDigest, semanticMapModuleRef, semanticMapTypes } from "./manifest.js";
export type * from "./types.js";
diff --git a/packages/semantic-map/src/location.ts b/packages/semantic-map/src/location.ts
index 31f1b78d..cf481fbd 100644
--- a/packages/semantic-map/src/location.ts
+++ b/packages/semantic-map/src/location.ts
@@ -48,7 +48,15 @@ function frameFor(frames: ReadonlyMap<string, number>, anchorId: string, owner:
return frame;
}
-/** Project every occurrence of one Script Selection onto one measured SemanticMap. */
+/**
+ * Project every occurrence of one Script Selection onto one measured SemanticMap.
+ *
+ * One entry per occurrence, in Script order — the order the markers appear in the
+ * source. Segments may overlap in time, so Script order is not necessarily time
+ * order, and occurrences are located independently: they are never sorted,
+ * merged, clipped against one another or otherwise reconciled. A caller that
+ * needs time order sorts them itself.
+ */
export function selectionFrameSpans(
map: CompleteSemanticMap,
selection: NarrativeSelectionRef,
@@ -68,6 +76,27 @@ export function selectionFrameSpans(
});
}
+/**
+ * The measured window a run of Script tokens occupies: the first token's start
+ * and the last token's end, exactly as located. Undefined when any named token
+ * is absent, leaving the caller to decide what that means.
+ *
+ * This is the second way the same points are addressed. Markers address them by
+ * anchor; a component that renders the Script text itself addresses them by
+ * token, because its runs are computed rather than authored.
+ */
+export function tokenSpanSeconds(
+ map: CompleteSemanticMap,
+ tokenIds: readonly string[],
+): { readonly startSec: number; readonly endSec: number } | undefined {
+ assertCompleteSemanticMapIdentity(map);
+ if (tokenIds.length === 0) return undefined;
+ const timing = new Map(map.tokens.map((token) => [token.tokenId, token]));
+ const located = tokenIds.map((id) => timing.get(id));
+ if (located.some((token) => token === undefined)) return undefined;
+ return { startSec: located[0]!.startSec, endSec: located.at(-1)!.endSec };
+}
+
/** Project every occurrence of one Script Moment onto one measured SemanticMap. */
export function momentFrames(
map: CompleteSemanticMap,
diff --git a/packages/semantic-map/src/manifest.ts b/packages/semantic-map/src/manifest.ts
index cd2708da..ce2c3f24 100644
--- a/packages/semantic-map/src/manifest.ts
+++ b/packages/semantic-map/src/manifest.ts
@@ -9,7 +9,6 @@ const timedSegment = object({ segmentId: { schema: string }, startSec: { schema:
const timedToken = object({ tokenId: { schema: string }, segmentId: { schema: string }, startSec: { schema: number }, endSec: { schema: number }, startFrame: { schema: integer }, endFrame: { schema: integer } });
const point = object({ identity: { schema: string }, timeSec: { schema: number }, frame: { schema: integer } });
export const completeSemanticMapSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.complete-semantic-map@1" } },
- segments: { schema: { kind: "array", items: timedSegment } },
tokens: { schema: { kind: "array", items: timedToken } }, anchors: { schema: { kind: "array", items: point } } });
export const semanticMapModuleRef = { name: "@narratage/semantic-map", version: "0.0.0-dev" } as const;
export const semanticMapTypes = { complete: { module: semanticMapModuleRef, name: "CompleteSemanticMap" } } satisfies Record<string, TypeRef>;
diff --git a/packages/semantic-map/src/types.ts b/packages/semantic-map/src/types.ts
index 3cba7739..605c1d36 100644
--- a/packages/semantic-map/src/types.ts
+++ b/packages/semantic-map/src/types.ts
@@ -10,7 +10,6 @@ export type SemanticTimePoint = { readonly identity: string; readonly timeSec: n
*/
export type CompleteSemanticMap = {
readonly contract: "svml.complete-semantic-map@1";
- readonly segments: readonly TimedSpeechSegment[];
readonly tokens: readonly TimedSpeechToken[];
readonly anchors: readonly SemanticTimePoint[];
};
diff --git a/packages/semantic-map/test/location.test.ts b/packages/semantic-map/test/location.test.ts
index 715a98c0..64385da7 100644
--- a/packages/semantic-map/test/location.test.ts
+++ b/packages/semantic-map/test/location.test.ts
@@ -106,3 +106,55 @@ test("an anchor the map does not contain names the Selection that asked for it",
/NarrativeSelection x names anchor segment:missing:start/u,
);
});
+
+test("overlapping occurrences pass through untouched, in Script order", () => {
+ // `@beat one @/beat … @beat three @/beat` where the two Segments overlap in
+ // time. Locating never sorts, merges or clips occurrences against each other:
+ // reconciling them is the caller's decision about its own material.
+ const overlapping = {
+ contract: "svml.narrative-selection@1",
+ id: "beat",
+ occurrences: [
+ {
+ occurrence: 0,
+ open: { affinity: "right", boundary: boundary("segment:opening:token:1:start") },
+ close: { affinity: "left", boundary: boundary("segment:opening:end") },
+ },
+ {
+ occurrence: 1,
+ open: { affinity: "right", boundary: boundary("segment:second:token:1:end") },
+ close: { affinity: "left", boundary: boundary("segment:second:end") },
+ },
+ ],
+ } as NarrativeSelectionRef;
+ // opening:token1:start = 0, opening:end = 4, second:token1:end = 6, second:end = 9
+ assert.deepEqual(selectionFrameSpans(map, overlapping, space), [
+ { startFrame: 0, endFrameExclusive: 4 },
+ { startFrame: 6, endFrameExclusive: 9 },
+ ]);
+});
+
+test("Script order is preserved even when it runs backwards in time", () => {
+ // Overlapping Segments make the second occurrence start before the first ends.
+ // The array still follows the Script; a caller that needs time order sorts.
+ const crossing = {
+ contract: "svml.narrative-selection@1",
+ id: "beat",
+ occurrences: [
+ {
+ occurrence: 0,
+ open: { affinity: "right", boundary: boundary("segment:second:token:1:start") },
+ close: { affinity: "left", boundary: boundary("segment:second:end") },
+ },
+ {
+ occurrence: 1,
+ open: { affinity: "right", boundary: boundary("segment:opening:token:1:start") },
+ close: { affinity: "left", boundary: boundary("segment:opening:end") },
+ },
+ ],
+ } as NarrativeSelectionRef;
+ assert.deepEqual(selectionFrameSpans(map, crossing, space), [
+ { startFrame: 5, endFrameExclusive: 9 },
+ { startFrame: 0, endFrameExclusive: 4 },
+ ]);
+});
diff --git a/packages/speech-alignment/src/locate.ts b/packages/speech-alignment/src/locate.ts
index d963d473..bb865804 100644
--- a/packages/speech-alignment/src/locate.ts
+++ b/packages/speech-alignment/src/locate.ts
@@ -265,6 +265,7 @@ function groupWindow(
...charRun.map((char) => char.endSec),
].filter(finite);
if (!starts.length || !ends.length) return undefined;
+ // The envelope of a run of evidence, not a correction of any one measurement.
return { startSec: Math.min(...starts), endSec: Math.max(...ends) };
}
@@ -305,10 +306,7 @@ function locatePairedGroup(
}
if (!finite(startSec) || !finite(endSec)) continue;
const sourceIndex = sourceIndexById.get(sourceRun[tokenOffset]!.id)!;
- output[sourceIndex] = {
- startSec,
- endSec: Math.max(startSec, endSec),
- };
+ output[sourceIndex] = { startSec, endSec };
}
}
@@ -336,6 +334,8 @@ function fillEstimated(
const runEnd = cursor;
const left = runStart > 0 ? values[runStart - 1]!.endSec : startBound;
const right = runEnd < values.length ? values[runEnd]!.startSec : endBound;
+ // These tokens have no measurement at all, so this bound shapes an invention
+ // rather than editing anything that was measured.
const usableRight = Math.max(left, right);
const weights = source
.slice(runStart, runEnd)
@@ -356,16 +356,6 @@ function fillEstimated(
return values as MutableTiming[];
}
-function assertMonotonic(tokens: readonly TimedSpeechToken[], segmentId: string): void {
- let previousEnd = -Infinity;
- for (const token of tokens) {
- if (token.startSec < previousEnd - EPSILON || token.endSec < token.startSec - EPSILON) {
- fail("SPEECH_MAP_ORDER", `Located token ${token.tokenId} violates time order in Segment ${segmentId}.`);
- }
- previousEnd = token.endSec;
- }
-}
-
function frameFor(basis: SpeechAudioBasis, timeSec: number): number {
const { numerator, denominator } = basis.programSpace.frameRate;
return Math.round(timeSec * numerator / denominator);
@@ -399,7 +389,7 @@ export function locateSpeechTiming(
const segmentTokens = source.map((token, index): TimedSpeechToken => {
const timing = complete[index]!;
const startFrame = frameFor(basis, timing.startSec);
- const endFrame = Math.max(startFrame, frameFor(basis, timing.endSec));
+ const endFrame = frameFor(basis, timing.endSec);
return {
tokenId: token.id,
segmentId: segment.id,
@@ -409,10 +399,9 @@ export function locateSpeechTiming(
endFrame,
};
});
- assertMonotonic(segmentTokens, segment.id);
timedTokens.push(...segmentTokens);
const startFrame = frameFor(basis, aligned.startSec);
- const endFrame = Math.max(startFrame, frameFor(basis, aligned.endSec));
+ const endFrame = frameFor(basis, aligned.endSec);
timedSegments.push({
segmentId: segment.id,
startSec: secondsFor(basis, startFrame),
@@ -438,7 +427,6 @@ export function locateSpeechTiming(
});
return {
contract: "svml.complete-semantic-map@1" as const,
- segments: timedSegments,
tokens: timedTokens,
anchors,
};
diff --git a/packages/speech-alignment/test/speech-align.test.ts b/packages/speech-alignment/test/speech-align.test.ts
index 12b1380e..84285b0f 100644
--- a/packages/speech-alignment/test/speech-align.test.ts
+++ b/packages/speech-alignment/test/speech-align.test.ts
@@ -359,3 +359,28 @@ test("the final map is quantized once into the selected ProgramSpace", () => {
);
assert.equal(map.anchors.every((anchor) => anchor.timeSec === anchor.frame / 30), true);
});
+
+test("a backwards character measurement reaches the map backwards, uncorrected", () => {
+ // WhisperX character times need not be ordered. The locator reports what it
+ // measured; deciding what a backwards window means belongs to whoever renders
+ // it, and silently flattening it here would hide the evidence. Three Script
+ // words merge into one spoken word, so the middle one inherits neither edge of
+ // the group envelope and its own characters decide its window.
+ const narrative = parseScript("backwards.svml", "<line>can not now</line>");
+ const map = locate(narrative, {
+ endSec: 1,
+ durationSec: 1,
+ words: [{ text: "cannotnow", startSec: 0.1, endSec: 0.9 }],
+ chars: characters(
+ "cannotnow",
+ [0.10, 0.15, 0.20, /* backwards: */ 0.50, 0.45, 0.40, 0.60, 0.65, 0.70],
+ [0.15, 0.20, 0.25, /* backwards: */ 0.55, 0.50, 0.45, 0.65, 0.70, 0.75],
+ ),
+ });
+ const middle = map.tokens[1]!;
+ assert.equal(
+ middle.startSec > middle.endSec,
+ true,
+ `the inverted measurement survived, got ${middle.startSec}..${middle.endSec}`,
+ );
+});
diff --git a/tools/package-boundaries.test.mjs b/tools/package-boundaries.test.mjs
index d2cc0610..b92946f7 100644
--- a/tools/package-boundaries.test.mjs
+++ b/tools/package-boundaries.test.mjs
@@ -127,6 +127,31 @@ test("a Provider reaches no exact-model package, so models and services stay N+M
assert.ok(transitive(graph, "@narratage/seedance").has("@narratage/generation"));
});
+test("the speech time map is an opaque handle: no consumer reads its fields", async () => {
+ const { readdir, readFile } = await import("node:fs/promises");
+ const packages = new URL("../packages/", import.meta.url);
+ // Locating is a lookup through semantic-map. A consumer that destructured the
+ // map could sort, merge or clip located spans against one another; those are
+ // the caller's decisions to make on its own values, never the map's to make
+ // for it.
+ const reach = /\bmap\.(tokens|anchors|segments)\b/u;
+ for (const entry of await readdir(packages, { withFileTypes: true })) {
+ if (!entry.isDirectory() || entry.name === "semantic-map" || entry.name === "speech-alignment") continue;
+ const source = new URL(`./${entry.name}/src/`, packages);
+ let files = [];
+ try {
+ files = await readdir(source);
+ } catch {
+ continue;
+ }
+ for (const file of files.filter((name) => name.endsWith(".ts"))) {
+ const content = await readFile(new URL(file, source), "utf8");
+ assert.ok(!reach.test(content),
+ `${entry.name}/src/${file} reads a SemanticMap field directly; call a semantic-map lookup instead`);
+ }
+ }
+});
+
test("Text compilation is one explicit leaf assembly, not a Package Loader or Local Runtime dependency", async () => {
const graph = productionGraph(await workspacePackages());
assert.ok(transitive(graph, "@narratage/compiler-text-node").has("@narratage/text"));