@sogni-ai/sogni-intelligence-client 2.2.0 → 2.2.1

package/dist-esm/public-skill-runtime/index.js

@@ -3006,8 +3006,13 @@ function applyStoryboardPlanningLayoutContract(fallback, contract, frameCount, u
         ?? cellAspectRatio
         ?? fallback.targetVideoAspectRatio;
     const layout = describeStoryboardLayout(boardAspectRatio, cellAspectRatio, frameCount);
-    const boardDimensions = contractOwnsCanvas
+    const contractBoardDimensions = contractOwnsCanvas
         ? normalizeStoryboardBoardDimensions(layoutContract.boardDimensions)
+        : null;
+    const boardDimensions = contractOwnsCanvas
+        ? (storyboardBoardDimensionsMatchAspect(contractBoardDimensions, boardAspectRatio)
+            ? contractBoardDimensions
+            : null)
             ?? (userDefinedCanvas ? fallback.boardDimensions : undefined)
         : fallback.boardDimensions;
     return {
@@ -3018,6 +3023,27 @@ function applyStoryboardPlanningLayoutContract(fallback, contract, frameCount, u
         ...(boardDimensions ? { boardDimensions } : {}),
     };
 }
+function storyboardBoardDimensionsMatchAspect(boardDimensions, boardAspectRatio) {
+    if (!boardDimensions)
+        return false;
+    const match = boardDimensions.match(/^(\d+)x(\d+)$/i);
+    if (!match)
+        return false;
+    const width = Number(match[1]);
+    const height = Number(match[2]);
+    if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0)
+        return false;
+    const normalized = normalizeAspectRatio(boardAspectRatio);
+    const targetPair = normalized ? parseAspectRatioPair(normalized) : null;
+    if (!targetPair)
+        return true;
+    const targetRatio = targetPair.width / targetPair.height;
+    const actualRatio = width / height;
+    if (!Number.isFinite(targetRatio) || targetRatio <= 0)
+        return true;
+    const ratioError = Math.abs(actualRatio - targetRatio) / targetRatio;
+    return ratioError <= 0.1;
+}
 export function inferStoryboardLayoutSpec(userIntentText, frameCount, planningContract) {
     const planningLayout = planningContract?.layout;
     const userDefinedCanvas = typeof planningLayout?.storyboardCanvasSpecifiedByUser === 'boolean'
@@ -3731,7 +3757,8 @@ function extractStoryboardField(section, labels) {
 function removeStoryboardTimingText(value) {
     return value
         .replace(/\b\d{1,2}:\d{2}(?:\.\d+)?\s*(?:-|to|\u2013|\u2014)\s*\d{1,2}:\d{2}(?:\.\d+)?\b/gi, ' ')
-        .replace(/\b\d{1,3}(?:\.\d+)?\s*(?:s|sec|secs|seconds?)?\s*(?:-|to|\u2013|\u2014)\s*\d{1,3}(?:\.\d+)?\s*(?:s|sec|secs|seconds?)?\b/gi, ' ')
+        .replace(/\b\d{1,3}(?:\.\d+)?\s*(?:s|sec|secs|seconds?)\s*(?:-|to|\u2013|\u2014)\s*\d{1,3}(?:\.\d+)?\s*(?:s|sec|secs|seconds?)\b/gi, ' ')
+        .replace(/\b\d{1,3}(?:\.\d+)?(?:-|\u2013|\u2014)\d{1,3}(?:\.\d+)?\s*(?:s|sec|secs|seconds?)\b/gi, ' ')
         .replace(/\(\s*\)|\[\s*\]/g, ' ')
         .replace(/\s*[|]\s*/g, ' ')
         .replace(/^[-:.\s|]+|[-:.\s|]+$/g, ' ')
@@ -3805,20 +3832,29 @@ function parseStoryboardTimeValue(value) {
     return Number.isFinite(numeric) ? numeric : null;
 }
 function extractStoryboardTiming(text) {
-    const match = text.match(/(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?\s*(?:-|to|\u2013|\u2014)\s*(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?/i);
-    if (!match)
-        return null;
-    const startSec = parseStoryboardTimeValue(match[1]);
-    const endSec = parseStoryboardTimeValue(match[2]);
-    if (startSec === null || endSec === null)
-        return null;
-    if (!Number.isFinite(startSec) || !Number.isFinite(endSec) || endSec <= startSec)
-        return null;
-    return {
-        startSec,
-        endSec,
-        durationSec: Math.round((endSec - startSec) * 100) / 100,
-    };
+    const patterns = [
+        /(\d{1,2}:\d{1,2}(?:\.\d+)?)\s*(?:-|to|\u2013|\u2014)\s*(\d{1,2}:\d{1,2}(?:\.\d+)?)/i,
+        /(\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)\s*(?:-|to|\u2013|\u2014)\s*(\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)/i,
+        /(\d{1,3}(?:\.\d+)?)(?:-|\u2013|\u2014)(\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)/i,
+        /(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?\s*(?:-|to|\u2013|\u2014)\s*(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?/i,
+    ];
+    for (const pattern of patterns) {
+        const match = text.match(pattern);
+        if (!match)
+            continue;
+        const startSec = parseStoryboardTimeValue(match[1]);
+        const endSec = parseStoryboardTimeValue(match[2]);
+        if (startSec === null || endSec === null)
+            continue;
+        if (!Number.isFinite(startSec) || !Number.isFinite(endSec) || endSec <= startSec)
+            continue;
+        return {
+            startSec,
+            endSec,
+            durationSec: Math.round((endSec - startSec) * 100) / 100,
+        };
+    }
+    return null;
 }
 function extractStoryboardTimingMarker(text) {
     const match = text.match(/(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?\s*(?:-|to|\u2013|\u2014)\s*(\d{1,2}:\d{1,2}(?:\.\d+)?|\d{1,3}(?:\.\d+)?)\s*(?:s|sec|secs|seconds?)?/i);