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

euporie/core/{widgets → bars}/search.py

@@ -5,24 +5,26 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
+from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.document import Document
 from prompt_toolkit.filters.app import is_searching
 from prompt_toolkit.filters.base import Condition
+from prompt_toolkit.formatted_text.base import to_formatted_text
 from prompt_toolkit.key_binding.vi_state import InputMode
 from prompt_toolkit.layout.controls import BufferControl, SearchBufferControl
 from prompt_toolkit.search import SearchDirection
 from prompt_toolkit.selection import SelectionState
 from prompt_toolkit.widgets import SearchToolbar as PtkSearchToolbar
 
+from euporie.core.app.current import get_app
+from euporie.core.bars import SEARCH_BAR_BUFFER
 from euporie.core.commands import add_cmd
-from euporie.core.current import get_app
 from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
 )
 
 if TYPE_CHECKING:
-    from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text.base import AnyFormattedText
 
@@ -40,24 +42,26 @@ class SearchBar(PtkSearchToolbar):
         search_buffer: Buffer | None = None,
         vi_mode: bool = False,
         text_if_not_searching: AnyFormattedText = "",
-        forward_search_prompt: AnyFormattedText = "I-search: ",
-        backward_search_prompt: AnyFormattedText = "I-search backward: ",
+        forward_search_prompt: AnyFormattedText = " Find: ",
+        backward_search_prompt: AnyFormattedText = " Find (up): ",
         ignore_case: FilterOrBool = False,
     ) -> None:
         """Create a new search bar instance."""
+        if search_buffer is None:
+            search_buffer = Buffer(name=SEARCH_BAR_BUFFER)
         super().__init__(
-            text_if_not_searching="",
-            forward_search_prompt=[
-                ("class:search-toolbar.title", " Find: "),
-                ("", " "),
-            ],
-            backward_search_prompt=[
-                ("class:search-toolbar.title", " Find (up): "),
-                ("", " "),
-            ],
+            search_buffer=search_buffer,
+            vi_mode=vi_mode,
+            text_if_not_searching=text_if_not_searching,
+            forward_search_prompt=to_formatted_text(
+                forward_search_prompt, "class:status-field"
+            ),
+            backward_search_prompt=to_formatted_text(
+                backward_search_prompt, "class:status-field"
+            ),
         )
         self.control.key_bindings = load_registered_bindings(
-            "euporie.core.widgets.search.SearchBar",
+            "euporie.core.bars.search.SearchBar",
             config=get_app().config,
         )
         search_state = self.control.searcher_search_state
@@ -67,12 +71,12 @@ class SearchBar(PtkSearchToolbar):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "find": ["c-f", "f3", "f7"],
                 "find-next": "c-g",
                 "find-previous": "c-p",
             },
-            "euporie.core.widgets.search.SearchBar": {
+            "euporie.core.bars.search.SearchBar": {
                 "accept-search": "enter",
                 "stop-search": "escape",
             },

euporie/core/{widgets → bars}/status.py

@@ -16,13 +16,13 @@ from prompt_toolkit.layout.containers import (
 )
 from prompt_toolkit.layout.controls import FormattedTextControl
 
-from euporie.core.config import add_setting
-from euporie.core.current import get_app
-from euporie.core.filters import is_searching
+from euporie.core.app.current import get_app
+from euporie.core.filters import has_toolbar
 from euporie.core.layout.containers import VSplit, Window
 
 if TYPE_CHECKING:
-    from typing import Callable, Sequence
+    from collections.abc import Sequence
+    from typing import Callable
 
     from prompt_toolkit.filters.base import FilterOrBool
     from prompt_toolkit.formatted_text import StyleAndTextTuples
@@ -99,8 +99,8 @@ class StatusBar:
                 ],
                 height=1,
             ),
-            filter=get_app().config.filter("show_status_bar")
-            & ~is_searching
+            filter=get_app().config.filters.show_status_bar
+            & ~has_toolbar
             & to_filter(extra_filter),
         )
 
@@ -144,20 +144,3 @@ class StatusBar:
     def __pt_container__(self) -> AnyContainer:
         """Return the widget's container."""
         return self.container
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_status_bar",
-        flags=["--show-status-bar"],
-        type_=bool,
-        title="status bar",
-        help_="Show the status bar",
-        default=True,
-        schema={
-            "type": "boolean",
-        },
-        description="""
-            Whether the status bar should be shown at the bottom of the screen.
-        """,
-    )

euporie/core/clipboard.py

@@ -3,21 +3,15 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
 
 from prompt_toolkit.clipboard.base import Clipboard, ClipboardData
 from prompt_toolkit.clipboard.in_memory import InMemoryClipboard
 from prompt_toolkit.clipboard.pyperclip import PyperclipClipboard
 from prompt_toolkit.selection import SelectionType
-from pyperclip import determine_clipboard
 
-from euporie.core.config import add_setting
+from euporie.core.app.current import get_app
 from euporie.core.io import Vt100_Output
-
-if TYPE_CHECKING:
-    from euporie.core.app import BaseApp
-    from euporie.core.config import Setting
-    from euporie.core.terminal import TerminalQuery
+from euporie.core.key_binding.key_processor import KeyProcessor
 
 log = logging.getLogger(__name__)
 
@@ -25,16 +19,13 @@ log = logging.getLogger(__name__)
 class Osc52Clipboard(Clipboard):
     """Clipboard that syncs with the system clipboard using OSC52 escape codes."""
 
-    def __init__(self, app: BaseApp) -> None:
+    def __init__(self) -> None:
         """Create a new instance of the clipboard."""
-        self.app = app
-        term_clipboard_data = app.term_info.clipboard_data
-        term_clipboard_data.event += self._update_clipboard
-        self._data = ClipboardData(text=term_clipboard_data.value)
+        self._data = ClipboardData()
 
     def set_data(self, data: ClipboardData) -> None:
         """Set clipboard data."""
-        output = self.app.output
+        output = get_app().output
         if isinstance(output, Vt100_Output):
             output.set_clipboard(data.text)
             output.flush()
@@ -43,16 +34,21 @@ class Osc52Clipboard(Clipboard):
     def get_data(self) -> ClipboardData:
         """Retrieve clipboard data."""
         # Send clipboard query
-        output = self.app.output
+        app = get_app()
+        output = app.output
+        # Request clipboard contents from terminal
         if isinstance(output, Vt100_Output):
+            from euporie.core.keys import MoreKeys
+
             output.get_clipboard()
             output.flush()
-            self.app.term_info.clipboard_data.await_response(timeout=5)
+            # Wait for terminal response
+            if isinstance(app.key_processor, KeyProcessor):
+                app.key_processor.await_key(MoreKeys.ClipboardDataResponse)
         return self._data
 
-    def _update_clipboard(self, query: TerminalQuery) -> None:
+    def sync(self, text: str) -> None:
         """Update the last known clipboard data."""
-        text = query.value
         if text != self._data.text:
             self._data = ClipboardData(
                 text=text,
@@ -60,65 +56,8 @@ class Osc52Clipboard(Clipboard):
             )
 
 
-class ConfiguredClipboard(Clipboard):
-    """Use a clipboard determined by euporie's configuration."""
-
-    _clipboard: Clipboard
-
-    def __init__(self, app: BaseApp) -> None:
-        """Create a new clipboard instance."""
-        self.app = app
-        clipboard_config = app.config.settings["clipboard"]
-        self.get_clipboard(clipboard_config)
-        clipboard_config.event += self.get_clipboard
-
-    def get_clipboard(self, setting: Setting) -> None:
-        """Determine which clipboard to use."""
-        clipboard: Clipboard | None = None
-        if setting.value == "external" and determine_clipboard()[0]:
-            log.debug("Using pyperclip clipboard")
-            clipboard = PyperclipClipboard()
-        if not clipboard:
-            if setting.value == "terminal":
-                log.debug("Using terminal clipboard")
-                clipboard = Osc52Clipboard(self.app)
-            else:
-                log.debug("Using in-memory clipboard")
-                clipboard = InMemoryClipboard()
-        self._clipboard = clipboard
-
-    def set_data(self, data: ClipboardData) -> None:
-        """Set data to the clipboard."""
-        self._clipboard.set_data(data)
-
-    def set_text(self, text: str) -> None:
-        """Shortcut for setting plain text on clipboard."""
-        self._clipboard.set_text(text)
-
-    def rotate(self) -> None:
-        """For Emacs mode, rotate the kill ring."""
-        self._clipboard.rotate()
-
-    def get_data(self) -> ClipboardData:
-        """Return clipboard data."""
-        return self._clipboard.get_data()
-
-    # ################################### Settings ####################################w
-
-    add_setting(
-        name="clipboard",
-        flags=["--clipboard"],
-        choices=["external", "internal", "terminal"],
-        type_=str,
-        default="external",
-        help_="The preferred clipboard access method",
-        description="""
-        The clipboard access method to use.
-        - ``external``: Data is saved to the system clipboard using OS native tooling.
-        - ``internal``: Clipboard data is only stored and usable inside euporie - it is
-            not saved to the system clipboard.
-        - ``terminal``: uses OSC52 escape sequences to retrieve and set the clipboard
-            contents. Requires your terminal emulator to support OSC52. Works over SSH.
-
-    """,
-    )
+CONFIGURED_CLIPBOARDS = {
+    "internal": InMemoryClipboard,
+    "external": PyperclipClipboard,
+    "terminal": Osc52Clipboard,
+}

euporie/core/comm/base.py

@@ -7,17 +7,16 @@ from abc import ABCMeta, abstractmethod
 from typing import TYPE_CHECKING
 from weakref import WeakKeyDictionary
 
-from euporie.core.convert.datum import Datum
-from euporie.core.current import get_app
-from euporie.core.widgets.display import Display
+from euporie.core.app.current import get_app
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Mapping, Sequence
+    from collections.abc import Mapping, Sequence
+    from typing import Any, Callable
 
     from prompt_toolkit.layout.containers import AnyContainer
 
-    from euporie.core.kernel import Kernel
-    from euporie.core.tabs.base import KernelTab
+    from euporie.core.kernel.client import Kernel
+    from euporie.core.tabs.kernel import KernelTab
     from euporie.core.widgets.cell_outputs import OutputParent
 
 
@@ -97,6 +96,9 @@ class Comm(metaclass=ABCMeta):
 
     def create_view(self, parent: OutputParent) -> CommView:
         """Create a new :class:`CommView` for this Comm."""
+        from euporie.core.convert.datum import Datum
+        from euporie.core.widgets.display import Display
+
         return CommView(Display(Datum("[Object cannot be rendered]", format="ansi")))
 
     def new_view(self, parent: OutputParent) -> CommView:

euporie/core/comm/ipywidgets.py

@@ -18,12 +18,9 @@ from prompt_toolkit.layout.containers import HSplit, VSplit
 from prompt_toolkit.layout.processors import BeforeInput
 
 from euporie.core.comm.base import Comm, CommView
-from euporie.core.convert.datum import Datum
 from euporie.core.data_structures import DiBool
-from euporie.core.kernel import MsgCallbacks
+from euporie.core.kernel.client import MsgCallbacks
 from euporie.core.layout.decor import FocusedStyle
-from euporie.core.widgets.cell_outputs import CellOutputArea
-from euporie.core.widgets.display import Display
 from euporie.core.widgets.forms import (
     Button,
     Checkbox,
@@ -46,13 +43,14 @@ from euporie.core.widgets.layout import (
 )
 
 if TYPE_CHECKING:
-    from typing import Any, Iterable, MutableSequence, Sequence
+    from collections.abc import Iterable, MutableSequence, Sequence
+    from typing import Any
 
     from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.formatted_text.base import AnyFormattedText
     from prompt_toolkit.layout.containers import AnyContainer, _Split
 
-    from euporie.core.comm.base import KernelTab
+    from euporie.core.tabs.kernel import KernelTab
     from euporie.core.widgets.cell_outputs import OutputParent
     from euporie.core.widgets.forms import SelectableWidget, ToggleableWidget
     from euporie.core.widgets.layout import StackedSplit
@@ -213,6 +211,9 @@ class UnimplementedModel(IpyWidgetComm):
 
     def create_view(self, parent: OutputParent) -> CommView:
         """Create a new view."""
+        from euporie.core.convert.datum import Datum
+        from euporie.core.widgets.display import Display
+
         return CommView(Display(Datum("[Widget not implemented]", format="ansi")))
 
 
@@ -242,6 +243,8 @@ class OutputModel(IpyWidgetComm):
 
     def create_view(self, parent: OutputParent) -> CommView:
         """Create a new view of this output ipywidget."""
+        from euporie.core.widgets.cell_outputs import CellOutputArea
+
         container = CellOutputArea(
             self.data.get("state", {}).get("outputs", []), parent
         )
@@ -1258,6 +1261,9 @@ class HTMLModel(IpyWidgetComm):
 
     def create_view(self, parent: OutputParent) -> CommView:
         """Create a new view of the HTML widget."""
+        from euporie.core.convert.datum import Datum
+        from euporie.core.widgets.display import Display
+
         html = Display(
             Datum(data=self.data["state"].get("value", ""), format="html"),
             dont_extend_width=True,
@@ -1285,6 +1291,9 @@ class ImageModel(IpyWidgetComm):
 
     def create_view(self, parent: OutputParent) -> CommView:
         """Create a new view of the image widget."""
+        from euporie.core.convert.datum import Datum
+        from euporie.core.widgets.display import Display
+
         display = Display(
             Datum(
                 data=self.data["state"].get("value", b""),
@@ -1408,7 +1417,7 @@ class ColorPickerModel(TextBoxIpyWidgetComm):
         if value in NAMED_COLORS:
             value = NAMED_COLORS[value]
         elif 4 <= len(value) < 7:
-            value = f"#{value[1]*2}{value[2]*2}{value[3]*2}"
+            value = f"#{value[1] * 2}{value[2] * 2}{value[3] * 2}"
         else:
             value = value[:7]
         return value

euporie/core/comm/registry.py

@@ -8,7 +8,8 @@ from euporie.core.comm.base import UnimplementedComm
 from euporie.core.comm.ipywidgets import open_comm_ipywidgets
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Sequence
+    from collections.abc import Sequence
+    from typing import Any, Callable
 
     from euporie.core.comm.base import Comm, KernelTab
 

euporie/core/commands.py

@@ -15,7 +15,8 @@ from prompt_toolkit.key_binding.key_processor import KeyPressEvent
 from euporie.core.key_binding.utils import parse_keys
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Coroutine
+    from collections.abc import Coroutine
+    from typing import Any, Callable
 
     from prompt_toolkit.filters import Filter, FilterOrBool
     from prompt_toolkit.key_binding.key_bindings import (
@@ -50,6 +51,7 @@ class Command:
         filter: FilterOrBool = True,
         hidden: FilterOrBool = False,
         name: str | None = None,
+        aliases: list[str] | None = None,
         title: str | None = None,
         menu_title: str | None = None,
         description: str | None = None,
@@ -66,6 +68,7 @@ class Command:
             filter: The condition under which the command is allowed to run
             hidden: The condition under the command is visible to the user
             name: The name of the command, for accessing the command from the registry
+            aliases: List of additional names for the command
             title: The title of the command for display
             menu_title: The title to display in menus if different
             description: The description of the command to explain it's function
@@ -77,6 +80,7 @@ class Command:
 
         """
         self.handler = handler
+        self.aliases = aliases or []
         self.filter = to_filter(filter)
         self.hidden = to_filter(hidden)
         if name is None:
@@ -106,18 +110,18 @@ class Command:
 
         self.keys: list[tuple[str | Keys, ...]] = []
 
-    def run(self) -> None:
+    def run(self, arg: str | None = None) -> None:
         """Run the command's handler."""
         if self.filter():
             app = get_app()
             result = self.key_handler(
                 KeyPressEvent(
                     key_processor_ref=weakref.ref(app.key_processor),
-                    arg=None,
+                    arg=arg,
                     key_sequence=[],
                     previous_key_sequence=[],
                     is_repeat=False,
-                )
+                ),
             )
             if isawaitable(result):
 
@@ -187,22 +191,6 @@ class Command:
             return format_keys([self.keys[0]])[0]
         return ""
 
-    @property
-    def menu_handler(self) -> Callable[[], None]:
-        """Return a menu handler for the command."""
-        handler = self.handler
-        if isawaitable(handler):
-
-            def _menu_handler() -> None:
-                task = cast("CommandHandlerNoArgs", handler)()
-                task = cast("Coroutine[Any, Any, None]", task)
-                if task is not None:
-                    get_app().create_background_task(task)
-
-            return _menu_handler
-        else:
-            return cast("Callable[[], None]", handler)
-
     @property
     def menu(self) -> MenuItem:
         """Return a menu item for the command."""
@@ -222,6 +210,8 @@ def add_cmd(**kwargs: Any) -> Callable:
     def decorator(handler: Callable) -> Callable:
         cmd = Command(handler, **kwargs)
         commands[cmd.name] = cmd
+        for alias in cmd.aliases:
+            commands[alias] = cmd
         return handler
 
     return decorator

euporie/core/completion.py

@@ -3,16 +3,17 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, AsyncGenerator, Iterable
+from typing import TYPE_CHECKING
 
 from prompt_toolkit.completion.base import CompleteEvent, Completer, Completion
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator, Iterable
     from pathlib import Path
 
     from prompt_toolkit.document import Document
 
-    from euporie.core.kernel import Kernel
+    from euporie.core.kernel.client import Kernel
     from euporie.core.lsp import LspClient
 
 log = logging.getLogger(__name__)