euporie 2.8.4__py3-none-any.whl → 2.8.6__py3-none-any.whl

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."""
 
@@ -60,6 +56,8 @@ def register(
 
 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_]
 

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(

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,12 +3,12 @@
 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,
@@ -27,7 +27,7 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.containers import Window
 
 
-@lru_cache(maxsize=None)
+@cache
 def command_exists(*cmds: str) -> Filter:
     """Verify a list of external commands exist on the system."""
     filters = [
@@ -37,17 +37,13 @@ def command_exists(*cmds: str) -> Filter:
     return reduce(lambda a, b: a & b, filters, to_filter(True))
 
 
-@lru_cache(maxsize=None)
+@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))
@@ -81,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():
@@ -112,18 +116,59 @@ def has_menus() -> bool:
 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
 
 
+@Condition
+def kernel_tab_has_focus() -> bool:
+    """Determine if there is a focused kernel tab."""
+    from euporie.core.app.current import get_app
+    from euporie.core.tabs.kernel import KernelTab
+
+    return isinstance(get_app().tab, KernelTab)
+
+
+@cache
+def tab_type_has_focus(tab_class_path: str) -> Condition:
+    """Determine if the focused tab is of a particular type."""
+    from pkgutil import resolve_name
+
+    from euporie.core.app.current import get_app
+
+    tab_class = cache(resolve_name)
+
+    return Condition(lambda: isinstance(get_app().tab, tab_class(tab_class_path)))
+
+
+@Condition
+def tab_can_save() -> bool:
+    """Determine if the current tab can save it's contents."""
+    from euporie.core.app.current import get_app
+    from euporie.core.tabs.base import Tab
+
+    return (
+        tab := get_app().tab
+    ) is not None and tab.__class__.write_file != Tab.write_file
+
+
 @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
@@ -135,7 +180,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)
@@ -144,7 +189,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
 
@@ -152,7 +197,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"
 
@@ -160,7 +205,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"
 
@@ -168,15 +213,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
@@ -185,7 +231,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
@@ -194,7 +240,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
 
@@ -202,7 +248,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
 
@@ -210,7 +256,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
 
@@ -218,7 +264,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
 
@@ -226,11 +272,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)
@@ -245,7 +312,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 (
@@ -265,8 +332,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):
@@ -277,7 +344,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
@@ -286,15 +353,6 @@ def multiple_cells_selected() -> bool:
     return False
 
 
-@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
-
-    return isinstance(get_app().tab, KernelTab)
-
-
 def scrollable(window: Window) -> Filter:
     """Return a filter which indicates if a window is scrollable."""
     return Condition(

euporie/core/format.py

@@ -110,11 +110,10 @@ class LspFormatter(Formatter):
                     range_ = change.get("range", {})
                     start = range_.get("start", {})
                     start_line = start.get("line", 0)
-                    start_char = start.get("char", 0)
+                    start_char = start.get("character", 0)
                     end = range_.get("end", {})
                     end_line = end.get("line", 0)
-                    end_char = end.get("char", 0)
-
+                    end_char = end.get("character", 0)
                     segment = range_to_slice(
                         start_line, start_char, end_line, end_char, text
                     )

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__)
 

euporie/core/ft/html.py

@@ -27,6 +27,7 @@ from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.utils import Event
 from upath import UPath
 
+from euporie.core.app.current import get_app
 from euporie.core.border import (
     DiLineStyle,
     DoubleLine,
@@ -50,7 +51,6 @@ from euporie.core.border import (
 )
 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.data_structures import DiBool, DiInt, DiStr
 from euporie.core.ft.table import Cell, Table, compute_padding
 from euporie.core.ft.utils import (
@@ -102,8 +102,9 @@ class CssSelector(NamedTuple):
 
 
 if TYPE_CHECKING:
+    from collections.abc import Generator, Iterator
     from pathlib import Path
-    from typing import Any, Callable, Generator, Iterator
+    from typing import Any, Callable
 
     from fsspec.spec import AbstractFileSystem
     from prompt_toolkit.filters.base import Filter
@@ -595,8 +596,8 @@ def css_dimension(
 
     # Get cell pixel dimensions
     app = get_app()
-    if hasattr(app, "term_info"):
-        cell_px, cell_py = get_app().term_info.cell_size_px
+    if hasattr(app, "cell_size_px"):
+        cell_px, cell_py = get_app().cell_size_px
     else:
         cell_px, cell_py = 10, 20
 
@@ -1149,8 +1150,7 @@ class Theme(Mapping):
                     and parent_theme["flex_direction"].startswith("col")
                 )
             )
-            or (parent_theme is not None and parent_theme.d_grid)
-        )
+        ) or (parent_theme is not None and parent_theme.d_grid)
 
     @cached_property
     def d_inline(self) -> bool:
@@ -2892,7 +2892,7 @@ class Node:
                 s += ">"
                 if self.contents:
                     for child in self.contents:
-                        s += f"\n{dd} {child._outer_html(d+1, attrs=attrs)}"
+                        s += f"\n{dd} {child._outer_html(d + 1, attrs=attrs)}"
                     s += f"\n{dd}{dd}"
                 s += f"</{self.name}>"
         else:
@@ -3263,15 +3263,6 @@ class CustomHTMLParser(HTMLParser):
             Node(dom=self.dom, name="::text", text=data, parent=self.curr, attrs=[])
         )
 
-    # def handle_endtag(self, tag: str) -> None:
-    #     """Handle end tags: close the currently opened element."""
-    #     if tag == self.curr.name:
-    #         self.curr.closed = True
-    #         if self.curr.parent:
-    #             self.curr = self.curr.parent
-    #     else:
-    #         self.autoclose()
-
     def handle_endtag(self, tag: str) -> None:
         """Handle end tags: close the currently opened element."""
         if tag != self.curr.name:
@@ -3285,7 +3276,6 @@ def parse_style_sheet(css_str: str, dom: HTML, condition: Filter = always) -> No
     """Collect all CSS styles from style tags."""
     dom_css = dom.css
     # Remove whitespace and newlines
-    # css_str = css_str.strip().replace("\n", "")
     css_str = re.sub(r"\s*\n\s*", " ", css_str)
     # Remove comments
     css_str = re.sub(r"\/\*[^\*]+\*\/", "", css_str)
@@ -4992,15 +4982,16 @@ if __name__ == "__main__":
     from prompt_toolkit.shortcuts.utils import print_formatted_text
     from prompt_toolkit.styles.style import Style
 
-    from euporie.core.app import BaseApp
+    from euporie.core.app.dummy import DummyApp
     from euporie.core.path import parse_path
     from euporie.core.style import HTML_STYLE
 
     path = parse_path(sys.argv[1])
 
-    with create_app_session(
-        input=BaseApp.load_input(), output=BaseApp.load_output()
-    ), set_app(BaseApp()):
+    with (
+        create_app_session(input=DummyApp.load_input(), output=DummyApp.load_output()),
+        set_app(DummyApp()),
+    ):
         print_formatted_text(
             HTML(
                 path.read_text(),

euporie/core/ft/table.py

@@ -36,11 +36,9 @@ from euporie.core.ft.utils import (
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator, Sequence
     from typing import (
         Any,
-        Iterable,
-        Iterator,
-        Sequence,
         TypeVar,
     )
 

euporie/core/ft/utils.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import re
 from enum import Enum
-from typing import Iterable, cast
+from typing import TYPE_CHECKING, cast
 
 from prompt_toolkit.formatted_text.base import OneStyleAndTextTuple, StyleAndTextTuples
 from prompt_toolkit.formatted_text.utils import (
@@ -20,6 +20,9 @@ from pygments.util import ClassNotFound
 from euporie.core.border import GridStyle, ThinGrid
 from euporie.core.data_structures import DiBool, DiInt, DiStr
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _ZERO_WIDTH_FRAGMENTS = ("[ZeroWidthEscape]", "[ReverseOverwrite]")