diff --git a/packages/stats/app/src/component/model-compare-detail.tsx b/packages/stats/app/src/component/model-compare-detail.tsx index e4c2ac5cbdd..8d59cf5dc49 100644 --- a/packages/stats/app/src/component/model-compare-detail.tsx +++ b/packages/stats/app/src/component/model-compare-detail.tsx @@ -48,6 +48,7 @@ import { } from "../lib/comparison-pages" import { baseUrl } from "../lib/language" import { runStatsEffect } from "../stats-runtime" +import { NotFoundMeta } from "./not-found-meta" const compareHeaderLinks: readonly HeaderLink[] = [ { href: `${import.meta.env.BASE_URL}#top-models`, label: "Top Models" }, @@ -235,20 +236,28 @@ export default function ModelCompareDetailPage(props: ModelCompareDetailPageProp return (
- + {/* Server-rendered head tags are never removed, so render them once all data has loaded. */} + {title()} - 2 ? "noindex,follow" : "index,follow"} /> - - - - - - - - - - + model.catalog || model.stats)} + fallback={} + > + 2 ? "noindex,follow" : "index,follow"} /> + + + + + + + + + + +
+ + + + ) +} diff --git a/packages/stats/app/src/routes/[...404].tsx b/packages/stats/app/src/routes/[...404].tsx new file mode 100644 index 00000000000..62a03c0e1c1 --- /dev/null +++ b/packages/stats/app/src/routes/[...404].tsx @@ -0,0 +1,18 @@ +import { Title } from "@solidjs/meta" +import { NotFoundMeta } from "../component/not-found-meta" +import { useLanguage } from "../context/language" + +export default function NotFound() { + const language = useLanguage() + return ( +
+ Page not found + +
+ Page not found +

This data page doesn't exist.

+ Model data +
+
+ ) +} diff --git a/packages/stats/app/src/routes/[lab]/[model].tsx b/packages/stats/app/src/routes/[lab]/[model].tsx index 6753afa3cb4..5cd33cafea0 100644 --- a/packages/stats/app/src/routes/[lab]/[model].tsx +++ b/packages/stats/app/src/routes/[lab]/[model].tsx @@ -14,10 +14,12 @@ import { createAsync, query, useParams } from "@solidjs/router" import { createMemo, createSignal, createUniqueId, For, onMount, Show, type JSX } from "solid-js" import { getRequestEvent } from "solid-js/web" import { LocaleLinks } from "../../component/locale-links" +import { NotFoundMeta } from "../../component/not-found-meta" import { useI18n } from "../../context/i18n" import { useLanguage } from "../../context/language" import { localizedUrl } from "../../lib/language" import { + catalogModelPath, findModelCatalogEntry, formatCatalogLabName, isKnownCatalogLab, @@ -47,7 +49,7 @@ import { } from "../stats-shell" const statsUnfurlPath = "banner.png" -const glmFlashCatalogId = "zhipuai/glm-5.3-flash" +const glmFlashPath = "/data/zhipuai/glm-5-3-flash" const glmFlashModel = "glm-5.3-flash" const shortMonths = ["JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"] as const @@ -110,10 +112,10 @@ export default function StatsModel() { const modelTitle = createMemo(() => i18n.t("model.title", { model: searchModelName() })) const modelDescription = createMemo(() => i18n.t("model.description", { model: searchModelName() })) const modelPath = createMemo(() => { - const fallback = formerName() - ? glmFlashCatalogId - : [labParam(), stats()?.slug ?? canonicalModel()].filter((part) => part.length > 0).join("/") - return `/data/${catalogEntry()?.id ?? fallback}` + const entry = catalogEntry() + if (entry) return catalogModelPath(entry) + if (formerName()) return glmFlashPath + return `/data/${providerSlug(labParam())}/${stats()?.slug ?? providerSlug(canonicalModel())}` }) const modelUrl = createMemo(() => localizedUrl(language.locale(), modelPath())) const statsUnfurlUrl = new URL(statsUnfurlPath, localizedUrl("en", "/data/")).toString() @@ -152,24 +154,32 @@ export default function StatsModel() { return (
- {modelTitle()} - - - - - - - - - - - - - - - - - + {/* Server-rendered head tags are never removed, so render them once data has loaded. */} + + {modelTitle()} + + } + > + + + + + + + + + + + + + + + + + +
({ - href: language.route(`${import.meta.env.BASE_URL}${model.id}`), + href: language.route(catalogModelPath(model)), label: model.name, value: model.id, }))} diff --git a/packages/stats/app/src/routes/[lab]/index.tsx b/packages/stats/app/src/routes/[lab]/index.tsx index f79f5c21f41..980602d8261 100644 --- a/packages/stats/app/src/routes/[lab]/index.tsx +++ b/packages/stats/app/src/routes/[lab]/index.tsx @@ -12,10 +12,12 @@ import { createAsync, query, useParams } from "@solidjs/router" import { createMemo, createSignal, createUniqueId, For, onMount, Show, type JSX } from "solid-js" import { getRequestEvent } from "solid-js/web" import { LocaleLinks } from "../../component/locale-links" +import { NotFoundMeta } from "../../component/not-found-meta" import { useI18n } from "../../context/i18n" import { useLanguage } from "../../context/language" import { localizedUrl } from "../../lib/language" import { + catalogModelPath, catalogSlug, findModelCatalogLab, formatCatalogLabName, @@ -124,24 +126,29 @@ export default function StatsLab() { return (
- {labTitle()} - - - - - - - - - - - - - - - - - + {/* Server-rendered head tags are never removed, so render them once data has loaded. */} + + {labTitle()} + + }> + + + + + + + + + + + + + + + + + +
props.onTooltipChange(undefined)} diff --git a/packages/stats/app/src/routes/compare/[firstFamily]/[secondFamily].tsx b/packages/stats/app/src/routes/compare/[firstFamily]/[secondFamily].tsx index a39226721b4..bdf130d843c 100644 --- a/packages/stats/app/src/routes/compare/[firstFamily]/[secondFamily].tsx +++ b/packages/stats/app/src/routes/compare/[firstFamily]/[secondFamily].tsx @@ -1,7 +1,8 @@ -import { Meta, Title } from "@solidjs/meta" +import { Title } from "@solidjs/meta" import { createAsync, useParams } from "@solidjs/router" import { createMemo, Show } from "solid-js" import ModelCompareDetailPage from "../../../component/model-compare-detail" +import { NotFoundMeta } from "../../../component/not-found-meta" import { resolveComparisonFamily } from "../../../lib/comparison-pages" import { getModelCatalog } from "../../model-catalog" @@ -23,7 +24,7 @@ export default function ModelCompareFamily() { fallback={ Model comparison not found - +
Comparison not found diff --git a/packages/stats/app/src/routes/compare/index.tsx b/packages/stats/app/src/routes/compare/index.tsx index 861f6949347..c0d1d47c7af 100644 --- a/packages/stats/app/src/routes/compare/index.tsx +++ b/packages/stats/app/src/routes/compare/index.tsx @@ -108,24 +108,27 @@ export default function ModelCompareIndex() { return (
- {compareTitle} - - - - - - - - - - - - - - - - - + {/* Server-rendered head tags are never removed, so render them once data has loaded. */} + + {compareTitle} + + + + + + + + + + + + + + + + + +
- {i18n.t("app.title")} - - - - - - - - - - - - - - - - - + {/* Server-rendered head tags are never removed, so render them once data has loaded. */} + + {i18n.t("app.title")} + + + + + + + + + + + + + + + + + +
diff --git a/packages/stats/app/src/routes/model-catalog.ts b/packages/stats/app/src/routes/model-catalog.ts index ae55eb55a85..868ea7fa20e 100644 --- a/packages/stats/app/src/routes/model-catalog.ts +++ b/packages/stats/app/src/routes/model-catalog.ts @@ -91,6 +91,10 @@ export function findModelCatalogLab(catalog: ModelCatalog, lab: string) { return catalog.labs.find((entry) => entry.id === id) } +export function catalogModelPath(entry: Pick) { + return `/data/${entry.lab}/${entry.slug}` +} + export function formatCatalogLabName(lab: string) { const known: Record = { alibaba: "Alibaba", diff --git a/packages/stats/app/src/routes/sitemap.xml.ts b/packages/stats/app/src/routes/sitemap.xml.ts index d3d8cf64c63..2234e3756bf 100644 --- a/packages/stats/app/src/routes/sitemap.xml.ts +++ b/packages/stats/app/src/routes/sitemap.xml.ts @@ -9,7 +9,7 @@ import { resolveComparisonFamily, } from "../lib/comparison-pages" import { baseUrl } from "../lib/language" -import { loadModelCatalog } from "./model-catalog" +import { catalogModelPath, findModelCatalogEntry, loadModelCatalog } from "./model-catalog" type SitemapEntry = { path: string @@ -55,7 +55,25 @@ export async function GET() { ] }), ) - const entries = uniqueSitemapEntries([{ path: "/data/compare", lastmod }, ...familyComparisons, ...modelComparisons]) + const labPages = catalog.labs.map((lab) => ({ + path: `/data/${lab.id}`, + lastmod: sitemapDate(stats?.updatedAt, ...lab.models.map((model) => model.lastUpdated ?? model.releaseDate)), + })) + // Skip entries whose URL resolves to another model, such as stats aliases. + const modelPages = [...catalog.models, ...(catalog.aliases ?? [])] + .filter((model) => findModelCatalogEntry(catalog, model.slug, model.lab)?.id === model.id) + .map((model) => ({ + path: catalogModelPath(model), + lastmod: sitemapDate(stats?.updatedAt, model.lastUpdated ?? model.releaseDate), + })) + const entries = uniqueSitemapEntries([ + { path: "/data/", lastmod: sitemapDate(stats?.updatedAt) }, + { path: "/data/compare", lastmod }, + ...labPages, + ...modelPages, + ...familyComparisons, + ...modelComparisons, + ]) return new Response(sitemapXml(entries), { headers: {