Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently serialize neural network data (#2224)

Browse Source
This commit is contained in:
Gold856
2025-12-07 18:45:14 -05:00
committed by GitHub
parent 192e2a115c
commit 6285f1ee24
3 changed files with 50 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
photon-server/src/main/java/org/photonvision/server/RequestHandler.java
View File

@@ -850,33 +850,30 @@ public class RequestHandler {
}
}
private record DeleteObjectDetectionModelRequest(String modelPath) {}
private record DeleteObjectDetectionModelRequest(Path modelPath) {}
public static void onDeleteObjectDetectionModelRequest(Context ctx) {
logger.info("Deleting object detection model");
Path modelPath;
try {
DeleteObjectDetectionModelRequest request =
JacksonUtils.deserialize(ctx.body(), DeleteObjectDetectionModelRequest.class);
modelPath = Path.of(request.modelPath.substring(7));
if (modelPath == null) {
if (request.modelPath == null) {
ctx.status(400);
ctx.result("The provided model path was malformed");
logger.error("The provided model path was malformed");
return;
}
if (!modelPath.toFile().exists()) {
if (!request.modelPath.toFile().exists()) {
ctx.status(400);
ctx.result("The provided model path does not exist");
logger.error("The provided model path does not exist");
return;
}
if (!modelPath.toFile().delete()) {
if (!request.modelPath.toFile().delete()) {
ctx.status(500);
ctx.result("Unable to delete the model file");
logger.error("Unable to delete the model file");
@@ -886,7 +883,7 @@ public class RequestHandler {
if (!ConfigManager.getInstance()
.getConfig()
.neuralNetworkPropertyManager()
.removeModel(modelPath)) {
.removeModel(request.modelPath)) {
ctx.status(400);
ctx.result("The model's information was not found in the config");
logger.error("The model's information was not found in the config");
@@ -910,26 +907,24 @@ public class RequestHandler {
UIPhotonConfiguration.programStateToUi(ConfigManager.getInstance().getConfig())));
}
private record RenameObjectDetectionModelRequest(String modelPath, String newName) {}
private record RenameObjectDetectionModelRequest(Path modelPath, String newName) {}
public static void onRenameObjectDetectionModelRequest(Context ctx) {
try {
RenameObjectDetectionModelRequest request =
JacksonUtils.deserialize(ctx.body(), RenameObjectDetectionModelRequest.class);
Path modelPath = Path.of(request.modelPath);
if (modelPath == null) {
if (request.modelPath == null) {
ctx.status(400);
ctx.result("The provided model path was malformed");
logger.error("The provided model path was malformed");
return;
}
if (!modelPath.toFile().exists()) {
if (!request.modelPath.toFile().exists()) {
ctx.status(400);
ctx.result("The provided model path does not exist");
logger.error("The model path: " + modelPath + " does not exist");
logger.error("The model path: " + request.modelPath + " does not exist");
return;
}
@@ -943,7 +938,7 @@ public class RequestHandler {
if (!ConfigManager.getInstance()
.getConfig()
.neuralNetworkPropertyManager()
.renameModel(modelPath, request.newName)) {
.renameModel(request.modelPath, request.newName)) {
ctx.status(400);
ctx.result("The model's information was not found in the config");
logger.error("The model's information was not found in the config");