diff --git a/.gitattributes b/.gitattributes index a7f2ead8f78..e6ae22ff6c8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,5 @@ apps/website/src/content/workshop-router-aliases.json linguist-generated=true apps/website/src/data/workshop-router-identity-audit.json linguist-generated=true apps/website/src/data/workshop-router-openapi.snapshot.json linguist-generated=true apps/website/src/data/workshop-node-pricing.json linguist-generated=true +apps/website/src/config/model-urls.ts linguist-generated=true +apps/website/MODEL_URL_MAP.md linguist-generated=true diff --git a/.github/workflows/ci-website-build.yaml b/.github/workflows/ci-website-build.yaml index b3def5ef668..e2626cc8880 100644 --- a/.github/workflows/ci-website-build.yaml +++ b/.github/workflows/ci-website-build.yaml @@ -62,11 +62,11 @@ jobs: WEBSITE_ASHBY_JOB_BOARD_NAME: ${{ secrets.WEBSITE_ASHBY_JOB_BOARD_NAME }} WORKSHOP_IN_BUILD: '0' run: | - models_pages() { find apps/website/dist/models -name index.html 2>/dev/null | sed "s|.*/dist/||" | sort; } + models_pages() { pnpm --silent --filter @comfyorg/website list:models-pages; } # dist/ still holds the "Build website" step's Workshop-enabled output. models_pages > "$RUNNER_TEMP/models-with-workshop.txt" if [ ! -s "$RUNNER_TEMP/models-with-workshop.txt" ]; then - echo "::error title=No Workshop-enabled baseline::apps/website/dist/models has no pages before the WORKSHOP_IN_BUILD=0 build. Run this step after \"Build website\"." + echo "::error title=No Workshop-enabled baseline::No pages under the Models URL registry's roots before the WORKSHOP_IN_BUILD=0 build. Run this step after \"Build website\"." exit 1 fi pnpm --filter @comfyorg/website build diff --git a/.github/workflows/model-page-discovery.yaml b/.github/workflows/model-page-discovery.yaml index c409a84a246..b3c1fedf4b2 100644 --- a/.github/workflows/model-page-discovery.yaml +++ b/.github/workflows/model-page-discovery.yaml @@ -106,8 +106,9 @@ jobs: ### Next steps 1. Review which of these warrant an SEO model page - 2. For local models: run \`SKIP_THUMBNAILS=1 pnpm generate:models\` and commit the result + 2. For local models: run \`SKIP_THUMBNAILS=1 pnpm generate:models\` and commit the result (it also regenerates \`vercel.json\` redirects) 3. For partner/API models: add to \`API_PROVIDER_MAP\` in \`generate-models.ts\`, regenerate, commit + 4. After hand-editing a \`canonicalSlug\` in \`generated-models.json\`: run \`pnpm sync:redirects\` and commit \`vercel.json\` --- *Generated by the [model-page-discovery workflow](https://github.com/$GITHUB_REPOSITORY/actions/workflows/model-page-discovery.yaml)*" diff --git a/.oxfmtrc.json b/.oxfmtrc.json index 7fc44fddc16..767b43d39bb 100644 --- a/.oxfmtrc.json +++ b/.oxfmtrc.json @@ -17,6 +17,7 @@ "apps/website/src/content/**/*.mdx", "apps/website/src/assets/world-countries.json", "apps/website/MODELS_TEST_RESULTS.md", + "apps/website/MODEL_URL_MAP.md", "apps/website/testing/models-test-results.json", "apps/website/src/content/workshop-display.json", "apps/website/src/content/workshop-models.json", diff --git a/apps/website/MODEL_URL_MAP.md b/apps/website/MODEL_URL_MAP.md new file mode 100644 index 00000000000..f5dbff323ca --- /dev/null +++ b/apps/website/MODEL_URL_MAP.md @@ -0,0 +1,415 @@ +# Model page URL map + +Generated by `scripts/generate-model-url-map.ts`. Old URL `/models//`, final URL `/hub/models//`. + +Scope: the Router model pages and their aliases only. The `/models/workflows//` pages are not in this table: they move to `/hub/workflows//` from their own list in FE-2972 B3. The `/models/apps//` pages (`apps/cinematic-studio`, `apps/reshoot`) are not in it either: they stay at `/models/apps//`. + +A published slug is frozen: regenerating keeps every old slug on the new slug recorded in `src/config/model-urls.ts`, even after a display-name change. Each row also records the display name its slug was frozen against, and a row whose current name would give a different slug than that recorded name is listed under "Check these first". Once reviewed, set that row's `name` to the current display name to clear the flag. Only pages new to the map get a slug from their display name. + +To change a published slug, edit that row's `newSlug` in `src/config/model-urls.ts` by hand, on purpose, then regenerate. A deliberate edit is not flagged. If the slug you replace is already live under `/hub/models/`, also add a redirect from it to the new one. + +The freeze covers renames, not removals: a page dropped from `workshopModels` loses its row, and its redirect, on the next regeneration. + +## Check these first (29) + +| New slug | Display name | Why | +| --- | --- | --- | +| `flux-tools-erase` | FLUX Tools Erase | no task words in the name; the product name stands in for the task; no version in the name, Router id is bfl/erase-v1 | +| `flux-pro-expand` | FLUX Pro Expand | no task words in the name; the product name stands in for the task; no version in the name, Router id is bfl/flux-pro-1.0-expand | +| `flux-pro-fill` | FLUX Pro Fill | no task words in the name; the product name stands in for the task; no version in the name, Router id is bfl/flux-pro-1.0-fill | +| `flux-video-upscale` | FLUX Video Upscale | no task words in the name; the product name stands in for the task; no version in the name, Router id is bfl/video-upscale-v1 | +| `flux-virtual-try-on` | FLUX Virtual Try-On | no task words in the name; the product name stands in for the task; no version in the name, Router id is bfl/vto-v1 | +| `bria-eraser` | Bria Eraser | no task words in the name; the product name stands in for the task | +| `bria-expand-image` | Bria Expand Image | no task words in the name; the product name stands in for the task | +| `bria-generative-fill` | Bria Generative Fill | no task words in the name; the product name stands in for the task | +| `bria-green-screen-video` | Bria Green Screen Video | no task words in the name; the product name stands in for the task | +| `bria-increase-resolution` | Bria Increase Resolution | no task words in the name; the product name stands in for the task | +| `bria-rmbg-2-0` | Bria RMBG 2.0 | no task words in the name; the product name stands in for the task | +| `bria-remove-video-background` | Bria Remove Video Background | no task words in the name; the product name stands in for the task | +| `bria-replace-video-background` | Bria Replace Video Background | no task words in the name; the product name stands in for the task | +| `seedream-5-0-pro-layer-separation` | Seedream 5.0 Pro Layer Separation | no task words in the name; the product name stands in for the task | +| `elevenlabs-text-to-dialogue` | ElevenLabs Text-to-Dialogue | no version in the name, Router id is elevenlabs/eleven_v3 | +| `magnific-skin-enhancer` | Magnific Skin Enhancer | no task words in the name; the product name stands in for the task | +| `nano-banana-image-edit` | Nano Banana Image Edit | no version in the name, Router id is vertexai/gemini-2.5-flash-image | +| `nano-banana-text-to-image` | Nano Banana Text-to-Image | no version in the name, Router id is vertexai/gemini-2.5-flash-image | +| `nano-banana-pro-image-edit` | Nano Banana Pro Image Edit | no version in the name, Router id is vertexai/gemini-3-pro-image | +| `nano-banana-pro-text-to-image` | Nano Banana Pro Text-to-Image | no version in the name, Router id is vertexai/gemini-3-pro-image | +| `kling-avatar` | Kling Avatar | no task words in the name; the product name stands in for the task | +| `kling-lip-sync-text-to-video` | Kling Lip Sync Text-to-Video | name says "text-to-video", page use case is edit-videos | +| `happyhorse-reference-to-video` | HappyHorse Reference-to-Video | no version in the name, Router id is wan/happyhorse-1.1-r2v | +| `happyhorse-text-to-video` | HappyHorse Text-to-Video | no version in the name, Router id is wan/happyhorse-1.1-t2v | +| `happyhorse-video-edit` | HappyHorse Video Edit | no version in the name, Router id is wan/happyhorse-1.0-video-edit | +| `wan-2-6-reference-to-video` | Wan 2.6 Reference-to-Video | name says "reference-to-video", page use case is edit-videos | +| `flashvsr` | FlashVSR | no task words in the name; the product name stands in for the task | +| `seedvr2-image-upscaler` | SeedVR2 Image Upscaler | no task words in the name; the product name stands in for the task | +| `ultimate-image-upscaler` | Ultimate Image Upscaler | no task words in the name; the product name stands in for the task | + +## Model pages (148) + +| Provider | Display name | Old slug | New slug | +| --- | --- | --- | --- | +| Beeble | Beeble SwitchX Image Edit | `beeble--switchx-image-edit--edit-images` | `beeble-switchx-image-edit` | +| Beeble | Beeble SwitchX Video Edit | `beeble--switchx-video-edit--edit-videos` | `beeble-switchx-video-edit` | +| Black Forest Labs | FLUX 2 Max Text-to-Image | `bfl--flux-2-max--generate-images` | `flux-2-max-text-to-image` | +| Black Forest Labs | FLUX 2 Pro Text-to-Image | `bfl--flux-2-pro--generate-images` | `flux-2-pro-text-to-image` | +| Black Forest Labs | FLUX 3 Video Image-to-Video | `bfl--flux-3-image-to-video--animate-images` | `flux-3-video-image-to-video` | +| Black Forest Labs | FLUX 3 Video Text-to-Video | `bfl--flux-3-text-to-video--generate-videos` | `flux-3-video-text-to-video` | +| Black Forest Labs | FLUX Tools Erase | `bfl--flux-erase--edit-images` | `flux-tools-erase` | +| Black Forest Labs | FLUX.1 Kontext Max Image Edit | `bfl--flux-kontext-max--edit-images` | `flux-1-kontext-max-image-edit` | +| Black Forest Labs | FLUX.1 Kontext Pro Image Edit | `bfl--flux-kontext-pro--edit-images` | `flux-1-kontext-pro-image-edit` | +| Black Forest Labs | FLUX Pro 1.1 Text-to-Image | `bfl--flux-pro-1.1--generate-images` | `flux-pro-1-1-text-to-image` | +| Black Forest Labs | FLUX Pro 1.1 Ultra Text-to-Image | `bfl--flux-pro-1.1-ultra--generate-images` | `flux-pro-1-1-ultra-text-to-image` | +| Black Forest Labs | FLUX Pro Expand | `bfl--flux-pro-expand--edit-images` | `flux-pro-expand` | +| Black Forest Labs | FLUX Pro Fill | `bfl--flux-pro-fill--edit-images` | `flux-pro-fill` | +| Black Forest Labs | FLUX Video Upscale | `bfl--flux-video-upscale--edit-videos` | `flux-video-upscale` | +| Black Forest Labs | FLUX Virtual Try-On | `bfl--flux-virtual-try-on--edit-images` | `flux-virtual-try-on` | +| Bria | Bria Eraser | `bria--eraser--edit-images` | `bria-eraser` | +| Bria | Bria Expand Image | `bria--expand-image--edit-images` | `bria-expand-image` | +| Bria | Bria FIBO Image Edit | `bria--fibo-image-edit--edit-images` | `bria-fibo-image-edit` | +| Bria | Bria Generative Fill | `bria--generative-fill--edit-images` | `bria-generative-fill` | +| Bria | Bria Green Screen Video | `bria--green-screen-video--edit-videos` | `bria-green-screen-video` | +| Bria | Bria Increase Resolution | `bria--increase-resolution--edit-images` | `bria-increase-resolution` | +| Bria | Bria RMBG 2.0 | `bria--remove-image-background--edit-images` | `bria-rmbg-2-0` | +| Bria | Bria Remove Video Background | `bria--remove-video-background--edit-videos` | `bria-remove-video-background` | +| Bria | Bria Replace Video Background | `bria--replace-video-background--edit-videos` | `bria-replace-video-background` | +| ByteDance | Seed Audio 1.0 Text-to-Speech | `byteplus--seed-audio-1.0--audio` | `seed-audio-1-0-text-to-speech` | +| ByteDance | Seed Audio 1.0 Multilingual Text-to-Speech | `byteplus--seed-audio-1.0-multilingual--audio` | `seed-audio-1-0-multilingual-text-to-speech` | +| ByteDance | Seedance 2.5 Video Edit | `byteplus--seedance-2-5-edit-video--edit-videos` | `seedance-2-5-video-edit` | +| ByteDance | Seedance 2.5 First-Last Frame | `byteplus--seedance-2-5-first-last-frame--animate-images` | `seedance-2-5-first-last-frame` | +| ByteDance | Seedance 2.5 Reference-to-Video | `byteplus--seedance-2-5-reference--generate-videos` | `seedance-2-5-reference-to-video` | +| ByteDance | Seedance 2.5 Text-to-Video | `byteplus--seedance-2-5-text-to-video--generate-videos` | `seedance-2-5-text-to-video` | +| ByteDance | Seedance 2.0 Fast First-Last Frame | `byteplus--seedance-2-fast-first-last-frame--animate-images` | `seedance-2-0-fast-first-last-frame` | +| ByteDance | Seedance 2.0 Fast Reference-to-Video | `byteplus--seedance-2-fast-reference--generate-videos` | `seedance-2-0-fast-reference-to-video` | +| ByteDance | Seedance 2.0 Fast Text-to-Video | `byteplus--seedance-2-fast-text-to-video--generate-videos` | `seedance-2-0-fast-text-to-video` | +| ByteDance | Seedance 2.0 Image-to-Video | `byteplus--seedance-2-image-to-video--animate-images` | `seedance-2-0-image-to-video` | +| ByteDance | Seedance 2.0 Mini Text-to-Video | `byteplus--seedance-2-mini-text-to-video--generate-videos` | `seedance-2-0-mini-text-to-video` | +| ByteDance | Seedance 2.0 Reference-to-Video | `byteplus--seedance-2-reference--generate-videos` | `seedance-2-0-reference-to-video` | +| ByteDance | Seedance 2.0 Text-to-Video | `byteplus--seedance-2-text-to-video--generate-videos` | `seedance-2-0-text-to-video` | +| ByteDance | Seedream 4.0 Image Edit | `byteplus--seedream-4--edit-images` | `seedream-4-0-image-edit` | +| ByteDance | Seedream 4.0 Text-to-Image | `byteplus--seedream-4--generate-images` | `seedream-4-0-text-to-image` | +| ByteDance | Seedream 4.5 Image Edit | `byteplus--seedream-4-5--edit-images` | `seedream-4-5-image-edit` | +| ByteDance | Seedream 4.5 Text-to-Image | `byteplus--seedream-4-5--generate-images` | `seedream-4-5-text-to-image` | +| ByteDance | Seedream 5.0 Lite Image Edit | `byteplus--seedream-5-lite--edit-images` | `seedream-5-0-lite-image-edit` | +| ByteDance | Seedream 5.0 Lite Text-to-Image | `byteplus--seedream-5-lite--generate-images` | `seedream-5-0-lite-text-to-image` | +| ByteDance | Seedream 5.0 Pro Image Edit | `byteplus--seedream-5-pro--edit-images` | `seedream-5-0-pro-image-edit` | +| ByteDance | Seedream 5.0 Pro Text-to-Image | `byteplus--seedream-5-pro--generate-images` | `seedream-5-0-pro-text-to-image` | +| ByteDance | Seedream 5.0 Pro Layer Separation | `byteplus--seedream-5-pro-layer-separation--edit-images` | `seedream-5-0-pro-layer-separation` | +| ElevenLabs | ElevenLabs Text-to-Dialogue | `elevenlabs--text-to-dialogue--audio` | `elevenlabs-text-to-dialogue` | +| Freepik | Magnific Skin Enhancer | `freepik--magnific-skin-enhancer--edit-images` | `magnific-skin-enhancer` | +| Google | Gemini Omni 1.1 Flash Image-to-Video | `gemini--omni-1.1-flash--animate-images` | `gemini-omni-1-1-flash-image-to-video` | +| Google | Gemini Omni 1.1 Flash Video Edit | `gemini--omni-1.1-flash--edit-videos` | `gemini-omni-1-1-flash-video-edit` | +| Google | Gemini Omni 1.1 Flash Text-to-Video | `gemini--omni-1.1-flash--generate-videos` | `gemini-omni-1-1-flash-text-to-video` | +| Google | Gemini Omni Flash Preview Image-to-Video | `gemini--omni-flash-preview--animate-images` | `gemini-omni-flash-preview-image-to-video` | +| Google | Gemini Omni Flash Preview Video Edit | `gemini--omni-flash-preview--edit-videos` | `gemini-omni-flash-preview-video-edit` | +| Google | Gemini Omni Flash Preview Text-to-Video | `gemini--omni-flash-preview--generate-videos` | `gemini-omni-flash-preview-text-to-video` | +| Google | Nano Banana Image Edit | `vertexai--gemini-2.5-flash-image--edit-images` | `nano-banana-image-edit` | +| Google | Nano Banana Text-to-Image | `vertexai--gemini-2.5-flash-image--generate-images` | `nano-banana-text-to-image` | +| Google | Nano Banana Pro Image Edit | `vertexai--gemini-3-pro-image--edit-images` | `nano-banana-pro-image-edit` | +| Google | Nano Banana Pro Text-to-Image | `vertexai--gemini-3-pro-image--generate-images` | `nano-banana-pro-text-to-image` | +| Google | Nano Banana 2 Image Edit | `vertexai--gemini-nano-banana-2--edit-images` | `nano-banana-2-image-edit` | +| Google | Nano Banana 2 Text-to-Image | `vertexai--gemini-nano-banana-2--generate-images` | `nano-banana-2-text-to-image` | +| Google | Veo 3 Image-to-Video | `vertexai--veo-3--animate-images` | `veo-3-image-to-video` | +| Google | Veo 3 Text-to-Video | `vertexai--veo-3--generate-videos` | `veo-3-text-to-video` | +| Google | Veo 3 First-Last Frame | `vertexai--veo-3-first-last-frame--animate-images` | `veo-3-first-last-frame` | +| Heygen | HeyGen Starfish Text-to-Speech | `heygen--starfish-tts--audio` | `heygen-starfish-text-to-speech` | +| Ideogram | Ideogram V3 Text-to-Image | `ideogram--v3--generate-images` | `ideogram-v3-text-to-image` | +| Ideogram | Ideogram V4 Text-to-Image | `ideogram--v4--generate-images` | `ideogram-v4-text-to-image` | +| Kling | Kling Avatar | `kling--avatar--animate-images` | `kling-avatar` | +| Kling | Kling 3.0 Turbo Text-to-Video | `kling--kling-3.0-turbo-text-to-video--generate-videos` | `kling-3-0-turbo-text-to-video` | +| Kling | Kling Lip Sync Audio-to-Video | `kling--lip-sync-audio-to-video--edit-videos` | `kling-lip-sync-audio-to-video` | +| Kling | Kling Lip Sync Text-to-Video | `kling--lip-sync-text-to-video--edit-videos` | `kling-lip-sync-text-to-video` | +| Kling | Kling O3 Video Edit | `kling--omni-pro-edit-video--edit-videos` | `kling-o3-video-edit` | +| Kling | Kling O3 Image-to-Video | `kling--omni-pro-image-to-video--animate-images` | `kling-o3-image-to-video` | +| Kling | Kling O3 Text-to-Video | `kling--omni-pro-text-to-video--generate-videos` | `kling-o3-text-to-video` | +| Kling | Kling O3 Video-to-Video | `kling--omni-pro-video-to-video--edit-videos` | `kling-o3-video-to-video` | +| Kling | Kling 2.5 Turbo Text-to-Video | `kling--text-to-video--generate-videos` | `kling-2-5-turbo-text-to-video` | +| Kling | Kling 2.6 Pro Text-to-Video with Audio | `kling--text-to-video-with-audio--generate-videos` | `kling-2-6-pro-text-to-video-with-audio` | +| Kling | Kling 3.0 Text-to-Video | `kling--v3--generate-videos` | `kling-3-0-text-to-video` | +| Krea | Krea 2 Large Text-to-Image | `krea--krea-2-large--generate-images` | `krea-2-large-text-to-image` | +| Krea | Krea 2 Medium Text-to-Image | `krea--krea-2-medium--generate-images` | `krea-2-medium-text-to-image` | +| Krea | Krea 2 Medium Turbo Text-to-Image | `krea--krea-2-medium-turbo--generate-images` | `krea-2-medium-turbo-text-to-image` | +| Luma | Luma Photon 1 Text-to-Image | `luma--photon-1-image-generation--generate-images` | `luma-photon-1-text-to-image` | +| Luma | Luma Photon 1 Image Edit | `luma--photon-1-image-modify--edit-images` | `luma-photon-1-image-edit` | +| Luma | Luma Photon Flash 1 Text-to-Image | `luma--photon-flash-1-image-generation--generate-images` | `luma-photon-flash-1-text-to-image` | +| Luma | Luma Photon Flash 1 Image Edit | `luma--photon-flash-1-image-modify--edit-images` | `luma-photon-flash-1-image-edit` | +| Luma | Luma Ray 2 Image-to-Video | `luma--ray-2-image-to-video--animate-images` | `luma-ray-2-image-to-video` | +| Luma | Luma Ray 2 Text-to-Video | `luma--ray-2-text-to-video--generate-videos` | `luma-ray-2-text-to-video` | +| Luma | Luma Ray Flash 2 Image-to-Video | `luma--ray-flash-2-image-to-video--animate-images` | `luma-ray-flash-2-image-to-video` | +| Luma | Luma Ray Flash 2 Text-to-Video | `luma--ray-flash-2-text-to-video--generate-videos` | `luma-ray-flash-2-text-to-video` | +| Luma | Luma Uni 1 Image Edit | `luma_2--uni-1-image-edit--edit-images` | `luma-uni-1-image-edit` | +| Luma | Luma Uni 1 Text-to-Image | `luma_2--uni-1-image-generation--generate-images` | `luma-uni-1-text-to-image` | +| Luma | Luma Uni 1 Max Image Edit | `luma_2--uni-1-max-image-edit--edit-images` | `luma-uni-1-max-image-edit` | +| Luma | Luma Uni 1 Max Text-to-Image | `luma_2--uni-1-max-image-generation--generate-images` | `luma-uni-1-max-text-to-image` | +| OpenAI | GPT Image 1 Image Edit | `openai--gpt-image-1--edit-images` | `gpt-image-1-image-edit` | +| OpenAI | GPT Image 1.5 Image Edit | `openai--gpt-image-1.5--edit-images` | `gpt-image-1-5-image-edit` | +| OpenAI | GPT Image 2 Text-to-Image | `openai--gpt-image-2--generate-images` | `gpt-image-2-text-to-image` | +| OpenAI | GPT Image 2.5 Flare Text-to-Image | `openai--gpt-image-2.5-flare--generate-images` | `gpt-image-2-5-flare-text-to-image` | +| OpenAI | GPT Image 2.5 Sunburst Text-to-Image | `openai--gpt-image-2.5-sunburst--generate-images` | `gpt-image-2-5-sunburst-text-to-image` | +| Qwen | Qwen Image 3.0 Image Edit | `qwen--qwen-image-3.0-image-edit--edit-images` | `qwen-image-3-0-image-edit` | +| Qwen | Qwen Image 3.0 Pro Image Edit | `qwen--qwen-image-3.0-pro-image-edit--edit-images` | `qwen-image-3-0-pro-image-edit` | +| Qwen | Qwen Image 3.0 Pro Text-to-Image | `qwen--qwen-image-3.0-pro-text-to-image--generate-images` | `qwen-image-3-0-pro-text-to-image` | +| Qwen | Qwen Image 3.0 Text-to-Image | `qwen--qwen-image-3.0-text-to-image--generate-images` | `qwen-image-3-0-text-to-image` | +| Recraft | Recraft V3 Text-to-Image | `recraft--v3-text-to-image--generate-images` | `recraft-v3-text-to-image` | +| Recraft | Recraft V3 Text-to-Vector | `recraft--v3-text-to-vector--generate-images` | `recraft-v3-text-to-vector` | +| Recraft | Recraft V4 Pro Text-to-Image | `recraft--v4-pro-text-to-image--generate-images` | `recraft-v4-pro-text-to-image` | +| Recraft | Recraft V4 Pro Text-to-Vector | `recraft--v4-pro-text-to-vector--generate-images` | `recraft-v4-pro-text-to-vector` | +| Recraft | Recraft V4 Text-to-Image | `recraft--v4-text-to-image--generate-images` | `recraft-v4-text-to-image` | +| Recraft | Recraft V4 Text-to-Vector | `recraft--v4-text-to-vector--generate-images` | `recraft-v4-text-to-vector` | +| Recraft | Recraft V4.1 Pro Text-to-Image | `recraft--v4.1-pro-text-to-image--generate-images` | `recraft-v4-1-pro-text-to-image` | +| Recraft | Recraft V4.1 Pro Text-to-Vector | `recraft--v4.1-pro-text-to-vector--generate-images` | `recraft-v4-1-pro-text-to-vector` | +| Recraft | Recraft V4.1 Text-to-Image | `recraft--v4.1-text-to-image--generate-images` | `recraft-v4-1-text-to-image` | +| Recraft | Recraft V4.1 Text-to-Vector | `recraft--v4.1-text-to-vector--generate-images` | `recraft-v4-1-text-to-vector` | +| Recraft | Recraft V4.1 Utility Pro Text-to-Image | `recraft--v4.1-utility-pro-text-to-image--generate-images` | `recraft-v4-1-utility-pro-text-to-image` | +| Recraft | Recraft V4.1 Utility Pro Text-to-Vector | `recraft--v4.1-utility-pro-text-to-vector--generate-images` | `recraft-v4-1-utility-pro-text-to-vector` | +| Recraft | Recraft V4.1 Utility Text-to-Image | `recraft--v4.1-utility-text-to-image--generate-images` | `recraft-v4-1-utility-text-to-image` | +| Recraft | Recraft V4.1 Utility Text-to-Vector | `recraft--v4.1-utility-text-to-vector--generate-images` | `recraft-v4-1-utility-text-to-vector` | +| Runway | Runway Aleph 2 Video-to-Video | `runway--aleph2-video-to-video--edit-videos` | `runway-aleph-2-video-to-video` | +| Runway | Runway Gen-4 Image Text-to-Image | `runway--gen4-image--generate-images` | `runway-gen-4-image-text-to-image` | +| Runway | Runway Gen-4 Turbo Image-to-Video | `runway--gen4-turbo-image-to-video--animate-images` | `runway-gen-4-turbo-image-to-video` | +| Wan | HappyHorse Reference-to-Video | `wan--happyhorse-reference-video--animate-images` | `happyhorse-reference-to-video` | +| Wan | HappyHorse Text-to-Video | `wan--happyhorse-text-to-video--generate-videos` | `happyhorse-text-to-video` | +| Wan | HappyHorse Video Edit | `wan--happyhorse-video-edit--edit-videos` | `happyhorse-video-edit` | +| Wan | Wan 2.5 Image Edit | `wan--image-to-image--edit-images` | `wan-2-5-image-edit` | +| Wan | Wan 2.6 Image-to-Video | `wan--image-to-video--animate-images` | `wan-2-6-image-to-video` | +| Wan | Wan 2.7 Image-to-Video | `wan--image-to-video-2.7--animate-images` | `wan-2-7-image-to-video` | +| Wan | Wan 3.0 Image-to-Video | `wan--image-to-video-3.0--animate-images` | `wan-3-0-image-to-video` | +| Wan | Wan 3.0 Prime Image-to-Video | `wan--image-to-video-3.0-prime--animate-images` | `wan-3-0-prime-image-to-video` | +| Wan | Wan 3.0 Reference-to-Video | `wan--reference-to-video-3.0--animate-images` | `wan-3-0-reference-to-video` | +| Wan | Wan 3.0 Prime Reference-to-Video | `wan--reference-to-video-3.0-prime--animate-images` | `wan-3-0-prime-reference-to-video` | +| Wan | Wan 2.6 Reference-to-Video | `wan--reference-video--edit-videos` | `wan-2-6-reference-to-video` | +| Wan | Wan 2.7 Reference-to-Video | `wan--reference-video-2.7--animate-images` | `wan-2-7-reference-to-video` | +| Wan | Wan 2.5 Text-to-Image | `wan--text-to-image--generate-images` | `wan-2-5-text-to-image` | +| Wan | Wan 2.6 Text-to-Video | `wan--text-to-video--generate-videos` | `wan-2-6-text-to-video` | +| Wan | Wan 2.7 Text-to-Video | `wan--text-to-video-2.7--generate-videos` | `wan-2-7-text-to-video` | +| Wan | Wan 3.0 Text-to-Video | `wan--text-to-video-3.0--generate-videos` | `wan-3-0-text-to-video` | +| Wan | Wan 3.0 Prime Text-to-Video | `wan--text-to-video-3.0-prime--generate-videos` | `wan-3-0-prime-text-to-video` | +| Wan | Wan 2.7 Video Continuation | `wan--video-continuation-2.7--animate-images` | `wan-2-7-video-continuation` | +| Wan | Wan 2.7 Video Edit | `wan--video-edit-2.7--edit-videos` | `wan-2-7-video-edit` | +| WaveSpeed | FlashVSR | `wavespeed--flashvsr--edit-videos` | `flashvsr` | +| WaveSpeed | SeedVR2 Image Upscaler | `wavespeed--seedvr2-image--edit-images` | `seedvr2-image-upscaler` | +| WaveSpeed | Ultimate Image Upscaler | `wavespeed--ultimate-image-upscaler--edit-images` | `ultimate-image-upscaler` | +| xAI | Grok Imagine Image Text-to-Image | `xai--grok-imagine-image--generate-images` | `grok-imagine-image-text-to-image` | +| xAI | Grok Imagine Image 2.0 Text-to-Image | `xai--grok-imagine-image-2.0--generate-images` | `grok-imagine-image-2-0-text-to-image` | +| xAI | Grok Imagine Video Image-to-Video | `xai--grok-imagine-video--animate-images` | `grok-imagine-video-image-to-video` | +| xAI | Grok Imagine Video Text-to-Video | `xai--grok-imagine-video--generate-videos` | `grok-imagine-video-text-to-video` | +| xAI | Grok Imagine Video 1.5 Image-to-Video | `xai--grok-imagine-video-1.5--animate-images` | `grok-imagine-video-1-5-image-to-video` | +| xAI | Grok Imagine Video 1.5 Text-to-Video | `xai--grok-imagine-video-1.5--generate-videos` | `grok-imagine-video-1-5-text-to-video` | +| xAI | Grok Imagine Video 1.5 Reference-to-Video | `xai--grok-imagine-video-1.5-reference--animate-images` | `grok-imagine-video-1-5-reference-to-video` | +| xAI | Grok Imagine Video Reference-to-Video | `xai--grok-imagine-video-reference--animate-images` | `grok-imagine-video-reference-to-video` | + +## Aliases (212) + +| Alias | New slug | +| --- | --- | +| `beeble--switchx` | `beeble-switchx-image-edit` | +| `beeble--switchx-image-edit` | `beeble-switchx-image-edit` | +| `beeble--switchx-video-edit` | `beeble-switchx-video-edit` | +| `bfl--erase-v1` | `flux-tools-erase` | +| `bfl--flux-2-max` | `flux-2-max-text-to-image` | +| `bfl--flux-2-pro` | `flux-2-pro-text-to-image` | +| `bfl--flux-3-image-to-video` | `flux-3-video-image-to-video` | +| `bfl--flux-3-text-to-video` | `flux-3-video-text-to-video` | +| `bfl--flux-3-video` | `flux-3-video-text-to-video` | +| `bfl--flux-erase` | `flux-tools-erase` | +| `bfl--flux-kontext-max` | `flux-1-kontext-max-image-edit` | +| `bfl--flux-kontext-pro` | `flux-1-kontext-pro-image-edit` | +| `bfl--flux-pro-1.0-expand` | `flux-pro-expand` | +| `bfl--flux-pro-1.0-fill` | `flux-pro-fill` | +| `bfl--flux-pro-1.1` | `flux-pro-1-1-text-to-image` | +| `bfl--flux-pro-1.1-ultra` | `flux-pro-1-1-ultra-text-to-image` | +| `bfl--flux-pro-expand` | `flux-pro-expand` | +| `bfl--flux-pro-fill` | `flux-pro-fill` | +| `bfl--flux-video-upscale` | `flux-video-upscale` | +| `bfl--flux-virtual-try-on` | `flux-virtual-try-on` | +| `bfl--video-upscale-v1` | `flux-video-upscale` | +| `bfl--vto-v1` | `flux-virtual-try-on` | +| `bria--eraser` | `bria-eraser` | +| `bria--expand-image` | `bria-expand-image` | +| `bria--fibo` | `bria-fibo-image-edit` | +| `bria--fibo-image-edit` | `bria-fibo-image-edit` | +| `bria--generative-fill` | `bria-generative-fill` | +| `bria--green-screen-video` | `bria-green-screen-video` | +| `bria--image-edit-erase` | `bria-eraser` | +| `bria--image-edit-expand` | `bria-expand-image` | +| `bria--image-edit-gen-fill` | `bria-generative-fill` | +| `bria--image-edit-increase-resolution` | `bria-increase-resolution` | +| `bria--image-edit-remove-background` | `bria-rmbg-2-0` | +| `bria--increase-resolution` | `bria-increase-resolution` | +| `bria--remove-image-background` | `bria-rmbg-2-0` | +| `bria--remove-video-background` | `bria-remove-video-background` | +| `bria--replace-video-background` | `bria-replace-video-background` | +| `bria--video-edit-green-screen` | `bria-green-screen-video` | +| `bria--video-edit-remove-background` | `bria-remove-video-background` | +| `bria--video-edit-replace-background` | `bria-replace-video-background` | +| `byteplus--dreamina-seedance-2-0-260128` | `seedance-2-0-text-to-video` | +| `byteplus--dreamina-seedance-2-0-fast-260128` | `seedance-2-0-fast-text-to-video` | +| `byteplus--dreamina-seedance-2-0-mini` | `seedance-2-0-mini-text-to-video` | +| `byteplus--dreamina-seedance-2-5-260628` | `seedance-2-5-text-to-video` | +| `byteplus--seed-audio-1.0` | `seed-audio-1-0-text-to-speech` | +| `byteplus--seed-audio-1.0-multilingual` | `seed-audio-1-0-multilingual-text-to-speech` | +| `byteplus--seedance-2-5-edit-video` | `seedance-2-5-video-edit` | +| `byteplus--seedance-2-5-first-last-frame` | `seedance-2-5-first-last-frame` | +| `byteplus--seedance-2-5-reference` | `seedance-2-5-reference-to-video` | +| `byteplus--seedance-2-5-text-to-video` | `seedance-2-5-text-to-video` | +| `byteplus--seedance-2-fast-first-last-frame` | `seedance-2-0-fast-first-last-frame` | +| `byteplus--seedance-2-fast-reference` | `seedance-2-0-fast-reference-to-video` | +| `byteplus--seedance-2-fast-text-to-video` | `seedance-2-0-fast-text-to-video` | +| `byteplus--seedance-2-image-to-video` | `seedance-2-0-image-to-video` | +| `byteplus--seedance-2-mini-text-to-video` | `seedance-2-0-mini-text-to-video` | +| `byteplus--seedance-2-reference` | `seedance-2-0-reference-to-video` | +| `byteplus--seedance-2-text-to-video` | `seedance-2-0-text-to-video` | +| `byteplus--seedream-4` | `seedream-4-0-text-to-image` | +| `byteplus--seedream-4-0-250828` | `seedream-4-0-text-to-image` | +| `byteplus--seedream-4-5` | `seedream-4-5-text-to-image` | +| `byteplus--seedream-4-5-251128` | `seedream-4-5-text-to-image` | +| `byteplus--seedream-5-0-260128` | `seedream-5-0-lite-text-to-image` | +| `byteplus--seedream-5-0-pro-260628` | `seedream-5-0-pro-text-to-image` | +| `byteplus--seedream-5-lite` | `seedream-5-0-lite-text-to-image` | +| `byteplus--seedream-5-pro` | `seedream-5-0-pro-text-to-image` | +| `byteplus--seedream-5-pro-layer-separation` | `seedream-5-0-pro-layer-separation` | +| `elevenlabs--eleven_v3` | `elevenlabs-text-to-dialogue` | +| `elevenlabs--text-to-dialogue` | `elevenlabs-text-to-dialogue` | +| `freepik--ai-skin-enhancer-creative` | `magnific-skin-enhancer` | +| `freepik--magnific-skin-enhancer` | `magnific-skin-enhancer` | +| `gemini--omni-1.1-flash` | `gemini-omni-1-1-flash-text-to-video` | +| `gemini--omni-flash-preview` | `gemini-omni-flash-preview-text-to-video` | +| `gemini-interactions--gemini-omni-1.1-flash` | `gemini-omni-1-1-flash-text-to-video` | +| `gemini-interactions--gemini-omni-flash-preview` | `gemini-omni-flash-preview-text-to-video` | +| `heygen--starfish` | `heygen-starfish-text-to-speech` | +| `heygen--starfish-tts` | `heygen-starfish-text-to-speech` | +| `ideogram--ideogram-v3` | `ideogram-v3-text-to-image` | +| `ideogram--ideogram-v4` | `ideogram-v4-text-to-image` | +| `ideogram--v3` | `ideogram-v3-text-to-image` | +| `ideogram--v4` | `ideogram-v4-text-to-image` | +| `kling--avatar` | `kling-avatar` | +| `kling--kling-3.0-turbo` | `kling-3-0-turbo-text-to-video` | +| `kling--kling-3.0-turbo-text-to-video` | `kling-3-0-turbo-text-to-video` | +| `kling--kling-v2-5-turbo` | `kling-2-5-turbo-text-to-video` | +| `kling--kling-v2-6` | `kling-2-6-pro-text-to-video-with-audio` | +| `kling--kling-v3` | `kling-3-0-text-to-video` | +| `kling--kling-v3-omni` | `kling-o3-image-to-video` | +| `kling--kling-video-o1` | `kling-o3-text-to-video` | +| `kling--lip-sync-audio-to-video` | `kling-lip-sync-audio-to-video` | +| `kling--lip-sync-text-to-video` | `kling-lip-sync-text-to-video` | +| `kling--omni-pro-edit-video` | `kling-o3-video-edit` | +| `kling--omni-pro-image-to-video` | `kling-o3-image-to-video` | +| `kling--omni-pro-text-to-video` | `kling-o3-text-to-video` | +| `kling--omni-pro-video-to-video` | `kling-o3-video-to-video` | +| `kling--text-to-video` | `kling-2-5-turbo-text-to-video` | +| `kling--text-to-video-with-audio` | `kling-2-6-pro-text-to-video-with-audio` | +| `kling--v3` | `kling-3-0-text-to-video` | +| `kling--videos-avatar-image2video` | `kling-avatar` | +| `kling--videos-lip-sync` | `kling-lip-sync-text-to-video` | +| `krea--krea-2-large` | `krea-2-large-text-to-image` | +| `krea--krea-2-medium` | `krea-2-medium-text-to-image` | +| `krea--krea-2-medium-turbo` | `krea-2-medium-turbo-text-to-image` | +| `luma--photon-1` | `luma-photon-1-text-to-image` | +| `luma--photon-1-image-generation` | `luma-photon-1-text-to-image` | +| `luma--photon-1-image-modify` | `luma-photon-1-image-edit` | +| `luma--photon-flash-1` | `luma-photon-flash-1-text-to-image` | +| `luma--photon-flash-1-image-generation` | `luma-photon-flash-1-text-to-image` | +| `luma--photon-flash-1-image-modify` | `luma-photon-flash-1-image-edit` | +| `luma--ray-2` | `luma-ray-2-text-to-video` | +| `luma--ray-2-image-to-video` | `luma-ray-2-image-to-video` | +| `luma--ray-2-text-to-video` | `luma-ray-2-text-to-video` | +| `luma--ray-flash-2` | `luma-ray-flash-2-text-to-video` | +| `luma--ray-flash-2-image-to-video` | `luma-ray-flash-2-image-to-video` | +| `luma--ray-flash-2-text-to-video` | `luma-ray-flash-2-text-to-video` | +| `luma_2--uni-1` | `luma-uni-1-text-to-image` | +| `luma_2--uni-1-image-edit` | `luma-uni-1-image-edit` | +| `luma_2--uni-1-image-generation` | `luma-uni-1-text-to-image` | +| `luma_2--uni-1-max` | `luma-uni-1-max-text-to-image` | +| `luma_2--uni-1-max-image-edit` | `luma-uni-1-max-image-edit` | +| `luma_2--uni-1-max-image-generation` | `luma-uni-1-max-text-to-image` | +| `openai--gpt-image-1` | `gpt-image-1-image-edit` | +| `openai--gpt-image-1.5` | `gpt-image-1-5-image-edit` | +| `openai--gpt-image-2` | `gpt-image-2-text-to-image` | +| `openai--gpt-image-2.5-flare` | `gpt-image-2-5-flare-text-to-image` | +| `openai--gpt-image-2.5-sunburst` | `gpt-image-2-5-sunburst-text-to-image` | +| `qwen--qwen-image-3.0` | `qwen-image-3-0-text-to-image` | +| `qwen--qwen-image-3.0-image-edit` | `qwen-image-3-0-image-edit` | +| `qwen--qwen-image-3.0-pro` | `qwen-image-3-0-pro-text-to-image` | +| `qwen--qwen-image-3.0-pro-image-edit` | `qwen-image-3-0-pro-image-edit` | +| `qwen--qwen-image-3.0-pro-text-to-image` | `qwen-image-3-0-pro-text-to-image` | +| `qwen--qwen-image-3.0-text-to-image` | `qwen-image-3-0-text-to-image` | +| `recraft--recraftv3` | `recraft-v3-text-to-image` | +| `recraft--recraftv4` | `recraft-v4-text-to-image` | +| `recraft--recraftv4_1` | `recraft-v4-1-text-to-image` | +| `recraft--recraftv4_1_pro` | `recraft-v4-1-pro-text-to-image` | +| `recraft--recraftv4_1_pro_vector` | `recraft-v4-1-pro-text-to-vector` | +| `recraft--recraftv4_1_utility` | `recraft-v4-1-utility-text-to-image` | +| `recraft--recraftv4_1_utility_pro` | `recraft-v4-1-utility-pro-text-to-image` | +| `recraft--recraftv4_1_utility_pro_vector` | `recraft-v4-1-utility-pro-text-to-vector` | +| `recraft--recraftv4_1_utility_vector` | `recraft-v4-1-utility-text-to-vector` | +| `recraft--recraftv4_1_vector` | `recraft-v4-1-text-to-vector` | +| `recraft--recraftv4_pro` | `recraft-v4-pro-text-to-image` | +| `recraft--v3-text-to-image` | `recraft-v3-text-to-image` | +| `recraft--v3-text-to-vector` | `recraft-v3-text-to-vector` | +| `recraft--v4-pro-text-to-image` | `recraft-v4-pro-text-to-image` | +| `recraft--v4-pro-text-to-vector` | `recraft-v4-pro-text-to-vector` | +| `recraft--v4-text-to-image` | `recraft-v4-text-to-image` | +| `recraft--v4-text-to-vector` | `recraft-v4-text-to-vector` | +| `recraft--v4.1-pro-text-to-image` | `recraft-v4-1-pro-text-to-image` | +| `recraft--v4.1-pro-text-to-vector` | `recraft-v4-1-pro-text-to-vector` | +| `recraft--v4.1-text-to-image` | `recraft-v4-1-text-to-image` | +| `recraft--v4.1-text-to-vector` | `recraft-v4-1-text-to-vector` | +| `recraft--v4.1-utility-pro-text-to-image` | `recraft-v4-1-utility-pro-text-to-image` | +| `recraft--v4.1-utility-pro-text-to-vector` | `recraft-v4-1-utility-pro-text-to-vector` | +| `recraft--v4.1-utility-text-to-image` | `recraft-v4-1-utility-text-to-image` | +| `recraft--v4.1-utility-text-to-vector` | `recraft-v4-1-utility-text-to-vector` | +| `runway--aleph2` | `runway-aleph-2-video-to-video` | +| `runway--aleph2-video-to-video` | `runway-aleph-2-video-to-video` | +| `runway--gen4-image` | `runway-gen-4-image-text-to-image` | +| `runway--gen4-turbo-image-to-video` | `runway-gen-4-turbo-image-to-video` | +| `runway--gen4_image` | `runway-gen-4-image-text-to-image` | +| `runway--gen4_turbo` | `runway-gen-4-turbo-image-to-video` | +| `veo--veo-3.1-generate-001` | `veo-3-text-to-video` | +| `vertexai--gemini-2.5-flash-image` | `nano-banana-text-to-image` | +| `vertexai--gemini-3-pro-image` | `nano-banana-pro-text-to-image` | +| `vertexai--gemini-3.1-flash-image` | `nano-banana-2-text-to-image` | +| `vertexai--gemini-nano-banana-2` | `nano-banana-2-text-to-image` | +| `vertexai--veo-3` | `veo-3-text-to-video` | +| `vertexai--veo-3-first-last-frame` | `veo-3-first-last-frame` | +| `wan--happyhorse-1.0-video-edit` | `happyhorse-video-edit` | +| `wan--happyhorse-1.1-r2v` | `happyhorse-reference-to-video` | +| `wan--happyhorse-1.1-t2v` | `happyhorse-text-to-video` | +| `wan--happyhorse-reference-video` | `happyhorse-reference-to-video` | +| `wan--happyhorse-text-to-video` | `happyhorse-text-to-video` | +| `wan--happyhorse-video-edit` | `happyhorse-video-edit` | +| `wan--image-to-image` | `wan-2-5-image-edit` | +| `wan--image-to-video` | `wan-2-6-image-to-video` | +| `wan--image-to-video-2.7` | `wan-2-7-image-to-video` | +| `wan--image-to-video-3.0` | `wan-3-0-image-to-video` | +| `wan--image-to-video-3.0-prime` | `wan-3-0-prime-image-to-video` | +| `wan--reference-to-video-3.0` | `wan-3-0-reference-to-video` | +| `wan--reference-to-video-3.0-prime` | `wan-3-0-prime-reference-to-video` | +| `wan--reference-video` | `wan-2-6-reference-to-video` | +| `wan--reference-video-2.7` | `wan-2-7-reference-to-video` | +| `wan--text-to-image` | `wan-2-5-text-to-image` | +| `wan--text-to-video` | `wan-2-6-text-to-video` | +| `wan--text-to-video-2.7` | `wan-2-7-text-to-video` | +| `wan--text-to-video-3.0` | `wan-3-0-text-to-video` | +| `wan--text-to-video-3.0-prime` | `wan-3-0-prime-text-to-video` | +| `wan--video-continuation-2.7` | `wan-2-7-video-continuation` | +| `wan--video-edit-2.7` | `wan-2-7-video-edit` | +| `wan--wan2.5-i2i-preview` | `wan-2-5-image-edit` | +| `wan--wan2.5-t2i-preview` | `wan-2-5-text-to-image` | +| `wan--wan2.6-i2v` | `wan-2-6-image-to-video` | +| `wan--wan2.6-r2v` | `wan-2-6-reference-to-video` | +| `wan--wan2.6-t2v` | `wan-2-6-text-to-video` | +| `wan--wan2.7-i2v` | `wan-2-7-image-to-video` | +| `wan--wan2.7-r2v` | `wan-2-7-reference-to-video` | +| `wan--wan2.7-t2v` | `wan-2-7-text-to-video` | +| `wan--wan2.7-videoedit` | `wan-2-7-video-edit` | +| `wan--wan3.0-video` | `wan-3-0-image-to-video` | +| `wan--wan3.0-video-prime` | `wan-3-0-prime-image-to-video` | +| `wavespeed--flashvsr` | `flashvsr` | +| `wavespeed--seedvr2` | `seedvr2-image-upscaler` | +| `wavespeed--seedvr2-image` | `seedvr2-image-upscaler` | +| `wavespeed--ultimate-image-upscaler` | `ultimate-image-upscaler` | +| `xai--grok-imagine-image` | `grok-imagine-image-text-to-image` | +| `xai--grok-imagine-image-2.0` | `grok-imagine-image-2-0-text-to-image` | +| `xai--grok-imagine-video` | `grok-imagine-video-text-to-video` | +| `xai--grok-imagine-video-1.5` | `grok-imagine-video-1-5-text-to-video` | +| `xai--grok-imagine-video-1.5-reference` | `grok-imagine-video-1-5-reference-to-video` | +| `xai--grok-imagine-video-reference` | `grok-imagine-video-reference-to-video` | diff --git a/apps/website/astro.config.ts b/apps/website/astro.config.ts index f57109ff09d..e8889d35518 100644 --- a/apps/website/astro.config.ts +++ b/apps/website/astro.config.ts @@ -5,7 +5,7 @@ import vue from '@astrojs/vue' import tailwindcss from '@tailwindcss/vite' import { isExcludedFromSitemap } from './src/config/indexing' import { DEFAULT_LOCALE, LOCALE_CODES } from './src/config/locales' -import { redirects } from './src/config/redirects' +import { astroRedirects } from './src/config/redirects' import { markdownTwins } from './src/integrations/markdown-twins' import { workshopReleaseGate } from './src/integrations/workshop-release-gate' import { sitemapAlternates } from './src/lib/hreflang' @@ -20,7 +20,7 @@ export default defineConfig({ // Keep MDX punctuation verbatim; SmartyPants would turn the source's straight // quotes into curly ones and drift from the rest of the site's copy. markdown: { smartypants: false }, - redirects, + redirects: astroRedirects, build: { assets: '_website' }, diff --git a/apps/website/e2e/acceptance/generation.spec.ts b/apps/website/e2e/acceptance/generation.spec.ts index 7831f5018b3..1c3c31a4a3c 100644 --- a/apps/website/e2e/acceptance/generation.spec.ts +++ b/apps/website/e2e/acceptance/generation.spec.ts @@ -9,6 +9,7 @@ import { useOwnInputs } from '../../acceptance/fixtures' import { expectedCharge } from '../../acceptance/settings' +import { hubModelHref } from '../../src/config/hub-models' for (const model of modelCases) { test(`${model.slug}: defaults, own inputs, advanced settings${model.smoke ? ' @smoke' : ''}`, async ({ @@ -18,7 +19,7 @@ for (const model of modelCases) { expectedCharge(model.slug, 'defaults') expectedCharge(model.slug, 'own') expectedCharge(model.slug, 'advanced') - await signIn(page, `/models/${model.slug}/`) + await signIn(page, hubModelHref(model.slug)) const defaults = await runAndVerify( page, billing, diff --git a/apps/website/e2e/acceptance/purchase.spec.ts b/apps/website/e2e/acceptance/purchase.spec.ts index 1f85a7b12bf..600cd5ed6c2 100644 --- a/apps/website/e2e/acceptance/purchase.spec.ts +++ b/apps/website/e2e/acceptance/purchase.spec.ts @@ -19,6 +19,7 @@ import { liveSettings, requiredSetting } from '../../acceptance/settings' +import { hubModelHref } from '../../src/config/hub-models' const topupDollars = 10 @@ -34,7 +35,7 @@ for (const model of modelCases.filter((model) => model.smoke)) { expectedCharge(model.slug, 'own') const domain = requiredSetting('WORKSHOP_SIGNUP_EMAIL_DOMAIN') const email = z.string().email().parse(`workshop-${randomUUID()}@${domain}`) - const path = `/models/${model.slug}/` + const path = hubModelHref(model.slug) await page.goto(path) await useOwnInputs(page, model) await page.getByTestId('run-button').click() diff --git a/apps/website/e2e/api-keys-onboarding.spec.ts b/apps/website/e2e/api-keys-onboarding.spec.ts index fa73a7468b2..82bfe227857 100644 --- a/apps/website/e2e/api-keys-onboarding.spec.ts +++ b/apps/website/e2e/api-keys-onboarding.spec.ts @@ -1,10 +1,9 @@ import { expect } from '@playwright/test' import { waitForIsland } from './fixtures/islands' -import { MODEL_PATH, test } from './fixtures/modelsAccount' +import { MODEL_ID, MODEL_PATH, test } from './fixtures/modelsAccount' const API_KEYS = 'https://platform.comfy.org/profile/api-keys' -const MODEL_SLUG = MODEL_PATH.split('/')[2] test.describe('API-keys onboarding links @smoke', () => { for (const { path, label } of [ @@ -31,7 +30,7 @@ test.describe('API-keys onboarding links @smoke', () => { await apiTab.click() await expect(page.getByTestId('api-get-key')).toHaveAttribute( 'href', - `${API_KEYS}?onboarding=models&model=${MODEL_SLUG}` + `${API_KEYS}?onboarding=models&model=${MODEL_ID}` ) }) }) diff --git a/apps/website/e2e/canonical-redirects.spec.ts b/apps/website/e2e/canonical-redirects.spec.ts index a1e43d61fec..7fce2b5d378 100644 --- a/apps/website/e2e/canonical-redirects.spec.ts +++ b/apps/website/e2e/canonical-redirects.spec.ts @@ -41,6 +41,22 @@ test.describe('canonical redirects', () => { ) }) + test('builds each model page at /hub/models and points its old address there', () => { + const canonical = + 'rel="canonical" href="https://comfy.org/hub/models/flux-2-max-text-to-image/"' + for (const path of [ + 'hub/models/flux-2-max-text-to-image', + 'models/bfl--flux-2-max--generate-images' + ]) { + expect(readFileSync(`dist/${path}/index.html`, 'utf8')).toContain( + canonical + ) + } + expect(readFileSync('dist/models/index.html', 'utf8')).toContain( + 'rel="canonical" href="https://comfy.org/hub/models/"' + ) + }) + test('builds the former Enterprise routes with the canonical destination', () => { for (const { source, destination } of enterpriseCases) { const redirectPage = readFileSync(`dist${source}/index.html`, 'utf8') diff --git a/apps/website/e2e/fixtures/modelsAccount.ts b/apps/website/e2e/fixtures/modelsAccount.ts index 5faef2d2099..31ea96d6d20 100644 --- a/apps/website/e2e/fixtures/modelsAccount.ts +++ b/apps/website/e2e/fixtures/modelsAccount.ts @@ -3,9 +3,11 @@ import type { ExchangeTokenResponse } from '@comfyorg/ingest-types' +import { hubModelHref } from '../../src/config/hub-models' import { test as base } from './blockExternalMedia' -export const MODEL_PATH = '/models/bfl--flux-2-max--generate-images/' +export const MODEL_ID = 'bfl--flux-2-max--generate-images' +export const MODEL_PATH = hubModelHref(MODEL_ID) /** The identity this fixture signs in as, and the workspace its token mints. */ export const MODELS_ACCOUNT_UID = 'e2e-models-user' diff --git a/apps/website/e2e/font-preload.spec.ts b/apps/website/e2e/font-preload.spec.ts index 043efabceef..475d8950e4e 100644 --- a/apps/website/e2e/font-preload.spec.ts +++ b/apps/website/e2e/font-preload.spec.ts @@ -8,16 +8,23 @@ import { test } from './fixtures/blockExternalMedia' // that load. It reached a committed visual baseline once: the pricing headline // and price, the only two elements on that page in the unpreloaded Light face, // were captured in the fallback while every preloaded weight matched exactly. -const PAGES = ['/', '/pricing', '/download', '/about', '/customers', '/models/'] +const PAGES = [ + '/', + '/pricing', + '/download', + '/about', + '/customers', + '/hub/models/' +] for (const path of PAGES) { test(`every PP Formula face rendered above the fold on ${path} is preloaded`, async ({ page, context }) => { - if (path === '/models/') { + if (path === '/hub/models/') { // The Hub only draws its own toolbar and shelves once Workshop is on; - // with it off, /models/ would hide the faces this case measures. + // with it off, /hub/models/ would hide the faces this case measures. await context.route('**/t.comfy.org/**', (route) => /\/(flags|decide)\//.test(route.request().url()) ? route.fulfill({ @@ -31,7 +38,8 @@ for (const path of PAGES) { ) } await page.goto(path) - if (path === '/models/') await page.getByTestId('workshop-hero').waitFor() + if (path === '/hub/models/') + await page.getByTestId('workshop-hero').waitFor() await page.evaluate(() => document.fonts.ready) const gaps = await page.evaluate(() => { diff --git a/apps/website/e2e/header-models-navigation.spec.ts b/apps/website/e2e/header-models-navigation.spec.ts index aeb98753dc9..8133b9aeb79 100644 --- a/apps/website/e2e/header-models-navigation.spec.ts +++ b/apps/website/e2e/header-models-navigation.spec.ts @@ -37,7 +37,7 @@ for (const viewport of viewports) { await expect(desktopLinks).toBeVisible() await expect( desktopLinks.getByRole('link', { name: 'Models', exact: true }) - ).toHaveAttribute('href', '/models') + ).toHaveAttribute('href', '/hub/models/') await expect(menuButton).toBeHidden() } else { await expect(desktopLinks).toBeHidden() @@ -47,7 +47,7 @@ for (const viewport of viewports) { await expect(menu).toBeVisible() await expect( menu.getByRole('link', { name: /^Models\b/ }) - ).toHaveAttribute('href', '/models') + ).toHaveAttribute('href', '/hub/models/') } await expectNoHorizontalOverflow(page) diff --git a/apps/website/e2e/homepage.spec.ts b/apps/website/e2e/homepage.spec.ts index 72c089fb973..fbc491cd469 100644 --- a/apps/website/e2e/homepage.spec.ts +++ b/apps/website/e2e/homepage.spec.ts @@ -44,7 +44,7 @@ test.describe('Homepage @smoke', () => { await expect(cta).toBeVisible() await expect(cta).toHaveAttribute( 'href', - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' + '/hub/models/seedance-2-5-text-to-video/' ) }) @@ -56,10 +56,10 @@ test.describe('Homepage @smoke', () => { section.getByRole('heading', { name: /ready to run/i }) ).toBeVisible() const bytedance = section.getByRole('link', { name: /ByteDance/ }).first() - await expect(bytedance).toHaveAttribute('href', '/models?q=ByteDance') + await expect(bytedance).toHaveAttribute('href', '/hub/models/?q=ByteDance') await expect( section.getByRole('link', { name: 'Browse all models' }) - ).toHaveAttribute('href', '/models') + ).toHaveAttribute('href', '/hub/models/') }) test('FeaturedWorkflowsSection carousel is visible', async ({ page }) => { diff --git a/apps/website/e2e/models-catalogue-corrections.spec.ts b/apps/website/e2e/models-catalogue-corrections.spec.ts index 946fd63b80b..6f3beb72e06 100644 --- a/apps/website/e2e/models-catalogue-corrections.spec.ts +++ b/apps/website/e2e/models-catalogue-corrections.spec.ts @@ -54,7 +54,9 @@ test('GPT Image generation pages remain discoverable while disabled edit pages a await route.fallback() }) try { - await page.goto('/models/?useCase=generate-images', { waitUntil: 'commit' }) + await page.goto('/hub/models/?useCase=generate-images', { + waitUntil: 'commit' + }) await moduleRequested await expect(page.getByTestId('workshop-search')).toHaveCount(0) await expect(page.getByTestId('models-loading')).toBeVisible() @@ -73,13 +75,11 @@ test('GPT Image generation pages remain discoverable while disabled edit pages a await expect(card).toHaveAccessibleName(/GPT Image/) await expect(card.getByRole('img', { name: /GPT Image/ })).toHaveCount(0) await page.getByRole('link', { name: /GPT Image 1\.5/ }).click() - await expect(page).toHaveURL( - /\/models\/openai--gpt-image-1\.5--edit-images\/$/ - ) + await expect(page).toHaveURL(/\/hub\/models\/gpt-image-1-5-image-edit\/$/) await expect( page.getByRole('textbox', { name: 'Prompt', exact: true }) ).toBeVisible() - await page.goto('/models/?useCase=edit-images') + await page.goto('/hub/models/?useCase=edit-images') await page.getByTestId('workshop-search').fill('gpt image') await expect(cards).toHaveCount(0) const disabledPage = await page.goto( @@ -92,7 +92,7 @@ test('GPT Image generation pages remain discoverable while disabled edit pages a test('role-specific pages omit controls that their requests cannot accept', async ({ page }) => { - await page.goto('/models/vertexai--veo-3--animate-images/') + await page.goto('/hub/models/veo-3-image-to-video/') await expect( page.getByRole('group', { name: 'First frame', exact: true }) ).toBeVisible() @@ -100,7 +100,7 @@ test('role-specific pages omit controls that their requests cannot accept', asyn page.getByRole('group', { name: 'Reference images', exact: true }) ).toHaveCount(0) - await page.goto('/models/byteplus--seedream-5-pro--generate-images/') + await page.goto('/hub/models/seedream-5-0-pro-text-to-image/') await expect( page.getByRole('group', { name: 'Source images', exact: true }) ).toHaveCount(0) diff --git a/apps/website/e2e/models-performance.spec.ts b/apps/website/e2e/models-performance.spec.ts index e515ed776ec..9823191dbec 100644 --- a/apps/website/e2e/models-performance.spec.ts +++ b/apps/website/e2e/models-performance.spec.ts @@ -34,7 +34,7 @@ test('catalogue browsing stays within its JavaScript budget', async ({ await page.goto('/') const shared = new Set((await requestedScripts(page)).map(([name]) => name)) - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('workshop-search').fill('kling') await page.getByRole('heading', { level: 1 }).click() await expect( @@ -59,7 +59,7 @@ test('catalogue browsing stays within its JavaScript budget', async ({ test('video cards load on screen and stop playing when scrolled away', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('workshop-filter').click() const videos = page.getByTestId('section-generate-videos').locator('video') await expect.poll(() => videos.count()).toBeGreaterThan(0) diff --git a/apps/website/e2e/models-row-arrows.spec.ts b/apps/website/e2e/models-row-arrows.spec.ts index af0b5d9a3b0..cd1002f003f 100644 --- a/apps/website/e2e/models-row-arrows.spec.ts +++ b/apps/website/e2e/models-row-arrows.spec.ts @@ -5,7 +5,7 @@ import { test } from './fixtures/workshopVisibility' test('the row keeps a keyboard inside it when an arrow is spent', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const row = page.locator('div:has(> [data-testid="card-row-arrows"])').first() const forward = row.getByTestId('card-row-next') const back = row.getByTestId('card-row-prev') diff --git a/apps/website/e2e/models-sign-in-draft.spec.ts b/apps/website/e2e/models-sign-in-draft.spec.ts index 4c24fe20e04..ba4d5ec7ea1 100644 --- a/apps/website/e2e/models-sign-in-draft.spec.ts +++ b/apps/website/e2e/models-sign-in-draft.spec.ts @@ -3,7 +3,7 @@ import { expect } from '@playwright/test' import { test } from './fixtures/modelsAccount' -const path = '/models/byteplus--seedream-4-5--edit-images/' +const path = '/hub/models/seedream-4-5-image-edit/' for (const { entry, randomUUID, failRead } of [ { entry: 'playground', randomUUID: true, failRead: false }, diff --git a/apps/website/e2e/router.spec.ts b/apps/website/e2e/router.spec.ts index 7e894325191..4f57db92fec 100644 --- a/apps/website/e2e/router.spec.ts +++ b/apps/website/e2e/router.spec.ts @@ -39,7 +39,7 @@ test.describe('Router page @smoke', () => { ).toHaveAttribute('href', /\/models\/google\/nano-banana-pro\/code$/) await expect( coverage.getByRole('link', { name: /^Browse all \d+ models$/ }) - ).toHaveAttribute('href', '/models') + ).toHaveAttribute('href', '/hub/models/') }) test('adds the chosen provider to the code sample', async ({ page }) => { diff --git a/apps/website/e2e/workshop-acceptance-inputs.spec.ts b/apps/website/e2e/workshop-acceptance-inputs.spec.ts index 64befbecdb7..7cf82f5fd60 100644 --- a/apps/website/e2e/workshop-acceptance-inputs.spec.ts +++ b/apps/website/e2e/workshop-acceptance-inputs.spec.ts @@ -7,6 +7,7 @@ import { modelCases } from '../acceptance/cases' import { useAdvancedInputs, useOwnInputs } from '../acceptance/fixtures' import { signIn } from './fixtures/buyCredits' import { test } from './fixtures/modelsAccount' +import { hubModelHref } from '../src/config/hub-models' test.beforeEach(async ({ context, page, modelsAccount }, testInfo) => { await context.route( @@ -58,7 +59,7 @@ for (const model of modelCases) { test(`${model.slug}: acceptance inputs reach the generation request`, async ({ page }, testInfo) => { - await page.goto(`/models/${model.slug}/`) + await page.goto(hubModelHref(model.slug)) await useOwnInputs(page, model, testInfo.outputDir) await useAdvancedInputs(page, model) const submitted = page.waitForRequest( diff --git a/apps/website/e2e/workshop-apps.spec.ts b/apps/website/e2e/workshop-apps.spec.ts index 73be193df75..9d0c3d7285c 100644 --- a/apps/website/e2e/workshop-apps.spec.ts +++ b/apps/website/e2e/workshop-apps.spec.ts @@ -51,7 +51,7 @@ test('lists both apps in the catalogue Apps tab, on /models/apps/ pages', async context }) => { await mockFlags(context, { apps: true, workflows: false }) - await page.goto('/models/?type=apps') + await page.goto('/hub/models/?type=apps') const shelf = page.getByTestId('app-shelf') const cards = shelf.getByRole('link') await expect(cards).toHaveCount(2) diff --git a/apps/website/e2e/workshop-delivery.spec.ts b/apps/website/e2e/workshop-delivery.spec.ts index f88f4ac9087..c46d61747e0 100644 --- a/apps/website/e2e/workshop-delivery.spec.ts +++ b/apps/website/e2e/workshop-delivery.spec.ts @@ -6,6 +6,7 @@ import { z } from 'zod' import availability from '../src/data/workshop-model-availability.json' with { type: 'json' } import { workshopModelAvailabilitySchema } from '../src/config/workshop-model-availability-schema' import { test } from './fixtures/modelsAccount' +import { hubModelHref } from '../src/config/hub-models' test.use({ launchOptions: { args: ['--disable-blink-features=AutomationControlled'] } @@ -87,7 +88,7 @@ test( .fill(modelsAccount.password) await page.getByRole('button', { name: 'Sign in', exact: true }).click() await expect(page).toHaveURL('/') - await page.goto(`/models/${slug}/`) + await page.goto(hubModelHref(slug)) await expect(page.getByTestId('run-button')).toBeEnabled() await page.getByTestId('run-button').click() await expect(page.getByTestId('playground-output')).toHaveAttribute( diff --git a/apps/website/e2e/workshop-file-read.spec.ts b/apps/website/e2e/workshop-file-read.spec.ts index 8555fb679d1..087af77d179 100644 --- a/apps/website/e2e/workshop-file-read.spec.ts +++ b/apps/website/e2e/workshop-file-read.spec.ts @@ -5,6 +5,7 @@ import { expect } from '@playwright/test' import { workshopModelAvailabilitySchema } from '../src/config/workshop-model-availability-schema' import { test } from './fixtures/modelsAccount' +import { hubModelHref } from '../src/config/hub-models' const scenarios = [ { @@ -98,7 +99,7 @@ for (const { name, models, field, inputField, result } of scenarios) { .fill(modelsAccount.password) await page.getByRole('button', { name: 'Sign in', exact: true }).click() await expect(page).toHaveURL('/') - await page.goto(`/models/${enabledModel}/`) + await page.goto(hubModelHref(enabledModel)) await expect(page.getByTestId('run-button')).toBeVisible() const source = page.getByTestId(`field-group-${field}`) for (const remove of await source diff --git a/apps/website/e2e/workshop-frame-ratio.spec.ts b/apps/website/e2e/workshop-frame-ratio.spec.ts index 1e85b143ee0..9f74be1f1f1 100644 --- a/apps/website/e2e/workshop-frame-ratio.spec.ts +++ b/apps/website/e2e/workshop-frame-ratio.spec.ts @@ -49,9 +49,7 @@ test('Seedance first/last frame warns about the stretch only while the shapes di } }) - await page.goto( - '/models/byteplus--seedance-2-5-first-last-frame--animate-images/' - ) + await page.goto('/hub/models/seedance-2-5-first-last-frame/') const group = (name: string) => page.getByRole('group', { name, exact: true }) const upload = (name: string) => group(name).getByLabel(name, { exact: true }) const first = upload('First frame') diff --git a/apps/website/e2e/workshop-input-feedback.spec.ts b/apps/website/e2e/workshop-input-feedback.spec.ts index 1ea69c4080e..d7e19f9aa2f 100644 --- a/apps/website/e2e/workshop-input-feedback.spec.ts +++ b/apps/website/e2e/workshop-input-feedback.spec.ts @@ -5,7 +5,7 @@ import { test } from './fixtures/modelsAccount' test('a single supported resolution stays visible but cannot be changed', async ({ page }) => { - await page.goto('/models/krea--krea-2-medium-turbo--generate-images/') + await page.goto('/hub/models/krea-2-medium-turbo-text-to-image/') const resolution = page.getByRole('combobox', { name: 'Resolution', exact: true @@ -20,7 +20,7 @@ test('a single supported resolution stays visible but cannot be changed', async test('FLUX Erase hydrates its local image and mask and shows an actual Erase result', async ({ page }) => { - const response = await page.goto('/models/bfl--flux-erase--edit-images/') + const response = await page.goto('/hub/models/flux-tools-erase/') expect(await response?.text()).not.toContain('blob:nodedata:') const image = page .getByRole('group', { name: 'Reference image', exact: true }) @@ -38,7 +38,7 @@ test('FLUX Erase hydrates its local image and mask and shows an actual Erase res }) test('Kontext Pro shows a sourced price estimate', async ({ page }) => { - await page.goto('/models/bfl--flux-kontext-pro--edit-images/') + await page.goto('/hub/models/flux-1-kontext-pro-image-edit/') await expect(page.getByTestId('model-price')).toContainText( '8.44 credits/Run' ) @@ -47,7 +47,7 @@ test('Kontext Pro shows a sourced price estimate', async ({ page }) => { test('Beeble displays readable options while the API keeps its native values', async ({ page }) => { - await page.goto('/models/beeble--switchx-video-edit--edit-videos/') + await page.goto('/hub/models/beeble-switchx-video-edit/') const alpha = page.getByRole('combobox', { name: 'Transparency mode', exact: true @@ -71,7 +71,7 @@ test('HeyGen offers named language and locale choices and uses the supported voi 'https://media.comfy.org/website/workshop/heygen/starfish-tts/harbour-radio-signs-off.mp3', (route) => route.fulfill({ contentType: 'audio/mpeg', body: '' }) ) - await page.goto('/models/heygen--starfish-tts--audio/') + await page.goto('/hub/models/heygen-starfish-text-to-speech/') await expect( page.getByRole('combobox', { name: 'Language', exact: true }) ).toBeVisible() @@ -100,7 +100,7 @@ test('HeyGen offers named language and locale choices and uses the supported voi test('BRIA Expand previews its source image instead of showing a URL textbox', async ({ page }) => { - await page.goto('/models/bria--expand-image--edit-images/') + await page.goto('/hub/models/bria-expand-image/') const source = page.getByRole('group', { name: 'Source image', exact: true }) await expect(source.getByRole('img')).toBeVisible() await expect(source.getByRole('img')).toHaveJSProperty('naturalWidth', 1) @@ -113,7 +113,7 @@ test('BRIA Expand previews its source image instead of showing a URL textbox', a test('Magnific Skin Enhancer uploads a source image instead of asking for a URL', async ({ page }) => { - await page.goto('/models/freepik--magnific-skin-enhancer--edit-images/') + await page.goto('/hub/models/magnific-skin-enhancer/') const source = page.getByRole('group', { name: 'Source image', exact: true }) await expect(source.getByRole('textbox')).toHaveCount(0) const input = source.getByLabel('Source image', { exact: true }) @@ -134,7 +134,7 @@ test('Magnific Skin Enhancer uploads a source image instead of asking for a URL' test('FLUX 2 Max takes an exact height the slider cannot be dragged onto', async ({ page }) => { - await page.goto('/models/bfl--flux-2-max--generate-images/') + await page.goto('/hub/models/flux-2-max-text-to-image/') const slider = page.getByRole('slider', { name: 'Height', exact: true }) const value = page.getByRole('spinbutton', { name: 'Height value', @@ -159,7 +159,7 @@ test('FLUX 2 Max takes an exact height the slider cannot be dragged onto', async test('FLUX Pro 1.1 Ultra keeps a dragged blend readable in its box', async ({ page }) => { - await page.goto('/models/bfl--flux-pro-1.1-ultra--generate-images/') + await page.goto('/hub/models/flux-pro-1-1-ultra-text-to-image/') await page.getByTestId('playground-advanced').locator('summary').click() const slider = page.getByRole('slider', { @@ -194,9 +194,7 @@ test('FLUX Pro 1.1 Ultra keeps a dragged blend readable in its box', async ({ test('the upload prompt leaves a full frame field and returns when it empties', async ({ page }) => { - await page.goto( - '/models/byteplus--seedance-2-5-first-last-frame--animate-images/' - ) + await page.goto('/hub/models/seedance-2-5-first-last-frame/') const lastFrame = page.getByRole('group', { name: 'Last frame', exact: true }) const firstFrame = page.getByRole('group', { name: 'First frame', diff --git a/apps/website/e2e/workshop-input-validation.spec.ts b/apps/website/e2e/workshop-input-validation.spec.ts index ba92d4a92e8..09a47de82f8 100644 --- a/apps/website/e2e/workshop-input-validation.spec.ts +++ b/apps/website/e2e/workshop-input-validation.spec.ts @@ -4,6 +4,7 @@ import type { Page } from '@playwright/test' import { test } from './fixtures/modelsAccount' import { workshopModelAvailabilitySchema } from '../src/config/workshop-model-availability-schema' +import { hubModelHref } from '../src/config/hub-models' const availability = workshopModelAvailabilitySchema.parse( JSON.parse( @@ -15,7 +16,7 @@ const availability = workshopModelAvailabilitySchema.parse( ) async function openModel(page: Page, slug: string): Promise { - const response = await page.goto(`/models/${slug}/`) + const response = await page.goto(hubModelHref(slug)) if (availability[slug]?.disabled) { expect(response?.status()).toBe(404) return false diff --git a/apps/website/e2e/workshop-loading-flash.spec.ts b/apps/website/e2e/workshop-loading-flash.spec.ts index cf565e4494d..5e49ac85da8 100644 --- a/apps/website/e2e/workshop-loading-flash.spec.ts +++ b/apps/website/e2e/workshop-loading-flash.spec.ts @@ -4,7 +4,7 @@ import { test } from './fixtures/blockExternalMedia' import { waitForIsland } from './fixtures/islands' import { MODEL_PATH } from './fixtures/modelsAccount' -for (const path of ['/models/', MODEL_PATH]) { +for (const path of ['/hub/models/', MODEL_PATH]) { test(`static HTML at ${path} paints only the loading frame`, async ({ request }) => { @@ -56,7 +56,7 @@ test.describe('enabled workshop', () => { }) test('client-side navigation does not flash marketing', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await waitForIsland(page, page.getByTestId('workshop-search')) await page .getByRole('link', { name: /Grok Imagine Image/i }) diff --git a/apps/website/e2e/workshop-visibility.spec.ts b/apps/website/e2e/workshop-visibility.spec.ts index ad53b0db17e..52a5a7aa4e9 100644 --- a/apps/website/e2e/workshop-visibility.spec.ts +++ b/apps/website/e2e/workshop-visibility.spec.ts @@ -7,14 +7,14 @@ import { MODEL_PATH } from './fixtures/modelsAccount' test('public HTML excludes catalogue and playground markup', async ({ request }) => { - for (const path of ['/', '/models/', MODEL_PATH]) { + for (const path of ['/', '/hub/models/', MODEL_PATH]) { const response = await request.get(path) expect(response.ok()).toBe(true) const html = await response.text() expect(html).not.toMatch( /data-testid="(?:workshop-search|model-discovery|model-hero|model-detail)"/ ) - if (path === '/models/') { + if (path === '/hub/models/') { expect(html).not.toContain('noindex') } } @@ -41,7 +41,7 @@ test('keeps the public site when PostHog is unavailable', async ({ page }) => { page.getByRole('link', { name: 'Explore Seedance 2.5' }) ).toHaveAttribute('href', '/seedance-2.5') - await page.goto('/models/') + await page.goto('/hub/models/') await expect( page.getByRole('link', { name: /Grok Imagine/i }).first() ).toBeVisible() @@ -69,7 +69,7 @@ test('keeps the public Models page when the flag is disabled', async ({ const response = page.waitForResponse((response) => /t\.comfy\.org\/(flags|decide)\//.test(response.url()) ) - await page.goto('/models/') + await page.goto('/hub/models/') await response await expect(page.getByTestId('workshop-search')).toHaveCount(0) await expect( @@ -99,7 +99,7 @@ test('does not initialize Firebase on public pages', async ({ const flags = page.waitForResponse((response) => /t\.comfy\.org\/(flags|decide)\//.test(response.url()) ) - await page.goto('/models/') + await page.goto('/hub/models/') await flags await waitForIsland( page, @@ -117,7 +117,7 @@ test.describe('without JavaScript', () => { test('renders the public Models page without exposing the catalogue', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('workshop-loading')).toBeHidden() await expect(page.getByTestId('workshop-search')).toHaveCount(0) await expect( diff --git a/apps/website/e2e/workshop-workflows.spec.ts b/apps/website/e2e/workshop-workflows.spec.ts index b31a9334923..77acbd4e3b8 100644 --- a/apps/website/e2e/workshop-workflows.spec.ts +++ b/apps/website/e2e/workshop-workflows.spec.ts @@ -28,7 +28,7 @@ test('workflow launch groups lead to the existing shared form', async ({ context }) => { await mockWorkflowVisibility(context, true) - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('catalogue-tab-workflows')).toBeInViewport() await page.getByTestId('catalogue-tab-workflows').click() const catalogue = page.getByTestId('workflow-catalogue') @@ -93,7 +93,7 @@ test('workflow launch groups lead to the existing shared form', async ({ await expect(shelf).toHaveText('Edit images') await expect(shelf).toHaveAttribute( 'href', - '/models?type=workflows&category=product' + '/hub/models/?type=workflows&category=product' ) await expect( page.getByRole('group', { name: 'Your original image' }) @@ -137,7 +137,9 @@ test('workflow launch groups lead to the existing shared form', async ({ expect(response.headers()['content-type']).toContain(type) } await shelf.click() - await expect(page).toHaveURL(/\/models\/?\?type=workflows&category=product$/) + await expect(page).toHaveURL( + /\/hub\/models\/?\?type=workflows&category=product$/ + ) await expect(page.getByTestId('catalogue-tab-workflows')).toHaveAttribute( 'aria-pressed', 'true' @@ -202,7 +204,7 @@ test('withholds workflow discovery and direct pages when the workflow flag is of context }) => { await mockWorkflowVisibility(context, false) - await page.goto('/models/?type=workflows') + await page.goto('/hub/models/?type=workflows') await expect(page.getByTestId('workshop-search')).toBeVisible() await expect(page.getByTestId('catalogue-tabs')).toHaveCount(0) await page.getByTestId('workshop-search').fill('Change a material') @@ -229,7 +231,7 @@ test('cold workflow filters focus their controls and respect dismissal while loa await released.promise await route.continue() }) - await page.goto('/models/?type=workflows') + await page.goto('/hub/models/?type=workflows') const trigger = page.getByTestId('workshop-filter') await trigger.click() await requested.promise @@ -266,7 +268,7 @@ test('workflow search and category filters share the mobile controls @mobile', a context }) => { await mockWorkflowVisibility(context, true) - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('catalogue-tab-workflows')).toBeInViewport() await page.getByTestId('catalogue-tab-workflows').click() await page.getByTestId('workshop-filter').click() @@ -316,7 +318,7 @@ test('the workflows half narrows to the model it runs on, from the menu and from context }) => { await mockWorkflowVisibility(context, true) - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('catalogue-tab-workflows')).toBeInViewport() await page.getByTestId('catalogue-tab-workflows').click() const outcomes = page @@ -340,7 +342,7 @@ test('the workflows half narrows to the model it runs on, from the menu and from await expect(page.getByTestId('workshop-filter-count')).toHaveCount(0) await expect(outcomes).toHaveCount(30) - await page.goto('/models/?type=workflows&model=LTX-2.3') + await page.goto('/hub/models/?type=workflows&model=LTX-2.3') await expect(page.getByTestId('workshop-filter-count')).toHaveText('1') await expect(outcomes).toHaveCount(7) }) @@ -410,11 +412,11 @@ for (const { path, group, file } of [ }) const tabletToolbars = [640, 700, 768].flatMap((width) => [ - { width, half: 'Models', path: '/models/' }, + { width, half: 'Models', path: '/hub/models/' }, { width, half: 'Workflows with a category selected', - path: '/models/?type=workflows&category=upscale' + path: '/hub/models/?type=workflows&category=upscale' } ]) diff --git a/apps/website/e2e/workshop.spec.ts b/apps/website/e2e/workshop.spec.ts index 16d01a859a5..c6bcba56ffe 100644 --- a/apps/website/e2e/workshop.spec.ts +++ b/apps/website/e2e/workshop.spec.ts @@ -10,7 +10,7 @@ test.describe('Retired prototype routes', () => { }) test('ignores old stored and query layout overrides', async ({ page }) => { - await page.goto('/models/?version=v2') + await page.goto('/hub/models/?version=v2') await expect(page.getByTestId('workshop-sections')).toBeVisible() await expect(page.getByTestId('workshop-hub')).toHaveCount(0) await expect(page.getByTestId('workshop-tabs')).toHaveCount(0) @@ -34,7 +34,7 @@ test.describe('Models catalog', () => { test('opens the featured model from the full banner surface', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const slide = page.getByTestId('featured-slide') const href = await page .getByTestId('featured-slide-link') @@ -51,7 +51,7 @@ test.describe('Models catalog', () => { page }) => { await page.setViewportSize({ width: 1280, height: 900 }) - await page.goto('/models/') + await page.goto('/hub/models/') const strip = page.getByTestId('featured-pagination') const card = page.getByTestId('featured-slide') const href = await page @@ -72,7 +72,7 @@ test.describe('Models catalog', () => { page }) => { await page.setViewportSize({ width: 390, height: 844 }) - await page.goto('/models/') + await page.goto('/hub/models/') const strip = page.getByTestId('featured-pagination') const card = page.getByTestId('featured-slide') const [bars, card_] = [await strip.boundingBox(), await card.boundingBox()] @@ -84,7 +84,7 @@ test.describe('Models catalog', () => { test('switches between the curated recommendation and alphabetical order', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const sections = page.getByTestId('workshop-sections') await expect(sections).toBeVisible() const sort = page.getByTestId('workshop-sort') @@ -111,45 +111,45 @@ test.describe('Models catalog', () => { cards.slice(0, 6).map((card) => card.getAttribute('href') ?? '') ) expect(recommended).toEqual([ - '/models/byteplus--seedream-5-pro--generate-images/', - '/models/openai--gpt-image-2--generate-images/', - '/models/byteplus--seedream-4--generate-images/', - '/models/xai--grok-imagine-image-2.0--generate-images/', - '/models/vertexai--gemini-nano-banana-2--generate-images/', - '/models/bfl--flux-2-pro--generate-images/' + '/hub/models/seedream-5-0-pro-text-to-image/', + '/hub/models/gpt-image-2-text-to-image/', + '/hub/models/seedream-4-0-text-to-image/', + '/hub/models/grok-imagine-image-2-0-text-to-image/', + '/hub/models/nano-banana-2-text-to-image/', + '/hub/models/flux-2-pro-text-to-image/' ]) expect(await recommendedIn('generate-videos', 5)).toEqual([ - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/', - '/models/kling--kling-3.0-turbo-text-to-video--generate-videos/', - '/models/xai--grok-imagine-video-1.5--generate-videos/', - '/models/wan--text-to-video-3.0--generate-videos/', - '/models/gemini--omni-1.1-flash--generate-videos/' + '/hub/models/seedance-2-5-text-to-video/', + '/hub/models/kling-3-0-turbo-text-to-video/', + '/hub/models/grok-imagine-video-1-5-text-to-video/', + '/hub/models/wan-3-0-text-to-video/', + '/hub/models/gemini-omni-1-1-flash-text-to-video/' ]) expect(await recommendedIn('animate-images', 6)).toEqual([ - '/models/byteplus--seedance-2-5-reference--generate-videos/', - '/models/byteplus--seedance-2-5-first-last-frame--animate-images/', - '/models/byteplus--seedance-2-image-to-video--animate-images/', - '/models/xai--grok-imagine-video--animate-images/', - '/models/wan--image-to-video-3.0--animate-images/', - '/models/wan--reference-to-video-3.0--animate-images/' + '/hub/models/seedance-2-5-reference-to-video/', + '/hub/models/seedance-2-5-first-last-frame/', + '/hub/models/seedance-2-0-image-to-video/', + '/hub/models/grok-imagine-video-image-to-video/', + '/hub/models/wan-3-0-image-to-video/', + '/hub/models/wan-3-0-reference-to-video/' ]) expect(await recommendedIn('other-formats', 1)).toEqual([ - '/models/byteplus--seed-audio-1.0--audio/' + '/hub/models/seed-audio-1-0-text-to-speech/' ]) expect(await recommendedIn('edit-videos', 6)).toEqual([ - '/models/byteplus--seedance-2-5-edit-video--edit-videos/', - '/models/kling--omni-pro-edit-video--edit-videos/', - '/models/gemini--omni-1.1-flash--edit-videos/', - '/models/runway--aleph2-video-to-video--edit-videos/', - '/models/gemini--omni-flash-preview--edit-videos/', - '/models/wan--video-edit-2.7--edit-videos/' + '/hub/models/seedance-2-5-video-edit/', + '/hub/models/kling-o3-video-edit/', + '/hub/models/gemini-omni-1-1-flash-video-edit/', + '/hub/models/runway-aleph-2-video-to-video/', + '/hub/models/gemini-omni-flash-preview-video-edit/', + '/hub/models/wan-2-7-video-edit/' ]) expect(await recommendedIn('edit-images', 5)).toEqual([ - '/models/vertexai--gemini-nano-banana-2--edit-images/', - '/models/vertexai--gemini-3-pro-image--edit-images/', - '/models/byteplus--seedream-5-pro--edit-images/', - '/models/byteplus--seedream-5-pro-layer-separation--edit-images/', - '/models/byteplus--seedream-4-5--edit-images/' + '/hub/models/nano-banana-2-image-edit/', + '/hub/models/nano-banana-pro-image-edit/', + '/hub/models/seedream-5-0-pro-image-edit/', + '/hub/models/seedream-5-0-pro-layer-separation/', + '/hub/models/seedream-4-5-image-edit/' ]) await sort.click() @@ -189,7 +189,7 @@ test.describe('Models catalog', () => { test('searches the approved catalog and recovers from empty results', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('workshop-sections')).toBeVisible() const cards = page .getByTestId('workshop-models-grid') @@ -214,7 +214,7 @@ test.describe('Models catalog', () => { test('category rows drill into the promised number of models', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const sections = page.getByTestId('workshop-sections') await expect(sections).toBeVisible() const videos = page.getByTestId('section-generate-videos') @@ -246,7 +246,7 @@ test.describe('Models catalog', () => { // A row loads eight whatever its total says, so a row holding fewer than // eight cards is showing its whole shelf and has nothing left to open. test('a shelf showing everything stops promising more', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const sections = page.getByTestId('workshop-sections') await expect(sections).toBeVisible() await expect( @@ -270,7 +270,7 @@ test.describe('Models catalog', () => { }) test('the rows listing opens the whole catalogue', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('browse-all-end').click() await expect(page.getByTestId('workshop-sections')).toHaveCount(0) @@ -293,7 +293,7 @@ test.describe('Models catalog', () => { test('a model page returns to the shelf it was opened from', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('section-generate-videos-open').click() await expect(page.getByRole('heading', { level: 1 })).toContainText( 'Generate videos' @@ -308,7 +308,7 @@ test.describe('Models catalog', () => { await expect(back).toHaveText('Back to Generate videos') await expect(back).toHaveAttribute( 'href', - '/models?useCase=generate-videos' + '/hub/models/?useCase=generate-videos' ) await back.click() await expect(page.getByRole('heading', { level: 1 })).toContainText( @@ -320,7 +320,7 @@ test.describe('Models catalog', () => { test('the search field stays put as the results swap under it', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('workshop-sections')).toBeVisible() await page.evaluate(() => window.scrollTo(0, 700)) const search = page.getByTestId('workshop-search') @@ -348,7 +348,7 @@ test.describe('Models catalog', () => { test('the category heading stays clear of the nav while searching', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('section-generate-videos-open').click() const heading = page.getByRole('heading', { level: 1 }) await expect(heading).toContainText('Generate videos') @@ -383,7 +383,7 @@ test.describe('Models catalog', () => { test('cards open canonical model pages with related models', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('workshop-search').fill('kling avatar') await page.getByRole('heading', { level: 1 }).click() await page @@ -391,7 +391,7 @@ test.describe('Models catalog', () => { .getByTestId('workshop-model-card') .first() .click() - await expect(page).toHaveURL(/\/models\/kling--avatar--animate-images\/$/) + await expect(page).toHaveURL(/\/hub\/models\/kling-avatar\/$/) await expect(page.getByRole('heading', { level: 1 })).toHaveText( 'Kling Avatar' ) @@ -408,16 +408,14 @@ test.describe('Models catalog', () => { }) => { const response = await page.goto('/models/bfl--flux-2-max/') expect(response?.status()).toBe(200) - await expect(page).toHaveURL( - /\/models\/bfl--flux-2-max--generate-images\/$/ - ) + await expect(page).toHaveURL(/\/hub\/models\/flux-2-max-text-to-image\/$/) await expect(page.getByRole('heading', { level: 1 })).toHaveText( 'FLUX 2 Max Text-to-Image' ) }) test('the use-case filter actually narrows the catalog', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await expect(page.getByTestId('workshop-sections')).toBeVisible() const all = await page.getByTestId('workshop-model-card').count() expect(all).toBeGreaterThan(0) @@ -430,12 +428,12 @@ test.describe('Models catalog', () => { expect(await cards.count()).toBeLessThan(all) await expect( page.locator( - '[data-testid="workshop-model-card"][href="/models/vertexai--gemini-nano-banana-2--edit-images/"]' + '[data-testid="workshop-model-card"][href="/hub/models/nano-banana-2-image-edit/"]' ) ).toBeVisible() await expect( page.locator( - '[data-testid="workshop-model-card"][href="/models/bfl--flux-2-max--generate-images/"]' + '[data-testid="workshop-model-card"][href="/hub/models/flux-2-max-text-to-image/"]' ) ).toHaveCount(0) await expect(page.getByTestId('workshop-filter-applied')).toHaveText( @@ -451,9 +449,9 @@ test.describe('Models catalog', () => { const tag = page .getByTestId('model-tags') .getByRole('link', { name: 'flux', exact: true }) - await expect(tag).toHaveAttribute('href', '/models?q=flux') + await expect(tag).toHaveAttribute('href', '/hub/models/?q=flux') await tag.click() - await expect(page).toHaveURL(/\/models\/?\?q=flux$/) + await expect(page).toHaveURL(/\/hub\/models\/?\?q=flux$/) await expect(page.getByTestId('workshop-search')).toHaveValue('flux') const cards = page .getByTestId('workshop-models-grid') @@ -464,12 +462,12 @@ test.describe('Models catalog', () => { }) test('the hero medium deep-links into the catalog', async ({ page }) => { - await page.goto('/models/kling--avatar--animate-images/') + await page.goto('/hub/models/kling-avatar/') await page .getByTestId('model-hero') .getByRole('link', { name: 'Image to video', exact: true }) .click() - await expect(page).toHaveURL(/\/models\/?\?useCase=animate-images$/) + await expect(page).toHaveURL(/\/hub\/models\/?\?useCase=animate-images$/) await expect( page.getByRole('heading', { level: 1, name: /Image to video/ }) ).toBeVisible() @@ -484,10 +482,7 @@ test.describe('Models catalog', () => { .scrollIntoViewIfNeeded() await expect( page.getByRole('link', { name: /Explore Seedance/i }) - ).toHaveAttribute( - 'href', - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' - ) + ).toHaveAttribute('href', '/hub/models/seedance-2-5-text-to-video/') }) test('the row arrow sits level with the middle of a card', async ({ @@ -495,7 +490,7 @@ test.describe('Models catalog', () => { }) => { for (const width of [1440, 820, 420]) { await page.setViewportSize({ width, height: 1000 }) - await page.goto('/models/') + await page.goto('/hub/models/') const row = page.getByTestId('section-generate-images') const card = row.getByTestId('workshop-model-card').first() await expect(card).toBeVisible() @@ -510,7 +505,7 @@ test.describe('Models catalog', () => { }) test('the fade reaches both ends of the scrolling row', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') const row = page.getByTestId('section-generate-images') await expect(row.getByTestId('workshop-model-card').first()).toBeVisible() await row.hover() @@ -649,7 +644,7 @@ test.describe('Model playground', () => { }) test('API snippets keep uploaded media local', async ({ page }) => { - await page.goto('/models/byteplus--seedream-4-5--edit-images/') + await page.goto('/hub/models/seedream-4-5-image-edit/') const [chooser] = await Promise.all([ page.waitForEvent('filechooser'), page.getByRole('button', { name: /^Replace seedream-4-5-input-/ }).click() @@ -718,7 +713,7 @@ test.describe('Model playground', () => { }) test('three examples fill the available desktop row', async ({ page }) => { - await page.goto('/models/krea--krea-2-medium-turbo--generate-images/') + await page.goto('/hub/models/krea-2-medium-turbo-text-to-image/') const list = page.getByTestId('examples-tab').locator('ul') const cards = page.getByTestId('example-card') await expect(cards).toHaveCount(3) @@ -742,7 +737,7 @@ test.describe('Model playground', () => { }) test('a phone sample is big enough to judge @mobile', async ({ page }) => { - await page.goto('/models/krea--krea-2-medium-turbo--generate-images/') + await page.goto('/hub/models/krea-2-medium-turbo-text-to-image/') const cards = page.getByTestId('example-card') await expect(cards).toHaveCount(3) @@ -766,7 +761,7 @@ test.describe('Model playground', () => { }) => { const width = 320 await page.setViewportSize({ width, height: 720 }) - await page.goto('/models/krea--krea-2-medium-turbo--generate-images/') + await page.goto('/hub/models/krea-2-medium-turbo-text-to-image/') const cards = page.getByTestId('example-card') await expect(cards).toHaveCount(3) @@ -782,7 +777,7 @@ test.describe('Model playground', () => { }) test('a lone sample takes the phone row @mobile', async ({ page }) => { - await page.goto('/models/bfl--flux-2-pro--generate-images/') + await page.goto('/hub/models/flux-2-pro-text-to-image/') const cards = page.getByTestId('example-card') await expect(cards).toHaveCount(1) @@ -803,7 +798,7 @@ test.describe('Model playground', () => { test.describe('Filter sheet @mobile', () => { test('the handle pulls the sheet up and lets it go', async ({ page }) => { - await page.goto('/models/') + await page.goto('/hub/models/') await page.getByTestId('workshop-filter').click() const sheet = page.getByTestId('workshop-filter-menu') diff --git a/apps/website/package.json b/apps/website/package.json index 2c67717ac86..bf75d981cb4 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -26,7 +26,9 @@ "cloud-nodes:refresh-snapshot": "tsx ./scripts/refresh-cloud-nodes-snapshot.ts", "rate-card:generate-types": "openapi-ts -f openapi-ts.rate-card.config.ts && node -e \"const fs=require('fs'); const f='src/types/rate-card/zod.gen.ts'; fs.writeFileSync(f, fs.readFileSync(f,'utf8').replace(\\\"from 'zod/v3'\\\", \\\"from 'zod'\\\"));\" && pnpm exec oxfmt --ignore-path .gitignore --write src/types/rate-card/index.ts src/types/rate-card/types.gen.ts src/types/rate-card/zod.gen.ts", "rate-card:refresh-snapshot": "tsx ./scripts/refresh-rate-card-snapshot.ts", - "generate:models": "tsx ./scripts/generate-models.ts", + "generate:model-url-map": "tsx ./scripts/generate-model-url-map.ts", + "generate:models": "tsx ./scripts/generate-models.ts && tsx ./scripts/sync-vercel-redirects.ts", + "sync:redirects": "tsx ./scripts/sync-vercel-redirects.ts", "generate:workshop-catalog": "tsx ./scripts/generate-workshop-catalog.ts", "generate:workshop-display": "tsx ./scripts/generate-workshop-display.ts", "generate:workshop-router-contracts": "tsx ./scripts/generate-workshop-router-contracts.ts", @@ -35,6 +37,7 @@ "generate:workshop-node-pricing": "tsx ./scripts/generate-workshop-node-pricing.ts", "validate:jsonld": "tsx ./scripts/validate-jsonld.ts", "check:hreflang": "tsx ./scripts/check-hreflang.ts", + "list:models-pages": "tsx ./scripts/list-models-pages.ts", "validate:llms-txt-links": "tsx ./scripts/validate-llms-txt-links.ts", "workshop:generate": "tsx ./scripts/generate-workshop-models.ts", "workshop:generate-versions": "tsx ./scripts/generate-workshop-versions.ts", diff --git a/apps/website/public/llms.txt b/apps/website/public/llms.txt index 65d1440954d..3ea212a34b9 100644 --- a/apps/website/public/llms.txt +++ b/apps/website/public/llms.txt @@ -95,7 +95,7 @@ Languages: comfy.org is published in English and Simplified Chinese, with a Japa ## Models - [Supported Models](https://comfy.org/p/supported-models/): Directory of 380+ models that run in ComfyUI: image, video, audio, 3D, and utility models, each with its own page. Machine-readable catalog at https://comfy.org/p/supported-models/llms.txt. -- [Models Overview](https://comfy.org/models/): Flagship models available on Comfy, with links to each launch page. +- [Models Overview](https://comfy.org/hub/models/): Flagship models available on Comfy, with links to each launch page. - [ChatGPT Images 2.5 (OpenAI, image model)](https://comfy.org/chatgpt-image-2.5/): Generate new images, edit existing visuals, and direct results with reference images in repeatable ComfyUI workflows through Partner Nodes. - [Qwen-Image 2.1 (Alibaba Qwen, image model)](https://comfy.org/qwen-image-2.1/): Open-weights 7B image model that generates and edits in one checkpoint, with native 2K output, RGBA transparency, and accurate English and Chinese text rendering. - [Flux 3 (Black Forest Labs, video model)](https://comfy.org/flux-3/): Multimodal model: video with native audio, up to 20 seconds per generation, from text, image, video, or keyframes. diff --git a/apps/website/scripts/generate-model-url-map.test.ts b/apps/website/scripts/generate-model-url-map.test.ts new file mode 100644 index 00000000000..32779a12048 --- /dev/null +++ b/apps/website/scripts/generate-model-url-map.test.ts @@ -0,0 +1,357 @@ +import { readFileSync, readdirSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' + +import { + ModuleKind, + flattenDiagnosticMessageText, + transpileModule +} from 'typescript' +import { describe, expect, it } from 'vitest' +import { z } from 'zod' + +import { modelAliasUrls, modelPageUrls } from '../src/config/model-urls' +import { astroRedirects } from '../src/config/redirects' +import { + PROVIDER_NAMES, + routerModelSlugAliases, + workshopModels +} from '../src/config/workshop-browse-content' +import { modelsBuildRoutes } from '../src/integrations/workshop-release-gate' +import { + MODEL_URL_SLUG, + MODEL_URL_TABLE, + MODEL_URLS_MODULE, + compileModelUrlMap, + modelUrlFlags, + modelUrlSlug, + renderModelUrlTable, + renderModelUrlsModule +} from './generate-model-url-map' + +const appDir = join(dirname(fileURLToPath(import.meta.url)), '..') +const newSlugs = modelPageUrls.map((page) => page.newSlug) + +function sitePathPatterns(): string[] { + const pagesDir = join(appDir, 'src/pages') + const pages = readdirSync(pagesDir, { recursive: true, encoding: 'utf8' }) + .map((file) => file.replaceAll('\\', '/')) + .filter((file) => /\.(astro|ts|mdx?)$/.test(file)) + .filter((file) => !file.split('/').some((part) => part.startsWith('_'))) + .filter((file) => !file.endsWith('.test.ts')) + .map( + (file) => + `/${file.replace(/\.(astro|ts|mdx?)$/, '').replace(/(^|\/)index$/, '')}` + ) + const vercel = z + .object({ redirects: z.array(z.object({ source: z.string() })) }) + .parse(JSON.parse(readFileSync(join(appDir, 'vercel.json'), 'utf8'))) + return [ + ...pages, + ...modelsBuildRoutes(true).map((route) => route.pattern), + ...Object.keys(astroRedirects), + ...vercel.redirects.map((redirect) => redirect.source) + ] +} + +function matchesRoute(pattern: string, path: string): boolean { + const source = pattern + .split(/(\[[^\]]+\]|:\w+\*?|\(\.\*\))/) + .map((part) => + /^(\[\.\.\.|:\w+\*$|\(\.\*\)$)/.test(part) + ? '.*' + : /^(\[|:\w)/.test(part) + ? '[^/]+' + : part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + ) + .join('') + return new RegExp(`^${source}/?$`).test(path) +} + +describe('model URL map', () => { + it('matches the generator output (pnpm generate:model-url-map)', () => { + const map = compileModelUrlMap( + workshopModels, + routerModelSlugAliases, + modelPageUrls + ) + expect(readFileSync(MODEL_URLS_MODULE, 'utf8')).toBe( + renderModelUrlsModule(map) + ) + expect(readFileSync(MODEL_URL_TABLE, 'utf8')).toBe( + renderModelUrlTable(workshopModels, map) + ) + }) + + it('keeps every recorded slug when display names change', () => { + const renamed = workshopModels.map((model) => ({ + ...model, + name: `${model.name} Renamed` + })) + expect( + compileModelUrlMap(renamed, routerModelSlugAliases, modelPageUrls) + ).toEqual({ pages: modelPageUrls, aliases: modelAliasUrls }) + }) + + it('gives every published model page exactly one new slug', () => { + const oldSlugs = modelPageUrls.map((page) => page.oldSlug) + expect(new Set(oldSlugs).size).toBe(oldSlugs.length) + expect(oldSlugs.toSorted()).toEqual( + workshopModels.map((model) => model.slug).toSorted() + ) + }) + + it('points every alias straight at a new page slug', () => { + const aliases = modelAliasUrls.map((entry) => entry.alias) + const oldSlugs = new Set(modelPageUrls.map((page) => page.oldSlug)) + expect(new Set(aliases).size).toBe(aliases.length) + expect(aliases.toSorted()).toEqual( + [...routerModelSlugAliases.keys()].sort() + ) + expect(aliases.filter((alias) => oldSlugs.has(alias))).toEqual([]) + expect( + modelAliasUrls.filter((entry) => !newSlugs.includes(entry.newSlug)) + ).toEqual([]) + }) + + it('uses unique, lowercase, hyphenated slugs', () => { + expect(new Set(newSlugs).size).toBe(newSlugs.length) + expect(newSlugs.filter((slug) => !MODEL_URL_SLUG.test(slug))).toEqual([]) + }) + + const renamedProviderIds = Object.entries(PROVIDER_NAMES) + .filter(([id, name]) => modelUrlSlug(id) !== modelUrlSlug(name)) + .map(([id]) => (id === 'gemini' ? 'gemini(?!-omni-)' : modelUrlSlug(id))) + + it.for([ + [ + 'a Router provider id', + new RegExp(`(^|-)(${renamedProviderIds.join('|')})(-|$)`) + ], + ['a Router model id', /(^|-)(dreamina|interactions|recraftv\d)(-|$)/], + ['a Router date stamp', /\d{6}/] + ] as const)('never leaks %s', ([, forbidden]) => { + expect(newSlugs.filter((slug) => forbidden.test(slug))).toEqual([]) + }) + + it('claims no path another route already serves', () => { + const patterns = sitePathPatterns().filter( + (pattern) => pattern !== '/hub/models/[slug]' + ) + const collisions = newSlugs.flatMap((slug) => + patterns.filter((pattern) => + matchesRoute(pattern, `/hub/models/${slug}/`) + ) + ) + expect(patterns).toContain('/p/supported-models/[slug]') + expect(collisions).toEqual([]) + }) +}) + +describe('modelUrlFlags', () => { + const noTaskWords = + 'no task words in the name; the product name stands in for the task' + + it.for([ + [ + 'an edit page whose Router model is overridden to generate-images', + 'openai--gpt-image-1--edit-images', + 'openai/gpt-image-1', + 'gpt-image-1-image-edit', + [] + ], + [ + 'a task word that disagrees with the page use case', + 'openai--gpt-image-1--generate-images', + 'openai/gpt-image-1', + 'gpt-image-1-image-edit', + ['name says "image-edit", page use case is generate-images'] + ], + [ + 'a digit inside a task word', + 'kling--avatar--animate-images', + 'kling/videos-avatar-image2video', + 'kling-avatar', + [noTaskWords] + ], + [ + 'a v-prefixed version', + 'bfl--erase-v1--edit-images', + 'bfl/erase-v1', + 'flux-tools-erase', + [noTaskWords, 'no version in the name, Router id is bfl/erase-v1'] + ], + [ + 'an underscore version', + 'elevenlabs--eleven_v3--audio', + 'elevenlabs/eleven_v3', + 'elevenlabs-text-to-dialogue', + ['no version in the name, Router id is elevenlabs/eleven_v3'] + ], + [ + 'a dotted version', + 'wan--happyhorse-text-to-video--generate-videos', + 'wan/happyhorse-1.1-t2v', + 'happyhorse-text-to-video', + ['no version in the name, Router id is wan/happyhorse-1.1-t2v'] + ] + ] as const)('flags %s', ([, slug, routerId, newSlug, flags]) => { + expect(modelUrlFlags({ slug, routerId }, newSlug)).toEqual(flags) + }) +}) + +describe('renderModelUrlsModule', () => { + it.for([ + 'Veo 3\nText-to-Video', + "Veo's 3 \\ Text\tto\rVideo", + 'Veo 3\u2028Text-to-Video', + 'Veo "3" Text-to-Video', + 'back\\"quote', + "''\\\"" + ])('writes %j back as the same string', (name) => { + const source = renderModelUrlsModule({ + pages: [{ oldSlug: 'veo--veo-3', newSlug: 'veo-3', name }], + aliases: [] + }) + const { outputText, diagnostics } = transpileModule(source, { + compilerOptions: { module: ModuleKind.CommonJS }, + reportDiagnostics: true + }) + expect( + diagnostics?.map((d) => flattenDiagnosticMessageText(d.messageText, '')) + ).toEqual([]) + const module = { exports: { modelPageUrls: [] as { name: string }[] } } + new Function('module', 'exports', outputText)(module, module.exports) + expect(module.exports.modelPageUrls[0].name).toBe(name) + }) +}) + +describe('compileModelUrlMap', () => { + it.for([ + ['FLUX.1 Kontext Max Image Edit', 'flux-1-kontext-max-image-edit'], + ['Seedance 2.5 Text-to-Video', 'seedance-2-5-text-to-video'], + ['Runway Gen-4 Turbo Image-to-Video', 'runway-gen-4-turbo-image-to-video'], + ['Café Photo 2.0', 'cafe-photo-2-0'], + [' Bria RMBG 2.0 ', 'bria-rmbg-2-0'] + ] as const)('slugifies %s', ([name, slug]) => { + expect(modelUrlSlug(name)).toBe(slug) + }) + + it('keeps a published slug and its recorded name when the display name changes', () => { + const models = [ + { slug: 'google--veo-3--generate-videos', name: 'Veo 3.1 Text-to-Video' }, + { slug: 'google--veo-4--generate-videos', name: 'Veo 4 Text-to-Video' } + ] + const frozen = [ + { + oldSlug: 'google--veo-3--generate-videos', + newSlug: 'veo-3-text-to-video', + name: 'Veo 3 Text-to-Video' + } + ] + expect(compileModelUrlMap(models, new Map(), frozen).pages).toEqual([ + ...frozen, + { + oldSlug: 'google--veo-4--generate-videos', + newSlug: 'veo-4-text-to-video', + name: 'Veo 4 Text-to-Video' + } + ]) + }) + + it.for([ + [ + 'flags a rename', + 'veo-3-text-to-video', + 'Veo 3.1 Text-to-Video', + [ + '| `veo-3-text-to-video` | Veo 3.1 Text-to-Video | frozen at `veo-3-text-to-video` for "Veo 3 Text-to-Video", name now suggests `veo-3-1-text-to-video` |' + ] + ], + [ + 'ignores a deliberate slug edit', + 'google-veo-3-text-to-video', + 'Veo 3 Text-to-Video', + [] + ], + [ + 'ignores a rename that keeps the same slug', + 'veo-3-text-to-video', + 'Veo 3: text to video', + [] + ] + ] as const)('%s', ([, newSlug, name, rows]) => { + const model = { + slug: 'google--veo-3--generate-videos', + name, + provider: 'Google', + routerId: 'veo/veo-3.0-generate-001' + } + const map = compileModelUrlMap([model], new Map(), [ + { oldSlug: model.slug, newSlug, name: 'Veo 3 Text-to-Video' } + ]) + const table = renderModelUrlTable([model], map) + expect(table).toContain(`## Check these first (${rows.length})`) + for (const row of rows) expect(table).toContain(row) + }) + + it('rejects a new page that takes a published slug', () => { + expect(() => + compileModelUrlMap( + [ + { slug: 'a--veo-3--generate-videos', name: 'Veo 3.1 Text-to-Video' }, + { slug: 'b--veo-3--generate-videos', name: 'Veo 3 Text-to-Video' } + ], + new Map(), + [ + { + oldSlug: 'a--veo-3--generate-videos', + newSlug: 'veo-3-text-to-video', + name: 'Veo 3 Text-to-Video' + } + ] + ) + ).toThrow('both map to veo-3-text-to-video') + }) + + it('rejects two pages that would share a URL', () => { + expect(() => + compileModelUrlMap( + [ + { slug: 'a--veo-3--generate-videos', name: 'Veo 3 Text-to-Video' }, + { slug: 'b--veo-3--generate-videos', name: 'Veo 3: Text to Video' } + ], + new Map() + ) + ).toThrow('both map to veo-3-text-to-video') + }) + + it.for([ + ['a shared old slug', ['veo--veo-3', 'veo--veo-3'], 'share an old slug'], + ['a dot-only old slug', ['..', 'veo--veo-4'], 'Invalid old slug'], + [ + 'a quote in an old slug', + ["veo--veo-3'", 'veo--veo-4'], + 'Invalid old slug' + ] + ] as const)('rejects %s', ([, [first, second], message]) => { + expect(() => + compileModelUrlMap( + [ + { slug: first, name: 'Veo 3 Text-to-Video' }, + { slug: second, name: 'Veo 4 Text-to-Video' } + ], + new Map() + ) + ).toThrow(message) + }) + + it('rejects an alias whose target page does not exist', () => { + expect(() => + compileModelUrlMap( + [{ slug: 'veo--veo-3--generate-videos', name: 'Veo 3 Text-to-Video' }], + new Map([['veo--veo-3', 'veo--missing--generate-videos']]) + ) + ).toThrow('Alias veo--veo-3 targets unknown veo--missing--generate-videos') + }) +}) diff --git a/apps/website/scripts/generate-model-url-map.ts b/apps/website/scripts/generate-model-url-map.ts new file mode 100644 index 00000000000..d54d445a103 --- /dev/null +++ b/apps/website/scripts/generate-model-url-map.ts @@ -0,0 +1,264 @@ +import { writeFile } from 'node:fs/promises' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' + +import type { + RouterWorkshopModel, + UseCase +} from '../src/config/models-catalogue' +import { USE_CASES } from '../src/config/models-catalogue' +import { modelPageUrls } from '../src/config/model-urls' +import { + routerModelSlugAliases, + workshopModels +} from '../src/config/workshop-browse-content' +import { isDirectExecution } from './script-entry-point' + +type MapModel = Pick< + RouterWorkshopModel, + 'slug' | 'name' | 'provider' | 'routerId' +> +type ModelPageUrl = { + oldSlug: string + newSlug: string + name: string +} +interface ModelUrlMap { + pages: ModelPageUrl[] + aliases: { alias: string; newSlug: string }[] +} + +export const MODEL_URL_SLUG = /^[a-z0-9]+(-[a-z0-9]+)*$/ +const OLD_URL_SLUG = /^(?!\.+$)[\w.-]+$/ +const VERSION = /(^|[-_])v?\d+(\.\d+)*($|[-_])/ + +const TASK_WORDS_BY_USE_CASE: Readonly> = { + 'generate-images': ['text-to-image', 'text-to-vector'], + 'edit-images': ['image-edit'], + 'generate-videos': ['text-to-video', 'reference-to-video'], + 'animate-images': [ + 'image-to-video', + 'reference-to-video', + 'first-last-frame', + 'video-continuation' + ], + 'edit-videos': ['video-edit', 'video-to-video', 'audio-to-video'], + audio: ['text-to-speech', 'text-to-dialogue'], + '3d': [], + text: [] +} +const TASK_WORDS = [...new Set(Object.values(TASK_WORDS_BY_USE_CASE).flat())] + +const compareText = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0) + +const hasWords = (slug: string, words: string) => + `-${slug}-`.includes(`-${words}-`) + +export function modelUrlSlug(name: string): string { + return name + .normalize('NFKD') + .replace(/\p{M}/gu, '') + .toLowerCase() + .replace(/[^a-z0-9]+/g, '-') + .replace(/^-+|-+$/g, '') +} + +/** + * `frozen` holds the rows already published: a page keeps its URL and the name + * it was frozen against when its display name changes, and only pages new to + * the map get a slug from theirs. + */ +export function compileModelUrlMap( + models: readonly Pick[], + aliases: ReadonlyMap, + frozen: readonly ModelPageUrl[] = [] +): ModelUrlMap { + const frozenByOld = new Map(frozen.map((page) => [page.oldSlug, page])) + const pageByOld = new Map( + models.map((model) => { + const page = frozenByOld.get(model.slug) + return [ + model.slug, + { + oldSlug: model.slug, + newSlug: page?.newSlug ?? modelUrlSlug(model.name), + name: page?.name ?? model.name + } + ] + }) + ) + if (pageByOld.size !== models.length) + throw new Error('Two model pages share an old slug') + for (const slug of [...pageByOld.keys(), ...aliases.keys()]) + if (!OLD_URL_SLUG.test(slug)) throw new Error(`Invalid old slug: ${slug}`) + const owners = new Map() + for (const { oldSlug, newSlug } of pageByOld.values()) { + if (!MODEL_URL_SLUG.test(newSlug)) + throw new Error(`Invalid model URL slug for ${oldSlug}: ${newSlug}`) + const owner = owners.get(newSlug) + if (owner) throw new Error(`${oldSlug} and ${owner} both map to ${newSlug}`) + owners.set(newSlug, oldSlug) + } + return { + pages: [...pageByOld.values()].sort((a, b) => + compareText(a.oldSlug, b.oldSlug) + ), + aliases: [...aliases] + .map(([alias, target]) => { + const newSlug = pageByOld.get(target)?.newSlug + if (!newSlug) + throw new Error(`Alias ${alias} targets unknown ${target}`) + return { alias, newSlug } + }) + .sort((a, b) => compareText(a.alias, b.alias)) + } +} + +function pageUseCase(slug: string): UseCase { + const tail = slug.split('--').at(-1) + const useCase = USE_CASES.find((item) => item === tail) + if (!useCase) throw new Error(`No use case in page slug ${slug}`) + return useCase +} + +export function modelUrlFlags( + model: Pick, + newSlug: string +): string[] { + const useCase = pageUseCase(model.slug) + const named = TASK_WORDS.filter((words) => hasWords(newSlug, words)) + const expected = TASK_WORDS_BY_USE_CASE[useCase] + return [ + ...(named.length + ? [] + : ['no task words in the name; the product name stands in for the task']), + ...named + .filter((words) => !expected.includes(words)) + .map((words) => `name says "${words}", page use case is ${useCase}`), + ...(VERSION.test(model.routerId.split('/')[1] ?? '') && !/\d/.test(newSlug) + ? [`no version in the name, Router id is ${model.routerId}`] + : []) + ] +} + +const countOf = (text: string, char: string) => text.split(char).length - 1 + +function stringLiteral(text: string): string { + const quote = countOf(text, "'") > countOf(text, '"') ? '"' : "'" + const body = JSON.stringify(text).slice(1, -1).replace(/\\"/g, '"') + return `${quote}${body.replaceAll(quote, `\\${quote}`)}${quote}` +} + +const entryLines = (fields: Record) => + [ + ' {', + Object.entries(fields) + .map(([k, v]) => ` ${k}: ${stringLiteral(v)}`) + .join(',\n'), + ' }' + ].join('\n') + +export function renderModelUrlsModule(map: ModelUrlMap): string { + return `// Generated by scripts/generate-model-url-map.ts. Rows are frozen: to change a +// published slug, edit its newSlug here on purpose; a live one also needs a redirect. +// name is the display name each slug was frozen against; update it to clear a rename flag. +// Router model pages only: /models/workflows/* move via their own list, /models/apps/* stay. +export const modelPageUrls: readonly { + oldSlug: string + newSlug: string + name: string +}[] = [ +${map.pages.map(entryLines).join(',\n')} +] + +export const modelAliasUrls: readonly { alias: string; newSlug: string }[] = [ +${map.aliases.map(entryLines).join(',\n')} +] +` +} + +const cell = (text: string) => text.replace(/\s+/g, ' ').replace(/\|/g, '\\|') + +export function renderModelUrlTable( + models: readonly MapModel[], + map: ModelUrlMap +): string { + const pageByOld = new Map(map.pages.map((page) => [page.oldSlug, page])) + const rows = models + .map((model) => { + const page = pageByOld.get(model.slug) + if (!page) throw new Error(`No new slug for ${model.slug}`) + return { model, newSlug: page.newSlug, frozenName: page.name } + }) + .sort( + (a, b) => + compareText(a.model.provider ?? '', b.model.provider ?? '') || + compareText(a.model.slug, b.model.slug) + ) + const flagged = rows.flatMap(({ model, newSlug, frozenName }) => { + const suggested = modelUrlSlug(model.name) + const flags = [ + ...(suggested === modelUrlSlug(frozenName) + ? [] + : [ + `frozen at \`${newSlug}\` for "${frozenName}", name now suggests \`${suggested}\`` + ]), + ...modelUrlFlags(model, newSlug) + ] + return flags.length + ? [`| \`${newSlug}\` | ${cell(model.name)} | ${cell(flags.join('; '))} |`] + : [] + }) + return [ + '# Model page URL map', + '', + 'Generated by `scripts/generate-model-url-map.ts`. Old URL `/models//`, final URL `/hub/models//`.', + '', + 'Scope: the Router model pages and their aliases only. The `/models/workflows//` pages are not in this table: they move to `/hub/workflows//` from their own list in FE-2972 B3. The `/models/apps//` pages (`apps/cinematic-studio`, `apps/reshoot`) are not in it either: they stay at `/models/apps//`.', + '', + 'A published slug is frozen: regenerating keeps every old slug on the new slug recorded in `src/config/model-urls.ts`, even after a display-name change. Each row also records the display name its slug was frozen against, and a row whose current name would give a different slug than that recorded name is listed under "Check these first". Once reviewed, set that row\'s `name` to the current display name to clear the flag. Only pages new to the map get a slug from their display name.', + '', + "To change a published slug, edit that row's `newSlug` in `src/config/model-urls.ts` by hand, on purpose, then regenerate. A deliberate edit is not flagged. If the slug you replace is already live under `/hub/models/`, also add a redirect from it to the new one.", + '', + 'The freeze covers renames, not removals: a page dropped from `workshopModels` loses its row, and its redirect, on the next regeneration.', + '', + `## Check these first (${flagged.length})`, + '', + '| New slug | Display name | Why |', + '| --- | --- | --- |', + ...flagged, + '', + `## Model pages (${rows.length})`, + '', + '| Provider | Display name | Old slug | New slug |', + '| --- | --- | --- | --- |', + ...rows.map( + ({ model, newSlug }) => + `| ${cell(model.provider ?? '')} | ${cell(model.name)} | \`${model.slug}\` | \`${newSlug}\` |` + ), + '', + `## Aliases (${map.aliases.length})`, + '', + '| Alias | New slug |', + '| --- | --- |', + ...map.aliases.map( + ({ alias, newSlug }) => `| \`${alias}\` | \`${newSlug}\` |` + ), + '' + ].join('\n') +} + +const appDir = join(dirname(fileURLToPath(import.meta.url)), '..') +export const MODEL_URLS_MODULE = join(appDir, 'src/config/model-urls.ts') +export const MODEL_URL_TABLE = join(appDir, 'MODEL_URL_MAP.md') + +if (isDirectExecution(process.argv[1], import.meta.filename)) { + const map = compileModelUrlMap( + workshopModels, + routerModelSlugAliases, + modelPageUrls + ) + await writeFile(MODEL_URLS_MODULE, renderModelUrlsModule(map)) + await writeFile(MODEL_URL_TABLE, renderModelUrlTable(workshopModels, map)) + console.warn(`${map.pages.length} pages, ${map.aliases.length} aliases`) +} diff --git a/apps/website/scripts/list-models-pages.ts b/apps/website/scripts/list-models-pages.ts new file mode 100644 index 00000000000..baa6e386d3c --- /dev/null +++ b/apps/website/scripts/list-models-pages.ts @@ -0,0 +1,32 @@ +/** Prints every built page under the Models URL registry's roots, sorted. */ +import { existsSync, readdirSync } from 'node:fs' +import { dirname, join, relative, sep } from 'node:path' +import { fileURLToPath } from 'node:url' + +import { modelsUrlRoots } from '../src/config/models-url-registry' + +const DIST = join(dirname(fileURLToPath(import.meta.url)), '..', 'dist') + +function indexPages(dir: string): string[] { + if (!existsSync(dir)) return [] + return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => { + const full = join(dir, entry.name) + if (entry.isDirectory()) return indexPages(full) + return entry.name === 'index.html' ? [full] : [] + }) +} + +const pages = new Set( + modelsUrlRoots.flatMap((root) => + indexPages(join(DIST, root)).map((file) => + relative(DIST, file).split(sep).join('/') + ) + ) +) + +process.stdout.write( + [...pages] + .sort() + .map((page) => `${page}\n`) + .join('') +) diff --git a/apps/website/scripts/sync-vercel-redirects.ts b/apps/website/scripts/sync-vercel-redirects.ts new file mode 100644 index 00000000000..a41b255852b --- /dev/null +++ b/apps/website/scripts/sync-vercel-redirects.ts @@ -0,0 +1,23 @@ +import { readFileSync, writeFileSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' + +import { z } from 'zod' + +import { siteRedirects, toVercelRedirects } from '../src/config/redirects' + +const vercelJsonPath = join( + dirname(fileURLToPath(import.meta.url)), + '..', + 'vercel.json' +) + +const config = z + .record(z.string(), z.unknown()) + .and(z.object({ buildCommand: z.string(), redirects: z.array(z.unknown()) })) + .parse(JSON.parse(readFileSync(vercelJsonPath, 'utf8'))) + +writeFileSync( + vercelJsonPath, + `${JSON.stringify({ ...config, redirects: toVercelRedirects(siteRedirects) }, null, 2)}\n` +) diff --git a/apps/website/src/components/auth/AuthForgotPassword.test.ts b/apps/website/src/components/auth/AuthForgotPassword.test.ts index ff86da2afe5..32458197bcd 100644 --- a/apps/website/src/components/auth/AuthForgotPassword.test.ts +++ b/apps/website/src/components/auth/AuthForgotPassword.test.ts @@ -422,6 +422,6 @@ describe('AuthForgotPassword', () => { expect( assign, 'a cross-origin destination maps to the safe Workshop-home fallback, never the raw value' - ).toHaveBeenCalledWith('/login/?returnTo=%2Fmodels%2F') + ).toHaveBeenCalledWith('/login/?returnTo=%2Fhub%2Fmodels%2F') }) }) diff --git a/apps/website/src/components/common/HeaderMain/HeaderMainDesktop.test.ts b/apps/website/src/components/common/HeaderMain/HeaderMainDesktop.test.ts index 57781428b8e..04d66b1fff9 100644 --- a/apps/website/src/components/common/HeaderMain/HeaderMainDesktop.test.ts +++ b/apps/website/src/components/common/HeaderMain/HeaderMainDesktop.test.ts @@ -18,18 +18,18 @@ describe('HeaderMainDesktop', () => { }) it('renders the Models leaf link with its NEW badge', async () => { const link = await modelsLink('/pricing') - expect(link.getAttribute('href')).toBe('/models') + expect(link.getAttribute('href')).toBe('/hub/models/') expect(link.textContent).toMatch(/new/i) expect(link.getAttribute('data-active')).toBeNull() }) it('marks the leaf link active on its own page', async () => { - const link = await modelsLink('/models') + const link = await modelsLink('/hub/models/') expect(link.getAttribute('data-active')).not.toBeNull() }) it('keeps Products inactive on the Models page it also links to', async () => { - await modelsLink('/models') + await modelsLink('/hub/models/') const products = screen.getByRole('button', { name: /products/i }) expect(products.getAttribute('data-active')).toBeNull() }) diff --git a/apps/website/src/components/home/ModelDiscoverySection.test.ts b/apps/website/src/components/home/ModelDiscoverySection.test.ts index ef28868c8af..ab4d672339c 100644 --- a/apps/website/src/components/home/ModelDiscoverySection.test.ts +++ b/apps/website/src/components/home/ModelDiscoverySection.test.ts @@ -91,12 +91,12 @@ describe('ModelDiscoverySection', async () => { const provider = screen.getByRole('link', { name: /Fixture Studio & Co/ }) expect(provider.getAttribute('href')).toBe( - '/models?q=Fixture+Studio+%26+Co' + '/hub/models/?q=Fixture+Studio+%26+Co' ) expect(screen.queryByRole('link', { name: /ByteDance/ })).toBeNull() const browse = screen.getByRole('link', { name: 'Browse all models' }) - expect(browse.getAttribute('href')).toBe('/models') + expect(browse.getAttribute('href')).toBe('/hub/models/') }) it('hides the looping copy of the row from assistive tech', async () => { @@ -158,7 +158,7 @@ describe('ModelDiscoverySection', async () => { ).toHaveAttribute('href', '/models/workflows/sketch/') expect( screen.getByRole('link', { name: 'Browse all workflows' }) - ).toHaveAttribute('href', '/models?type=workflows') + ).toHaveAttribute('href', '/hub/models/?type=workflows') }) // Both rows cross the screen at one pace, so switching tabs does not speed @@ -213,6 +213,6 @@ describe('ModelDiscoverySection', async () => { await nextTick() const browse = screen.getByRole('link', { name: '浏览全部模型' }) - expect(browse.getAttribute('href')).toBe('/models') + expect(browse.getAttribute('href')).toBe('/hub/models/') }) }) diff --git a/apps/website/src/components/home/ModelReleaseSection.test.ts b/apps/website/src/components/home/ModelReleaseSection.test.ts index 394a0d3066c..62fd9db1e2b 100644 --- a/apps/website/src/components/home/ModelReleaseSection.test.ts +++ b/apps/website/src/components/home/ModelReleaseSection.test.ts @@ -35,12 +35,12 @@ describe('ModelReleaseSection', () => { const explore = screen.getByRole('link', { name: 'Explore Seedance 2.5' }) expect(explore.getAttribute('href')).toBe( - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' + '/hub/models/seedance-2-5-text-to-video/' ) const tryCta = screen.getByRole('link', { name: 'Try Workflow' }) expect(tryCta.getAttribute('href')).toBe( - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' + '/hub/models/seedance-2-5-text-to-video/' ) expect(tryCta.getAttribute('target')).toBeNull() @@ -58,7 +58,7 @@ describe('ModelReleaseSection', () => { const explore = screen.getByRole('link', { name: '探索 Seedance 2.5' }) expect(explore.getAttribute('href')).toBe( - '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' + '/hub/models/seedance-2-5-text-to-video/' ) expect(screen.getByRole('link', { name: '试用工作流' })).toBeTruthy() diff --git a/apps/website/src/components/workshop/CatalogueBackLink.test.ts b/apps/website/src/components/workshop/CatalogueBackLink.test.ts index 7d752e51bc6..1f4414adc6c 100644 --- a/apps/website/src/components/workshop/CatalogueBackLink.test.ts +++ b/apps/website/src/components/workshop/CatalogueBackLink.test.ts @@ -16,7 +16,7 @@ describe('CatalogueBackLink', () => { const link = screen.getByTestId('model-back') expect(link.textContent.trim()).toBe('Back to all models') - expect(link.getAttribute('href')).toBe('/models') + expect(link.getAttribute('href')).toBe('/hub/models/') }) // A second catalogue answers for its own pages, under its own name. @@ -63,7 +63,9 @@ describe('CatalogueBackLink', () => { await waitFor(() => { const link = screen.getByTestId('model-back') expect(link.textContent.trim()).toBe('Back to Generate videos') - expect(link.getAttribute('href')).toBe('/models?useCase=generate-videos') + expect(link.getAttribute('href')).toBe( + '/hub/models/?useCase=generate-videos' + ) }) }) }) diff --git a/apps/website/src/components/workshop/ModelsPage.test.ts b/apps/website/src/components/workshop/ModelsPage.test.ts index e144cf5750a..9e8ad6994b0 100644 --- a/apps/website/src/components/workshop/ModelsPage.test.ts +++ b/apps/website/src/components/workshop/ModelsPage.test.ts @@ -122,7 +122,7 @@ describe('Models page entry', () => { within(screen.getByTestId('model-hero')).getByRole('link', { name: 'Generate images' }) - ).toHaveAttribute('href', '/models?useCase=generate-images') + ).toHaveAttribute('href', '/hub/models/?useCase=generate-images') } enabled.value = false await nextTick() diff --git a/apps/website/src/components/workshop/WorkflowPage.test.ts b/apps/website/src/components/workshop/WorkflowPage.test.ts index e7522eee22b..e4083691bbf 100644 --- a/apps/website/src/components/workshop/WorkflowPage.test.ts +++ b/apps/website/src/components/workshop/WorkflowPage.test.ts @@ -24,7 +24,7 @@ describe('WorkflowPage header', () => { const shelf = screen.getByTestId('workflow-use-case') expect(shelf.textContent.trim()).toBe('Edit images') expect(shelf.getAttribute('href')).toBe( - '/models?type=workflows&category=cleanup' + '/hub/models/?type=workflows&category=cleanup' ) }) diff --git a/apps/website/src/components/workshop/WorkflowPage.vue b/apps/website/src/components/workshop/WorkflowPage.vue index 35269623574..f099150f3e7 100644 --- a/apps/website/src/components/workshop/WorkflowPage.vue +++ b/apps/website/src/components/workshop/WorkflowPage.vue @@ -48,7 +48,7 @@ const cloudHref = template