euporie 2.8.9__tar.gz → 2.8.11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euporie
-Version: 2.8.9
+Version: 2.8.11
 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

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

@@ -638,7 +638,10 @@ class Console(KernelTab):
                         Window(
                             FormattedTextControl(
                                 lambda: self.prompt(
-                                    "In ", self.execution_count, offset=1
+                                    "In ",
+                                    self.execution_count,
+                                    offset=1,
+                                    show_busy=True,
                                 )
                             ),
                             dont_extend_width=True,

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

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

euporie-2.8.11/euporie/core/kernel/_settings.py

@@ -0,0 +1,24 @@
+"""Defines kernel settings."""
+
+from euporie.core.config import add_setting
+
+add_setting(
+    name="warn_venv",
+    # Kernel implementations are loaded lazily, so we add kernel settings to the root
+    # kernel module group, causing them to get loaded before any kernel implementations
+    group="euporie.core.kernel",
+    flags=["--warn-venv"],
+    type_=bool,
+    default=True,
+    help_="Warn when running in a virtual environment",
+    description="""
+    When enabled, displays a warning message when the kernel is running inside a
+    virtual environment.
+
+    This can be helpful to remind users that they are working in an isolated Python
+    environment with potentially different package versions than their system Python
+    installation.
+
+    Disable this setting if you prefer not to see these warnings.
+    """,
+)

{euporie-2.8.9 → euporie-2.8.11}/euporie/core/kernel/local.py

@@ -6,12 +6,14 @@ import ast
 import code
 import getpass
 import logging
+import os
 import sys
 import threading
 import traceback
 from asyncio import to_thread
 from functools import update_wrapper
 from linecache import cache as line_cache
+from pathlib import Path
 from typing import TYPE_CHECKING, cast
 
 from pygments import highlight
@@ -124,6 +126,77 @@ class LocalPythonKernel(BaseKernel):
         if callable(set_status):
             set_status(self.status)
 
+    def init_venv(self) -> None:
+        """Add the current venv to sys.path so we can import modules from it.
+
+        This isn't perfect: it doesn't use the Python interpreter with which the
+        virtualenv was built, and it ignores the --no-site-packages option. A warning
+        will appear suggesting the user installs euporie in the virtualenv or to use a
+        Jupyter kernel, but for many cases, it probably works well enough.
+
+        Adapted from :py:mod:`IPython`.
+        """
+        # Check if we are in a virtual environment
+        if "VIRTUAL_ENV" not in os.environ:
+            return
+        elif os.environ["VIRTUAL_ENV"] == "":
+            log.warning(
+                "The virtual environment path is set to '': "
+                "please check if this is intentional."
+            )
+            return
+
+        # Follow sys.executable symlink trail, recoding all paths along the way
+        # We need to check all of these
+        paths = [Path(sys.executable)]
+        while (path := paths[-1]).is_symlink():
+            new_path = path.readlink()
+            if not new_path.is_absolute():
+                new_path = path.parent / new_path
+            paths.append(new_path)
+
+        # Get the venv path
+        p_venv = Path(os.environ["VIRTUAL_ENV"]).resolve()
+        # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
+        if len(p_venv.parts) > 2 and p_venv.parts[1] == "cygdrive":
+            drive_name = p_venv.parts[2]
+            p_venv = (drive_name + ":/") / Path(*p_venv.parts[3:])
+
+        # Check if the executable is already inside or has access to the virtualenv
+        if any(p_venv == p.parents[1].resolve() for p in paths):
+            return
+
+        # Locate the site-packages of the virtual environment
+        if sys.platform == "win32":
+            virtual_env = str(Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages"))
+        else:
+            import re
+
+            virtual_env_path = Path(
+                os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages"
+            )
+            p_ver = sys.version_info[:2]
+
+            # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
+            re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
+            if re_m:
+                predicted_path = Path(str(virtual_env_path).format(*re_m.groups()))
+                if predicted_path.exists():
+                    p_ver = re_m.groups()
+
+            virtual_env = str(virtual_env_path).format(*p_ver)
+
+        if self.kernel_tab.app.config.warn_venv:
+            log.warning("Attempting to work in virtualenv %r.", virtual_env)
+            log.warning(
+                "If you encounter problems, please install euporie inside the virtual "
+                "environment, or use a Jupyter kernel."
+            )
+        import site
+
+        sys.path.insert(0, virtual_env)
+        site.addsitedir(virtual_env)
+
     async def start_async(self) -> None:
         """Start the local interpreter."""
         self.error = None
@@ -134,6 +207,7 @@ class LocalPythonKernel(BaseKernel):
             set_execution_count := self.default_callbacks.get("set_execution_count")
         ):
             set_execution_count(self.execution_count)
+        self.init_venv()
 
     @property
     def spec(self) -> dict[str, str]:
@@ -177,7 +251,7 @@ class LocalPythonKernel(BaseKernel):
         colored_traceback = highlight(
             traceback_text,
             Python3TracebackLexer(),
-            Terminal256Formatter(style=get_app().config.syntax_theme),
+            Terminal256Formatter(style=self.kernel_tab.app.config.syntax_theme),
         ).rstrip()
 
         # Send the error through the callback

{euporie-2.8.9 → euporie-2.8.11}/euporie/core/widgets/_settings.py

@@ -4,6 +4,7 @@ from prompt_toolkit.filters import buffer_has_focus
 
 from euporie.core.app.current import get_app
 from euporie.core.config import add_setting
+from euporie.core.filters import tab_type_has_focus
 
 # euporie.core.widgets.cell_outputs:CellOutputArea
 
@@ -14,12 +15,16 @@ add_setting(
     flags=["--wrap-cell-outputs"],
     type_=bool,
     help_="Wrap cell output text.",
-    default=False,
+    default=True,
     schema={"type": "boolean"},
     description="""
         Whether text-based cell outputs should be wrapped.
     """,
-    cmd_filter=~buffer_has_focus,
+    cmd_filter=(
+        ~buffer_has_focus
+        & tab_type_has_focus("euporie.notebook.tabs.notebook.Notebook")
+    )
+    | ~tab_type_has_focus("euporie.notebook.tabs.notebook.Notebook"),
 )
 
 add_setting(

{euporie-2.8.9 → euporie-2.8.11}/euporie/core/widgets/inputs.py

@@ -360,7 +360,7 @@ class KernelInput(TextArea):
 
     def reformat(self) -> None:
         """Reformat the cell's input."""
-        original_text = self.buffer.text
+        original_text = new_text = self.buffer.text
         language = self.language
         for formatter in self.formatters:
             new_text = formatter._format(original_text, language)

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

@@ -101,8 +101,6 @@ class ConsoleApp(BaseApp):
 
     def load_container(self) -> FloatContainer:
         """Return a container with all opened tabs."""
-        self.tabs = [Console(self)]
-
         self.command_bar = CommandBar()
         self.search_bar = SearchBar()
         self.pager = Pager()
@@ -115,6 +113,8 @@ class ConsoleApp(BaseApp):
         self.dialogs["shortcuts"] = ShortcutsDialog(self)
         self.dialogs["confirm"] = ConfirmDialog(self)
 
+        self.tabs = [Console(self)]
+
         return FloatContainer(
             DisableMouseOnScroll(
                 HSplit(