euporie 2.8.11__tar.gz → 2.8.12__tar.gz

{euporie-2.8.11 → euporie-2.8.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euporie
-Version: 2.8.11
+Version: 2.8.12
 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
@@ -36,7 +36,7 @@ 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: pyperclip~=1.9
 Requires-Dist: sixelcrop~=0.1.9
 Requires-Dist: timg~=1.1.6
 Requires-Dist: typing-extensions~=4.5

{euporie-2.8.11 → euporie-2.8.12}/euporie/console/app.py

@@ -79,7 +79,7 @@ class ConsoleApp(BaseApp):
         # Initialize the application
         super().__init__(**kwargs)
 
-        self.bindings_to_load += ["euporie.console.app.ConsoleApp"]
+        self.bindings_to_load += ["euporie.console.app:ConsoleApp"]
 
         self.tabs = []
 
@@ -171,4 +171,4 @@ class ConsoleApp(BaseApp):
 
     # ################################# Key Bindings ##################################
 
-    # register_bindings({"euporie.console.app.ConsoleApp": {}})
+    # register_bindings({"euporie.console.app:ConsoleApp": {}})

{euporie-2.8.11 → euporie-2.8.12}/euporie/console/tabs/console.py

@@ -667,7 +667,7 @@ class Console(KernelTab):
                 *input_row,
             ],
             key_bindings=load_registered_bindings(
-                "euporie.console.tabs.console.Console",
+                "euporie.console.tabs.console:Console",
                 config=self.app.config,
             ),
         )
@@ -883,13 +883,13 @@ class Console(KernelTab):
 
     register_bindings(
         {
-            "euporie.console.tabs.console.Console": {
+            "euporie.console.tabs.console:Console": {
                 "clear-input": ["c-c", "<sigint>"],
                 "cc-interrupt-kernel": ["c-c", "<sigint>"],
                 "run-input": ["c-enter", "c-e"],
                 "end-of-file": "c-d",
                 "clear-screen": "c-l",
             },
-            "euporie.console.app.ConsoleApp": {},
+            "euporie.console.app:ConsoleApp": {},
         }
     )

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/__init__.py

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

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/app/app.py

@@ -206,6 +206,7 @@ class BaseApp(ConfigurableApp, Application, ABC):
         self.term_graphics_iterm = False
         self.term_graphics_kitty = False
         self.term_sgr_pixel = False
+        self.term_osc52_clipboard = False
         self._term_size_px: tuple[int, int]
         # Floats at the app level
         self.leave_graphics = to_filter(leave_graphics)
@@ -232,7 +233,7 @@ class BaseApp(ConfigurableApp, Application, ABC):
         # List of key-bindings groups to load
         self.bindings_to_load = [
             "euporie.core.app.app:BaseApp",
-            "euporie.core.io.TerminalInfo",
+            "euporie.core.key_binding.bindings.terminal:TerminalQueries",
         ]
 
         if enable_page_navigation_bindings:
@@ -387,7 +388,7 @@ class BaseApp(ConfigurableApp, Application, ABC):
                 self.output.get_colors()
                 self.output.get_pixel_size()
                 self.output.get_kitty_graphics_status()
-                self.output.get_sixel_graphics_status()
+                self.output.get_device_attributes()
                 self.output.get_iterm_graphics_status()
                 self.output.get_sgr_pixel_status()
                 self.output.get_csiu_status()
@@ -814,11 +815,6 @@ class BaseApp(ConfigurableApp, Application, ABC):
             Return a combined style to use for the application
 
         """
-        styles: list[BaseStyle] = [
-            style_from_pygments_cls(get_style_by_name(self.syntax_theme)),
-            *self.base_styles,
-        ]
-
         # Get foreground and background colors based on the configured colour scheme
         theme_colors: dict[str, dict[str, str]] = {
             "default": {},
@@ -862,7 +858,11 @@ class BaseApp(ConfigurableApp, Application, ABC):
         )
 
         # Build app style
-        styles.append(build_style(cp))
+        styles: list[BaseStyle] = [
+            style_from_pygments_cls(get_style_by_name(self.syntax_theme)),
+            *self.base_styles,
+            build_style(cp),
+        ]
 
         # Apply style transformations based on the configured color scheme
         self.style_transformation = merge_style_transformations(
@@ -889,6 +889,8 @@ class BaseApp(ConfigurableApp, Application, ABC):
     def update_style(self, query: Setting | None = None) -> None:
         """Update the application's style when the syntax theme is changed."""
         self.renderer.style = self.create_merged_style()
+        # self.invalidate()
+        # self.renderer.reset()
 
     def refresh(self) -> None:
         """Reset all tabs."""

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/bars/search.py

@@ -63,7 +63,7 @@ class SearchBar(PtkSearchToolbar):
             ),
         )
         self.control.key_bindings = load_registered_bindings(
-            "euporie.core.bars.search.SearchBar",
+            "euporie.core.bars.search:SearchBar",
             config=get_app().config,
         )
         search_state = self.control.searcher_search_state
@@ -78,7 +78,7 @@ class SearchBar(PtkSearchToolbar):
                 "find-next": "c-g",
                 "find-previous": "c-p",
             },
-            "euporie.core.bars.search.SearchBar": {
+            "euporie.core.bars.search:SearchBar": {
                 "accept-search": "enter",
                 "stop-search": "escape",
             },

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/completion.py

@@ -48,7 +48,7 @@ class KernelCompleter(Completer):
 
     async def get_completions_async(
         self, document: Document, complete_event: CompleteEvent
-    ) -> AsyncGenerator[Completion, None]:
+    ) -> AsyncGenerator[Completion]:
         """Retrieve completions from a :class:`Kernel`."""
         for kwargs in await self.kernel.complete_async(
             source=document.text,
@@ -84,7 +84,7 @@ class LspCompleter(Completer):
 
     async def get_completions_async(
         self, document: Document, complete_event: CompleteEvent
-    ) -> AsyncGenerator[Completion, None]:
+    ) -> AsyncGenerator[Completion]:
         """Retrieve completions from an LSP server."""
         # Get completions
         text_preceding = document.current_line_before_cursor.lower()
@@ -138,7 +138,7 @@ class DeduplicateCompleter(Completer):
 
     async def get_completions_async(
         self, document: Document, complete_event: CompleteEvent
-    ) -> AsyncGenerator[Completion, None]:
+    ) -> AsyncGenerator[Completion]:
         """Get completions from wrapped completer."""
         # Keep track of the document strings we'd get after applying any completion.
         found_so_far: set[str] = set()

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/convert/formats/common.py

@@ -67,7 +67,12 @@ async def chafa_convert_cmd(
     extend: bool = True,
 ) -> str | bytes:
     """Convert image data to ANSI text using :command:`chafa`."""
-    cmd: list[Any] = ["chafa", f"--format={output_format}"]
+    cmd: list[Any] = [
+        "chafa",
+        f"--format={output_format}",
+        "--passthrough=none",
+        "--polite=on",
+    ]
     if cols is not None or rows is not None:
         size = "--size="
         if cols is not None:

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/ft/ansi.py

@@ -38,6 +38,13 @@ class ANSI(PTANSI):
         value = re.sub(r".*\x1b\[2K", "", value, count=0)
         # Remove hide & show cursor commands
         value = re.sub(r"\x1b\[\?25[hl]", "", value, count=0)
+        # Collapse cursor up movements
+        while (match := re.search(r"\x1b\[(?P<count>\d+)A", value)) is not None:
+            lines = int(match["count"])
+            before = value[: match.start()]
+            after = value[match.end() :]
+            before = "".join(before.splitlines(keepends=True)[:-lines])
+            value = before + after
 
         super().__init__(value)
 
@@ -153,3 +160,4 @@ class ANSI(PTANSI):
                     continue
 
             formatted_text.append((style, sequence))
+            # log.debug(repr(sequence))

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/ft/html.py

@@ -3036,14 +3036,14 @@ class Node:
         return contents
 
     @property
-    def descendents(self) -> Generator[Node, None, None]:
+    def descendents(self) -> Generator[Node]:
         """Yield all descendent elements."""
         for child in self.contents:
             yield child
             yield from child.descendents
 
     @property
-    def renderable_descendents(self) -> Generator[Node, None, None]:
+    def renderable_descendents(self) -> Generator[Node]:
         """Yield descendents, including pseudo and skipping inline elements."""
         for child in self.renderable_contents:
             if (
@@ -3084,7 +3084,7 @@ class Node:
         return False
 
     @property
-    def child_elements(self) -> Generator[Node, None, None]:
+    def child_elements(self) -> Generator[Node]:
         """Yield all of the child element nodes."""
         for child in self.contents:
             # Ignore text and comment nodes

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/ft/table.py

@@ -1503,8 +1503,8 @@ class Table:
 
         # Calculate border visibility
         render_count = self.render_count
-        row_edge_visibilities: dict[int, bool] = defaultdict(lambda: False)
-        col_edge_visibilities: dict[int, bool] = defaultdict(lambda: False)
+        row_edge_visibilities: dict[int, bool] = defaultdict(bool)
+        col_edge_visibilities: dict[int, bool] = defaultdict(bool)
         for y, row in enumerate(self.rows):
             for x, cell in enumerate(row.cells):
                 bv = compute_border_visibility(cell, render_count)

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/history.py

@@ -37,7 +37,7 @@ class KernelHistory(History):
             return self._kernel()
         return self._kernel
 
-    async def load(self) -> AsyncGenerator[str, None]:
+    async def load(self) -> AsyncGenerator[str]:
         """Load the history and yield all entries, most recent history first.
 
         This method can be called multiple times from the `Buffer` to

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/io.py

@@ -138,12 +138,13 @@ class Vt100Parser(vt100_parser.Vt100Parser):
                 # Allow BEL or ST as terminator
                 r"(?:\x1b\\|\x9c|\x07)"
             ),
+            MoreKeys.PaletteDsrResponse: re.compile(r"^\x1b\[\?997;(?P<mode>\d)n"),
             MoreKeys.PixelSizeResponse: re.compile(r"^\x1b\[4;(?P<y>\d+);(?P<x>\d+)t"),
             MoreKeys.KittyGraphicsStatusResponse: re.compile(
                 r"^\x1b_Gi=(4294967295|0);(?P<status>OK)\x1b\\"
             ),
-            MoreKeys.SixelGraphicsStatusResponse: re.compile(
-                r"^\x1b\[\?(?:\d+;)*(?P<sixel>4)(?:;\d+)*c"
+            MoreKeys.DeviceAttributesResponse: re.compile(
+                r"^\x1b\[\?(?P<attrs>[\d;]*)c"
             ),
             MoreKeys.ItermGraphicsStatusResponse: re.compile(
                 r"^\x1bP>\|(?P<term>[^\x1b]+)\x1b\\"
@@ -184,6 +185,14 @@ class Vt100_Output(PtkVt100_Output):
         """Disable SGR-pixel mouse positioning."""
         self.write_raw("\x1b[?1016l")
 
+    def enable_palette_dsr(self) -> None:
+        """Enable device status reports for color palette updates."""
+        self.write_raw("\x1b[?2031h")
+
+    def disable_palette_dsr(self) -> None:
+        """Disable device status reports for color palette updates."""
+        self.write_raw("\x1b[?2031l")
+
     def enable_extended_keys(self) -> None:
         """Request extended keys."""
         # xterm
@@ -225,11 +234,11 @@ class Vt100_Output(PtkVt100_Output):
         self.write_raw(
             "\x1b[s"
             + passthrough("\x1b_Gi=4294967295,s=1,v=1,a=q,t=d,f=24;aaaa\x1b\\")
-            + "\x1b[u\x1b[2k"
+            + "\x1b[u\x1b[2K"
         )
 
-    def get_sixel_graphics_status(self) -> None:
-        """Query terminal for sixel graphics support."""
+    def get_device_attributes(self) -> None:
+        """Query terminal for device attributes."""
         self.write_raw(passthrough("\x1b[c"))
 
     def get_iterm_graphics_status(self) -> None:

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/key_binding/bindings/basic.py

@@ -38,7 +38,7 @@ class TextEntry:
     # Register default bindings for micro edit mode
     register_bindings(
         {
-            "euporie.core.key_binding.bindings.basic.TextEntry": {
+            "euporie.core.key_binding.bindings.basic:TextEntry": {
                 "type-key": "<any>",
                 "complete-bracket-()": "(",
                 "complete-bracket-[]": "[",
@@ -57,7 +57,7 @@ def load_basic_bindings(config: Config | None = None) -> KeyBindingsBase:
     from euporie.core import keys  # noqa: F401
 
     return load_registered_bindings(
-        "euporie.core.key_binding.bindings.basic.TextEntry", config=config
+        "euporie.core.key_binding.bindings.basic:TextEntry", config=config
     )
 
 
@@ -80,11 +80,13 @@ def type_key(event: KeyPressEvent) -> None:
 
 
 def _complete_bracket(right: str, event: KeyPressEvent) -> None:
+    """Automatically insert a closing bracket."""
     event.current_buffer.insert_text(right, move_cursor=False)
     event.key_processor.feed(event.key_sequence[0], first=True)
 
 
 def _skip_close_bracket(right: str, event: KeyPressEvent) -> None:
+    """Skip typing a close bracket if it already exists."""
     event.current_buffer.cursor_position += 1
 
 

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/key_binding/bindings/micro.py

@@ -75,7 +75,7 @@ class EditMode:
 # Register default bindings for micro edit mode
 register_bindings(
     {
-        "euporie.core.key_binding.bindings.micro.EditMode": {
+        "euporie.core.key_binding.bindings.micro:EditMode": {
             "move-cursor-right": "right",
             "move-cursor-left": "left",
             "newline": "enter",
@@ -180,7 +180,7 @@ def load_micro_bindings(config: Config | None = None) -> KeyBindingsBase:
     """Load editor key-bindings in the style of the ``micro`` text editor."""
     return ConditionalKeyBindings(
         load_registered_bindings(
-            "euporie.core.key_binding.bindings.micro.EditMode", config=config
+            "euporie.core.key_binding.bindings.micro:EditMode", config=config
         ),
         micro_mode,
     )

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/key_binding/bindings/page_navigation.py

@@ -37,7 +37,7 @@ class PageNavigation:
     # Register default bindings for micro edit mode
     register_bindings(
         {
-            "euporie.core.key_binding.bindings.page_navigation.PageNavigation": {
+            "euporie.core.key_binding.bindings.page_navigation:PageNavigation": {
                 "scroll-page-up": "pageup",
                 "scroll-page-down": "pagedown",
             },
@@ -54,7 +54,7 @@ def load_page_navigation_bindings(config: Config | None = None) -> KeyBindingsBa
                 load_vi_page_navigation_bindings(),
                 ConditionalKeyBindings(
                     load_registered_bindings(
-                        "euporie.core.key_binding.bindings.page_navigation.PageNavigation",
+                        "euporie.core.key_binding.bindings.page_navigation:PageNavigation",
                         config=config,
                     ),
                     micro_mode,

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/key_binding/bindings/terminal.py

@@ -53,6 +53,15 @@ def get_match(event: KeyPressEvent) -> dict[str, str] | None:
     return None
 
 
+@add_cmd(hidden=True, is_global=True)
+def _set_terminal_palette(event: KeyPressEvent) -> object:
+    from euporie.core.io import Vt100_Output
+
+    if isinstance(output := event.app.output, Vt100_Output):
+        output.get_colors()
+    return NotImplemented
+
+
 @add_cmd(hidden=True, is_global=True)
 def _set_terminal_color(event: KeyPressEvent) -> object:
     """Run when the terminal receives a terminal color query response.
@@ -72,6 +81,7 @@ def _set_terminal_color(event: KeyPressEvent) -> object:
         r, g, b = colors.get("r", "00"), colors.get("g", "00"), colors.get("b", "00")
         app.term_colors[_COLOR_NAMES.get(c, c)] = f"#{r[:2]}{g[:2]}{b[:2]}"
         app.update_style()
+        return None
     return NotImplemented
 
 
@@ -91,16 +101,20 @@ def _set_terminal_pixel_size(event: KeyPressEvent) -> object:
 
 
 @add_cmd(hidden=True, is_global=True)
-def _set_terminal_graphics_sixel(event: KeyPressEvent) -> object:
-    """Run when the terminal receives a sixel graphics support query response."""
+def _set_terminal_device_attributes(event: KeyPressEvent) -> object:
+    """Run when the terminal receives a device attributes query response."""
     from euporie.core.app.app import BaseApp
 
     if (
         isinstance(app := event.app, BaseApp)
         and (values := get_match(event))
-        and values.get("sixel")
+        and (attrs_str := values.get("attrs"))
     ):
-        app.term_graphics_sixel = True
+        attrs = {attr for attr in attrs_str.split(";") if attr}
+        if "4" in attrs:
+            app.term_graphics_sixel = True
+        if "52" in attrs:
+            app.term_osc52_clipboard = True
     return NotImplemented
 
 
@@ -173,11 +187,12 @@ class TerminalQueries:
 
 register_bindings(
     {
-        "euporie.core.io.TerminalInfo": {
+        "euporie.core.key_binding.bindings.terminal:TerminalQueries": {
+            "set-terminal-palette": "<palette-dsr-response>",
             "set-terminal-color": "<colors-response>",
             "set-terminal-pixel-size": "<pixel-size-response>",
             "set-terminal-graphics-kitty": "<kitty-graphics-status-response>",
-            "set-terminal-graphics-sixel": "<sixel-graphics-status-response>",
+            "set-terminal-device-attributes": "<device-attributes-response>",
             "set-terminal-graphics-iterm": "<iterm-graphics-status-response>",
             "set-terminal-sgr-pixel": "<sgr-pixel-status-response>",
             "set-terminal-clipboard-data": "<clipboard-data-response>",
@@ -189,5 +204,5 @@ register_bindings(
 def load_terminal_bindings(config: Config | None = None) -> KeyBindingsBase:
     """Load editor key-bindings in the style of the ``micro`` text editor."""
     return load_registered_bindings(
-        "euporie.core.key_binding.bindings.terminal.TerminalQueries", config=config
+        "euporie.core.key_binding.bindings.terminal:TerminalQueries", config=config
     )

{euporie-2.8.11 → euporie-2.8.12}/euporie/core/key_binding/key_processor.py

@@ -26,7 +26,7 @@ def _kp_init(
 ) -> None:
     """Include more keys when creating a KeyPress."""
     assert isinstance(key, (Keys | MoreKeys)) or len(key) == 1, (
-        f"key {key!r} ({type(key)}) not recoognised {MoreKeys(key)}"
+        f"key {key!r} ({type(key)}) not recognised {MoreKeys(key)}"
     )
     if data is None:
         data = key.value if isinstance(key, (Keys, MoreKeys)) else key