Merge pull request #1965 from silx-kit/up-h5grove

Upgrade h5grove to v3.0.0rc1

Author: loichuder

packages/app/src/providers/h5grove/h5grove-api.ts

@@ -34,7 +34,7 @@ import {
 const SUPPORTED_EXPORT_FORMATS = new Set<ExportFormat>(['npy', 'tiff']);
 
 export class H5GroveApi extends DataProviderApi {
-  /* API compatible with h5grove@2.3.0 */
+  /* API compatible with h5grove@3.0.0rc1 */
   public constructor(
     private readonly baseURL: string,
     filepath: string,
@@ -46,7 +46,7 @@ export class H5GroveApi extends DataProviderApi {
 
   public override async getEntity(path: string): Promise<ProvidedEntity> {
     try {
-      const buffer = await this.fetcher(`${this.baseURL}/meta/`, {
+      const buffer = await this.fetcher(`${this.baseURL}/meta`, {
         file: this.filepath,
         path,
       });
@@ -65,7 +65,7 @@ export class H5GroveApi extends DataProviderApi {
     const { dataset, selection } = storeParams;
     const { path, type } = dataset;
 
-    const url = `${this.baseURL}/data/`;
+    const url = `${this.baseURL}/data`;
     const opts = { abortSignal, onProgress };
     const baseParams = {
       file: this.filepath,
@@ -109,7 +109,7 @@ export class H5GroveApi extends DataProviderApi {
     }
 
     try {
-      const data = await this.fetcher(`${this.baseURL}/attr/`, {
+      const data = await this.fetcher(`${this.baseURL}/attr`, {
         file: this.filepath,
         path,
       });
@@ -156,12 +156,12 @@ export class H5GroveApi extends DataProviderApi {
       ...(selection && { selection }),
     });
 
-    return new URL(`${this.baseURL || ''}/data/?${searchParams.toString()}`);
+    return new URL(`${this.baseURL || ''}/data?${searchParams.toString()}`);
   }
 
   public override async getSearchablePaths(path: string): Promise<string[]> {
     try {
-      const buffer = await this.fetcher(`${this.baseURL}/paths/`, {
+      const buffer = await this.fetcher(`${this.baseURL}/paths`, {
         file: this.filepath,
         path,
       });

packages/app/src/providers/h5grove/models.ts

@@ -94,7 +94,7 @@ export interface H5GroveTimeType extends H5GroveBaseType {
 export interface H5GroveStringType extends H5GroveBaseType {
   class: 3;
   cset: number;
-  strPad?: number; // optional for backwards compatibility with h5grove <= 2.1.0
+  strPad: number;
   vlen: boolean;
 }
 

packages/app/src/providers/h5grove/utils.test.ts

@@ -41,16 +41,16 @@ describe('parseDType', () => {
 
   it('should convert string types', () => {
     expect(
-      parseDType({ class: 3, size: 6, cset: 0, vlen: false }),
+      parseDType({ class: 3, size: 6, cset: 0, strPad: 0, vlen: false }),
     ).toStrictEqual(strType(H5T_CSET.ASCII, undefined, 6));
     expect(
-      parseDType({ class: 3, size: 6, cset: 0, vlen: true }),
+      parseDType({ class: 3, size: 6, cset: 0, strPad: 0, vlen: true }),
     ).toStrictEqual(strType(H5T_CSET.ASCII));
     expect(
       parseDType({ class: 3, size: 6, cset: 1, strPad: 1, vlen: false }),
     ).toStrictEqual(strType(H5T_CSET.UTF8, H5T_STR.NULLPAD, 6));
     expect(
-      parseDType({ class: 3, size: 6, cset: 1, vlen: true }),
+      parseDType({ class: 3, size: 6, cset: 1, strPad: 0, vlen: true }),
     ).toStrictEqual(strType(H5T_CSET.UTF8));
   });
 

support/h5grove/poetry.lock

@@ -5,7 +5,7 @@ description = "h5grove tornado server for testing purposes"
 authors = [{name = "ESRF"}]
 requires-python = ">=3.12"
 dependencies = [
-  "h5grove[tornado] (==2.3.0)",
+  "h5grove[tornado] (==3.0.0rc1)",
   "typing-extensions (~=4.10)"
 ]