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

euporie/notebook/widgets/_commands.py

@@ -0,0 +1,11 @@
+"""Define commands for widgets."""
+
+from euporie.core.commands import add_cmd
+
+
+@add_cmd()
+def _toggle_side_bar_pane() -> None:
+    """Open or close the current side-bar pane."""
+    from euporie.notebook.current import get_app
+
+    get_app().side_bar.toggle_pane()

euporie/notebook/widgets/_settings.py

@@ -0,0 +1,19 @@
+"""Define settings for the notebook app widgets."""
+
+from euporie.core.config import add_setting
+
+add_setting(
+    name="show_side_bar",
+    group="euporie.notebook.widgets.side_bar",
+    flags=["--show-side-bar"],
+    type_=bool,
+    title="side-bar",
+    help_="Show the side-bar",
+    default=False,
+    schema={
+        "type": "boolean",
+    },
+    description="""
+        Whether the side-bar should be shown at the side of the screen.
+    """,
+)

euporie/notebook/widgets/side_bar.py

@@ -16,14 +16,12 @@ from prompt_toolkit.layout.containers import (
 )
 from prompt_toolkit.layout.controls import FormattedTextControl
 
-from euporie.core.commands import add_cmd
-from euporie.core.config import add_setting
 from euporie.core.key_binding.registry import register_bindings
 from euporie.core.layout.decor import Line
 from euporie.core.widgets.forms import ToggleButton, ToggleButtons
 
 if TYPE_CHECKING:
-    from typing import Sequence
+    from collections.abc import Sequence
 
     from prompt_toolkit.layout.containers import AnyContainer
 
@@ -39,13 +37,22 @@ class SideBarButtons(ToggleButtons):
         else:
             return "class:side_bar,buttons,separator"
 
+    def _get_sep_char(self, i: int) -> str:
+        if self.index in {i, i - 1}:
+            return "▄"
+        return ""
+
     def load_container(self) -> AnyContainer:
         """Load the widget's container."""
         self.buttons: list[ToggleButton] = []
         children: list[AnyContainer] = []
         for i, (label, selected) in enumerate(zip(self.labels, self.mask)):
             children.append(
-                Window(char="▄", height=1, style=partial(self._get_sep_style, i))
+                Window(
+                    char=partial(self._get_sep_char, i),
+                    height=1,
+                    style=partial(self._get_sep_style, i),
+                )
             )
             button = ToggleButton(
                 text=label,
@@ -60,7 +67,7 @@ class SideBarButtons(ToggleButtons):
         children.extend(
             [
                 Window(
-                    char="▄",
+                    char=partial(self._get_sep_char, i),
                     height=1,
                     style=partial(self._get_sep_style, len(self.options)),
                 ),
@@ -85,7 +92,7 @@ class SideBar:
         panels: Sequence[AnyContainer],
     ) -> None:
         """Initialize a new side-bar object."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         self.side_bar_buttons = SideBarButtons(
             options=list(icons),
@@ -158,7 +165,7 @@ class SideBar:
                 ],
                 style="class:side_bar",
             ),
-            filter=get_app().config.filter("show_side_bar"),
+            filter=get_app().config.filters.show_side_bar,
         )
 
     def toggle_pane(self) -> None:
@@ -172,33 +179,6 @@ class SideBar:
         """Return the side_bar's main container."""
         return self.container
 
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_side_bar",
-        flags=["--show-side-bar"],
-        type_=bool,
-        title="side-bar",
-        help_="Show the side-bar",
-        default=False,
-        schema={
-            "type": "boolean",
-        },
-        description="""
-            Whether the side-bar should be shown at the side of the screen.
-        """,
-    )
-
-    # ################################### Commands ####################################
-
-    @staticmethod
-    @add_cmd()
-    def _toggle_side_bar_pane() -> None:
-        """Open or close the current side-bar pane."""
-        from euporie.notebook.current import get_app
-
-        get_app().side_bar.toggle_pane()
-
     # ################################# Key Bindings ##################################
 
     register_bindings(

euporie/preview/_settings.py

@@ -0,0 +1,104 @@
+"""Define settings for the preview app."""
+
+from __future__ import annotations
+
+import logging
+
+from upath import UPath
+
+from euporie.core.config import add_setting
+
+log = logging.getLogger(__name__)
+
+
+add_setting(
+    name="output_file",
+    group="euporie.preview.app",
+    flags=["--output-file"],
+    nargs="?",
+    default="-",
+    const="-",
+    type_=UPath,
+    help_="Output path when previewing file",
+    description="""
+        When set to a file path, the formatted output will be written to the
+        given path. If no value is given (or the default "-" is passed) output
+        will be printed to standard output.
+    """,
+)
+
+add_setting(
+    name="page",
+    group="euporie.preview.app",
+    flags=["--page"],
+    type_=bool,
+    help_="Pass output to pager",
+    default=False,
+    description="""
+        Whether to pipe output to the system pager when previewing a notebook.
+    """,
+)
+
+
+add_setting(
+    name="run",
+    group="euporie.preview.app",
+    flags=["--run"],
+    type_=bool,
+    help_="Run the notebook files when loaded",
+    default=False,
+    description="""
+        If set, notebooks will be run automatically when opened, or if previewing a
+        file, the notebooks will be run before being output.
+    """,
+)
+
+add_setting(
+    name="save",
+    group="euporie.preview.app",
+    flags=["--save"],
+    type_=bool,
+    help_="Save the notebook after running it",
+    default=False,
+    description="""
+        If set, notebooks will be saved after they have been run. This setting only
+        has any affect if the :option:`run` setting is active.
+    """,
+)
+
+add_setting(
+    name="show_filenames",
+    group="euporie.preview.app",
+    flags=["--show-filenames"],
+    type_=bool,
+    help_="Show the notebook filenames when previewing multiple notebooks",
+    default=False,
+    description="""
+        If set, the notebook filenames will be printed above each notebook's output
+        when multiple notebooks are being previewed.
+    """,
+)
+
+add_setting(
+    name="cell_start",
+    group="euporie.preview.app",
+    flags=["--cell-start"],
+    type_=int,
+    help_="The first cell to include in the preview",
+    default=None,
+    description="""
+        When set, only cells after the given cell index will be shown.
+    """,
+)
+
+add_setting(
+    name="cell_stop",
+    group="euporie.preview.app",
+    flags=["--cell-stop"],
+    type_=int,
+    help_="The last cell to include in the preview",
+    default=None,
+    description="""
+        When set, only cells before the given cell index will be shown.
+    """,
+)

euporie/preview/app.py

@@ -12,10 +12,9 @@ from typing import TYPE_CHECKING, cast
 from prompt_toolkit.layout.containers import DynamicContainer, FloatContainer, Window
 from prompt_toolkit.output.defaults import create_output
 from prompt_toolkit.output.vt100 import Vt100_Output
-from upath import UPath
 
-from euporie.core.app import BaseApp, get_app
-from euporie.core.config import add_setting
+from euporie.core.app.app import BaseApp
+from euporie.core.app.current import get_app
 from euporie.core.io import PseudoTTY
 from euporie.core.key_binding.registry import register_bindings
 from euporie.preview.tabs.notebook import PreviewNotebook
@@ -55,6 +54,7 @@ class PreviewApp(BaseApp):
         kwargs.setdefault("max_render_postpone_time", 0)
         kwargs.setdefault("min_redraw_interval", 0)
         kwargs.setdefault("extend_renderer_height", True)
+        kwargs.setdefault("enable_page_navigation_bindings", False)
         # Adjust options if we are paging output
         if self.config.page:
             kwargs.setdefault("set_title", False)
@@ -126,7 +126,7 @@ class PreviewApp(BaseApp):
             # Use a temporary file as display output if we are going to page the output
             from tempfile import TemporaryFile
 
-            output_file = TemporaryFile("w+")
+            output_file = TemporaryFile("w+")  # noqa: SIM115
             # Make this file look like a tty so we get colorful output
             output_file = cast("TextIO", PseudoTTY(output_file, isatty=True))
 
@@ -189,33 +189,11 @@ class PreviewApp(BaseApp):
         # time.sleep(0.1)
         super()._redraw(render_as_done=True)
 
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="output_file",
-        flags=["--output-file"],
-        nargs="?",
-        default="-",
-        const="-",
-        type_=UPath,
-        help_="Output path when previewing file",
-        description="""
-            When set to a file path, the formatted output will be written to the
-            given path. If no value is given (or the default "-" is passed) output
-            will be printed to standard output.
-        """,
-    )
+    def _update_invalidate_events(self) -> None:
+        """Do nothing, as we don't need invalidation events for the preview app."""
 
-    add_setting(
-        name="page",
-        flags=["--page"],
-        type_=bool,
-        help_="Pass output to pager",
-        default=False,
-        description="""
-            Whether to pipe output to the system pager when previewing a notebook.
-        """,
-    )
+    # def load_key_bindings(self) -> None:
+    #     """Do no load any additional key-bindings for the preview app."""
 
     # ################################# Key Bindings ##################################
 

euporie/preview/tabs/notebook.py

@@ -5,14 +5,12 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from prompt_toolkit.cache import FastDictCache
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
 )
 from prompt_toolkit.layout.dimension import Dimension
 
-from euporie.core.config import add_setting
 from euporie.core.layout.containers import VSplit, Window
 from euporie.core.layout.print import PrintingContainer
 from euporie.core.tabs.notebook import BaseNotebook
@@ -27,9 +25,9 @@ if TYPE_CHECKING:
     from prompt_toolkit.formatted_text.base import StyleAndTextTuples
     from prompt_toolkit.layout.containers import AnyContainer
 
-    from euporie.core.app import BaseApp
+    from euporie.core.app.app import BaseApp
     from euporie.core.comm.base import Comm
-    from euporie.core.kernel import Kernel
+    from euporie.core.kernel.client import Kernel
 
 log = logging.getLogger(__name__)
 
@@ -37,8 +35,6 @@ log = logging.getLogger(__name__)
 class PreviewNotebook(BaseNotebook):
     """A notebook tab which renders cells sequentially."""
 
-    bg_init = False
-
     def __init__(
         self,
         app: BaseApp,
@@ -47,15 +43,13 @@ class PreviewNotebook(BaseNotebook):
     ) -> None:
         """Create a new instance."""
         self.cell_index = 0
-        self.cells: FastDictCache[tuple[int], Cell] = FastDictCache(
-            get_value=self.get_cell
-        )
-
         super().__init__(app, path, use_kernel_history=use_kernel_history)
 
         self.app.before_render += self.before_render
         self.app.after_render += self.after_render
 
+        self._cell = Cell(0, {}, self)
+
     def pre_init_kernel(self) -> None:
         """Filter cells before kernel is loaded."""
         super().pre_init_kernel()
@@ -135,7 +129,7 @@ class PreviewNotebook(BaseNotebook):
         ):
             self.print_title()
 
-        if not self.json["cells"]:
+        if not self.json.get("cells", []):
             log.error("No cells")
             self.app.print_text([("", "(No cells to display)\n")])
             self.app.close_tab(self)
@@ -156,27 +150,24 @@ class PreviewNotebook(BaseNotebook):
         # Trigger a re-draw of the app right away, now with the next cell
         self.app.invalidate()
 
-    def get_cell(self, index: int) -> Cell:
-        """Render a cell by its index."""
-        if index < len(self.json["cells"]):
-            return Cell(index, self.json["cells"][index], self)
-        else:
-            return Cell(0, {}, self)
-
     @property
     def cell(self) -> Cell:
-        """Return the current cell."""
-        return self.cells[(self.cell_index,)]
+        """Load the current cell's data into our cell instance."""
+        cell = self._cell
+        cell_json = self.json["cells"][self.cell_index]
+        cell.json = cell_json
+        cell.input = cell_json["source"]
+        cell.output_area.json = cell.output_json
+        return cell
 
     def load_container(self) -> AnyContainer:
         """Load the notebook's main container."""
+        no_expand = ~self.app.config.filters.expand
         return PrintingContainer(
             [
                 VSplit(
                     [
-                        ConditionalContainer(
-                            Window(), filter=~self.app.config.filter("expand")
-                        ),
+                        ConditionalContainer(Window(), filter=no_expand),
                         Box(
                             body=DynamicContainer(lambda: self.cell),
                             padding=0,
@@ -184,70 +175,8 @@ class PreviewNotebook(BaseNotebook):
                                 preferred=self.app.config.max_notebook_width
                             ),
                         ),
-                        ConditionalContainer(
-                            Window(), filter=~self.app.config.filter("expand")
-                        ),
+                        ConditionalContainer(Window(), filter=no_expand),
                     ]
                 )
             ]
         )
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="run",
-        flags=["--run"],
-        type_=bool,
-        help_="Run the notebook files when loaded",
-        default=False,
-        description="""
-            If set, notebooks will be run automatically when opened, or if previewing a
-            file, the notebooks will be run before being output.
-        """,
-    )
-
-    add_setting(
-        name="save",
-        flags=["--save"],
-        type_=bool,
-        help_="Save the notebook after running it",
-        default=False,
-        description="""
-            If set, notebooks will be saved after they have been run. This setting only
-            has any affect if the :option:`run` setting is active.
-        """,
-    )
-
-    add_setting(
-        name="show_filenames",
-        flags=["--show-filenames"],
-        type_=bool,
-        help_="Show the notebook filenames when previewing multiple notebooks",
-        default=False,
-        description="""
-            If set, the notebook filenames will be printed above each notebook's output
-            when multiple notebooks are being previewed.
-        """,
-    )
-
-    add_setting(
-        name="cell_start",
-        flags=["--cell-start"],
-        type_=int,
-        help_="The first cell to include in the preview",
-        default=None,
-        description="""
-            When set, only cells after the given cell index will be shown.
-        """,
-    )
-
-    add_setting(
-        name="cell_stop",
-        flags=["--cell-stop"],
-        type_=int,
-        help_="The last cell to include in the preview",
-        default=None,
-        description="""
-            When set, only cells before the given cell index will be shown.
-        """,
-    )

euporie/web/tabs/web.py

@@ -1,6 +1,5 @@
 """Defines a web-view tab."""
 
-
 from __future__ import annotations
 
 import logging
@@ -11,8 +10,8 @@ from prompt_toolkit.layout.containers import HSplit, VSplit
 from prompt_toolkit.layout.dimension import Dimension
 from upath import UPath
 
+from euporie.core.app.current import get_app
 from euporie.core.convert.mime import get_mime
-from euporie.core.current import get_app
 from euporie.core.data_structures import DiBool
 from euporie.core.layout.decor import FocusedStyle
 from euporie.core.margins import MarginContainer, ScrollbarMargin
@@ -24,12 +23,12 @@ from euporie.web.widgets.webview import WebViewControl
 
 if TYPE_CHECKING:
     from pathlib import Path
-    from typing import Any, Callable, ClassVar
+    from typing import Any, Callable
 
     from prompt_toolkit.layout.containers import AnyContainer
 
-    from euporie.core.app import BaseApp
-    from euporie.core.widgets.status import StatusBarFields
+    from euporie.core.app.app import BaseApp
+    from euporie.core.bars.status import StatusBarFields
 
 log = logging.getLogger(__name__)
 
@@ -39,7 +38,6 @@ class WebTab(Tab):
 
     name = "Web Viewer"
     weight = 2
-    mime_types: ClassVar[set[str]] = {"text/html", "text/markdown"}
 
     def __init__(self, app: BaseApp, path: Path | None) -> None:
         """Call when the tab is created."""

euporie/web/widgets/webview.py

@@ -17,10 +17,10 @@ from prompt_toolkit.mouse_events import MouseButton, MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event
 from upath import UPath
 
+from euporie.core.app.current import get_app
 from euporie.core.commands import add_cmd
 from euporie.core.convert.datum import Datum, get_loop
 from euporie.core.convert.mime import get_format
-from euporie.core.current import get_app
 from euporie.core.ft.html import HTML, Node
 from euporie.core.ft.utils import fragment_list_width, paste
 from euporie.core.graphics import GraphicProcessor
@@ -31,9 +31,10 @@ from euporie.core.key_binding.registry import (
 from euporie.core.path import parse_path
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from concurrent.futures._base import Future
     from pathlib import Path
-    from typing import Any, Callable, Iterable
+    from typing import Any, Callable
 
     from prompt_toolkit.formatted_text.base import AnyFormattedText, StyleAndTextTuples
     from prompt_toolkit.key_binding.key_bindings import (
@@ -95,15 +96,13 @@ class WebViewControl(UIControl):
         self.render_thread = Thread(target=self.loop.run_forever, daemon=True)
 
         self.key_bindings = load_registered_bindings(
-            "euporie.web.widgets.webview.WebViewControl"
+            "euporie.web.widgets.webview.WebViewControl",
+            config=get_app().config,
         )
 
         self._dom_cache: FastDictCache[tuple[Path], HTML] = FastDictCache(
             get_value=self.get_dom, size=100
         )
-        self._line_cache: FastDictCache[
-            tuple[HTML, int, int], list[StyleAndTextTuples]
-        ] = FastDictCache(get_value=self.get_lines, size=100_000)
         self._content_cache: FastDictCache = FastDictCache(self.get_content, size=1_000)
 
         self.load_url(url)
@@ -173,12 +172,6 @@ class WebViewControl(UIControl):
             return dom.title
         return ""
 
-    def get_lines(
-        self, dom: HTML, width: int, height: int, assets_loaded: bool = False
-    ) -> list[StyleAndTextTuples]:
-        """Render a HTML page as lines of formatted text."""
-        return list(split_lines(dom.render(width, height)))
-
     def load_url(self, url: str | Path, **kwargs: Any) -> None:
         """Load a new URL."""
         save_to_history = kwargs.get("save_to_history", True)

{euporie-2.8.1.dist-info → euporie-2.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: euporie
-Version: 2.8.1
+Version: 2.8.5
 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
@@ -13,40 +13,36 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Framework :: Jupyter
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.8
-Requires-Dist: aenum<=3.1.12,~=3.1
+Requires-Python: >=3.9
 Requires-Dist: fastjsonschema~=2.15
 Requires-Dist: flatlatex~=0.15
 Requires-Dist: fsspec[http]>=2022.12.0
 Requires-Dist: imagesize~=1.3
 Requires-Dist: jupyter-client>=7.1
 Requires-Dist: jupytext>=1.14.0
-Requires-Dist: linkify-it-py~=1.0
-Requires-Dist: markdown-it-py~=2.1.0
-Requires-Dist: mdit-py-plugins~=0.3.0
+Requires-Dist: linkify-it-py~=2.0
+Requires-Dist: markdown-it-py~=3.0
+Requires-Dist: mdit-py-plugins~=0.4.2
 Requires-Dist: nbformat~=5.0
-Requires-Dist: pillow~=9.0
+Requires-Dist: pillow>=9.0
 Requires-Dist: platformdirs~=3.5
 Requires-Dist: prompt-toolkit~=3.0.36
 Requires-Dist: pygments~=2.11
 Requires-Dist: pyperclip~=1.8
-Requires-Dist: sixelcrop~=0.1.6
+Requires-Dist: sixelcrop~=0.1.9
 Requires-Dist: timg~=1.1.6
 Requires-Dist: typing-extensions~=4.5
 Requires-Dist: universal-pathlib~=0.2.1
-Provides-Extra: format
-Requires-Dist: black>=19.3.b0; extra == 'format'
-Requires-Dist: isort~=5.10.1; extra == 'format'
-Requires-Dist: ruff~=0.1.0; extra == 'format'
 Provides-Extra: hub
-Requires-Dist: asyncssh~=2.10.1; extra == 'hub'
+Requires-Dist: asyncssh~=2.18; extra == 'hub'
 Description-Content-Type: text/x-rst
 
 |logo|