##// END OF EJS Templates
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.

File last commit:

r3416:5fd0b6bb
r3416:5fd0b6bb
Show More
history.py
610 lines | 22.7 KiB | text/x-python | PythonLexer
vivainio
crlf normalization
r851 """ History related magics and functionality """
Fernando Perez
Created HistoryManager to better organize history control....
r3079 #-----------------------------------------------------------------------------
# Copyright (C) 2010 The IPython Development Team.
#
# Distributed under the terms of the BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import print_function
vivainio
crlf normalization
r851
fperez
Add -f flag to %history to direct output to file
r960 # Stdlib imports
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405 import datetime
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 import json
fperez
Add -f flag to %history to direct output to file
r960 import os
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 import re
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 import sqlite3
fperez
Add -f flag to %history to direct output to file
r960
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 from collections import defaultdict
Fernando Perez
Created HistoryManager to better organize history control....
r3079 # Our own packages
Thomas Kluyver
Make HistoryManager configurable.
r3393 from IPython.config.configurable import Configurable
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 import IPython.utils.io
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Thomas Kluyver
Skip doctests where necessary.
r3341 from IPython.testing import decorators as testdec
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 from IPython.utils.io import ask_yes_no
Thomas Kluyver
Make HistoryManager configurable.
r3393 from IPython.utils.traitlets import Bool, Dict, Instance, Int, List, Unicode
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.warn import warn
Fernando Perez
Created HistoryManager to better organize history control....
r3079
#-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
Thomas Kluyver
Make HistoryManager configurable.
r3393 class HistoryManager(Configurable):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """A class to organize all history-related functionality in one place.
"""
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # Public interface
# An instance of the IPython shell we are attached to
Thomas Kluyver
Make HistoryManager configurable.
r3393 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
# Lists to hold processed and raw history. These start with a blank entry
# so that we can index them starting from 1
input_hist_parsed = List([""])
input_hist_raw = List([""])
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # A list of directories visited during session
Thomas Kluyver
Make HistoryManager configurable.
r3393 dir_hist = List()
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # A dict of output history, keyed with ints from the shell's execution count
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 output_hist = Instance(defaultdict)
Thomas Kluyver
Make HistoryManager configurable.
r3393 # String holding the path to the history file
hist_file = Unicode()
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 # The SQLite database
Thomas Kluyver
Make HistoryManager configurable.
r3393 db = Instance(sqlite3.Connection)
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 # The number of the current session in the history database
Thomas Kluyver
Make HistoryManager configurable.
r3393 session_number = Int()
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # Should we log output to the database? (default no)
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_log_output = Bool(False, config=True)
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # Write to database every x commands (higher values save disk access & power)
# Values of 1 or less effectively disable caching.
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_cache_size = Int(0, config=True)
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # The input and output caches
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_input_cache = List()
db_output_cache = List()
Thomas Kluyver
Small changes as suggested by Fernando.
r3382
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # Private interface
# Variables used to store the three last inputs from the user. On each new
# history update, we populate the user's namespace with these, shifted as
# necessary.
_i00, _i, _ii, _iii = '','','',''
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
# A set with all forms of the exit command, so that we don't store them in
# the history (it's annoying to rewind the first entry and land on an exit
# call).
_exit_commands = None
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095
Thomas Kluyver
Make HistoryManager configurable.
r3393 def __init__(self, shell, config=None):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """Create a new history manager associated with a shell instance.
"""
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 # We need a pointer back to the shell for various tasks.
Thomas Kluyver
Make HistoryManager configurable.
r3393 super(HistoryManager, self).__init__(shell=shell, config=config)
Fernando Perez
Created HistoryManager to better organize history control....
r3079
# list of visited directories
try:
self.dir_hist = [os.getcwd()]
except OSError:
self.dir_hist = []
# Now the history file
if shell.profile:
histfname = 'history-%s' % shell.profile
else:
histfname = 'history'
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 self.hist_file = os.path.join(shell.ipython_dir, histfname + '.sqlite')
Thomas Kluyver
Make HistoryManager configurable.
r3393 self.init_db()
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405 self.new_session()
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 self._i00, self._i, self._ii, self._iii = '','','',''
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 self.output_hist = defaultdict(list)
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246 self._exit_commands = set(['Quit', 'quit', 'Exit', 'exit', '%Quit',
'%quit', '%Exit', '%exit'])
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 def init_db(self):
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405 """Connect to the database, and create tables if necessary."""
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 self.db = sqlite3.connect(self.hist_file)
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405 self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
primary key autoincrement, start timestamp,
end timestamp, num_cmds integer, remark text)""")
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db.execute("""CREATE TABLE IF NOT EXISTS history
(session integer, line integer, source text, source_raw text,
PRIMARY KEY (session, line))""")
# Output history is optional, but ensure the table's there so it can be
# enabled later.
self.db.execute("""CREATE TABLE IF NOT EXISTS output_history
(session integer, line integer, output text,
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 PRIMARY KEY (session, line))""")
self.db.commit()
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405 def new_session(self):
"""Get a new session number."""
with self.db:
cur = self.db.execute("""INSERT INTO sessions VALUES (NULL, ?, NULL,
NULL, "") """, (datetime.datetime.now(),))
self.session_number = cur.lastrowid
def end_session(self):
"""Close the database session, filling in the end time and line count."""
self.writeout_cache()
with self.db:
self.db.execute("""UPDATE sessions SET end=?, num_cmds=? WHERE
session==?""", (datetime.datetime.now(),
len(self.input_hist_parsed)-1, self.session_number))
self.session_number = 0
def name_session(self, name):
"""Give the current session a name in the history database."""
with self.db:
self.db.execute("UPDATE sessions SET remark=? WHERE session==?",
(name, self.session_number))
def reset(self, new_session=True):
"""Clear the session history, releasing all object references, and
optionally open a new session."""
if self.session_number:
self.end_session()
self.input_hist_parsed[:] = [""]
self.input_hist_raw[:] = [""]
self.output_hist.clear()
# The directory history can't be completely empty
self.dir_hist[:] = [os.getcwd()]
if new_session:
self.new_session()
## -------------------------------
## Methods for retrieving history:
## -------------------------------
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 def _get_hist_sql(self, sql, params, raw=True, output=False):
"""Prepares and runs an SQL query for the history database.
Parameters
----------
sql : str
Any filtering expressions to go after SELECT ... FROM ...
params : tuple
Parameters passed to the SQL query (to replace "?")
raw : bool
If True, get raw input.
Thomas Kluyver
Add missing type in docstring
r3402 output : bool
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 If True, include output where available.
Returns
-------
An iterator over 3-tuples: (session, line_number, command), or if output
is True, (session, line_number, (command, output)).
"""
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 toget = 'source_raw' if raw else 'source'
Thomas Kluyver
ipython-qtconsole now calls the right function.
r3397 sqlfrom = "history"
if output:
sqlfrom = "history LEFT JOIN output_history USING (session, line)"
toget = "history.%s, output_history.output" % toget
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 cur = self.db.execute("SELECT session, line, %s FROM %s " %\
(toget, sqlfrom) + sql, params)
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 if output: # Regroup into 3-tuples, and parse JSON
loads = lambda out: json.loads(out) if out else None
return ((ses, lin, (inp, loads(out))) \
for ses, lin, inp, out in cur)
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 return cur
def get_hist_tail(self, n=10, raw=True, output=False):
"""Get the last n lines from the history database."""
Thomas Kluyver
Flush cache before querying database.
r3403 self.writeout_cache()
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 cur = self._get_hist_sql("ORDER BY session DESC, line DESC LIMIT ?",
(n,), raw=raw, output=output)
return reversed(list(cur))
Satrajit Ghosh
History refactored and saved to json file...
r3240
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 def get_hist_search(self, pattern="*", raw=True, output=False):
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 """Search the database using unix glob-style matching (wildcards * and
?, escape using \).
Returns
-------
An iterator over tuples: (session, line_number, command)
"""
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 tosearch = "source_raw" if raw else "source"
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 if output:
tosearch = "history." + tosearch
Thomas Kluyver
Flush cache before querying database.
r3403 self.writeout_cache()
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 return self._get_hist_sql("WHERE %s GLOB ?" % tosearch, (pattern,),
raw=raw, output=output)
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394
def _get_hist_session(self, start=1, stop=None, raw=True, output=False):
"""Get input and output history from the current session. Called by
get_history, and takes similar parameters."""
input_hist = self.input_hist_raw if raw else self.input_hist_parsed
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
Fernando Perez
Created HistoryManager to better organize history control....
r3079 n = len(input_hist)
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 if start < 0:
start += n
if not stop:
stop = n
elif stop < 0:
stop += n
Fernando Perez
Created HistoryManager to better organize history control....
r3079 for i in range(start, stop):
if output:
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 output_item = [repr(x) for x in self.output_hist[i]]
line = (input_hist[i], output_item)
Fernando Perez
Created HistoryManager to better organize history control....
r3079 else:
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 line = input_hist[i]
yield (0, i, line)
def get_history(self, session=0, start=1, stop=None, raw=True,output=False):
"""Retrieve input by session.
Parameters
----------
session : int
Session number to retrieve. The current session is 0, and negative
numbers count back from current session, so -1 is previous session.
start : int
First line to retrieve.
stop : int
Thomas Kluyver
Passing IPython.core tests.
r3396 End of line range (excluded from output itself). If None, retrieve
to the end of the session.
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 raw : bool
If True, return untranslated input
output : bool
If True, attempt to include output. This will be 'real' Python
objects for the current session, or text reprs from previous
sessions if db_log_output was enabled at the time. Where no output
is found, None is used.
Returns
-------
An iterator over the desired lines. Each line is a 3-tuple, either
(session, line, input) if output is False, or
(session, line, (input, output)) if output is True.
"""
if session == 0 or session==self.session_number: # Current session
return self._get_hist_session(start, stop, raw, output)
if session < 0:
session += self.session_number
if stop:
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 lineclause = "line >= ? AND line < ?"
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 params = (session, start, stop)
else:
lineclause = "line>=?"
params = (session, start)
Thomas Kluyver
Simplify history retrieval code by moving query building and running into a common helper function.
r3401 return self._get_hist_sql("WHERE session==? AND %s""" % lineclause,
params, raw=raw, output=output)
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394
def get_hist_from_rangestr(self, rangestr, raw=True, output=False):
"""Get lines of history from a string of ranges, as used by magic
commands %hist, %save, %macro, etc."""
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 for sess, s, e in extract_hist_ranges(rangestr):
for line in self.get_history(sess, s, e, raw=raw, output=output):
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 yield line
Thomas Kluyver
Store history sessions in table with start and end time, number of commands, and name/remark.
r3405
## ----------------------------
## Methods for storing history:
## ----------------------------
Thomas Kluyver
Tidy up store_inputs
r3390 def store_inputs(self, line_num, source, source_raw=None):
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 """Store source and raw input in history and create input cache
variables _i*.
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 Parameters
----------
Thomas Kluyver
Tidy up store_inputs
r3390 line_num : int
The prompt number of this input.
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 source : str
Python input.
source_raw : str, optional
If given, this is the raw input without any IPython transformations
applied to it. If not given, ``source`` is used.
"""
if source_raw is None:
source_raw = source
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
# do not store exit/quit commands
if source_raw.strip() in self._exit_commands:
Satrajit Ghosh
removed quit/exit commands from history
r3243 return
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
Satrajit Ghosh
strip trailing \n for history lines
r3245 self.input_hist_parsed.append(source.rstrip())
self.input_hist_raw.append(source_raw.rstrip())
Thomas Kluyver
Tidy up store_inputs
r3390
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db_input_cache.append((self.session_number, line_num,
source, source_raw))
# Trigger to flush cache and write to DB.
if len(self.db_input_cache) >= self.db_cache_size:
self.writeout_cache()
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 # update the auto _i variables
self._iii = self._ii
self._ii = self._i
self._i = self._i00
self._i00 = source_raw
# hackish access to user namespace to create _i1,_i2... dynamically
Thomas Kluyver
Tidy up store_inputs
r3390 new_i = '_i%s' % line_num
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 to_main = {'_i': self._i,
'_ii': self._ii,
'_iii': self._iii,
new_i : self._i00 }
self.shell.user_ns.update(to_main)
Thomas Kluyver
Ability to cache commits before writing to disk, to save power.
r3389
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 def store_output(self, line_num):
if (not self.db_log_output) or not self.output_hist[line_num]:
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 return
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 output = json.dumps([repr(x) for x in self.output_hist[line_num]])
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 db_row = (self.session_number, line_num, output)
if self.db_cache_size > 1:
self.db_output_cache.append(db_row)
else:
with self.db:
self.db.execute("INSERT INTO output_history VALUES (?,?,?)", db_row)
Thomas Kluyver
Ability to cache commits before writing to disk, to save power.
r3389 def writeout_cache(self):
Thomas Kluyver
ipython-qtconsole now calls the right function.
r3397 #print(self.db_input_cache)
Thomas Kluyver
Ability to cache commits before writing to disk, to save power.
r3389 with self.db:
self.db.executemany("INSERT INTO history VALUES (?, ?, ?, ?)",
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db_input_cache)
self.db.executemany("INSERT INTO output_history VALUES (?, ?, ?)",
self.db_output_cache)
self.db_input_cache = []
self.db_output_cache = []
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087
Thomas Kluyver
Passing IPython.core tests.
r3396
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 # To match, e.g. ~5/8-~2/3
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 range_re = re.compile(r"""
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 ((?P<startsess>~?\d+)/)?
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 (?P<start>\d+) # Only the start line num is compulsory
((?P<sep>[\-:])
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 ((?P<endsess>~?\d+)/)?
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 (?P<end>\d+))?
""", re.VERBOSE)
def extract_hist_ranges(ranges_str):
"""Turn a string of history ranges into 3-tuples of (session, start, stop).
Examples
--------
Thomas Kluyver
Fix up extracting ranges from previous sessions, now using ~2/8 syntax instead of ~2#8
r3395 list(extract_input_ranges("~8/5-~7/4 2"))
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 [(-8, 5, None), (-7, 1, 4), (0, 2, 3)]
"""
for range_str in ranges_str.split():
rmatch = range_re.match(range_str)
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 if not rmatch:
continue
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 start = int(rmatch.group("start"))
end = rmatch.group("end")
end = int(end) if end else start+1 # If no end specified, get (a, a+1)
if rmatch.group("sep") == "-": # 1-3 == 1:4 --> [1, 2, 3]
end += 1
startsess = rmatch.group("startsess") or "0"
endsess = rmatch.group("endsess") or startsess
startsess = int(startsess.replace("~","-"))
endsess = int(endsess.replace("~","-"))
assert endsess >= startsess
if endsess == startsess:
yield (startsess, start, end)
continue
# Multiple sessions in one range:
yield (startsess, start, None)
for sess in range(startsess+1, endsess):
yield (sess, 1, None)
yield (endsess, 1, end)
def _format_lineno(session, line):
"""Helper function to format line numbers properly."""
if session == 0:
return str(line)
return "%s#%s" % (session, line)
vivainio
crlf normalization
r851
Thomas Kluyver
Skip doctests where necessary.
r3341 @testdec.skip_doctest
vivainio
crlf normalization
r851 def magic_history(self, parameter_s = ''):
"""Print input history (_i<n> variables), with most recent last.
%history -> print at most 40 inputs (some may be multi-line)\\
%history n -> print at most n inputs\\
%history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 By default, input history is printed without line numbers so it can be
directly pasted into an editor.
With -n, each input's number <n> is shown, and is accessible as the
automatically generated variable _i<n> as well as In[<n>]. Multi-line
statements are printed starting at a new line for easy copy/paste.
vivainio
crlf normalization
r851
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 Options:
vivainio
crlf normalization
r851
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 -n: print line numbers for each input.
vivainio
crlf normalization
r851 This feature is only available if numbered prompts are in use.
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 -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.
Fernando Perez
Change %history to default to 'raw' history.
r2899 -r: (default) print the 'raw' history, i.e. the actual commands you typed.
vivainio
crlf normalization
r851
Fernando Perez
Change %history to default to 'raw' history.
r2899 -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().magic("%cd /")' instead of '%cd /'.
vivainio
crlf normalization
r851
-g: treat the arg as a pattern to grep for in (full) history.
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 This includes the saved history (almost all commands ever written).
Use '%hist -g' to show full saved history (may be very long).
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394
-l: get the last n lines from all sessions. Specify n as a single arg, or
the default is the last 10 lines.
fperez
Forgot to commit docstring about this feature
r961
-f FILENAME: instead of printing the output to the screen, redirect it to
the given file. The file is always overwritten, though IPython asks for
confirmation first if it already exists.
Vishnu S G
Wrote example for %history...
r3326
Thomas Kluyver
Tweaks to RST formatting.
r3337 Examples
--------
Vishnu S G
Wrote example for %history...
r3326 ::
In [6]: %hist -n 4 6
4:a = 12
5:print a**2
vivainio
crlf normalization
r851 """
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 if not self.shell.displayhook.do_full_cache:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('This feature is only available if numbered prompts are in use.')
vivainio
crlf normalization
r851 return
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 opts,args = self.parse_options(parameter_s,'noprtglf:',mode='string')
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
# For brevity
history_manager = self.shell.history_manager
Thomas Kluyver
Fix various small bugs.
r3398
def _format_lineno(session, line):
"""Helper function to format line numbers properly."""
if session in (0, history_manager.session_number):
return str(line)
return "%s/%s" % (session, line)
fperez
Add -f flag to %history to direct output to file
r960
# Check if output to specific file was requested.
try:
outfname = opts['f']
except KeyError:
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 outfile = IPython.utils.io.Term.cout # default
fperez
Add -f flag to %history to direct output to file
r960 # We don't want to close stdout at the end!
close_at_end = False
else:
if os.path.exists(outfname):
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 if not ask_yes_no("File %r exists. Overwrite?" % outfname):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('Aborting.')
fperez
Add -f flag to %history to direct output to file
r960 return
vivainio
crlf normalization
r851
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 outfile = open(outfname,'w')
close_at_end = True
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
print_nums = 'n' in opts
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 get_output = 'o' in opts
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 pyprompts = 'p' in opts
# Raw history is the default
raw = not('t' in opts)
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762
vivainio
crlf normalization
r851 default_length = 40
pattern = None
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 if 'g' in opts: # Glob search
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 pattern = "*" + args + "*" if args else "*"
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 hist = history_manager.get_hist_search(pattern, raw=raw,
output=get_output)
elif 'l' in opts: # Get 'tail'
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 try:
n = int(args)
except ValueError, IndexError:
n = 10
Thomas Kluyver
ipython-qtconsole now calls the right function.
r3397 hist = history_manager.get_hist_tail(n, raw=raw, output=get_output)
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 else:
if args: # Get history by ranges
hist = history_manager.get_hist_from_rangestr(args, raw, get_output)
else: # Just get history for the current session
hist = history_manager.get_history(raw=raw, output=get_output)
vivainio
crlf normalization
r851
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 # We could be displaying the entire history, so let's not try to pull it
# into a list in memory. Anything that needs more space will just misalign.
width = 4
vivainio
crlf normalization
r851
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 for session, lineno, inline in hist:
Fernando Perez
Expand tabs to 4 spaces in %history.
r2970 # Print user history with tabs expanded to 4 spaces. The GUI clients
# use hard tabs for easier usability in auto-indented code, but we want
# to produce PEP-8 compliant history for safe pasting into an editor.
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 if get_output:
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 inline, output = inline
inline = inline.expandtabs(4).rstrip()
vivainio
crlf normalization
r851
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 multiline = "\n" in inline
Thomas Kluyver
Simplify magic_history display code, allow get_hist_search to include output in return values, and add some unit tests.
r3400 line_sep = '\n' if multiline else ' '
vivainio
crlf normalization
r851 if print_nums:
Thomas Kluyver
Fix various small bugs.
r3398 print('%s:%s' % (_format_lineno(session, lineno).rjust(width),
Thomas Kluyver
Passing IPython.core tests.
r3396 line_sep), file=outfile, end='')
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if pyprompts:
Thomas Kluyver
Simplifying code in several places.
r3381 print(">>> ", end="", file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if multiline:
Thomas Kluyver
Simplifying code in several places.
r3381 inline = "\n... ".join(inline.splitlines()) + "\n..."
print(inline, file=outfile)
Thomas Kluyver
Tidy up history retrieval APIs, and magic commands using them (%hist, %macro, %save, %edit)
r3394 if get_output and output:
Thomas Kluyver
Allow history to store multiple outputs for a single input line.
r3415 print("\n".join(output), file=outfile)
fperez
Add -f flag to %history to direct output to file
r960
if close_at_end:
outfile.close()
vivainio
crlf normalization
r851
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 def magic_rep(self, arg):
vivainio
crlf normalization
r851 r""" Repeat a command, or get command to input line for editing
- %rep (no arguments):
Place a string version of last computation result (stored in the special '_'
variable) to the next input prompt. Allows you to create elaborate command
lines without using copy-paste::
$ l = ["hei", "vaan"]
$ "".join(l)
==> heivaan
$ %rep
$ heivaan_ <== cursor blinking
%rep 45
Place history line 45 to next input prompt. Use %hist to find out the
number.
%rep 1-4 6-7 3
Repeat the specified lines immediately. Input slice syntax is the same as
in %macro and %save.
%rep foo
Place the most recent line that has the substring "foo" to next input.
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 (e.g. 'svn ci -m foobar').
vivainio
crlf normalization
r851 """
opts,args = self.parse_options(arg,'',mode='list')
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 if not args: # Last output
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 self.set_next_input(str(self.shell.user_ns["_"]))
vivainio
crlf normalization
r851 return
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 arg = " ".join(args)
histlines = self.history_manager.get_hist_from_rangestr(arg, raw=False)
histlines = [x[2] for x in histlines]
if len(histlines) > 1: # Execute immediately
histlines = "\n".join(histlines)
print("=== Executing: ===")
print(histlines)
print("=== Output: ===")
self.run_source(histlines, symbol="exec")
elif len(histlines) == 1: # Editable input
self.set_next_input(histlines[0].rstrip())
else: # Search for term - editable input
histlines = self.history_manager.get_hist_search("*"+arg+"*")
for h in reversed([x[2] for x in histlines]):
vivainio
crlf normalization
r851 if 'rep' in h:
continue
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 self.set_next_input(h.rstrip())
return
print("Not found in history:", arg)
vivainio
crlf normalization
r851
def init_ipython(ip):
Thomas Kluyver
Initial fix for magic %rep function (was broken by new history system). Needs a bit of further thought.
r3416 ip.define_magic("rep", magic_rep)
ip.define_magic("hist",magic_history) # Alternative name
Brian Granger
Continuing a massive refactor of everything.
r2205 ip.define_magic("history",magic_history)
vivainio
crlf normalization
r851
Fernando Perez
Fix %history magics....
r2421 # XXX - ipy_completers are in quarantine, need to be updated to new apis
#import ipy_completers
Fernando Perez
Progress towards getting the test suite in shape again....
r2392 #ipy_completers.quick_completer('%hist' ,'-g -t -r -n')