euporie 2.8.13__py3-none-any.whl → 2.8.15__py3-none-any.whl

euporie/console/tabs/console.py

@@ -78,6 +78,10 @@ class Console(KernelTab):
 
     """
 
+    live_output: CellOutputArea
+    input_box: KernelInput
+    stdin_box: StdInput
+
     def __init__(
         self,
         app: BaseApp,

euporie/core/__init__.py

@@ -1,7 +1,7 @@
 """This package defines the euporie application and its components."""
 
 __app_name__ = "euporie"
-__version__ = "2.8.13"
+__version__ = "2.8.15"
 __logo__ = "⚈"
 __strapline__ = "Jupyter in the terminal"
 __author__ = "Josiah Outram Halstead"

euporie/core/cache.py

@@ -0,0 +1,36 @@
+"""Updated version of the prompt_toolkit caches."""
+
+from __future__ import annotations
+
+import threading
+from typing import TYPE_CHECKING
+
+from prompt_toolkit.cache import _T, _U
+from prompt_toolkit.cache import SimpleCache as PtkSimpleCache
+
+if TYPE_CHECKING:
+    from typing import Callable
+
+
+__all__ = [
+    "SimpleCache",
+]
+
+
+class SimpleCache(PtkSimpleCache[_T, _U]):
+    """Thread safe version of :py:`SimpleCache`."""
+
+    def __init__(self, maxsize: int = 8) -> None:
+        """Create lock at init."""
+        super().__init__(maxsize)
+        self._lock = threading.Lock()
+
+    def get(self, key: _T, getter_func: Callable[[], _U]) -> _U:
+        """Access cache with thread safety."""
+        with self._lock:
+            return super().get(key, getter_func)
+
+    def clear(self) -> None:
+        """Clear cache."""
+        with self._lock:
+            super().clear()

euporie/core/clipboard.py

@@ -4,9 +4,12 @@ from __future__ import annotations
 
 import logging
 
+import pyperclip
 from prompt_toolkit.clipboard.base import Clipboard, ClipboardData
 from prompt_toolkit.clipboard.in_memory import InMemoryClipboard
-from prompt_toolkit.clipboard.pyperclip import PyperclipClipboard
+from prompt_toolkit.clipboard.pyperclip import (
+    PyperclipClipboard as PtkPyperclipClipboard,
+)
 from prompt_toolkit.selection import SelectionType
 
 from euporie.core.app.current import get_app
@@ -16,6 +19,18 @@ from euporie.core.key_binding.key_processor import KeyProcessor
 log = logging.getLogger(__name__)
 
 
+class PyperclipClipboard(PtkPyperclipClipboard):
+    """Pyperclip clipboard which suppresses pyperclip exceptions."""
+
+    def set_data(self, data: ClipboardData) -> None:
+        """Set the clipboard data, ignoring any clipboard errors."""
+        self._data = data
+        try:
+            pyperclip.copy(data.text)
+        except pyperclip.PyperclipException:
+            log.exception("Failed to set clipboard data")
+
+
 class Osc52Clipboard(Clipboard):
     """Clipboard that syncs with the system clipboard using OSC52 escape codes."""
 

euporie/core/config.py

@@ -502,7 +502,7 @@ class Config:
     def _load_args(self) -> dict[str, Any]:
         """Attempt to load configuration settings from commandline flags."""
         # Parse known arguments
-        namespace, remainder = self._load_parser().parse_known_intermixed_args()
+        namespace, _remainder = self._load_parser().parse_known_intermixed_args()
         # Validate arguments
         return vars(namespace)
 

euporie/core/convert/datum.py

@@ -137,14 +137,29 @@ class Datum(Generic[T], metaclass=_MetaDatum):
         self.align = align
         self._cell_size: tuple[int, float] | None = None
         self._conversions: dict[
-            tuple[str, int | None, int | None, str | None, str | None, bool], T | None
+            tuple[
+                str,
+                int | None,
+                int | None,
+                str | None,
+                str | None,
+                tuple[tuple[str, Any], ...],
+            ],
+            T | None,
         ] = {}
         self._queue: dict[
-            tuple[str, int | None, int | None, str | None, str | None, bool],
+            tuple[
+                str,
+                int | None,
+                int | None,
+                str | None,
+                str | None,
+                tuple[tuple[str, Any], ...],
+            ],
             asyncio.Event,
         ] = {}
         self._finalizer: finalize = finalize(self, self._cleanup_datum_sizes, self.hash)
-        self._finalizer.atexit = False
+        self._finalizer.atexit = False  # type: ignore [misc]
 
     def __repr__(self) -> str:
         """Return a string representation of object."""
@@ -228,8 +243,8 @@ class Datum(Generic[T], metaclass=_MetaDatum):
         rows: int | None = None,
         fg: str | None = None,
         bg: str | None = None,
-        extend: bool = True,
         bbox: DiInt | None = None,
+        **kwargs: Any,
     ) -> Any:
         """Perform conversion asynchronously, caching the result."""
         if to == self.format:
@@ -241,7 +256,7 @@ class Datum(Generic[T], metaclass=_MetaDatum):
         if not bg and hasattr(app := get_app(), "color_palette"):
             bg = self.bg or app.color_palette.bg.base_hex
 
-        if (key_conv := (to, cols, rows, fg, bg, extend)) in self._queue:
+        if (key_conv := (to, cols, rows, fg, bg, tuple(kwargs.items()))) in self._queue:
             await self._queue[key_conv].wait()
         if key_conv in self._conversions:
             return self._conversions[key_conv]
@@ -262,7 +277,7 @@ class Datum(Generic[T], metaclass=_MetaDatum):
             output = None
             for route in routes:
                 for stage_a, stage_b in zip(route, route[1:]):
-                    key_stage = (stage_b, cols, rows, fg, bg, extend)
+                    key_stage = (stage_b, cols, rows, fg, bg, tuple(kwargs.items()))
                     if key_stage in self._conversions:
                         output = self._conversions[key_stage]
                     else:
@@ -277,7 +292,7 @@ class Datum(Generic[T], metaclass=_MetaDatum):
                         ):
                             try:
                                 output = await converter.func(
-                                    datum, cols, rows, fg, bg, extend
+                                    datum, cols, rows, fg, bg, **kwargs
                                 )
                                 self._conversions[key_stage] = output
                             except Exception:
@@ -341,10 +356,11 @@ class Datum(Generic[T], metaclass=_MetaDatum):
         rows: int | None = None,
         fg: str | None = None,
         bg: str | None = None,
-        extend: bool = True,
+        bbox: DiInt | None = None,
+        **kwargs: Any,
     ) -> Any:
         """Convert between formats."""
-        return self._to_sync(self.convert_async(to, cols, rows, fg, bg, extend))
+        return self._to_sync(self.convert_async(to, cols, rows, fg, bg, bbox, **kwargs))
 
     async def pixel_size_async(self) -> tuple[int | None, int | None]:
         """Get the dimensions of displayable data in pixels.

euporie/core/convert/formats/ansi.py

@@ -32,7 +32,7 @@ async def html_to_ansi_w3m(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`w3m`."""
     cmd: list[Any] = ["w3m", "-T", "text/html"]
@@ -52,7 +52,7 @@ async def html_to_ansi_elinks(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`elinks`."""
     cmd: list[Any] = [
@@ -80,7 +80,7 @@ async def html_to_ansi_lynx(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`lynx`."""
     cmd: list[Any] = ["lynx", "-dump", "-stdin"]
@@ -100,7 +100,7 @@ async def html_to_ansi_links(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`links`."""
     cmd: list[Any] = ["links", "-dump"]
@@ -120,7 +120,7 @@ async def html_to_ansi_py_htmlparser(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML tables to ANSI text using :py:mod:`HTMLParser`."""
     import io
@@ -177,10 +177,14 @@ async def latex_to_ansi_utftex(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Render LaTeX maths as unicode."""
-    return (await call_subproc(datum.data, ["utftex"])).decode()
+    return (
+        (await call_subproc(datum.data.strip().strip("$").strip(), ["utftex"]))
+        .decode()
+        .rstrip("\n")
+    )
 
 
 @register(
@@ -195,7 +199,7 @@ async def latex_to_ansi_py_pylatexenc(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`pylatexenc`."""
     from pylatexenc.latex2text import LatexNodes2Text
@@ -215,7 +219,7 @@ async def latex_to_ansi_py_flatlatex(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`flatlatex`."""
     import flatlatex
@@ -244,7 +248,7 @@ async def latex_to_ansi_py_sympy(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`sympy`."""
     from sympy import pretty
@@ -268,7 +272,7 @@ async def pil_to_ansi_py_timg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert a PIL image to ANSI text using :py:mod:`timg`."""
     import timg
@@ -297,7 +301,7 @@ async def pil_to_ansi_py_img2unicode(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert a PIL image to ANSI text using :py:mod:`img2unicode`."""
     import io
@@ -335,7 +339,7 @@ async def image_to_ansi_timg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`timg`."""
     cmd: list[Any] = ["timg"]
@@ -356,7 +360,7 @@ async def image_to_ansi_catimg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`catimg`."""
     cmd: list[Any] = ["catimg"]
@@ -377,7 +381,7 @@ async def image_to_ansi_icat(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`icat`."""
     cmd: list[Any] = ["icat"]
@@ -398,7 +402,7 @@ async def image_to_ansi_tiv(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`tiv`."""
     cmd: list[Any] = ["tiv"]
@@ -418,7 +422,7 @@ async def image_to_ansi_viu(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`viu`."""
     cmd: list[Any] = ["viu", "-b"]
@@ -439,7 +443,7 @@ async def image_to_ansi_jp2a(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert image data to ANSI text using :command:`jp2a`."""
     cmd: list[Any] = ["jp2a", "--color"]
@@ -460,7 +464,7 @@ async def png_to_ansi_img2txt(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert PNG data to ANSI text using :command:`img2txt`."""
     cmd: list[Any] = ["img2txt"]
@@ -476,7 +480,7 @@ async def png_to_ansi_py_placeholder(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Draw placeholder ANSI text."""
     from euporie.core.border import RoundedLine
@@ -509,7 +513,7 @@ async def rich_to_ansi_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert rich objects to formatted ANSI text."""
     import rich

euporie/core/convert/formats/base64.py

@@ -8,6 +8,8 @@ from typing import TYPE_CHECKING
 from euporie.core.convert.registry import register
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from euporie.core.convert.datum import Datum
 
 
@@ -21,7 +23,7 @@ async def bytes_to_base64_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert bytes to base64 encoded data."""
     data = datum.data

euporie/core/convert/formats/common.py

@@ -23,7 +23,7 @@ async def base64_to_bytes_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> bytes:
     """Convert base64 encoded data to bytes."""
     data = datum.data
@@ -38,7 +38,7 @@ async def imagemagick_convert(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str | bytes:
     """Convert image data to PNG bytes using ``imagemagick``."""
     cmd: list[Any] = ["magick"]
@@ -64,7 +64,7 @@ async def chafa_convert_cmd(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str | bytes:
     """Convert image data to ANSI text using :command:`chafa`."""
     cmd: list[Any] = [
@@ -93,7 +93,7 @@ async def chafa_convert_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str | bytes:
     """Convert image data to ANSI text using ::`chafa.py`."""
     from chafa import Canvas, CanvasConfig, PixelMode, PixelType

euporie/core/convert/formats/ft.py

@@ -15,6 +15,8 @@ from euporie.core.ft.utils import strip_one_trailing_newline
 from euporie.core.lexers import detect_lexer
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from prompt_toolkit.formatted_text.base import StyleAndTextTuples
 
     from euporie.core.convert.datum import Datum
@@ -22,7 +24,7 @@ if TYPE_CHECKING:
 
 log = logging.getLogger(__name__)
 
-_html_cache: SimpleCache[str, HTML] = SimpleCache(maxsize=20)
+_html_cache: SimpleCache[tuple[str | Any, ...], HTML] = SimpleCache(maxsize=20)
 
 
 @register(
@@ -36,6 +38,7 @@ async def html_to_ft(
     fg: str | None = None,
     bg: str | None = None,
     extend: bool = True,
+    **kwargs: Any,
 ) -> StyleAndTextTuples:
     """Convert HTML to formatted text."""
     from euporie.core.ft.html import HTML
@@ -43,7 +46,7 @@ async def html_to_ft(
     data = datum.data
     markup = data.decode() if isinstance(data, bytes) else data
     html = _html_cache.get(
-        datum.hash,
+        (datum.hash, *kwargs.items()),
         partial(
             HTML,
             markup,
@@ -75,8 +78,8 @@ async def ansi_to_ft(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
     lex: bool = False,
+    **kwargs: Any,
 ) -> StyleAndTextTuples:
     """Convert ANSI text to formatted text, lexing & formatting automatically."""
     data = datum.data

euporie/core/convert/formats/html.py

@@ -11,6 +11,8 @@ from euporie.core.convert.registry import register
 from euporie.core.lexers import detect_lexer
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from markdown_it import MarkdownIt
 
     from euporie.core.convert.datum import Datum
@@ -24,7 +26,6 @@ def markdown_parser() -> MarkdownIt:
     from markdown_it import MarkdownIt
     from mdit_py_plugins.amsmath import amsmath_plugin
     from mdit_py_plugins.dollarmath.index import dollarmath_plugin
-    from mdit_py_plugins.texmath.index import texmath_plugin
     from pygments import highlight
     from pygments.formatters import HtmlFormatter
 
@@ -36,30 +37,27 @@ def markdown_parser() -> MarkdownIt:
             return True
 
     return (
-        (
-            MarkdownParser(
-                options_update={
-                    "highlight": lambda text, language, lang_args: highlight(
-                        text,
-                        detect_lexer(text, language=language),
-                        HtmlFormatter(
-                            nowrap=True,
-                            noclasses=True,
-                            style=(
-                                app.syntax_theme
-                                if hasattr((app := get_app()), "syntax_theme")
-                                else "default"
-                            ),
+        MarkdownParser(
+            options_update={
+                "highlight": lambda text, language, lang_args: highlight(
+                    text,
+                    detect_lexer(text, language=language),
+                    HtmlFormatter(
+                        nowrap=True,
+                        noclasses=True,
+                        style=(
+                            app.syntax_theme
+                            if hasattr((app := get_app()), "syntax_theme")
+                            else "default"
                         ),
-                    )
-                }
-            )
-            .enable("linkify")
-            .enable("table")
-            .enable("strikethrough")
+                    ),
+                )
+            }
         )
-        .use(texmath_plugin)
-        .use(dollarmath_plugin)
+        .enable("linkify")
+        .enable("table")
+        .enable("strikethrough")
+        .use(dollarmath_plugin, allow_space=True, double_inline=True)
         .use(amsmath_plugin)
         # .use(tasklists_plugin)
     )
@@ -72,7 +70,7 @@ async def markdown_to_html_markdown_it(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert markdown to HTML using :py:mod:`markdownit_py`."""
     parser = markdown_parser()

euporie/core/convert/formats/markdown.py

@@ -9,6 +9,8 @@ from euporie.core.convert.registry import register
 from euporie.core.filters import have_modules
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from euporie.core.convert.datum import Datum
 
 log = logging.getLogger(__name__)
@@ -27,7 +29,7 @@ async def html_to_markdown_py_html2text(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML to markdown tables using :py:mod:`html2text`."""
     import re
@@ -72,7 +74,7 @@ async def html_to_markdown_py_mtable(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert HTML tables to markdown tables using :py:mod:`mtable`."""
     from mtable import MarkupTable

euporie/core/convert/formats/pil.py

@@ -9,6 +9,8 @@ from euporie.core.convert.registry import register
 from euporie.core.filters import have_modules
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from PIL.Image import Image as PilImage
 
     from euporie.core.convert.datum import Datum
@@ -44,7 +46,7 @@ async def png_to_pil_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> PilImage:
     """Convert PNG to a pillow image using :py:mod:`PIL`."""
     import io

euporie/core/convert/formats/png.py

@@ -11,6 +11,8 @@ from euporie.core.convert.registry import register
 from euporie.core.filters import command_exists, have_modules
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from euporie.core.convert.datum import Datum
 
 register(
@@ -30,8 +32,8 @@ async def latex_to_png_dvipng(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
     timeout: int = 2,
+    **kwargs: Any,
 ) -> bytes | None:
     """Render LaTeX as a png image using :command:`dvipng`.
 
@@ -113,7 +115,7 @@ async def latex_to_png_py_mpl(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> bytes:
     """Render LaTeX as a png image using :py:module:`matplotlib`.
 
@@ -156,7 +158,7 @@ async def pil_to_png_py_pil(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> bytes:
     """Convert a pillow image to sixels :py:mod:`teimpy`."""
     import io
@@ -177,7 +179,7 @@ async def svg_to_png_py_cairosvg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert SVG to PNG using :py:mod:`cairosvg`."""
     import cairosvg

euporie/core/convert/formats/rich.py

@@ -8,6 +8,8 @@ from euporie.core.convert.registry import register
 from euporie.core.filters import have_modules
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from rich.markdown import Markdown
 
     from euporie.core.convert.datum import Datum
@@ -24,7 +26,7 @@ async def markdown_to_rich_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> Markdown:
     """Convert base64 encoded data to bytes."""
     from rich.markdown import Markdown

euporie/core/convert/formats/sixel.py

@@ -46,7 +46,7 @@ async def png_to_sixel_img2sixel(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert PNG data to sixels :command:`img2sixel`."""
     cmd: list[Any] = ["img2sixel", "-I"]
@@ -76,7 +76,7 @@ async def pil_to_sixel_py_timg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert a pillow image to sixels :py:mod:`timg`."""
     import timg
@@ -95,7 +95,7 @@ async def pil_to_sixel_py_teimpy(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    extend: bool = True,
+    **kwargs: Any,
 ) -> str:
     """Convert a pillow image to sixels :py:mod:`teimpy`."""
     import numpy as np