cjm-transcript-segment-align 0.0.29__tar.gz → 0.0.31__tar.gz

{cjm_transcript_segment_align-0.0.29/cjm_transcript_segment_align.egg-info → cjm_transcript_segment_align-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cjm-transcript-segment-align
-Version: 0.0.29
+Version: 0.0.31
 Summary: FastHTML dual-column text segmentation & VAD alignment UI for transcript decomposition workflows with forced alignment-based text splitting for aligning text segments with VAD chunks.
 Author-email: "Christian J. Mills" <9126128+cj-mills@users.noreply.github.com>
 License: Apache-2.0
@@ -15,10 +15,12 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-fasthtml==0.13.4
 Requires-Dist: cjm-plugin-system
 Requires-Dist: cjm_transcription_plugin_system
-Requires-Dist: cjm_transcript_segmentation>=0.0.20
-Requires-Dist: cjm_transcript_vad_align>=0.0.26
+Requires-Dist: cjm_transcript_segmentation>=0.0.22
+Requires-Dist: cjm_transcript_vad_align>=0.0.28
+Requires-Dist: cjm_fasthtml_keyboard_navigation>=0.0.22
 Requires-Dist: cjm_fasthtml_job_monitor>=0.0.11
 Requires-Dist: cjm_fasthtml_web_audio>=0.0.11
 Requires-Dist: cjm_fasthtml_design_system>=0.0.8
@@ -75,17 +77,17 @@ graph LR
 
     components_handlers --> components_step_renderer
     components_handlers --> services_forced_alignment
-    components_handlers --> routes_forced_alignment
-    components_handlers --> components_keyboard_config
     components_handlers --> html_ids
+    components_handlers --> components_keyboard_config
     components_handlers --> components_sync_controls
-    components_keyboard_config --> html_ids
+    components_handlers --> routes_forced_alignment
     components_keyboard_config --> components_sync_controls
-    components_step_renderer --> components_helpers
-    components_step_renderer --> components_sync_controls
+    components_keyboard_config --> html_ids
+    components_step_renderer --> html_ids
     components_step_renderer --> components_keyboard_config
+    components_step_renderer --> components_sync_controls
     components_step_renderer --> components_toolbar_state
-    components_step_renderer --> html_ids
+    components_step_renderer --> components_helpers
     components_toolbar_state --> components_sync_controls
     routes_chrome --> components_step_renderer
     routes_chrome --> components_handlers
@@ -94,15 +96,15 @@ graph LR
     routes_forced_alignment --> components_step_renderer
     routes_forced_alignment --> html_ids
     routes_forced_alignment --> components_sync_controls
+    routes_init --> components_handlers
     routes_init --> components_sync_controls
     routes_init --> services_forced_alignment
-    routes_init --> models
-    routes_init --> components_handlers
-    routes_init --> routes_forced_alignment
     routes_init --> html_ids
+    routes_init --> routes_forced_alignment
+    routes_init --> components_keyboard_config
+    routes_init --> models
     routes_init --> routes_chrome
     routes_init --> components_step_renderer
-    routes_init --> components_keyboard_config
 ```
 
 *30 cross-module dependencies detected*
@@ -141,13 +143,15 @@ async def _handle_switch_chrome(
     jm_trigger=None,  # Pre-rendered job monitor trigger element
     fa_toggle_url:str="",  # URL for FA toggle route
     fa_available:bool=False,  # Whether FA plugin is available
-) -> tuple:  # OOB swaps for shared chrome containers
+) -> tuple:  # OOB swaps for shared chrome containers (toolbar, footer, settings_trigger)
     """
     Switch shared chrome content based on active column.
     
     Client-side toolbar state restoration (sync button, auto-play toggle)
     is handled by the centralized settle handler from toolbar_state.py.
-    Settings modals persist in the DOM — only the trigger buttons swap.
+    Settings modals persist in the DOM — only the trigger button (in the
+    step header band, not the toolbar) swaps to retarget the active
+    column's modal_id (V2 / G3 closure).
     """
 ```
 
@@ -194,7 +198,13 @@ def render_fa_toggle(
     active_presplit: str,  # "nltk" or "forced_alignment"
     toggle_url: str,  # URL for toggle route
 ) -> Any:  # Toggle button group
-    "Render the NLTK / Force Aligned toggle button group."
+    """
+    Render the NLTK / Force Aligned toggle button group.
+    
+    Each leg uses primary_action (active) or secondary_action (inactive) — the
+    canonical V1 state-toggle composition — plus join_item for daisyui button
+    group joining.
+    """
 ```
 
 ``` python
@@ -498,6 +508,8 @@ def create_seg_init_chrome_wrapper(
     Saves nltk_presplit snapshot at init time for match detection.
     FA controls are rendered in the toolbar via extra_actions.
     Settings modals are rendered in a persistent container (both seg + align).
+    Settings trigger is OOB-swapped into the step header band (V2 / G3) — the
+    toolbar OOB no longer carries the trigger.
     """
 ```
 
@@ -831,12 +843,17 @@ def _render_shared_chrome(
     urls:SegmentationUrls=None,  # Segmentation URL bundle (required when seg_state provided)
     extra_actions:tuple=(),  # Extra toolbar elements (FA controls, sync toggle, etc.)
     nltk_split_disabled:bool=False,  # Whether NLTK Split button is disabled
-) -> tuple:  # (toolbar, footer, settings_modals_container)
+) -> tuple:  # (toolbar, footer, settings_modals_container, settings_trigger_container)
     """
     Render shared chrome containers, populated with segmentation content when initialized.
     
     Takes extracted state dicts from `extract_seg_state()` and `extract_alignment_state()`
     which contain deserialized TextSegment and VADChunk objects.
+    
+    The settings trigger lives in the step header band (paired with the keyboard-hints
+    trigger in `render_combined_step`), not the toolbar — matches `cjm-transcript-review`
+    placement (V2 / G3). Trigger contents swap on zone change via OOB (see
+    `routes/chrome.py:_handle_switch_chrome`); both modals persist in the DOM.
     """
 ```
 
@@ -924,7 +941,13 @@ from cjm_transcript_segment_align.components.sync_controls import (
 
 ``` python
 def render_sync_toggle_button() -> Any:  # Sync toggle button element
-    "Render the synced navigation toggle button for the seg toolbar."
+    """
+    Render the synced navigation toggle button for the seg toolbar.
+    
+    Initial state: secondary_action (outline neutral = inactive).
+    JS toggle flips between btn-primary and btn-outline (primary_action ↔
+    secondary_action) by manipulating the literal class strings.
+    """
 ```
 
 ``` python

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/README.md

@@ -49,17 +49,17 @@ graph LR
 
     components_handlers --> components_step_renderer
     components_handlers --> services_forced_alignment
-    components_handlers --> routes_forced_alignment
-    components_handlers --> components_keyboard_config
     components_handlers --> html_ids
+    components_handlers --> components_keyboard_config
     components_handlers --> components_sync_controls
-    components_keyboard_config --> html_ids
+    components_handlers --> routes_forced_alignment
     components_keyboard_config --> components_sync_controls
-    components_step_renderer --> components_helpers
-    components_step_renderer --> components_sync_controls
+    components_keyboard_config --> html_ids
+    components_step_renderer --> html_ids
     components_step_renderer --> components_keyboard_config
+    components_step_renderer --> components_sync_controls
     components_step_renderer --> components_toolbar_state
-    components_step_renderer --> html_ids
+    components_step_renderer --> components_helpers
     components_toolbar_state --> components_sync_controls
     routes_chrome --> components_step_renderer
     routes_chrome --> components_handlers
@@ -68,15 +68,15 @@ graph LR
     routes_forced_alignment --> components_step_renderer
     routes_forced_alignment --> html_ids
     routes_forced_alignment --> components_sync_controls
+    routes_init --> components_handlers
     routes_init --> components_sync_controls
     routes_init --> services_forced_alignment
-    routes_init --> models
-    routes_init --> components_handlers
-    routes_init --> routes_forced_alignment
     routes_init --> html_ids
+    routes_init --> routes_forced_alignment
+    routes_init --> components_keyboard_config
+    routes_init --> models
     routes_init --> routes_chrome
     routes_init --> components_step_renderer
-    routes_init --> components_keyboard_config
 ```
 
 *30 cross-module dependencies detected*
@@ -115,13 +115,15 @@ async def _handle_switch_chrome(
     jm_trigger=None,  # Pre-rendered job monitor trigger element
     fa_toggle_url:str="",  # URL for FA toggle route
     fa_available:bool=False,  # Whether FA plugin is available
-) -> tuple:  # OOB swaps for shared chrome containers
+) -> tuple:  # OOB swaps for shared chrome containers (toolbar, footer, settings_trigger)
     """
     Switch shared chrome content based on active column.
     
     Client-side toolbar state restoration (sync button, auto-play toggle)
     is handled by the centralized settle handler from toolbar_state.py.
-    Settings modals persist in the DOM — only the trigger buttons swap.
+    Settings modals persist in the DOM — only the trigger button (in the
+    step header band, not the toolbar) swaps to retarget the active
+    column's modal_id (V2 / G3 closure).
     """
 ```
 
@@ -168,7 +170,13 @@ def render_fa_toggle(
     active_presplit: str,  # "nltk" or "forced_alignment"
     toggle_url: str,  # URL for toggle route
 ) -> Any:  # Toggle button group
-    "Render the NLTK / Force Aligned toggle button group."
+    """
+    Render the NLTK / Force Aligned toggle button group.
+    
+    Each leg uses primary_action (active) or secondary_action (inactive) — the
+    canonical V1 state-toggle composition — plus join_item for daisyui button
+    group joining.
+    """
 ```
 
 ``` python
@@ -472,6 +480,8 @@ def create_seg_init_chrome_wrapper(
     Saves nltk_presplit snapshot at init time for match detection.
     FA controls are rendered in the toolbar via extra_actions.
     Settings modals are rendered in a persistent container (both seg + align).
+    Settings trigger is OOB-swapped into the step header band (V2 / G3) — the
+    toolbar OOB no longer carries the trigger.
     """
 ```
 
@@ -805,12 +815,17 @@ def _render_shared_chrome(
     urls:SegmentationUrls=None,  # Segmentation URL bundle (required when seg_state provided)
     extra_actions:tuple=(),  # Extra toolbar elements (FA controls, sync toggle, etc.)
     nltk_split_disabled:bool=False,  # Whether NLTK Split button is disabled
-) -> tuple:  # (toolbar, footer, settings_modals_container)
+) -> tuple:  # (toolbar, footer, settings_modals_container, settings_trigger_container)
     """
     Render shared chrome containers, populated with segmentation content when initialized.
     
     Takes extracted state dicts from `extract_seg_state()` and `extract_alignment_state()`
     which contain deserialized TextSegment and VADChunk objects.
+    
+    The settings trigger lives in the step header band (paired with the keyboard-hints
+    trigger in `render_combined_step`), not the toolbar — matches `cjm-transcript-review`
+    placement (V2 / G3). Trigger contents swap on zone change via OOB (see
+    `routes/chrome.py:_handle_switch_chrome`); both modals persist in the DOM.
     """
 ```
 
@@ -898,7 +913,13 @@ from cjm_transcript_segment_align.components.sync_controls import (
 
 ``` python
 def render_sync_toggle_button() -> Any:  # Sync toggle button element
-    "Render the synced navigation toggle button for the seg toolbar."
+    """
+    Render the synced navigation toggle button for the seg toolbar.
+    
+    Initial state: secondary_action (outline neutral = inactive).
+    JS toggle flips between btn-primary and btn-outline (primary_action ↔
+    secondary_action) by manipulating the literal class strings.
+    """
 ```
 
 ``` python

cjm_transcript_segment_align-0.0.31/cjm_transcript_segment_align/__init__.py

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

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/cjm_transcript_segment_align/components/handlers.py

@@ -19,10 +19,7 @@ from cjm_fasthtml_interactions.core.state_store import get_session_id
 from cjm_fasthtml_card_stack.components.settings_modal import render_card_stack_settings_modal, render_settings_trigger
 from cjm_fasthtml_card_stack.core.constants import DEFAULT_VISIBLE_COUNT
 from cjm_fasthtml_daisyui.components.data_display.badge import badge, badge_styles, badge_sizes
-from cjm_fasthtml_tailwind.utilities.sizing import w
 from cjm_fasthtml_tailwind.utilities.layout import display_tw
-from cjm_fasthtml_tailwind.utilities.flexbox_and_grid import flex_display, items, gap
-from cjm_fasthtml_tailwind.core.base import combine_classes
 
 from ..html_ids import CombinedHtmlIds
 from cjm_transcript_segment_align.components.step_renderer import (
@@ -383,10 +380,12 @@ def create_seg_init_chrome_wrapper(
     fa_available:bool=False,  # Whether forced alignment plugin is available
 ) -> Callable:  # Wrapped handler that builds KB system and shared chrome
     """Create a wrapper for seg init that builds combined KB system and shared chrome.
-    
+
     Saves nltk_presplit snapshot at init time for match detection.
     FA controls are rendered in the toolbar via extra_actions.
     Settings modals are rendered in a persistent container (both seg + align).
+    Settings trigger is OOB-swapped into the step header band (V2 / G3) — the
+    toolbar OOB no longer carries the trigger.
     """
     async def wrapped_seg_init(
         state_store:WorkflowStateStore,
@@ -405,9 +404,9 @@ def create_seg_init_chrome_wrapper(
             state_store, workflow_id, source_service, segmentation_service,
             request, sess, urls, visible_count, card_width,
         )
-        
+
         session_id = get_session_id(sess)
-        
+
         # Save NLTK pre-split snapshot for match detection
         workflow_state = state_store.get_state(workflow_id, session_id)
         step_states = workflow_state.get("step_states", {})
@@ -423,10 +422,10 @@ def create_seg_init_chrome_wrapper(
 
         chunk_count = len(align_state.get("vad_chunks", []))
         segment_count = len(result.segments)
-        
+
         # Build combined KB system with both zones
         kb_manager, kb_system = build_combined_kb_system(urls, align_urls)
-        
+
         # OOB swap for stable keyboard system container
         kb_system_oob = Div(
             kb_system.script,
@@ -435,10 +434,10 @@ def create_seg_init_chrome_wrapper(
             id=CombinedHtmlIds.KEYBOARD_SYSTEM,
             hx_swap_oob="innerHTML"
         )
-        
+
         # Zone change JS (goes in response for browser to execute)
         zone_change_js = generate_zone_change_js(switch_chrome_url)
-        
+
         # Hidden chrome switch button for HTMX trigger
         chrome_switch_btn = Button(
             id=SWITCH_CHROME_BTN_ID,
@@ -448,31 +447,32 @@ def create_seg_init_chrome_wrapper(
             hx_swap="none",
             hx_swap_oob="true",
         )
-        
+
         # Build FA extra_actions for toolbar
         fa_extra = build_fa_extra_actions(
             seg_state, jm_trigger, fa_toggle_url, fa_available,
         )
-        
-        # Settings modal trigger for seg column
+
+        # Settings modal trigger for seg column (header-band slot, not toolbar)
         settings_trigger = render_settings_trigger(modal_id=SEG_CS_IDS.settings_modal)
-        
-        # Toolbar OOB (settings trigger + toolbar with FA controls, NLTK Split disabled at init)
+        settings_trigger_oob = Div(
+            settings_trigger,
+            id=CombinedHtmlIds.SHARED_SETTINGS_TRIGGER,
+            hx_swap_oob="innerHTML"
+        )
+
+        # Toolbar OOB (toolbar with FA controls, NLTK Split disabled at init)
         toolbar_oob = Div(
-            Div(
-                settings_trigger,
-                render_toolbar(
-                    reset_url=urls.reset, ai_split_url=urls.ai_split, undo_url=urls.undo,
-                    can_undo=(result.history_depth > 0),
-                    extra_actions=build_extra_actions(fa_extra),
-                    nltk_split_disabled=True,
-                ),
-                cls=combine_classes(flex_display, items.center, gap(2), w.full),
+            render_toolbar(
+                reset_url=urls.reset, ai_split_url=urls.ai_split, undo_url=urls.undo,
+                can_undo=(result.history_depth > 0),
+                extra_actions=build_extra_actions(fa_extra),
+                nltk_split_disabled=True,
             ),
             id=CombinedHtmlIds.SHARED_TOOLBAR,
             hx_swap_oob="innerHTML"
         )
-        
+
         # Settings modals OOB (both seg + align persist in DOM)
         from cjm_transcript_vad_align.components.card_stack_config import (
             ALIGN_CS_CONFIG, ALIGN_CS_IDS,
@@ -493,10 +493,10 @@ def create_seg_init_chrome_wrapper(
             id=CombinedHtmlIds.SETTINGS_MODALS,
             hx_swap_oob="innerHTML"
         )
-        
+
         # Footer OOB with both column footers + alignment status
         seg_footer = render_seg_footer_content(result.segments, result.focused_index)
-        
+
         # Align footer (if alignment is initialized)
         is_align_init = align_state.get("is_initialized", False)
         if is_align_init and align_state.get("vad_chunks"):
@@ -505,21 +505,21 @@ def create_seg_init_chrome_wrapper(
             align_footer = render_align_footer_content(align_chunks, align_focused)
         else:
             align_footer = None
-        
+
         footer_oob = Div(
             render_footer_inner_content(seg_footer, align_footer, segment_count, chunk_count),
             id=CombinedHtmlIds.SHARED_FOOTER,
             hx_swap_oob="innerHTML"
         )
-        
+
         # Mini-stats badge OOB
         mini_stats_oob = render_seg_mini_stats_badge(result.segments, oob=True)
-        
+
         return (
             result.column_body, kb_system_oob, zone_change_js, chrome_switch_btn,
-            toolbar_oob, settings_modals_oob, footer_oob, mini_stats_oob,
+            toolbar_oob, settings_trigger_oob, settings_modals_oob, footer_oob, mini_stats_oob,
         )
-    
+
     return wrapped_seg_init
 
 # %% ../../nbs/components/handlers.ipynb #ecvyiypdxk

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/cjm_transcript_segment_align/components/step_renderer.py

@@ -244,21 +244,26 @@ def _render_shared_chrome(
     urls:SegmentationUrls=None,  # Segmentation URL bundle (required when seg_state provided)
     extra_actions:tuple=(),  # Extra toolbar elements (FA controls, sync toggle, etc.)
     nltk_split_disabled:bool=False,  # Whether NLTK Split button is disabled
-) -> tuple:  # (toolbar, footer, settings_modals_container)
+) -> tuple:  # (toolbar, footer, settings_modals_container, settings_trigger_container)
     """Render shared chrome containers, populated with segmentation content when initialized.
-    
+
     Takes extracted state dicts from `extract_seg_state()` and `extract_alignment_state()`
     which contain deserialized TextSegment and VADChunk objects.
+
+    The settings trigger lives in the step header band (paired with the keyboard-hints
+    trigger in `render_combined_step`), not the toolbar — matches `cjm-transcript-review`
+    placement (V2 / G3). Trigger contents swap on zone change via OOB (see
+    `routes/chrome.py:_handle_switch_chrome`); both modals persist in the DOM.
     """
     is_init = seg_state is not None and seg_state.get("is_initialized", False)
 
-    # --- Settings modals (both persist in DOM, triggers swap with toolbar) ---
+    # --- Settings modals (both persist in DOM, trigger swaps on zone change) ---
     seg_modal, seg_trigger = render_card_stack_settings_modal(
         SEG_CS_CONFIG, SEG_CS_IDS,
         current_count=seg_state.get("visible_count", DEFAULT_VISIBLE_COUNT) if seg_state else DEFAULT_VISIBLE_COUNT,
         card_width=seg_state.get("card_width", DEFAULT_CARD_WIDTH) if seg_state else DEFAULT_CARD_WIDTH,
     )
-    align_modal, align_trigger = render_card_stack_settings_modal(
+    align_modal, _align_trigger = render_card_stack_settings_modal(
         ALIGN_CS_CONFIG, ALIGN_CS_IDS,
         current_count=align_state.get("visible_count", 5) if align_state else 5,
         card_width=align_state.get("card_width", 40) if align_state else 40,
@@ -270,19 +275,24 @@ def _render_shared_chrome(
         id=CombinedHtmlIds.SETTINGS_MODALS,
     )
 
+    # --- Settings trigger (header-band slot; swaps on zone change via OOB) ---
+    # Initial render targets the seg modal because active_column starts as "seg".
+    # The chrome-switch handler retargets the trigger to the align modal_id when
+    # the user moves to the VAD column.
+    settings_trigger_container = Div(
+        seg_trigger,
+        id=CombinedHtmlIds.SHARED_SETTINGS_TRIGGER,
+    )
+
     # --- Toolbar ---
     if is_init and urls:
-        toolbar_content = Div(
-            seg_trigger,
-            render_toolbar(
-                reset_url=urls.reset,
-                ai_split_url=urls.ai_split,
-                undo_url=urls.undo,
-                can_undo=(len(seg_state.get("history", [])) > 0),
-                extra_actions=extra_actions,
-                nltk_split_disabled=nltk_split_disabled,
-            ),
-            cls=combine_classes(flex_display, items.center, gap(2), w.full),
+        toolbar_content = render_toolbar(
+            reset_url=urls.reset,
+            ai_split_url=urls.ai_split,
+            undo_url=urls.undo,
+            can_undo=(len(seg_state.get("history", [])) > 0),
+            extra_actions=extra_actions,
+            nltk_split_disabled=nltk_split_disabled,
         )
     else:
         toolbar_content = _placeholder("Toolbar actions will appear here based on the active column.")
@@ -298,7 +308,7 @@ def _render_shared_chrome(
     segment_count = len(seg_segments)
     align_chunks = align_state.get("vad_chunks", []) if align_state else []
     chunk_count = len(align_chunks)
-    
+
     # Seg footer
     if is_init and seg_segments:
         focused_index = seg_state.get("focused_index", 0)
@@ -325,7 +335,7 @@ def _render_shared_chrome(
         )
     )
 
-    return toolbar, footer, settings_modals_container
+    return toolbar, footer, settings_modals_container, settings_trigger_container
 
 # %% ../../nbs/components/step_renderer.ipynb #c9d0e1f2
 # Shared column styling (reused by init handler for outerHTML swap)
@@ -552,7 +562,7 @@ def render_combined_step(
         )
         mini_stats_text = render_seg_mini_stats_text(segments)
 
-        toolbar, footer, settings_modals_container = _render_shared_chrome(
+        toolbar, footer, settings_modals_container, settings_trigger_el = _render_shared_chrome(
             seg_state=seg_state,
             align_state=align_state,
             urls=seg_urls,
@@ -566,7 +576,7 @@ def render_combined_step(
             mini_stats_text=mini_stats_text,
         )
     else:
-        toolbar, footer, settings_modals_container = _render_shared_chrome(
+        toolbar, footer, settings_modals_container, settings_trigger_el = _render_shared_chrome(
             align_state=align_state,
         )
         seg_col = _render_seg_column(
@@ -650,7 +660,13 @@ def render_combined_step(
                     cls=combine_classes(text_tiers.secondary, m.b(2))
                 ),
             ),
-            hints_trigger,
+            # Top-right trigger pair: settings (zone-aware via OOB) + keyboard hints (static).
+            # Matches `cjm-transcript-review`'s placement (V2 / G3 closure).
+            Div(
+                settings_trigger_el,
+                hints_trigger,
+                cls=combine_classes(flex_display, items.center, gap(2)),
+            ),
             cls=combine_classes(flex_display, items.start, justify.between),
         ),
         toolbar,

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/cjm_transcript_segment_align/html_ids.py

@@ -22,6 +22,7 @@ class CombinedHtmlIds:
     SHARED_HINTS = "sd-shared-hints"
     SHARED_TOOLBAR = "sd-shared-toolbar"
     SHARED_FOOTER = "sd-shared-footer"
+    SHARED_SETTINGS_TRIGGER = "sd-shared-settings-trigger"
     ALIGNMENT_STATUS = "sd-alignment-status"
     SETTINGS_MODALS = "sd-settings-modals"
 

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/cjm_transcript_segment_align/routes/chrome.py

@@ -38,12 +38,6 @@ from cjm_transcript_vad_align.components.card_stack_config import (
     ALIGN_CS_CONFIG, ALIGN_CS_IDS,
 )
 
-from cjm_fasthtml_tailwind.utilities.sizing import w
-from cjm_fasthtml_tailwind.utilities.flexbox_and_grid import (
-    flex_display, items, gap,
-)
-from cjm_fasthtml_tailwind.core.base import combine_classes
-
 # Footer helper + FA extra_actions builder + match detection
 from cjm_transcript_segment_align.components.step_renderer import (
     render_footer_inner_content,
@@ -67,12 +61,14 @@ async def _handle_switch_chrome(
     jm_trigger=None,  # Pre-rendered job monitor trigger element
     fa_toggle_url:str="",  # URL for FA toggle route
     fa_available:bool=False,  # Whether FA plugin is available
-) -> tuple:  # OOB swaps for shared chrome containers
+) -> tuple:  # OOB swaps for shared chrome containers (toolbar, footer, settings_trigger)
     """Switch shared chrome content based on active column.
-    
+
     Client-side toolbar state restoration (sync button, auto-play toggle)
     is handled by the centralized settle handler from toolbar_state.py.
-    Settings modals persist in the DOM — only the trigger buttons swap.
+    Settings modals persist in the DOM — only the trigger button (in the
+    step header band, not the toolbar) swaps to retarget the active
+    column's modal_id (V2 / G3 closure).
     """
     form = await request.form()
     active_column = form.get("active_column", "seg")
@@ -91,10 +87,8 @@ async def _handle_switch_chrome(
     chunk_count = len(align_state.get("vad_chunks", []))
 
     if active_column == "seg":
-        # Segmentation chrome (settings trigger + toolbar)
-        segments = [TextSegment.from_dict(s) for s in seg_state.get("segments", [])]
+        # Segmentation toolbar (Undo + Reset + NLTK Split + FA controls)
         history = seg_state.get("history", [])
-        focused_index = seg_state.get("focused_index", 0)
 
         # Build FA extra_actions and NLTK Split disabled state
         fa_extra = build_fa_extra_actions(
@@ -106,30 +100,22 @@ async def _handle_switch_chrome(
         )
 
         settings_trigger = render_settings_trigger(modal_id=SEG_CS_IDS.settings_modal)
-        toolbar_content = Div(
-            settings_trigger,
-            render_seg_toolbar(
-                reset_url=seg_urls.reset,
-                ai_split_url=seg_urls.ai_split,
-                undo_url=seg_urls.undo,
-                can_undo=(len(history) > 0),
-                extra_actions=build_extra_actions(fa_extra),
-                nltk_split_disabled=nltk_disabled,
-            ),
-            cls=combine_classes(flex_display, items.center, gap(2), w.full),
+        toolbar_content = render_seg_toolbar(
+            reset_url=seg_urls.reset,
+            ai_split_url=seg_urls.ai_split,
+            undo_url=seg_urls.undo,
+            can_undo=(len(history) > 0),
+            extra_actions=build_extra_actions(fa_extra),
+            nltk_split_disabled=nltk_disabled,
         )
     else:
-        # Alignment chrome (settings trigger + speed selector + auto-play toggle)
+        # Alignment toolbar (speed selector + auto-play toggle)
         # Read persisted state so chrome switches restore the user's current speed + auto-nav
         settings_trigger = render_settings_trigger(modal_id=ALIGN_CS_IDS.settings_modal)
-        toolbar_content = Div(
-            settings_trigger,
-            render_align_toolbar(
-                current_speed=align_state.get("playback_speed", 1.0),
-                auto_navigate=align_state.get("auto_navigate", False),
-                speed_url=align_urls.speed_change,
-            ),
-            cls=combine_classes(flex_display, items.center, gap(2), w.full),
+        toolbar_content = render_align_toolbar(
+            current_speed=align_state.get("playback_speed", 1.0),
+            auto_navigate=align_state.get("auto_navigate", False),
+            speed_url=align_urls.speed_change,
         )
 
     # --- Footer: both column footers always present ---
@@ -144,7 +130,7 @@ async def _handle_switch_chrome(
     if DEBUG_SWITCH_CHROME:
         print(f"[SWITCH_CHROME] returning OOB swaps for {active_column}")
 
-    # Return OOB swaps (toolbar + footer — settings modals persist in DOM)
+    # Return OOB swaps (toolbar + footer + settings trigger — modals persist in DOM)
     toolbar_oob = Div(
         toolbar_content,
         id=CombinedHtmlIds.SHARED_TOOLBAR,
@@ -155,8 +141,13 @@ async def _handle_switch_chrome(
         id=CombinedHtmlIds.SHARED_FOOTER,
         hx_swap_oob="innerHTML"
     )
+    settings_trigger_oob = Div(
+        settings_trigger,
+        id=CombinedHtmlIds.SHARED_SETTINGS_TRIGGER,
+        hx_swap_oob="innerHTML"
+    )
 
-    return (toolbar_oob, footer_oob)
+    return (toolbar_oob, footer_oob, settings_trigger_oob)
 
 # %% ../../nbs/routes/chrome.ipynb #g7b8c9d0
 def init_chrome_router(

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31/cjm_transcript_segment_align.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cjm-transcript-segment-align
-Version: 0.0.29
+Version: 0.0.31
 Summary: FastHTML dual-column text segmentation & VAD alignment UI for transcript decomposition workflows with forced alignment-based text splitting for aligning text segments with VAD chunks.
 Author-email: "Christian J. Mills" <9126128+cj-mills@users.noreply.github.com>
 License: Apache-2.0
@@ -15,10 +15,12 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-fasthtml==0.13.4
 Requires-Dist: cjm-plugin-system
 Requires-Dist: cjm_transcription_plugin_system
-Requires-Dist: cjm_transcript_segmentation>=0.0.20
-Requires-Dist: cjm_transcript_vad_align>=0.0.26
+Requires-Dist: cjm_transcript_segmentation>=0.0.22
+Requires-Dist: cjm_transcript_vad_align>=0.0.28
+Requires-Dist: cjm_fasthtml_keyboard_navigation>=0.0.22
 Requires-Dist: cjm_fasthtml_job_monitor>=0.0.11
 Requires-Dist: cjm_fasthtml_web_audio>=0.0.11
 Requires-Dist: cjm_fasthtml_design_system>=0.0.8
@@ -75,17 +77,17 @@ graph LR
 
     components_handlers --> components_step_renderer
     components_handlers --> services_forced_alignment
-    components_handlers --> routes_forced_alignment
-    components_handlers --> components_keyboard_config
     components_handlers --> html_ids
+    components_handlers --> components_keyboard_config
     components_handlers --> components_sync_controls
-    components_keyboard_config --> html_ids
+    components_handlers --> routes_forced_alignment
     components_keyboard_config --> components_sync_controls
-    components_step_renderer --> components_helpers
-    components_step_renderer --> components_sync_controls
+    components_keyboard_config --> html_ids
+    components_step_renderer --> html_ids
     components_step_renderer --> components_keyboard_config
+    components_step_renderer --> components_sync_controls
     components_step_renderer --> components_toolbar_state
-    components_step_renderer --> html_ids
+    components_step_renderer --> components_helpers
     components_toolbar_state --> components_sync_controls
     routes_chrome --> components_step_renderer
     routes_chrome --> components_handlers
@@ -94,15 +96,15 @@ graph LR
     routes_forced_alignment --> components_step_renderer
     routes_forced_alignment --> html_ids
     routes_forced_alignment --> components_sync_controls
+    routes_init --> components_handlers
     routes_init --> components_sync_controls
     routes_init --> services_forced_alignment
-    routes_init --> models
-    routes_init --> components_handlers
-    routes_init --> routes_forced_alignment
     routes_init --> html_ids
+    routes_init --> routes_forced_alignment
+    routes_init --> components_keyboard_config
+    routes_init --> models
     routes_init --> routes_chrome
     routes_init --> components_step_renderer
-    routes_init --> components_keyboard_config
 ```
 
 *30 cross-module dependencies detected*
@@ -141,13 +143,15 @@ async def _handle_switch_chrome(
     jm_trigger=None,  # Pre-rendered job monitor trigger element
     fa_toggle_url:str="",  # URL for FA toggle route
     fa_available:bool=False,  # Whether FA plugin is available
-) -> tuple:  # OOB swaps for shared chrome containers
+) -> tuple:  # OOB swaps for shared chrome containers (toolbar, footer, settings_trigger)
     """
     Switch shared chrome content based on active column.
     
     Client-side toolbar state restoration (sync button, auto-play toggle)
     is handled by the centralized settle handler from toolbar_state.py.
-    Settings modals persist in the DOM — only the trigger buttons swap.
+    Settings modals persist in the DOM — only the trigger button (in the
+    step header band, not the toolbar) swaps to retarget the active
+    column's modal_id (V2 / G3 closure).
     """
 ```
 
@@ -194,7 +198,13 @@ def render_fa_toggle(
     active_presplit: str,  # "nltk" or "forced_alignment"
     toggle_url: str,  # URL for toggle route
 ) -> Any:  # Toggle button group
-    "Render the NLTK / Force Aligned toggle button group."
+    """
+    Render the NLTK / Force Aligned toggle button group.
+    
+    Each leg uses primary_action (active) or secondary_action (inactive) — the
+    canonical V1 state-toggle composition — plus join_item for daisyui button
+    group joining.
+    """
 ```
 
 ``` python
@@ -498,6 +508,8 @@ def create_seg_init_chrome_wrapper(
     Saves nltk_presplit snapshot at init time for match detection.
     FA controls are rendered in the toolbar via extra_actions.
     Settings modals are rendered in a persistent container (both seg + align).
+    Settings trigger is OOB-swapped into the step header band (V2 / G3) — the
+    toolbar OOB no longer carries the trigger.
     """
 ```
 
@@ -831,12 +843,17 @@ def _render_shared_chrome(
     urls:SegmentationUrls=None,  # Segmentation URL bundle (required when seg_state provided)
     extra_actions:tuple=(),  # Extra toolbar elements (FA controls, sync toggle, etc.)
     nltk_split_disabled:bool=False,  # Whether NLTK Split button is disabled
-) -> tuple:  # (toolbar, footer, settings_modals_container)
+) -> tuple:  # (toolbar, footer, settings_modals_container, settings_trigger_container)
     """
     Render shared chrome containers, populated with segmentation content when initialized.
     
     Takes extracted state dicts from `extract_seg_state()` and `extract_alignment_state()`
     which contain deserialized TextSegment and VADChunk objects.
+    
+    The settings trigger lives in the step header band (paired with the keyboard-hints
+    trigger in `render_combined_step`), not the toolbar — matches `cjm-transcript-review`
+    placement (V2 / G3). Trigger contents swap on zone change via OOB (see
+    `routes/chrome.py:_handle_switch_chrome`); both modals persist in the DOM.
     """
 ```
 
@@ -924,7 +941,13 @@ from cjm_transcript_segment_align.components.sync_controls import (
 
 ``` python
 def render_sync_toggle_button() -> Any:  # Sync toggle button element
-    "Render the synced navigation toggle button for the seg toolbar."
+    """
+    Render the synced navigation toggle button for the seg toolbar.
+    
+    Initial state: secondary_action (outline neutral = inactive).
+    JS toggle flips between btn-primary and btn-outline (primary_action ↔
+    secondary_action) by manipulating the literal class strings.
+    """
 ```
 
 ``` python

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/cjm_transcript_segment_align.egg-info/requires.txt

@@ -1,7 +1,9 @@
+python-fasthtml==0.13.4
 cjm-plugin-system
 cjm_transcription_plugin_system
-cjm_transcript_segmentation>=0.0.20
-cjm_transcript_vad_align>=0.0.26
+cjm_transcript_segmentation>=0.0.22
+cjm_transcript_vad_align>=0.0.28
+cjm_fasthtml_keyboard_navigation>=0.0.22
 cjm_fasthtml_job_monitor>=0.0.11
 cjm_fasthtml_web_audio>=0.0.11
 cjm_fasthtml_design_system>=0.0.8

{cjm_transcript_segment_align-0.0.29 → cjm_transcript_segment_align-0.0.31}/pyproject.toml

@@ -12,7 +12,7 @@ license = {text = "Apache-2.0"}
 authors = [{name = "Christian J. Mills", email = "9126128+cj-mills@users.noreply.github.com"}]
 keywords = ['nbdev', 'jupyter', 'notebook', 'python']
 classifiers = ["Natural Language :: English", "Intended Audience :: Developers", "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only"]
-dependencies = ['cjm-plugin-system', 'cjm_transcription_plugin_system', 'cjm_transcript_segmentation>=0.0.20', 'cjm_transcript_vad_align>=0.0.26', 'cjm_fasthtml_job_monitor>=0.0.11', 'cjm_fasthtml_web_audio>=0.0.11', 'cjm_fasthtml_design_system>=0.0.8']
+dependencies = ['python-fasthtml==0.13.4', 'cjm-plugin-system', 'cjm_transcription_plugin_system', 'cjm_transcript_segmentation>=0.0.22', 'cjm_transcript_vad_align>=0.0.28', 'cjm_fasthtml_keyboard_navigation>=0.0.22', 'cjm_fasthtml_job_monitor>=0.0.11', 'cjm_fasthtml_web_audio>=0.0.11', 'cjm_fasthtml_design_system>=0.0.8']
 
 [project.urls]
 Repository = "https://github.com/cj-mills/cjm-transcript-segment-align"

cjm_transcript_segment_align-0.0.29/cjm_transcript_segment_align/__init__.py

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