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

euporie/core/convert/formats/pil.py

@@ -72,7 +72,7 @@ def crop(data: PilImage, bbox: DiInt) -> PilImage:
         rows=full_height,
     )
     if image is not None:
-        cell_size_x, cell_size_y = self.app.term_info.cell_size_px
+        cell_size_x, cell_size_y = self.app.cell_size_px
         # Downscale image to fit target region for precise cropping
         image.thumbnail((full_width * cell_size_x, full_height * cell_size_y))
         image = image.crop(

euporie/core/convert/formats/png.py

@@ -13,7 +13,6 @@ from euporie.core.filters import command_exists, have_modules
 if TYPE_CHECKING:
     from euporie.core.convert.datum import Datum
 
-
 register(
     from_="base64-png",
     to="png",
@@ -126,9 +125,8 @@ async def latex_to_png_py_mpl(
     from matplotlib.backends import backend_agg
 
     # mpl mathtext doesn't support display math, force inline
-    data = datum.data.strip().replace("$$", "$")
-    if not data.startswith("$"):
-        data = f"${data}$"
+    data = datum.data.replace("$", "").strip()
+    data = f"${data}$"
     buffer = BytesIO()
     prop = font_manager.FontProperties(size=12)
     parser = mathtext.MathTextParser("path")
@@ -143,7 +141,7 @@ async def latex_to_png_py_mpl(
 register(
     from_=("svg", "jpeg", "pdf", "gif"),
     to="png",
-    filter_=command_exists("convert", "mogrify"),
+    filter_=command_exists("magick"),
 )(partial(imagemagick_convert, "PNG"))
 
 

euporie/core/convert/formats/sixel.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from functools import partial
 from typing import TYPE_CHECKING
 
+from euporie.core.app.current import get_app
 from euporie.core.convert.formats.common import (
     chafa_convert_cmd,
     chafa_convert_py,
@@ -12,7 +13,6 @@ from euporie.core.convert.formats.common import (
 )
 from euporie.core.convert.registry import register
 from euporie.core.convert.utils import call_subproc
-from euporie.core.current import get_app
 from euporie.core.filters import command_exists, have_modules
 
 if TYPE_CHECKING:
@@ -53,7 +53,7 @@ async def png_to_sixel_img2sixel(
     if bg:
         cmd += [f"--bgcolor={bg}"]
     if cols is not None:
-        px, _ = get_app().term_info.cell_size_px
+        px, _ = get_app().cell_size_px
         cmd += [f"--width={int(cols * px)}"]
     return (await call_subproc(datum.data, cmd)).decode()
 
@@ -61,7 +61,7 @@ async def png_to_sixel_img2sixel(
 register(
     from_=("png", "jpeg", "svg", "pdf"),
     to="sixel",
-    filter_=command_exists("convert", "mogrify"),
+    filter_=command_exists("magick"),
 )(partial(imagemagick_convert, "sixel"))
 
 

euporie/core/convert/registry.py

@@ -8,19 +8,15 @@ from typing import TYPE_CHECKING, NamedTuple
 from prompt_toolkit.cache import FastDictCache, SimpleCache
 from prompt_toolkit.filters import to_filter
 
-# from euporie.core.cache import cache
-
 if TYPE_CHECKING:
-    from typing import Callable, Iterable
+    from collections.abc import Iterable
+    from typing import Callable
 
     from prompt_toolkit.filters import Filter, FilterOrBool
 
 log = logging.getLogger(__name__)
 
 
-BASE64_FORMATS = {"png", "jpeg", "pdf", "gif"}
-
-
 class Converter(NamedTuple):
     """Hold a conversion function and its weight."""
 
@@ -58,8 +54,10 @@ def register(
     return decorator
 
 
-def find_route(from_: str, to: str) -> list | None:
+def _find_route(from_: str, to: str) -> list | None:
     """Find the shortest conversion path between two formats."""
+    from euporie.core.convert import formats  # noqa: F401
+
     if from_ == to:
         return [from_]
 
@@ -100,5 +98,10 @@ def find_route(from_: str, to: str) -> list | None:
 
 
 _CONVERTOR_ROUTE_CACHE: FastDictCache[tuple[str, str], list | None] = FastDictCache(
-    find_route
+    _find_route
 )
+
+
+def find_route(from_: str, to: str) -> list | None:
+    """Find and cache conversion routes."""
+    return _CONVERTOR_ROUTE_CACHE[from_, to]

euporie/core/convert/utils.py

@@ -6,15 +6,49 @@ import asyncio
 import logging
 import subprocess  # S404 - Security implications have been considered
 import tempfile
+from math import ceil
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from euporie.core.app.current import get_app
+
 if TYPE_CHECKING:
     from typing import Any
 
+    from euporie.core.convert.datum import Datum
+
 log = logging.getLogger(__name__)
 
 
+async def scale_to_fit(
+    datum: Datum, cols: int | None, rows: int | None
+) -> tuple[int, int]:
+    """Calculate image size based on aspect ratio, and scale to fit."""
+    data = datum.data
+    px, py = get_app().cell_size_px
+
+    # Calculate rows based on image aspect ratio
+    w, h = data.size
+    if rows is None and cols is not None:
+        rows = ceil(cols / w * h)
+    elif cols is None and rows is not None:
+        cols = ceil(rows / h * w)
+    elif rows is None and cols is None:
+        cols = ceil(w / px)
+        rows = ceil(h / py)
+    assert rows is not None
+    assert cols is not None
+
+    # Scale to fit while maintaining aspect ratio
+    _width, aspect = await datum.cell_size_async()
+    if cols * aspect < rows:
+        rows = ceil(cols * aspect)
+    else:
+        cols = ceil(rows / aspect)
+
+    return cols, rows
+
+
 async def call_subproc(
     data: str | bytes,
     cmd: list[Any],
@@ -43,15 +77,18 @@ async def call_subproc(
     if use_tempfile:
         # If the command cannot read from stdin, create a temporary file to pass to
         # the command
-        tfile = tempfile.NamedTemporaryFile(delete=False, suffix=suffix)
-        tfile.write(data)
-        tfile.close()
+        with tempfile.NamedTemporaryFile(delete=False, suffix=suffix) as tfile:
+            tfile.write(data)
         cmd.append(tfile.name)
         stdinput = None
     else:
         stdinput = data
 
-    log.debug("Running external command `%s`", cmd)
+    if log.level <= 0:
+        import shlex
+
+        log.debug("Running external command `%s`", shlex.join(cmd))
+
     error: Exception | None = None
     try:
         proc = await asyncio.create_subprocess_exec(
@@ -61,28 +98,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/core/diagnostics.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 from abc import ABCMeta
-from typing import TYPE_CHECKING, List, NamedTuple
+from typing import TYPE_CHECKING, NamedTuple
 
 if TYPE_CHECKING:
     from typing import Literal
@@ -23,7 +23,7 @@ class Diagnostic(NamedTuple):
     chars: slice
 
 
-class Report(List[Diagnostic], metaclass=ABCMeta):
+class Report(list[Diagnostic], metaclass=ABCMeta):
     """Class for storing a diagnostic report."""
 
     @classmethod

euporie/core/filters.py

@@ -3,16 +3,17 @@
 from __future__ import annotations
 
 import os
-from functools import lru_cache, partial, reduce
-from importlib import import_module
+from functools import cache, partial, reduce
+from importlib.util import find_spec
 from shutil import which
 from typing import TYPE_CHECKING
 
-from prompt_toolkit.enums import EditingMode
+# from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.filters import (
     Condition,
     emacs_insert_mode,
     emacs_mode,
+    has_completions,
     to_filter,
     vi_insert_mode,
     vi_mode,
@@ -26,6 +27,7 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.containers import Window
 
 
+@cache
 def command_exists(*cmds: str) -> Filter:
     """Verify a list of external commands exist on the system."""
     filters = [
@@ -35,72 +37,18 @@ def command_exists(*cmds: str) -> Filter:
     return reduce(lambda a, b: a & b, filters, to_filter(True))
 
 
+@cache
 def have_modules(*modules: str) -> Filter:
     """Verify a list of python modules are importable."""
 
     def try_import(module: str) -> bool:
-        try:
-            import_module(module)
-        except ModuleNotFoundError:
-            return False
-        else:
-            return True
+        loader = find_spec(module)
+        return loader is not None
 
     filters = [Condition(partial(try_import, module)) for module in modules]
     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)
@@ -129,12 +77,20 @@ def has_suggestion() -> bool:
     )
 
 
+@Condition
+def has_tabs() -> bool:
+    """Filter to show if any tabs are open in an app."""
+    from euporie.core.app.current import get_app
+
+    return bool(get_app().tabs)
+
+
 @Condition
 def has_dialog() -> bool:
     """Determine if a dialog is being displayed."""
     from prompt_toolkit.layout.containers import ConditionalContainer
 
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     app = get_app()
     for dialog in app.dialogs.values():
@@ -157,10 +113,22 @@ def has_menus() -> bool:
     return False
 
 
+has_float = has_dialog | has_menus | has_completions
+
+
+@Condition
+def has_toolbar() -> bool:
+    """Is there an active toolbar?"""
+    from euporie.core.app.current import get_app
+    from euporie.core.bars import BAR_BUFFERS
+
+    return get_app().current_buffer.name in BAR_BUFFERS
+
+
 @Condition
 def tab_has_focus() -> bool:
     """Determine if there is a currently focused tab."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().tab is not None
 
@@ -168,7 +136,7 @@ def tab_has_focus() -> bool:
 @Condition
 def pager_has_focus() -> bool:
     """Determine if there is a currently focused notebook."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     app = get_app()
     pager = app.pager
@@ -180,7 +148,7 @@ def pager_has_focus() -> bool:
 @Condition
 def display_has_focus() -> bool:
     """Determine if there is a currently focused cell."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
     from euporie.core.widgets.display import DisplayControl
 
     return isinstance(get_app().layout.current_control, DisplayControl)
@@ -189,7 +157,7 @@ def display_has_focus() -> bool:
 @Condition
 def buffer_is_empty() -> bool:
     """Determine if the current buffer contains nothing."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return not get_app().current_buffer.text
 
@@ -197,7 +165,7 @@ def buffer_is_empty() -> bool:
 @Condition
 def buffer_is_code() -> bool:
     """Determine if the current buffer contains code."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.name == "code"
 
@@ -205,7 +173,7 @@ def buffer_is_code() -> bool:
 @Condition
 def buffer_is_markdown() -> bool:
     """Determine if the current buffer contains markdown."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.name == "markdown"
 
@@ -213,15 +181,16 @@ def buffer_is_markdown() -> bool:
 @Condition
 def micro_mode() -> bool:
     """When the micro key-bindings are active."""
-    from euporie.core.current import get_app
+    from euporie.core.app.app import ExtraEditingMode
+    from euporie.core.app.current import get_app
 
-    return get_app().editing_mode == EditingMode.MICRO  # type: ignore
+    return get_app().editing_mode == ExtraEditingMode.MICRO
 
 
 @Condition
 def micro_replace_mode() -> bool:
     """Determine if the editor is in overwrite mode."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     app = get_app()
     return app.micro_state.input_mode == MicroInputMode.REPLACE
@@ -230,7 +199,7 @@ def micro_replace_mode() -> bool:
 @Condition
 def micro_insert_mode() -> bool:
     """Determine if the editor is in insert mode."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     app = get_app()
     return app.micro_state.input_mode == MicroInputMode.INSERT
@@ -239,7 +208,7 @@ def micro_insert_mode() -> bool:
 @Condition
 def micro_recording_macro() -> bool:
     """Determine if a micro macro is being recorded."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().micro_state.current_recording is not None
 
@@ -247,7 +216,7 @@ def micro_recording_macro() -> bool:
 @Condition
 def is_returnable() -> bool:
     """Determine if the current buffer has an accept handler."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.is_returnable
 
@@ -255,7 +224,7 @@ def is_returnable() -> bool:
 @Condition
 def cursor_at_start_of_line() -> bool:
     """Determine if the cursor is at the start of a line."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.document.cursor_position_col == 0
 
@@ -263,7 +232,7 @@ def cursor_at_start_of_line() -> bool:
 @Condition
 def cursor_on_first_line() -> bool:
     """Determine if the cursor is on the first line of a buffer."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.document.on_first_line
 
@@ -271,11 +240,32 @@ def cursor_on_first_line() -> bool:
 @Condition
 def cursor_on_last_line() -> bool:
     """Determine if the cursor is on the last line of a buffer."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     return get_app().current_buffer.document.on_last_line
 
 
+@cache
+def char_after_cursor(char: str) -> Condition:
+    """Generate a condition to check for a character after the cursor."""
+    from euporie.core.app.current import get_app
+
+    return Condition(
+        lambda: bool(
+            (post := get_app().current_buffer.document.text_after_cursor)
+            and post[0] == char
+        )
+    )
+
+
+@Condition
+def has_matching_bracket() -> bool:
+    """Determine if the bracket at the cursor has a matching pair."""
+    from euporie.core.app.current import get_app
+
+    return bool(get_app().current_buffer.document.find_matching_bracket_position())
+
+
 """Determine if any binding style is in insert mode."""
 insert_mode = (
     (vi_mode & vi_insert_mode)
@@ -290,7 +280,7 @@ replace_mode = micro_replace_mode | vi_replace_mode
 @Condition
 def is_searching() -> bool:
     """Determine if the app is in search mode."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
 
     app = get_app()
     return (
@@ -310,8 +300,8 @@ def at_end_of_buffer() -> bool:
 @Condition
 def kernel_is_python() -> bool:
     """Determine if the current notebook has a python kernel."""
-    from euporie.core.current import get_app
-    from euporie.core.tabs.base import KernelTab
+    from euporie.core.app.current import get_app
+    from euporie.core.tabs.kernel import KernelTab
 
     kernel_tab = get_app().tab
     if isinstance(kernel_tab, KernelTab):
@@ -322,7 +312,7 @@ def kernel_is_python() -> bool:
 @Condition
 def multiple_cells_selected() -> bool:
     """Determine if there is more than one selected cell."""
-    from euporie.core.current import get_app
+    from euporie.core.app.current import get_app
     from euporie.core.tabs.notebook import BaseNotebook
 
     nb = get_app().tab
@@ -334,8 +324,8 @@ def multiple_cells_selected() -> bool:
 @Condition
 def kernel_tab_has_focus() -> bool:
     """Determine if there is a focused kernel tab."""
-    from euporie.core.current import get_app
-    from euporie.core.tabs.base import KernelTab
+    from euporie.core.app.current import get_app
+    from euporie.core.tabs.kernel import KernelTab
 
     return isinstance(get_app().tab, KernelTab)
 

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/core/ft/ansi.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING
 from prompt_toolkit.formatted_text import ANSI as PTANSI
 
 if TYPE_CHECKING:
-    from typing import Generator
+    from collections.abc import Generator
 
 log = logging.getLogger(__name__)