move quantization check to constructor

Author: boomermath

photon-core/src/main/java/org/photonvision/vision/objects/ObjectDetector.java

@@ -57,11 +57,4 @@ public interface ObjectDetector extends Releasable {
      *     empty list if the detector is not initialized or if no objects are detected.
      */
     public List<NeuralNetworkPipeResult> detect(Mat in, double nmsThresh, double boxThresh);
-
-    /**
-     * Checks if the model is quantized
-     *
-     * @return true if the model is quantized, false if not
-     */
-    public boolean isQuantized();
 }

photon-core/src/main/java/org/photonvision/vision/objects/RknnObjectDetector.java

@@ -74,6 +74,8 @@ public RknnObjectDetector(RknnModel model, Size inputSize) {
         if (objPointer <= 0) {
             throw new RuntimeException(
                     "Failed to create detector from path " + model.modelFile.getPath());
+        } else if (!RknnJNI.isQuantized(objPointer)) {
+            throw new UnsupportedOperationException("Model must be quantized.");
         }
 
         logger.debug("Created detector for model " + model.modelFile.getName());
@@ -133,11 +135,6 @@ public List<NeuralNetworkPipeResult> detect(Mat in, double nmsThresh, double box
                         .toList());
     }
 
-    @Override
-    public boolean isQuantized() {
-        return RknnJNI.isQuantized(objPointer);
-    }
-
     /** Thread-safe method to release the detector. */
     @Override
     public void release() {

photon-core/src/main/java/org/photonvision/vision/objects/RubikObjectDetector.java

@@ -80,6 +80,8 @@ public RubikObjectDetector(RubikModel model, Size inputSize) {
                             + ". Please ensure the model is valid and compatible with the Rubik backend.");
             throw new RuntimeException(
                     "Failed to create detector from path " + model.modelFile.getPath());
+        } else if (!RubikJNI.isQuantized(ptr)) {
+            throw new UnsupportedOperationException("Model must be quantized.");
         }
 
         logger.debug("Created detector for model " + model.modelFile.getName());
@@ -140,12 +142,6 @@ public List<NeuralNetworkPipeResult> detect(Mat in, double nmsThresh, double box
                         .toList());
     }
 
-    // TODO: replace with actual quantization check
-    @Override
-    public boolean isQuantized() {
-        return true;
-    }
-
     /** Thread-safe method to release the detector. */
     @Override
     public void release() {

photon-server/src/main/java/org/photonvision/server/RequestHandler.java

@@ -680,13 +680,7 @@ public static void onImportObjectDetectionModelRequest(Context ctx) {
                             case RUBIK -> new RubikModel(modelProperties).load();
                             case RKNN -> new RknnModel(modelProperties).load();
                         };
-
-                if (!objDetector.isQuantized()) {
-                    ctx.status(400);
-                    ctx.result("Failed to load object detection model: model must be quantized!");
-                    return;
-                }
-            } catch (Exception e) {
+            } 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);