improvements

package-lock.json

@@ -9,6 +9,8 @@
       "version": "0.0.0",
       "dependencies": {
         "@huggingface/inference": "^2.6.4",
+        "@photo-sphere-viewer/core": "^5.5.1",
+        "@photo-sphere-viewer/video-plugin": "^5.5.1",
         "@radix-ui/react-accordion": "^1.1.2",
         "@radix-ui/react-avatar": "^1.0.3",
         "@radix-ui/react-checkbox": "^1.0.4",
@@ -44,6 +46,7 @@
         "lucide-react": "^0.260.0",
         "markdown-yaml-metadata-parser": "^3.0.0",
         "next": "^14.0.4",
+        "photo-sphere-viewer-lensflare-plugin": "^2.0.1",
         "pick": "^0.0.1",
         "postcss": "8.4.26",
         "qs": "^6.11.2",
@@ -52,10 +55,12 @@
         "react-copy-to-clipboard": "^5.1.0",
         "react-dom": "18.2.0",
         "react-icons": "^4.12.0",
+        "react-photo-sphere-viewer": "^4.0.2-psv5.4.4",
         "react-smooth-scroll-hook": "^1.3.4",
         "react-string-avatar": "^1.2.2",
         "react-tuby": "^0.1.24",
         "react-virtualized-auto-sizer": "^1.0.20",
+        "react-window-infinite-loader": "^1.0.9",
         "replicate": "^0.17.0",
         "sbd": "^1.0.19",
         "sentence-splitter": "^4.3.0",
@@ -496,6 +501,158 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@photo-sphere-viewer/autorotate-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/autorotate-plugin/-/autorotate-plugin-5.5.1.tgz",
+      "integrity": "sha512-ZU20ZYaa5VPNg3J+wh9GwS/yZxD9r+XPCE90FiekYnDyJ2wE3ckQ5m7h+BEvH4Hpb3rX0NVzyZl4iA9kubuxhQ==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/compass-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/compass-plugin/-/compass-plugin-5.5.1.tgz",
+      "integrity": "sha512-tI5wKcVWwvebH2loI1C9B5CwR++Oz7yzODpGRhkjWADw2LLqjap0rJxiheYl6AiL+tHCWl4pIJ8lss6frZ1vkA==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/core": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/core/-/core-5.5.1.tgz",
+      "integrity": "sha512-dddxySM0retvsO7cDa0lJ0oviGpSYZV9vJLqv126YoYnZZhL9fFOjkmJP+GSMLU6AU8pZIVuiVZ1TSWJaZcGrg==",
+      "dependencies": {
+        "three": "^0.159.0"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/core/node_modules/three": {
+      "version": "0.159.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.159.0.tgz",
+      "integrity": "sha512-eCmhlLGbBgucuo4VEA9IO3Qpc7dh8Bd4VKzr7WfW4+8hMcIfoAVi1ev0pJYN9PTTsCslbcKgBwr2wNZ1EvLInA=="
+    },
+    "node_modules/@photo-sphere-viewer/cubemap-adapter": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/cubemap-adapter/-/cubemap-adapter-5.5.1.tgz",
+      "integrity": "sha512-5K8UwrSlUR6EVFOoCxbZeLJXSJ40fgtTQ6Kj2ltZ++y9r9I6vkvtqTUCRnZs9yaYezcbCXbuppebLKSWhodZtA==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/cubemap-tiles-adapter": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/cubemap-tiles-adapter/-/cubemap-tiles-adapter-5.5.1.tgz",
+      "integrity": "sha512-NEt4GYGo8ZlnV1rCe4KWtZLPbcxQHlEjqnOUn1Laf1aGcxo64WWHoFaeDkAHR9aky+VJS6tJXbl4HFCtaqdp1g==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1",
+        "@photo-sphere-viewer/cubemap-adapter": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/cubemap-video-adapter": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/cubemap-video-adapter/-/cubemap-video-adapter-5.5.1.tgz",
+      "integrity": "sha512-YnASpozLY+8Wjud8f0+3XG8zGfTtdFSFjWja8pPpTl23gVukpBlKElrEargNrOznGW1TXvGoNXE34r4/OLJjeg==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/equirectangular-tiles-adapter": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/equirectangular-tiles-adapter/-/equirectangular-tiles-adapter-5.5.1.tgz",
+      "integrity": "sha512-Uf88wdMHlXTCl8zLnwdRPS8HgaofK6EJyARXew/smJ4mR/0VUt9RWRE/8K9LrLhh01OYDEK7eo6sNXOhWsddLw==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/equirectangular-video-adapter": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/equirectangular-video-adapter/-/equirectangular-video-adapter-5.5.1.tgz",
+      "integrity": "sha512-Obh3n9K00d8NiRWPaOQLNI31iW32k8wrc9ANVUNxVSIzDt8Hkd/qBBV7VZoQtuELiFK+EPz+61h1uisckf50lQ==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/gallery-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/gallery-plugin/-/gallery-plugin-5.5.1.tgz",
+      "integrity": "sha512-J+Futd4VSFmAU1kw7a9zBZi1GUZT5lGTf/mHmGdOZSX0+/hLY0txCJhD909aoFZYqC4JRczRWAgW5aIpdvfV+A==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/gyroscope-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/gyroscope-plugin/-/gyroscope-plugin-5.5.1.tgz",
+      "integrity": "sha512-hgOzHHZyiM00/+5n3i386lI/Hf5dg4HCLpgxxeHP2eusieUI9JQIv4XNXWhzTq+OTdv1bwEj3wWXH65b+JuT/Q==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/map-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/map-plugin/-/map-plugin-5.5.1.tgz",
+      "integrity": "sha512-Wbaco0/RvLOeq6u4FqzuEIsOY/gV2kzOTUnrYSVoGiP6opNfDT62Bd4F+MpUq+FjazI6uoXcfrbuz6SrZi7Nmg==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/markers-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/markers-plugin/-/markers-plugin-5.5.1.tgz",
+      "integrity": "sha512-PnhmBplFFlT6CX4wz0qleGAHWOeZb+YmUCpOk/+zstUxf8Opf+XmXTZdk3M3bu/NmCe6DhkbyRl6f8aXDMQhhA==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/resolution-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/resolution-plugin/-/resolution-plugin-5.5.1.tgz",
+      "integrity": "sha512-pa+mVfkfQ7AuypYNdHG8pFk9+bcn3GJpq1JMfcMwurKUVi4XbLxQCOb2yq7owZP/IEpp82L1cvV4o8cFIV+8Eg==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1",
+        "@photo-sphere-viewer/settings-plugin": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/settings-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/settings-plugin/-/settings-plugin-5.5.1.tgz",
+      "integrity": "sha512-M5FAdwBuPn7INW0q7MnYRscQMFJMlNb2yR1vyjyq5mmTsghnclsCPq+ghkFJ3n7aIsrwObxndbPtB1RvrA4Xbw==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/stereo-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/stereo-plugin/-/stereo-plugin-5.5.1.tgz",
+      "integrity": "sha512-WSoi1i5JabGG7j+xTHXEE7S/AFY4xEM28EdwgJgPz+/S3xba7ouXWhOKCBE+Vjrka+mv0uwasaqRvFfzJrRJ0Q==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1",
+        "@photo-sphere-viewer/gyroscope-plugin": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/video-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/video-plugin/-/video-plugin-5.5.1.tgz",
+      "integrity": "sha512-sPxLWrwFnfj13XkxP+gCucagDDN0ZnYqUmrKpHe4aiAiwwiJIAdsllm7eq1e9dzYJoPk4tQuk9rJAuHseEbcsg==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/virtual-tour-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/virtual-tour-plugin/-/virtual-tour-plugin-5.5.1.tgz",
+      "integrity": "sha512-1qnp8XBCb26WlVnR/8kalqIeGgC3+ioBOZGxPJ2pu88QUBfb6UHYub4lLdslvTVd0eaMrV4KamTtweoxLRfTjg==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
+    "node_modules/@photo-sphere-viewer/visible-range-plugin": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/visible-range-plugin/-/visible-range-plugin-5.5.1.tgz",
+      "integrity": "sha512-Kt2zE99cHLdY0AjYVdmQjD0bQJj1MuSCz/J+2EFInA5O8xeanSjmTKOlaCoXuJPP8Q4j1e5gaY4/gguLjQ5P9w==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "5.5.1"
+      }
+    },
     "node_modules/@radix-ui/number": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.0.1.tgz",
@@ -3728,6 +3885,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -5244,6 +5406,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/photo-sphere-viewer-lensflare-plugin": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/photo-sphere-viewer-lensflare-plugin/-/photo-sphere-viewer-lensflare-plugin-2.0.1.tgz",
+      "integrity": "sha512-tF5uM/J0yOyYobTvcqPyClBXfdZbqfycBShZ8YSJDfjoi4co/y6gwsuN3XYvVKJz4GzfoY/t1BGQy/E0tLnMEA==",
+      "peerDependencies": {
+        "@photo-sphere-viewer/core": "^5.4.4",
+        "three": "^0.158.0"
+      }
+    },
     "node_modules/pick": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/pick/-/pick-0.0.1.tgz",
@@ -5624,6 +5795,74 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-photo-sphere-viewer": {
+      "version": "4.0.2-psv5.4.4",
+      "resolved": "https://registry.npmjs.org/react-photo-sphere-viewer/-/react-photo-sphere-viewer-4.0.2-psv5.4.4.tgz",
+      "integrity": "sha512-OYjbatB58IUO1msgh/1TL1iJeEoZxPswUrvOGYsUL5a4PeOJ0fDvqbVuYA1ZhXYwhRM2mH/M1JPFpc4gB81drA==",
+      "dependencies": {
+        "@photo-sphere-viewer/autorotate-plugin": "^5.4.4",
+        "@photo-sphere-viewer/compass-plugin": "^5.4.4",
+        "@photo-sphere-viewer/core": "^5.4.4",
+        "@photo-sphere-viewer/cubemap-adapter": "^5.4.4",
+        "@photo-sphere-viewer/cubemap-tiles-adapter": "^5.4.4",
+        "@photo-sphere-viewer/cubemap-video-adapter": "^5.4.4",
+        "@photo-sphere-viewer/equirectangular-tiles-adapter": "^5.4.4",
+        "@photo-sphere-viewer/equirectangular-video-adapter": "^5.4.4",
+        "@photo-sphere-viewer/gallery-plugin": "^5.4.4",
+        "@photo-sphere-viewer/gyroscope-plugin": "^5.4.4",
+        "@photo-sphere-viewer/map-plugin": "^5.4.4",
+        "@photo-sphere-viewer/markers-plugin": "^5.4.4",
+        "@photo-sphere-viewer/resolution-plugin": "^5.4.4",
+        "@photo-sphere-viewer/settings-plugin": "^5.4.4",
+        "@photo-sphere-viewer/stereo-plugin": "^5.4.4",
+        "@photo-sphere-viewer/video-plugin": "^5.4.4",
+        "@photo-sphere-viewer/virtual-tour-plugin": "^5.4.4",
+        "@photo-sphere-viewer/visible-range-plugin": "^5.4.4",
+        "autoprefixer": "^10.4.16",
+        "eventemitter3": "^5.0.1",
+        "photo-sphere-viewer-lensflare-plugin": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/react-photo-sphere-viewer/node_modules/autoprefixer": {
+      "version": "10.4.16",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+      "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001538",
+        "fraction.js": "^4.3.6",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
     "node_modules/react-remove-scroll": {
       "version": "2.5.5",
       "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
@@ -5732,6 +5971,18 @@
         "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc"
       }
     },
+    "node_modules/react-window-infinite-loader": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/react-window-infinite-loader/-/react-window-infinite-loader-1.0.9.tgz",
+      "integrity": "sha512-5Hg89IdU4Vrp0RT8kZYKeTIxWZYhNkVXeI1HbKo01Vm/Z7qztDvXljwx16sMzsa9yapRJQW3ODZfMUw38SOWHw==",
+      "engines": {
+        "node": ">8.0.0"
+      },
+      "peerDependencies": {
+        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -6534,6 +6785,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/three": {
+      "version": "0.158.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.158.0.tgz",
+      "integrity": "sha512-TALj4EOpdDPF1henk2Q+s17K61uEAAWQ7TJB68nr7FKxqwyDr3msOt5IWdbGm4TaWKjrtWS8DJJWe9JnvsWOhQ==",
+      "peer": true
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",

package.json

@@ -10,6 +10,8 @@
   },
   "dependencies": {
     "@huggingface/inference": "^2.6.4",
+    "@photo-sphere-viewer/core": "^5.5.1",
+    "@photo-sphere-viewer/video-plugin": "^5.5.1",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-avatar": "^1.0.3",
     "@radix-ui/react-checkbox": "^1.0.4",
@@ -45,6 +47,7 @@
     "lucide-react": "^0.260.0",
     "markdown-yaml-metadata-parser": "^3.0.0",
     "next": "^14.0.4",
+    "photo-sphere-viewer-lensflare-plugin": "^2.0.1",
     "pick": "^0.0.1",
     "postcss": "8.4.26",
     "qs": "^6.11.2",
@@ -53,10 +56,12 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "18.2.0",
     "react-icons": "^4.12.0",
+    "react-photo-sphere-viewer": "^4.0.2-psv5.4.4",
     "react-smooth-scroll-hook": "^1.3.4",
     "react-string-avatar": "^1.2.2",
     "react-tuby": "^0.1.24",
     "react-virtualized-auto-sizer": "^1.0.20",
+    "react-window-infinite-loader": "^1.0.9",
     "replicate": "^0.17.0",
     "sbd": "^1.0.19",
     "sentence-splitter": "^4.3.0",

src/app/interface/video-player/equirectangular.tsx

@@ -72,7 +72,7 @@ export function EquirectangularVideoPlayer({
             // progressbar: true,
             bigbutton: false
           }],
-          // SettingsPlugin,
+          SettingsPlugin,
           [ResolutionPlugin, {
             defaultResolution: 'HD',
             resolutions: [

src/app/interface/video-player/index.tsx

@@ -23,6 +23,9 @@ export function VideoPlayer({
   // we should our video players from  misssing data
   if (!video?.assetUrl) { return null }
 
+  video.assetUrl = "/demo.mp4"
+  video.projection = "equirectangular"
+
   const isEquirectangular = (
     video.projection === "equirectangular" ||
     parseProjectionFromLoRA(video.lora) === "equirectangular"

src/app/server/actions/ai-tube-hf/getChannelVideos.ts

@@ -6,8 +6,7 @@ import { getVideoRequestsFromChannel  } from "./getVideoRequestsFromChannel"
 import { adminApiKey } from "../config"
 import { getVideoIndex } from "./getVideoIndex"
 import { extendVideosWithStats } from "./extendVideosWithStats"
-import { orientationToWidthHeight } from "../utils/orientationToWidthHeight"
-import { parseProjectionFromLoRA } from "../utils/parseProjectionFromLoRA"
+import { computeOrientationProjectionWidthHeight } from "../utils/computeOrientationProjectionWidthHeight"
 
 // return 
 export async function getChannelVideos({
@@ -47,7 +46,6 @@ export async function getChannelVideos({
         thumbnailUrl: v.thumbnailUrl,
         model: v.model,
         lora: v.lora,
-        projection: parseProjectionFromLoRA(v.lora),
         style: v.style,
         voice: v.voice,
         music: v.music,
@@ -59,8 +57,11 @@ export async function getChannelVideos({
         tags: v.tags,
         channel,
         duration: v.duration || 0,
-        orientation: v.orientation,
-        ...orientationToWidthHeight(v.orientation),
+        ...computeOrientationProjectionWidthHeight({
+          lora: v.lora,
+          orientation: v.orientation,
+          // projection, // <- will be extrapolated from the LoRA for now
+        }),
       }
 
       if (queued[v.id]) {

src/app/server/actions/ai-tube-hf/getVideoRequestsFromChannel.ts

@@ -6,9 +6,7 @@ import { listFiles } from "@/huggingface/hub/src"
 import { parsePromptFileName } from "../utils/parsePromptFileName"
 import { downloadFileAsText } from "./downloadFileAsText"
 import { parseDatasetPrompt } from "../utils/parseDatasetPrompt"
-import { parseVideoModelName } from "../utils/parseVideoModelName"
-import { orientationToWidthHeight } from "../utils/orientationToWidthHeight"
-import { parseProjectionFromLoRA } from "../utils/parseProjectionFromLoRA"
+import { computeOrientationProjectionWidthHeight } from "../utils/computeOrientationProjectionWidthHeight"
 
 /**
  * Return all the videos requests created by a user on their channel
@@ -115,9 +113,12 @@ export async function getVideoRequestsFromChannel({
           updatedAt: file.lastCommit?.date || new Date().toISOString(),
           tags: Array.isArray(tags) && tags.length ? tags : channel.tags,
           channel,
-          orientation,
-          ...orientationToWidthHeight(orientation),
           duration: 0,
+          ...computeOrientationProjectionWidthHeight({
+            lora,
+            orientation,
+            // projection, // <- will be extrapolated from the LoRA for now
+          }),
         }
 
         videos[id] = video

src/app/server/actions/ai-tube-hf/uploadVideoRequestToDataset.ts

@@ -5,8 +5,7 @@ import { Blob } from "buffer"
 import { Credentials, uploadFile, whoAmI } from "@/huggingface/hub/src"
 import { ChannelInfo, VideoGenerationModel, VideoInfo, VideoOrientation, VideoRequest } from "@/types"
 import { formatPromptFileName } from "../utils/formatPromptFileName"
-import { orientationToWidthHeight } from "../utils/orientationToWidthHeight"
-import { parseProjectionFromLoRA } from "../utils/parseProjectionFromLoRA"
+import { computeOrientationProjectionWidthHeight } from "../utils/computeOrientationProjectionWidthHeight"
 
 /**
  * Save the video request to the user's own dataset
@@ -131,7 +130,11 @@ ${prompt}
     tags,
     channel,
     duration: 0,
-    orientation,
+    ...computeOrientationProjectionWidthHeight({
+      lora,
+      orientation,
+      // projection, // <- will be extrapolated from the LoRA for now
+    }),
   }
 
   const newVideo: VideoInfo = {
@@ -143,7 +146,6 @@ ${prompt}
     model,
     style,
     lora,
-    projection: parseProjectionFromLoRA(lora),
     voice,
     music,
     thumbnailUrl: channel.thumbnail, // will be generated in async
@@ -155,8 +157,11 @@ ${prompt}
     tags,
     channel,
     duration,
-    orientation,
-    ...orientationToWidthHeight(orientation),
+    ...computeOrientationProjectionWidthHeight({
+      lora,
+      orientation,
+      // projection, // <- will be extrapolated from the LoRA for now
+    }),
   }
 
   return {

src/app/server/actions/utils/computeOrientationProjectionWidthHeight.ts

@@ -0,0 +1,51 @@
+import { VideoOrientation, VideoProjection } from "@/types"
+
+import { parseVideoOrientation } from "./parseVideoOrientation"
+import { parseProjectionFromLoRA } from "./parseProjectionFromLoRA"
+
+export function computeOrientationProjectionWidthHeight({
+  lora: maybeLora,
+  projection: maybeProjection,
+  orientation: maybeOrientation,
+}: {
+  lora?: any
+  projection?: any
+  orientation?: any
+}): {
+  orientation: VideoOrientation
+  projection: VideoProjection
+  width: number
+  height: number
+} {
+
+  const lora = `${maybeLora || ""}`
+  const orientation = parseVideoOrientation(maybeOrientation)
+  const projection = maybeProjection ? maybeProjection : parseProjectionFromLoRA(lora)
+
+  let width = 1024
+  let height = 576
+
+  if (orientation === "portrait") {
+    height = 1024
+    width = 576
+  } else if (orientation === "square") {
+    height = 512
+    width = 512
+  } else {
+    width = 1024
+    height = 576
+  }
+
+  // now for equirectangular videos we need to have the correct image ratio of 2:1
+  if (projection === "equirectangular") {
+    width = 1024
+    height = 512
+  }
+
+  return {
+    orientation,
+    projection,
+    width,
+    height,
+  }
+}

src/app/server/actions/utils/orientationToWidthHeight.ts

@@ -1,38 +0,0 @@
-import { VideoOrientation } from "@/types"
-
-export function orientationToWidthHeight(orientation?: VideoOrientation): { width: number; height: number } {
-
-  if (orientation === "square") {
-    return {
-      width: 512,
-      height: 512,
-    }
-  }
-  
-  const longResolution = 1024
-  const shortResolution = 576
-
-  if (orientation === "portrait") {
-    return {
-      width: shortResolution,
-      height: longResolution,
-    }
-  }
-
-  /*
-
-  this is already the default, actually
-
-  if (orientation === "landscape") {
-    return {
-      width: longResolution,
-      height: shortResolution,
-    }
-  }
-  */
-
-  return {
-    width: longResolution,
-    height: shortResolution,
-  }
-}

src/app/server/actions/utils/parseVideoModelName.ts

@@ -20,5 +20,14 @@ export function parseVideoModelName(text: any, defaultToUse: VideoGenerationMode
     model = "LaVie"
   }
 
+  if (
+    rawModelString === "hotshot" || 
+    rawModelString === "hotshotxl" ||
+    rawModelString === "hotshot xl" ||
+    rawModelString === "hotshot-xl"
+  ) {
+    model = "HotshotXL"
+  }
+
   return model
 }

src/app/server/actions/utils/parseVideoOrientation.ts

@@ -4,7 +4,7 @@ import { VideoOrientation } from "@/types"
 export function parseVideoOrientation(text: any, defaultToUse?: VideoOrientation): VideoOrientation {
   const rawOrientationString = `${text || ""}`.trim().toLowerCase()
 
-  let orientation: VideoOrientation = defaultToUse || defaultVideoOrientation
+  let orientation: VideoOrientation = defaultToUse || (defaultVideoOrientation || "landscape")
 
   if (
     rawOrientationString === "landscape" || 
@@ -15,7 +15,8 @@ export function parseVideoOrientation(text: any, defaultToUse?: VideoOrientation
 
   if (
     rawOrientationString === "portrait" || 
-    rawOrientationString === "vertical"
+    rawOrientationString === "vertical" ||
+    rawOrientationString === "mobile"
   ) {
     orientation = "portrait"
   }

src/types.ts

@@ -254,6 +254,9 @@ export type VideoRequest = {
    */
   id: string
 
+  // skip generation (mostly used for debugging)
+  // skip?: boolean
+
   /**
    * Human readable title for the video
    */