diff --git a/server/data_cxg/cxg_adaptor.py b/server/data_cxg/cxg_adaptor.py index 5cd1b795..3bab6987 100644 --- a/server/data_cxg/cxg_adaptor.py +++ b/server/data_cxg/cxg_adaptor.py @@ -195,6 +195,8 @@ class CxgAdaptor(DataAdaptor): return diffexp_cxg.diffexp_ttest(self, maskA, maskB, top_n, lfc_cutoff) def get_colors(self): + if self.cxg_version == "0.0": + return dict() meta = self.open_array("cxg_group_metadata").meta return json.loads(meta["cxg_category_colors"]) if "cxg_category_colors" in meta else dict() diff --git a/server/test/test_cxg_adaptor.py b/server/test/test_cxg_adaptor.py index ef716dfc..8dbef620 100644 --- a/server/test/test_cxg_adaptor.py +++ b/server/test/test_cxg_adaptor.py @@ -7,10 +7,14 @@ from server.test.test_datasets.fixtures import pbmc3k_colors class TestCxgAdaptor(unittest.TestCase): - def setUp(self): - data_locator = f"{PROJECT_ROOT}/server/test/test_datasets/pbmc3k.cxg" - config = app_config(data_locator) - self.data = CxgAdaptor(DataLocator(data_locator), config) def test_get_colors(self): - self.assertEqual(self.data.get_colors(), pbmc3k_colors) + data = self.get_data("pbmc3k.cxg") + self.assertDictEqual(data.get_colors(), pbmc3k_colors) + data = self.get_data("pbmc3k_v0.cxg") + self.assertDictEqual(data.get_colors(), dict()) + + def get_data(self, fixture): + data_locator = f"{PROJECT_ROOT}/server/test/test_datasets/{fixture}" + config = app_config(data_locator) + return CxgAdaptor(DataLocator(data_locator), config) diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__attr.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__attr.tdb new file mode 100644 index 00000000..68f06ed1 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__attr.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__fragment_metadata.tdb new file mode 100644 index 00000000..511a453a Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/X/__1576858534264_1576858534264_4f12045b32ea45a490bdad087bac4dc3/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/X/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/X/__array_schema.tdb new file mode 100644 index 00000000..b5c8fd3a Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/X/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/X/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/X/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/__tiledb_group.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/__tiledb_group.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/__tiledb_group.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/__tiledb_group.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__attr.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__attr.tdb new file mode 100644 index 00000000..28d844a9 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__attr.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__fragment_metadata.tdb new file mode 100644 index 00000000..6faeac81 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__1576858534229_1576858534229_391cdd6b87b649dea76842dfa59ed0d9/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__array_schema.tdb new file mode 100644 index 00000000..b914fda9 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/draw_graph_fr/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__attr.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__attr.tdb new file mode 100644 index 00000000..b7f3d4d5 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__attr.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__fragment_metadata.tdb new file mode 100644 index 00000000..167e76b2 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__1576858534121_1576858534121_454903804a694b3b8ccdae56065664ba/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__array_schema.tdb new file mode 100644 index 00000000..2ad7d0e0 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/pca/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__attr.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__attr.tdb new file mode 100644 index 00000000..5f3adbea Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__attr.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__fragment_metadata.tdb new file mode 100644 index 00000000..5b449a93 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__1576858534161_1576858534161_aa4803e7e7be4b23bea35f5d62296f14/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__array_schema.tdb new file mode 100644 index 00000000..b914fda9 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/tsne/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__attr.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__attr.tdb new file mode 100644 index 00000000..b80fb865 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__attr.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__fragment_metadata.tdb new file mode 100644 index 00000000..167e8680 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__1576858534193_1576858534193_67d97bcdd3d1486985f5974b133cb496/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__array_schema.tdb new file mode 100644 index 00000000..b914fda9 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/emb/umap/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/__fragment_metadata.tdb new file mode 100644 index 00000000..cddac6b7 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain.tdb new file mode 100644 index 00000000..2b3b91d9 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain_var.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain_var.tdb new file mode 100644 index 00000000..56196286 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/louvain_var.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_counts.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_counts.tdb new file mode 100644 index 00000000..8141af5d Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_counts.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_genes.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_genes.tdb new file mode 100644 index 00000000..51219d8e Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/n_genes.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0.tdb new file mode 100644 index 00000000..e431a413 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0_var.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0_var.tdb new file mode 100644 index 00000000..be821f91 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/name_0_var.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/percent_mito.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/percent_mito.tdb new file mode 100644 index 00000000..22773bef Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__1576858534031_1576858534031_1641d0129fe64c78b2d0a6a684ce47ba/percent_mito.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__array_schema.tdb new file mode 100644 index 00000000..54eae0c3 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/obs/__meta/__1576858534024_1576858534024_e856aef5b0e244b1a4b7dde70cd864d0 b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__meta/__1576858534024_1576858534024_e856aef5b0e244b1a4b7dde70cd864d0 new file mode 100644 index 00000000..88398dfe Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/obs/__meta/__1576858534024_1576858534024_e856aef5b0e244b1a4b7dde70cd864d0 differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/__fragment_metadata.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/__fragment_metadata.tdb new file mode 100644 index 00000000..05ed94e2 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/__fragment_metadata.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/n_cells.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/n_cells.tdb new file mode 100644 index 00000000..733701eb Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/n_cells.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0.tdb new file mode 100644 index 00000000..7ce34978 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0_var.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0_var.tdb new file mode 100644 index 00000000..7fa293f2 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__1576858533970_1576858533970_d241b2e750eb425a9ee23ed1de686c2a/name_0_var.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__array_schema.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__array_schema.tdb new file mode 100644 index 00000000..48812401 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__array_schema.tdb differ diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__lock.tdb b/server/test/test_datasets/pbmc3k_v0.cxg/var/__lock.tdb new file mode 100644 index 00000000..e69de29b diff --git a/server/test/test_datasets/pbmc3k_v0.cxg/var/__meta/__1576858533966_1576858533966_1362646d804b4982b35052a367633436 b/server/test/test_datasets/pbmc3k_v0.cxg/var/__meta/__1576858533966_1576858533966_1362646d804b4982b35052a367633436 new file mode 100644 index 00000000..09f3a459 Binary files /dev/null and b/server/test/test_datasets/pbmc3k_v0.cxg/var/__meta/__1576858533966_1576858533966_1362646d804b4982b35052a367633436 differ