mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-09-16 21:37:59 +08:00
f69d141336
This will give us the ability to specify different config options for different dataroots. the key of the dataroot dictionary is no longer the same as the dataroot_url. Previously key==dataroot_url, and now those are separated. Added an "is_multi_dataset" function to simplify logic where it branched on single vs multi. Simplified the rest.py interface by no longer passing in the user annotations object, since that can be retrieved from the dataset.
101 lines
4.4 KiB
Python
101 lines
4.4 KiB
Python
import unittest
|
|
from server.common.app_config import AppConfig
|
|
from server.common.errors import ConfigurationError
|
|
from server.test import PROJECT_ROOT, test_server
|
|
import requests
|
|
|
|
# NOTE, there are more tests that should be written for AppConfig.
|
|
# this is just a start.
|
|
|
|
|
|
class AppConfigTest(unittest.TestCase):
|
|
def test_update(self):
|
|
c = AppConfig()
|
|
c.update_server_config(app__verbose=True, multi_dataset__dataroot="datadir")
|
|
v = c.server_config.changes_from_default()
|
|
self.assertCountEqual(v, [("app__verbose", True, False), ("multi_dataset__dataroot", "datadir", None)])
|
|
|
|
c = AppConfig()
|
|
c.update_default_dataset_config(app__scripts=(), app__inline_scripts=())
|
|
v = c.server_config.changes_from_default()
|
|
self.assertCountEqual(v, [])
|
|
|
|
c = AppConfig()
|
|
c.update_default_dataset_config(app__scripts=[], app__inline_scripts=[])
|
|
v = c.default_dataset_config.changes_from_default()
|
|
self.assertCountEqual(v, [])
|
|
|
|
c = AppConfig()
|
|
c.update_default_dataset_config(app__scripts=("a", "b"), app__inline_scripts=["c", "d"])
|
|
v = c.default_dataset_config.changes_from_default()
|
|
self.assertCountEqual(v, [("app__scripts", ["a", "b"], []), ("app__inline_scripts", ["c", "d"], [])])
|
|
|
|
def test_multi_dataset(self):
|
|
|
|
c = AppConfig()
|
|
# test for illegal url_dataroots
|
|
for illegal in ("../b", "!$*", "\\n", "", "(bad)"):
|
|
c.update_server_config(
|
|
multi_dataset__dataroot={"tag": {"base_url": illegal, "dataroot": "{PROJECT_ROOT}/example-dataset"}}
|
|
)
|
|
with self.assertRaises(ConfigurationError):
|
|
c.complete_config()
|
|
|
|
# test for legal url_dataroots
|
|
for legal in ("d", "this.is-okay_", "a/b"):
|
|
c.update_server_config(
|
|
multi_dataset__dataroot={"tag": {"base_url": legal, "dataroot": "{PROJECT_ROOT}/example-dataset"}}
|
|
)
|
|
c.complete_config()
|
|
|
|
# test that multi dataroots work end to end
|
|
c.update_server_config(
|
|
multi_dataset__dataroot=dict(
|
|
s1=dict(dataroot=f"{PROJECT_ROOT}/example-dataset", base_url="set1/1/2"),
|
|
s2=dict(dataroot=f"{PROJECT_ROOT}/server/test/test_datasets", base_url="set2"),
|
|
s3=dict(dataroot=f"{PROJECT_ROOT}/server/test/test_datasets", base_url="set3"),
|
|
)
|
|
)
|
|
|
|
# Change this default to test if the dataroot overrides below work.
|
|
c.update_default_dataset_config(app__about_legal_tos="tos_default.html")
|
|
|
|
# specialize the configs for set1
|
|
c.add_dataroot_config(
|
|
"s1", user_annotations__enable=False, diffexp__enable=True, app__about_legal_tos="tos_set1.html"
|
|
)
|
|
|
|
# specialize the configs for set2
|
|
c.add_dataroot_config(
|
|
"s2", user_annotations__enable=True, diffexp__enable=False, app__about_legal_tos="tos_set2.html"
|
|
)
|
|
|
|
# no specializations for set3 (they get the default dataset config)
|
|
c.complete_config()
|
|
|
|
with test_server(app_config=c) as server:
|
|
session = requests.Session()
|
|
|
|
r = session.get(f"{server}/set1/1/2/pbmc3k.h5ad/api/v0.2/config")
|
|
data_config = r.json()
|
|
assert data_config["config"]["displayNames"]["dataset"] == "pbmc3k"
|
|
assert data_config["config"]["parameters"]["annotations"] is False
|
|
assert data_config["config"]["parameters"]["disable-diffexp"] is False
|
|
assert data_config["config"]["parameters"]["about_legal_tos"] == "tos_set1.html"
|
|
|
|
r = session.get(f"{server}/set2/pbmc3k.cxg/api/v0.2/config")
|
|
data_config = r.json()
|
|
assert data_config["config"]["displayNames"]["dataset"] == "pbmc3k"
|
|
assert data_config["config"]["parameters"]["annotations"] is True
|
|
assert data_config["config"]["parameters"]["about_legal_tos"] == "tos_set2.html"
|
|
|
|
r = session.get(f"{server}/set3/pbmc3k.cxg/api/v0.2/config")
|
|
data_config = r.json()
|
|
assert data_config["config"]["displayNames"]["dataset"] == "pbmc3k"
|
|
assert data_config["config"]["parameters"]["annotations"] is True
|
|
assert data_config["config"]["parameters"]["disable-diffexp"] is False
|
|
assert data_config["config"]["parameters"]["about_legal_tos"] == "tos_default.html"
|
|
|
|
r = session.get(f"{server}/health")
|
|
assert r.json()["status"] == "pass"
|