cjm-transcript-source-select 0.0.13__tar.gz → 0.0.15__tar.gz

{cjm_transcript_source_select-0.0.13/cjm_transcript_source_select.egg-info → cjm_transcript_source_select-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cjm-transcript-source-select
-Version: 0.0.13
+Version: 0.0.15
 Summary: FastHTML source selection component for transcript decomposition workflows, with federated database browsing, drag-drop ordering, and keyboard navigation.
 Home-page: https://github.com/cj-mills/cjm-transcript-source-select
 Author: Christian J. Mills
@@ -106,57 +106,57 @@ graph LR
     utils[utils<br/>utils]
 
     components_helpers --> models
-    components_local_files --> components_helpers
     components_local_files --> html_ids
+    components_local_files --> components_helpers
     components_preview_panel --> html_ids
     components_source_browser --> services_source_utils
     components_source_browser --> utils
     components_source_browser --> html_ids
+    components_step_renderer --> components_preview_panel
     components_step_renderer --> components_selection_queue
-    components_step_renderer --> components_source_browser
     components_step_renderer --> utils
     components_step_renderer --> components_local_files
     components_step_renderer --> html_ids
-    components_step_renderer --> components_preview_panel
     components_step_renderer --> models
-    routes_core --> components_selection_queue
-    routes_core --> services_source
-    routes_core --> html_ids
+    components_step_renderer --> components_source_browser
     routes_core --> models
+    routes_core --> services_source
+    routes_core --> components_selection_queue
     routes_core --> components_step_renderer
+    routes_core --> html_ids
+    routes_filtering --> routes_core
     routes_filtering --> services_source_utils
     routes_filtering --> services_source
-    routes_filtering --> routes_core
     routes_filtering --> models
     routes_init --> routes_core
+    routes_init --> routes_queue
+    routes_init --> routes_tabs
+    routes_init --> routes_filtering
     routes_init --> services_source
     routes_init --> routes_source_browser
-    routes_init --> routes_filtering
     routes_init --> routes_local_files
-    routes_init --> routes_queue
     routes_init --> models
-    routes_init --> routes_tabs
+    routes_local_files --> models
+    routes_local_files --> routes_core
     routes_local_files --> components_local_files
     routes_local_files --> services_source
-    routes_local_files --> routes_core
-    routes_local_files --> models
-    routes_queue --> services_source_utils
-    routes_queue --> services_source
     routes_queue --> routes_core
+    routes_queue --> services_source_utils
     routes_queue --> components_preview_panel
+    routes_queue --> services_source
     routes_queue --> models
-    routes_source_browser --> routes_core
-    routes_source_browser --> services_source_utils
     routes_source_browser --> components_source_browser
+    routes_source_browser --> components_preview_panel
+    routes_source_browser --> services_source_utils
     routes_source_browser --> services_source
+    routes_source_browser --> routes_core
     routes_source_browser --> html_ids
-    routes_source_browser --> components_preview_panel
     routes_source_browser --> models
+    routes_tabs --> models
     routes_tabs --> components_step_renderer
+    routes_tabs --> services_source
     routes_tabs --> routes_core
     routes_tabs --> services_source_utils
-    routes_tabs --> services_source
-    routes_tabs --> models
 ```
 
 *52 cross-module dependencies detected*
@@ -426,7 +426,7 @@ def init_selection_routers(
     source_service: SourceService,  # The source service for queries
     workflow_id: str,  # The workflow identifier
     prefix: str,  # Base prefix for selection routes (e.g., "/workflow/selection")
-) -> Tuple[List[APIRouter], SelectionUrls, Dict[str, Callable], Callable, "SourceBrowserRouterState"]
+) -> SelectionResult:  # Selection router result with routers, urls, routes, and restore
     "Initialize and return all selection routers with URL bundle."
 ```
 
@@ -526,8 +526,6 @@ def _handle_remove_external_source(
     sess,  # FastHTML session object
     db_path: str,  # Path to the .db file to remove
     external_db_paths_ref: List[str],  # Shared external paths list (mutated in place)
-    fb_state_getter: Callable[[], BrowserState],  # File browser state getter
-    fb_state_setter: Callable[[BrowserState], None],  # File browser state setter
     fb_routers: FileBrowserRouters,  # File browser routers (for targeted OOB)
     remove_url: str,  # URL for remove button in external sources list
 ):  # Tuple of OOB elements (external sources list + checkbox cells)
@@ -541,7 +539,7 @@ def init_local_files_router(
     source_service: SourceService,  # The source service for external db ops
     prefix: str,  # Route prefix (e.g., "/workflow/selection/local_files")
     urls: SelectionUrls,  # URL bundle for rendering
-) -> Tuple[List, Dict[str, Callable], Callable]:  # (routers, route_dict, render_panel_fn)
+) -> LocalFilesResult:  # Router result with routers, routes, render, and restore
     "Initialize local files browser routes with new file browser API."
 ```
 
@@ -560,10 +558,24 @@ _local_files_provider: Optional[LocalFileSystemProvider] = None
 ``` python
 from cjm_transcript_source_select.models import (
     SelectionStepState,
-    SelectionUrls
+    SelectionUrls,
+    LocalFilesResult,
+    SelectionResult
 )
 ```
 
+#### Functions
+
+``` python
+def _no_op_restore(session_id: str) -> None:
+    """Default no-op for restore_state."""
+    pass
+
+@dataclass
+class LocalFilesResult
+    "Default no-op for restore_state."
+```
+
 #### Classes
 
 ``` python
@@ -593,6 +605,30 @@ class SelectionUrls:
     tab_switch: str = ''  # Switch source tabs
 ```
 
+``` python
+@dataclass
+class LocalFilesResult:
+    "Return type from init_local_files_router."
+    
+    routers: List[APIRouter]  # Routers to register (custom + file browser + VC)
+    routes: Dict[str, Callable]  # Named route handlers
+    render_panel: Callable  # (error_message?, session_id?) -> rendered panel
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
+``` python
+@dataclass
+class SelectionResult:
+    "Return type from init_selection_routers."
+    
+    routers: List[APIRouter]  # All selection routers to register
+    urls: 'SelectionUrls' = field(...)  # URL bundle
+    routes: Dict[str, Callable] = field(...)  # All named route handlers
+    render_local_files_panel: Optional[Callable]  # Render fn for local files tab
+    sb_state: Any  # SourceBrowserRouterState
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
 ### preview_panel (`preview_panel.ipynb`)
 
 > Collapsible preview panel for displaying selected content
@@ -1436,15 +1472,16 @@ from cjm_transcript_source_select.routes.tabs import (
 
 ``` python
 def _handle_tab_switch(
-    state_store: WorkflowStateStore,  # The workflow state store
-    workflow_id: str,  # The workflow identifier
     source_service: SourceService,  # The source service for queries
     request,  # FastHTML request object
     sess,  # FastHTML session object
     direction: str,  # Direction: "prev", "next", "db", or "files"
     urls: SelectionUrls,  # URL bundle for rendering
+    current_tab_ref: List[str],  # Mutable ref [current_tab] for closure-based tracking
     render_local_files_panel: Optional[Callable] = None,  # Render fn for Files tab
     sb_state: Any = None,  # SourceBrowserRouterState for DB tab VC rendering
+    state_store: WorkflowStateStore = None,  # State store (for reading step state)
+    workflow_id: str = "",  # Workflow ID (for reading step state)
 ):  # Tuple of inner content, OOB tab headers, and tab switch script
     "Switch between Plugin DB and Local Files tabs."
 ```

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/README.md

@@ -60,57 +60,57 @@ graph LR
     utils[utils<br/>utils]
 
     components_helpers --> models
-    components_local_files --> components_helpers
     components_local_files --> html_ids
+    components_local_files --> components_helpers
     components_preview_panel --> html_ids
     components_source_browser --> services_source_utils
     components_source_browser --> utils
     components_source_browser --> html_ids
+    components_step_renderer --> components_preview_panel
     components_step_renderer --> components_selection_queue
-    components_step_renderer --> components_source_browser
     components_step_renderer --> utils
     components_step_renderer --> components_local_files
     components_step_renderer --> html_ids
-    components_step_renderer --> components_preview_panel
     components_step_renderer --> models
-    routes_core --> components_selection_queue
-    routes_core --> services_source
-    routes_core --> html_ids
+    components_step_renderer --> components_source_browser
     routes_core --> models
+    routes_core --> services_source
+    routes_core --> components_selection_queue
     routes_core --> components_step_renderer
+    routes_core --> html_ids
+    routes_filtering --> routes_core
     routes_filtering --> services_source_utils
     routes_filtering --> services_source
-    routes_filtering --> routes_core
     routes_filtering --> models
     routes_init --> routes_core
+    routes_init --> routes_queue
+    routes_init --> routes_tabs
+    routes_init --> routes_filtering
     routes_init --> services_source
     routes_init --> routes_source_browser
-    routes_init --> routes_filtering
     routes_init --> routes_local_files
-    routes_init --> routes_queue
     routes_init --> models
-    routes_init --> routes_tabs
+    routes_local_files --> models
+    routes_local_files --> routes_core
     routes_local_files --> components_local_files
     routes_local_files --> services_source
-    routes_local_files --> routes_core
-    routes_local_files --> models
-    routes_queue --> services_source_utils
-    routes_queue --> services_source
     routes_queue --> routes_core
+    routes_queue --> services_source_utils
     routes_queue --> components_preview_panel
+    routes_queue --> services_source
     routes_queue --> models
-    routes_source_browser --> routes_core
-    routes_source_browser --> services_source_utils
     routes_source_browser --> components_source_browser
+    routes_source_browser --> components_preview_panel
+    routes_source_browser --> services_source_utils
     routes_source_browser --> services_source
+    routes_source_browser --> routes_core
     routes_source_browser --> html_ids
-    routes_source_browser --> components_preview_panel
     routes_source_browser --> models
+    routes_tabs --> models
     routes_tabs --> components_step_renderer
+    routes_tabs --> services_source
     routes_tabs --> routes_core
     routes_tabs --> services_source_utils
-    routes_tabs --> services_source
-    routes_tabs --> models
 ```
 
 *52 cross-module dependencies detected*
@@ -380,7 +380,7 @@ def init_selection_routers(
     source_service: SourceService,  # The source service for queries
     workflow_id: str,  # The workflow identifier
     prefix: str,  # Base prefix for selection routes (e.g., "/workflow/selection")
-) -> Tuple[List[APIRouter], SelectionUrls, Dict[str, Callable], Callable, "SourceBrowserRouterState"]
+) -> SelectionResult:  # Selection router result with routers, urls, routes, and restore
     "Initialize and return all selection routers with URL bundle."
 ```
 
@@ -480,8 +480,6 @@ def _handle_remove_external_source(
     sess,  # FastHTML session object
     db_path: str,  # Path to the .db file to remove
     external_db_paths_ref: List[str],  # Shared external paths list (mutated in place)
-    fb_state_getter: Callable[[], BrowserState],  # File browser state getter
-    fb_state_setter: Callable[[BrowserState], None],  # File browser state setter
     fb_routers: FileBrowserRouters,  # File browser routers (for targeted OOB)
     remove_url: str,  # URL for remove button in external sources list
 ):  # Tuple of OOB elements (external sources list + checkbox cells)
@@ -495,7 +493,7 @@ def init_local_files_router(
     source_service: SourceService,  # The source service for external db ops
     prefix: str,  # Route prefix (e.g., "/workflow/selection/local_files")
     urls: SelectionUrls,  # URL bundle for rendering
-) -> Tuple[List, Dict[str, Callable], Callable]:  # (routers, route_dict, render_panel_fn)
+) -> LocalFilesResult:  # Router result with routers, routes, render, and restore
     "Initialize local files browser routes with new file browser API."
 ```
 
@@ -514,10 +512,24 @@ _local_files_provider: Optional[LocalFileSystemProvider] = None
 ``` python
 from cjm_transcript_source_select.models import (
     SelectionStepState,
-    SelectionUrls
+    SelectionUrls,
+    LocalFilesResult,
+    SelectionResult
 )
 ```
 
+#### Functions
+
+``` python
+def _no_op_restore(session_id: str) -> None:
+    """Default no-op for restore_state."""
+    pass
+
+@dataclass
+class LocalFilesResult
+    "Default no-op for restore_state."
+```
+
 #### Classes
 
 ``` python
@@ -547,6 +559,30 @@ class SelectionUrls:
     tab_switch: str = ''  # Switch source tabs
 ```
 
+``` python
+@dataclass
+class LocalFilesResult:
+    "Return type from init_local_files_router."
+    
+    routers: List[APIRouter]  # Routers to register (custom + file browser + VC)
+    routes: Dict[str, Callable]  # Named route handlers
+    render_panel: Callable  # (error_message?, session_id?) -> rendered panel
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
+``` python
+@dataclass
+class SelectionResult:
+    "Return type from init_selection_routers."
+    
+    routers: List[APIRouter]  # All selection routers to register
+    urls: 'SelectionUrls' = field(...)  # URL bundle
+    routes: Dict[str, Callable] = field(...)  # All named route handlers
+    render_local_files_panel: Optional[Callable]  # Render fn for local files tab
+    sb_state: Any  # SourceBrowserRouterState
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
 ### preview_panel (`preview_panel.ipynb`)
 
 > Collapsible preview panel for displaying selected content
@@ -1390,15 +1426,16 @@ from cjm_transcript_source_select.routes.tabs import (
 
 ``` python
 def _handle_tab_switch(
-    state_store: WorkflowStateStore,  # The workflow state store
-    workflow_id: str,  # The workflow identifier
     source_service: SourceService,  # The source service for queries
     request,  # FastHTML request object
     sess,  # FastHTML session object
     direction: str,  # Direction: "prev", "next", "db", or "files"
     urls: SelectionUrls,  # URL bundle for rendering
+    current_tab_ref: List[str],  # Mutable ref [current_tab] for closure-based tracking
     render_local_files_panel: Optional[Callable] = None,  # Render fn for Files tab
     sb_state: Any = None,  # SourceBrowserRouterState for DB tab VC rendering
+    state_store: WorkflowStateStore = None,  # State store (for reading step state)
+    workflow_id: str = "",  # Workflow ID (for reading step state)
 ):  # Tuple of inner content, OOB tab headers, and tab switch script
     "Switch between Plugin DB and Local Files tabs."
 ```

cjm_transcript_source_select-0.0.15/cjm_transcript_source_select/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.15"

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/_modidx.py

@@ -81,10 +81,16 @@ d = { 'settings': { 'branch': 'main',
                                                                                                                                    'cjm_transcript_source_select/html_ids.py'),
                                                        'cjm_transcript_source_select.html_ids.SelectionHtmlIds.source_row': ( 'html_ids.html#selectionhtmlids.source_row',
                                                                                                                               'cjm_transcript_source_select/html_ids.py')},
-            'cjm_transcript_source_select.models': { 'cjm_transcript_source_select.models.SelectionStepState': ( 'models.html#selectionstepstate',
+            'cjm_transcript_source_select.models': { 'cjm_transcript_source_select.models.LocalFilesResult': ( 'models.html#localfilesresult',
+                                                                                                               'cjm_transcript_source_select/models.py'),
+                                                     'cjm_transcript_source_select.models.SelectionResult': ( 'models.html#selectionresult',
+                                                                                                              'cjm_transcript_source_select/models.py'),
+                                                     'cjm_transcript_source_select.models.SelectionStepState': ( 'models.html#selectionstepstate',
                                                                                                                  'cjm_transcript_source_select/models.py'),
                                                      'cjm_transcript_source_select.models.SelectionUrls': ( 'models.html#selectionurls',
-                                                                                                            'cjm_transcript_source_select/models.py')},
+                                                                                                            'cjm_transcript_source_select/models.py'),
+                                                     'cjm_transcript_source_select.models._no_op_restore': ( 'models.html#_no_op_restore',
+                                                                                                             'cjm_transcript_source_select/models.py')},
             'cjm_transcript_source_select.routes.core': { 'cjm_transcript_source_select.routes.core._build_queue_response': ( 'routes/core.html#_build_queue_response',
                                                                                                                               'cjm_transcript_source_select/routes/core.py'),
                                                           'cjm_transcript_source_select.routes.core._find_duplicate_media_source': ( 'routes/core.html#_find_duplicate_media_source',

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/components/local_files.py

@@ -16,6 +16,7 @@ from cjm_fasthtml_interactions.core.context import InteractionContext
 # DaisyUI components
 from cjm_fasthtml_daisyui.components.actions.button import btn, btn_sizes, btn_styles
 from cjm_fasthtml_daisyui.components.data_display.badge import badge, badge_colors, badge_sizes
+from cjm_fasthtml_daisyui.components.data_display.list import list_ui, list_row
 from cjm_fasthtml_daisyui.components.feedback.alert import alert, alert_colors
 from cjm_fasthtml_daisyui.utilities.semantic_colors import bg_dui, text_dui, border_dui
 from cjm_fasthtml_daisyui.utilities.border_radius import border_radius
@@ -123,15 +124,13 @@ def _render_external_sources_list(
                     cls=combine_classes(btn, btn_styles.ghost, btn_sizes.xs, shrink._0),
                     hx_post=remove_url,
                     hx_vals=json.dumps({"db_path": db_path}),
-                    # Use SOURCE_LIST ID for consistent zone focus ring
-                    hx_target=SelectionHtmlIds.as_selector(SelectionHtmlIds.SOURCE_LIST),
-                    hx_swap="outerHTML",
+                    hx_swap="none",
                     title=f"Remove {path.name}"
                 ),
                 cls=combine_classes(flex_display, items.center, gap(2), p.y(1), p.x(2))
             ),
             title=db_path,
-            cls=combine_classes(border_dui.base_300, border.b(), bg_dui.primary.opacity(10))
+            cls=combine_classes(list_row, border_dui.base_300, border.b(), bg_dui.primary.opacity(10))
         ))
     
     return Div(
@@ -149,7 +148,7 @@ def _render_external_sources_list(
         Ul(
             *list_items,
             id=SelectionHtmlIds.EXTERNAL_SOURCES_LIST,
-            cls=combine_classes(border_radius.box, list_style.none, m(0), p(0), overflow.y.auto, max_h(32))
+            cls=combine_classes(list_ui, m(0), p(0), overflow.y.auto, max_h(32))
         ),
         id=SelectionHtmlIds.EXTERNAL_SOURCES_SECTION,
         cls=combine_classes(m.t(2), shrink._0),

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/models.py

@@ -3,12 +3,14 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/models.ipynb.
 
 # %% auto #0
-__all__ = ['SelectionStepState', 'SelectionUrls']
+__all__ = ['SelectionStepState', 'SelectionUrls', 'LocalFilesResult', 'SelectionResult']
 
 # %% ../nbs/models.ipynb #selection-models-imports
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Callable, Optional
 from typing_extensions import TypedDict
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+
+from fasthtml.common import APIRouter
 
 from cjm_source_provider.models import SelectedSource
 
@@ -51,3 +53,26 @@ class SelectionUrls:
 
     # Tab switching
     tab_switch: str = ""  # Switch source tabs
+
+# %% ../nbs/models.ipynb #gxc6wl5o4mn
+def _no_op_restore(session_id: str) -> None:
+    """Default no-op for restore_state."""
+    pass
+
+@dataclass
+class LocalFilesResult:
+    """Return type from init_local_files_router."""
+    routers: List[APIRouter]              # Routers to register (custom + file browser + VC)
+    routes: Dict[str, Callable]           # Named route handlers
+    render_panel: Callable                # (error_message?, session_id?) -> rendered panel
+    restore_state: Callable = field(default=_no_op_restore)  # (session_id) -> None, restore persisted state
+
+@dataclass
+class SelectionResult:
+    """Return type from init_selection_routers."""
+    routers: List[APIRouter]              # All selection routers to register
+    urls: "SelectionUrls" = field(default_factory=lambda: SelectionUrls())  # URL bundle
+    routes: Dict[str, Callable] = field(default_factory=dict)  # All named route handlers
+    render_local_files_panel: Optional[Callable] = None  # Render fn for local files tab
+    sb_state: Any = None                  # SourceBrowserRouterState
+    restore_state: Callable = field(default=_no_op_restore)  # (session_id) -> None, restore persisted state

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/routes/init.py

@@ -12,7 +12,7 @@ from fasthtml.common import APIRouter
 
 from cjm_fasthtml_interactions.core.state_store import get_session_id
 
-from ..models import SelectionUrls
+from ..models import SelectionUrls, SelectionResult
 from cjm_transcript_source_select.routes.core import (
     WorkflowStateStore,
     _rebuild_and_render_ref, _sync_items_ref,
@@ -32,7 +32,7 @@ def init_selection_routers(
     source_service: SourceService,  # The source service for queries
     workflow_id: str,  # The workflow identifier
     prefix: str,  # Base prefix for selection routes (e.g., "/workflow/selection")
-) -> Tuple[List[APIRouter], SelectionUrls, Dict[str, Callable], Callable, "SourceBrowserRouterState"]:
+) -> SelectionResult:  # Selection router result with routers, urls, routes, and restore
     """Initialize and return all selection routers with URL bundle."""
     urls = SelectionUrls()
 
@@ -42,7 +42,7 @@ def init_selection_routers(
     filtering_router, filtering_routes = init_filtering_router(
         state_store, workflow_id, source_service, f"{prefix}/filtering", urls
     )
-    local_files_routers, local_files_routes, render_local_files_panel = init_local_files_router(
+    local_files = init_local_files_router(
         state_store, workflow_id, source_service, f"{prefix}/local_files", urls
     )
     sb_state = init_source_browser_router(
@@ -92,7 +92,7 @@ def init_selection_routers(
 
     tabs_router, tabs_routes = init_tabs_router(
         state_store, workflow_id, source_service, f"{prefix}/tabs", urls,
-        render_local_files_panel=render_local_files_panel,
+        render_local_files_panel=local_files.render_panel,
         sb_state=sb_state,
     )
 
@@ -108,16 +108,23 @@ def init_selection_routers(
     urls.keyboard_reorder = filtering_routes["keyboard_reorder"].to()
     urls.filter = filtering_routes["filter"].to()
     urls.grouping_change = filtering_routes["grouping_change"].to()
-    urls.remove_external = local_files_routes["remove_external"].to()
+    urls.remove_external = local_files.routes["remove_external"].to()
     urls.tab_switch = tabs_routes["tab_switch"].to()
 
     merged_routes = {
         **queue_routes,
         **filtering_routes,
-        **local_files_routes,
+        **local_files.routes,
         **tabs_routes,
     }
 
-    routers = [queue_router, filtering_router, *local_files_routers, tabs_router, sb_state.router]
+    routers = [queue_router, filtering_router, *local_files.routers, tabs_router, sb_state.router]
 
-    return routers, urls, merged_routes, render_local_files_panel, sb_state
+    return SelectionResult(
+        routers=routers,
+        urls=urls,
+        routes=merged_routes,
+        render_local_files_panel=local_files.render_panel,
+        sb_state=sb_state,
+        restore_state=local_files.restore_state,
+    )

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/routes/local_files.py

@@ -17,7 +17,7 @@ from cjm_fasthtml_file_browser.routes.handlers import init_router as init_fb_rou
 
 from cjm_fasthtml_interactions.core.state_store import get_session_id
 
-from ..models import SelectionUrls
+from ..models import SelectionUrls, LocalFilesResult
 from cjm_transcript_source_select.routes.core import (
     WorkflowStateStore, _get_step_state, _update_step_state
 )
@@ -52,8 +52,6 @@ def _handle_remove_external_source(
     sess,  # FastHTML session object
     db_path: str,  # Path to the .db file to remove
     external_db_paths_ref: List[str],  # Shared external paths list (mutated in place)
-    fb_state_getter: Callable[[], BrowserState],  # File browser state getter
-    fb_state_setter: Callable[[BrowserState], None],  # File browser state setter
     fb_routers: FileBrowserRouters,  # File browser routers (for targeted OOB)
     remove_url: str,  # URL for remove button in external sources list
 ):  # Tuple of OOB elements (external sources list + checkbox cells)
@@ -66,13 +64,8 @@ def _handle_remove_external_source(
         _update_step_state(state_store, workflow_id, session_id, external_db_paths=list(external_db_paths_ref))
         source_service.set_external_paths(list(external_db_paths_ref))
 
-    # Sync browser selection state with external_db_paths for checkbox display
-    browser_state = fb_state_getter()
-    browser_state.selection.selected_paths = list(external_db_paths_ref)
-    fb_state_setter(browser_state)
-
-    # Targeted OOB updates instead of full panel re-render
-    checkbox_oobs = fb_routers.render_selection_oobs([db_path])
+    # Sync selection + get targeted OOBs in one call
+    checkbox_oobs = fb_routers.update_selection_oobs(list(external_db_paths_ref), [db_path])
     external_list_oob = _render_external_sources_list(
         list(external_db_paths_ref), remove_url, oob=True,
     )
@@ -85,7 +78,7 @@ def init_local_files_router(
     source_service: SourceService,  # The source service for external db ops
     prefix: str,  # Route prefix (e.g., "/workflow/selection/local_files")
     urls: SelectionUrls,  # URL bundle for rendering
-) -> Tuple[List, Dict[str, Callable], Callable]:  # (routers, route_dict, render_panel_fn)
+) -> LocalFilesResult:  # Router result with routers, routes, render, and restore
     """Initialize local files browser routes with new file browser API."""
     provider = _get_local_files_provider()
     config = _create_db_browser_config()
@@ -97,18 +90,57 @@ def init_local_files_router(
     # --- File browser state accessors (shared, non-per-session) ---
     _browser_state = BrowserState(current_path=home_path)
 
+    # --- Lazy state restoration from persisted store ---
+    _state_restored = [False]
+
+    def _restore_from_persisted(session_id: str) -> None:
+        """Load persisted external_db_paths and file_browser_state on first call."""
+        if _state_restored[0]:
+            return
+        step_state = _get_step_state(state_store, workflow_id, session_id)
+
+        # Restore external_db_paths
+        persisted_paths = step_state.get("external_db_paths", [])
+        if persisted_paths:
+            _external_db_paths[:] = persisted_paths
+            source_service.set_external_paths(list(_external_db_paths))
+
+        # Restore browser state (current_path, sort)
+        persisted_browser = step_state.get("file_browser_state", {})
+        if persisted_browser:
+            restored = BrowserState.from_dict(persisted_browser)
+            _browser_state.current_path = restored.current_path
+            _browser_state.sort_by = restored.sort_by
+            _browser_state.sort_descending = restored.sort_descending
+            # Selection synced from _external_db_paths via _fb_state_getter
+
+        _state_restored[0] = True
+
     def _fb_state_getter() -> BrowserState:
         """Get browser state with selection synced to external_db_paths."""
         _browser_state.selection.selected_paths = list(_external_db_paths)
         return _browser_state
 
-    def _fb_state_setter(state: BrowserState) -> None:
-        """Save browser state from file browser."""
+    def _fb_state_setter(state: BrowserState, request=None) -> None:
+        """Save browser state from file browser and persist to state store."""
+        # Lazy restore on first request
+        if request is not None and not _state_restored[0]:
+            _restore_from_persisted(get_session_id(request.session))
+
         _browser_state.current_path = state.current_path
         _browser_state.sort_by = state.sort_by
         _browser_state.sort_descending = state.sort_descending
         _browser_state.selection = state.selection
 
+        # Persist browser state
+        if request is not None:
+            session_id = get_session_id(request.session)
+            _update_step_state(
+                state_store, workflow_id, session_id,
+                file_browser_state=state.to_dict(),
+                current_browse_path=state.current_path,
+            )
+
     # --- Callbacks for file browser ---
     def _validate_selection(path: str) -> Tuple[bool, str]:
         """Validate .db schema before allowing selection (checkbox click path)."""
@@ -118,8 +150,12 @@ def init_local_files_router(
             return (False, error)
         return (True, "")
 
-    def _on_selection_change(selected_paths: List[str]) -> Tuple:
+    def _on_selection_change(selected_paths: List[str], request=None) -> Tuple:
         """Sync external_db_paths with validation and return OOB updates."""
+        # Lazy restore on first request
+        if request is not None and not _state_restored[0]:
+            _restore_from_persisted(get_session_id(request.session))
+
         # Validate any newly added paths
         old_set = set(_external_db_paths)
         validated_paths = []
@@ -141,6 +177,14 @@ def init_local_files_router(
         _external_db_paths[:] = validated_paths
         source_service.set_external_paths(list(_external_db_paths))
 
+        # Persist external_db_paths
+        if request is not None:
+            session_id = get_session_id(request.session)
+            _update_step_state(
+                state_store, workflow_id, session_id,
+                external_db_paths=list(_external_db_paths),
+            )
+
         return (
             _render_external_sources_list(list(_external_db_paths), urls.remove_external, oob=True),
             _render_error_alert(error_message, oob=True),
@@ -163,8 +207,12 @@ def init_local_files_router(
     )
 
     # --- Render function for the full local files panel ---
-    def _render_panel(error_message: Optional[str] = None) -> Any:
+    def _render_panel(error_message: Optional[str] = None, session_id: Optional[str] = None) -> Any:
         """Render the complete local files panel (file browser + external sources list)."""
+        # Restore persisted state and rebuild items before rendering
+        if session_id is not None and not _state_restored[0]:
+            _restore_from_persisted(session_id)
+            fb_routers.sync_items()
         return _render_local_files_browser(
             render_fn=fb_routers.render,
             external_paths=list(_external_db_paths),
@@ -172,6 +220,12 @@ def init_local_files_router(
             error_message=error_message,
         )
 
+    # --- Restore callable for eager state restoration ---
+    def _restore_state(session_id: str) -> None:
+        """Restore persisted local files state (external_db_paths + browser state)."""
+        _restore_from_persisted(session_id)
+        fb_routers.sync_items()
+
     # --- Custom router for remove_external (needs session context) ---
     custom_router = APIRouter(prefix=prefix)
 
@@ -182,8 +236,6 @@ def init_local_files_router(
             state_store, workflow_id, source_service,
             sess, db_path,
             external_db_paths_ref=_external_db_paths,
-            fb_state_getter=_fb_state_getter,
-            fb_state_setter=_fb_state_setter,
             fb_routers=fb_routers,
             remove_url=urls.remove_external,
         )
@@ -195,4 +247,9 @@ def init_local_files_router(
         "remove_external": remove_external,
     }
 
-    return all_routers, routes, _render_panel
+    return LocalFilesResult(
+        routers=all_routers,
+        routes=routes,
+        render_panel=_render_panel,
+        restore_state=_restore_state,
+    )

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/cjm_transcript_source_select/routes/tabs.py

@@ -6,7 +6,7 @@
 __all__ = ['init_tabs_router']
 
 # %% ../../nbs/routes/tabs.ipynb #ca31d3ff
-from typing import Any, Optional, Tuple, Dict, Callable
+from typing import Any, Optional, Tuple, Dict, List, Callable
 
 from fasthtml.common import APIRouter, Script
 
@@ -24,15 +24,16 @@ from ..services.source_utils import calculate_next_tab
 
 # %% ../../nbs/routes/tabs.ipynb #4d0109d3
 def _handle_tab_switch(
-    state_store: WorkflowStateStore,  # The workflow state store
-    workflow_id: str,  # The workflow identifier
     source_service: SourceService,  # The source service for queries
     request,  # FastHTML request object
     sess,  # FastHTML session object
     direction: str,  # Direction: "prev", "next", "db", or "files"
     urls: SelectionUrls,  # URL bundle for rendering
+    current_tab_ref: List[str],  # Mutable ref [current_tab] for closure-based tracking
     render_local_files_panel: Optional[Callable] = None,  # Render fn for Files tab
     sb_state: Any = None,  # SourceBrowserRouterState for DB tab VC rendering
+    state_store: WorkflowStateStore = None,  # State store (for reading step state)
+    workflow_id: str = "",  # Workflow ID (for reading step state)
 ):  # Tuple of inner content, OOB tab headers, and tab switch script
     """Switch between Plugin DB and Local Files tabs."""
     session_id = get_session_id(sess)
@@ -41,14 +42,10 @@ def _handle_tab_switch(
     selected_sources = step_state.get("selected_sources", [])
     grouping_mode = step_state.get("grouping_mode", "media_path")
 
-    # Determine new tab
-    workflow_state = state_store.get_state(workflow_id, session_id)
-    current_tab = workflow_state.get("source_tab", "db")
+    # Determine new tab from closure-based tracking (not persisted)
+    current_tab = current_tab_ref[0]
     new_tab = calculate_next_tab(direction, current_tab, ["db", "files"])
-
-    # Save new tab state
-    workflow_state["source_tab"] = new_tab
-    state_store.update_state(workflow_id, session_id, workflow_state)
+    current_tab_ref[0] = new_tab
 
     # Render the content for the new active tab
     if new_tab == "db":
@@ -56,7 +53,7 @@ def _handle_tab_switch(
         content = sb_state.rebuild_and_render(all_transcriptions, selected_sources, grouping_mode)
     else:
         if render_local_files_panel is not None:
-            content = render_local_files_panel()
+            content = render_local_files_panel(session_id=session_id)
         else:
             from cjm_transcript_source_select.components.local_files import _render_local_files_browser
             content = _render_local_files_browser()
@@ -85,14 +82,20 @@ def init_tabs_router(
     """Initialize tab switching routes."""
     router = APIRouter(prefix=prefix)
 
+    # Closure-based tab tracking (not persisted across restarts)
+    _current_tab: List[str] = ["db"]
+
     @router
     def tab_switch(request, sess, direction: str):
         """Switch between source tabs."""
         return _handle_tab_switch(
-            state_store, workflow_id, source_service,
-            request, sess, direction, urls=urls,
+            source_service=source_service,
+            request=request, sess=sess, direction=direction, urls=urls,
+            current_tab_ref=_current_tab,
             render_local_files_panel=render_local_files_panel,
             sb_state=sb_state,
+            state_store=state_store,
+            workflow_id=workflow_id,
         )
 
     routes = {

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15/cjm_transcript_source_select.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cjm-transcript-source-select
-Version: 0.0.13
+Version: 0.0.15
 Summary: FastHTML source selection component for transcript decomposition workflows, with federated database browsing, drag-drop ordering, and keyboard navigation.
 Home-page: https://github.com/cj-mills/cjm-transcript-source-select
 Author: Christian J. Mills
@@ -106,57 +106,57 @@ graph LR
     utils[utils<br/>utils]
 
     components_helpers --> models
-    components_local_files --> components_helpers
     components_local_files --> html_ids
+    components_local_files --> components_helpers
     components_preview_panel --> html_ids
     components_source_browser --> services_source_utils
     components_source_browser --> utils
     components_source_browser --> html_ids
+    components_step_renderer --> components_preview_panel
     components_step_renderer --> components_selection_queue
-    components_step_renderer --> components_source_browser
     components_step_renderer --> utils
     components_step_renderer --> components_local_files
     components_step_renderer --> html_ids
-    components_step_renderer --> components_preview_panel
     components_step_renderer --> models
-    routes_core --> components_selection_queue
-    routes_core --> services_source
-    routes_core --> html_ids
+    components_step_renderer --> components_source_browser
     routes_core --> models
+    routes_core --> services_source
+    routes_core --> components_selection_queue
     routes_core --> components_step_renderer
+    routes_core --> html_ids
+    routes_filtering --> routes_core
     routes_filtering --> services_source_utils
     routes_filtering --> services_source
-    routes_filtering --> routes_core
     routes_filtering --> models
     routes_init --> routes_core
+    routes_init --> routes_queue
+    routes_init --> routes_tabs
+    routes_init --> routes_filtering
     routes_init --> services_source
     routes_init --> routes_source_browser
-    routes_init --> routes_filtering
     routes_init --> routes_local_files
-    routes_init --> routes_queue
     routes_init --> models
-    routes_init --> routes_tabs
+    routes_local_files --> models
+    routes_local_files --> routes_core
     routes_local_files --> components_local_files
     routes_local_files --> services_source
-    routes_local_files --> routes_core
-    routes_local_files --> models
-    routes_queue --> services_source_utils
-    routes_queue --> services_source
     routes_queue --> routes_core
+    routes_queue --> services_source_utils
     routes_queue --> components_preview_panel
+    routes_queue --> services_source
     routes_queue --> models
-    routes_source_browser --> routes_core
-    routes_source_browser --> services_source_utils
     routes_source_browser --> components_source_browser
+    routes_source_browser --> components_preview_panel
+    routes_source_browser --> services_source_utils
     routes_source_browser --> services_source
+    routes_source_browser --> routes_core
     routes_source_browser --> html_ids
-    routes_source_browser --> components_preview_panel
     routes_source_browser --> models
+    routes_tabs --> models
     routes_tabs --> components_step_renderer
+    routes_tabs --> services_source
     routes_tabs --> routes_core
     routes_tabs --> services_source_utils
-    routes_tabs --> services_source
-    routes_tabs --> models
 ```
 
 *52 cross-module dependencies detected*
@@ -426,7 +426,7 @@ def init_selection_routers(
     source_service: SourceService,  # The source service for queries
     workflow_id: str,  # The workflow identifier
     prefix: str,  # Base prefix for selection routes (e.g., "/workflow/selection")
-) -> Tuple[List[APIRouter], SelectionUrls, Dict[str, Callable], Callable, "SourceBrowserRouterState"]
+) -> SelectionResult:  # Selection router result with routers, urls, routes, and restore
     "Initialize and return all selection routers with URL bundle."
 ```
 
@@ -526,8 +526,6 @@ def _handle_remove_external_source(
     sess,  # FastHTML session object
     db_path: str,  # Path to the .db file to remove
     external_db_paths_ref: List[str],  # Shared external paths list (mutated in place)
-    fb_state_getter: Callable[[], BrowserState],  # File browser state getter
-    fb_state_setter: Callable[[BrowserState], None],  # File browser state setter
     fb_routers: FileBrowserRouters,  # File browser routers (for targeted OOB)
     remove_url: str,  # URL for remove button in external sources list
 ):  # Tuple of OOB elements (external sources list + checkbox cells)
@@ -541,7 +539,7 @@ def init_local_files_router(
     source_service: SourceService,  # The source service for external db ops
     prefix: str,  # Route prefix (e.g., "/workflow/selection/local_files")
     urls: SelectionUrls,  # URL bundle for rendering
-) -> Tuple[List, Dict[str, Callable], Callable]:  # (routers, route_dict, render_panel_fn)
+) -> LocalFilesResult:  # Router result with routers, routes, render, and restore
     "Initialize local files browser routes with new file browser API."
 ```
 
@@ -560,10 +558,24 @@ _local_files_provider: Optional[LocalFileSystemProvider] = None
 ``` python
 from cjm_transcript_source_select.models import (
     SelectionStepState,
-    SelectionUrls
+    SelectionUrls,
+    LocalFilesResult,
+    SelectionResult
 )
 ```
 
+#### Functions
+
+``` python
+def _no_op_restore(session_id: str) -> None:
+    """Default no-op for restore_state."""
+    pass
+
+@dataclass
+class LocalFilesResult
+    "Default no-op for restore_state."
+```
+
 #### Classes
 
 ``` python
@@ -593,6 +605,30 @@ class SelectionUrls:
     tab_switch: str = ''  # Switch source tabs
 ```
 
+``` python
+@dataclass
+class LocalFilesResult:
+    "Return type from init_local_files_router."
+    
+    routers: List[APIRouter]  # Routers to register (custom + file browser + VC)
+    routes: Dict[str, Callable]  # Named route handlers
+    render_panel: Callable  # (error_message?, session_id?) -> rendered panel
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
+``` python
+@dataclass
+class SelectionResult:
+    "Return type from init_selection_routers."
+    
+    routers: List[APIRouter]  # All selection routers to register
+    urls: 'SelectionUrls' = field(...)  # URL bundle
+    routes: Dict[str, Callable] = field(...)  # All named route handlers
+    render_local_files_panel: Optional[Callable]  # Render fn for local files tab
+    sb_state: Any  # SourceBrowserRouterState
+    restore_state: Callable = field(...)  # (session_id) -> None, restore persisted state
+```
+
 ### preview_panel (`preview_panel.ipynb`)
 
 > Collapsible preview panel for displaying selected content
@@ -1436,15 +1472,16 @@ from cjm_transcript_source_select.routes.tabs import (
 
 ``` python
 def _handle_tab_switch(
-    state_store: WorkflowStateStore,  # The workflow state store
-    workflow_id: str,  # The workflow identifier
     source_service: SourceService,  # The source service for queries
     request,  # FastHTML request object
     sess,  # FastHTML session object
     direction: str,  # Direction: "prev", "next", "db", or "files"
     urls: SelectionUrls,  # URL bundle for rendering
+    current_tab_ref: List[str],  # Mutable ref [current_tab] for closure-based tracking
     render_local_files_panel: Optional[Callable] = None,  # Render fn for Files tab
     sb_state: Any = None,  # SourceBrowserRouterState for DB tab VC rendering
+    state_store: WorkflowStateStore = None,  # State store (for reading step state)
+    workflow_id: str = "",  # Workflow ID (for reading step state)
 ):  # Tuple of inner content, OOB tab headers, and tab switch script
     "Switch between Plugin DB and Local Files tabs."
 ```

{cjm_transcript_source_select-0.0.13 → cjm_transcript_source_select-0.0.15}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = cjm-transcript-source-select
 lib_name = cjm-transcript-source-select
-version = 0.0.13
+version = 0.0.15
 min_python = 3.12
 license = apache2
 black_formatting = False

cjm_transcript_source_select-0.0.13/cjm_transcript_source_select/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.13"