large-image-source-multi 1.29.9.dev2__tar.gz → 1.29.10__tar.gz

{large_image_source_multi-1.29.9.dev2/large_image_source_multi.egg-info → large_image_source_multi-1.29.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.29.9.dev2
+Version: 1.29.10
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,12 +19,12 @@ Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.29.9.dev2
+Requires-Dist: large-image>=1.29.10
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.9.dev2; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.10; extra == "girder"
 
 A tilesource for large_image to composite other tile sources
 

{large_image_source_multi-1.29.9.dev2 → large_image_source_multi-1.29.10}/large_image_source_multi/__init__.py

@@ -411,6 +411,7 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         None: SourcePriority.FALLBACK,
         'application/json': SourcePriority.PREFERRED,
         'application/yaml': SourcePriority.PREFERRED,
+        'text/yaml': SourcePriority.PREFERRED,
     }
 
     _minTileSize = 64
@@ -418,7 +419,7 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
     _defaultTileSize = 256
     _maxOpenHandles = 6
 
-    def __init__(self, path, **kwargs):
+    def __init__(self, path, **kwargs):  # noqa
         """
         Initialize the tile class.  See the base class for other available
         parameters.
@@ -433,7 +434,16 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         self._lastOpenSourceLock = threading.RLock()
         # 'c' must be first as channels are special because they can have names
         self._axesList = ['c', 'z', 't', 'xy']
-        if not os.path.isfile(self._largeImagePath):
+        if isinstance(path, dict) and 'sources' in path:
+            self._info = path.copy()
+            self._basePath = '.'
+            self._largeImagePath = '.'
+            try:
+                self._validator.validate(self._info)
+            except jsonschema.ValidationError:
+                msg = 'File cannot be validated via multi-source reader.'
+                raise TileSourceError(msg)
+        elif not os.path.isfile(self._largeImagePath):
             try:
                 possibleYaml = self._largeImagePath.split('multi://', 1)[-1]
                 self._info = yaml.safe_load(possibleYaml)

{large_image_source_multi-1.29.9.dev2 → large_image_source_multi-1.29.10/large_image_source_multi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.29.9.dev2
+Version: 1.29.10
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,12 +19,12 @@ Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.29.9.dev2
+Requires-Dist: large-image>=1.29.10
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.9.dev2; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.10; extra == "girder"
 
 A tilesource for large_image to composite other tile sources
 

large_image_source_multi-1.29.10/large_image_source_multi.egg-info/requires.txt

@@ -0,0 +1,9 @@
+jsonschema
+large-image>=1.29.10
+pyyaml
+
+[all]
+scikit-image
+
+[girder]
+girder-large-image>=1.29.10

large_image_source_multi-1.29.9.dev2/large_image_source_multi.egg-info/requires.txt

@@ -1,9 +0,0 @@
-jsonschema
-large-image>=1.29.9.dev2
-pyyaml
-
-[all]
-scikit-image
-
-[girder]
-girder-large-image>=1.29.9.dev2