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

euporie/core/margins.py

@@ -9,9 +9,11 @@ from typing import TYPE_CHECKING, cast
 
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.filters import FilterOrBool, to_filter
+from prompt_toolkit.layout.containers import ScrollOffsets, WindowRenderInfo
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.margins import Margin
+from prompt_toolkit.layout.screen import WritePosition
 from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.mouse_events import MouseEvent as PtkMouseEvent
 
@@ -27,10 +29,10 @@ if TYPE_CHECKING:
         KeyBindingsBase,
         NotImplementedOrNone,
     )
-    from prompt_toolkit.layout.containers import Container, WindowRenderInfo
+    from prompt_toolkit.layout.containers import Container
     from prompt_toolkit.layout.controls import UIContent
     from prompt_toolkit.layout.mouse_handlers import MouseHandlers
-    from prompt_toolkit.layout.screen import Screen, WritePosition
+    from prompt_toolkit.layout.screen import Screen
 
     from euporie.core.diagnostics import Report
 
@@ -49,9 +51,9 @@ class ClickableMargin(Margin, metaclass=ABCMeta):
 
     write_position: WritePosition | None
 
-    def set_write_position(self, write_position: WritePosition) -> None:
+    def set_margin_window(self, margin_window: Window) -> None:
         """Set the write position of the menu."""
-        self.write_position = write_position
+        self.margin_window = margin_window
 
 
 class MarginContainer(Window):
@@ -65,6 +67,9 @@ class MarginContainer(Window):
         self.content = FormattedTextControl(self.create_fragments)
         self.always_hide_cursor = to_filter(True)
 
+        if isinstance(self.margin, ClickableMargin):
+            self.margin.set_margin_window(self)
+
     def create_fragments(self) -> StyleAndTextTuples:
         """Generate text fragments to display."""
         return self.margin.create_margin(
@@ -102,8 +107,6 @@ class MarginContainer(Window):
     ) -> None:
         """Write the actual content to the screen."""
         self.write_position = write_position
-        if isinstance(self.margin, ClickableMargin):
-            self.margin.set_write_position(write_position)
 
         margin_content: UIContent = self.content.create_content(
             write_position.width + 1, write_position.height
@@ -112,6 +115,21 @@ class MarginContainer(Window):
             margin_content, screen, write_position, 0, write_position.width
         )
 
+        self.render_info = WindowRenderInfo(
+            window=self,
+            ui_content=margin_content,
+            horizontal_scroll=0,
+            vertical_scroll=0,
+            window_width=write_position.width,
+            window_height=write_position.height,
+            configured_scroll_offsets=ScrollOffsets(),
+            visible_line_to_row_col=visible_line_to_row_col,
+            rowcol_to_yx=rowcol_to_yx,
+            x_offset=write_position.xpos,
+            y_offset=write_position.ypos,
+            wrap_lines=False,
+        )
+
         # Set mouse handlers.
         def mouse_handler(mouse_event: PtkMouseEvent) -> NotImplementedOrNone:
             """Turn screen coordinates into line coordinates."""
@@ -164,6 +182,8 @@ class MarginContainer(Window):
             handler=mouse_handler,
         )
 
+        screen.visible_windows_to_write_positions[self] = write_position
+
     def is_modal(self) -> bool:
         """When this container is modal."""
         return False
@@ -214,8 +234,7 @@ class ScrollbarMargin(ClickableMargin):
         self.thumb_top = 0.0
         self.thumb_size = 0.0
 
-        self.window_render_info: WindowRenderInfo | None = None
-        self.write_position: WritePosition | None = None
+        self.target_render_info: WindowRenderInfo | None = None
 
     def get_width(self, get_ui_content: Callable[[], UIContent]) -> int:
         """Return the scrollbar width: always 1."""
@@ -226,13 +245,11 @@ class ScrollbarMargin(ClickableMargin):
         window_render_info: WindowRenderInfo | None,
         width: int,
         height: int,
-        margin_render_info: WindowRenderInfo | None = None,
     ) -> StyleAndTextTuples:
         """Create the margin's formatted text."""
         result: StyleAndTextTuples = []
 
-        self.window_render_info = window_render_info
-        self.margin_render_info = margin_render_info
+        self.target_render_info = window_render_info
 
         # If this is the first time the target is being drawn, it may not yet have a
         # render_info yet. Thus, invalidate the app so we can immediately redraw the
@@ -400,11 +417,11 @@ class ScrollbarMargin(ClickableMargin):
             :py:const:`None` is returned when the mouse event is handled successfully
 
         """
-        render_info = self.window_render_info
-        if render_info is None:
+        target_render_info = self.target_render_info
+        if target_render_info is None:
             return NotImplemented
 
-        content_height = render_info.content_height
+        content_height = target_render_info.content_height
         if isinstance(mouse_event, MouseEvent):
             cell_position = mouse_event.cell_position
         else:
@@ -413,9 +430,9 @@ class ScrollbarMargin(ClickableMargin):
 
         # Handle scroll events on the scrollbar
         if mouse_event.event_type == MouseEventType.SCROLL_UP:
-            render_info.window._scroll_up()
+            target_render_info.window._scroll_up()
         elif mouse_event.event_type == MouseEventType.SCROLL_DOWN:
-            render_info.window._scroll_down()
+            target_render_info.window._scroll_down()
 
         # Mouse drag events
         elif self.dragging and mouse_event.event_type == MouseEventType.MOUSE_MOVE:
@@ -425,8 +442,8 @@ class ScrollbarMargin(ClickableMargin):
                 + 0.5
             )
             # Use the window's current vertical scroll as it may have changed since the
-            # window_render_info was generated
-            window = render_info.window
+            # target_render_info was generated
+            window = target_render_info.window
             delta = window.vertical_scroll - target_scroll
 
             if isinstance(window, Window):
@@ -435,7 +452,7 @@ class ScrollbarMargin(ClickableMargin):
                     func()
             # Hack to speed up scrolling on the :py:`ScrollingContainer`
             elif hasattr(window, "scrolling"):
-                setattr(render_info.window, "scrolling", delta)  # noqa: B010
+                setattr(target_render_info.window, "scrolling", delta)  # noqa: B010
 
         # Mouse down events
         elif mouse_event.event_type == MouseEventType.MOUSE_DOWN:
@@ -443,20 +460,30 @@ class ScrollbarMargin(ClickableMargin):
             arrows = self.display_arrows()
             if arrows and int(row) == 0:
                 offset = -1
-            elif arrows and int(row) == render_info.window_height - 1:
+            elif arrows and int(row) == target_render_info.window_height - 1:
                 offset = 1
             # Scroll up or down one page if clicking on the background
             elif row < self.thumb_top + 1 or self.thumb_top + 1 + self.thumb_size < row:
                 direction = (row < (self.thumb_top + self.thumb_size // 2)) * -2 + 1
-                offset = direction * render_info.window_height
+                offset = direction * target_render_info.window_height
             # We are on the scroll button - start a drag event if this is not a
             # repeated mouse event
             elif not repeated:
-                self.dragging = True
-                self.drag_start_scroll = render_info.vertical_scroll
-                self.drag_start_offset = row - self.thumb_top
-                # Restrict mouse events to this area
-                get_app().mouse_limits = self.write_position
+                # Restrict mouse events to the scrollbar's area. Recalculate the area
+                # based on the margin's window's render_info, in case this is not the
+                # main screen
+                if margin_render_info := self.margin_window.render_info:
+                    y_min, x_min = min(margin_render_info._rowcol_to_yx.values())
+                    y_max, x_max = max(margin_render_info._rowcol_to_yx.values())
+                    get_app().mouse_limits = WritePosition(
+                        xpos=x_min,
+                        ypos=y_min,
+                        width=x_max - x_min + 1,
+                        height=y_max - y_min + 1,
+                    )
+                    self.dragging = True
+                    self.drag_start_scroll = target_render_info.vertical_scroll
+                    self.drag_start_offset = row - self.thumb_top
                 return None
             # Otherwise this is a click on the centre scroll button - do nothing
             else:
@@ -465,9 +492,9 @@ class ScrollbarMargin(ClickableMargin):
             if mouse_event.button == MouseButton.LEFT:
                 func = None
                 if offset < 0:
-                    func = render_info.window._scroll_up
+                    func = target_render_info.window._scroll_up
                 elif offset > 0:
-                    func = render_info.window._scroll_down
+                    func = target_render_info.window._scroll_down
                 if func is not None:
                     # Scroll the window multiple times to scroll by the offset
                     for _ in range(abs(int(offset))):
@@ -517,7 +544,7 @@ class NumberedMargin(Margin):
     def get_width(self, get_ui_content: Callable[[], UIContent]) -> int:
         """Return the width of the margin."""
         line_count = get_ui_content().line_count
-        return len("%s" % line_count) + 2
+        return len(f"{line_count}") + 2
 
     def create_margin(
         self, window_render_info: WindowRenderInfo, width: int, height: int
@@ -561,8 +588,10 @@ class NumberedMargin(Margin):
                 style = f"{self_style} class:line-number.current"
             else:
                 style = self_style
+            if last_lineno is None and lineno == 0 and not multiline:
+                linestr = ">"
             # Only display line number if this line is not a continuation of the previous line.
-            if lineno != last_lineno:
+            elif lineno != last_lineno:
                 linestr = str(lineno + 1).rjust(width - 2)
             else:
                 linestr = " " * (width - 2)

euporie/core/style.py

@@ -207,9 +207,9 @@ IPYWIDGET_STYLE = [
 class ColorPaletteColor:
     """A representation of a color with adjustment methods."""
 
-    _cache: SimpleCache[
-        tuple[str, float, float, float, bool], ColorPaletteColor
-    ] = SimpleCache()
+    _cache: SimpleCache[tuple[str, float, float, float, bool], ColorPaletteColor] = (
+        SimpleCache()
+    )
 
     def __init__(self, base: str, _base_override: str = "") -> None:
         """Create a new color.
@@ -496,8 +496,10 @@ def build_style(
         "cell border edit": f"fg:{cp.hl.adjust(hue=-0.3333, rel=False)}",
         "cell input prompt": "fg:blue",
         "cell output prompt": "fg:red",
-        "cell show outputs": "bg:#888",
-        "cell show inputs": "bg:#888",
+        "cell show outputs": f"fg:{cp.fg.more(0.5)} bg:{cp.bg.more(0.05)}",
+        "cell show inputs": f"fg:{cp.fg.more(0.5)} bg:{cp.bg.more(0.05)}",
+        "cell show inputs border": f"fg:{cp.bg.darker(0.1)}",
+        "cell show outputs border": f"fg:{cp.bg.darker(0.1)}",
         # Scrollbars
         "scrollbar": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.15)}",
         "scrollbar.background": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.15)}",

euporie/core/tabs/base.py

@@ -584,3 +584,35 @@ class KernelTab(Tab, metaclass=ABCMeta):
             When set, execution timing data will be recorded in cell metadata.
         """,
     )
+
+    add_setting(
+        name="show_remote_inputs",
+        flags=["--show-remote-inputs"],
+        type_=bool,
+        help_="Display inputs sent to the kernel by other clients",
+        default=True,
+        description="""
+            If set to `True`, all code input sent to the kernel by any client will be
+            displayed.
+
+            If set to `False`, only inputs sent to the kernel by the current instance
+            of euporie will be displayed, and all other inputs will be ignored.
+
+        """,
+    )
+
+    add_setting(
+        name="show_remote_outputs",
+        flags=["--show-remote-outputs"],
+        type_=bool,
+        help_="Display kernel outputs triggered by other clients",
+        default=True,
+        description="""
+            If set to `False`, only outputs generated by code input from the current
+            instance of euporie will be displayed, and all other outputs will be
+            ignored.
+
+            If set to `True`, all outputs generated by the kernel will be
+            displayed.
+        """,
+    )

euporie/core/tabs/notebook.py

@@ -75,7 +75,7 @@ class BaseNotebook(KernelTab, metaclass=ABCMeta):
                     prompt, password
                 ),
                 "set_execution_count": lambda n: self.cell.set_execution_count(n),
-                "add_output": lambda output_json: self.cell.add_output(output_json),
+                "add_output": self.new_output_default,
                 "clear_output": lambda wait: self.cell.clear_output(wait),
                 "set_metadata": lambda path, data: self.cell.set_metadata(path, data),
                 "set_status": self.set_status,
@@ -116,12 +116,10 @@ class BaseNotebook(KernelTab, metaclass=ABCMeta):
         prev = self.container
         self.container = self.load_container()
         self.loaded = True
-
         # Update the focus if the old container had focus
         if self.app.layout.has_focus(prev):
             self.focus()
 
-        self.app.invalidate()
         # Load widgets
         self.load_widgets_from_metadata()
 
@@ -385,6 +383,11 @@ class BaseNotebook(KernelTab, metaclass=ABCMeta):
                 done=cell.ran,
             )
 
+    def new_output_default(self, output_json: dict[str, Any], own: bool) -> None:
+        """Add a new output without a cell to the currently selected cell."""
+        if self.app.config.show_remote_outputs:
+            self.cell.add_output(output_json, own)
+
     def load_widgets_from_metadata(self) -> None:
         """Load widgets from state saved in notebook metadata."""
         for comm_id, comm_data in (

euporie/core/terminal.py

@@ -75,6 +75,7 @@ class TerminalQuery:
     cache = False
     cmd = ""
     pattern: re.Pattern | None = None
+    run_at_startup: bool = True
 
     def __init__(self, input_: Input, output: Output, config: Config) -> None:
         """Create a new instance of the terminal query."""
@@ -257,13 +258,11 @@ class KittyGraphicsStatus(TerminalQuery):
 
     def verify(self, data: str) -> bool:
         """Verify the terminal response means kitty graphics are supported."""
-        if (
+        return bool(
             (match := self.pattern.match(data))
             and (values := match.groupdict())
             and values.get("status") == "OK"
-        ):
-            return True
-        return False
+        )
 
 
 class SixelGraphicsStatus(TerminalQuery):
@@ -279,13 +278,11 @@ class SixelGraphicsStatus(TerminalQuery):
 
     def verify(self, data: str) -> bool:
         """Verify the terminal response means sixel graphics are supported."""
-        if (
+        return bool(
             (match := self.pattern.match(data))
             and (values := match.groupdict())
             and values.get("sixel")
-        ):
-            return True
-        return False
+        )
 
 
 class ItermGraphicsStatus(TerminalQuery):
@@ -301,14 +298,12 @@ class ItermGraphicsStatus(TerminalQuery):
 
     def verify(self, data: str) -> bool:
         """Verify iterm graphics are supported by the terminal."""
-        if (
+        return bool(
             (match := self.pattern.match(data))
             and (values := match.groupdict())
             and (term := values.get("term"))
-            and (term.startswith(("WezTerm", "Konsole", "mlterm")))
-        ):
-            return True
-        return False
+            and term.startswith(("WezTerm", "Konsole", "mlterm"))
+        )
 
 
 class DepthOfColor(TerminalQuery):
@@ -362,9 +357,7 @@ class CsiUStatus(TerminalQuery):
 
     def verify(self, data: str) -> bool:
         """Verify the terminal responds."""
-        if (match := self.pattern.match(data)) and match:
-            return True
-        return False
+        return bool((match := self.pattern.match(data)) and match)
 
 
 class ClipboardData(TerminalQuery):
@@ -374,6 +367,7 @@ class ClipboardData(TerminalQuery):
     cache = False
     cmd = "\x1b]52;c;?\x1b\\"
     pattern = re.compile(r"^\x1b\]52;(?:c|p)?;(?P<data>[A-Za-z0-9+/=]+)\x1b\\\Z")
+    run_at_startup = False
 
     def verify(self, data: str) -> str:
         """Verify the terminal responds."""
@@ -453,7 +447,8 @@ class TerminalInfo:
         # Ensure line wrapping is off before sending queries
         self.output.disable_autowrap()
         for query in self._queries.values():
-            query.send(flush=False)
+            if query.run_at_startup:
+                query.send(flush=False)
         self.output.flush()
 
     def _tiocgwnsz(self) -> tuple[int, int, int, int]:

euporie/core/utils.py

@@ -32,12 +32,10 @@ class ChainedList(Sequence[T]):
         return list(chain.from_iterable(self.lists))
 
     @overload
-    def __getitem__(self, i: int) -> T:
-        ...
+    def __getitem__(self, i: int) -> T: ...
 
     @overload
-    def __getitem__(self, i: slice) -> list[T]:
-        ...
+    def __getitem__(self, i: slice) -> list[T]: ...
 
     def __getitem__(self, i):
         """Get an item from the chained lists."""