Migrate Hailo detector key and support hailo device (#24327)

* Migrate Hailo detector key and support hailo device

* Fix missing check

web/e2e/specs/settings/detection-models.spec.ts

@@ -49,9 +49,43 @@ const PLUS_MODEL = {
   height: 320,
 };
 
+// Frigate+ builds a Hailo model per device and names the detector by its
+// pre-rename key; /api/plus/models adds the current one before serving it
+const HAILO_PLUS_MODELS = [
+  {
+    ...PLUS_MODEL,
+    id: "hailo8l1",
+    supportedDetectors: ["hailo8l", "hailo"],
+    hailoDevice: "hailo8l",
+  },
+  {
+    ...PLUS_MODEL,
+    id: "hailo8r1",
+    supportedDetectors: ["hailo8l", "hailo"],
+    hailoDevice: "hailo8r",
+  },
+];
+
+const HAILO_HARDWARE = [
+  {
+    key: "hailo",
+    detector: "hailo",
+    name: "Hailo",
+    units: [{ device: "hailo:PCIe", label: "hailo0" }],
+    count: 1,
+    unlimited: true,
+  },
+];
+
 type SavedConfig = { config_data?: { models?: Model[] } };
 
-async function installRoutes(page: Page, models: Model[], plusEnabled = false) {
+async function installRoutes(
+  page: Page,
+  models: Model[],
+  plusEnabled = false,
+  plusModels: unknown[] = [PLUS_MODEL],
+  hailoHardware = false,
+) {
   const config = configFactory({
     models,
     plus: { enabled: plusEnabled },
@@ -70,8 +104,14 @@ async function installRoutes(page: Page, models: Model[], plusEnabled = false) {
     route.fulfill({ json: { models } }),
   );
   await page.route("**/api/plus/models", (route) =>
-    route.fulfill({ json: [PLUS_MODEL] }),
+    route.fulfill({ json: plusModels }),
   );
+
+  if (hailoHardware) {
+    await page.route("**/api/hardware/probe**", (route) =>
+      route.fulfill({ json: HAILO_HARDWARE }),
+    );
+  }
   await page.route("**/api/config/set", async (route) => {
     saves.push(route.request().postDataJSON() as SavedConfig);
     await route.fulfill({ json: { success: true, require_restart: false } });
@@ -262,6 +302,35 @@ test.describe("Detection models settings @high", () => {
     expect(saves.at(-1)?.config_data?.models?.[0].path).toBe("plus://abc123");
   });
 
+  test("a Frigate+ Hailo model is listed by the device it was built for", async ({
+    frigateApp,
+  }) => {
+    // every Hailo model supports the one hailo detector, so the detector name
+    // says nothing; which device it was built for is what the user picks on
+    await installRoutes(
+      frigateApp.page,
+      [{ scene: "all", devices: ["hailo:PCIe"], path: "/config/custom.hef" }],
+      true,
+      HAILO_PLUS_MODELS,
+      true,
+    );
+    await openPage(frigateApp);
+
+    await frigateApp.page.getByRole("tab", { name: "Frigate+" }).click();
+    await frigateApp.page.getByRole("combobox").last().click();
+
+    const options = frigateApp.page.getByRole("option");
+
+    await expect(options).toHaveCount(2);
+    await expect(options.first()).toContainText("hailo8l");
+    await expect(options.last()).toContainText("hailo8r");
+
+    // knowing which device is attached is left to the user, so neither is
+    // ruled out here
+    await expect(options.first()).not.toHaveAttribute("aria-disabled", "true");
+    await expect(options.last()).not.toHaveAttribute("aria-disabled", "true");
+  });
+
   test("a freshly opened page is not reported as modified", async ({
     frigateApp,
   }) => {

web/e2e/specs/system-health.spec.ts

@@ -422,7 +422,7 @@ test.describe("System — Health hardware pane @medium", () => {
     frigateApp,
   }) => {
     await frigateApp.installDefaults({
-      config: { models: [{ scene: "all", devices: ["hailo8l"] }] },
+      config: { models: [{ scene: "all", devices: ["hailo"] }] },
       stats: QUIET_STATS,
     });
     await frigateApp.goto("/system#health");
@@ -431,7 +431,7 @@ test.describe("System — Health hardware pane @medium", () => {
     await expect(row).toHaveAttribute("data-state", "error", {
       timeout: 15_000,
     });
-    await expect(row).toContainText("hailo8l was not found on this system");
+    await expect(row).toContainText("hailo was not found on this system");
   });
 
   test("a generic device the probe cannot enumerate is judged by its runtime", async ({

web/src/components/config-form/theme/fields/ModelSourcePicker.tsx

@@ -12,6 +12,7 @@ import {
 } from "@/components/ui/select";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import type { FrigateConfig } from "@/types/frigateConfig";
+import { describeSupportedDetectors } from "@/utils/plusModels";
 
 export type FrigatePlusModel = {
   id: string;
@@ -20,6 +21,8 @@ export type FrigatePlusModel = {
   trainDate: string;
   isBaseModel: boolean;
   supportedDetectors: string[];
+  // which Hailo device a Hailo model was built for, absent on every other model
+  hailoDevice?: string;
   width: number;
   height: number;
 };
@@ -152,7 +155,7 @@ export function ModelSourcePicker({
                     <div>{describe(model)}</div>
                     <div className="text-xs text-muted-foreground">
                       {t("frigatePlus.modelInfo.supportedDetectors")}:{" "}
-                      {model.supportedDetectors.join(", ")}
+                      {describeSupportedDetectors(model)}
                     </div>
                   </SelectItem>
                 ))

web/src/types/frigateConfig.ts

@@ -429,6 +429,8 @@ export type DetectionModelConfig = {
     baseModel: string;
     isBaseModel: boolean;
     supportedDetectors: string[];
+    // which Hailo device a Hailo model was built for, absent on every other model
+    hailoDevice?: string;
     width: number;
     height: number;
   } | null;

web/src/utils/health.ts

@@ -55,7 +55,7 @@ export function runnerNames(models: DetectionModelConfig[]): string[] {
 export const PROBED_DETECTORS = new Set([
   "cpu",
   "edgetpu",
-  "hailo8l",
+  "hailo",
   "memryx",
   "openvino",
   "onnx",

web/src/utils/plusModels.ts

@@ -0,0 +1,17 @@
+/** Matching Frigate+ models against the hardware that can run them. */
+
+type PlusModel = {
+  supportedDetectors: string[];
+  // which Hailo device a Hailo model was built for, absent on every other model
+  hailoDevice?: string;
+};
+
+/**
+ * The detectors to show for a model.
+ *
+ * Every Hailo model supports the one hailo detector, so the device it was
+ * built for is what the user needs to see.
+ */
+export function describeSupportedDetectors(model: PlusModel): string {
+  return model.hailoDevice ?? model.supportedDetectors.join(", ");
+}

web/src/views/settings/components/FrigatePlusCurrentModelSummary.tsx

@@ -5,6 +5,7 @@ import {
 } from "@/components/card/SettingsGroupCard";
 import type { DetectionModelConfig } from "@/types/frigateConfig";
 import { useTranslation } from "react-i18next";
+import { describeSupportedDetectors } from "@/utils/plusModels";
 
 type FrigatePlusCurrentModelSummaryProps = {
   plusModel: DetectionModelConfig["plus"];
@@ -61,7 +62,7 @@ export default function FrigatePlusCurrentModelSummary({
           />
           <SplitCardRow
             label={t("frigatePlus.modelInfo.supportedDetectors")}
-            content={<p>{plusModel.supportedDetectors.join(", ")}</p>}
+            content={<p>{describeSupportedDetectors(plusModel)}</p>}
           />
         </div>
       )}