##// END OF EJS Templates
merge review fperez-execution-refactor
merge review fperez-execution-refactor

File last commit:

r3124:4e2d3af2
r3124:4e2d3af2
Show More
history.py
506 lines | 17.0 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
vivainio
crlf normalization
r851 import fnmatch
fperez
Add -f flag to %history to direct output to file
r960 import os
Fernando Perez
Created HistoryManager to better organize history control....
r3079 import sys
fperez
Add -f flag to %history to direct output to file
r960
Fernando Perez
Created HistoryManager to better organize history control....
r3079 # Our own packages
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
from IPython.core import ipapi
from IPython.core.inputlist import InputList
from IPython.utils.pickleshare import PickleShareDB
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 from IPython.utils.io import ask_yes_no
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
#-----------------------------------------------------------------------------
class HistoryManager(object):
"""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
shell = None
# An InputList instance to hold processed history
input_hist = None
# An InputList instance to hold raw history (as typed by user)
input_hist_raw = None
# A list of directories visited during session
dir_hist = None
# A dict of output history, keyed with ints from the shell's execution count
output_hist = None
# String with path to the history file
hist_file = None
# PickleShareDB instance holding the raw data for the shadow history
shadow_db = None
# ShadowHist instance with the actual shadow history
shadow_hist = None
# 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
Created HistoryManager to better organize history control....
r3079 def __init__(self, shell):
"""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.
Fernando Perez
Created HistoryManager to better organize history control....
r3079 self.shell = shell
# List of input with multi-line handling.
self.input_hist = InputList()
# This one will hold the 'raw' input history, without any
# pre-processing. This will allow users to retrieve the input just as
# it was exactly typed in by the user, with %hist -r.
self.input_hist_raw = InputList()
# list of visited directories
try:
self.dir_hist = [os.getcwd()]
except OSError:
self.dir_hist = []
# dict of output history
self.output_hist = {}
# Now the history file
if shell.profile:
histfname = 'history-%s' % shell.profile
else:
histfname = 'history'
self.hist_file = os.path.join(shell.ipython_dir, histfname)
# Objects related to shadow history management
self._init_shadow_hist()
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 self._i00, self._i, self._ii, self._iii = '','','',''
# Object is fully initialized, we can now call methods on it.
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 # Fill the history zero entry, user counter starts at 1
self.store_inputs('\n', '\n')
Fernando Perez
Created HistoryManager to better organize history control....
r3079 # For backwards compatibility, we must put these back in the shell
# object, until we've removed all direct uses of the history objects in
# the shell itself.
shell.input_hist = self.input_hist
shell.input_hist_raw = self.input_hist_raw
shell.output_hist = self.output_hist
shell.dir_hist = self.dir_hist
shell.histfile = self.hist_file
shell.shadowhist = self.shadow_hist
shell.db = self.shadow_db
def _init_shadow_hist(self):
try:
self.shadow_db = PickleShareDB(os.path.join(
self.shell.ipython_dir, 'db'))
except UnicodeDecodeError:
print("Your ipython_dir can't be decoded to unicode!")
print("Please set HOME environment variable to something that")
print(r"only has ASCII characters, e.g. c:\home")
print("Now it is", self.ipython_dir)
sys.exit()
self.shadow_hist = ShadowHist(self.shadow_db)
def save_hist(self):
"""Save input history to a file (via readline library)."""
try:
self.shell.readline.write_history_file(self.hist_file)
except:
print('Unable to save IPython command history to file: ' +
`self.hist_file`)
def reload_hist(self):
"""Reload the input history from disk file."""
try:
self.shell.readline.clear_history()
self.shell.readline.read_history_file(self.hist_file)
except AttributeError:
pass
def get_history(self, index=None, raw=False, output=True):
"""Get the history list.
Get the input and output history.
Parameters
----------
index : n or (n1, n2) or None
If n, then the last entries. If a tuple, then all in
range(n1, n2). If None, then all entries. Raises IndexError if
the format of index is incorrect.
raw : bool
If True, return the raw input.
output : bool
If True, then return the output as well.
Returns
-------
If output is True, then return a dict of tuples, keyed by the prompt
numbers and with values of (input, output). If output is False, then
a dict, keyed by the prompt number with the values of input. Raises
IndexError if no history is found.
"""
if raw:
input_hist = self.input_hist_raw
else:
input_hist = self.input_hist
if output:
output_hist = self.output_hist
n = len(input_hist)
if index is None:
start=0; stop=n
elif isinstance(index, int):
start=n-index; stop=n
elif isinstance(index, tuple) and len(index) == 2:
start=index[0]; stop=index[1]
else:
raise IndexError('Not a valid index for the input history: %r'
% index)
hist = {}
for i in range(start, stop):
if output:
hist[i] = (input_hist[i], output_hist.get(i))
else:
hist[i] = input_hist[i]
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 if not hist:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 raise IndexError('No history for range of indices: %r' % index)
return hist
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 def store_inputs(self, 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
----------
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
self.input_hist.append(source)
self.input_hist_raw.append(source_raw)
self.shadow_hist.add(source)
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
new_i = '_i%s' % self.shell.execution_count
to_main = {'_i': self._i,
'_ii': self._ii,
'_iii': self._iii,
new_i : self._i00 }
self.shell.user_ns.update(to_main)
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 def sync_inputs(self):
"""Ensure raw and translated histories have same length."""
if len(self.input_hist) != len (self.input_hist_raw):
self.input_hist_raw = InputList(self.input_hist)
def reset(self):
"""Clear all histories managed by this object."""
self.input_hist[:] = []
self.input_hist_raw[:] = []
self.output_hist.clear()
# The directory history can't be completely empty
self.dir_hist[:] = [os.getcwd()]
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.
This includes the "shadow history" (almost all commands ever written).
Use '%hist -g' to show full shadow history (may be very long).
In shadow history, every index nuwber starts with 0.
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.
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
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 opts,args = self.parse_options(parameter_s,'gnoptsrf:',mode='list')
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
if 't' in opts:
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 input_hist = self.shell.input_hist
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 elif 'r' in opts:
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 input_hist = self.shell.input_hist_raw
vivainio
crlf normalization
r851 else:
Fernando Perez
Change %history to default to 'raw' history.
r2899 # Raw history is the default
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 input_hist = self.shell.input_hist_raw
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762
vivainio
crlf normalization
r851 default_length = 40
pattern = None
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 if 'g' in opts:
vivainio
crlf normalization
r851 init = 1
final = len(input_hist)
Fernando Perez
Fix %history to stop printing last line....
r2474 parts = parameter_s.split(None, 1)
vivainio
crlf normalization
r851 if len(parts) == 1:
parts += '*'
head, pattern = parts
pattern = "*" + pattern + "*"
elif len(args) == 0:
Fernando Perez
Fix %history to stop printing last line....
r2474 final = len(input_hist)-1
vivainio
crlf normalization
r851 init = max(1,final-default_length)
elif len(args) == 1:
final = len(input_hist)
Fernando Perez
Fix %history to stop printing last line....
r2474 init = max(1, final-int(args[0]))
vivainio
crlf normalization
r851 elif len(args) == 2:
Fernando Perez
Fix %history to stop printing last line....
r2474 init, final = map(int, args)
vivainio
crlf normalization
r851 else:
warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print(self.magic_hist.__doc__, file=IPython.utils.io.Term.cout)
vivainio
crlf normalization
r851 return
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441
vivainio
crlf normalization
r851 width = len(str(final))
line_sep = ['','\n']
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 print_nums = 'n' in opts
print_outputs = 'o' in opts
pyprompts = 'p' in opts
vivainio
crlf normalization
r851
found = False
if pattern is not None:
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 sh = self.shell.shadowhist.all()
vivainio
crlf normalization
r851 for idx, s in sh:
if fnmatch.fnmatch(s, pattern):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("0%d: %s" %(idx, s.expandtabs(4)), file=outfile)
vivainio
crlf normalization
r851 found = True
if found:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("===", file=outfile)
print("shadow history ends, fetch by %rep <number> (must start with 0)",
file=outfile)
print("=== start of normal history ===", file=outfile)
vivainio
crlf normalization
r851
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 for in_num in range(init, final):
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.
inline = input_hist[in_num].expandtabs(4)
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993
vivainio
crlf normalization
r851 if pattern is not None and not fnmatch.fnmatch(inline, pattern):
continue
multiline = int(inline.count('\n') > 1)
if print_nums:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('%s:%s' % (str(in_num).ljust(width), line_sep[multiline]),
file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if pyprompts:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('>>>', file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if multiline:
lines = inline.splitlines()
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('\n... '.join(lines), file=outfile)
print('... ', file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 else:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print(inline, end='', file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 else:
MinRK
merge review fperez-execution-refactor
r3124 print(inline, end='', file=outfile)
Fernando Perez
Fix %history to stop printing last line....
r2474 if print_outputs:
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 output = self.shell.output_hist.get(in_num)
Fernando Perez
Fix %history to stop printing last line....
r2474 if output is not None:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print(repr(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
def magic_hist(self, parameter_s=''):
"""Alternate name for %history."""
return self.magic_history(parameter_s)
def rep_f(self, arg):
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')
if not args:
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
if len(args) == 1 and not '-' in args[0]:
arg = args[0]
if len(arg) > 1 and arg.startswith('0'):
# get from shadow hist
num = int(arg[1:])
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 line = self.shell.shadowhist.get(num)
Brian Granger
Continuing a massive refactor of everything.
r2205 self.set_next_input(str(line))
vivainio
crlf normalization
r851 return
try:
num = int(args[0])
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 self.set_next_input(str(self.shell.input_hist_raw[num]).rstrip())
vivainio
crlf normalization
r851 return
except ValueError:
pass
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 for h in reversed(self.shell.input_hist_raw):
vivainio
crlf normalization
r851 if 'rep' in h:
continue
if fnmatch.fnmatch(h,'*' + arg + '*'):
Brian Granger
Continuing a massive refactor of everything.
r2205 self.set_next_input(str(h).rstrip())
vivainio
crlf normalization
r851 return
try:
lines = self.extract_input_slices(args, True)
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("lines", lines)
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 self.run_cell(lines)
vivainio
crlf normalization
r851 except ValueError:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("Not found in recent history:", args)
vivainio
crlf normalization
r851
_sentinel = object()
Brian Granger
Continuing a massive refactor of everything.
r2205 class ShadowHist(object):
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 def __init__(self, db):
vivainio
crlf normalization
r851 # cmd => idx mapping
self.curidx = 0
self.db = db
Ville M. Vainio
disable shadow history on file system failure
r1686 self.disabled = False
vivainio
crlf normalization
r851
def inc_idx(self):
idx = self.db.get('shadowhist_idx', 1)
self.db['shadowhist_idx'] = idx + 1
return idx
def add(self, ent):
Ville M. Vainio
disable shadow history on file system failure
r1686 if self.disabled:
vivainio
crlf normalization
r851 return
Ville M. Vainio
disable shadow history on file system failure
r1686 try:
old = self.db.hget('shadowhist', ent, _sentinel)
if old is not _sentinel:
return
newidx = self.inc_idx()
Fernando Perez
Created HistoryManager to better organize history control....
r3079 #print("new", newidx) # dbg
Ville M. Vainio
disable shadow history on file system failure
r1686 self.db.hset('shadowhist',ent, newidx)
except:
Brian Granger
Continuing a massive refactor of everything.
r2205 ipapi.get().showtraceback()
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("WARNING: disabling shadow history")
Ville M. Vainio
disable shadow history on file system failure
r1686 self.disabled = True
vivainio
crlf normalization
r851
def all(self):
d = self.db.hdict('shadowhist')
Thomas Kluyver
Replacing some .items() calls with .iteritems() for cleaner conversion with 2to3.
r3114 items = [(i,s) for (s,i) in d.iteritems()]
vivainio
crlf normalization
r851 items.sort()
return items
def get(self, idx):
all = self.all()
for k, v in all:
if k == idx:
return v
def init_ipython(ip):
Brian Granger
Continuing a massive refactor of everything.
r2205 ip.define_magic("rep",rep_f)
ip.define_magic("hist",magic_hist)
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')