dataroot_dict and sserver

chanzuckerberg · Nov 17, 2022 · 0f1e811 · 0f1e811
1 parent 9cf6bec
commit 0f1e811
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/server/app/api/v3.py b/server/app/api/v3.py
@@ -232,8 +232,7 @@ def register_api_v3(app, app_config, api_url_prefix):
     # NOTE:  These routes only allow the dataset to be in the directory
     # of the dataroot, and not a subdirectory.  We may want to change
     # the route format at some point
-    for dataroot in app_config.server__multi_dataset__dataroots.values():
-        dataroot_dict = dataroot
+    for dataroot_dict in app_config.server__multi_dataset__dataroots.values():
         url_dataroot = dataroot_dict["base_url"]
         bp_dataroot = Blueprint(
             name=f"api_dataset_{url_dataroot}_{api_version.replace('.',',')}",

diff --git a/server/app/app.py b/server/app/app.py
@@ -76,11 +76,10 @@ def dataroot_test_index():
 
     datasets = []
     for dataroot_dict in config.server__multi_dataset__dataroot.values():
-        dataroot = dataroot_dict["dataroot"]
         url_dataroot = dataroot_dict["base_url"]
-        locator = DataLocator(dataroot, region_name=config.server__data_locator__s3_region_name)
+        locator = DataLocator(dataroot_dict, region_name=config.server__data_locator__s3_region_name)
         for fname in locator.ls():
-            location = path_join(dataroot, fname)
+            location = path_join(dataroot_dict, fname)
             try:
                 DataLoader(location, app_config=config)
                 datasets.append((url_dataroot, fname))
@@ -183,8 +182,7 @@ def __init__(self, app_config):
         # NOTE:  These routes only allow the dataset to be in the directory
         # of the dataroot, and not a subdirectory.  We may want to change
         # the route format at some point
-        for dataroot in app_config.server__multi_dataset__dataroots.values():
-            dataroot_dict = dataroot
+        for dataroot_dict in app_config.server__multi_dataset__dataroots.values():
             url_dataroot = dataroot_dict["base_url"]
             self.app.add_url_rule(
                 f"/{url_dataroot}/<string:dataset>/",

diff --git a/server/cli/launch.py b/server/cli/launch.py
@@ -239,7 +239,7 @@ def launch(
         # Those will override the ones provided in the config file (if provided).
         updates = dict(
             server__app__verbose=verbose,
-            sserver__app__debug=debug,
+            server__app__debug=debug,
             server__app__host=host,
             server__app__port=port,
             server__app__open_browser=open_browser,