fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-07 13:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

harden dataset name handling (#1297)

Browse Source
This commit is contained in:
Bruce Martin
2020-03-25 15:37:06 -07:00
committed by GitHub
parent e07ebf85e8
commit 674f14f9bd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/data_common/matrix_loader.py
+5 -2
View File
@@ -154,6 +154,9 @@ class MatrixDataLoader(object):
def __init__(self, location, matrix_data_type=None, app_config=None): def __init__(self, location, matrix_data_type=None, app_config=None):
""" location can be a string or DataLocator """ """ location can be a string or DataLocator """
self.location = DataLocator(location) self.location = DataLocator(location)
if not self.location.exists():
raise DatasetAccessError("Dataset does not exist.")
# matrix_data_type is an enum value of type MatrixDataType # matrix_data_type is an enum value of type MatrixDataType
self.matrix_data_type = matrix_data_type self.matrix_data_type = matrix_data_type
# matrix_type is a DataAdaptor type, which corresonds to the matrix_data_type # matrix_type is a DataAdaptor type, which corresonds to the matrix_data_type
@@ -163,7 +166,7 @@ class MatrixDataLoader(object):
self.matrix_data_type = self.__matrix_data_type() self.matrix_data_type = self.__matrix_data_type()
if not self.__matrix_data_type_allowed(app_config): if not self.__matrix_data_type_allowed(app_config):
raise DatasetAccessError(f"{self.location} does not have an allowed type: {str(self.matrix_data_type)}") raise DatasetAccessError(f"Dataset does not have an allowed type.")
if self.matrix_data_type == MatrixDataType.H5AD: if self.matrix_data_type == MatrixDataType.H5AD:
from server.data_anndata.anndata_adaptor import AnndataAdaptor from server.data_anndata.anndata_adaptor import AnndataAdaptor
@@ -207,7 +210,7 @@ class MatrixDataLoader(object):
def pre_load_validation(self): def pre_load_validation(self):
if self.matrix_data_type == MatrixDataType.UNKNOWN: if self.matrix_data_type == MatrixDataType.UNKNOWN:
raise DatasetAccessError(f"{self.location} does not have a recognized type: .h5ad or .cxg") raise DatasetAccessError(f"Dataset does not have a recognized type: .h5ad or .cxg")
self.matrix_type.pre_load_validation(self.location) self.matrix_type.pre_load_validation(self.location)
def file_size(self): def file_size(self):