Remove cal images if needed and bump http request size

PhotonVision · Mar 22, 2024 · 6e18c45 · 6e18c45
1 parent 15da06b
commit 6e18c45
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/photon-client/src/components/cameras/CameraCalibrationInfoCard.vue b/photon-client/src/components/cameras/CameraCalibrationInfoCard.vue
@@ -4,6 +4,8 @@ import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
 import { useStateStore } from "@/stores/StateStore";
 import { computed, inject, ref } from "vue";
 import { getResolutionString, parseJsonFile } from "@/lib/PhotonUtils";
+import axios from "axios";
+import loadingImage from "@/assets/images/loading.svg";
 
 const props = defineProps<{
   videoFormat: VideoFormat;
@@ -36,13 +38,36 @@ const importCalibration = async () => {
     return;
   }
 
+  let message: any = undefined;
+
+  // check size and trim if we have to
+  let approxSizeMb = uploadedJson.size / 1e6;
+  if (approxSizeMb > 50) {
+    data.observations.map((it) => (it.snapshotData = undefined));
+
+    // so at this point the calibration is likely pretty small -- it's cheap enough to check though
+    approxSizeMb = JSON.stringify(data).length / 1e6;
+
+    if (approxSizeMb > 50) {
+      // Absolutely monster dataset, try trimming again
+      data.observations = [];
+    }
+
+    message = {
+      color: "warning",
+      message: `The calibration file was very large (~${approxSizeMb.toFixed(0)}MB) -- images were removed to save space!`,
+      timeout: 10000
+    };
+  }
+
   useCameraSettingsStore()
     .importCalibrationFromData({ calibration: data })
     .then((response) => {
-      useStateStore().showSnackbarMessage({
+      message = message || {
         color: "success",
         message: response.data.text || response.data
-      });
+      };
+      useStateStore().showSnackbarMessage(message);
     })
     .catch((error) => {
       if (error.response) {
@@ -256,7 +281,12 @@ const calibrationImageURL = (index: number) =>
         <template #expanded-item="{ headers, item }">
           <td :colspan="headers.length">
             <div style="display: flex; justify-content: center; width: 100%">
-              <img :src="calibrationImageURL(item.index)" alt="observation image" class="snapshot-preview pt-2 pb-2" />
+              <v-img
+                :src="calibrationImageURL(item.index)"
+                :lazy-src="loadingImage"
+                alt="observation image"
+                class="snapshot-preview pt-2 pb-2"
+              />
             </div>
           </td>
         </template>

diff --git a/photon-client/src/types/SettingTypes.ts b/photon-client/src/types/SettingTypes.ts
@@ -131,7 +131,7 @@ export interface BoardObservation {
   optimisedCameraToObject: Pose3d;
   includeObservationInCalibration: boolean;
   snapshotName: string;
-  snapshotData: JsonImageMat;
+  snapshotData?: JsonImageMat;
 }
 
 export interface CameraCalibrationResult {

diff --git a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
@@ -604,7 +604,9 @@ public static void onCalibrationSnapshotRequest(Context ctx) {
                         .findFirst()
                         .orElse(null);
 
-        if (calList == null || calList.observations.size() < observationIdx) {
+        if (calList == null
+                || calList.observations.size() < observationIdx
+                || calList.observations.get(observationIdx).snapshotData == null) {
             ctx.status(404);
             return;
         }

diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java
@@ -67,7 +67,7 @@ private static void start(int port) {
 
                             // Increase the upload size limit (arbitrary, but need to be able to deal with large
                             // calibration JSONs)
-                            javalinConfig.http.maxRequestSize = (long) (50 * 1e6);
+                            javalinConfig.http.maxRequestSize = (long) (100 * 1e6);
 
                             javalinConfig.requestLogger.http(
                                     (ctx, ms) -> {