##// END OF EJS Templates
Fix a bug in renaming notebook...
Fix a bug in renaming notebook There was a bug in NotebookManager.save_notebook_object. Here is how to reproduce: 0. Make sure you don't have Untitled0. 1. Open new notebook Untitled0. 2. Rename it to something else. 3. Copy Untitled0.ipynb to the notebook dir from somewhere. (Do not use notebook UI.) 4. New copied Untitled0 cannot be opened. The renamed notebook is opened when tried. Indeed, accessing to http://localhost:XXXX/notebooks shows duplicated notebook_id. The problem was that NotebookManager.rev_mapping keeps old notebook name after renaming.

File last commit:

r6270:35b8990b
r7359:ef719b62
Show More
frontend.py
197 lines | 6.2 KiB | text/x-python | PythonLexer
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 #!/usr/bin/env python
"""A simple interactive frontend that talks to a kernel over 0MQ.
"""
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
# stdlib
import cPickle as pickle
import code
import readline
import sys
import time
import uuid
# our own
import zmq
import session
import completer
MinRK
Possible fix for GH-169
r3144 from IPython.utils.localinterfaces import LOCALHOST
MinRK
small changes in response to pyflakes pass...
r6270 from IPython.zmq.session import Message
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597
#-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
class Console(code.InteractiveConsole):
def __init__(self, locals=None, filename="<console>",
session = session,
request_socket=None,
sub_socket=None):
code.InteractiveConsole.__init__(self, locals, filename)
self.session = session
self.request_socket = request_socket
self.sub_socket = sub_socket
self.backgrounded = 0
self.messages = {}
# Set tab completion
self.completer = completer.ClientCompleter(self, session, request_socket)
readline.parse_and_bind('tab: complete')
readline.parse_and_bind('set show-all-if-ambiguous on')
readline.set_completer(self.completer.complete)
# Set system prompts
sys.ps1 = 'Py>>> '
sys.ps2 = ' ... '
sys.ps3 = 'Out : '
# Build dict of handlers for message types
self.handlers = {}
for msg_type in ['pyin', 'pyout', 'pyerr', 'stream']:
self.handlers[msg_type] = getattr(self, 'handle_%s' % msg_type)
def handle_pyin(self, omsg):
if omsg.parent_header.session == self.session.session:
return
c = omsg.content.code.rstrip()
if c:
print '[IN from %s]' % omsg.parent_header.username
print c
def handle_pyout(self, omsg):
#print omsg # dbg
if omsg.parent_header.session == self.session.session:
print "%s%s" % (sys.ps3, omsg.content.data)
else:
print '[Out from %s]' % omsg.parent_header.username
print omsg.content.data
def print_pyerr(self, err):
print >> sys.stderr, err.etype,':', err.evalue
Bernardo B. Marques
remove all trailling spaces
r4872 print >> sys.stderr, ''.join(err.traceback)
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597
def handle_pyerr(self, omsg):
if omsg.parent_header.session == self.session.session:
return
print >> sys.stderr, '[ERR from %s]' % omsg.parent_header.username
self.print_pyerr(omsg.content)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 def handle_stream(self, omsg):
if omsg.content.name == 'stdout':
outstream = sys.stdout
else:
outstream = sys.stderr
print >> outstream, '*ERR*',
print >> outstream, omsg.content.data,
def handle_output(self, omsg):
handler = self.handlers.get(omsg.msg_type, None)
if handler is not None:
handler(omsg)
def recv_output(self):
while True:
MinRK
all sends/recvs now via Session.send/recv....
r3269 ident,msg = self.session.recv(self.sub_socket)
if msg is None:
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 break
MinRK
all sends/recvs now via Session.send/recv....
r3269 self.handle_output(Message(msg))
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597
def handle_reply(self, rep):
# Handle any side effects on output channels
self.recv_output()
# Now, dispatch on the possible reply types we must handle
if rep is None:
return
if rep.content.status == 'error':
Bernardo B. Marques
remove all trailling spaces
r4872 self.print_pyerr(rep.content)
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 elif rep.content.status == 'aborted':
print >> sys.stderr, "ERROR: ABORTED"
ab = self.messages[rep.parent_header.msg_id].content
if 'code' in ab:
print >> sys.stderr, ab.code
else:
print >> sys.stderr, ab
def recv_reply(self):
MinRK
all sends/recvs now via Session.send/recv....
r3269 ident,rep = self.session.recv(self.request_socket)
mrep = Message(rep)
self.handle_reply(mrep)
return mrep
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597
def runcode(self, code):
# We can't pickle code objects, so fetch the actual source
src = '\n'.join(self.buffer)
# for non-background inputs, if we do have previoiusly backgrounded
# jobs, check to see if they've produced results
if not src.endswith(';'):
while self.backgrounded > 0:
#print 'checking background'
rep = self.recv_reply()
if rep:
self.backgrounded -= 1
time.sleep(0.05)
# Send code execution message to kernel
omsg = self.session.send(self.request_socket,
'execute_request', dict(code=src))
self.messages[omsg.header.msg_id] = omsg
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 # Fake asynchronicity by letting the user put ';' at the end of the line
if src.endswith(';'):
self.backgrounded += 1
return
# For foreground jobs, wait for reply
while True:
rep = self.recv_reply()
if rep is not None:
break
self.recv_output()
time.sleep(0.05)
else:
# We exited without hearing back from the kernel!
print >> sys.stderr, 'ERROR!!! kernel never got back to us!!!'
class InteractiveClient(object):
def __init__(self, session, request_socket, sub_socket):
self.session = session
self.request_socket = request_socket
self.sub_socket = sub_socket
self.console = Console(None, '<zmq-console>',
session, request_socket, sub_socket)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 def interact(self):
self.console.interact()
def main():
# Defaults
#ip = '192.168.2.109'
MinRK
Possible fix for GH-169
r3144 ip = LOCALHOST
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 #ip = '99.146.222.252'
port_base = 5575
connection = ('tcp://%s' % ip) + ':%i'
req_conn = connection % port_base
sub_conn = connection % (port_base+1)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 # Create initial sockets
c = zmq.Context()
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 request_socket = c.socket(zmq.DEALER)
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 request_socket.connect(req_conn)
Bernardo B. Marques
remove all trailling spaces
r4872
Fernando Perez
Added files from our zmq prototype into main ipython tree....
r2597 sub_socket = c.socket(zmq.SUB)
sub_socket.connect(sub_conn)
sub_socket.setsockopt(zmq.SUBSCRIBE, '')
# Make session and user-facing client
sess = session.Session()
client = InteractiveClient(sess, request_socket, sub_socket)
client.interact()
if __name__ == '__main__':
main()