euporie 2.8.6__tar.gz → 2.8.7__tar.gz

{euporie-2.8.6 → euporie-2.8.7}/.gitignore

@@ -2,9 +2,6 @@
 /media
 /examples
 
-# Python version specifier file
-.python-version
-
 # AI tools
 .aider*
 
@@ -97,7 +94,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -151,141 +148,3 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/

{euporie-2.8.6 → euporie-2.8.7}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Josiah Outram Halstead
+Copyright (c) 2025 Josiah Outram Halstead
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{euporie-2.8.6 → euporie-2.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euporie
-Version: 2.8.6
+Version: 2.8.7
 Summary: Euporie is a suite of terminal applications for interacting with Jupyter kernels
 Project-URL: Documentation, https://euporie.readthedocs.io/en/latest
 Project-URL: Issues, https://github.com/joouha/euporie/issues

{euporie-2.8.6 → euporie-2.8.7}/euporie/console/app.py

@@ -32,6 +32,7 @@ from euporie.core.filters import has_dialog
 from euporie.core.layout.mouse import DisableMouseOnScroll
 from euporie.core.widgets.dialog import (
     AboutDialog,
+    ConfirmDialog,
     NoKernelsDialog,
     SaveAsDialog,
     SelectKernelDialog,
@@ -112,6 +113,7 @@ class ConsoleApp(BaseApp):
         self.dialogs["no-kernels"] = NoKernelsDialog(self)
         self.dialogs["change-kernel"] = SelectKernelDialog(self)
         self.dialogs["shortcuts"] = ShortcutsDialog(self)
+        self.dialogs["confirm"] = ConfirmDialog(self)
 
         return FloatContainer(
             DisableMouseOnScroll(

{euporie-2.8.6 → euporie-2.8.7}/euporie/console/tabs/console.py

@@ -40,7 +40,7 @@ from euporie.core.filters import (
 )
 from euporie.core.format import LspFormatter
 from euporie.core.io import edit_in_editor
-from euporie.core.kernel.client import MsgCallbacks
+from euporie.core.kernel.base import MsgCallbacks
 from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
@@ -137,10 +137,7 @@ class Console(KernelTab):
 
         self.container = self.load_container()
 
-        self.kernel.start(cb=self.kernel_started, wait=False)
-
         self.app.before_render += self.render_outputs
-
         self.on_advance = Event(self)
 
     async def load_lsps(self) -> None:
@@ -162,9 +159,26 @@ class Console(KernelTab):
 
             lsp.on_exit += lsp_unload
 
+    def post_init_kernel(self) -> None:
+        """Start the kernel after if has been loaded."""
+        # Load container
+        super().post_init_kernel()
+
+        # Start kernel
+        if self.kernel._status == "stopped":
+            self.kernel.start(cb=self.kernel_started, wait=False)
+
     def kernel_died(self) -> None:
-        """Call when the kernel dies."""
+        """Call if the kernel dies."""
         log.error("The kernel has died")
+        if confirm := self.app.dialogs.get("confirm"):
+            confirm.show(
+                title="Kernel connection lost",
+                message="The kernel appears to have died\n"
+                "as it can no longer be reached.\n\n"
+                "Do you want to restart the kernel?",
+                cb=self.kernel.restart,
+            )
 
     async def load_history(self) -> None:
         """Load kernel history."""
@@ -191,9 +205,7 @@ class Console(KernelTab):
     def validate_input(self, code: str) -> bool:
         """Determine if the entered code is ready to run."""
         assert self.kernel is not None
-        completeness_status = self.kernel.is_complete(code, wait=True).get(
-            "status", "unknown"
-        )
+        completeness_status = self.kernel.is_complete(code).get("status", "unknown")
         return not (
             not code.strip()
             or completeness_status == "incomplete"
@@ -404,12 +416,7 @@ class Console(KernelTab):
                 if ((json_cells and cell.id != json_cells[0].id) or i > 0) and (
                     (height_known and rows_above_layout > 0) or not height_known
                 ):
-                    children.append(
-                        Window(
-                            height=1,
-                            dont_extend_height=True,
-                        )
-                    )
+                    children.append(Window(height=1, dont_extend_height=True))
 
                 # Cell input
                 children.append(
@@ -441,9 +448,12 @@ class Console(KernelTab):
             if outputs := cell.outputs:
                 # Add space before an output if last rendered cell did not have outputs
                 # or we are rendering a new output
-                if self.last_rendered is not None and (
-                    not self.last_rendered.outputs
-                    or cell.execution_count != self.last_rendered.execution_count
+                if self.last_rendered is None or (
+                    self.last_rendered is not None
+                    and (
+                        not self.last_rendered.outputs
+                        or cell.execution_count != self.last_rendered.execution_count
+                    )
                 ):
                     children.append(
                         Window(

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/__init__.py

@@ -1,10 +1,10 @@
 """This package defines the euporie application and its components."""
 
 __app_name__ = "euporie"
-__version__ = "2.8.6"
+__version__ = "2.8.7"
 __logo__ = "⚈"
 __strapline__ = "Jupyter in the terminal"
 __author__ = "Josiah Outram Halstead"
 __email__ = "josiah@halstead.email"
-__copyright__ = f"© 2024, {__author__}"
+__copyright__ = f"© 2025, {__author__}"
 __license__ = "MIT"

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/app/_commands.py

@@ -28,20 +28,6 @@ def _force_quit() -> None:
     Application.exit(get_app())
 
 
-@add_cmd(aliases=["wq", "x"])
-def _save_and_quit(event: KeyPressEvent) -> None:
-    """Save the current tab then quits euporie."""
-    from upath import UPath
-
-    app = get_app()
-    if (tab := get_app().tab) is not None:
-        try:
-            tab._save(UPath(event._arg) if event._arg else None)
-        except NotImplementedError:
-            pass
-    app.exit()
-
-
 @add_cmd(aliases=["bc"], filter=tab_has_focus, menu_title="Close File")
 def _close_tab() -> None:
     """Close the current tab."""
@@ -79,17 +65,14 @@ def _clear_screen() -> None:
 
 
 @add_cmd(hidden=True, aliases=[""])
-def _go_to(event: KeyPressEvent) -> None:
+def _go_to(event: KeyPressEvent, index: int = 0) -> None:
     """Go to a line or cell by number."""
-    try:
-        idx = int(event._arg or "") - 1
-    except (ValueError, TypeError):
-        return
+    index = max(0, index - 1)
     if buffer_has_focus():
         buffer = get_app().current_buffer
-        buffer.cursor_position = len("".join(buffer.text.splitlines(True)[:idx]))
+        buffer.cursor_position = len("".join(buffer.text.splitlines(True)[:index]))
     elif tab_type_has_focus("euporie.notebook.tabs.notebook:Notebook")():
         from euporie.notebook.tabs.notebook import Notebook
 
         if isinstance(nb := get_app().tab, Notebook):
-            nb.select(idx)
+            nb.select(index)

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/app/app.py

@@ -520,14 +520,17 @@ class BaseApp(ConfigurableApp, Application, ABC):
     @classmethod
     def launch(cls) -> None:
         """Launch the app."""
+        from prompt_toolkit.utils import in_main_thread
+
         super().launch()
         # Run the application
         with create_app_session(input=cls.load_input(), output=cls.load_output()):
             # Create an instance of the app and run it
             app = cls()
-            # Handle SIGTERM while the app is running
-            original_sigterm = signal.getsignal(signal.SIGTERM)
-            signal.signal(signal.SIGTERM, app.cleanup)
+            if in_main_thread():
+                # Handle SIGTERM while the app is running
+                original_sigterm = signal.getsignal(signal.SIGTERM)
+                signal.signal(signal.SIGTERM, app.cleanup)
             # Set and run the app
             with set_app(app):
                 try:
@@ -535,7 +538,8 @@ class BaseApp(ConfigurableApp, Application, ABC):
                 except (EOFError, KeyboardInterrupt):
                     result = None
                 finally:
-                    signal.signal(signal.SIGTERM, original_sigterm)
+                    if in_main_thread():
+                        signal.signal(signal.SIGTERM, original_sigterm)
                     # Shut down any remaining LSP clients at exit
                     app.shutdown_lsps()
         return result
@@ -582,14 +586,16 @@ class BaseApp(ConfigurableApp, Application, ABC):
         path_mime = get_mime(path) or "text/plain"
         log.debug("File %s has mime type: %s", path, path_mime)
 
-        tab_options: list[TabRegistryEntry] = []
+        # Use a set to automatically handle duplicates
+        tab_options: set[TabRegistryEntry] = set()
         for entry in self.tab_registry:
             for mime_type in entry.mime_types:
                 if PurePath(path_mime).match(mime_type):
-                    tab_options.append(entry)
+                    tab_options.add(entry)
             if path.suffix in entry.file_extensions:
-                tab_options.append(entry)
+                tab_options.add(entry)
 
+        # Sort by weight (TabRegistryEntry.__lt__ handles this)
         return sorted(tab_options, reverse=True)
 
     def get_file_tab(self, path: Path) -> type[Tab] | None:

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/bars/command.py

@@ -29,6 +29,7 @@ from euporie.core.key_binding.registry import (
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
+    from typing import Unpack
 
     from prompt_toolkit.completion.base import CompleteEvent
     from prompt_toolkit.document import Document
@@ -195,11 +196,13 @@ class CommandBar:
 
     @staticmethod
     @add_cmd(aliases=["shell"])
-    async def _run_shell_command(event: KeyPressEvent) -> None:
+    async def _run_shell_command(
+        event: KeyPressEvent, *cmd_arg: Unpack[tuple[str]]
+    ) -> None:
         """Run system command."""
-        app = event.app
-        if event._arg:
-            await app.run_system_command(
-                event._arg,
-                display_before_text=[("bold", "$ "), ("", f"{event._arg}\n")],
+        command = " ".join(str(x) for x in cmd_arg)
+        if command:
+            await event.app.run_system_command(
+                command,
+                display_before_text=[("bold", "$ "), ("", f"{command}\n")],
             )

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/bars/search.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import re
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.buffer import Buffer
@@ -27,6 +28,7 @@ from euporie.core.key_binding.registry import (
 if TYPE_CHECKING:
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text.base import AnyFormattedText
+    from prompt_toolkit.layout.controls import UIControl
 
 log = logging.getLogger(__name__)
 
@@ -119,9 +121,17 @@ 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] = []
+    # If a tab provides a list of buffers to search, use that. Otherwise, trawl the
+    # layout for buffer controls with this as its search control
+    long_list: list[UIControl]
+    if tab := get_app().tab:
+        try:
+            long_list = list(tab.__pt_searchables__())
+        except NotImplementedError:
+            long_list = list(get_app().layout.find_all_controls())
     next_control_index = 0
-    for control in get_app().layout.find_all_controls():
+    searchable_controls: list[BufferControl] = []
+    for control in long_list:
         # 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.
@@ -134,6 +144,7 @@ def find_searchable_controls(
         ):
             # Add it to our list
             searchable_controls.append(control)
+    # Cut list based on current control index
     searchable_controls = (
         searchable_controls[next_control_index:]
         + searchable_controls[:next_control_index]
@@ -332,3 +343,33 @@ def accept_search() -> None:
     search_buffer_control.buffer.append_to_history()
     # Stop the search
     stop_search()
+
+
+@add_cmd()
+def _replace_all(find_str: str, replace_str: str) -> None:
+    """Find and replace text in all searchable buffers.
+
+    Args:
+        find_str: String pattern to find (will be converted to regex)
+        replace_str: Replacement string
+    """
+    # Convert find string to regex pattern
+    pattern = re.compile(find_str)
+
+    # Get searchable controls
+    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
+    )
+
+    # Apply replacements to each buffer
+    for control in searchable_controls:
+        if isinstance(control, BufferControl):
+            buffer = control.buffer
+            text = buffer.text
+            new_text = pattern.sub(replace_str, text)
+            if new_text != text:
+                buffer.text = new_text
+                buffer.on_text_changed()

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/border.py

@@ -512,6 +512,11 @@ _GRID_CHARS = {
     GridChar(LowerLeftQuarterLine, NoLine, NoLine, UpperRightEighthLine): " ",
     GridChar(UpperRightQuarterLine, UpperRightEighthLine, NoLine, NoLine): " ",
 
+    GridChar(NoLine, NoLine, UpperRightQuarterLine, UpperRightEighthLine): "▁",
+    GridChar(UpperRightQuarterLine, NoLine, NoLine, UpperRightEighthLine): "▔",
+    GridChar(LowerLeftQuarterLine, UpperRightEighthLine, NoLine, NoLine): "▔",
+    GridChar(NoLine, LowerLeftEighthLine, LowerLeftQuarterLine, NoLine): "▁",
+
     # LowerLeftQuarterLine
     GridChar(LowerLeftQuarterLine, NoLine, LowerLeftQuarterLine, NoLine): "▎",
     GridChar(NoLine, LowerLeftQuarterLine, NoLine, LowerLeftQuarterLine): "▂",
@@ -875,9 +880,9 @@ InsetGrid = (
 
 OutsetGrid = (
     LowerLeftEighthLine.top_edge
-    + UpperRightEighthLine.right_edge
+    + UpperRightQuarterLine.right_edge
     + UpperRightEighthLine.bottom_edge
-    + LowerLeftEighthLine.left_edge
+    + LowerLeftQuarterLine.left_edge
     + ThinLine.inner
 )
 

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/comm/base.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
     from prompt_toolkit.layout.containers import AnyContainer
 
-    from euporie.core.kernel.client import Kernel
+    from euporie.core.kernel.jupyter import JupyterKernel
     from euporie.core.tabs.kernel import KernelTab
     from euporie.core.widgets.cell_outputs import OutputParent
 
@@ -40,7 +40,7 @@ class CommView:
         """
         self.container = container
         self.setters: dict[str, Callable[..., None]] = dict(setters or {})
-        self.kernel: Kernel | None = None
+        self.kernel: JupyterKernel | None = None
 
     def update(self, changes: dict[str, Any]) -> None:
         """Update the view to reflect changes in the Comm.

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/comm/ipywidgets.py

@@ -19,7 +19,7 @@ from prompt_toolkit.layout.processors import BeforeInput
 
 from euporie.core.comm.base import Comm, CommView
 from euporie.core.data_structures import DiBool
-from euporie.core.kernel.client import MsgCallbacks
+from euporie.core.kernel.jupyter import MsgCallbacks
 from euporie.core.layout.decor import FocusedStyle
 from euporie.core.widgets.forms import (
     Button,
@@ -518,7 +518,7 @@ class TextBoxIpyWidgetComm(IpyWidgetComm, metaclass=ABCMeta):
             container,
             setters={
                 "value": lambda x: setattr(text.buffer, "text", str(x)),
-                "rows": partial(setattr, text.text_area.window, "height"),
+                "rows": partial(setattr, text.window, "height"),
                 "placeholder": partial(setattr, text, "placeholder"),
                 "description_allow_html": partial(setattr, labelled_widget, "html"),
             },
@@ -1403,7 +1403,7 @@ class ColorPickerModel(TextBoxIpyWidgetComm):
             container,
             setters={
                 "value": lambda x: setattr(text.buffer, "text", str(x)),
-                "rows": partial(setattr, text.text_area.window, "height"),
+                "rows": partial(setattr, text.window, "height"),
                 "placeholder": partial(setattr, text, "placeholder"),
             },
         )

{euporie-2.8.6 → euporie-2.8.7}/euporie/core/commands.py

@@ -41,6 +41,36 @@ if TYPE_CHECKING:
 log = logging.getLogger(__name__)
 
 
+def parse_args(arg: str) -> list[Any]:
+    """Parse a command argument string into a list of values.
+
+    Args:
+        arg: The argument string to parse
+
+    Returns:
+        A list of parsed values, with strings for items that couldn't be evaluated
+    """
+    if not arg:
+        return []
+
+    import ast
+
+    result = []
+    for item in arg.split():
+        try:
+            # Safely evaluate string as a Python literal
+            new_value = ast.literal_eval(item)
+        except (ValueError, SyntaxError):
+            # Keep as string if evaluation fails
+            result.append(item)
+        else:
+            if type(new_value) is str:
+                result.append(item)
+            else:
+                result.append(new_value)
+    return result
+
+
 class Command:
     """Wrap a function so it can be used as a key-binding or a menu item."""
 
@@ -110,18 +140,19 @@ class Command:
 
         self.keys: list[tuple[str | Keys, ...]] = []
 
-    def run(self, arg: str | None = None) -> None:
+    def run(self, arg: str = "") -> 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=arg,
+                    arg=None,
                     key_sequence=[],
                     previous_key_sequence=[],
                     is_repeat=False,
                 ),
+                *parse_args(arg),
             )
             if isawaitable(result):
 
@@ -141,14 +172,19 @@ class Command:
         handler = self.handler
         sig = signature(handler)
 
-        if sig.parameters:
-            # The handler already accepts a `KeyPressEvent` argument
+        if sig.parameters and next(iter(sig.parameters.keys())) == "event":
+            # The handler already accepts a `KeyPressEvent` argument named "event"
+            # as the first parameter
             return cast("KeyHandlerCallable", handler)
 
+        # Otherwise we need to wrap in a function which accepts a KeyPressEvent as the
+        # first parameter
         if iscoroutinefunction(handler):
 
-            async def _key_handler_async(event: KeyPressEvent) -> NotImplementedOrNone:
-                result = cast("CommandHandlerNoArgs", handler)()
+            async def _key_handler_async(
+                event: KeyPressEvent, *args: Any
+            ) -> NotImplementedOrNone:
+                result = cast("CommandHandlerNoArgs", handler)(*args)
                 assert isawaitable(result)
                 return await result
 
@@ -156,8 +192,8 @@ class Command:
 
         else:
 
-            def _key_handler(event: KeyPressEvent) -> NotImplementedOrNone:
-                return cast("CommandHandlerNoArgs", handler)()
+            def _key_handler(event: KeyPressEvent, *args: Any) -> NotImplementedOrNone:
+                return cast("CommandHandlerNoArgs", handler)(*args)
 
             return _key_handler