euporie 2.8.4__py3-none-any.whl → 2.8.6__py3-none-any.whl

euporie/notebook/tabs/notebook.py

@@ -12,24 +12,14 @@ import nbformat
 from prompt_toolkit.clipboard.base import ClipboardData
 from prompt_toolkit.filters import (
     Condition,
-    buffer_has_focus,
-    has_completions,
-    vi_mode,
-    vi_navigation_mode,
 )
 from prompt_toolkit.layout.containers import ConditionalContainer, VSplit
 from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.mouse_events import MouseEventType
 
-from euporie.core.commands import add_cmd, get_cmd
-from euporie.core.config import add_setting
-from euporie.core.current import get_app
+from euporie.core.commands import get_cmd
 from euporie.core.filters import (
-    cursor_on_first_line,
-    cursor_on_last_line,
-    display_has_focus,
     insert_mode,
-    kernel_tab_has_focus,
     multiple_cells_selected,
     replace_mode,
 )
@@ -42,29 +32,23 @@ from euporie.core.layout.decor import Line, Pattern
 from euporie.core.layout.scroll import ScrollingContainer
 from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.style import KERNEL_STATUS_REPR
-from euporie.core.tabs.base import KernelTab
 from euporie.core.tabs.notebook import BaseNotebook
 from euporie.core.widgets.cell import Cell
-from euporie.notebook.filters import (
-    cell_has_focus,
-    code_cell_selected,
-    deleted_cells,
-    notebook_has_focus,
-)
 
 if TYPE_CHECKING:
+    from collections.abc import MutableSequence, Sequence
     from pathlib import Path
-    from typing import Any, MutableSequence, Sequence
+    from typing import Any
 
     from prompt_toolkit.formatted_text.base import StyleAndTextTuples
     from prompt_toolkit.key_binding.key_bindings import NotImplementedOrNone
     from prompt_toolkit.layout.containers import AnyContainer
     from prompt_toolkit.mouse_events import MouseEvent
 
-    from euporie.core.app import BaseApp
+    from euporie.core.app.app import BaseApp
+    from euporie.core.bars.status import StatusBarFields
     from euporie.core.comm.base import Comm
-    from euporie.core.kernel import Kernel
-    from euporie.core.widgets.status import StatusBarFields
+    from euporie.core.kernel.client import Kernel
 
 log = logging.getLogger(__name__)
 
@@ -87,6 +71,7 @@ class Notebook(BaseNotebook):
         file_extensions.update(dict.fromkeys(NOTEBOOK_EXTENSIONS))
 
     allow_stdin = True
+    bg_init = True
 
     def __init__(
         self,
@@ -139,7 +124,7 @@ class Notebook(BaseNotebook):
             return (
                 [
                     self.mode(),
-                    f"Cell {self.page.selected_slice.start+1}",
+                    f"Cell {self.page.selected_slice.start + 1}",
                     f"Rendering… ({rendered:.0%})" if rendered and rendered < 1 else "",
                     "Saving…" if self.saving else "",
                 ],
@@ -183,6 +168,9 @@ class Notebook(BaseNotebook):
         self.page = ScrollingContainer(
             self.rendered_cells, width=self.app.config.max_notebook_width
         )
+        # Ensure all cells get initialized ASAP to prevent race conditions
+        # creating multiple version of cells across threads
+        self.page.all_children()
 
         expand = Condition(lambda: self.app.config.expand)
 
@@ -592,643 +580,6 @@ class Notebook(BaseNotebook):
                     cell.run_or_render(wait=wait)
             log.debug("All cells run")
 
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_scroll_bar",
-        title="scroll bar",
-        flags=["--show-scroll-bar"],
-        type_=bool,
-        help_="Show the scroll bar",
-        default=True,
-        description="""
-            Whether the scroll bar should be shown on the right of the screen.
-        """,
-    )
-
-    # ################################### Commands ####################################
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _enter_cell_edit_mode() -> None:
-        """Enter cell edit mode."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.enter_edit_mode()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus
-        & buffer_has_focus
-        & (~vi_mode | (vi_mode & vi_navigation_mode)),
-    )
-    def _exit_edit_mode() -> None:
-        """Exit cell edit mode."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.exit_edit_mode()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus,
-    )
-    def _run_selected_cells() -> None:
-        """Run or render the current cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.run_selected_cells()
-
-    @staticmethod
-    @add_cmd(
-        title="Run selected cells and select next cell",
-        filter=cell_has_focus,
-    )
-    def _run_and_select_next() -> None:
-        """Run or render the current cells and select the next cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.run_selected_cells(advance=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus,
-    )
-    def _run_cell_and_insert_below() -> None:
-        """Run or render the current cells and insert a new cell below."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.run_selected_cells(insert=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus,
-    )
-    def _run_all_cells() -> None:
-        """Run or render all the cells in the current notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.run_all()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _add_cell_above() -> None:
-        """Add a new cell above the current."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.add_cell_above()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _add_cell_below() -> None:
-        """Add a new cell below the current."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.add_cell_below()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _delete_cells() -> None:
-        """Delete the current cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.delete()
-
-    @staticmethod
-    @add_cmd(
-        menu_title="Undo delete cell",
-        filter=notebook_has_focus
-        & ~buffer_has_focus
-        & ~display_has_focus
-        & deleted_cells,
-    )
-    def _undelete_cells() -> None:
-        """Undelete the last deleted cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.undelete()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _cut_cells() -> None:
-        """Cut the current cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.cut()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _copy_cells() -> None:
-        """Copy the current cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.copy()
-
-    @staticmethod
-    @add_cmd(
-        menu_title="Copy cell outputs",
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _copy_outputs() -> None:
-        """Copy the cell's output to the clipboard."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.copy_outputs()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _paste_cells() -> None:
-        """Pate the previously copied cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.paste()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus
-        & ~buffer_has_focus
-        & ~display_has_focus
-        & multiple_cells_selected,
-    )
-    def _merge_cells() -> None:
-        """Merge the selected cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.merge()
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    @add_cmd(
-        filter=notebook_has_focus,
-    )
-    def _scroll_up() -> NotImplementedOrNone:
-        """Scroll the page up a line."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            return nb.page.scroll(1)
-        return None
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    @add_cmd(
-        filter=notebook_has_focus,
-    )
-    def _scroll_down() -> NotImplementedOrNone:
-        """Scroll the page down a line."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            return nb.page.scroll(-1)
-        return None
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _scroll_up_5_lines() -> None:
-        """Scroll the page up 5 lines."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.page.scroll(5)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _scroll_down_5_lines() -> None:
-        """Scroll the page down 5 lines."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.page.scroll(-5)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_first_cell() -> None:
-        """Select the first cell in the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(0)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_5th_previous_cell() -> None:
-        """Go up 5 cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page.selected_slice.start - 5)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_previous_cell() -> None:
-        """Go up one cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page.selected_slice.start - 1)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_next_cell() -> None:
-        """Select the next cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page.selected_slice.start + 1)
-
-    @staticmethod
-    @add_cmd(
-        filter=~buffer_has_focus,
-    )
-    def _select_5th_next_cell() -> None:
-        """Go down 5 cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page.selected_slice.start + 5)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_last_cell() -> None:
-        """Select the last cell in the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(len(nb.page.all_children()) - 1)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _select_all_cells() -> None:
-        """Select all cells in the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.page.selected_slice = slice(
-                0,
-                len(nb.page.all_children()) + 1,
-            )
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _extend_cell_selection_to_top() -> None:
-        """Extend the cell selection to the top of the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(0, extend=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _extend_cell_selection_up() -> None:
-        """Extend the cell selection up a cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page._selected_slice.start - 1, extend=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _extend_cell_selection_down() -> None:
-        """Extend the cell selection down a cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(nb.page._selected_slice.start + 1, extend=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _extend_cell_selection_to_bottom() -> None:
-        """Extend the cell selection to the bottom of the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.select(len(nb.json["cells"]) - 1, extend=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _move_cells_up() -> None:
-        """Move selected cells up."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.move(-1)
-
-    @staticmethod
-    @add_cmd(
-        filter=notebook_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _move_cells_down() -> None:
-        """Move selected cells down."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.move(1)
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _cells_to_markdown() -> None:
-        """Change selected cells to markdown cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.set_cell_type("markdown", clear=True)
-                # Remove unallowed additional properties
-                json = cell.json
-                json.pop("execution_count", None)
-                json.pop("outputs", None)
-                cell.run_or_render()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _cells_to_code() -> None:
-        """Change selected cells to code cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.set_cell_type("code", clear=False)
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _cells_to_raw() -> None:
-        """Change selected cells to raw cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.set_cell_type("raw", clear=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _clear_cell_outputs() -> None:
-        """Clear the outputs of the selected cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.remove_outputs()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _clear_all_outputs() -> None:
-        """Clear the outputs of the selected cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb._rendered_cells.values():
-                cell.remove_outputs()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-        title="Expand cell inputs",
-    )
-    def _show_cell_inputs() -> None:
-        """Expand the selected cells' inputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.show_input()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-        title="Collapse cell inputs",
-    )
-    def _hide_cell_inputs() -> None:
-        """Collapse the selected cells' inputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.hide_input()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _toggle_cell_inputs() -> None:
-        """Toggle the visibility of the selected cells' inputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.toggle_input()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-        title="Expand cell outputs",
-    )
-    def _show_cell_outputs() -> None:
-        """Expand the selected cells' outputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.show_output()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-        title="Collapse cell outputs",
-    )
-    def _hide_cell_outputs() -> None:
-        """Collapse the selected cells' outputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.hide_output()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _toggle_cell_outputs() -> None:
-        """Toggle the visibility of the selected cells' outputs."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                cell.toggle_output()
-
-    @staticmethod
-    @add_cmd(
-        title="Reformat cells",
-        filter=code_cell_selected
-        & cell_has_focus
-        & ~buffer_has_focus
-        & notebook_has_focus,
-    )
-    def _reformat_cells() -> None:
-        """Format the selected code cells."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            for cell in nb.cells:
-                if cell.cell_type == "code":
-                    cell.input_box.reformat()
-
-    @staticmethod
-    @add_cmd(filter=notebook_has_focus & ~buffer_has_focus)
-    def _reformat_notebook() -> None:
-        """Automatically reformat all code cells in the notebook."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.reformat()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    async def _edit_in_external_editor() -> None:
-        """Edit cell in $EDITOR."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            await nb.cell.edit_in_editor()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & buffer_has_focus,
-    )
-    def _split_cell() -> None:
-        """Split the current cell at the cursor position."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.split_cell()
-
-    @staticmethod
-    @add_cmd(
-        name="edit-previous-cell-vi",
-        filter=cell_has_focus
-        & buffer_has_focus
-        & cursor_on_first_line
-        & ~has_completions
-        & vi_mode
-        & vi_navigation_mode,
-    )
-    @add_cmd(
-        filter=cell_has_focus
-        & buffer_has_focus
-        & cursor_on_first_line
-        & ~has_completions
-    )
-    def _edit_previous_cell() -> None:
-        """Move the cursor up to the previous cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            new_index = nb.cell.index - 1
-            cells = nb.rendered_cells()
-            if 0 <= new_index < len(cells):
-                nb.select(index=new_index, position=-1, scroll=True)
-
-    @staticmethod
-    @add_cmd(
-        name="edit-next-cell-vi",
-        filter=cell_has_focus
-        & buffer_has_focus
-        & cursor_on_last_line
-        & ~has_completions
-        & vi_mode
-        & vi_navigation_mode,
-    )
-    @add_cmd(
-        filter=cell_has_focus
-        & buffer_has_focus
-        & cursor_on_last_line
-        & ~has_completions
-    )
-    def _edit_next_cell() -> None:
-        """Move the cursor down to the next cell."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            new_index = nb.cell.index + 1
-            cells = nb.rendered_cells()
-            if 0 <= new_index < len(cells):
-                nb.select(index=new_index, position=0, scroll=True)
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _scroll_output_left() -> None:
-        """Scroll the cell output to the left."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.cell.output_area.scroll_left()
-
-    @staticmethod
-    @add_cmd(
-        filter=cell_has_focus & ~buffer_has_focus,
-    )
-    def _scroll_output_right() -> None:
-        """Scroll the cell output to the right."""
-        nb = get_app().tab
-        if isinstance(nb, Notebook):
-            nb.cell.output_area.scroll_right()
-
-    @staticmethod
-    @add_cmd(
-        filter=kernel_tab_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _interrupt_kernel() -> None:
-        """Interrupt the notebook's kernel."""
-        if isinstance(kt := get_app().tab, KernelTab):
-            kt.interrupt_kernel()
-
-    @staticmethod
-    @add_cmd(
-        filter=kernel_tab_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _restart_kernel() -> None:
-        """Restart the notebook's kernel."""
-        if isinstance(kt := get_app().tab, KernelTab):
-            kt.restart_kernel()
-
-    @staticmethod
-    @add_cmd(
-        filter=kernel_tab_has_focus & ~buffer_has_focus & ~display_has_focus,
-    )
-    def _restart_kernel_and_clear_all_outputs() -> None:
-        """Restart the notebook's kernel and clear all cell output."""
-        if isinstance(nb := get_app().tab, Notebook):
-            nb.restart_kernel(cb=Notebook._clear_all_outputs)
-
-    @staticmethod
-    @add_cmd(
-        filter=~buffer_has_focus,
-    )
-    def _notebook_toggle_line_numbers() -> None:
-        """Toggle line numbers when a buffer does not have focus."""
-        get_cmd("toggle-line-numbers").run()
-
     # ################################# Key Bindings ##################################
 
     register_bindings(