p2yq6ufca
/
monkeyking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ellisonbg-nb-bugfixes'

Browse Source 
- remove stable urls for notebooks that were causing nasty problems
with notebook renames.
- ctrl-enter now leaves input in place.
- add info messages to http errors
Fernando Perez 15 years ago
parent 706819d81c d1cfedaf16
commit 5eaf0061e3
5 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
IPython/frontend/html/notebook/handlers.py
Unescape View File

@ -53,7 +53,7 @@ class NamedNotebookHandler(web.RequestHandler):
def get(self, notebook_id):
nbm = self.application.notebook_manager
if not nbm.notebook_exists(notebook_id):
raise web.HTTPError(404)
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
self.render('notebook.html', notebook_id=notebook_id)
@ -311,7 +311,7 @@ class RSTHandler(web.RequestHandler):
def post(self):
if publish_string is None:
raise web.HTTPError(503)
raise web.HTTPError(503, u'docutils not available')
body = self.request.body.strip()
source = body
# template_path=os.path.join(os.path.dirname(__file__), u'templates', u'rst_template.html')
@ -326,7 +326,7 @@ class RSTHandler(web.RequestHandler):
settings_overrides=defaults
)
except:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Invalid RST')
print html
self.set_header('Content-Type', 'text/html')
self.finish(html)

27
IPython/frontend/html/notebook/kernelmanager.py
Unescape View File

@ -278,24 +278,20 @@ class MappingKernelManager(KernelManager):
def kill_kernel(self, kernel_id):
"""Kill a kernel and remove its notebook association."""
if kernel_id not in self:
raise web.HTTPError(404)
self._check_kernel_id(kernel_id)
super(MappingKernelManager, self).kill_kernel(kernel_id)
self.delete_mapping_for_kernel(kernel_id)
self.log.info("Kernel killed: %s" % kernel_id)
def interrupt_kernel(self, kernel_id):
"""Interrupt a kernel."""
if kernel_id not in self:
raise web.HTTPError(404)
self._check_kernel_id(kernel_id)
super(MappingKernelManager, self).interrupt_kernel(kernel_id)
self.log.info("Kernel interrupted: %s" % kernel_id)
def restart_kernel(self, kernel_id):
"""Restart a kernel while keeping clients connected."""
if kernel_id not in self:
raise web.HTTPError(404)
self._check_kernel_id(kernel_id)
# Get the notebook_id to preserve the kernel/notebook association.
notebook_id = self.notebook_for_kernel(kernel_id)
# Create the new kernel first so we can move the clients over.
@ -309,17 +305,22 @@ class MappingKernelManager(KernelManager):
return new_kernel_id
def create_iopub_stream(self, kernel_id):
if kernel_id not in self:
raise web.HTTPError(404)
"""Create a new iopub stream."""
self._check_kernel_id(kernel_id)
return super(MappingKernelManager, self).create_iopub_stream(kernel_id)
def create_shell_stream(self, kernel_id):
if kernel_id not in self:
raise web.HTTPError(404)
"""Create a new shell stream."""
self._check_kernel_id(kernel_id)
return super(MappingKernelManager, self).create_shell_stream(kernel_id)
def create_hb_stream(self, kernel_id):
if kernel_id not in self:
raise web.HTTPError(404)
"""Create a new hb stream."""
self._check_kernel_id(kernel_id)
return super(MappingKernelManager, self).create_hb_stream(kernel_id)
def _check_kernel_id(self, kernel_id):
"""Check a that a kernel_id exists and raise 404 if not."""
if kernel_id not in self:
raise web.HTTPError(404, u'Kernel does not exist: %s' % kernel_id)

39
IPython/frontend/html/notebook/notebookmanager.py
Unescape View File

@ -70,8 +70,17 @@ class NotebookManager(LoggingConfigurable):
def new_notebook_id(self, name):
"""Generate a new notebook_id for a name and store its mappings."""
notebook_id = unicode(uuid.uuid5(uuid.NAMESPACE_URL,
'file://'+self.get_path_by_name(name).encode('utf-8')))
# TODO: the following will give stable urls for notebooks, but unless
# the notebooks are immediately redirected to their new urls when their
# filemname changes, nasty inconsistencies result. So for now it's
# disabled and instead we use a random uuid4() call. But we leave the
# logic here so that we can later reactivate it, whhen the necessary
# url redirection code is written.
#notebook_id = unicode(uuid.uuid5(uuid.NAMESPACE_URL,
# 'file://'+self.get_path_by_name(name).encode('utf-8')))
notebook_id = unicode(uuid.uuid4())
self.mapping[notebook_id] = name
self.rev_mapping[name] = notebook_id
return notebook_id
@ -94,7 +103,7 @@ class NotebookManager(LoggingConfigurable):
try:
name = self.mapping[notebook_id]
except KeyError:
raise web.HTTPError(404)
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
return self.get_path_by_name(name)
def get_path_by_name(self, name):
@ -107,7 +116,7 @@ class NotebookManager(LoggingConfigurable):
"""Get the representation of a notebook in format by notebook_id."""
format = unicode(format)
if format not in self.allowed_formats:
raise web.HTTPError(415)
raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
last_modified, nb = self.get_notebook_object(notebook_id)
data = current.writes(nb, format)
name = nb.get('name','notebook')
@ -117,7 +126,7 @@ class NotebookManager(LoggingConfigurable):
"""Get the NotebookNode representation of a notebook by notebook_id."""
path = self.find_path(notebook_id)
if not os.path.isfile(path):
raise web.HTTPError(404)
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
info = os.stat(path)
last_modified = datetime.datetime.utcfromtimestamp(info.st_mtime)
with open(path,'r') as f:
@ -126,7 +135,7 @@ class NotebookManager(LoggingConfigurable):
# v1 and v2 and json in the .ipynb files.
nb = current.reads(s, u'json')
except:
raise web.HTTPError(404)
raise web.HTTPError(500, u'Unreadable JSON notebook.')
if 'name' not in nb:
nb.name = os.path.split(path)[-1].split(u'.')[0]
return last_modified, nb
@ -138,18 +147,18 @@ class NotebookManager(LoggingConfigurable):
and the value in the data is updated to use that value.
"""
if format not in self.allowed_formats:
raise web.HTTPError(415)
raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
try:
nb = current.reads(data, format)
except:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Invalid JSON data')
if name is None:
try:
name = nb.metadata.name
except AttributeError:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Missing notebook name')
nb.metadata.name = name
notebook_id = self.new_notebook_id(name)
@ -159,12 +168,12 @@ class NotebookManager(LoggingConfigurable):
def save_notebook(self, notebook_id, data, name=None, format=u'json'):
"""Save an existing notebook by notebook_id."""
if format not in self.allowed_formats:
raise web.HTTPError(415)
raise web.HTTPError(415, u'Invalid notebook format: %s' % format)
try:
nb = current.reads(data, format)
except:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Invalid JSON data')
if name is not None:
nb.metadata.name = name
@ -173,18 +182,18 @@ class NotebookManager(LoggingConfigurable):
def save_notebook_object(self, notebook_id, nb):
"""Save an existing notebook object by notebook_id."""
if notebook_id not in self.mapping:
raise web.HTTPError(404)
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
old_name = self.mapping[notebook_id]
try:
new_name = nb.metadata.name
except AttributeError:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Missing notebook name')
path = self.get_path_by_name(new_name)
try:
with open(path,'w') as f:
current.write(nb, f, u'json')
except:
raise web.HTTPError(400)
raise web.HTTPError(400, u'Unexpected error while saving notebook')
if old_name != new_name:
old_path = self.get_path_by_name(old_name)
if os.path.isfile(old_path):
@ -196,7 +205,7 @@ class NotebookManager(LoggingConfigurable):
"""Delete notebook by notebook_id."""
path = self.find_path(notebook_id)
if not os.path.isfile(path):
raise web.HTTPError(404)
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
os.unlink(path)
self.delete_notebook_id(notebook_id)

9
IPython/frontend/html/notebook/static/js/codecell.js
Unescape View File

@ -190,6 +190,15 @@ var IPython = (function (IPython) {
};
CodeCell.prototype.select_all = function () {
var start = {line: 0, ch: 0};
var nlines = this.code_mirror.lineCount();
var last_line = this.code_mirror.getLine(nlines-1);
var end = {line: nlines-1, ch: last_line.length};
this.code_mirror.setSelection(start, end);
};
CodeCell.prototype.append_output = function (json) {
this.expand();
if (json.output_type === 'pyout') {

2
IPython/frontend/html/notebook/static/js/notebook.js
Unescape View File

@ -776,7 +776,7 @@ var IPython = (function (IPython) {
cell.render();
}
if (default_options.terminal) {
cell.clear_input();
cell.select_all();
} else {
if ((cell_index === (that.ncells()-1)) && default_options.add_new) {
that.insert_code_cell_below();

Write Preview
Loading…
Cancel
Save