euporie 2.8.5__tar.gz → 2.8.7__tar.gz

{euporie-2.8.5 → 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.5 → 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.5 → euporie-2.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euporie
-Version: 2.8.5
+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
@@ -85,10 +85,12 @@ If you're working with Jupyter notebooks in a terminal only environment, like an
 Install
 *******
 
-You can install euporie with `pipx <https://pipxproject.github.io/>`_ (recommended) or ``pip``:
+You can install euporie with `uv <https://docs.astral.sh/uv/>`_  (recommended), or with `pipx <https://pipxproject.github.io/>`_ or ``pip``):
 
 .. code-block:: console
 
+   $ uv tool install euporie
+   $ # OR
    $ pipx install euporie
    $ # OR
    $ python -m pip install --user euporie

{euporie-2.8.5 → euporie-2.8.7}/README.rst

@@ -38,10 +38,12 @@ If you're working with Jupyter notebooks in a terminal only environment, like an
 Install
 *******
 
-You can install euporie with `pipx <https://pipxproject.github.io/>`_ (recommended) or ``pip``:
+You can install euporie with `uv <https://docs.astral.sh/uv/>`_  (recommended), or with `pipx <https://pipxproject.github.io/>`_ or ``pip``):
 
 .. code-block:: console
 
+   $ uv tool install euporie
+   $ # OR
    $ pipx install euporie
    $ # OR
    $ python -m pip install --user euporie

{euporie-2.8.5 → 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.5 → 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.5 → 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.5"
+__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.5 → euporie-2.8.7}/euporie/core/__main__.py

@@ -7,13 +7,13 @@ from importlib.metadata import entry_points
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from importlib.metadata import EntryPoint, EntryPoints, SelectableGroups
+    from importlib.metadata import EntryPoint, EntryPoints
 
 
 @cache
 def available_apps() -> dict[str, EntryPoint]:
     """Return a list of loadable euporie apps."""
-    eps: dict | SelectableGroups | EntryPoints
+    eps: dict | EntryPoints
     try:
         eps = entry_points(group="euporie.apps")
     except TypeError:

{euporie-2.8.5 → euporie-2.8.7}/euporie/core/_settings.py

@@ -1,5 +1,7 @@
 """Defines core settings."""
 
+import json
+
 from euporie.core import __version__
 from euporie.core.config import add_setting
 
@@ -73,8 +75,11 @@ add_setting(
     name="log_config",
     group="euporie.core.log",
     flags=["--log-config"],
-    type_=str,
-    default="{}",
+    type_=json.loads,
+    default={},
+    schema={
+        "type": "object",
+    },
     title="additional logging configuration",
     help_="Additional logging configuration",
     description="""

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

@@ -8,7 +8,7 @@ from prompt_toolkit.filters import buffer_has_focus
 
 from euporie.core.app.current import get_app
 from euporie.core.commands import add_cmd
-from euporie.core.filters import tab_has_focus
+from euporie.core.filters import tab_has_focus, tab_type_has_focus
 
 if TYPE_CHECKING:
     from prompt_toolkit.key_binding.key_processor import KeyPressEvent
@@ -20,18 +20,12 @@ def _quit() -> None:
     get_app().exit()
 
 
-@add_cmd(aliases=["wq", "x"])
-def _save_and_quit(event: KeyPressEvent) -> None:
-    """Save the current tab then quits euporie."""
-    from upath import UPath
+@add_cmd(aliases=["q!"])
+def _force_quit() -> None:
+    """Quit euporie without saving any changes."""
+    from prompt_toolkit.application.application import Application
 
-    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()
+    Application.exit(get_app())
 
 
 @add_cmd(aliases=["bc"], filter=tab_has_focus, menu_title="Close File")
@@ -68,3 +62,17 @@ def _focus_previous() -> None:
 def _clear_screen() -> None:
     """Clear the screen."""
     get_app().renderer.clear()
+
+
+@add_cmd(hidden=True, aliases=[""])
+def _go_to(event: KeyPressEvent, index: int = 0) -> None:
+    """Go to a line or cell by number."""
+    index = max(0, index - 1)
+    if buffer_has_focus():
+        buffer = get_app().current_buffer
+        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(index)

{euporie-2.8.5 → euporie-2.8.7}/euporie/core/app/_settings.py

@@ -140,6 +140,8 @@ add_setting(
 
         e.g.
 
+        .. code-block:: json
+
            [
              {"command": ["ruff", "format", "-"], "languages": ["python"]},
              {"command": ["black", "-"], "languages": ["python"]},
@@ -281,6 +283,30 @@ add_setting(
     """,
 )
 
+add_setting(
+    name="custom_styles",
+    group="euporie.core.style",
+    flags=["--custom-styles"],
+    type_=json.loads,
+    default={},
+    schema={
+        "type": "object",
+    },
+    help_="Additional style settings",
+    description="""
+        A JSON object mapping style names to prompt-toolkit style values.
+
+        The style keys used in euporie can be found in :py:func:`euporie.core.style.build_style`.
+
+        e.g.:
+
+        .. code-block:: json
+
+           { "cell input prompt":"fg:purple", "cell output prompt": "fg:green" }
+
+    """,
+)
+
 add_setting(
     name="key_bindings",
     group="euporie.core.app.app",
@@ -288,19 +314,19 @@ add_setting(
     type_=json.loads,
     help_="Additional key binding definitions",
     default={},
-    description="""
-        A mapping of component names to mappings of command name to key-binding lists.
-""",
     schema={
         "type": "object",
     },
+    description="""
+        A mapping of component names to mappings of command name to key-binding lists.
+""",
 )
 
 add_setting(
     name="graphics",
     group="euporie.core.app.app",
     flags=["--graphics"],
-    choices=["none", "sixel", "kitty", "iterm"],
+    choices=["none", "sixel", "kitty", "kitty-unicode", "iterm"],
     type_=str,
     default=None,
     help_="The preferred graphics protocol",
@@ -375,6 +401,8 @@ add_setting(
     description="""
         Additional language servers can be defined here, e.g.:
 
+        .. code-block:: json
+
            {
             "ruff": {"command": ["ruff-lsp"], "languages": ["python"]},
             "pylsp": {"command": ["pylsp"], "languages": ["python"]},
@@ -392,6 +420,8 @@ add_setting(
         empty dictionary. For example, the following would disable the awk language
         server:
 
+        .. code-block:: json
+
            {
              "awk-language-server": {},
            }

{euporie-2.8.5 → 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:
@@ -791,6 +797,13 @@ class BaseApp(ConfigurableApp, Application, ABC):
             syntax_theme = "tango" if self.color_palette.bg.is_light else "euporie"
         return syntax_theme
 
+    base_styles = (
+        Style(MIME_STYLE),
+        Style(HTML_STYLE),
+        Style(LOG_STYLE),
+        Style(IPYWIDGET_STYLE),
+    )
+
     def create_merged_style(self) -> BaseStyle:
         """Generate a new merged style for the application.
 
@@ -801,6 +814,11 @@ class BaseApp(ConfigurableApp, Application, ABC):
             Return a combined style to use for the application
 
         """
+        styles: list[BaseStyle] = [
+            style_from_pygments_cls(get_style_by_name(self.syntax_theme)),
+            *self.base_styles,
+        ]
+
         # Get foreground and background colors based on the configured colour scheme
         theme_colors: dict[str, dict[str, str]] = {
             "default": {},
@@ -844,7 +862,7 @@ class BaseApp(ConfigurableApp, Application, ABC):
         )
 
         # Build app style
-        app_style = build_style(cp)
+        styles.append(build_style(cp))
 
         # Apply style transformations based on the configured color scheme
         self.style_transformation = merge_style_transformations(
@@ -862,16 +880,11 @@ class BaseApp(ConfigurableApp, Application, ABC):
             ]
         )
 
-        return merge_styles(
-            [
-                style_from_pygments_cls(get_style_by_name(self.syntax_theme)),
-                Style(MIME_STYLE),
-                Style(HTML_STYLE),
-                Style(LOG_STYLE),
-                Style(IPYWIDGET_STYLE),
-                app_style,
-            ]
-        )
+        # Add user style customizations
+        if custom_style_dict := self.config.custom_styles:
+            styles.append(Style.from_dict(custom_style_dict))
+
+        return merge_styles(styles)
 
     def update_style(self, query: Setting | None = None) -> None:
         """Update the application's style when the syntax theme is changed."""