##// END OF EJS Templates
First step in reintegrating Jedi...
First step in reintegrating Jedi If Jedi is installed expose a private API use it with prompt toolkit. Jedi does not _yet_ provide all the completion IPython has, so this is still a bit awkward. In order to debug this (and see what is Jedi provided we for now inject a fake Jedi/IPython delimiter in the menu. Jedi completion and this behavior are enabled by default, but could likely be opt-in. Add also a number of debug flags to be able to track why jedi is not working, and/or what completions are found by IPython and not Jedi. That should give us a bit of heads up and feedback to know whether we can remove part of the IPython completer, and more especially if we can drop `python_matches`. Once `python_matches` is dropped and some other of the current matchers are either dropped or converted to the new API, that should simplify the internal quite a bit. That would just be too much for an already BIG pull-request.

File last commit:

r22963:2961b531
r23284:3ff1be2e
Show More
historyapp.py
161 lines | 5.8 KiB | text/x-python | PythonLexer
Thomas Kluyver
Add command to trim the history database.
r9723 # encoding: utf-8
"""
An application for managing IPython history.
To be invoked as the `ipython history` subcommand.
"""
import os
import sqlite3
Min RK
update dependency imports...
r21253 from traitlets.config.application import Application
Thomas Kluyver
Add command to trim the history database.
r9723 from IPython.core.application import BaseIPythonApplication
Min RK
update dependency imports...
r21253 from traitlets import Bool, Int, Dict
Paul Ivanov
`ipython history clear` subcommand
r13612 from IPython.utils.io import ask_yes_no
Thomas Kluyver
Add command to trim the history database.
r9723
trim_hist_help = """Trim the IPython history database to the last 1000 entries.
This actually copies the last 1000 entries to a new database, and then replaces
Paul Ivanov
add note about the 1000 / --keep variable
r13607 the old file with the new. Use the `--keep=` argument to specify a number
other than 1000.
Thomas Kluyver
Add command to trim the history database.
r9723 """
Paul Ivanov
`ipython history clear` subcommand
r13612 clear_hist_help = """Clear the IPython history database, deleting all entries.
Because this is a destructive operation, IPython will prompt the user if they
really want to do this. Passing a `-f` flag will force clearing without a
prompt.
This is an handy alias to `ipython history trim --keep=0`
"""
Thomas Kluyver
Add command to trim the history database.
r9723 class HistoryTrim(BaseIPythonApplication):
description = trim_hist_help
Matthias Bussonnier
Fix Traitlets API 42. Help is in constructor, not tag.
r22337 backup = Bool(False,
help="Keep the old history file as history.sqlite.<N>"
).tag(config=True)
Thomas Kluyver
Add command to trim the history database.
r9723
Matthias Bussonnier
Fix Traitlets API 42. Help is in constructor, not tag.
r22337 keep = Int(1000,
help="Number of recent lines to keep in the database."
).tag(config=True)
Thomas Kluyver
Add command to trim the history database.
r9723
flags = Dict(dict(
backup = ({'HistoryTrim' : {'backup' : True}},
Matthias Bussonnier
Update IPython/core/historyapp.py to use the new traitlets API.
r22328 backup.help
Thomas Kluyver
Add command to trim the history database.
r9723 )
))
Paul Ivanov
add --keep alias for history trim
r13601
aliases=Dict(dict(
keep = 'HistoryTrim.keep'
))
Thomas Kluyver
Add command to trim the history database.
r9723
def start(self):
profile_dir = self.profile_dir.location
hist_file = os.path.join(profile_dir, 'history.sqlite')
con = sqlite3.connect(hist_file)
# Grab the recent history from the current database.
inputs = list(con.execute('SELECT session, line, source, source_raw FROM '
'history ORDER BY session DESC, line DESC LIMIT ?', (self.keep+1,)))
if len(inputs) <= self.keep:
print("There are already at most %d entries in the history database." % self.keep)
Paul Ivanov
add --keep alias for history trim
r13601 print("Not doing anything. Use --keep= argument to keep fewer entries")
Thomas Kluyver
Add command to trim the history database.
r9723 return
print("Trimming history to the most recent %d entries." % self.keep)
inputs.pop() # Remove the extra element we got to check the length.
inputs.reverse()
Paul Ivanov
allow trimming to an empty database (--keep=0)
r13611 if inputs:
first_session = inputs[0][0]
outputs = list(con.execute('SELECT session, line, output FROM '
'output_history WHERE session >= ?', (first_session,)))
sessions = list(con.execute('SELECT session, start, end, num_cmds, remark FROM '
'sessions WHERE session >= ?', (first_session,)))
Thomas Kluyver
Add command to trim the history database.
r9723 con.close()
# Create the new history database.
new_hist_file = os.path.join(profile_dir, 'history.sqlite.new')
i = 0
while os.path.exists(new_hist_file):
# Make sure we don't interfere with an existing file.
i += 1
new_hist_file = os.path.join(profile_dir, 'history.sqlite.new'+str(i))
new_db = sqlite3.connect(new_hist_file)
new_db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
primary key autoincrement, start timestamp,
end timestamp, num_cmds integer, remark text)""")
new_db.execute("""CREATE TABLE IF NOT EXISTS history
(session integer, line integer, source text, source_raw text,
PRIMARY KEY (session, line))""")
new_db.execute("""CREATE TABLE IF NOT EXISTS output_history
(session integer, line integer, output text,
PRIMARY KEY (session, line))""")
new_db.commit()
Paul Ivanov
allow trimming to an empty database (--keep=0)
r13611 if inputs:
with new_db:
# Add the recent history into the new database.
new_db.executemany('insert into sessions values (?,?,?,?,?)', sessions)
new_db.executemany('insert into history values (?,?,?,?)', inputs)
new_db.executemany('insert into output_history values (?,?,?)', outputs)
Thomas Kluyver
Add command to trim the history database.
r9723 new_db.close()
if self.backup:
i = 1
backup_hist_file = os.path.join(profile_dir, 'history.sqlite.old.%d' % i)
while os.path.exists(backup_hist_file):
i += 1
backup_hist_file = os.path.join(profile_dir, 'history.sqlite.old.%d' % i)
os.rename(hist_file, backup_hist_file)
print("Backed up longer history file to", backup_hist_file)
else:
os.remove(hist_file)
os.rename(new_hist_file, hist_file)
Paul Ivanov
`ipython history clear` subcommand
r13612 class HistoryClear(HistoryTrim):
description = clear_hist_help
Matthias Bussonnier
Fix Traitlets API 42. Help is in constructor, not tag.
r22337 keep = Int(0,
Paul Ivanov
`ipython history clear` subcommand
r13612 help="Number of recent lines to keep in the database.")
Matthias Bussonnier
Fix Traitlets API 42. Help is in constructor, not tag.
r22337 force = Bool(False,
help="Don't prompt user for confirmation"
).tag(config=True)
Paul Ivanov
`ipython history clear` subcommand
r13612
flags = Dict(dict(
force = ({'HistoryClear' : {'force' : True}},
Matthias Bussonnier
Update IPython/core/historyapp.py to use the new traitlets API.
r22328 force.help),
Paul Ivanov
`ipython history clear` subcommand
r13612 f = ({'HistoryTrim' : {'force' : True}},
Matthias Bussonnier
Update IPython/core/historyapp.py to use the new traitlets API.
r22328 force.help
Paul Ivanov
`ipython history clear` subcommand
r13612 )
))
aliases = Dict()
def start(self):
if self.force or ask_yes_no("Really delete all ipython history? ",
default="no", interrupt="no"):
HistoryTrim.start(self)
Thomas Kluyver
Add command to trim the history database.
r9723
class HistoryApp(Application):
name = u'ipython-history'
description = "Manage the IPython history database."
subcommands = Dict(dict(
trim = (HistoryTrim, HistoryTrim.description.splitlines()[0]),
Paul Ivanov
`ipython history clear` subcommand
r13612 clear = (HistoryClear, HistoryClear.description.splitlines()[0]),
Thomas Kluyver
Add command to trim the history database.
r9723 ))
def start(self):
if self.subapp is None:
print("No subcommand specified. Must specify one of: %s" % \
(self.subcommands.keys()))
print()
self.print_description()
self.print_subcommands()
self.exit(1)
else:
return self.subapp.start()