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

euporie/console/_commands.py

@@ -0,0 +1,143 @@
+"""Contains commands for the console."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from prompt_toolkit.filters.app import (
+    buffer_has_focus,
+    has_selection,
+)
+
+from euporie.core.commands import add_cmd
+from euporie.core.filters import (
+    buffer_is_code,
+    buffer_is_empty,
+    kernel_tab_has_focus,
+)
+from euporie.core.tabs.kernel import KernelTab
+
+if TYPE_CHECKING:
+    from prompt_toolkit.key_binding.key_processor import KeyPressEvent
+
+
+@add_cmd()
+async def _convert_to_notebook() -> None:
+    """Convert the current console session to a notebook."""
+    from prompt_toolkit.application.run_in_terminal import in_terminal
+
+    from euporie.console.app import get_app
+    from euporie.console.tabs.console import Console
+    from euporie.notebook.app import NotebookApp
+
+    app = get_app()
+    NotebookApp.config = app.config
+    NotebookApp.load_settings()
+    NotebookApp.config.__init__(app="notebook")  # type: ignore [misc]
+    nb_app = NotebookApp()
+    # Use same event loop
+    nb_app.loop = app.loop
+    for tab in app.tabs:
+        if isinstance(tab, Console):
+            from euporie.notebook.tabs.notebook import Notebook
+
+            nb = Notebook(
+                app=nb_app,
+                path=tab.path,
+                kernel=tab.kernel,
+                comms=tab.comms,
+                json=tab.json,
+            )
+            # Set the history to the console's history
+            nb.history = tab.history
+            # Add the current input
+            nb.add(len(nb.json["cells"]) + 1, source=tab.input_box.buffer.text)
+            # Add the new notebook to the notebook app
+            nb_app.tabs.append(nb)
+            # Tell notebook that the kernel has already started
+            nb.kernel_started()
+
+    async with in_terminal():
+        await nb_app.run_async()
+
+    app.exit()
+
+
+@add_cmd()
+def _accept_input() -> None:
+    """Accept the current console input."""
+    from euporie.console.app import get_app
+
+    buffer = get_app().current_buffer
+    if buffer:
+        buffer.validate_and_handle()
+
+
+@add_cmd(
+    filter=buffer_is_code & buffer_has_focus & ~has_selection & ~buffer_is_empty,
+)
+def _clear_input() -> None:
+    """Clear the console input."""
+    from euporie.console.app import get_app
+
+    buffer = get_app().current_buffer
+    buffer.reset()
+
+
+@add_cmd(
+    filter=buffer_is_code & buffer_has_focus,
+)
+def _run_input() -> None:
+    """Run the console input."""
+    from euporie.console.app import get_app
+    from euporie.console.tabs.console import Console
+
+    if isinstance(console := get_app().tab, Console):
+        console.run()
+
+
+@add_cmd(
+    name="cc-interrupt-kernel",
+    hidden=True,
+    filter=buffer_is_code & buffer_is_empty,
+)
+@add_cmd(filter=kernel_tab_has_focus)
+def _interrupt_kernel() -> None:
+    """Interrupt the notebook's kernel."""
+    from euporie.console.app import get_app
+
+    if isinstance(kt := get_app().tab, KernelTab):
+        kt.interrupt_kernel()
+
+
+@add_cmd(filter=kernel_tab_has_focus)
+def _restart_kernel() -> None:
+    """Restart the notebook's kernel."""
+    from euporie.console.app import get_app
+
+    if isinstance(kt := get_app().tab, KernelTab):
+        kt.restart_kernel()
+
+
+@add_cmd(
+    filter=buffer_is_code & buffer_is_empty,
+    hidden=True,
+    description="Signals the end of the input, causing the console to exit.",
+)
+def _end_of_file(event: KeyPressEvent) -> None:
+    """Exit when Control-D has been pressed."""
+    event.app.exit(exception=EOFError)
+
+
+@add_cmd()
+def _clear_screen() -> None:
+    """Clear the screen and the previous output."""
+    from euporie.console.app import get_app
+    from euporie.console.tabs.console import Console
+
+    app = get_app()
+    app.renderer.clear()
+
+    if isinstance(console := app.tab, Console):
+        console.reset()
+        app.layout.focus(console.input_box)

euporie/console/_settings.py

@@ -0,0 +1,58 @@
+"""Settings for the console app."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from upath import UPath
+
+from euporie.core.config import add_setting
+
+if TYPE_CHECKING:
+    from typing import TypeVar
+
+    _AppResult = TypeVar("_AppResult")
+
+add_setting(
+    name="mouse_support",
+    group="euporie.console.app",
+    flags=["--mouse-support"],
+    type_=bool,
+    help_="Enable or disable mouse support",
+    default=None,
+    description="""
+            When set to True, mouse support is enabled. When set to False, mouse
+            support is disabled.
+        """,
+)
+add_setting(
+    name="max_stored_outputs",
+    group="euporie.console.app",
+    flags=["--max-stored-outputs"],
+    type_=int,
+    help_="The number of inputs / outputs to store in an in-memory notebook",
+    default=100,
+    schema={
+        "minimum": 0,
+    },
+    description="""
+        Defines the maximum number of executed "cells" to store in case the console
+        session is saved to a file or converted into a notebook.
+    """,
+)
+
+add_setting(
+    name="connection_file",
+    group="euporie.console.app",
+    flags=["--connection-file", "--kernel-connection-file"],
+    type_=UPath,
+    help_="Attempt to connect to an existing kernel using a JSON connection info file",
+    default=None,
+    description="""
+        If the file does not exist, kernel connection information will be written
+        to the file path provided.
+
+        If the file exists, kernel connection info will be read from the file,
+        allowing euporie to connect to existing kernels.
+    """,
+)

euporie/console/app.py

@@ -6,7 +6,6 @@ import logging
 from typing import TYPE_CHECKING, cast
 
 from prompt_toolkit.application.current import get_app as ptk_get_app
-from prompt_toolkit.application.run_in_terminal import in_terminal
 from prompt_toolkit.filters.app import (
     has_completions,
     is_done,
@@ -15,6 +14,7 @@ from prompt_toolkit.filters.app import (
 )
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
+    Float,
     FloatContainer,
     HSplit,
     VSplit,
@@ -23,10 +23,11 @@ from prompt_toolkit.layout.containers import (
 from prompt_toolkit.layout.dimension import Dimension
 
 from euporie.console.tabs.console import Console
-from euporie.core import __logo__
-from euporie.core.app import BaseApp
-from euporie.core.commands import add_cmd
-from euporie.core.config import add_setting
+from euporie.core.app.app import BaseApp
+from euporie.core.bars.command import CommandBar
+from euporie.core.bars.menu import ToolbarCompletionsMenu
+from euporie.core.bars.search import SearchBar
+from euporie.core.bars.status import StatusBar
 from euporie.core.filters import has_dialog
 from euporie.core.layout.mouse import DisableMouseOnScroll
 from euporie.core.widgets.dialog import (
@@ -36,14 +37,15 @@ from euporie.core.widgets.dialog import (
     SelectKernelDialog,
     ShortcutsDialog,
 )
+from euporie.core.widgets.logo import Logo
 from euporie.core.widgets.pager import Pager
 from euporie.core.widgets.palette import CommandPalette
-from euporie.core.widgets.search import SearchBar
-from euporie.core.widgets.status import StatusBar
 
 if TYPE_CHECKING:
     from typing import Any, TypeVar
 
+    from prompt_toolkit.application.application import Application
+
     _AppResult = TypeVar("_AppResult")
 
 log = logging.getLogger(__name__)
@@ -63,7 +65,6 @@ class ConsoleApp(BaseApp):
     """
 
     name = "console"
-    log_stdout_level = "ERROR"
 
     def __init__(self, **kwargs: Any) -> None:
         """Create a new euporie text user interface application instance."""
@@ -72,16 +73,22 @@ class ConsoleApp(BaseApp):
         kwargs.setdefault("title", "euporie-console")
         kwargs.setdefault("full_screen", False)
         kwargs.setdefault("leave_graphics", True)
-        kwargs.setdefault("mouse_support", self.config.filter("mouse_support"))
+        kwargs.setdefault("mouse_support", self.config.filters.mouse_support)
 
         # Initialize the application
         super().__init__(**kwargs)
 
-        self.search_bar = SearchBar()
         self.bindings_to_load += ["euporie.console.app.ConsoleApp"]
 
         self.tabs = []
-        self.pager = Pager()
+
+    def pre_run(self, app: Application | None = None) -> None:
+        """Continue loading the app."""
+        super().pre_run(app)
+        # Add a toolbar completion menu
+        self.menus["toolbar_completions"] = Float(
+            content=ToolbarCompletionsMenu(), ycursor=True, transparent=True
+        )
 
     def _get_reserved_height(self) -> Dimension:
         if has_dialog():
@@ -95,9 +102,9 @@ class ConsoleApp(BaseApp):
         """Return a container with all opened tabs."""
         self.tabs = [Console(self)]
 
-        assert self.pager is not None
-        assert self.search_bar is not None
-        assert self.tab is not None
+        self.command_bar = CommandBar()
+        self.search_bar = SearchBar()
+        self.pager = Pager()
 
         self.dialogs["command-palette"] = CommandPalette(self)
         self.dialogs["about"] = AboutDialog(self)
@@ -110,7 +117,7 @@ class ConsoleApp(BaseApp):
             DisableMouseOnScroll(
                 HSplit(
                     [
-                        self.tab,
+                        self.tabs[0],
                         ConditionalContainer(
                             HSplit(
                                 [
@@ -120,17 +127,12 @@ class ConsoleApp(BaseApp):
                                         style="class:default",
                                     ),
                                     self.pager,
-                                    self.search_bar,
                                     ConditionalContainer(
                                         VSplit(
                                             [
-                                                Window(
-                                                    char=f" {__logo__} ",
-                                                    height=1,
-                                                    width=3,
-                                                    style="class:menu,logo",
-                                                    dont_extend_width=True,
-                                                ),
+                                                Logo(),
+                                                self.command_bar,
+                                                self.search_bar,
                                                 StatusBar(),
                                             ]
                                         ),
@@ -165,54 +167,6 @@ class ConsoleApp(BaseApp):
         else:
             super().exit()
 
-    # ################################### Commands ####################################
-
-    @staticmethod
-    @add_cmd()
-    async def _convert_to_notebook() -> None:
-        """Convert the current console session to a notebook."""
-        from euporie.notebook.app import NotebookApp
-        from euporie.notebook.tabs.notebook import Notebook
-
-        app = get_app()
-        nb_app = NotebookApp()
-        for tab in app.tabs:
-            if isinstance(tab, Console):
-                nb = Notebook(
-                    app=nb_app,
-                    path=tab.path,
-                    kernel=tab.kernel,
-                    comms=tab.comms,
-                    json=tab.json,
-                )
-                # Set the history to the console's history
-                nb.history = tab.history
-                # Add the current input
-                nb.add(len(nb.json["cells"]) + 1, source=tab.input_box.buffer.text)
-                # Add the new notebook to the notebook app
-                nb_app.tabs.append(nb)
-                # Tell notebook that the kernel has already started
-                nb.kernel_started()
-
-        async with in_terminal():
-            await nb_app.run_async()
-
-        app.exit()
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="mouse_support",
-        flags=["--mouse-support"],
-        type_=bool,
-        help_="Enable or disable mouse support",
-        default=None,
-        description="""
-            When set to True, mouse support is enabled. When set to False, mouse
-            support is disabled.
-        """,
-    )
-
     # ################################# Key Bindings ##################################
 
     # register_bindings({"euporie.console.app.ConsoleApp": {}})