ipython 8.35.0__tar.gz → 8.36.0__tar.gz

{ipython-8.35.0 → ipython-8.36.0}/IPython/core/magics/execution.py

@@ -151,10 +151,11 @@ class TimeitTemplateFiller(ast.NodeTransformer):
 
 class Timer(timeit.Timer):
     """Timer class that explicitly uses self.inner
-    
+
     which is an undocumented implementation detail of CPython,
     not shared by PyPy.
     """
+
     # Timer.timeit copied from CPython 3.4.2
     def timeit(self, number=timeit.default_number):
         """Time 'number' executions of the main statement.
@@ -192,7 +193,6 @@ class ExecutionMagics(Magics):
     @no_var_expand
     @line_cell_magic
     def prun(self, parameter_s='', cell=None):
-
         """Run a statement through the python code profiler.
 
         **Usage, in line mode:**
@@ -993,7 +993,7 @@ class ExecutionMagics(Magics):
                     # Stop iteration is raised on quit command
                     pass
 
-        except:
+        except Exception:
             etype, value, tb = sys.exc_info()
             # Skip three frames in the traceback: the %run one,
             # one inside bdb.py, and the command-line typed by the
@@ -1127,7 +1127,7 @@ class ExecutionMagics(Magics):
         )
         if stmt == "" and cell is None:
             return
-        
+
         timefunc = timeit.default_timer
         number = int(getattr(opts, "n", 0))
         default_repeat = 7 if timeit.default_repeat < 7 else timeit.default_repeat
@@ -1242,7 +1242,7 @@ class ExecutionMagics(Magics):
     @needs_local_scope
     @line_cell_magic
     @output_can_be_silenced
-    def time(self,line='', cell=None, local_ns=None):
+    def time(self, line="", cell=None, local_ns=None):
         """Time execution of a Python statement or expression.
 
         The CPU and wall clock times are printed, and the value of the
@@ -1257,13 +1257,19 @@ class ExecutionMagics(Magics):
         - In cell mode, you can time the cell body (a directly
           following statement raises an error).
 
-        This function provides very basic timing functionality.  Use the timeit
+        This function provides very basic timing functionality. Use the timeit
         magic for more control over the measurement.
 
         .. versionchanged:: 7.3
             User variables are no longer expanded,
             the magic line is always left unmodified.
 
+        .. versionchanged:: 8.3
+            The time magic now correctly propagates system-exiting exceptions
+            (such as ``KeyboardInterrupt`` invoked when interrupting execution)
+            rather than just printing out the exception traceback.
+            The non-system-exception will still be caught as before.
+
         Examples
         --------
         ::
@@ -1304,10 +1310,10 @@ class ExecutionMagics(Magics):
                 Compiler : 0.78 s
         """
         # fail immediately if the given expression can't be compiled
-        
+
         if line and cell:
             raise UsageError("Can't use statement directly after '%%time'!")
-        
+
         if cell:
             expr = self.shell.transform_cell(cell)
         else:
@@ -1318,7 +1324,7 @@ class ExecutionMagics(Magics):
 
         t0 = clock()
         expr_ast = self.shell.compile.ast_parse(expr)
-        tp = clock()-t0
+        tp = clock() - t0
 
         # Apply AST transformations
         expr_ast = self.shell.transform_ast(expr_ast)
@@ -1326,8 +1332,8 @@ class ExecutionMagics(Magics):
         # Minimum time above which compilation time will be reported
         tc_min = 0.1
 
-        expr_val=None
-        if len(expr_ast.body)==1 and isinstance(expr_ast.body[0], ast.Expr):
+        expr_val = None
+        if len(expr_ast.body) == 1 and isinstance(expr_ast.body[0], ast.Expr):
             mode = 'eval'
             source = '<timed eval>'
             expr_ast = ast.Expression(expr_ast.body[0].value)
@@ -1336,25 +1342,25 @@ class ExecutionMagics(Magics):
             source = '<timed exec>'
             # multi-line %%time case
             if len(expr_ast.body) > 1 and isinstance(expr_ast.body[-1], ast.Expr):
-                expr_val= expr_ast.body[-1]
+                expr_val = expr_ast.body[-1]
                 expr_ast = expr_ast.body[:-1]
                 expr_ast = Module(expr_ast, [])
                 expr_val = ast.Expression(expr_val.value)
 
         t0 = clock()
         code = self.shell.compile(expr_ast, source, mode)
-        tc = clock()-t0
+        tc = clock() - t0
 
         # skew measurement as little as possible
         glob = self.shell.user_ns
         wtime = time.time
         # time execution
         wall_st = wtime()
-        if mode=='eval':
+        if mode == "eval":
             st = clock2()
             try:
                 out = eval(code, glob, local_ns)
-            except:
+            except Exception:
                 self.shell.showtraceback()
                 return
             end = clock2()
@@ -1362,12 +1368,12 @@ class ExecutionMagics(Magics):
             st = clock2()
             try:
                 exec(code, glob, local_ns)
-                out=None
+                out = None
                 # multi-line %%time case
                 if expr_val is not None:
                     code_2 = self.shell.compile(expr_val, source, 'eval')
                     out = eval(code_2, glob, local_ns)
-            except:
+            except Exception:
                 self.shell.showtraceback()
                 return
             end = clock2()
@@ -1597,14 +1603,15 @@ def parse_breakpoint(text, current_file):
         return current_file, int(text)
     else:
         return text[:colon], int(text[colon+1:])
-    
+
+
 def _format_time(timespan, precision=3):
     """Formats the timespan in a human readable form"""
 
     if timespan >= 60.0:
         # we have more than a minute, format that in a human readable form
         # Idea from http://snipplr.com/view/5713/
-        parts = [("d", 60*60*24),("h", 60*60),("min", 60), ("s", 1)]
+        parts = [("d", 60 * 60 * 24), ("h", 60 * 60), ("min", 60), ("s", 1)]
         time = []
         leftover = timespan
         for suffix, length in parts:
@@ -1616,7 +1623,6 @@ def _format_time(timespan, precision=3):
                 break
         return " ".join(time)
 
-
     # Unfortunately characters outside of range(128) can cause problems in
     # certain terminals.
     # See bug: https://bugs.launchpad.net/ipython/+bug/348466
@@ -1630,7 +1636,7 @@ def _format_time(timespan, precision=3):
         except:
             pass
     scaling = [1, 1e3, 1e6, 1e9]
-        
+
     if timespan > 0.0:
         order = min(-int(math.floor(math.log10(timespan)) // 3), 3)
     else:

{ipython-8.35.0 → ipython-8.36.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 = 35
+_version_minor = 36
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"

{ipython-8.35.0 → ipython-8.36.0}/IPython/core/tests/test_magic.py

@@ -16,8 +16,6 @@ from time import sleep
 from threading import Thread
 from subprocess import CalledProcessError
 from textwrap import dedent
-from time import sleep
-from threading import Thread
 from unittest import TestCase, mock
 
 import pytest
@@ -814,6 +812,16 @@ def test_timeit_invalid_return():
     with pytest.raises(SyntaxError):
         _ip.run_line_magic('timeit', 'return')
 
+def test_timeit_raise_on_interrupt():
+    ip = get_ipython()
+
+    with pytest.raises(KeyboardInterrupt):
+        thread = Thread(target=_interrupt_after_1s)
+        thread.start()
+        ip.run_cell_magic("timeit", "", "from time import sleep; sleep(2)")
+        thread.join()
+
+
 @dec.skipif(execution.profile is None)
 def test_prun_special_syntax():
     "Test %%prun with IPython special syntax"
@@ -1542,6 +1550,16 @@ def test_timeit_arguments():
     _ip.run_line_magic("timeit", "-n1 -r1 a=('#')")
 
 
+def test_time_raise_on_interrupt():
+    ip = get_ipython()
+
+    with pytest.raises(KeyboardInterrupt):
+        thread = Thread(target=_interrupt_after_1s)
+        thread.start()
+        ip.run_cell_magic("time", "", "from time import sleep; sleep(2)")
+        thread.join()
+
+
 MINIMAL_LAZY_MAGIC = """
 from IPython.core.magic import (
     Magics,

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

@@ -174,7 +174,7 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
     # 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
-    _llm_prefixer: callable = lambda self, x: "wrong"
+    _llm_prefixer: Callable = lambda self, x: "wrong"
 
     def __init__(self):
         super().__init__()
@@ -325,7 +325,6 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
         """
         # we likely want to store the current cursor position, and cancel if the cursor has moved.
         try:
-            import jupyter_ai_magics
             import jupyter_ai.completions.models as jai_models
         except ModuleNotFoundError:
             jai_models = None
@@ -333,9 +332,7 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
             warnings.warn("No LLM provider found, cannot trigger LLM completions")
             return
         if jai_models is None:
-            warnings.warn(
-                "LLM Completion requires `jupyter_ai_magics` and `jupyter_ai` to be installed"
-            )
+            warnings.warn("LLM Completion requires `jupyter_ai` to be installed")
 
         self._cancel_running_llm_task()
 
@@ -365,7 +362,7 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
         Unlike with JupyterAi, as we do not have multiple cell, the cell id
         is always set to `None`.
 
-        We set the prefix to the current cell content, but could also inset the
+        We set the prefix to the current cell content, but could also insert the
         rest of the history or even just the non-fail history.
 
         In the same way, we do not have cell id.
@@ -378,21 +375,27 @@ class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
         providers.
         """
         try:
-            import jupyter_ai_magics
             import jupyter_ai.completions.models as jai_models
         except ModuleNotFoundError:
             jai_models = None
 
+        if not jai_models:
+            raise ValueError("jupyter-ai is not installed")
+
+        if not self._llm_provider:
+            raise ValueError("No LLM provider found, cannot trigger LLM completions")
+
         hm = buffer.history.shell.history_manager
         prefix = self._llm_prefixer(hm)
         get_ipython().log.debug("prefix: %s", prefix)
 
         self._request_number += 1
         request_number = self._request_number
+
         request = jai_models.InlineCompletionRequest(
             number=request_number,
-            prefix=prefix + buffer.document.text,
-            suffix="",
+            prefix=prefix + buffer.document.text_before_cursor,
+            suffix=buffer.document.text_after_cursor,
             mime="text/x-python",
             stream=True,
             path=None,
@@ -438,7 +441,7 @@ async def llm_autosuggestion(event: KeyPressEvent):
     doc = event.current_buffer.document
     lines_to_insert = max(0, _MIN_LINES - doc.line_count + doc.cursor_position_row)
     for _ in range(lines_to_insert):
-        event.current_buffer.insert_text("\n", move_cursor=False)
+        event.current_buffer.insert_text("\n", move_cursor=False, fire_event=False)
 
     await provider._trigger_llm(event.current_buffer)
 

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

@@ -42,7 +42,7 @@ class FibonacciCompletionProvider(BaseProvider, FakeListLLM):  # type: ignore[mi
 
         assert request.number > 0
         token = f"t{request.number}s0"
-        last_line = request.prefix.rstrip("\n").splitlines()[-1]
+        last_line = request.prefix.splitlines()[-1]
 
         if not FIBONACCI.startswith(last_line):
             return

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

@@ -1,4 +1,5 @@
 import pytest
+from IPython.terminal.interactiveshell import PtkHistoryAdapter
 from IPython.terminal.shortcuts.auto_suggest import (
     accept,
     accept_or_jump_to_end,
@@ -46,7 +47,7 @@ def make_event(text, cursor, suggestion):
 try:
     from .fake_llm import FIBONACCI
 except ImportError:
-    FIBONACCI = None
+    FIBONACCI = ""
 
 
 @dec.skip_without("jupyter_ai")
@@ -56,9 +57,13 @@ async def test_llm_autosuggestion():
     ip = get_ipython()
     ip.auto_suggest = provider
     ip.llm_provider_class = "IPython.terminal.tests.fake_llm.FibonacciCompletionProvider"
+    ip.history_manager.get_range = Mock(return_value=[])
     text = "def fib"
-    event = make_event(text, len(text), "")
-    event.current_buffer.history.shell.history_manager.get_range = Mock(return_value=[])
+    event = Mock()
+    event.current_buffer = Buffer(
+        history=PtkHistoryAdapter(ip),
+    )
+    event.current_buffer.insert_text(text, move_cursor=True)
     await llm_autosuggestion(event)
     assert event.current_buffer.suggestion.text == FIBONACCI[len(text) :]
 

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

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

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

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

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.compilerop.rst

@@ -15,8 +15,11 @@ Module: :mod:`core.compilerop`
 
   .. automethod:: __init__
 
-1 Function
-----------
+2 Functions
+-----------
 
 .. autofunction:: IPython.core.compilerop.code_name
 
+
+.. autofunction:: IPython.core.compilerop.check_linecache_ipython
+

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.completer.rst

@@ -55,9 +55,12 @@ Module: :mod:`core.completer`
 
   .. automethod:: __init__
 
-16 Functions
+18 Functions
 ------------
 
+.. autofunction:: IPython.core.completer.cast
+
+
 .. autofunction:: IPython.core.completer.provisionalcompleter
 
 
@@ -105,3 +108,6 @@ Module: :mod:`core.completer`
 
 .. autofunction:: IPython.core.completer.back_latex_name_matcher
 
+
+.. autofunction:: IPython.core.completer.back_latex_name_matches
+

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.debugger.rst

@@ -19,9 +19,12 @@ Module: :mod:`core.debugger`
   :members:
   :show-inheritance:
 
-4 Functions
+5 Functions
 -----------
 
+.. autofunction:: IPython.core.debugger.make_arrow
+
+
 .. autofunction:: IPython.core.debugger.BdbQuit_excepthook
 
 

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.history.rst

@@ -6,17 +6,9 @@ Module: :mod:`core.history`
 
 .. currentmodule:: IPython.core.history
 
-7 Classes
+4 Classes
 ---------
 
-.. autoclass:: DatabaseError
-  :members:
-  :show-inheritance:
-
-.. autoclass:: OperationalError
-  :members:
-  :show-inheritance:
-
 .. autoclass:: HistoryAccessorBase
   :members:
   :show-inheritance:
@@ -27,10 +19,6 @@ Module: :mod:`core.history`
 
   .. automethod:: __init__
 
-.. autoclass:: HistoryOutput
-  :members:
-  :show-inheritance:
-
 .. autoclass:: HistoryManager
   :members:
   :show-inheritance:
@@ -43,7 +31,7 @@ Module: :mod:`core.history`
 
   .. automethod:: __init__
 
-4 Functions
+3 Functions
 -----------
 
 .. autofunction:: IPython.core.history.only_when_enabled
@@ -52,8 +40,5 @@ Module: :mod:`core.history`
 .. autofunction:: IPython.core.history.catch_corrupt_db
 
 
-.. autofunction:: IPython.core.history.hold
-
-
 .. autofunction:: IPython.core.history.extract_hist_ranges
 

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.hooks.rst

@@ -15,7 +15,7 @@ Module: :mod:`core.hooks`
 
   .. automethod:: __init__
 
-4 Functions
+5 Functions
 -----------
 
 .. autofunction:: IPython.core.hooks.editor
@@ -27,5 +27,8 @@ Module: :mod:`core.hooks`
 .. autofunction:: IPython.core.hooks.show_in_pager
 
 
+.. autofunction:: IPython.core.hooks.pre_prompt_hook
+
+
 .. autofunction:: IPython.core.hooks.clipboard_get
 

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.inputtransformer.rst

@@ -13,6 +13,8 @@ Module: :mod:`core.inputtransformer`
   :members:
   :show-inheritance:
 
+  .. automethod:: __init__
+
 .. autoclass:: StatelessInputTransformer
   :members:
   :show-inheritance:

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.inputtransformer2.rst

@@ -57,7 +57,7 @@ Module: :mod:`core.inputtransformer2`
 
   .. automethod:: __init__
 
-8 Functions
+9 Functions
 -----------
 
 .. autofunction:: IPython.core.inputtransformer2.leading_empty_lines
@@ -81,5 +81,8 @@ Module: :mod:`core.inputtransformer2`
 .. autofunction:: IPython.core.inputtransformer2.has_sunken_brackets
 
 
+.. autofunction:: IPython.core.inputtransformer2.show_linewise_tokens
+
+
 .. autofunction:: IPython.core.inputtransformer2.find_last_indent
 

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.interactiveshell.rst

@@ -6,9 +6,15 @@ Module: :mod:`core.interactiveshell`
 
 .. currentmodule:: IPython.core.interactiveshell
 
-7 Classes
+8 Classes
 ---------
 
+.. autoclass:: PickleShareDB
+  :members:
+  :show-inheritance:
+
+  .. automethod:: __init__
+
 .. autoclass:: ProvisionalWarning
   :members:
   :show-inheritance:
@@ -43,7 +49,7 @@ Module: :mod:`core.interactiveshell`
   :members:
   :show-inheritance:
 
-3 Functions
+2 Functions
 -----------
 
 .. autofunction:: IPython.core.interactiveshell.sphinxify
@@ -51,6 +57,3 @@ Module: :mod:`core.interactiveshell`
 
 .. autofunction:: IPython.core.interactiveshell.is_integer_string
 
-
-.. autofunction:: IPython.core.interactiveshell.make_main_module_type
-

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.payloadpage.rst

@@ -6,8 +6,11 @@ Module: :mod:`core.payloadpage`
 
 .. currentmodule:: IPython.core.payloadpage
 
-1 Function
-----------
+2 Functions
+-----------
 
 .. autofunction:: IPython.core.payloadpage.page
 
+
+.. autofunction:: IPython.core.payloadpage.install_payload_page
+

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.pylabtools.rst

@@ -6,8 +6,8 @@ Module: :mod:`core.pylabtools`
 
 .. currentmodule:: IPython.core.pylabtools
 
-9 Functions
------------
+10 Functions
+------------
 
 .. autofunction:: IPython.core.pylabtools.getfigs
 
@@ -35,3 +35,6 @@ Module: :mod:`core.pylabtools`
 
 .. autofunction:: IPython.core.pylabtools.import_pylab
 
+
+.. autofunction:: IPython.core.pylabtools.configure_inline_support
+

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.core.ultratb.rst

@@ -6,13 +6,25 @@ Module: :mod:`core.ultratb`
 
 .. currentmodule:: IPython.core.ultratb
 
-6 Classes
+8 Classes
 ---------
 
+.. autoclass:: TBTools
+  :members:
+  :show-inheritance:
+
+  .. automethod:: __init__
+
 .. autoclass:: ListTB
   :members:
   :show-inheritance:
 
+.. autoclass:: FrameInfo
+  :members:
+  :show-inheritance:
+
+  .. automethod:: __init__
+
 .. autoclass:: VerboseTB
   :members:
   :show-inheritance:
@@ -40,3 +52,21 @@ Module: :mod:`core.ultratb`
   :show-inheritance:
 
   .. automethod:: __init__
+
+5 Functions
+-----------
+
+.. autofunction:: IPython.core.ultratb.count_lines_in_py_file
+
+
+.. autofunction:: IPython.core.ultratb.get_line_number_of_frame
+
+
+.. autofunction:: IPython.core.ultratb.text_repr
+
+
+.. autofunction:: IPython.core.ultratb.eqrepr
+
+
+.. autofunction:: IPython.core.ultratb.nullrepr
+

{ipython-8.35.0 → ipython-8.36.0}/docs/source/api/generated/IPython.display.rst

@@ -135,7 +135,7 @@ Module: :mod:`display`
 
   .. automethod:: __init__
 
-14 Functions
+16 Functions
 ------------
 
 .. autofunction:: IPython.display.clear_output
@@ -177,5 +177,11 @@ Module: :mod:`display`
 .. autofunction:: IPython.display.publish_display_data
 
 
+.. autofunction:: IPython.display.set_matplotlib_close
+
+
+.. autofunction:: IPython.display.set_matplotlib_formats
+
+
 .. autofunction:: IPython.display.update_display