Merge pull request #5132 from voxel51/feat/extend-array-deserialization

extend compatibility of array deserialization in lookers
voxel51 · Nov 16, 2024 · 9a13da7 · 9a13da7
2 parents e0c22fd + deaf55b
commit 9a13da7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/app/packages/looker/src/overlays/segmentation.ts b/app/packages/looker/src/overlays/segmentation.ts
@@ -273,7 +273,7 @@ export default class SegmentationOverlay<State extends BaseState>
   private getTarget(state: Readonly<State>): number {
     const index = this.getIndex(state);
 
-    if (index < 0) {
+    if (index < 0 || !this.targets || index >= this.targets.length) {
       return null;
     }
     return this.targets[index];

diff --git a/app/packages/looker/src/worker/deserializer.ts b/app/packages/looker/src/worker/deserializer.ts
@@ -1,9 +1,24 @@
 import { deserialize } from "../numpy";
 
+const extractSerializedMask = (
+  label: object,
+  maskProp: string
+): string | undefined => {
+  if (typeof label?.[maskProp] === "string") {
+    return label[maskProp];
+  } else if (typeof label?.[maskProp]?.$binary?.base64 === "string") {
+    return label[maskProp].$binary.base64;
+  }
+
+  return undefined;
+};
+
 export const DeserializerFactory = {
   Detection: (label, buffers) => {
-    if (typeof label?.mask === "string") {
-      const data = deserialize(label.mask);
+    const serializedMask = extractSerializedMask(label, "mask");
+
+    if (serializedMask) {
+      const data = deserialize(serializedMask);
       const [height, width] = data.shape;
       label.mask = {
         data,
@@ -20,8 +35,10 @@ export const DeserializerFactory = {
     }
   },
   Heatmap: (label, buffers) => {
-    if (typeof label?.map === "string") {
-      const data = deserialize(label.map);
+    const serializedMask = extractSerializedMask(label, "map");
+
+    if (serializedMask) {
+      const data = deserialize(serializedMask);
       const [height, width] = data.shape;
 
       label.map = {
@@ -34,8 +51,10 @@ export const DeserializerFactory = {
     }
   },
   Segmentation: (label, buffers) => {
-    if (typeof label?.mask === "string") {
-      const data = deserialize(label.mask);
+    const serializedMask = extractSerializedMask(label, "mask");
+
+    if (serializedMask) {
+      const data = deserialize(serializedMask);
       const [height, width] = data.shape;
 
       label.mask = {