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

euporie/core/widgets/cell.py

@@ -49,7 +49,7 @@ if TYPE_CHECKING:
 
     from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.completion.base import Completer
-    from prompt_toolkit.formatted_text.base import OneStyleAndTextTuple
+    from prompt_toolkit.formatted_text.base import StyleAndTextTuples
 
     from euporie.core.format import Formatter
     from euporie.core.inspection import Inspector
@@ -234,36 +234,11 @@ class Cell:
         fill = partial(Window, style="class:border")
 
         # Create textbox for standard input
-        def _send_input(buf: Buffer) -> bool:
-            return False
-
         self.stdin_box = StdInput(weak_self.kernel_tab)
 
-        top_border = VSplit(
-            [
-                self.control,
-                ConditionalContainer(
-                    content=fill(
-                        char=border_char("TOP_MID"),
-                        width=lambda: len(weak_self.prompt),
-                        height=1,
-                    ),
-                    filter=show_prompt,
-                ),
-                ConditionalContainer(
-                    content=fill(width=1, height=1, char=border_char("TOP_SPLIT")),
-                    filter=show_prompt,
-                ),
-                fill(char=border_char("TOP_MID"), height=1),
-                fill(width=1, height=1, char=border_char("TOP_RIGHT")),
-            ],
-            height=1,
-        )
-
         input_row = ConditionalContainer(
             VSplit(
                 [
-                    fill(width=1, char=border_char("MID_LEFT")),
                     ConditionalContainer(
                         content=Window(
                             FormattedTextControl(
@@ -276,63 +251,44 @@ class Cell:
                                     ("", "\n ", lambda e: NotImplemented),
                                 ]
                             ),
-                            width=lambda: len(weak_self.prompt),
+                            width=lambda: len(weak_self.prompt) + 1,
                             height=Dimension(preferred=1),
                             style="class:input,prompt",
                         ),
                         filter=show_prompt,
                     ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_SPLIT")),
-                        filter=show_prompt,
-                    ),
                     ConditionalContainer(self.input_box, filter=~source_hidden),
                     ConditionalContainer(
                         Window(
                             FormattedTextControl(
-                                [
-                                    cast(
-                                        "OneStyleAndTextTuple",
+                                cast(
+                                    "StyleAndTextTuples",
+                                    [
+                                        (
+                                            "class:cell,show,inputs,border",
+                                            "▏",
+                                            on_click(self.show_input),
+                                        ),
                                         (
                                             "class:cell,show,inputs",
-                                            " … ",
+                                            "…",
                                             on_click(self.show_input),
                                         ),
-                                    )
-                                ]
+                                        (
+                                            "class:cell,show,inputs,border",
+                                            "▕",
+                                            on_click(self.show_input),
+                                        ),
+                                    ],
+                                )
                             )
                         ),
                         filter=source_hidden,
                     ),
-                    fill(width=1, char=border_char("MID_RIGHT")),
                 ],
             ),
             filter=show_input,
         )
-        middle_line = ConditionalContainer(
-            content=VSplit(
-                [
-                    fill(width=1, height=1, char=border_char("SPLIT_LEFT")),
-                    ConditionalContainer(
-                        content=fill(
-                            char=border_char("SPLIT_MID"),
-                            width=lambda: len(weak_self.prompt),
-                        ),
-                        filter=show_prompt,
-                    ),
-                    ConditionalContainer(
-                        content=fill(
-                            width=1, height=1, char=border_char("SPLIT_SPLIT")
-                        ),
-                        filter=show_prompt,
-                    ),
-                    fill(char=border_char("SPLIT_MID")),
-                    fill(width=1, height=1, char=border_char("SPLIT_RIGHT")),
-                ],
-                height=1,
-            ),
-            filter=(show_input & show_output) | self.stdin_box.visible,
-        )
 
         outputs_hidden = Condition(
             lambda: weak_self.json["metadata"]
@@ -344,7 +300,6 @@ class Cell:
         output_row = ConditionalContainer(
             VSplit(
                 [
-                    fill(width=1, char=border_char("MID_LEFT")),
                     ConditionalContainer(
                         content=Window(
                             FormattedTextControl(
@@ -357,20 +312,12 @@ class Cell:
                                     ("", "\n ", lambda e: NotImplemented),
                                 ],
                             ),
-                            width=lambda: len(weak_self.prompt),
+                            width=lambda: len(weak_self.prompt) + 1,
                             height=Dimension(preferred=1),
                             style="class:output,prompt",
                         ),
                         filter=show_prompt,
                     ),
-                    ConditionalContainer(
-                        content=fill(width=1, char=border_char("MID_SPLIT")),
-                        filter=show_prompt,
-                    ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_MID")),
-                        filter=~show_prompt,
-                    ),
                     HSplit(
                         [
                             ConditionalContainer(
@@ -380,51 +327,38 @@ class Cell:
                             ConditionalContainer(
                                 Window(
                                     FormattedTextControl(
-                                        [
-                                            cast(
-                                                "OneStyleAndTextTuple",
+                                        cast(
+                                            "StyleAndTextTuples",
+                                            [
+                                                (
+                                                    "class:cell,show,outputs,border",
+                                                    "▏",
+                                                    on_click(self.show_output),
+                                                ),
                                                 (
                                                     "class:cell,show,outputs",
-                                                    " … ",
+                                                    "…",
                                                     on_click(self.show_output),
                                                 ),
-                                            ),
-                                        ]
+                                                (
+                                                    "class:cell,show,outputs,border",
+                                                    "▕",
+                                                    on_click(self.show_output),
+                                                ),
+                                            ],
+                                        )
                                     )
                                 ),
                                 filter=outputs_hidden,
                             ),
                             self.stdin_box,
-                        ]
-                    ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_MID")),
-                        filter=~show_prompt,
+                        ],
                     ),
-                    fill(width=1, char=border_char("MID_RIGHT")),
                 ],
+                width=Dimension(min=1),
             ),
             filter=show_output | self.stdin_box.visible,
         )
-        bottom_border = VSplit(
-            [
-                fill(width=1, height=1, char=border_char("BOTTOM_LEFT")),
-                ConditionalContainer(
-                    content=fill(
-                        char=border_char("BOTTOM_MID"),
-                        width=lambda: len(weak_self.prompt),
-                    ),
-                    filter=show_prompt,
-                ),
-                ConditionalContainer(
-                    content=fill(width=1, height=1, char=border_char("BOTTOM_SPLIT")),
-                    filter=show_prompt,
-                ),
-                fill(char=border_char("BOTTOM_MID")),
-                fill(width=1, height=1, char=border_char("BOTTOM_RIGHT")),
-            ],
-            height=1,
-        )
 
         def _style() -> str:
             """Calculate the cell's style given its state."""
@@ -438,11 +372,32 @@ class Cell:
 
         self.container = HSplit(
             [
-                top_border,
-                input_row,
-                middle_line,
-                output_row,
-                bottom_border,
+                VSplit(
+                    [
+                        self.control,
+                        fill(char=border_char("TOP_MID"), height=1),
+                        fill(width=1, height=1, char=border_char("TOP_RIGHT")),
+                    ],
+                    height=1,
+                ),
+                VSplit(
+                    [
+                        fill(width=1, char=border_char("MID_LEFT")),
+                        HSplit(
+                            [input_row, output_row],
+                            padding=lambda: 1 if show_input() and show_output() else 0,
+                        ),
+                        fill(width=1, char=border_char("MID_RIGHT")),
+                    ]
+                ),
+                VSplit(
+                    [
+                        fill(width=1, height=1, char=border_char("BOTTOM_LEFT")),
+                        fill(char=border_char("BOTTOM_MID")),
+                        fill(width=1, height=1, char=border_char("BOTTOM_RIGHT")),
+                    ],
+                    height=1,
+                ),
             ],
             style=_style,
         )
@@ -795,7 +750,7 @@ class Cell:
         """Set the execution count of the cell."""
         self.json["execution_count"] = n
 
-    def add_output(self, output_json: dict[str, Any]) -> None:
+    def add_output(self, output_json: dict[str, Any], own: bool) -> None:
         """Add a new output to the cell."""
         # Clear the output if we were previously asked to
         if self.clear_outputs_on_output:

euporie/core/widgets/dialog.py

@@ -26,6 +26,7 @@ from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
     Float,
+    to_container,
 )
 from prompt_toolkit.layout.controls import FormattedTextControl, UIContent, UIControl
 from prompt_toolkit.layout.dimension import Dimension
@@ -189,7 +190,7 @@ class Dialog(Float, metaclass=ABCMeta):
         # Set default body & buttons
         self.body: AnyContainer = Window()
         self.buttons: dict[str, Callable | None] = {"OK": None}
-        self.button_widgets: list[AnyContainer] = []
+        self._button_widgets: list[AnyContainer] = []
 
         # Create key-bindings
         kb = KeyBindings()
@@ -225,16 +226,12 @@ class Dialog(Float, metaclass=ABCMeta):
         )
 
         # The buttons.
+        self.button_split = VSplit(self.button_widgets, padding=1)
         buttons_row = ConditionalContainer(
             Box(
-                body=DynamicContainer(
-                    lambda: VSplit(
-                        self.button_widgets,
-                        padding=1,
-                        key_bindings=DynamicKeyBindings(lambda: self.buttons_kb),
-                    )
-                ),
+                body=self.button_split,
                 height=Dimension(min=1, max=3, preferred=3),
+                key_bindings=DynamicKeyBindings(lambda: self.buttons_kb),
             ),
             filter=Condition(lambda: bool(self.buttons)),
         )
@@ -263,6 +260,16 @@ class Dialog(Float, metaclass=ABCMeta):
         # Set the body as the float's contents
         super().__init__(content=self.container)
 
+    @property
+    def button_widgets(self) -> list[AnyContainer]:
+        """A list of button widgets to show in the dialog's row of buttons."""
+        return self._button_widgets
+
+    @button_widgets.setter
+    def button_widgets(self, value: list[AnyContainer]) -> None:
+        self._button_widgets = list(value)
+        self.button_split.children = [to_container(c) for c in value]
+
     def _button_handler(
         self, button: str = "", event: KeyPressEvent | None = None
     ) -> None:
@@ -280,8 +287,7 @@ class Dialog(Float, metaclass=ABCMeta):
         self.load(**params)
 
         # Create button widgets & callbacks
-        self.button_widgets.clear()
-
+        new_button_widgets: list[AnyContainer] = []
         if self.buttons:
             width = max(map(len, self.buttons)) + 2
             used_keys = set()
@@ -296,7 +302,7 @@ class Dialog(Float, metaclass=ABCMeta):
                     rest = text
                 # Add a button with a handler
                 handler = partial(self._button_handler, text)
-                self.button_widgets.append(
+                new_button_widgets.append(
                     FocusedStyle(
                         Button(
                             [("underline", key), ("", rest)],
@@ -309,6 +315,7 @@ class Dialog(Float, metaclass=ABCMeta):
                 # Add a key-handler
                 if key:
                     self.buttons_kb.add(f"A-{key.lower()}", is_global=True)(handler)
+        self.button_widgets = new_button_widgets
 
         # When a button is selected, handle left/right key bindings.
         if len(self.button_widgets) > 1:
@@ -333,15 +340,13 @@ class Dialog(Float, metaclass=ABCMeta):
         self._load(**params)
         self.last_focused = self.app.layout.current_control
         self._visible = True
-        if self.to_focus is not None:
-            self.app.layout.focus(self.to_focus)
-        else:
-            try:
-                self.app.layout.focus(self.container)
-            except ValueError:
-                pass
-        self.app.layout.focus(self.container)
-        self.app.invalidate()
+        to_focus = self.to_focus or self.container
+        try:
+            self.app.layout.focus(to_focus)
+        except ValueError:
+            pass
+        finally:
+            self.app.invalidate()
 
     def hide(self, event: KeyPressEvent | None = None) -> None:
         """Hide the dialog."""

euporie/core/widgets/file_browser.py

@@ -377,9 +377,9 @@ class FileBrowserControl(UIControl):
         self.dir = path or UPath(".")
         self.hovered: int | None = None
         self.selected: int | None = None
-        self._dir_cache: FastDictCache[
-            tuple[Path], list[tuple[bool, Path]]
-        ] = FastDictCache(get_value=self.load_path, size=1)
+        self._dir_cache: FastDictCache[tuple[Path], list[tuple[bool, Path]]] = (
+            FastDictCache(get_value=self.load_path, size=1)
+        )
         self.on_select = Event(self, on_select)
         self.on_chdir = Event(self, on_chdir)
         self.on_open = Event(self, on_open)

euporie/core/widgets/forms.py

@@ -236,6 +236,7 @@ class Button:
 
     def default_mouse_handler(self, mouse_event: MouseEvent) -> NotImplementedOrNone:
         """Handle mouse events."""
+        app = get_app()
         if self.disabled():
             return NotImplemented
         if mouse_event.button == MouseButton.LEFT:
@@ -249,16 +250,15 @@ class Button:
                 ):
                     y_min, x_min = min(render_info._rowcol_to_yx.values())
                     y_max, x_max = max(render_info._rowcol_to_yx.values())
-                    get_app().mouse_limits = WritePosition(
+                    app.mouse_limits = WritePosition(
                         xpos=x_min,
                         ypos=y_min,
-                        width=x_max - x_min,
-                        height=y_max - y_min,
+                        width=x_max - x_min + 1,
+                        height=y_max - y_min + 1,
                     )
                 self.on_mouse_down.fire()
 
                 if not self.has_focus():
-                    app = get_app()
                     app.layout.focus(self)
                     # Invalidate the app - we don't do it by returning None so the
                     # event can bubble
@@ -269,7 +269,7 @@ class Button:
                     return None
 
             elif mouse_event.event_type == MouseEventType.MOUSE_UP:
-                get_app().mouse_limits = None
+                app.mouse_limits = None
                 if self.selected:
                     self.selected = False
                     self.on_click.fire()
@@ -280,11 +280,12 @@ class Button:
                 if (info := self.window.render_info) is not None and (
                     info._x_offset + mouse_event.position.x,
                     info._y_offset + mouse_event.position.y,
-                ) != get_app().mouse_position:
+                ) != app.mouse_position:
+                    app.mouse_limits = None
                     self.selected = False
                 return None
 
-        get_app().mouse_limits = None
+        app.mouse_limits = None
         self.selected = False
         return NotImplemented
 

euporie/core/widgets/layout.py

@@ -40,7 +40,7 @@ if TYPE_CHECKING:
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text.base import AnyFormattedText, StyleAndTextTuples
     from prompt_toolkit.key_binding.key_bindings import (
-        KeyBindings,
+        KeyBindingsBase,
         NotImplementedOrNone,
     )
     from prompt_toolkit.layout.containers import AnyContainer, Container, _Split
@@ -84,7 +84,7 @@ class Box:
         style: str = "",
         char: None | str | Callable[[], str] = None,
         modal: bool = False,
-        key_bindings: KeyBindings | None = None,
+        key_bindings: KeyBindingsBase | None = None,
     ) -> None:
         """Initialize this widget."""
         if padding is None:
@@ -117,7 +117,7 @@ class Box:
             height=height,
             style=style,
             modal=modal,
-            key_bindings=None,
+            key_bindings=key_bindings,
         )
 
     def __pt_container__(self) -> Container:
@@ -155,7 +155,7 @@ class ConditionalSplit:
         return self._cache.get(vertical, partial(self.load_container, vertical))
 
     def __pt_container__(self) -> AnyContainer:
-        """Return a dymanic container."""
+        """Return a dynamic container."""
         return DynamicContainer(self.container)
 
 
@@ -287,7 +287,7 @@ class TabBarControl(UIControl):
 
     def is_focusable(self) -> bool:
         """Tell whether this user control is focusable."""
-        return True
+        return False
 
     def create_content(self, width: int, height: int) -> UIContent:
         """Generate the formatted text fragments which make the controls output."""

euporie/core/widgets/status.py

@@ -77,9 +77,9 @@ class StatusBar:
     ) -> None:
         """Create a new status bar instance."""
         self.default: StatusBarFields = default or ([], [])
-        self._status_cache: FastDictCache[
-            tuple[int], list[StyleAndTextTuples]
-        ] = FastDictCache(self._status, size=1)
+        self._status_cache: FastDictCache[tuple[int], list[StyleAndTextTuples]] = (
+            FastDictCache(self._status, size=1)
+        )
         self.container = ConditionalContainer(
             content=VSplit(
                 [

euporie/hub/app.py

@@ -89,9 +89,13 @@ class HubApp(BaseApp):
             )
 
         # Import the hubbed app
-        if entry_point := {
-            entry.name: entry for entry in entry_points()["euporie.apps"]
-        }.get(cls.config.app):
+        eps = entry_points()
+        if isinstance(eps, dict):
+            points = eps.get("euporie.apps")
+        else:
+            points = eps.select(group="euporie.apps")
+        apps = {x.name: x for x in points} if points else {}
+        if entry_point := apps.get(cls.config.app):
             app_cls = entry_point.load()
         else:
             raise ValueError("Application `%s` not found", cls.config.app)

euporie/notebook/app.py

@@ -74,6 +74,8 @@ class NotebookApp(BaseApp):
     notebooks in the terminal.
     """
 
+    _tab_container: AnyContainer
+
     name = "notebook"
 
     def __init__(self, **kwargs: Any) -> None:
@@ -84,8 +86,13 @@ class NotebookApp(BaseApp):
         super().__init__(**kwargs)
         self.bindings_to_load.append("euporie.notebook.app.NotebookApp")
 
+        self.on_tabs_change += self.set_tab_container
+
         # Register config hooks
         self.config.get_item("show_cell_borders").event += lambda x: self.refresh()
+        self.config.get_item("tab_mode").event += self.set_tab_container
+        self.config.get_item("background_pattern").event += self.set_tab_container
+        self.config.get_item("background_character").event += self.set_tab_container
 
     async def _poll_terminal_colors(self) -> None:
         """Repeatedly query the terminal for its background and foreground colours."""
@@ -96,10 +103,6 @@ class NotebookApp(BaseApp):
     def pre_run(self, app: Application | None = None) -> None:
         """Continue loading the app."""
         super().pre_run(app)
-        # Ensure an opened tab is focused
-        if self.tab:
-            self.tab.focus()
-
         # Load style hooks and start polling terminal style
         if self.config.terminal_polling_interval and hasattr(
             self.input, "vt100_parser"
@@ -118,29 +121,58 @@ class NotebookApp(BaseApp):
         """Return a container with all opened tabs.
 
         Returns:
-            A layout displaying the opened tab containers.
-
+            A layout container displaying the opened tab containers.
         """
-        if self.tabs:
-            if TabMode(self.config.tab_mode) == TabMode.TILE_HORIZONTALLY:
-                return HSplit(
-                    children=self.tabs,
-                    padding=1,
-                    padding_style="class:tab-padding",
-                    padding_char="─",
-                )
-            elif TabMode(self.config.tab_mode) == TabMode.TILE_VERTICALLY:
-                return VSplit(
-                    children=self.tabs,
-                    padding=1,
-                    padding_style="class:tab-padding",
-                    padding_char="│",
-                )
-            else:
-                return DynamicContainer(lambda: self.tabs[self._tab_idx])
+        try:
+            return self._tab_container
+        except AttributeError:
+            self.set_tab_container()
+            return self._tab_container
+
+    def set_tab_container(self, app: BaseApp | None = None) -> None:
+        """Set the container to use to display opened tabs."""
+        if not self.tabs:
+            self._tab_container = Pattern(
+                self.config.background_character,
+                self.config.background_pattern,
+            )
+        elif TabMode(self.config.tab_mode) == TabMode.TILE_HORIZONTALLY:
+            self._tab_container = HSplit(
+                children=self.tabs,
+                padding=1,
+                padding_style="class:tab-padding",
+                padding_char="─",
+            )
+        elif TabMode(self.config.tab_mode) == TabMode.TILE_VERTICALLY:
+            self._tab_container = VSplit(
+                children=self.tabs,
+                padding=1,
+                padding_style="class:tab-padding",
+                padding_char="│",
+            )
         else:
-            return Pattern(
-                self.config.background_character, self.config.background_pattern
+            self._tab_container = HSplit(
+                [
+                    ConditionalContainer(
+                        Window(
+                            TabBarControl(
+                                tabs=self.tab_bar_tabs,
+                                active=lambda: self._tab_idx,
+                                closeable=True,
+                            ),
+                            height=2,
+                            style="class:app-tab-bar",
+                            dont_extend_height=True,
+                        ),
+                        filter=Condition(
+                            lambda: (
+                                len(self.tabs) > 1 or self.config.always_show_tab_bar
+                            )
+                            and TabMode(self.config.tab_mode) == TabMode.STACK
+                        ),
+                    ),
+                    DynamicContainer(lambda: self.tabs[self._tab_idx]),
+                ]
             )
 
     def _statusbar_defaults(self) -> StatusBarFields | None:
@@ -186,24 +218,6 @@ class NotebookApp(BaseApp):
             filter=have_tabs,
         )
 
-        self.tab_bar_control = TabBarControl(
-            tabs=self.tab_bar_tabs,
-            active=lambda: self._tab_idx,
-            closeable=True,
-        )
-        tab_bar = ConditionalContainer(
-            Window(
-                self.tab_bar_control,
-                height=2,
-                style="class:app-tab-bar",
-                dont_extend_height=True,
-            ),
-            filter=Condition(
-                lambda: (len(self.tabs) > 1 or self.config.always_show_tab_bar)
-                and TabMode(self.config.tab_mode) == TabMode.STACK
-            ),
-        )
-
         self.pager = Pager()
         self.search_bar = SearchBar()
 
@@ -255,7 +269,6 @@ class NotebookApp(BaseApp):
                             self.side_bar,
                             HSplit(
                                 [
-                                    tab_bar,
                                     DynamicContainer(self.tab_container),
                                     self.pager,
                                 ],
@@ -500,8 +513,8 @@ class NotebookApp(BaseApp):
         from euporie.notebook.current import get_app
 
         app = get_app()
-        app.tabs.append(Notebook(app, None))
-        app.tabs[-1].focus()
+        app.add_tab(tab := Notebook(app, None))
+        tab.focus()
 
     @staticmethod
     @add_cmd()