Skip to content

Commit

Permalink
refactor: move default laoyut to layouts module
Browse files Browse the repository at this point in the history
  • Loading branch information
neindochoh committed Sep 20, 2023
1 parent 111e8bc commit 327849c
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 21 deletions.
10 changes: 5 additions & 5 deletions renumics/spotlight/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
from renumics.spotlight.backend.middlewares.timing import add_timing_middleware
from renumics.spotlight.app_config import AppConfig
from renumics.spotlight.data_source import DataSource, create_datasource
from renumics.spotlight.layout.default import DEFAULT_LAYOUT
from renumics.spotlight import layouts

from renumics.spotlight.data_store import DataStore

Expand Down Expand Up @@ -86,7 +86,7 @@ class SpotlightApp(FastAPI):

task_manager: TaskManager
websocket_manager: Optional[WebsocketManager]
_layout: Optional[Layout]
_layout: Layout
config: Config
username: str
filebrowsing_allowed: bool
Expand All @@ -106,7 +106,7 @@ def __init__(self) -> None:
self.task_manager = TaskManager()
self.websocket_manager = None
self.config = Config()
self._layout = None
self._layout = layouts.default()
self.project_root = Path.cwd()
self.vite_url = None
self.username = ""
Expand Down Expand Up @@ -368,11 +368,11 @@ def layout(self) -> Layout:
"""
Frontend layout
"""
return self._layout or DEFAULT_LAYOUT
return self._layout

@layout.setter
def layout(self, layout: Optional[Layout]) -> None:
self._layout = layout
self._layout = layout or layouts.default()
self._broadcast(ResetLayoutMessage())

async def get_current_layout_dict(self, user_id: str) -> Optional[Dict]:
Expand Down
15 changes: 0 additions & 15 deletions renumics/spotlight/layout/default.py

This file was deleted.

3 changes: 2 additions & 1 deletion renumics/spotlight/layouts/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .default import default
from .model_debug import debug_classification
from .model_compare import compare_classification

__all__ = ["debug_classification", "compare_classification"]
__all__ = ["default", "debug_classification", "compare_classification"]
26 changes: 26 additions & 0 deletions renumics/spotlight/layouts/default.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from renumics.spotlight.layout import (
histogram,
inspector,
layout,
scatterplot,
similaritymap,
split,
tab,
table,
)
from renumics.spotlight.layout.nodes import Layout


def default() -> Layout:
"""
Default layout for spotlight.
"""

return layout(
split(
tab(table(), weight=60),
tab(similaritymap(), scatterplot(), histogram(), weight=40),
weight=60,
),
tab(inspector(), weight=40),
)

0 comments on commit 327849c

Please sign in to comment.