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

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

@@ -5,22 +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
 
@@ -38,34 +42,41 @@ 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
+        search_state.ignore_case = Condition(
+            lambda: self.search_buffer.text.islower() or search_state.text.islower()
         )
 
     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",
             },
@@ -73,28 +84,44 @@ class SearchBar(PtkSearchToolbar):
     )
 
 
-def start_global_search(
-    buffer_control: BufferControl | None = None,
-    direction: SearchDirection = SearchDirection.FORWARD,
-) -> None:
-    """Start a search through all searchable `buffer_controls` in the layout."""
+def find_search_control() -> tuple[SearchBufferControl | None, BufferControl | None]:
+    """Find the current search buffer and buffer control."""
+    current_buffer_control: BufferControl | None = None
+    search_buffer_control: SearchBufferControl | None = None
+
     app = get_app()
     layout = app.layout
-    current_control = layout.current_control
-    # Find the search buffer control
-    if app.search_bar is not None:
+    current_control = app.layout.current_control
+
+    if isinstance(current_control, SearchBufferControl):
+        search_buffer_control = current_control
+
+    if search_buffer_control is None and app.search_bar is not None:
         search_buffer_control = app.search_bar.control
-    elif (
-        isinstance(current_control, BufferControl)
-        and current_control.search_buffer_control is not None
+
+    if search_buffer_control is not None and current_buffer_control is None:
+        current_buffer_control = layout.search_links.get(search_buffer_control)
+
+    if current_buffer_control is None and isinstance(current_control, BufferControl):
+        current_buffer_control = current_control
+
+    if (
+        search_buffer_control is None
+        and current_buffer_control is not None
+        and current_buffer_control.search_buffer_control is not None
     ):
-        search_buffer_control = current_control.search_buffer_control
-    else:
-        return
-    # Find all searchable controls
+        search_buffer_control = current_buffer_control.search_buffer_control
+
+    return search_buffer_control, current_buffer_control
+
+
+def find_searchable_controls(
+    search_buffer_control: SearchBufferControl, current_control: BufferControl | None
+) -> list[BufferControl]:
+    """Find list of searchable controls and the index of the next control."""
     searchable_controls: list[BufferControl] = []
     next_control_index = 0
-    for control in layout.find_all_controls():
+    for control in get_app().layout.find_all_controls():
         # Find the index of the next searchable control so we can link the search
         # control to it if the currently focused control is not searchable. This is so
         # that the next searchable control can be focused when search is completed.
@@ -105,24 +132,40 @@ def start_global_search(
             isinstance(control, BufferControl)
             and control.search_buffer_control == search_buffer_control
         ):
-            # Set its search direction
-            control.search_state.direction = direction
             # Add it to our list
             searchable_controls.append(control)
+    searchable_controls = (
+        searchable_controls[next_control_index:]
+        + searchable_controls[:next_control_index]
+    )
+    return searchable_controls
+
+
+def start_global_search(
+    buffer_control: BufferControl | None = None,
+    direction: SearchDirection = SearchDirection.FORWARD,
+) -> None:
+    """Start a search through all searchable `buffer_controls` in the layout."""
+    search_buffer_control, current_control = find_search_control()
+    if search_buffer_control is None:
+        return
+    searchable_controls = find_searchable_controls(
+        search_buffer_control, current_control
+    )
 
     # Stop the search if we did not find any searchable controls
     if not searchable_controls:
         return
 
     # If the current control is searchable, link it
+    app = get_app()
+    layout = app.layout
     if current_control in searchable_controls:
         assert isinstance(current_control, BufferControl)
         layout.search_links[search_buffer_control] = current_control
     else:
         # otherwise use the next after the currently selected control
-        layout.search_links[search_buffer_control] = searchable_controls[
-            next_control_index % len(searchable_controls)
-        ]
+        layout.search_links[search_buffer_control] = searchable_controls[0]
     # Make sure to focus the search BufferControl
     layout.focus(search_buffer_control)
     # If we're in Vi mode, make sure to go into insert mode.
@@ -137,31 +180,85 @@ def find() -> None:
 
 def find_prev_next(direction: SearchDirection) -> None:
     """Find the previous or next search match."""
-    app = get_app()
-    layout = app.layout
-    control = app.layout.current_control
-    # Determine search buffer and searched buffer
-    search_buffer_control = None
-    if isinstance(control, SearchBufferControl):
-        search_buffer_control = control
-        control = layout.search_links[search_buffer_control]
-    elif isinstance(control, BufferControl):
-        if control.search_buffer_control is not None:
-            search_buffer_control = control.search_buffer_control
-    elif app.search_bar is not None:
-        search_buffer_control = app.search_bar.control
-    if isinstance(control, BufferControl) and search_buffer_control is not None:
+    if is_searching():
+        accept_search()
+
+    search_buffer_control, current_control = find_search_control()
+    if search_buffer_control is None:
+        return
+    searchable_controls = find_searchable_controls(
+        search_buffer_control, current_control
+    )
+
+    if direction == SearchDirection.BACKWARD:
+        searchable_controls = searchable_controls[:1] + searchable_controls[1:][::-1]
+
+    # Search over all searchable buffers
+    for i, control in enumerate(searchable_controls):
         # Update search_state.
         search_state = control.search_state
         search_state.direction = direction
         # Apply search to buffer
         buffer = control.buffer
-        buffer.apply_search(search_state, include_current_position=False, count=1)
-        # Set selection
-        buffer.selection_state = SelectionState(
-            buffer.cursor_position + len(search_state.text)
-        )
-        buffer.selection_state.enter_shift_mode()
+
+        search_result: tuple[int, int] | None = None
+
+        # If we are searching history, use the PTK buffer search implementation
+        if buffer.enable_history_search():
+            search_result = buffer._search(search_state)
+
+        # Otherwise, only search the buffer's current "working line"
+        else:
+            document = buffer.document
+            # If have move to the next buffer, set the cursor position for the start of
+            # the search to the start or the end of the text, depending on if we are
+            # searching forwards or backwards
+            if i > 0:
+                if direction == SearchDirection.FORWARD:
+                    document = Document(document.text, 0)
+                else:
+                    document = Document(document.text, len(document.text))
+
+            text = search_state.text
+            ignore_case = search_state.ignore_case()
+
+            if direction == SearchDirection.FORWARD:
+                # Try find at the current input.
+                new_index = document.find(
+                    text,
+                    # If we have moved to the next buffer, include the current position
+                    # which will be the start of the document text
+                    include_current_position=i > 0,
+                    ignore_case=ignore_case,
+                )
+                if new_index is not None:
+                    search_result = (
+                        buffer.working_index,
+                        document.cursor_position + new_index,
+                    )
+            else:
+                # Try find at the current input.
+                new_index = document.find_backwards(text, ignore_case=ignore_case)
+                if new_index is not None:
+                    search_result = (
+                        buffer.working_index,
+                        document.cursor_position + new_index,
+                    )
+
+        if search_result is not None:
+            working_index, cursor_position = search_result
+            buffer.working_index = working_index
+            buffer.cursor_position = cursor_position
+            # Set SelectionState
+            buffer.selection_state = SelectionState(
+                buffer.cursor_position + len(search_state.text)
+            )
+            buffer.selection_state.enter_shift_mode()
+
+            # Trigger a cursor position changed event on this buffer
+            buffer._cursor_position_changed()
+
+            break
 
 
 @add_cmd()

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
@@ -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(
                 [
@@ -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()
+            # 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
@@ -122,7 +120,7 @@ def _separate_buffers(
                         cloned_substrate = dict(substate)  # clone list/tuple
                     cloned_substrate[k] = vnew
     else:
-        raise ValueError("expected state to be a list or dict, not %r" % substate)
+        raise ValueError(f"Expected state to be a list or dict, not {substate!r}")
     return cloned_substrate if cloned_substrate is not None else substate
 
 
@@ -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
         )
@@ -250,7 +253,7 @@ class OutputModel(IpyWidgetComm):
             {"outputs": partial(setattr, container, "json")},
         )
 
-    def add_output(self, json: dict[str, Any]) -> None:
+    def add_output(self, json: dict[str, Any], own: bool) -> None:
         """Add a new output to this widget."""
         if self.clear_output_wait:
             self.set_state("outputs", [json])
@@ -285,9 +288,9 @@ class OutputModel(IpyWidgetComm):
             else:
                 # Restore the message's callbacks
                 if self.original_callbacks:
-                    self.comm_container.kernel.msg_id_callbacks[
-                        self.prev_msg_id
-                    ] = self.original_callbacks
+                    self.comm_container.kernel.msg_id_callbacks[self.prev_msg_id] = (
+                        self.original_callbacks
+                    )
                     self.original_callbacks = MsgCallbacks()
                 else:
                     del self.comm_container.kernel.msg_id_callbacks[self.prev_msg_id]
@@ -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