euporie 2.8.0__tar.gz → 2.8.2__tar.gz

{euporie-2.8.0 → euporie-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: euporie
-Version: 2.8.0
+Version: 2.8.2
 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
@@ -32,7 +32,7 @@ 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: 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
@@ -41,10 +41,6 @@ Requires-Dist: sixelcrop~=0.1.6
 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'
 Description-Content-Type: text/x-rst

{euporie-2.8.0 → euporie-2.8.2}/euporie/console/tabs/console.py

@@ -503,7 +503,8 @@ class Console(KernelTab):
                 *input_row,
             ],
             key_bindings=load_registered_bindings(
-                "euporie.console.tabs.console.Console"
+                "euporie.console.tabs.console.Console",
+                config=self.app.config,
             ),
         )
 

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/__init__.py

@@ -1,18 +1,10 @@
 """This package defines the euporie application and its components."""
 
 __app_name__ = "euporie"
-__version__ = "2.8.0"
+__version__ = "2.8.2"
 __logo__ = "⚈"
 __strapline__ = "Jupyter in the terminal"
 __author__ = "Josiah Outram Halstead"
 __email__ = "josiah@halstead.email"
 __copyright__ = f"© 2024, {__author__}"
 __license__ = "MIT"
-
-
-# Register extensions to external packages
-from euporie.core import path  # noqa F401
-from euporie.core import pygments  # noqa F401
-
-# Monkey-patch prompt_toolkit
-from euporie.core.layout import containers  # noqa: F401

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/__main__.py

@@ -5,6 +5,15 @@ def main(name: "str" = "launch") -> "None":
     """Load and launches the application."""
     from importlib.metadata import entry_points
 
+    # Register extensions to external packages
+    from euporie.core import (
+        path,  # noqa F401
+        pygments,  # noqa F401
+    )
+
+    # Monkey-patch prompt_toolkit
+    from euporie.core.layout import containers  # noqa: F401
+
     eps = entry_points()  # group="euporie.apps")
     if isinstance(eps, dict):
         points = eps.get("euporie.apps")

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/convert/datum.py

@@ -230,9 +230,7 @@ class Datum(Generic[T], metaclass=_MetaDatum):
             return self._conversions[key]
 
         routes = _CONVERTOR_ROUTE_CACHE[(self.format, to)]
-        # log.debug(
-        #     "Converting from '%s' to '%s' using route: %s", self, to, routes
-        # )
+        # log.debug("Converting from '%s' to '%s' using route: %s", self, to, routes)
         output: T | None = None
         if routes:
             datum = self
@@ -244,18 +242,25 @@ class Datum(Generic[T], metaclass=_MetaDatum):
                         output = self._conversions[key]
                     else:
                         # Find converter with lowest weight
-                        func = sorted(
+                        for converter in sorted(
                             [
                                 conv
                                 for conv in converters[stage_b][stage_a]
                                 if _FILTER_CACHE.get((conv,), conv.filter_)
                             ],
                             key=lambda x: x.weight,
-                        )[0].func
-                        try:
-                            output = await func(datum, cols, rows, fg, bg, extend)
-                            self._conversions[key] = output
-                        except Exception:
+                        ):
+                            try:
+                                output = await converter.func(
+                                    datum, cols, rows, fg, bg, extend
+                                )
+                                self._conversions[key] = output
+                            except Exception:
+                                log.debug("Conversion step %s failed", converter)
+                                continue
+                            else:
+                                break
+                        else:
                             log.exception("An error occurred during format conversion")
                             output = None
                     if output is None:

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/convert/formats/ansi.py

@@ -169,9 +169,10 @@ async def html_to_ansi_py_htmlparser(
 @register(
     from_="latex",
     to="ansi",
-    filter_=have_modules("flatlatex.latexfuntypes"),
+    filter_=command_exists("utftex"),
+    weight=0,
 )
-async def latex_to_ansi_py_flatlatex(
+async def latex_to_ansi_utftex(
     datum: Datum,
     cols: int | None = None,
     rows: int | None = None,
@@ -179,16 +180,15 @@ async def latex_to_ansi_py_flatlatex(
     bg: str | None = None,
     extend: bool = True,
 ) -> str:
-    """Convert LaTeX to ANSI using :py:mod:`flatlatex`."""
-    import flatlatex
-
-    return flatlatex.converter().convert(datum.data.strip().strip("$").strip())
+    """Render LaTeX maths as unicode."""
+    return (await call_subproc(datum.data, ["utftex"])).decode()
 
 
 @register(
     from_="latex",
     to="ansi",
     filter_=have_modules("pylatexenc"),
+    weight=0,
 )
 async def latex_to_ansi_py_pylatexenc(
     datum: Datum,
@@ -204,6 +204,36 @@ async def latex_to_ansi_py_pylatexenc(
     return LatexNodes2Text().latex_to_text(datum.data.strip().strip("$").strip())
 
 
+@register(
+    from_="latex",
+    to="ansi",
+    filter_=have_modules("flatlatex.latexfuntypes"),
+    weight=0,
+)
+async def latex_to_ansi_py_flatlatex(
+    datum: Datum,
+    cols: int | None = None,
+    rows: int | None = None,
+    fg: str | None = None,
+    bg: str | None = None,
+    extend: bool = True,
+) -> str:
+    """Convert LaTeX to ANSI using :py:mod:`flatlatex`."""
+    import flatlatex
+    from flatlatex.latexfuntypes import latexfun
+
+    converter = flatlatex.converter()
+    for style in (
+        r"\textstyle",
+        r"\displaystyle",
+        r"\scriptstyle",
+        r"\scriptscriptstyle",
+    ):
+        converter._converter__cmds[style] = latexfun(lambda x: "", 0)
+
+    return converter.convert(datum.data.strip().strip("$").strip())
+
+
 @register(
     from_="latex",
     to="ansi",
@@ -261,7 +291,7 @@ async def pil_to_ansi_py_timg(
     assert rows is not None
     assert cols is not None
 
-    # `timg` assumes a 2x1 terminal cell aspect ratio, so we correct for while
+    # `timg` assumes a 2x1 terminal cell aspect ratio, so we correct for this while
     # resizing the image
     data = data.resize((cols, ceil(rows * 2 * (px / py) / 0.5)))
 

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/convert/utils.py

@@ -61,28 +61,18 @@ async def call_subproc(
             stderr=asyncio.subprocess.DEVNULL,
         )
         output_bytes, _ = await proc.communicate(stdinput)
-    except FileNotFoundError as error_:
+    except FileNotFoundError as error:
         log.error("Could not run external command `%s`", cmd)
-        error = error_
-    except subprocess.CalledProcessError as error_:
+        raise error
+    except subprocess.CalledProcessError as error:
         log.error("There was an error while running external command `%s`", cmd)
-        error = error_
+        raise error
+    else:
+        if (proc.returncode or 0) > 0 or error:
+            # Raise an exception if the process failed so we can continue on the the
+            # next conversion method
+            raise subprocess.CalledProcessError(proc.returncode or 0, cmd)
     finally:
-        if error is not None:
-            # Generate an output stating there was an error
-            output_bytes = (
-                b"\x1b[33m"  # Set fg to yellow
-                b"\xee\x82\xb6"  # Draw left pill side
-                b"\x1b[43m\x1b[30m"  # Set fg to black, bg to yellow
-                b"\xe2\x9a\xa0"  # Draw warning symbol
-                b" Rendering Error"
-                b"\x1b[33m\x1b[49m"  # Set fg to yellow, reset bg
-                b"\xee\x82\xb4"  # Draw right pill side
-                b"\x1b[n"  # Reset style
-            )
-
-        # TODO Log any stderr
-
         # Clean up any temporary file
         if use_tempfile:
             tfile.close()

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/filters.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from functools import lru_cache, partial, reduce
+from functools import partial, reduce
 from importlib import import_module
 from shutil import which
 from typing import TYPE_CHECKING
@@ -13,6 +13,7 @@ from prompt_toolkit.filters import (
     Condition,
     emacs_insert_mode,
     emacs_mode,
+    has_completions,
     to_filter,
     vi_insert_mode,
     vi_mode,
@@ -50,57 +51,6 @@ def have_modules(*modules: str) -> Filter:
     return reduce(lambda a, b: a & b, filters, to_filter(True))
 
 
-@Condition
-@lru_cache
-def have_ruff() -> bool:
-    """Determine if ruff is available."""
-    try:
-        import ruff  # noqa F401
-    except ModuleNotFoundError:
-        return False
-    else:
-        return True
-
-
-@Condition
-@lru_cache
-def have_black() -> bool:
-    """Determine if black is available."""
-    try:
-        import black.const  # noqa F401
-    except ModuleNotFoundError:
-        return False
-    else:
-        return True
-
-
-@Condition
-@lru_cache
-def have_isort() -> bool:
-    """Determine if isort is available."""
-    try:
-        import isort  # noqa F401
-    except ModuleNotFoundError:
-        return False
-    else:
-        return True
-
-
-@Condition
-@lru_cache
-def have_ssort() -> bool:
-    """Determine if ssort is available."""
-    try:
-        import ssort  # noqa F401
-    except ModuleNotFoundError:
-        return False
-    else:
-        return True
-
-
-# Determine if we have at least one formatter
-have_formatter = have_black | have_isort | have_ssort | have_ruff
-
 # Determine if euporie is running inside a multiplexer.
 in_screen = to_filter(os.environ.get("TERM", "").startswith("screen"))
 in_tmux = to_filter(os.environ.get("TMUX") is not None)
@@ -157,6 +107,9 @@ def has_menus() -> bool:
     return False
 
 
+has_float = has_dialog | has_menus | has_completions
+
+
 @Condition
 def tab_has_focus() -> bool:
     """Determine if there is a currently focused tab."""

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/format.py

@@ -67,11 +67,18 @@ class CliFormatter(Formatter):
         except Exception:
             return text
         try:
-            output, _error = proc.communicate(text)
+            output, error = proc.communicate(text)
         except Exception:
             return text
         else:
-            return output.rstrip("\r\n")
+            if output and not error:
+                return output.rstrip("\r\n")
+            else:
+                return text
+
+    def __repr__(self) -> str:
+        """Return representation of the formatter as a string."""
+        return f"{self.command[0].title()}Formatter()"
 
 
 class LspFormatter(Formatter):
@@ -115,3 +122,7 @@ class LspFormatter(Formatter):
             text = text.rstrip()
 
         return text
+
+    def __repr__(self) -> str:
+        """Return representation of the formatter as a string."""
+        return f"{self.lsp.name.title()}Formatter()"

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/ft/html.py

@@ -15,7 +15,6 @@ from math import ceil
 from operator import eq, ge, gt, le, lt
 from typing import TYPE_CHECKING, NamedTuple, cast, overload
 
-from flatlatex.data import subscript, superscript
 from fsspec.core import url_to_fs
 from prompt_toolkit.application.current import get_app_session
 from prompt_toolkit.data_structures import Size
@@ -74,6 +73,16 @@ from euporie.core.ft.utils import (
     valign,
 )
 
+sub_trans = str.maketrans(
+    "0123456789+-=()aeijoruvxβγρφχ",
+    "₀₁₂₃₄₅₆₇₈₉₊₋₌₍₎ₐₑᵢⱼₒᵣᵤᵥₓᵦᵧᵨᵩᵪ",
+)
+
+sup_trans = str.maketrans(
+    "0123456789+-=()abcdefghijklmnoprstuvwxyzABDEGHIJKLMNOPRTUVWαβγδ∊θιΦφχ",
+    "⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽⁾ᵃᵇᶜᵈᵉᶠᵍʰⁱʲᵏˡᵐⁿᵒᵖʳˢᵗᵘᵛʷˣʸᶻᴬᴮᴰᴱᴳᴴᴵᴶᴷᴸᴹᴺᴼᴾᴿᵀᵁⱽᵂᵅᵝᵞᵟᵋᶿᶥᶲᵠᵡ",
+)
+
 
 class CssSelector(NamedTuple):
     """A named tuple to hold CSS selector data."""
@@ -343,6 +352,7 @@ _HERITABLE_PROPS = {
     "text_transform",
     "text_decoration",
     "text_align",
+    "vertical_align",
     "visibility",
     "white_space",
     "list_style_type",
@@ -1761,18 +1771,19 @@ class Theme(Mapping):
 
     async def text_transform(self, value: str) -> str:
         """Return a function which transforms text."""
-        if "uppercase" in self.theme["text_transform"]:
+        transform = self.theme["text_transform"]
+        if "uppercase" in transform:
             return value.upper()
-        elif "lowercase" in self.theme["text_transform"]:
+        elif "lowercase" in transform:
             return value.lower()
-        elif "capitalize" in self.theme["text_transform"]:
+        elif "capitalize" in transform:
             return value.capitalize()
-        elif "sub" in self.theme["vertical_align"]:
-            return "".join(subscript.get(c, c) for c in value)
-        elif "super" in self.theme["vertical_align"]:
-            return "".join(superscript.get(c, c) for c in value)
-        elif "latex" in self.theme["text_transform"]:
+        elif "latex" in transform:
             return await Datum(value, "latex").convert_async("ansi")
+        if "sub" in self.theme["vertical_align"]:
+            return value.translate(sub_trans)
+        elif "super" in self.theme["vertical_align"]:
+            return value.translate(sup_trans)
         return value
 
     @cached_property
@@ -2771,7 +2782,7 @@ _BROWSER_CSS: CssSelectors = {
             "text_transform": "latex",
             "display": "inline-block",
             "vertical_align": "top",
-            # "margin_right": "1em",
+            "white_space": "pre",
         },
         (
             (
@@ -4275,7 +4286,7 @@ class HTML:
 
         # Render text representation
         ft: StyleAndTextTuples = await self.render_node_content(
-            element, left, fill, align_content
+            element, left=0, fill=False, align_content=False
         )
 
         # Render graphic representation

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/graphics.py

@@ -10,7 +10,6 @@ from typing import TYPE_CHECKING
 
 from prompt_toolkit.cache import FastDictCache, SimpleCache
 from prompt_toolkit.data_structures import Point
-from prompt_toolkit.filters.app import has_completions
 from prompt_toolkit.filters.base import Condition
 from prompt_toolkit.filters.utils import to_filter
 from prompt_toolkit.formatted_text.base import to_formatted_text
@@ -25,7 +24,7 @@ from euporie.core.convert.datum import Datum
 from euporie.core.convert.registry import find_route
 from euporie.core.current import get_app
 from euporie.core.data_structures import DiInt
-from euporie.core.filters import has_dialog, has_menus, in_mplex
+from euporie.core.filters import has_float, in_mplex
 from euporie.core.ft.utils import _ZERO_WIDTH_FRAGMENTS
 from euporie.core.layout.scroll import BoundedWritePosition
 from euporie.core.terminal import passthrough
@@ -192,7 +191,7 @@ class SixelGraphicControl(GraphicControl):
         def render_lines() -> list[StyleAndTextTuples]:
             """Render the lines to display in the control."""
             ft: list[StyleAndTextTuples] = []
-            if height:
+            if height >= 0:
                 cmd = self.convert_data(
                     BoundedWritePosition(0, 0, width, height, self.bbox)
                 )
@@ -282,7 +281,7 @@ class ItermGraphicControl(GraphicControl):
         def render_lines() -> list[StyleAndTextTuples]:
             """Render the lines to display in the control."""
             ft: list[StyleAndTextTuples] = []
-            if height:
+            if height > 0 and width > 0:
                 b64data = self.convert_data(
                     BoundedWritePosition(0, 0, width, height, self.bbox)
                 )
@@ -574,7 +573,7 @@ class GraphicWindow(Window):
         super().__init__(*args, **kwargs)
         self.content = content
         self.get_position = get_position
-        self.filter = ~has_completions & ~has_dialog & ~has_menus & to_filter(filter)
+        self.filter = ~has_float & to_filter(filter)
         self._pre_rendered = False
 
     def write_to_screen(

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/key_binding/bindings/micro.py

@@ -680,6 +680,9 @@ def dent_buffer(event: KeyPressEvent, indenting: bool = True) -> None:
             )
             * sign
         )
+        selection_state.original_cursor_position = max(
+            min(selection_state.original_cursor_position, len(buffer.text)), 0
+        )
     # Maintain the selection state before indentation
     buffer.selection_state = selection_state
 
@@ -722,7 +725,7 @@ def indent_lines(event: KeyPressEvent) -> None:
 @add_cmd(
     filter=buffer_has_focus
     & (cursor_in_leading_ws | has_selection)
-    & ~cursor_at_start_of_line,
+    & (~cursor_at_start_of_line | cursor_at_start_of_line),
 )
 def unindent_lines(event: KeyPressEvent) -> None:
     """Unindent the current or selected lines."""

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/keys.py

@@ -59,6 +59,7 @@ _kitty_functional_codes = {
     "F12": (24, "~"),
     "Backspace": (127, "u"),
     "Enter": (13, "u"),
+    "Tab": (9, "u"),
 }
 
 # Add Alt-key shortcuts

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/launch.py

@@ -11,6 +11,12 @@ APP_ALIASES = {
     "edit": "notebook",
 }
 
+_EPS = entry_points()
+if isinstance(_EPS, dict):
+    APP_ENTRY_POINTS = _EPS.get("euporie.apps")
+else:
+    APP_ENTRY_POINTS = _EPS.select(group="euporie.apps")
+
 
 class CoreApp:
     """Launch a euporie application."""
@@ -50,8 +56,7 @@ class CoreApp:
         required=False,
         help_="The application to launch",
         choices=sorted(
-            {entry.name for entry in entry_points()["euporie.apps"]} - {"launch"}
-            | APP_ALIASES.keys()
+            {entry.name for entry in APP_ENTRY_POINTS} - {"launch"} | APP_ALIASES.keys()
         ),
         description="""
             The name of the application to launch.

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/layout/scroll.py

@@ -600,9 +600,10 @@ class ScrollingContainer(Container):
 
     def all_children(self) -> Sequence[Container]:
         """Return the list of all children of this container."""
-        if self.refresh_children:
-            _children = self._children
-            _children.clear()
+        _children = self._children
+        if self.refresh_children or not self._children:
+            self.refresh_children = False
+            new_children = []
             new_child_hashes = set()
             for child in self.children_func():
                 if not (
@@ -611,21 +612,21 @@ class ScrollingContainer(Container):
                     wrapped_child = self._child_cache[child_hash] = CachedContainer(
                         child, mouse_handler_wrapper=self._mouse_handler_wrapper
                     )
-                _children.append(wrapped_child)
+                new_children.append(wrapped_child)
                 new_child_hashes.add(child_hash)
+            _children[:] = new_children
 
             # Clean up metacache
             for child_hash in set(self._child_cache) - new_child_hashes:
                 del self._child_cache[child_hash]
 
-            self.refresh_children = False
             # Clean up positions
             self.index_positions = {
                 i: pos
                 for i, pos in self.index_positions.items()
                 if i < len(self._children)
             }
-        return self._children
+        return _children
 
     def get_children(self) -> list[Container]:
         """Return the list of currently visible children to include in the layout."""

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/widgets/cell.py

@@ -17,6 +17,7 @@ from prompt_toolkit.completion.base import (
     _MergedCompleter,
 )
 from prompt_toolkit.document import Document
+from prompt_toolkit.filters.app import is_searching
 from prompt_toolkit.filters.base import Condition
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
@@ -163,6 +164,11 @@ class Cell:
             """Respond to cursor movements."""
             # Tell the scrolling container to scroll the cursor into view on the next render
             weak_self.kernel_tab.page.scroll_to_cursor = True
+            if not is_searching():
+                if not self.selected:
+                    weak_self.kernel_tab.select(self.index, scroll=True)
+                if not weak_self.kernel_tab.in_edit_mode():
+                    weak_self.kernel_tab.enter_edit_mode()
 
         # Now we generate the main container used to represent a kernel_tab cell
 
@@ -720,6 +726,8 @@ class Cell:
         self.input_box.control._fragment_cache.clear()
         # Trigger callbacks
         self.on_change()
+        # Flag notebook as modified
+        self.kernel_tab.dirty = True
 
     @property
     def path(self) -> Path:

{euporie-2.8.0 → euporie-2.8.2}/euporie/core/widgets/cell_outputs.py

@@ -358,7 +358,7 @@ class CellOutput:
                         metadata=self.json.get("metadata", {}).get(mime, {}),
                         parent=self.parent,
                     )
-                except NotImplementedError:
+                except (NotImplementedError, KeyError):
                     self.selected_mime = mime = list(data.keys())[-1]
                     continue
                 else: