Improved app testing

Author: lucasimi

src/tdamapper/app.py

@@ -10,7 +10,7 @@
 from sklearn.preprocessing import StandardScaler
 from umap import UMAP
 
-from tdamapper.clustering import TrivialClustering
+from tdamapper.core import TrivialClustering
 from tdamapper.cover import BallCover, CubicalCover, KNNCover
 from tdamapper.learn import MapperAlgorithm
 from tdamapper.plot import MapperPlot
@@ -636,17 +636,17 @@ def load_file(self):
             self.storage["df"] = fix_data(df)
             self.storage["labels"] = fix_data(labels)
         elif self.load_type.value == LOAD_CSV:
-            df = self.storage.get("df")
-            if df is None:
+            df = self.storage.get("df", pd.DataFrame())
+            if df is None or df.empty:
                 logger.warning("No data found. Please upload a file first.")
                 ui.notify("No data found. Please upload a file first.", type="warning")
                 return
         else:
             logger.error("Unknown load type selected.")
             return
 
-        df = self.storage.get("df")
-        if df is not None:
+        df = self.storage.get("df", pd.DataFrame())
+        if df is not None or not df.empty:
             logger.info("Data loaded successfully.")
             ui.notify("File loaded successfully.", type="positive")
         else:
@@ -657,18 +657,27 @@ async def async_run_mapper(self):
         notification = ui.notification(timeout=None, type="ongoing")
         notification.message = "Running Mapper..."
         notification.spinner = True
-        df_X = self.storage.get("df")
+        df_X = self.storage.get("df", pd.DataFrame())
         if df_X is None or df_X.empty:
             logger.warning("No data found. Please upload a file first.")
             ui.notify("No data found. Please upload a file first.", type="warning")
+            notification.message = "No data found. Please upload a file first."
+            notification.spinner = False
+            notification.dismiss()
             return
         mapper_config = self.get_mapper_config()
-        mapper_graph, df_y = await run.cpu_bound(
-            run_mapper, df_X, **asdict(mapper_config)
-        )
-        self.storage["mapper_graph"] = mapper_graph
-        self.storage["df_y"] = df_y
-        notification.message = "Done!"
+        result = await run.cpu_bound(run_mapper, df_X, **asdict(mapper_config))
+        if result is None:
+            notification.message = "Something went wrong."
+            notification.spinner = False
+            notification.dismiss()
+            return
+        mapper_graph, df_y = result
+        if mapper_graph is not None:
+            self.storage["mapper_graph"] = mapper_graph
+        if df_y is not None:
+            self.storage["df_y"] = df_y
+        notification.message = "Running Mapper Completed!"
         notification.spinner = False
         notification.dismiss()
 
@@ -713,23 +722,25 @@ async def async_draw_mapper(self):
         with self.plot_container:
             self.draw_area = ui.plotly(mapper_fig).classes("w-full h-full")
 
-        notification.message = "Done!"
+        notification.message = "Drawing Mapper Completed!"
         notification.spinner = False
         notification.dismiss()
 
 
-@ui.page("/")
-def main_page():
-    ui.query(".nicegui-content").classes("p-0")
-    storage = app.storage.client
-    App(storage=storage)
+def startup():
+    @ui.page("/")
+    def main_page():
+        ui.query(".nicegui-content").classes("p-0")
+        storage = app.storage.client
+        App(storage=storage)
 
 
 def main():
     port = os.getenv("PORT", "8080")
     host = os.getenv("HOST", "0.0.0.0")
     production = os.getenv("PRODUCTION", "false").lower() == "true"
     storage_secret = os.getenv("STORAGE_SECRET", "storage_secret")
+    startup()
     ui.run(
         storage_secret=storage_secret,
         reload=not production,

tests/test_unit_app.py

@@ -1,17 +1,45 @@
-import pytest
+from dataclasses import asdict
+
 from nicegui.testing import User
+from sklearn.datasets import load_digits
 
 from tdamapper import app
 
 pytest_plugins = ["nicegui.testing.user_plugin"]
 
 
-@pytest.mark.module_under_test(app)
-async def test_run_mapper(user: User) -> None:
+async def test_run_app(user: User) -> None:
+    app.startup()
     await user.open("/")
     await user.should_see("Load Data")
+    await user.should_see("Lens")
+    await user.should_see("Cover")
+    await user.should_see("Clustering")
     await user.should_see("Run Mapper")
+    await user.should_see("Redraw")
     user.find("Load Data").click()
     await user.should_see("File loaded successfully")
+    await user.should_not_see("No data found.")
     user.find("Run Mapper").click()
     await user.should_see("Running Mapper...")
+    await user.should_not_see("No data found.")
+    await user.should_see("Running Mapper Completed!", retries=20)
+    await user.should_see("Drawing Mapper...")
+    await user.should_not_see("No data")
+    await user.should_see("Drawing Mapper Completed!", retries=20)
+    user.find("Redraw").click()
+    await user.should_see("Drawing Mapper...")
+    await user.should_not_see("No data")
+    await user.should_see("Drawing Mapper Completed!", retries=20)
+
+
+def test_run_mapper() -> None:
+    config = app.MapperConfig()
+    df_X, df_target = load_digits(return_X_y=True, as_frame=True)
+    result = app.run_mapper(df_X, **asdict(config))
+    assert result is not None
+    mapper_graph, df_y = result
+    mapper_fig = app.create_mapper_figure(
+        df_X, df_y, df_target, mapper_graph, **asdict(config)
+    )
+    assert mapper_fig is not None