From 5166040a15b493631009b9e446f25b6a724289e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 14 Aug 2024 10:04:22 +0100 Subject: [PATCH] Add support for OMERO.web 5.27.0 The internal logic of omeroweb.webclient.tree._marshal_image has changed to support the archived status of the images. This change adjusts the mapr logic consuming this internal API accordingly and declares OMERO.web 5.27.0 as the minimal version --- omero_mapr/tree.py | 4 +++- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/omero_mapr/tree.py b/omero_mapr/tree.py index 8b5b8363..03d718ed 100644 --- a/omero_mapr/tree.py +++ b/omero_mapr/tree.py @@ -757,6 +757,7 @@ def marshal_images(conn, parent, parent_id, q = """ select new map(image.id as id, + image.archived as archived, image.name as name, image.details.owner.id as ownerId, image as image_details_permissions, @@ -804,11 +805,12 @@ def marshal_images(conn, parent, parent_id, for e in qs.projection(q, params, service_opts): e = unwrap(e)[0] d = [e["id"], + e["archived"], e["name"], e["ownerId"], e["image_details_permissions"], e["filesetId"]] - kwargs = {'conn': conn, 'row': d[0:5]} + kwargs = {'conn': conn, 'row': d[0:6]} if load_pixels: d = [e["sizeX"], e["sizeY"], e["sizeZ"], e["sizeT"]] kwargs['row_pixels'] = d diff --git a/requirements.txt b/requirements.txt index 439eab4f..2e5c62f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ requests -omero-web[redis]>=5.14.0 +omero-web[redis]>=5.27.0