| {{ model.nickname }} |
{{ model.labels.join(", ") }} |
diff --git a/photon-client/tests/fixtures.ts b/photon-client/tests/fixtures.ts
new file mode 100644
index 000000000..b5bedca41
--- /dev/null
+++ b/photon-client/tests/fixtures.ts
@@ -0,0 +1,16 @@
+import { test as base } from "@playwright/test";
+import axios from "axios";
+
+export const test = base.extend({
+ page: async ({ page }, use) => {
+ // Use the page in the test (no per-test backend reset here)
+ axios.defaults.baseURL = "http://localhost:5800/api/test";
+ await use(page);
+ }
+});
+
+test.beforeAll(async () => {
+ console.log("Running before all tests: Resetting backend state...");
+ await axios.post("http://localhost:5800/api/test/resetBackend");
+ await axios.post("http://localhost:5800/api/test/activateTestMode");
+});
diff --git a/photon-client/tests/global-setup.ts b/photon-client/tests/global-setup.ts
new file mode 100644
index 000000000..cfb7a590e
--- /dev/null
+++ b/photon-client/tests/global-setup.ts
@@ -0,0 +1,7 @@
+async function globalSetup() {
+ // You can perform global setup tasks here, such as starting a server or setting environment variables
+ const path = await import("path");
+ process.env.TESTS_DIR = path.resolve(process.cwd());
+}
+
+export default globalSetup;
diff --git a/photon-client/tests/platformDependent/od.spec.ts b/photon-client/tests/platformDependent/od.spec.ts
new file mode 100644
index 000000000..2ac32a194
--- /dev/null
+++ b/photon-client/tests/platformDependent/od.spec.ts
@@ -0,0 +1,79 @@
+import { expect } from "@playwright/test";
+import { test } from "../fixtures";
+import axios from "axios";
+import path from "path";
+
+const fakeModelName = "FAKE-MODEL";
+const fakeLabels = "test, 1, woof";
+const newModelName = "foo-bar";
+const platforms = ["LINUX_RK3588_64", "LINUX_QCS6490"];
+
+for (const platform of platforms) {
+ test.describe(`Platform: ${platform}`, () => {
+ test.beforeEach(async ({ page }) => {
+ await page.goto("/#/settings");
+ await axios.post("/override/platform", { platform: platform });
+ await page.reload();
+ });
+
+ test("testSettingsPage", async ({ page }) => {
+ if (platform.endsWith("RK3588_64")) {
+ await expect(page.getByRole("main")).toContainText("Linux AARCH 64-bit with RK3588");
+ } else if (platform.endsWith("QCS6490")) {
+ await expect(page.getByRole("main")).toContainText("Linux AARCH 64-bit with QCS6490");
+ }
+ await expect(page.getByText("Object Detection")).toBeVisible();
+ });
+
+ test("Upload model", async ({ page }) => {
+ const testsDir = process.env.TESTS_DIR;
+ if (!testsDir) {
+ throw new Error("TESTS_DIR is not set");
+ }
+
+ await page.getByRole("button", { name: "Import Model" }).click();
+ await page.getByRole("textbox", { name: "Labels" }).fill(fakeLabels);
+ await page.getByRole("spinbutton", { name: "Width" }).fill("640");
+ await page.getByRole("spinbutton", { name: "Height" }).fill("640");
+ await page.getByTestId("import-version-select").click();
+ await page.getByRole("option", { name: "YOLOv8" }).click();
+
+ const modelFile = platform.endsWith("RK3588_64") ? `${fakeModelName}.rknn` : `${fakeModelName}.tflite`;
+ await page
+ .getByRole("button", { name: "Model File Model File" })
+ .setInputFiles(path.join(testsDir, "tests/resources", modelFile));
+
+ await page.getByRole("button", { name: "Import Object Detection Model" }).click();
+
+ await page.goto("/#/settings");
+ const tableRow = page.getByTestId("model-table").locator("tr", { hasText: fakeModelName });
+
+ await expect(tableRow).toBeVisible();
+ await expect(tableRow).toContainText(fakeLabels);
+ });
+
+ test("Rename model", async ({ page }) => {
+ const tableRow = page.getByTestId("model-table").locator("tr", { hasText: fakeModelName });
+
+ await tableRow.getByRole("button", { name: "Rename Model" }).click();
+ await page.getByRole("textbox", { name: "New Name New Name" }).fill(newModelName);
+ await page.getByRole("button", { name: "Rename", exact: true }).click();
+
+ await page.reload();
+
+ const renamedRow = page.getByTestId("model-table").locator("tr", { hasText: newModelName });
+ await expect(renamedRow).toContainText(fakeLabels);
+ });
+
+ test("Delete model", async ({ page }) => {
+ const tableRow = page.getByTestId("model-table").locator("tr", { hasText: newModelName });
+
+ await tableRow.getByRole("button", { name: "Delete Model" }).click();
+ await page.getByRole("button", { name: "Delete model", exact: true }).click();
+
+ await page.reload();
+ const deletedRow = page.getByTestId("model-table").locator("tr", { hasText: newModelName });
+ await expect(deletedRow).toHaveCount(0);
+ });
+ });
+}
diff --git a/photon-client/tests/resources/FAKE-MODEL.rknn b/photon-client/tests/resources/FAKE-MODEL.rknn
new file mode 100644
index 000000000..e69de29bb
diff --git a/photon-client/tests/resources/FAKE-MODEL.tflite b/photon-client/tests/resources/FAKE-MODEL.tflite
new file mode 100644
index 000000000..e69de29bb
diff --git a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java
index d1063ded4..6b789402e 100644
--- a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java
+++ b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java
@@ -212,12 +212,23 @@ public class NeuralNetworkModelManager {
}
/**
- * Returns the singleton instance of the NeuralNetworkModelManager
+ * Returns the singleton instance of the NeuralNetworkModelManager. Call getInstance() to use the
+ * default (no reset), or getInstance(true) to reset.
*
* @return The singleton instance
*/
public static NeuralNetworkModelManager getInstance() {
- if (INSTANCE == null) {
+ return getInstance(false);
+ }
+
+ /**
+ * Returns the singleton instance of the NeuralNetworkModelManager, optionally resetting it.
+ *
+ * @param reset If true, resets the instance
+ * @return The singleton instance
+ */
+ public static NeuralNetworkModelManager getInstance(boolean reset) {
+ if (INSTANCE == null || reset) {
INSTANCE = new NeuralNetworkModelManager();
}
return INSTANCE;
diff --git a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
index 67b60070a..b655cb656 100644
--- a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
+++ b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
@@ -74,6 +74,12 @@ public class RequestHandler {
private static final ObjectMapper kObjectMapper = new ObjectMapper();
+ private static boolean testMode = false;
+
+ public static void setTestMode(boolean isTestMode) {
+ testMode = isTestMode;
+ }
+
private record CommonCameraUniqueName(String cameraUniqueName) {}
public static void onSettingsImportRequest(Context ctx) {
@@ -662,35 +668,36 @@ public class RequestHandler {
ModelProperties modelProperties =
new ModelProperties(modelPath, nickname, labels, width, height, family, version);
- ObjectDetector objDetector = null;
-
- try {
- objDetector =
- switch (family) {
- case RUBIK -> new RubikModel(modelProperties).load();
- case RKNN -> new RknnModel(modelProperties).load();
- };
- } catch (RuntimeException e) {
- ctx.status(400);
- ctx.result("Failed to load object detection model: " + e.getMessage());
+ if (!testMode) {
+ ObjectDetector objDetector = null;
try {
- Files.deleteIfExists(modelPath);
- } catch (IOException ex) {
- e.addSuppressed(ex);
- }
+ objDetector =
+ switch (family) {
+ case RUBIK -> new RubikModel(modelProperties).load();
+ case RKNN -> new RknnModel(modelProperties).load();
+ };
+ } catch (RuntimeException e) {
+ ctx.status(400);
+ ctx.result("Failed to load object detection model: " + e.getMessage());
- logger.error("Failed to load object detection model", e);
- return;
- } finally {
- // this finally block will run regardless of what happens in try/catch
- // please see https://docs.oracle.com/javase/tutorial/essential/exceptions/finally.html
- // for a summary on how finally works
- if (objDetector != null) {
- objDetector.release();
+ try {
+ Files.deleteIfExists(modelPath);
+ } catch (IOException ex) {
+ e.addSuppressed(ex);
+ }
+
+ logger.error("Failed to load object detection model", e);
+ return;
+ } finally {
+ // this finally block will run regardless of what happens in try/catch
+ // please see https://docs.oracle.com/javase/tutorial/essential/exceptions/finally.html
+ // for a summary on how finally works
+ if (objDetector != null) {
+ objDetector.release();
+ }
}
}
-
ConfigManager.getInstance()
.getConfig()
.neuralNetworkPropertyManager()
diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java
index ec54caf25..ee2922c26 100644
--- a/photon-server/src/main/java/org/photonvision/server/Server.java
+++ b/photon-server/src/main/java/org/photonvision/server/Server.java
@@ -162,6 +162,13 @@ public class Server {
app.post("/api/objectdetection/rename", RequestHandler::onRenameObjectDetectionModelRequest);
app.post("/api/objectdetection/nuke", RequestHandler::onNukeObjectDetectionModelsRequest);
+ /* Testing API Events */
+
+ app.post("/api/test/resetBackend", TestRequestHandler::handleResetRequest);
+
+ app.post("/api/test/activateTestMode", TestRequestHandler::testMode);
+ app.post("/api/test/override/platform", TestRequestHandler::handlePlatformOverrideRequest);
+
app.start(port);
}
diff --git a/photon-server/src/main/java/org/photonvision/server/TestRequestHandler.java b/photon-server/src/main/java/org/photonvision/server/TestRequestHandler.java
new file mode 100644
index 000000000..6f888c78a
--- /dev/null
+++ b/photon-server/src/main/java/org/photonvision/server/TestRequestHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) Photon Vision.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.photonvision.server;
+
+import io.javalin.http.Context;
+import org.photonvision.common.configuration.ConfigManager;
+import org.photonvision.common.configuration.NeuralNetworkModelManager;
+import org.photonvision.common.hardware.Platform;
+import org.photonvision.common.logging.LogGroup;
+import org.photonvision.common.logging.Logger;
+import org.photonvision.common.util.file.JacksonUtils;
+
+public class TestRequestHandler {
+ // Treat all 2XX calls as "INFO"
+ // Treat all 4XX calls as "ERROR"
+ // Treat all 5XX calls as "ERROR"
+
+ static Logger logger = new Logger(TestRequestHandler.class, LogGroup.WebServer);
+
+ public static void handleResetRequest(Context ctx) {
+ logger.info("Resetting Backend");
+ // Reset backend
+ ConfigManager.nukeConfigDirectory();
+ ConfigManager.getInstance().load();
+ }
+
+ private record PlatformOverrideRequest(Platform platform) {}
+
+ public static void handlePlatformOverrideRequest(Context ctx) {
+ try {
+ PlatformOverrideRequest request =
+ JacksonUtils.deserialize(ctx.body(), PlatformOverrideRequest.class);
+ Platform platform = request.platform();
+ logger.info("Overriding platform to: " + platform);
+
+ Platform.overridePlatform(platform);
+ NeuralNetworkModelManager.getInstance(true).extractModels();
+ NeuralNetworkModelManager.getInstance().discoverModels();
+ ctx.status(200);
+
+ } catch (Exception e) {
+ logger.error("Failed to parse platform override request: " + e.getMessage());
+ ctx.status(400).result("Invalid request");
+ }
+ }
+
+ public static void testMode(Context ctx) {
+ logger.info("Test mode activated");
+ RequestHandler.setTestMode(true);
+ ctx.status(200).result("Test mode activated");
+ }
+}
diff --git a/photon-targeting/src/main/java/org/photonvision/common/hardware/Platform.java b/photon-targeting/src/main/java/org/photonvision/common/hardware/Platform.java
index efe06760e..1080f40ab 100644
--- a/photon-targeting/src/main/java/org/photonvision/common/hardware/Platform.java
+++ b/photon-targeting/src/main/java/org/photonvision/common/hardware/Platform.java
@@ -102,7 +102,8 @@ public enum Platform {
public final boolean isSupported;
// Set once at init, shouldn't be needed after.
- private static final Platform currentPlatform = getCurrentPlatform();
+ private static Platform currentPlatform = getCurrentPlatform();
+ private static boolean override = false;
Platform(
String description,
@@ -119,6 +120,11 @@ public enum Platform {
this.nativeLibraryFolderName = nativeLibFolderName;
}
+ public static void overridePlatform(Platform platform) {
+ currentPlatform = platform;
+ override = true;
+ }
+
//////////////////////////////////////////////////////
// Public API
@@ -128,14 +134,15 @@ public enum Platform {
}
public static boolean isRK3588() {
- return Platform.isOrangePi()
+ return currentPlatform == LINUX_RK3588_64
+ || Platform.isOrangePi()
|| Platform.isCoolPi4b()
|| Platform.isRock5C()
|| fileHasText("/proc/device-tree/compatible", "rk3588");
}
public static boolean isQCS6490() {
- return isRubik();
+ return currentPlatform == LINUX_QCS6490 || Platform.isRubik();
}
public static boolean isRaspberryPi() {
@@ -167,6 +174,11 @@ public enum Platform {
return runRobotFile.exists();
}
+ public static boolean isWindows() {
+ var p = getCurrentPlatform();
+ return (p == WINDOWS_32 || p == WINDOWS_64);
+ }
+
//////////////////////////////////////////////////////
// Debug info related to unknown platforms for debug help
@@ -177,6 +189,10 @@ public enum Platform {
private static final String UnknownDeviceModelString = "Unknown";
public static Platform getCurrentPlatform() {
+ if (override) {
+ return currentPlatform;
+ }
+
String OS_NAME;
if (Platform.OS_NAME != null) {
OS_NAME = Platform.OS_NAME;
@@ -319,9 +335,4 @@ public enum Platform {
return false;
}
}
-
- public static boolean isWindows() {
- var p = getCurrentPlatform();
- return (p == WINDOWS_32 || p == WINDOWS_64);
- }
}