ipython 8.36.0__tar.gz → 8.37.0__tar.gz

{ipython-8.36.0 → ipython-8.37.0}/IPython/core/completer.py

@@ -1145,6 +1145,48 @@ class Completer(Configurable):
     # we simple attribute matching with normal identifiers.
     _ATTR_MATCH_RE = re.compile(r"(.+)\.(\w*)$")
 
+    def _strip_code_before_operator(self, code: str) -> str:
+        o_parens = {"(", "[", "{"}
+        c_parens = {")", "]", "}"}
+
+        # Dry-run tokenize to catch errors
+        try:
+            _ = list(tokenize.generate_tokens(iter(code.splitlines()).__next__))
+        except tokenize.TokenError:
+            # Try trimming the expression and retrying
+            trimmed_code = self._trim_expr(code)
+            try:
+                _ = list(
+                    tokenize.generate_tokens(iter(trimmed_code.splitlines()).__next__)
+                )
+                code = trimmed_code
+            except tokenize.TokenError:
+                return code
+
+        tokens = _parse_tokens(code)
+        encountered_operator = False
+        after_operator = []
+        nesting_level = 0
+
+        for t in tokens:
+            if t.type == tokenize.OP:
+                if t.string in o_parens:
+                    nesting_level += 1
+                elif t.string in c_parens:
+                    nesting_level -= 1
+                elif t.string != "." and nesting_level == 0:
+                    encountered_operator = True
+                    after_operator = []
+                    continue
+
+            if encountered_operator:
+                after_operator.append(t.string)
+
+        if encountered_operator:
+            return "".join(after_operator)
+        else:
+            return code
+
     def _attr_matches(
         self, text: str, include_prefix: bool = True
     ) -> Tuple[Sequence[str], str]:
@@ -1152,9 +1194,12 @@ class Completer(Configurable):
         if not m2:
             return [], ""
         expr, attr = m2.group(1, 2)
+        try:
+            expr = self._strip_code_before_operator(expr)
+        except tokenize.TokenError:
+            pass
 
         obj = self._evaluate_expr(expr)
-
         if obj is not_found:
             return [], ""
 

{ipython-8.36.0 → ipython-8.37.0}/IPython/core/release.py

@@ -16,7 +16,7 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 36
+_version_minor = 37
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"

{ipython-8.36.0 → ipython-8.37.0}/IPython/core/tests/test_completer.py

@@ -595,7 +595,9 @@ class TestCompleter(unittest.TestCase):
         """
         ip = get_ipython()
         ip.ex("a=list(range(5))")
+        ip.ex("b,c = 1, 1.2")
         ip.ex("d = {'a b': str}")
+        ip.ex("x=y='a'")
         _, c = ip.complete(".", line="a[0].")
         self.assertFalse(".real" in c, "Shouldn't have completed on a[0]: %s" % c)
 
@@ -653,6 +655,41 @@ class TestCompleter(unittest.TestCase):
                 "Should have completed on `a.app`: %s",
                 Completion(2, 4, "append"),
             )
+            _(
+                "x.upper() == y.",
+                15,
+                ".upper",
+                "Should have completed on `x.upper() == y.`: %s",
+                Completion(15, 15, "upper"),
+            )
+            _(
+                "(x.upper() == y.",
+                16,
+                ".upper",
+                "Should have completed on `(x.upper() == y.`: %s",
+                Completion(16, 16, "upper"),
+            )
+            _(
+                "(x.upper() == y).",
+                17,
+                ".bit_length",
+                "Should have completed on `(x.upper() == y).`: %s",
+                Completion(17, 17, "bit_length"),
+            )
+            _(
+                "{'==', 'abc'}.",
+                14,
+                ".add",
+                "Should have completed on `{'==', 'abc'}.`: %s",
+                Completion(14, 14, "add"),
+            )
+            _(
+                "b + c.",
+                6,
+                ".hex",
+                "Should have completed on `b + c.`: %s",
+                Completion(6, 6, "hex"),
+            )
 
     def test_omit__names(self):
         # also happens to test IPCompleter as a configurable

{ipython-8.36.0 → ipython-8.37.0}/IPython/terminal/interactiveshell.py

@@ -502,13 +502,16 @@ class TerminalInteractiveShell(InteractiveShell):
         elif provider == "NavigableAutoSuggestFromHistory":
             # LLM stuff are all Provisional in 8.32
             if self._llm_provider_class:
-                llm_provider_constructor = import_item(self._llm_provider_class)
-                llm_provider = llm_provider_constructor(**self.llm_constructor_kwargs)
+
+                def init_llm_provider():
+                    llm_provider_constructor = import_item(self._llm_provider_class)
+                    return llm_provider_constructor(**self.llm_constructor_kwargs)
+
             else:
-                llm_provider = None
+                init_llm_provider = None
             self.auto_suggest = NavigableAutoSuggestFromHistory()
             # Provisinal in 8.32
-            self.auto_suggest._llm_provider = llm_provider
+            self.auto_suggest._init_llm_provider = init_llm_provider
 
             name = self.llm_prefix_from_history
 

{ipython-8.36.0 → ipython-8.37.0}/IPython/terminal/shortcuts/auto_suggest.py

@@ -171,16 +171,19 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
     # another request.
     _llm_task: asyncio.Task | None = None
 
-    # This is the instance of the LLM provider from jupyter-ai to which we forward the request
-    # to generate inline completions.
-    _llm_provider: Any | None
+    # This is the constructor of the LLM provider from jupyter-ai
+    # to which we forward the request to generate inline completions.
+    _init_llm_provider: Callable | None
+
+    _llm_provider_instance: Any | None
     _llm_prefixer: Callable = lambda self, x: "wrong"
 
     def __init__(self):
         super().__init__()
         self.skip_lines = 0
         self._connected_apps = []
-        self._llm_provider = None
+        self._llm_provider_instance = None
+        self._init_llm_provider = None
         self._request_number = 0
 
     def reset_history_position(self, _: Buffer):
@@ -317,6 +320,16 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
                     "LLM task not cancelled, does your provider support cancellation?"
                 )
 
+    @property
+    def _llm_provider(self):
+        """Lazy-initialized instance of the LLM provider.
+
+        Do not use in the constructor, as `_init_llm_provider` can trigger slow side-effects.
+        """
+        if self._llm_provider_instance is None and self._init_llm_provider:
+            self._llm_provider_instance = self._init_llm_provider()
+        return self._llm_provider_instance
+
     async def _trigger_llm(self, buffer) -> None:
         """
         This will ask the current llm provider a suggestion for the current buffer.
@@ -325,14 +338,14 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
         """
         # we likely want to store the current cursor position, and cancel if the cursor has moved.
         try:
-            import jupyter_ai.completions.models as jai_models
+            import jupyter_ai_magics
         except ModuleNotFoundError:
-            jai_models = None
+            jupyter_ai_magics = None
         if not self._llm_provider:
             warnings.warn("No LLM provider found, cannot trigger LLM completions")
             return
-        if jai_models is None:
-            warnings.warn("LLM Completion requires `jupyter_ai` to be installed")
+        if jupyter_ai_magics is None:
+            warnings.warn("LLM Completion requires `jupyter_ai_magics` to be installed")
 
         self._cancel_running_llm_task()
 
@@ -359,7 +372,7 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
         provider to stream it's response back to us iteratively setting it as
         the suggestion on the current buffer.
 
-        Unlike with JupyterAi, as we do not have multiple cell, the cell id
+        Unlike with JupyterAi, as we do not have multiple cells, the cell id
         is always set to `None`.
 
         We set the prefix to the current cell content, but could also insert the

{ipython-8.36.0 → ipython-8.37.0}/IPython/terminal/tests/fake_llm.py

@@ -1,7 +1,8 @@
 import asyncio
+from time import sleep
 
 try:
-    from jupyter_ai_magics import BaseProvider
+    from jupyter_ai_magics.providers import BaseProvider
     from langchain_community.llms import FakeListLLM
 except ImportError:
 
@@ -87,3 +88,16 @@ class FibonacciCompletionProvider(BaseProvider, FakeListLLM):  # type: ignore[mi
             reply_to=request_number,
             done=True,
         )
+
+
+class SlowStartingCompletionProvider(BaseProvider, FakeListLLM):  # type: ignore[misc, valid-type]
+    id = "slow_provider"
+    name = "Slow Provider"
+    model_id_key = "model"
+    models = ["model_a"]
+
+    def __init__(self, **kwargs):
+        kwargs["responses"] = ["This fake response will be used for completion"]
+        kwargs["model_id"] = "model_a"
+        sleep(10)
+        super().__init__(**kwargs)

{ipython-8.36.0 → ipython-8.37.0}/IPython/terminal/tests/test_shortcuts.py

@@ -1,4 +1,5 @@
 import pytest
+import time
 from IPython.terminal.interactiveshell import PtkHistoryAdapter
 from IPython.terminal.shortcuts.auto_suggest import (
     accept,
@@ -68,6 +69,17 @@ async def test_llm_autosuggestion():
     assert event.current_buffer.suggestion.text == FIBONACCI[len(text) :]
 
 
+def test_slow_llm_provider_should_not_block_init():
+    ip = get_ipython()
+    provider = NavigableAutoSuggestFromHistory()
+    ip.auto_suggest = provider
+    start = time.perf_counter()
+    ip.llm_provider_class = "tests.fake_llm.SlowStartingCompletionProvider"
+    end = time.perf_counter()
+    elapsed = end - start
+    assert elapsed < 0.1
+
+
 @pytest.mark.parametrize(
     "text, suggestion, expected",
     [

{ipython-8.36.0 → ipython-8.37.0}/IPython/utils/_sysinfo.py

@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = "3525cd4bc"
+commit = "86a50d33a"

{ipython-8.36.0/ipython.egg-info → ipython-8.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 8.36.0
+Version: 8.37.0
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org

{ipython-8.36.0 → ipython-8.37.0}/docs/source/interactive/magics-generated.txt

@@ -698,12 +698,9 @@ Line magics
       -n                  print line numbers for each input. This feature is only available if numbered prompts are in use.
       -o                  also print outputs for each input.
       -p                  print classic '>>>' python prompts before each input. This is useful for making documentation, and in conjunction with -o, for producing doctest-ready output.
-      -t                  print the 'translated' history, as IPython understands it. IPython filters your input and converts it all into valid Python source before executing it (things like magics or aliases are turned into function calls, for example).
-                          With this option, you'll see the native history instead of the user-entered version: '%cd /' will be seen as 'get_ipython().run_line_magic("cd", "/")' instead of '%cd /'.
-      -f FILENAME         FILENAME: instead of printing the output to the screen, redirect it to the given file. The file is always overwritten, though *when it can*, IPython asks for confirmation first. In particular, running the command 'history -f
-                          FILENAME' from the IPython Notebook interface will replace FILENAME even if it already exists *without* confirmation.
-      -g <[PATTERN ...]>  treat the arg as a glob pattern to search for in (full) history. This includes the saved history (almost all commands ever written). The pattern may contain '?' to match one unknown character and '*' to match any number of unknown
-                          characters. Use '%hist -g' to show full saved history (may be very long).
+      -t                  print the 'translated' history, as IPython understands it. IPython filters your input and converts it all into valid Python source before executing it (things like magics or aliases are turned into function calls, for example). With this option, you'll see the native history instead of the user-entered version: '%cd /' will be seen as 'get_ipython().run_line_magic("cd", "/")' instead of '%cd /'.
+      -f FILENAME         FILENAME: instead of printing the output to the screen, redirect it to the given file. The file is always overwritten, though *when it can*, IPython asks for confirmation first. In particular, running the command 'history -f FILENAME' from the IPython Notebook interface will replace FILENAME even if it already exists *without* confirmation.
+      -g <[PATTERN ...]>  treat the arg as a glob pattern to search for in (full) history. This includes the saved history (almost all commands ever written). The pattern may contain '?' to match one unknown character and '*' to match any number of unknown characters. Use '%hist -g' to show full saved history (may be very long).
       -l <[LIMIT]>        get the last n lines from all sessions. Specify n as a single arg, or the default is the last 10 lines.
       -u                  when searching history using `-g`, show only unique history.
 
@@ -2323,8 +2320,7 @@ Cell magics
     run the cell, capturing stdout, stderr, and IPython's rich display() calls.
     
     positional arguments:
-      output        The name of the variable in which to store output. This is a utils.io.CapturedIO object with stdout/err attributes for the text of the captured output. CapturedOutput also has a show() method for displaying the output, and __call__ as
-                    well, so you can use that to quickly display the output. If unspecified, captured output is discarded.
+      output        The name of the variable in which to store output. This is a utils.io.CapturedIO object with stdout/err attributes for the text of the captured output. CapturedOutput also has a show() method for displaying the output, and __call__ as well, so you can use that to quickly display the output. If unspecified, captured output is discarded.
     
     options:
       --no-stderr   Don't capture stderr.

{ipython-8.36.0 → ipython-8.37.0}/docs/source/whatsnew/version8.rst

@@ -2,6 +2,16 @@
  8.x Series
 ============
 
+.. _version 8.37:
+
+IPython 8.37
+============
+
+This release includes fixes for the tab completer and LLM completer backported from IPython 9.4:
+
+- :ghpull:`14910` Eliminate startup delay when LLM completion provider is configured
+- :ghpull:`14898` Fix attribute completion for expressions with comparison operators
+
 .. _version 8.36:
 
 IPython 8.36

{ipython-8.36.0 → ipython-8.37.0}/examples/auto_suggest_llm.py

@@ -68,13 +68,13 @@ import asyncio
 import textwrap
 from typing import Any, AsyncIterable, AsyncIterator
 
-from jupyter_ai.completions.models import (
+from jupyter_ai_magics.models.completion import (
     InlineCompletionList,
     InlineCompletionReply,
     InlineCompletionRequest,
     InlineCompletionStreamChunk,
 )
-from jupyter_ai_magics import BaseProvider
+from jupyter_ai_magics.providers import BaseProvider
 from langchain_community.llms import FakeListLLM
 
 

{ipython-8.36.0 → ipython-8.37.0/ipython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 8.36.0
+Version: 8.37.0
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org