##// END OF EJS Templates
update payload source...
update payload source should be simple key, not Python (or worse, IPython) specific long key. I could have sworn I did this long ago, but apparently the source key was only updated in display_data, not execute_reply.

File last commit:

r10466:b3181118
r11839:8cbae575
Show More
nbbase.py
215 lines | 6.7 KiB | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """The basic dict based notebook format.
Bernardo B. Marques
remove all trailling spaces
r4872 The Python representation of a notebook is a nested structure of
Brian E. Granger
More review changes....
r4609 dictionary subclasses that support attribute access
(IPython.utils.ipstruct.Struct). The functions in this module are merely
helpers to build the structs in the right form.
Authors:
* Brian Granger
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian E. Granger
Adding nbformat subpackage.
r4392
Brian E. Granger
Initial draft of more formal notebook format....
r4401 import pprint
Brian E. Granger
Adding nbformat subpackage.
r4392 import uuid
Brian E. Granger
Initial draft of more formal notebook format....
r4401 from IPython.utils.ipstruct import Struct
Brian E. Granger
More review changes....
r4609 #-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian E. Granger
Initial draft of more formal notebook format....
r4401
Brian Granger
Fixing minor issues with nbformat....
r6048 # Change this when incrementing the nbformat version
MinRK
add nbformat_minor for minor revisions to nbformat
r7545 nbformat = 3
nbformat_minor = 0
Brian Granger
Fixing minor issues with nbformat....
r6048
Brian E. Granger
Initial draft of more formal notebook format....
r4401 class NotebookNode(Struct):
pass
Brian E. Granger
Adding nbformat subpackage.
r4392
Brian E. Granger
Full versioning added to nbformat.
r4406 def from_dict(d):
if isinstance(d, dict):
newd = NotebookNode()
for k,v in d.items():
newd[k] = from_dict(v)
return newd
elif isinstance(d, (tuple, list)):
return [from_dict(i) for i in d]
else:
return d
Brian E. Granger
Updates to basic notebook format....
r4402 def new_output(output_type=None, output_text=None, output_png=None,
Bernardo B. Marques
remove all trailling spaces
r4872 output_html=None, output_svg=None, output_latex=None, output_json=None,
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 output_javascript=None, output_jpeg=None, prompt_number=None,
MinRK
add metadata to nbformat Python API
r10466 ename=None, evalue=None, traceback=None, stream=None, metadata=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a new code cell with input and output"""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 output = NotebookNode()
Brian E. Granger
Updates to basic notebook format....
r4402 if output_type is not None:
output.output_type = unicode(output_type)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540
MinRK
add metadata to nbformat Python API
r10466 if metadata is None:
metadata = {}
if not isinstance(metadata, dict):
raise TypeError("metadata must be dict")
output.metadata = metadata
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if output_type != 'pyerr':
if output_text is not None:
output.text = unicode(output_text)
if output_png is not None:
output.png = bytes(output_png)
if output_jpeg is not None:
output.jpeg = bytes(output_jpeg)
if output_html is not None:
output.html = unicode(output_html)
if output_svg is not None:
output.svg = unicode(output_svg)
if output_latex is not None:
output.latex = unicode(output_latex)
if output_json is not None:
output.json = unicode(output_json)
if output_javascript is not None:
output.javascript = unicode(output_javascript)
if output_type == u'pyout':
if prompt_number is not None:
output.prompt_number = int(prompt_number)
if output_type == u'pyerr':
Maxim Grechkin
Notebook actually gets and holds ename, not etype
r10233 if ename is not None:
output.ename = unicode(ename)
Brian E. Granger
Adding tracebacks, evalue and etype to the nbformat and notebook.
r4540 if evalue is not None:
output.evalue = unicode(evalue)
if traceback is not None:
output.traceback = [unicode(frame) for frame in list(traceback)]
Paul Ivanov
adding stream kwarg to current.new_output...
r10183 if output_type == u'stream':
output.stream = 'stdout' if stream is None else unicode(stream)
MinRK
add metadata to nbformat Python API
r10466
Brian E. Granger
Updates to basic notebook format....
r4402 return output
Brian E. Granger
Adding nbformat subpackage.
r4392
Brian E. Granger
Added collapsed field to the code cell.
r4533 def new_code_cell(input=None, prompt_number=None, outputs=None,
MinRK
add empty metadata field on cells/worksheets...
r7523 language=u'python', collapsed=False, metadata=None):
Brian E. Granger
Updates to basic notebook format....
r4402 """Create a new code cell with input and output"""
cell = NotebookNode()
cell.cell_type = u'code'
if language is not None:
cell.language = unicode(language)
if input is not None:
cell.input = unicode(input)
if prompt_number is not None:
cell.prompt_number = int(prompt_number)
if outputs is None:
cell.outputs = []
else:
cell.outputs = outputs
Brian E. Granger
Added collapsed field to the code cell.
r4533 if collapsed is not None:
Brian E. Granger
New .py notebook format implemented.
r4536 cell.collapsed = bool(collapsed)
MinRK
add empty metadata field on cells/worksheets...
r7523 cell.metadata = NotebookNode(metadata or {})
Brian E. Granger
Updates to basic notebook format....
r4402
return cell
MinRK
add empty metadata field on cells/worksheets...
r7523 def new_text_cell(cell_type, source=None, rendered=None, metadata=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a new text cell."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 cell = NotebookNode()
MinRK
add VERSIONHACK markers for never-released plaintext handling
r6477 # VERSIONHACK: plaintext -> raw
# handle never-released plaintext name for raw cells
MinRK
interpret 'plaintext' cells with their new name 'raw'
r6255 if cell_type == 'plaintext':
cell_type = 'raw'
Brian E. Granger
Starting to rename text cell to html cell.
r4498 if source is not None:
cell.source = unicode(source)
Brian E. Granger
Markdown cells are now saved and restored in notebooks.
r4511 if rendered is not None:
cell.rendered = unicode(rendered)
MinRK
add empty metadata field on cells/worksheets...
r7523 cell.metadata = NotebookNode(metadata or {})
Brian E. Granger
Markdown cells are now saved and restored in notebooks.
r4511 cell.cell_type = cell_type
Brian E. Granger
Adding nbformat subpackage.
r4392 return cell
MinRK
add empty metadata field on cells/worksheets...
r7523 def new_heading_cell(source=None, rendered=None, level=1, metadata=None):
Brian Granger
Adding rst and heading cells to the notebook format.
r6016 """Create a new section cell with a given integer level."""
cell = NotebookNode()
cell.cell_type = u'heading'
if source is not None:
cell.source = unicode(source)
Brian Granger
Minor changes to heading cell in nbformat.
r6020 if rendered is not None:
cell.rendered = unicode(rendered)
Brian Granger
Adding rst and heading cells to the notebook format.
r6016 cell.level = int(level)
MinRK
add empty metadata field on cells/worksheets...
r7523 cell.metadata = NotebookNode(metadata or {})
Brian Granger
Adding rst and heading cells to the notebook format.
r6016 return cell
MinRK
add empty metadata field on cells/worksheets...
r7523 def new_worksheet(name=None, cells=None, metadata=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a worksheet by name with with a list of cells."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws = NotebookNode()
Brian E. Granger
Adding nbformat subpackage.
r4392 if name is not None:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws.name = unicode(name)
Brian E. Granger
Adding nbformat subpackage.
r4392 if cells is None:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws.cells = []
Brian E. Granger
Adding nbformat subpackage.
r4392 else:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 ws.cells = list(cells)
MinRK
add empty metadata field on cells/worksheets...
r7523 ws.metadata = NotebookNode(metadata or {})
Brian E. Granger
Adding nbformat subpackage.
r4392 return ws
MinRK
allow name as kwarg to new_notebook...
r6207 def new_notebook(name=None, metadata=None, worksheets=None):
Brian E. Granger
Adding nbformat subpackage.
r4392 """Create a notebook by name, id and a list of worksheets."""
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb = NotebookNode()
Brian Granger
Fixing minor issues with nbformat....
r6048 nb.nbformat = nbformat
MinRK
add nbformat_minor for minor revisions to nbformat
r7545 nb.nbformat_minor = nbformat_minor
Brian E. Granger
Adding nbformat subpackage.
r4392 if worksheets is None:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb.worksheets = []
Brian E. Granger
Adding nbformat subpackage.
r4392 else:
Brian E. Granger
Initial draft of more formal notebook format....
r4401 nb.worksheets = list(worksheets)
Brian E. Granger
Implemented metadata for notebook format.
r4637 if metadata is None:
nb.metadata = new_metadata()
else:
nb.metadata = NotebookNode(metadata)
MinRK
allow name as kwarg to new_notebook...
r6207 if name is not None:
nb.metadata.name = unicode(name)
Brian E. Granger
Implemented metadata for notebook format.
r4637 return nb
def new_metadata(name=None, authors=None, license=None, created=None,
modified=None, gistid=None):
"""Create a new metadata node."""
metadata = NotebookNode()
if name is not None:
metadata.name = unicode(name)
if authors is not None:
metadata.authors = list(authors)
Brian E. Granger
New .py notebook format implemented.
r4536 if created is not None:
Brian E. Granger
Implemented metadata for notebook format.
r4637 metadata.created = unicode(created)
if modified is not None:
metadata.modified = unicode(modified)
Brian E. Granger
New .py notebook format implemented.
r4536 if license is not None:
Brian E. Granger
Implemented metadata for notebook format.
r4637 metadata.license = unicode(license)
if gistid is not None:
metadata.gistid = unicode(gistid)
return metadata
def new_author(name=None, email=None, affiliation=None, url=None):
"""Create a new author."""
author = NotebookNode()
if name is not None:
author.name = unicode(name)
if email is not None:
author.email = unicode(email)
if affiliation is not None:
author.affiliation = unicode(affiliation)
if url is not None:
author.url = unicode(url)
return author
Brian E. Granger
Adding nbformat subpackage.
r4392