girder-large-image 1.29.3.dev6__tar.gz → 1.29.3.dev8__tar.gz

{girder-large-image-1.29.3.dev6 → girder-large-image-1.29.3.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.29.3.dev6
+Version: 1.29.3.dev8
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.29.3.dev6
+Requires-Dist: large_image>=1.29.3.dev8
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.29.3.dev6; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.29.3.dev8; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder-large-image-1.29.3.dev6 → girder-large-image-1.29.3.dev8}/girder_large_image/__init__.py

@@ -673,6 +673,26 @@ def unbindGirderEventsByHandlerName(handlerName):
         events.unbind(eventName, handlerName)
 
 
+def patchMount():
+    try:
+        import girder.cli.mount
+
+        def _flatItemFile(self, item):
+            return next(File().collection.aggregate([
+                {'$match': {'itemId': item['_id']}},
+            ] + ([
+                {'$addFields': {'matchLI': {'$eq': ['$_id', item['largeImage']['fileId']]}}},
+            ] if 'largeImage' in item and 'expected' not in item['largeImage'] else []) + [
+                {'$addFields': {'matchName': {'$eq': ['$name', item['name']]}}},
+                {'$sort': {'matchLI': -1, 'matchName': -1, '_id': 1}},
+                {'$limit': 1},
+            ]), None)
+
+        girder.cli.mount.ServerFuse._flatItemFile = _flatItemFile
+    except Exception:
+        pass
+
+
 class LargeImagePlugin(GirderPlugin):
     DISPLAY_NAME = 'Large Image'
     CLIENT_SOURCE_PATH = 'web_client'
@@ -727,3 +747,5 @@ class LargeImagePlugin(GirderPlugin):
 
         search._allowedSearchMode.pop('li_metadata', None)
         search.addSearchMode('li_metadata', metadataSearchHandler)
+
+        patchMount()

{girder-large-image-1.29.3.dev6 → girder-large-image-1.29.3.dev8}/girder_large_image/girder_tilesource.py

@@ -1,3 +1,4 @@
+import inspect
 import os
 import re
 
@@ -99,7 +100,10 @@ class GirderTileSource(tilesource.FileTileSource):
                     pass
                 if not largeImagePath:
                     try:
-                        largeImagePath = File().getGirderMountFilePath(largeImageFile)
+                        largeImagePath = File().getGirderMountFilePath(
+                            largeImageFile,
+                            **({'preferFlat': True} if 'preferFlat' in inspect.signature(
+                                File.getGirderMountFilePath).parameters else {}))
                     except FilePathException:
                         pass
             if not largeImagePath:

{girder-large-image-1.29.3.dev6 → girder-large-image-1.29.3.dev8}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.29.3.dev6
+Version: 1.29.3.dev8
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.29.3.dev6
+Requires-Dist: large_image>=1.29.3.dev8
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.29.3.dev6; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.29.3.dev8; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder-large-image-1.29.3.dev6 → girder-large-image-1.29.3.dev8}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder>=3.1.18
 girder-jobs>=3.0.3
-large_image>=1.29.3.dev6
+large_image>=1.29.3.dev8
 
 [tasks]
-large-image-tasks[girder]>=1.29.3.dev6
+large-image-tasks[girder]>=1.29.3.dev8
 girder-worker[girder]>=0.6.0