euporie 2.8.0__py3-none-any.whl → 2.8.5__py3-none-any.whl

euporie/core/widgets/cell_outputs.py

@@ -4,22 +4,18 @@ from __future__ import annotations
 
 import logging
 from abc import ABCMeta, abstractmethod
+from functools import cache
 from pathlib import PurePath
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.cache import SimpleCache
-from prompt_toolkit.filters import buffer_has_focus
 from prompt_toolkit.layout.containers import (
     DynamicContainer,
     to_container,
 )
 
-from euporie.core.config import add_setting
-from euporie.core.convert.datum import Datum
-from euporie.core.convert.formats import BASE64_FORMATS
-from euporie.core.convert.mime import MIME_FORMATS
+from euporie.core.app.current import get_app
 from euporie.core.convert.registry import find_route
-from euporie.core.current import get_app
 from euporie.core.layout.containers import HSplit
 from euporie.core.widgets.display import Display
 from euporie.core.widgets.layout import Box
@@ -30,7 +26,7 @@ if TYPE_CHECKING:
 
     from prompt_toolkit.layout.containers import AnyContainer
 
-    from euporie.core.comm.base import KernelTab
+    from euporie.core.tabs.kernel import KernelTab
 
     KTParent = TypeVar("KTParent", bound=KernelTab)
 
@@ -98,6 +94,10 @@ class CellOutputDataElement(CellOutputElement):
             metadata: Any metadata relating to the data
             parent: The cell the output-element is attached to
         """
+        from euporie.core.convert.datum import Datum
+        from euporie.core.convert.formats import BASE64_FORMATS
+        from euporie.core.convert.mime import MIME_FORMATS
+
         self.parent = parent
 
         # Get foreground and background colors
@@ -129,16 +129,14 @@ class CellOutputDataElement(CellOutputElement):
             self._datum,
             focusable=False,
             focus_on_click=False,
-            wrap_lines=config.filter("wrap_cell_outputs"),
+            wrap_lines=config.filters.wrap_cell_outputs,
             always_hide_cursor=True,
-            style=f"class:mime-{mime.replace('/','-')}",
+            style=f"class:mime-{mime.replace('/', '-')}",
             scrollbar=False,
         )
 
         # Ensure container gets invalidated if `wrap_cell_output` changes
-        self.container.control.invalidate_events.append(
-            config.settings["wrap_cell_outputs"].event
-        )
+        self.container.control.invalidate_events.append(config.events.wrap_cell_outputs)
 
     @property
     def data(self) -> Any:
@@ -148,6 +146,8 @@ class CellOutputDataElement(CellOutputElement):
     @data.setter
     def data(self, value: Any) -> None:
         """Set the cell output's data."""
+        from euporie.core.convert.datum import Datum
+
         self._datum = Datum(
             value,
             self._datum.format,
@@ -260,12 +260,12 @@ MIME_ORDER = [
 ]
 
 
-def _calculate_mime_rank(mime_data: tuple[str, Any]) -> int:
+@cache
+def _calculate_mime_rank(mime: str, have_escapes: bool) -> int:
     """Score the richness of mime output types."""
-    mime, data = mime_data
     for i, ranked_mime in enumerate(MIME_ORDER):
         # Uprank plain text with escape sequences
-        if mime == "text/plain" and "\x1b[" in data:
+        if mime == "text/plain" and have_escapes:
             i -= 7
         if PurePath(mime).match(ranked_mime):
             return i
@@ -273,6 +273,12 @@ def _calculate_mime_rank(mime_data: tuple[str, Any]) -> int:
         return 999
 
 
+def _mime_ranker(mime_data: tuple[str, Any]) -> int:
+    """Score the richness of mime output types."""
+    mime, data = mime_data
+    return _calculate_mime_rank(mime, isinstance(data, str) and "\x1b[" in data)
+
+
 class CellOutput:
     """Represent a single cell output.
 
@@ -319,7 +325,7 @@ class CellOutput:
         data = {}
         output_type = self.json.get("output_type", "unknown")
         if output_type == "stream":
-            data = {f'stream/{self.json.get("name")}': self.json.get("text", "")}
+            data = {f"stream/{self.json.get('name')}": self.json.get("text", "")}
         elif output_type == "error":
             ename = self.json.get("ename", "")
             evalue = self.json.get("evalue", "")
@@ -327,7 +333,7 @@ class CellOutput:
             data = {"text/x-python-traceback": f"{ename}: {evalue}\n{traceback}"}
         else:
             data = self.json.get("data", {"text/plain": ""})
-        return dict(sorted(data.items(), key=_calculate_mime_rank))
+        return dict(sorted(data.items(), key=_mime_ranker))
 
     def update(self) -> None:
         """Update the output by updating all child containers."""
@@ -358,7 +364,7 @@ class CellOutput:
                         metadata=self.json.get("metadata", {}).get(mime, {}),
                         parent=self.parent,
                     )
-                except NotImplementedError:
+                except (NotImplementedError, KeyError):
                     self.selected_mime = mime = list(data.keys())[-1]
                     continue
                 else:
@@ -372,9 +378,8 @@ class CellOutput:
         if mime not in self._elements:
             element = self.make_element(mime)
             self._elements[mime] = element
-        else:
-            element = self._elements[mime]
-        return element
+            return element
+        return self._elements[mime]
 
     @property
     def element(self) -> CellOutputElement:
@@ -511,19 +516,3 @@ class CellOutputArea:
                 ):
                     outputs.append(to_plain_text(line))
         return "\n".join(outputs)
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="wrap_cell_outputs",
-        title="wrap cell outputs",
-        flags=["--wrap-cell-outputs"],
-        type_=bool,
-        help_="Wrap cell output text.",
-        default=False,
-        schema={"type": "boolean"},
-        description="""
-            Whether text-based cell outputs should be wrapped.
-        """,
-        cmd_filter=~buffer_has_focus,
-    )

euporie/core/widgets/decor.py

@@ -9,15 +9,12 @@ from prompt_toolkit.filters import to_filter
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
-    Float,
-    FloatContainer,
 )
 
+from euporie.core.app.current import get_app
 from euporie.core.border import ThinLine
-from euporie.core.config import add_setting
-from euporie.core.current import get_app
 from euporie.core.data_structures import DiBool
-from euporie.core.layout.containers import HSplit, VSplit, Window
+from euporie.core.layout.containers import DummyContainer, HSplit, VSplit, Window
 from euporie.core.layout.decor import DropShadow
 
 if TYPE_CHECKING:
@@ -183,8 +180,7 @@ class Border:
 class Shadow:
     """Draw a shadow underneath/behind this container.
 
-    This is a globally configurable version of the
-    :py:class:`prompt_toolkit.widows.base.Shadow` class.
+    The container must be in a float.
     """
 
     def __init__(self, body: AnyContainer) -> None:
@@ -193,27 +189,14 @@ class Shadow:
         Args:
             body: Another container object.
         """
-        filter_ = get_app().config.filter("show_shadows")
-        shadow = FloatContainer(
-            content=body,
-            floats=[
-                Float(
-                    bottom=-1,
-                    height=1,
-                    left=1,
-                    right=0,
-                    transparent=True,
-                    content=DropShadow(),
-                ),
-                Float(
-                    bottom=-1,
-                    top=1,
-                    width=1,
-                    right=-1,
-                    transparent=True,
-                    content=DropShadow(),
-                ),
-            ],
+        filter_ = get_app().config.filters.show_shadows
+
+        spacer = DummyContainer(width=1, height=1)
+        shadow = VSplit(
+            [
+                HSplit([body, VSplit([spacer, DropShadow()])]),
+                HSplit([spacer, DropShadow()]),
+            ]
         )
 
         def get_contents() -> AnyContainer:
@@ -227,16 +210,3 @@ class Shadow:
     def __pt_container__(self) -> AnyContainer:
         """Return the container's content."""
         return self.container
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_shadows",
-        flags=["--show-shadows"],
-        type_=bool,
-        help_="Show or hide shadows under menus and dialogs",
-        default=True,
-        description="""
-            Sets whether shadows are shown under dialogs and popup-menus.
-        """,
-    )

euporie/core/widgets/dialog.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import traceback
 from abc import ABCMeta, abstractmethod
 from functools import partial
 from pathlib import Path
@@ -26,6 +25,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
@@ -33,7 +33,7 @@ from prompt_toolkit.layout.screen import WritePosition
 from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.widgets.base import Label
 
-from euporie.core.app import get_app
+from euporie.core.app.current import get_app
 from euporie.core.border import (
     FullLine,
     LowerLeftHalfLine,
@@ -45,14 +45,14 @@ from euporie.core.ft.utils import FormattedTextAlign, align, lex
 from euporie.core.key_binding.registry import register_bindings
 from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.layout.decor import FocusedStyle
-from euporie.core.tabs.base import Tab
 from euporie.core.widgets.decor import Border, Shadow
 from euporie.core.widgets.file_browser import FileBrowser
 from euporie.core.widgets.forms import Button, LabelledWidget, Select, Text
 from euporie.core.widgets.layout import Box
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Hashable
+    from collections.abc import Hashable
+    from typing import Any, Callable
 
     from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.data_structures import Point
@@ -63,9 +63,9 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.layout import FocusableElement
     from prompt_toolkit.mouse_events import MouseEvent
 
-    from euporie.core.app import BaseApp
-    from euporie.core.tabs.base import KernelTab
-    from euporie.core.widgets.file_browser import FileBrowserControl
+    from euporie.core.app.app import BaseApp
+    from euporie.core.tabs.base import Tab
+    from euporie.core.tabs.kernel import KernelTab
 
 log = logging.getLogger(__name__)
 
@@ -138,8 +138,12 @@ class DialogTitleControl(UIControl):
                             dl_width, max_y
                         ).preferred
                         # Calculate new dialog position
-                        new_x = max(1, min(gx - self.drag_start.x, max_x - dl_width))
-                        new_y = max(1, min(gy - self.drag_start.y, max_y - dl_height))
+                        new_x = max(
+                            1, min(gx - self.drag_start.x, max_x - dl_width + 1)
+                        )
+                        new_y = max(
+                            1, min(gy - self.drag_start.y, max_y - dl_height + 1)
+                        )
                         # Move dialog
                         self.dialog.left = new_x - 1
                         self.dialog.top = new_y - 1
@@ -189,7 +193,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 +229,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 +263,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 +290,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 +305,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 +318,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 +343,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."""
@@ -404,7 +412,7 @@ class AboutDialog(Dialog):
     @add_cmd()
     def _about() -> None:
         """Show the about dialog."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("about"):
             dialog.toggle()
@@ -493,12 +501,13 @@ class OpenFileDialog(FileDialog):
 
         self.tab_dd = tab_dd = Dropdown(options=[])
 
-        def _update_options(fb: FileBrowserControl) -> None:
-            tabs = get_app().get_file_tabs(path) if (path := fb.path).is_file() else []
+        def _update_options(path: Path) -> None:
+            tabs = get_app().get_file_tabs(path) if path.is_file() else []
             tab_dd.options = tabs
             tab_dd.labels = [tab.name for tab in tabs]
 
-        self.file_browser.control.on_select += _update_options
+        self.file_browser.control.on_select += lambda fb: _update_options(fb.path)
+        self.filepath.buffer.on_text_changed += lambda b: _update_options(Path(b.text))
 
         if isinstance(self.body, HSplit):
             self.body.children.append(
@@ -538,7 +547,7 @@ class OpenFileDialog(FileDialog):
                     self.file_browser.control.dir = path
                 elif path.is_file():
                     self.hide()
-                    self.app.open_file(path, tab_class=self.tab_dd.value)
+                    self.app.open_file(path, tab_class=self.tab_dd.value.tab_class)
                 return
             else:
                 self.show(
@@ -551,7 +560,7 @@ class OpenFileDialog(FileDialog):
     @add_cmd(menu_title="Open File…")
     def _open_file() -> None:
         """Open a file."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("open-file"):
             dialog.show()
@@ -560,7 +569,7 @@ class OpenFileDialog(FileDialog):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "open-file": "c-o",
             }
         }
@@ -597,7 +606,7 @@ class SaveAsDialog(FileDialog):
     )
     def _save_as() -> None:
         """Save the current file at a new location."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         app = get_app()
         if dialog := app.dialogs.get("save-as"):
@@ -607,7 +616,7 @@ class SaveAsDialog(FileDialog):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "save-as": ("A-s"),
             }
         }
@@ -768,6 +777,8 @@ class ErrorDialog(Dialog):
 
     def load(self, exception: Exception | None = None, when: str = "") -> None:
         """Load dialog body & buttons."""
+        import traceback
+
         from euporie.core.margins import MarginContainer, ScrollbarMargin
         from euporie.core.widgets.formatted_text_area import FormattedTextArea
         from euporie.core.widgets.forms import Checkbox
@@ -793,7 +804,7 @@ class ErrorDialog(Dialog):
                             ("bold", f" when {when}" if when else ""),
                             ("bold", ":"),
                             ("", "\n\n"),
-                            ("fg:ansired", exception.__repr__()),
+                            ("fg:ansired", repr(exception)),
                             ("", "\n"),
                         ],
                     )
@@ -854,6 +865,8 @@ class UnsavedDialog(Dialog):
             tab.save(cb=partial(tab.close, cb))
 
         def no_cb() -> None:
+            from euporie.core.tabs.base import Tab
+
             assert tab is not None
             self.hide()
             Tab.close(tab, cb)
@@ -898,7 +911,7 @@ class ShortcutsDialog(Dialog):
 
     def format_key_info(self) -> StyleAndTextTuples:
         """Generate a table with the current key bindings."""
-        import importlib
+        import pkgutil
         from textwrap import dedent
 
         from prompt_toolkit.formatted_text.base import to_formatted_text
@@ -915,9 +928,7 @@ class ShortcutsDialog(Dialog):
 
         for group, bindings in BINDINGS.items():
             if any(not get_cmd(cmd_name).hidden() for cmd_name in bindings):
-                mod_name, cls_name = group.rsplit(".", maxsplit=1)
-                mod = importlib.import_module(mod_name)
-                app_cls = getattr(mod, cls_name)
+                app_cls = pkgutil.resolve_name(group)
                 section_title = (
                     dedent(app_cls.__doc__).strip().split("\n")[0].rstrip(".")
                 )
@@ -960,7 +971,7 @@ class ShortcutsDialog(Dialog):
     @add_cmd()
     def _keyboard_shortcuts() -> None:
         """Display details of registered key-bindings in a dialog."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("shortcuts"):
             dialog.toggle()

euporie/core/widgets/display.py

@@ -16,13 +16,10 @@ from prompt_toolkit.layout.controls import GetLinePrefixCallable, UIContent, UIC
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event, to_str
 
+from euporie.core.app.current import get_app
 from euporie.core.commands import add_cmd
 from euporie.core.convert.datum import Datum
-from euporie.core.current import get_app
-from euporie.core.filters import (
-    display_has_focus,
-    scrollable,
-)
+from euporie.core.filters import display_has_focus, scrollable
 from euporie.core.ft.utils import wrap
 from euporie.core.graphics import GraphicProcessor
 from euporie.core.key_binding.registry import (
@@ -34,7 +31,8 @@ from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.utils import run_in_thread_with_context
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Iterable
+    from collections.abc import Iterable
+    from typing import Any, Callable
 
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text import StyleAndTextTuples
@@ -89,7 +87,8 @@ class DisplayControl(UIControl):
         self.height = 0
 
         self.key_bindings = load_registered_bindings(
-            "euporie.core.widgets.display.DisplayControl"
+            "euporie.core.widgets.display.DisplayControl",
+            config=get_app().config,
         )
 
         self.rendered = Event(self)
@@ -159,7 +158,7 @@ class DisplayControl(UIControl):
             extend=not self.dont_extend_width(),
         )
         if width and height:
-            key = Datum.add_size(datum, Size(height, self.width))
+            key = Datum.add_size(datum, Size(height, width))
             ft = [(f"[Graphic_{key}]", ""), *ft]
         lines = list(split_lines(ft))
         if wrap_lines and width:
@@ -196,13 +195,14 @@ class DisplayControl(UIControl):
         )
 
     def render(self) -> None:
-        """Render the HTML DOM in a thread."""
+        """Render the content in a thread."""
         datum = self.datum
         wrap_lines = self.wrap_lines()
 
-        max_cols, aspect = self.datum.cell_size()
-        cols = min(max_cols, self.width) if max_cols else self.width
-        rows = ceil(cols * aspect) if aspect else self.height
+        cols = self.preferred_width(self.width)
+        rows = self.preferred_height(
+            self.width, self.height, wrap_lines=wrap_lines, get_line_prefix=None
+        )
 
         def _render() -> None:
             cp = self.color_palette
@@ -226,12 +226,7 @@ class DisplayControl(UIControl):
 
     def preferred_width(self, max_available_width: int) -> int | None:
         """Calculate and return the preferred width of the control."""
-        max_cols, aspect = self.datum.cell_size()
-        if max_cols:
-            return min(max_cols, max_available_width)
-        return self._max_line_width_cache[
-            self.datum, max_available_width, None, self.wrap_lines()
-        ]
+        return max_available_width
 
     def preferred_height(
         self,
@@ -241,12 +236,18 @@ class DisplayControl(UIControl):
         get_line_prefix: GetLinePrefixCallable | None,
     ) -> int | None:
         """Calculate and return the preferred height of the control."""
+        height = None
         max_cols, aspect = self.datum.cell_size()
         if aspect:
-            return ceil(min(width, max_cols) * aspect)
+            height = ceil(min(width, max_cols) * aspect)
         cp = self.color_palette
         self.lines = self._line_cache[
-            self.datum, width, None, cp.fg.base_hex, cp.bg.base_hex, self.wrap_lines()
+            self.datum,
+            width,
+            height,
+            cp.fg.base_hex,
+            cp.bg.base_hex,
+            self.wrap_lines(),
         ]
         return len(self.lines)
 
@@ -299,17 +300,19 @@ class DisplayControl(UIControl):
             A :py:class:`UIContent` instance.
         """
         # Trigger a re-render in the future if things have changed
+        render = False
         if self.loading:
-            self.render()
-        if width != self.width:
+            render = True
+        if width != self.width or height != self.height:
             self.resizing = True
             self.width = width
             self.height = height
-            self.render()
+            render = True
         if (cp := get_app().color_palette) != self.color_palette:
             self.color_palette = cp
+            render = True
+        if render:
             self.render()
-
         content = self._content_cache[
             self.datum, width, height, self.loading, self.cursor_position, cp
         ]