Going back to using uuid.uuid4() for notebook ids.

We were having problems with notebook renaming when using uuid5,
as there are many places in the code where we assume that the
notebook id is unique and unchanging as long as the notebook
server runs.

IPython/frontend/html/notebook/notebookmanager.py

@@ -1,219 +1,218
 """A notebook manager that uses the local file system for storage.
 
 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
 #-----------------------------------------------------------------------------
 
 import datetime
 import os
 import uuid
 import glob
 
 from tornado import web
 
 from IPython.config.configurable import LoggingConfigurable
 from IPython.nbformat import current
 from IPython.utils.traitlets import Unicode, List, Dict
 
 
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
 
 
 class NotebookManager(LoggingConfigurable):
 
     notebook_dir = Unicode(os.getcwd(), config=True, help="""
         The directory to use for notebooks.
     """)
     filename_ext = Unicode(u'.ipynb')
     allowed_formats = List([u'json',u'py'])
 
     # Map notebook_ids to notebook names
     mapping = Dict()
     # Map notebook names to notebook_ids
     rev_mapping = Dict()
 
     def list_notebooks(self):
         """List all notebooks in the notebook dir.
 
         This returns a list of dicts of the form::
 
             dict(notebook_id=notebook,name=name)
         """
         names = glob.glob(os.path.join(self.notebook_dir,
                                        '*' + self.filename_ext))
         names = [os.path.splitext(os.path.basename(name))[0]
                  for name in names]
 
         data = []
         for name in names:
             if name not in self.rev_mapping:
                 notebook_id = self.new_notebook_id(name)
             else:
                 notebook_id = self.rev_mapping[name]
             data.append(dict(notebook_id=notebook_id,name=name))
         data = sorted(data, key=lambda item: item['name'])
         return data
 
     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')))
+        notebook_id = unicode(uuid.uuid4())
         self.mapping[notebook_id] = name
         self.rev_mapping[name] = notebook_id
         return notebook_id
 
     def delete_notebook_id(self, notebook_id):
         """Delete a notebook's id only. This doesn't delete the actual notebook."""
         name = self.mapping[notebook_id]
         del self.mapping[notebook_id]
         del self.rev_mapping[name]
 
     def notebook_exists(self, notebook_id):
         """Does a notebook exist?"""
         if notebook_id not in self.mapping:
             return False
         path = self.get_path_by_name(self.mapping[notebook_id])
         return os.path.isfile(path)
 
     def find_path(self, notebook_id):
         """Return a full path to a notebook given its notebook_id."""
         try:
             name = self.mapping[notebook_id]
         except KeyError:
             raise web.HTTPError(404)
         return self.get_path_by_name(name)
 
     def get_path_by_name(self, name):
         """Return a full path to a notebook given its name."""
         filename = name + self.filename_ext
         path = os.path.join(self.notebook_dir, filename)
         return path       
 
     def get_notebook(self, notebook_id, format=u'json'):
         """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)
         last_modified, nb = self.get_notebook_object(notebook_id)
         data = current.writes(nb, format)
         name = nb.get('name','notebook')
         return last_modified, name, data
 
     def get_notebook_object(self, notebook_id):
         """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)
         info = os.stat(path)
         last_modified = datetime.datetime.utcfromtimestamp(info.st_mtime)
         with open(path,'r') as f:
             s = f.read()
             try:
                 # v1 and v2 and json in the .ipynb files.
                 nb = current.reads(s, u'json')
             except:
                 raise web.HTTPError(404)
         if 'name' not in nb:
             nb.name = os.path.split(path)[-1].split(u'.')[0]
         return last_modified, nb
 
     def save_new_notebook(self, data, name=None, format=u'json'):
         """Save a new notebook and return its notebook_id.
 
         If a name is passed in, it overrides any values in the notebook data
         and the value in the data is updated to use that value.
         """
         if format not in self.allowed_formats:
             raise web.HTTPError(415)
 
         try:
             nb = current.reads(data, format)
         except:
             raise web.HTTPError(400)
 
         if name is None:
             try:
                 name = nb.metadata.name
             except AttributeError:
                 raise web.HTTPError(400)
         nb.metadata.name = name
 
         notebook_id = self.new_notebook_id(name)
         self.save_notebook_object(notebook_id, nb)
         return notebook_id
 
     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)
 
         try:
             nb = current.reads(data, format)
         except:
             raise web.HTTPError(400)
 
         if name is not None:
             nb.metadata.name = name
         self.save_notebook_object(notebook_id, nb)
 
     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)
         old_name = self.mapping[notebook_id]
         try:
             new_name = nb.metadata.name
         except AttributeError:
             raise web.HTTPError(400)
         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)
         if old_name != new_name:
             old_path = self.get_path_by_name(old_name)
             if os.path.isfile(old_path):
                 os.unlink(old_path)
             self.mapping[notebook_id] = new_name
             self.rev_mapping[new_name] = notebook_id
 
     def delete_notebook(self, notebook_id):
         """Delete notebook by notebook_id."""
         path = self.find_path(notebook_id)
         if not os.path.isfile(path):
             raise web.HTTPError(404)
         os.unlink(path)
         self.delete_notebook_id(notebook_id)
 
     def new_notebook(self):
         """Create a new notebook and returns its notebook_id."""
         i = 0
         while True:
             name = u'Untitled%i' % i
             path = self.get_path_by_name(name)
             if not os.path.isfile(path):
                 break
             else:
                 i = i+1
         notebook_id = self.new_notebook_id(name)
         metadata = current.new_metadata(name=name)
         nb = current.new_notebook(metadata=metadata)
         with open(path,'w') as f:
             current.write(nb, f, u'json')
         return notebook_id
 

docs/source/interactive/htmlnotebook.txt

@@ -1,203 +1,202
 .. _htmlnotebook:
 
 =========================
 An HTML Notebook IPython
 =========================
 
 The IPython Notebook consists of two related components:
 
-* An XML/JSON based Notebook document format for recording and distributing
+* An JSON based Notebook document format for recording and distributing
   Python code and rich text.
 * A web-based user interface for authoring and running notebook documents.
 
 The Notebook can be used by starting the Notebook server with the 
 command::
 
     $ ipython notebook
 
 Note that by default, the notebook doesn't load pylab, it's just a normal
 IPython session like any other.  If you want pylab support, you must use::
     
     $ ipython notebook --pylab
 
 which will behave similar to the terminal and Qt console versions, using your
 default matplotlib backend and providing floating interactive plot windows.  If
 you want inline figures, you must manually select the ``inline`` backend::
 
-    $ ipython notebook --pylab inline
+    $ ipython notebook --pylab=inline
 
 This server uses the same ZeroMQ-based two process kernel architecture as
 the QT Console as well Tornado for serving HTTP requests. Some of the main
 features of the Notebook include:
 
 * Display rich data (png/html/latex/svg) in the browser as a result of
   computations.
 * Compose text cells using HTML and Markdown.
-* Import and export notebook documents in range of formats (.ipynb, .json, .py).
+* Import and export notebook documents in range of formats (.ipynb, .py).
 * In browser syntax highlighting, tab completion and autoindentation.
 * Inline matplotlib plots that can be stored in Notebook documents and opened
   later.
 
 See :ref:`our installation documentation <install_index>` for directions on
 how to install the notebook and its dependencies.
 
 .. note::
 
    You can start more than one notebook server at the same time, if you want to
    work on notebooks in different directories.  By default the first notebook
    server starts in port 8888, later notebooks search for random ports near
    that one.  You can also manually specify the port with the ``--port``
-   option, if you want persistent URLs you can bookmark.
+   option.
    
 
 Basic Usage
 ===========
 
 The landing page of the notebook server application, which we call the IPython
 Notebook *dashboard*, shows the notebooks currently available in the directory
 in which the application was started, and allows you to create new notebooks.
 
 A notebook is a combination of two things:
 
-1. an interactive session connected to an IPython kernel, controlled by a web
+1. An interactive session connected to an IPython kernel, controlled by a web
 application that can send input to the console and display many types of output
 (text, graphics, mathematics and more).  This is the same kernel used by the
 :ref:`Qt console <qtconsole>`, but in this case the web console sends input in
 persistent cells that you can edit in-place instead of the vertically scrolling
 terminal style used by the Qt console.
 
-2. a document that can save the inputs and outputs of the session as well as
+2. A document that can save the inputs and outputs of the session as well as
 additional text that accompanies the code but is not meant for execution.  In
 this way, notebook files serve as a complete computational record of a session
 including explanatory text and mathematics, code and resulting figures.  These
 documents are internally JSON files and are saved with the ``.ipynb``
 extension.
 
 If you have ever used the Mathematica or Sage notebooks (the latter is also
 web-based__) you should feel right at home.  If you have not, you should be
 able to learn how to use it in just a few minutes.
 
 .. __: http://sagenb.org
 
 
 Creating and editing notebooks
 ------------------------------
 
 You can create new notebooks from the dashboard with the ``New Notebook``
 button or open existing ones by clicking on their name.  Once in a notebook,
 your browser tab will reflect the name of that notebook (prefixed with "IPy:").
-The URL for that notebook is not meant to be human-readable, but it is
-persistent across invocations of the notebook server *as long as you don't
-rename the notebook*, so you can bookmark them for future use.
+The URL for that notebook is not meant to be human-readable and is *not*
+persistent across invocations of the notebook server.
 
-You can also drag and dropp into the area listing files any python file: it
+You can also drag and drop into the area listing files any python file: it
 will be imported into a notebook with the same name (but ``.ipynb`` extension)
 located in the directory where the notebook server was started.  This notebook
 will consist of a single cell with all the code in the file, which you can
 later manually partition into individual cells for gradual execution, add text
 and graphics, etc.
 
 Workflow and limitations
 ------------------------
 
 The normal workflow in a notebook is quite similar to a normal IPython session,
 with the difference that you can edit a cell in-place multiple times until you
 obtain the desired results rather than having to rerun separate scripts with
 the ``%run`` magic (though magics also work in the notebook).   Typically
 you'll work on a problem in pieces, organizing related pieces into cells and
 moving forward as previous parts work correctly.  This is much more convenient
 for interactive exploration than breaking up a computation into scripts that
 must be executed together, especially if parts of them take a long time to run
 (you can use tricks with namespaces and ``%run -i``, but we think the notebook
 is a more natural solution for  that kind of problem).
 
 The only significant limitation the notebook currently has, compared to the qt
 console, is that it can not run any code that expects input from the kernel
 (such as scripts that call :func:`raw_input`).  Very importantly, this means
 that the ``%debug`` magic does *not* work in the notebook!  We intend to
 correct this limitation, but in the meantime, there is a way to debug problems
 in the notebook: you can attach a Qt console to your existing notebook kernel,
 and run ``%debug`` from the Qt console.  Simply look for the lines in the
 terminal where you started the kernel that read something like::
 
     [IPKernelApp] To connect another client to this kernel, use:
     [IPKernelApp] --existing --shell=53328 --iopub=53817 --stdin=34736 --hb=45543
 
 and then start a qt console pointing to that kernel::
 
     ipython qtconsole --existing --shell=53328 --iopub=53817 --stdin=34736 --hb=45543
 
     
 Text input
 ----------
 
 In addition to code cells and the output they procude (such as figures), you
 can also type text not meant for execution.  To type text, change the type of a
-cell from ``Code`` to ``Markdown`` by using the button or the :kbd:`C-m m`
+cell from ``Code`` to ``Markdown`` by using the button or the :kbd:`Ctrl-m m`
 keybinding (see below).  You can then type any text in Markdown_ syntax, as
 well as mathematical expressions if you use ``$...$`` for inline math or
 ``$$...$$`` for displayed math.
 
 Exporting a notebook
 --------------------
 
 If you want to provide others with a static HTML or PDF view of your notebook,
 use the ``Print`` button.  This opens a static view of the document, which you
 can print to PDF using your operating system's facilities, or save to a file
 with your web browser's 'Save' option (note that typically, this will create
 both an html file *and* a directory called `notebook_name_files` next to it
 that contains all the necessary style information, so if you intend to share
 this, you must send the directory along with the main html file).
 
 The `Download` button lets you save a notebook file to the Download area
 configured by your web browser (particularly useful if you are running the
 notebook server on a remote host and need a file locally).  The notebook is
 saved by default with the ``.ipynb`` extension and the files contain JSON data
 that is not meant for human editing or consumption.  But you can always export
 the input part of a notebook to a plain python script by choosing Python format
 in the `Download` drop list.  This removes all output and saves the text cells
 in comment areas.
 
 .. warning::
 
    While in simple cases you can roundtrip a notebook to Python, edit the
    python file and import it back without loss, this is in general *not
    guaranteed to work at all*.  As the notebook format evolves in complexity,
    there will be attributes of the notebook that will not survive a roundtrip
    through the Python form.  You should think of the Python format as a way to
    output a script version of a notebook and the import capabilities as a way
    to load existing code to get a notebook started.  But the Python version is
-   *not* an alternate Python format.
+   *not* an alternate notebook format.
 
     
 Keyboard use
 ------------
 
 All actions in the notebook can be achieved with the mouse, but we have also
 added keyboard shortcuts for the most common ones, so that productive use of
 the notebook can be achieved with minimal mouse intervention.  The main
 key bindings you need to remember are:
 
 * :kbd:`Shift-Enter`: execute the current cell (similar to the Qt console),
   show output (if any) and create a new cell below.  Note that in the notebook,
   simply using :kbd:`Enter` *never* forces execution, it simply inserts a new
   line in the current cell.  Therefore, in the notebook you must always use
   :kbd:`Shift-Enter` to get execution (or use the mouse and click on the ``Run
   Selected`` button).
 
-* :kbd:`Control-Enter`: execute the current cell in "terminal mode", where any
+* :kbd:`Ctrl-Enter`: execute the current cell in "terminal mode", where any
   output is shown but the cursor cursor stays in the current cell, whose input
   area is flushed empty.  This is convenient to do quick in-place experiments
   or query things like filesystem content without creating additional cells you
   may not want saved in your notebook.
 
-* :kbd:`Control-m`: this is the prefix for all other keybindings, which consist
+* :kbd:`Ctrl-m`: this is the prefix for all other keybindings, which consist
   of an additional single letter.  Type :kbd:`Ctrl-m h` (that is, the sole
   letter :kbd:`h` after :kbd:`Ctrl-m`) and IPython will show you the remaining
   available keybindings.
 
 
 Notebook document format
 ========================