Merge branch 'release_21.05' into dev

galaxyproject · Sep 7, 2021 · 23e801c · 23e801c
2 parents 00c6c28 + fa3828a
commit 23e801c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
@@ -963,7 +963,12 @@ def set_meta(self, dataset, overwrite=True, **kwd):
                 dataset.metadata.description = loom_file.attrs.get('description')
                 dataset.metadata.url = loom_file.attrs.get('url')
                 dataset.metadata.doi = loom_file.attrs.get('doi')
-                dataset.metadata.loom_spec_version = loom_file.attrs.get('LOOM_SPEC_VERSION')
+                loom_spec_version = loom_file.attrs.get('LOOM_SPEC_VERSION')
+                if isinstance(loom_spec_version, np.ndarray):
+                    loom_spec_version = loom_spec_version[0]
+                    if isinstance(loom_spec_version, bytes):
+                        loom_spec_version = loom_spec_version.decode()
+                dataset.metadata.loom_spec_version = loom_spec_version
                 dataset.creation_date = loom_file.attrs.get('creation_date')
                 dataset.metadata.shape = tuple(loom_file['matrix'].shape)
 

diff --git a/lib/galaxy/datatypes/test/test_binary_loom_spec_version.loom b/lib/galaxy/datatypes/test/test_binary_loom_spec_version.loom
diff --git a/lib/galaxy/model/metadata.py b/lib/galaxy/model/metadata.py
@@ -242,7 +242,10 @@ def to_JSON_dict(self, filename=None):
             meta_dict['__validated_state__'] = dataset_meta_dict['__validated_state__']
         if '__validated_state_message__' in dataset_meta_dict:
             meta_dict['__validated_state_message__'] = dataset_meta_dict['__validated_state_message__']
-        encoded_meta_dict = galaxy.model.custom_types.json_encoder.encode(meta_dict)
+        try:
+            encoded_meta_dict = galaxy.model.custom_types.json_encoder.encode(meta_dict)
+        except Exception as e:
+            raise Exception(f"Failed encoding metadata dictionary: {meta_dict}") from e
         if filename is None:
             return encoded_meta_dict
         with open(filename, 'wt+') as fh: