upgrade dependencies

package-lock.json

@@ -8,9 +8,9 @@
       "name": "@aitube/website",
       "version": "0.0.0",
       "dependencies": {
-        "@aitube/clap": "0.0.7",
-        "@aitube/client": "0.0.7",
-        "@aitube/engine": "^0.0.0",
+        "@aitube/clap": "0.0.10",
+        "@aitube/client": "0.0.11",
+        "@aitube/engine": "0.0.2",
         "@huggingface/hub": "0.12.3-oauth",
         "@huggingface/inference": "^2.6.7",
         "@jcoreio/async-throttle": "^1.6.0",
@@ -117,9 +117,9 @@
       }
     },
     "node_modules/@aitube/clap": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@aitube/clap/-/clap-0.0.7.tgz",
-      "integrity": "sha512-0muPu4G1sRsNqSVZ/ICBCc4QibZ9OT33ORbahPP1+h3GYcD/7K+ZLYJjdbQwJWVEcpKDosDVaQKeNYdab0S0LA==",
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/@aitube/clap/-/clap-0.0.10.tgz",
+      "integrity": "sha512-pj855yWhUJ0QTJIaxMJhg0PwC3JaHsScJ5rQ8iqog7zDBWNNJR9MPBtFDYRuIs3vmUsGVxHwSlIBz5I1VjMF8w==",
       "dependencies": {
         "pure-uuid": "^1.8.1",
         "yaml": "^2.4.1"
@@ -129,29 +129,19 @@
       }
     },
     "node_modules/@aitube/client": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@aitube/client/-/client-0.0.7.tgz",
-      "integrity": "sha512-s6vxst7pkLt7tI96JS508gfk4EgdLJy5Itr76ej/zvtMRMgnKgAlfB6Bb8/1u7L5CToz4Wgk6h4kz8T+yEbEeg==",
-      "dependencies": {
-        "uuid": "^9.0.1",
-        "yaml": "^2.4.1"
-      },
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/@aitube/client/-/client-0.0.11.tgz",
+      "integrity": "sha512-MqgLN/VxZ6BmHovCSIE8SqR+NpC8U2j1aGrxob6+yBUOsmjBm81cwRtv861jgz0LM3aVXOJsM03EJDFgUnigQQ==",
       "peerDependencies": {
-        "@aitube/clap": "0.0.7",
-        "typescript": "^5.4.5"
+        "@aitube/clap": "0.0.10"
       }
     },
     "node_modules/@aitube/engine": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/@aitube/engine/-/engine-0.0.0.tgz",
-      "integrity": "sha512-3yOAXXCUf6pehdB2t1Nt/F4CC2biC9LA3LZK1d7PwmEA4cahP5q5sb2P1633mSrX7ElJEFkXIsKdEz6hltIP2Q==",
-      "dependencies": {
-        "uuid": "^9.0.1",
-        "yaml": "^2.4.1"
-      },
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@aitube/engine/-/engine-0.0.2.tgz",
+      "integrity": "sha512-k+H91R8tP6cgR5E2yLkF0g2esKk1EI9jwaqF+YrEdPiRcEFNUUhwBER9XkkWp7ySDLUWumgiZgCCmVC4OnBmVQ==",
       "peerDependencies": {
-        "@aitube/clap": "0.0.7",
-        "typescript": "^5.4.5"
+        "@aitube/clap": "0.0.10"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -166,9 +156,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz",
-      "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
+      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -219,9 +209,9 @@
       "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
     },
     "node_modules/@emotion/unitless": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
-      "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -1530,9 +1520,9 @@
       }
     },
     "node_modules/@mediapipe/tasks-vision": {
-      "version": "0.10.13-rc.20240428",
-      "resolved": "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.13-rc.20240428.tgz",
-      "integrity": "sha512-YMOshYcwxzLNNNEKSs4hWVTRjtuX+irWIjsbENrOee491t/oM1a9bnhggMdWLq0FBQ7xuCfvp1diu/JeZFoE0A=="
+      "version": "0.10.13-rc.20240503",
+      "resolved": "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.13-rc.20240503.tgz",
+      "integrity": "sha512-1ExneS7QNyKFCROGJ9A04B89ofFMga/m0ANLiD8yQeHJC7jZKSnWlaC+QxOwdIN4pV+uvMoQO4TPDpuqGlVEpw=="
     },
     "node_modules/@next/env": {
       "version": "14.2.3",
@@ -3260,9 +3250,9 @@
       }
     },
     "node_modules/alchemy-sdk": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/alchemy-sdk/-/alchemy-sdk-3.2.1.tgz",
-      "integrity": "sha512-ytCllr0E3TZxlYT2o/+i8AVEFJwRS7msXYvS3f/L47VEemkv0Hpz09XTqbjOcfur2PooEMcD8rn5oKrbwLyFrQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/alchemy-sdk/-/alchemy-sdk-3.3.0.tgz",
+      "integrity": "sha512-g9AstE3NMC7ot2vhLhtoLTVCRik1O7TGMDd1DBAWpZl8N/uReYwYJrVBO6b9+GAybmrNudxqy4C4DL2HB58Kiw==",
       "dependencies": {
         "@ethersproject/abi": "^5.7.0",
         "@ethersproject/abstract-provider": "^5.7.0",
@@ -3750,9 +3740,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001614",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001614.tgz",
-      "integrity": "sha512-jmZQ1VpmlRwHgdP1/uiKzgiAuGOfLEJsYFP4+GBou/QQ4U6IOJCB4NP1c+1p9RGLpwObcT94jA5/uO+F1vBbog==",
+      "version": "1.0.30001615",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz",
+      "integrity": "sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -4324,9 +4314,9 @@
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.750",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz",
-      "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA=="
+      "version": "1.4.755",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.755.tgz",
+      "integrity": "sha512-9nop+3jZxSHIxe1EzEUcjDXzK+3qOv3fY5w0sE88nIZUntbv1aXWmoxGWlklX5XSO4txCpLssWkUSh8RQPovBg=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -5428,11 +5418,12 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6531,9 +6522,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
-      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
       "bin": {
         "node-gyp-build": "bin.js",
         "node-gyp-build-optional": "optional.js",
@@ -6694,9 +6685,9 @@
       }
     },
     "node_modules/openai": {
-      "version": "4.38.5",
-      "resolved": "https://registry.npmjs.org/openai/-/openai-4.38.5.tgz",
-      "integrity": "sha512-Ym5GJL98ZhLJJ7enBx53jjG3vwN/fsB+Ozh46nnRZZS9W1NiYqbwkJ+sXd3dkCIiWIgcyyOPL2Zr8SQAzbpj3g==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-4.40.2.tgz",
+      "integrity": "sha512-r9AIaYQNHw8HGJpnny6Rcu/0moGUVqvpv0wTJfP0hKlk8ja5DVUMUCdPWEVfg7lxQMC+wIh+Qjp3onDIhVBemA==",
       "dependencies": {
         "@types/node": "^18.11.18",
         "@types/node-fetch": "^2.6.4",
@@ -7460,9 +7451,9 @@
       }
     },
     "node_modules/runcss": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/runcss/-/runcss-0.1.6.tgz",
-      "integrity": "sha512-RyG7VVUxZi8+ynXA4YFH7N6uXK0QgULKTEEMmeUkK/uhfNGiQitWRKQp5b+1AEKu4/QTslFEx7wu971vQQk9Tg=="
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/runcss/-/runcss-0.1.7.tgz",
+      "integrity": "sha512-6o3Mtdgk5bJ6RPq3N46YjLKniOsw8Su+ezfZcS1Os+t57kMKuy+HBe0/BUxgmfgKLwcqeOX70uM5c65kvQv/Gg=="
     },
     "node_modules/safe-array-concat": {
       "version": "1.1.2",
@@ -7910,12 +7901,12 @@
       "integrity": "sha512-NnzSOEKyv4I83qbuKw9ROtJrrT6Z/Xt7I0HiP/e6H6GnpeTDvzwGIGeJ8slai+VwODSHQDooW2CAilJwT9SpRg=="
     },
     "node_modules/styled-components": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.8.tgz",
-      "integrity": "sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==",
+      "version": "6.1.9",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.9.tgz",
+      "integrity": "sha512-aBOqs0uMsYufFXSE4q6cA6Ty1fwZuMk4BJRHfiGSna59F1otnxiDelwhN4fEwmBtIymmF0ZqXHnpSigr2ps9Cg==",
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.1",
-        "@emotion/unitless": "0.8.0",
+        "@emotion/unitless": "0.8.1",
         "@types/stylis": "4.2.0",
         "css-to-react-native": "3.2.0",
         "csstype": "3.1.2",
@@ -8313,9 +8304,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.0.tgz",
-      "integrity": "sha512-+dbmiyliDY/2TTcjCS7NpI9yV2iEFlUDk5TKnsbkN7ZoRu5s7bT+zvYtNFhFXC2oLwURGT2frACAZvbbyNBI+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.1.tgz",
+      "integrity": "sha512-qXhgeNsX15bM63h5aapNFcQid9jRF/l3ojDoDFmekDQEUufZ9U4ErVt6SjDxnHp48Ltrw616R8yNc3giJ3KvVQ==",
       "engines": {
         "node": ">=16"
       },
@@ -8432,9 +8423,9 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz",
+      "integrity": "sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw==",
       "funding": [
         {
           "type": "opencollective",
@@ -8450,7 +8441,7 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.1",
+        "escalade": "^3.1.2",
         "picocolors": "^1.0.0"
       },
       "bin": {

package.json

@@ -10,9 +10,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@aitube/clap": "0.0.7",
-    "@aitube/client": "0.0.7",
-    "@aitube/engine": "^0.0.0",
+    "@aitube/clap": "0.0.10",
+    "@aitube/client": "0.0.11",
+    "@aitube/engine": "0.0.2",
     "@huggingface/hub": "0.12.3-oauth",
     "@huggingface/inference": "^2.6.7",
     "@jcoreio/async-throttle": "^1.6.0",

src/app/api/v1/edit/dialogues/processShot.ts

@@ -1,8 +1,7 @@
 
-import { ClapProject, ClapSegment, getClapAssetSourceType } from "@aitube/clap"
+import { ClapProject, ClapSegment, getClapAssetSourceType, filterSegments, ClapSegmentFilteringMode } from "@aitube/clap"
 import { getSpeechBackgroundAudioPrompt } from "@aitube/engine"
 
-import { startOfSegment1IsWithinSegment2 } from "@/lib/utils/startOfSegment1IsWithinSegment2"
 import { generateSpeechWithParlerTTS } from "@/app/api/generators/speech/generateVoiceWithParlerTTS"
 import { getMediaInfo } from "@/app/api/utils/getMediaInfo"
 
@@ -14,20 +13,22 @@ export async function processShot({
   clap: ClapProject
 }): Promise<void> {
 
-  const shotSegments: ClapSegment[] = clap.segments.filter(s =>
-    startOfSegment1IsWithinSegment2(s, shotSegment)
+  const shotSegments: ClapSegment[] = filterSegments(
+    ClapSegmentFilteringMode.START,
+    shotSegment,
+    clap.segments
   )
-
+  
   const shotDialogueSegments: ClapSegment[] = shotSegments.filter(s =>
     s.category === "dialogue"
   )
 
   let shotDialogueSegment: ClapSegment | undefined = shotDialogueSegments.at(0)
   
-  console.log(`[api/generate/dialogues] processShot: shot [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}] has ${shotSegments.length} segments (${shotDialogueSegments.length} dialogues)`)
+  console.log(`[api/edit/dialogues] processShot: shot [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}] has ${shotSegments.length} segments (${shotDialogueSegments.length} dialogues)`)
 
   if (shotDialogueSegment && !shotDialogueSegment.assetUrl) {
-    // console.log(`[api/generate/dialogues] generating audio..`)
+    // console.log(`[api/edit/dialogues] generating audio..`)
 
     try {
       // this generates a mp3
@@ -52,12 +53,12 @@ export async function processShot({
       }
 
     } catch (err) {
-      console.log(`[api/generate/dialogues] processShot: failed to generate audio: ${err}`)
+      console.log(`[api/edit/dialogues] processShot: failed to generate audio: ${err}`)
       throw err
     }
 
-    console.log(`[api/generate/dialogues] processShot: generated dialogue audio: ${shotDialogueSegment?.assetUrl?.slice?.(0, 50)}...`)
+    console.log(`[api/edit/dialogues] processShot: generated dialogue audio: ${shotDialogueSegment?.assetUrl?.slice?.(0, 50)}...`)
   } else {
-    console.log(`[api/generate/dialogues] processShot: there is already a dialogue audio: ${shotDialogueSegment?.assetUrl?.slice?.(0, 50)}...`)
+    console.log(`[api/edit/dialogues] processShot: there is already a dialogue audio: ${shotDialogueSegment?.assetUrl?.slice?.(0, 50)}...`)
   }
 }

src/app/api/v1/edit/dialogues/route.ts

@@ -17,10 +17,10 @@ export async function POST(req: NextRequest) {
 
   if (!clap?.segments) { throw new Error(`no segment found in the provided clap!`) }
   
-  console.log(`[api/generate/dialogues] detected ${clap.segments.length} segments`)
+  console.log(`[api/edit/dialogues] detected ${clap.segments.length} segments`)
   
   const shotsSegments: ClapSegment[] = clap.segments.filter(s => s.category === "camera")
-  console.log(`[api/generate/dialogues] detected ${shotsSegments.length} shots`)
+  console.log(`[api/edit/dialogues] detected ${shotsSegments.length} shots`)
   
   if (shotsSegments.length > 32) {
     throw new Error(`Error, this endpoint being synchronous, it is designed for short stories only (max 32 shots).`)
@@ -34,7 +34,7 @@ export async function POST(req: NextRequest) {
     })
   ))
 
-  // console.log(`[api/generate/dialogues] returning the clap augmented with dialogues`)
+  // console.log(`[api/edit/dialogues] returning the clap augmented with dialogues`)
 
   return new NextResponse(await serializeClap(clap), {
     status: 200,

src/app/api/v1/edit/entities/route.ts

@@ -6,6 +6,9 @@ import { getToken } from "@/app/api/auth/getToken"
 
 import { generateImageID } from "./generateImageID"
 import { generateAudioID } from "./generateAudioID"
+import { ClapCompletionMode } from "../types"
+
+const defaultMode: ClapCompletionMode = "full"
 
 export async function POST(req: NextRequest) {
 
@@ -25,7 +28,14 @@ export async function POST(req: NextRequest) {
   if (!prompt.length) { throw new Error(`please provide a prompt`) }
   */
 
-  console.log("[api/generate/entities] request:", prompt)
+
+  let mode = defaultMode
+  try {
+    let maybeMode = decodeURIComponent(query?.mode?.toString() || defaultMode).trim()
+    mode = ["partial", "full"].includes(maybeMode) ? (maybeMode as ClapCompletionMode) : "full"
+  } catch (err) {}
+
+  console.log("[api/edit/entities] request:", prompt)
 
   const jwtToken = await getToken({ user: "anonymous" })
 
@@ -68,7 +78,7 @@ export async function POST(req: NextRequest) {
     }
   }
 
-  console.log(`[api/generate/entities] returning the clap extended with the entities`)
+  console.log(`[api/edit/entities] returning the clap extended with the entities`)
 
   return new NextResponse(await serializeClap(clap), {
     status: 200,

src/app/api/v1/edit/storyboards/processShot.ts

@@ -1,7 +1,6 @@
-import { ClapProject, ClapSegment, getClapAssetSourceType, newSegment, parseClap, serializeClap } from "@aitube/clap"
-import { getVideoPrompt } from "@aitube/engine"
+import { ClapProject, ClapSegment, getClapAssetSourceType, newSegment, filterSegments, ClapSegmentFilteringMode } from "@aitube/clap"
 
-import { startOfSegment1IsWithinSegment2 } from "@/lib/utils/startOfSegment1IsWithinSegment2"
+import { getVideoPrompt } from "@aitube/engine"
 
 import { getPositivePrompt } from "@/app/api/utils/imagePrompts"
 import { generateStoryboard } from "./generateStoryboard"
@@ -14,8 +13,10 @@ export async function processShot({
   clap: ClapProject
 }): Promise<void> {
 
-  const shotSegments: ClapSegment[] = clap.segments.filter(s =>
-    startOfSegment1IsWithinSegment2(s, shotSegment)
+  const shotSegments: ClapSegment[] = filterSegments(
+    ClapSegmentFilteringMode.START,
+    shotSegment,
+    clap.segments
   )
 
   const shotStoryboardSegments: ClapSegment[] = shotSegments.filter(s =>

src/app/api/v1/edit/types.ts

@@ -0,0 +1,8 @@
+export type ClapCompletionMode =
+  // the full .clap is returned, containing both previous data and also new entries
+  // this isn't the most optimized mode, obviously
+  | "full"
+
+  // only changes are
+  | "partial"
+

src/app/api/v1/edit/videos/processShot.ts

@@ -1,10 +1,7 @@
-import { NextResponse, NextRequest } from "next/server"
 
-import { ClapProject, ClapSegment, getClapAssetSourceType, newSegment, parseClap, serializeClap } from "@aitube/clap"
+import { ClapProject, ClapSegment, getClapAssetSourceType, newSegment,filterSegments, ClapSegmentFilteringMode } from "@aitube/clap"
 import { getVideoPrompt } from "@aitube/engine"
 
-import { startOfSegment1IsWithinSegment2 } from "@/lib/utils/startOfSegment1IsWithinSegment2"
-import { getToken } from "@/app/api/auth/getToken"
 import { getPositivePrompt } from "@/app/api/utils/imagePrompts"
 
 import { generateVideo } from "./generateVideo"
@@ -16,8 +13,10 @@ export async function processShot({
   shotSegment: ClapSegment
   clap: ClapProject
 }): Promise<void> {
-  const shotSegments: ClapSegment[] = clap.segments.filter(s =>
-    startOfSegment1IsWithinSegment2(s, shotSegment)
+  const shotSegments: ClapSegment[] = filterSegments(
+    ClapSegmentFilteringMode.START,
+    shotSegment,
+    clap.segments
   )
 
   const shotVideoSegments: ClapSegment[] = shotSegments.filter(s =>
@@ -26,7 +25,7 @@ export async function processShot({
 
   let shotVideoSegment: ClapSegment | undefined = shotVideoSegments.at(0)
   
-  console.log(`[api/generate/videos] processShot: shot [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}] has ${shotSegments.length} segments (${shotVideoSegments.length} videos)`)
+  console.log(`[api/edit/videos] processShot: shot [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}] has ${shotSegments.length} segments (${shotVideoSegments.length} videos)`)
 
   // TASK 1: GENERATE MISSING VIDEO SEGMENT
   if (!shotVideoSegment) {
@@ -45,7 +44,7 @@ export async function processShot({
       clap.segments.push(shotVideoSegment)
     }
 
-    console.log(`[api/generate/videos] processShot: generated video segment [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}]`)
+    console.log(`[api/edit/videos] processShot: generated video segment [${shotSegment.startTimeInMs}:${shotSegment.endTimeInMs}]`)
   }
 
   if (!shotVideoSegment) {
@@ -56,12 +55,12 @@ export async function processShot({
   if (!shotVideoSegment?.prompt) {
     // video is missing, let's generate it
     shotVideoSegment.prompt = getVideoPrompt(shotSegments, clap.entityIndex, ["high quality", "crisp", "detailed"])
-    console.log(`[api/generate/videos] processShot: generating video prompt: ${shotVideoSegment.prompt}`)
+    console.log(`[api/edit/videos] processShot: generating video prompt: ${shotVideoSegment.prompt}`)
   }
 
   // TASK 3: GENERATE MISSING VIDEO FILE
   if (!shotVideoSegment.assetUrl) {
-    console.log(`[api/generate/videos] processShot: generating video file..`)
+    console.log(`[api/edit/videos] processShot: generating video file..`)
 
     try {
       shotVideoSegment.assetUrl = await generateVideo({
@@ -71,12 +70,12 @@ export async function processShot({
       })
       shotVideoSegment.assetSourceType = getClapAssetSourceType(shotVideoSegment.assetUrl)
     } catch (err) {
-      console.log(`[api/generate/videos] processShot: failed to generate a video file: ${err}`)
+      console.log(`[api/edit/videos] processShot: failed to generate a video file: ${err}`)
       throw err
     }
   
-    console.log(`[api/generate/videos] processShot: generated video files: ${shotVideoSegment?.assetUrl?.slice?.(0, 50)}...`)
+    console.log(`[api/edit/videos] processShot: generated video files: ${shotVideoSegment?.assetUrl?.slice?.(0, 50)}...`)
   } else {
-    console.log(`[api/generate/videos] processShot: there is already a video file: ${shotVideoSegment?.assetUrl?.slice?.(0, 50)}...`)
+    console.log(`[api/edit/videos] processShot: there is already a video file: ${shotVideoSegment?.assetUrl?.slice?.(0, 50)}...`)
   }
 }

src/app/api/v1/edit/videos/route.ts

@@ -24,10 +24,10 @@ export async function POST(req: NextRequest) {
 
   if (!clap?.segments) { throw new Error(`no segment found in the provided clap!`) }
   
-  console.log(`[api/generate/videos] detected ${clap.segments.length} segments`)
+  console.log(`[api/edit/videos] detected ${clap.segments.length} segments`)
   
   const shotsSegments: ClapSegment[] = clap.segments.filter(s => s.category === "camera")
-  console.log(`[api/generate/videos] detected ${shotsSegments.length} shots`)
+  console.log(`[api/edit/videos] detected ${shotsSegments.length} shots`)
   
   if (shotsSegments.length > 32) {
     throw new Error(`Error, this endpoint being synchronous, it is designed for short stories only (max 32 shots).`)
@@ -41,7 +41,7 @@ export async function POST(req: NextRequest) {
     })
   ))
 
-  console.log(`[api/generate/videos] returning the clap augmented with videos`)
+  console.log(`[api/edit/videos] returning the clap augmented with videos`)
 
   return new NextResponse(await serializeClap(clap), {
     status: 200,

src/lib/utils/startOfSegment1IsWithinSegment2.ts

@@ -1,6 +0,0 @@
-import { ClapSegment } from "@aitube/clap"
-
-export function startOfSegment1IsWithinSegment2(s1: ClapSegment, s2: ClapSegment) {
-  const startOfSegment1 = s1.startTimeInMs 
-  return s2.startTimeInMs <= startOfSegment1 && startOfSegment1 <= s2.endTimeInMs
-}