Fetch boolean data from h5grove as binary

silx-kit · Sep 2, 2024 · 1f6929c · 1f6929c
1 parent ac0b148
commit 1f6929c
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 46 deletions.
diff --git a/packages/app/src/providers/h5grove/__snapshots__/h5grove-api.test.ts.snap b/packages/app/src/providers/h5grove/__snapshots__/h5grove-api.test.ts.snap
@@ -1431,6 +1431,11 @@ exports[`test file matches snapshot 1`] = `
               "size": 64,
             },
             "bool": {
+              "base": {
+                "class": "Integer",
+                "endianness": "little-endian",
+                "size": 8,
+              },
               "class": "Boolean",
             },
             "cplx": {
@@ -1605,6 +1610,11 @@ exports[`test file matches snapshot 1`] = `
     },
     "shape": null,
     "type": {
+      "base": {
+        "class": "Integer (unsigned)",
+        "endianness": "little-endian",
+        "size": 8,
+      },
       "class": "Boolean",
     },
     "value": null,
@@ -1629,9 +1639,14 @@ exports[`test file matches snapshot 1`] = `
     },
     "shape": [],
     "type": {
+      "base": {
+        "class": "Integer",
+        "endianness": "little-endian",
+        "size": 8,
+      },
       "class": "Boolean",
     },
-    "value": false,
+    "value": 0,
   },
   {
     "name": "bool_true_scalar",
@@ -1653,9 +1668,14 @@ exports[`test file matches snapshot 1`] = `
     },
     "shape": [],
     "type": {
+      "base": {
+        "class": "Integer",
+        "endianness": "little-endian",
+        "size": 8,
+      },
       "class": "Boolean",
     },
-    "value": true,
+    "value": 1,
   },
   {
     "name": "bool_2D",
@@ -1680,17 +1700,22 @@ exports[`test file matches snapshot 1`] = `
       4,
     ],
     "type": {
+      "base": {
+        "class": "Integer",
+        "endianness": "little-endian",
+        "size": 8,
+      },
       "class": "Boolean",
     },
-    "value": [
-      true,
-      false,
-      true,
-      true,
-      false,
-      false,
-      true,
-      false,
+    "value": Int8Array [
+      1,
+      0,
+      1,
+      1,
+      0,
+      0,
+      1,
+      0,
     ],
   },
   {

diff --git a/packages/app/src/providers/h5grove/utils.test.ts b/packages/app/src/providers/h5grove/utils.test.ts
@@ -89,10 +89,10 @@ describe('parseDType', () => {
       parseDType({
         class: 8,
         size: 2,
-        base: { class: 0, size: 1, order: 0, sign: 0 },
+        base: { class: 0, size: 1, order: 0, sign: 1 },
         members: { FALSE: 0, TRUE: 1 },
       }),
-    ).toStrictEqual(boolType());
+    ).toStrictEqual(boolType(intType(8)));
   });
 
   it('should convert array types', () => {

diff --git a/packages/app/src/providers/hsds/utils.test.ts b/packages/app/src/providers/hsds/utils.test.ts
@@ -130,7 +130,7 @@ describe('convertHsdsType', () => {
       mapping: { FALSE: 0, TRUE: 1 },
     };
 
-    expect(convertHsdsType(boolEnum)).toStrictEqual(boolType());
+    expect(convertHsdsType(boolEnum)).toStrictEqual(boolType(intType(8)));
   });
 
   it('should convert the complex compound type into Complex type', () => {

diff --git a/packages/app/src/providers/mock/mock-file.ts b/packages/app/src/providers/mock/mock-file.ts
@@ -114,7 +114,7 @@ export function makeMockFile(): GroupWithChildren {
             string: strType(),
             int: intType(),
             float: floatType(),
-            bool: boolType(),
+            bool: boolType(intType(8)),
             complex: cplxType(floatType()),
           }),
         }),
@@ -127,7 +127,7 @@ export function makeMockFile(): GroupWithChildren {
             string: strType(),
             int: intType(),
             float: floatType(),
-            bool: boolType(),
+            bool: boolType(intType(8)),
             complex: cplxType(floatType()),
           }),
         }),

diff --git a/packages/app/src/providers/utils.ts b/packages/app/src/providers/utils.ts
@@ -1,4 +1,4 @@
-import { isEnumType, isNumericType } from '@h5web/shared/guards';
+import { isBoolType, isEnumType, isNumericType } from '@h5web/shared/guards';
 import type {
   ArrayShape,
   Dataset,
@@ -8,13 +8,14 @@ import type {
 import { DTypeClass } from '@h5web/shared/hdf5-models';
 import type { OnProgress } from '@h5web/shared/react-suspense-fetch';
 import type { AxiosProgressEvent } from 'axios';
+import { isAxiosError } from 'axios';
 
 import type { DataProviderApi } from './api';
 
 export const CANCELLED_ERROR_MSG = 'Request cancelled';
 
 export function typedArrayFromDType(dtype: DType) {
-  if (isEnumType(dtype)) {
+  if (isEnumType(dtype) || isBoolType(dtype)) {
     return typedArrayFromDType(dtype.base);
   }
 
@@ -72,7 +73,7 @@ export async function getValueOrError(
   try {
     return await api.getValue({ dataset });
   } catch (error) {
-    return error;
+    return isAxiosError(error) ? error.message : error;
   }
 }
 

diff --git a/packages/app/src/vis-packs/core/visualizations.test.ts b/packages/app/src/vis-packs/core/visualizations.test.ts
@@ -34,17 +34,17 @@ const scalarInt = dataset('int', intType(), []);
 const scalarUint = dataset('uint', uintType(), []);
 const scalarFloat = dataset('float', floatType(), []);
 const scalarStr = dataset('float', strType(), []);
-const scalarBool = dataset('bool', boolType(), []);
+const scalarBool = dataset('bool', boolType(intType(8)), []);
 const scalarCplx = dataset('cplx', cplxType(floatType()), []);
 const scalarCompound = dataset('comp', compoundType({ int: intType() }), []);
 const oneDInt = dataset('int_1d', intType(), [5]);
 const oneDUint = dataset('uint_1d', uintType(), [5]);
-const oneDBool = dataset('bool_1d', boolType(), [3]);
+const oneDBool = dataset('bool_1d', boolType(intType(8)), [3]);
 const oneDCplx = dataset('cplx_1d', cplxType(floatType()), [10]);
 const oneDCompound = dataset('comp_1d', compoundType({ int: intType() }), [5]);
 const twoDInt = dataset('int_2d', intType(), [5, 3]);
 const twoDUint = dataset('uint_2d', uintType(), [5, 3]);
-const twoDBool = dataset('bool_2d', boolType(), [3, 2]);
+const twoDBool = dataset('bool_2d', boolType(intType(8)), [3, 2]);
 const twoDCplx = dataset('cplx_2d', cplxType(floatType()), [2, 2]);
 const twoDStr = dataset('str_2d', strType(), [5, 3]);
 const threeDFloat = dataset('float_3d', intType(), [5, 3, 1]);

diff --git a/packages/lib/src/vis/matrix/MatrixVis.tsx b/packages/lib/src/vis/matrix/MatrixVis.tsx
@@ -1,7 +1,11 @@
-import type { ArrayValue, Primitive } from '@h5web/shared/hdf5-models';
+import type {
+  ArrayValue,
+  Primitive,
+  PrintableType,
+} from '@h5web/shared/hdf5-models';
 import type { NdArray } from 'ndarray';
 
-import type { ClassStyleAttrs, PrintableType } from '../models';
+import type { ClassStyleAttrs } from '../models';
 import GridProvider from './context';
 import Grid from './Grid';
 

diff --git a/packages/lib/src/vis/models.ts b/packages/lib/src/vis/models.ts
@@ -1,9 +1,3 @@
-import type {
-  BooleanType,
-  ComplexType,
-  NumericType,
-  StringType,
-} from '@h5web/shared/hdf5-models';
 import type {
   AxisScaleType,
   ColorScaleType,
@@ -87,12 +81,6 @@ export interface AxisParams {
 
 export type Coords = [x: number, y: number];
 
-export type PrintableType =
-  | BooleanType
-  | NumericType
-  | ComplexType
-  | StringType;
-
 export interface HistogramParams {
   values: NumArray;
   bins: NumArray;

diff --git a/packages/shared/src/hdf5-models.ts b/packages/shared/src/hdf5-models.ts
@@ -134,10 +134,6 @@ export type DType =
   | ReferenceType
   | UnknownType;
 
-export interface BooleanType {
-  class: DTypeClass.Bool;
-}
-
 export interface NumericType {
   class: DTypeClass.Integer | DTypeClass.Unsigned | DTypeClass.Float;
   size: number;
@@ -172,6 +168,11 @@ export interface ArrayType<T extends DType = DType> {
   dims?: number[];
 }
 
+export interface BooleanType {
+  class: DTypeClass.Bool;
+  base: NumericType; // typically int8 with h5py
+}
+
 export interface EnumType {
   class: DTypeClass.Enum;
   base: NumericType; // technically, only int/uint

diff --git a/packages/shared/src/hdf5-utils.ts b/packages/shared/src/hdf5-utils.ts
@@ -98,10 +98,6 @@ export function strType(
   };
 }
 
-export function boolType(): BooleanType {
-  return { class: DTypeClass.Bool };
-}
-
 export function cplxType(
   realType: NumericType,
   imagType = realType,
@@ -155,6 +151,10 @@ export function enumType(
   };
 }
 
+export function boolType(baseType: NumericType): BooleanType {
+  return { class: DTypeClass.Bool, base: baseType };
+}
+
 export function enumOrBoolType(
   baseType: NumericType,
   hdf5Mapping: Record<string, number>,
@@ -164,7 +164,7 @@ export function enumOrBoolType(
     hdf5Mapping.FALSE === 0 &&
     hdf5Mapping.TRUE === 1
   ) {
-    return boolType();
+    return boolType(baseType);
   }
 
   return enumType(baseType, hdf5Mapping);

diff --git a/packages/shared/src/mock-utils.ts b/packages/shared/src/mock-utils.ts
@@ -20,6 +20,7 @@ import {
   buildEntityPath,
   cplxType,
   floatType,
+  intType,
   strType,
   unknownType,
 } from './hdf5-utils';
@@ -297,7 +298,7 @@ function guessType(value: unknown): DType {
   }
 
   if (typeof value === 'boolean') {
-    return boolType();
+    return boolType(intType(8));
   }
 
   if (