##// END OF EJS Templates
Refactor of prompts and the displayhook....
Refactor of prompts and the displayhook. * Renamed CachedOutput to displayhook.DisplayHook. * Added methods that DisplayHook.__call__ uses to do its work. These methods can now be overridden for the ZMQ kernel. * Removed all hooks (result_display and generate_output_prompt) that the outputcache was using. We need to add these back in once we figure out what to do about hooks in general.

File last commit:

r2775:c291d5fa
r2781:775b3992
Show More
ipkernel.py
367 lines | 13.2 KiB | text/x-python | PythonLexer
Fernando Perez
Added zmq kernel file which I forgot
r2598 #!/usr/bin/env python
"""A simple interactive kernel that talks to a frontend over 0MQ.
Things to do:
* Implement `set_parent` logic. Right before doing exec, the Kernel should
call set_parent on all the PUB objects with the message about to be executed.
* Implement random port and security key logic.
* Implement control messages.
* Implement event loop and poll version.
"""
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # Standard library imports.
Fernando Perez
Added zmq kernel file which I forgot
r2598 import __builtin__
epatters
Fixed bugs with raw_input and finished and implementing InStream.
r2708 from code import CommandCompiler
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 import os
Fernando Perez
Added zmq kernel file which I forgot
r2598 import sys
import time
import traceback
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # System library imports.
Fernando Perez
Added zmq kernel file which I forgot
r2598 import zmq
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # Local imports.
Brian Granger
First semi-working draft of ipython based kernel.
r2759 from IPython.config.configurable import Configurable
Brian Granger
Initial version of system command out/err forwarding.
r2773 from IPython.zmq.zmqshell import ZMQInteractiveShell
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 from IPython.external.argparse import ArgumentParser
Brian Granger
First semi-working draft of ipython based kernel.
r2759 from IPython.utils.traitlets import Instance
from IPython.zmq.session import Session, Message
Fernando Perez
Added zmq kernel file which I forgot
r2598 from completer import KernelCompleter
Brian Granger
First semi-working draft of ipython based kernel.
r2759 from iostream import OutStream
from displayhook import DisplayHook
from exitpoller import ExitPollerUnix, ExitPollerWindows
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
Brian Granger
Separating kernel into smaller pieces.
r2754 # Main kernel class
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641
Brian Granger
First semi-working draft of ipython based kernel.
r2759 class Kernel(Configurable):
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
Brian Granger
First semi-working draft of ipython based kernel.
r2759 session = Instance('IPython.zmq.session.Session')
reply_socket = Instance('zmq.Socket')
pub_socket = Instance('zmq.Socket')
req_socket = Instance('zmq.Socket')
def __init__(self, **kwargs):
super(Kernel, self).__init__(**kwargs)
Brian Granger
Initial version of system command out/err forwarding.
r2773 self.shell = ZMQInteractiveShell.instance()
Fernando Perez
Added zmq kernel file which I forgot
r2598
# Build dict of handlers for message types
epatters
* Adding object_info_request support to prototype kernel....
r2612 msg_types = [ 'execute_request', 'complete_request',
'object_info_request' ]
Fernando Perez
Added zmq kernel file which I forgot
r2598 self.handlers = {}
epatters
* Adding object_info_request support to prototype kernel....
r2612 for msg_type in msg_types:
Fernando Perez
Added zmq kernel file which I forgot
r2598 self.handlers[msg_type] = getattr(self, msg_type)
def abort_queue(self):
while True:
try:
ident = self.reply_socket.recv(zmq.NOBLOCK)
except zmq.ZMQError, e:
if e.errno == zmq.EAGAIN:
break
else:
assert self.reply_socket.rcvmore(), "Unexpected missing message part."
msg = self.reply_socket.recv_json()
print>>sys.__stdout__, "Aborting:"
print>>sys.__stdout__, Message(msg)
msg_type = msg['msg_type']
reply_type = msg_type.split('_')[0] + '_reply'
reply_msg = self.session.msg(reply_type, {'status' : 'aborted'}, msg)
print>>sys.__stdout__, Message(reply_msg)
self.reply_socket.send(ident,zmq.SNDMORE)
self.reply_socket.send_json(reply_msg)
# We need to wait a bit for requests to come in. This can probably
# be set shorter for true asynchronous clients.
time.sleep(0.1)
def execute_request(self, ident, parent):
try:
code = parent[u'content'][u'code']
except:
print>>sys.__stderr__, "Got bad msg: "
print>>sys.__stderr__, Message(parent)
return
pyin_msg = self.session.msg(u'pyin',{u'code':code}, parent=parent)
self.pub_socket.send_json(pyin_msg)
epatters
Greatly increased frontend performance by improving kernel stdout/stderr buffering.
r2722
Fernando Perez
Added zmq kernel file which I forgot
r2598 try:
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 # Replace raw_input. Note that is not sufficient to replace
# raw_input in the user namespace.
raw_input = lambda prompt='': self.raw_input(prompt, ident, parent)
__builtin__.raw_input = raw_input
# Configure the display hook.
Fernando Perez
Added zmq kernel file which I forgot
r2598 sys.displayhook.set_parent(parent)
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730
Brian Granger
First semi-working draft of ipython based kernel.
r2759 self.shell.runlines(code)
# exec comp_code in self.user_ns, self.user_ns
Fernando Perez
Added zmq kernel file which I forgot
r2598 except:
etype, evalue, tb = sys.exc_info()
tb = traceback.format_exception(etype, evalue, tb)
exc_content = {
u'status' : u'error',
u'traceback' : tb,
epatters
* Moved AnsiCodeProcessor to separate file, refactored its API, and added unit tests....
r2716 u'ename' : unicode(etype.__name__),
Fernando Perez
Added zmq kernel file which I forgot
r2598 u'evalue' : unicode(evalue)
}
exc_msg = self.session.msg(u'pyerr', exc_content, parent)
self.pub_socket.send_json(exc_msg)
reply_content = exc_content
else:
reply_content = {'status' : 'ok'}
epatters
Greatly increased frontend performance by improving kernel stdout/stderr buffering.
r2722
# Flush output before sending the reply.
sys.stderr.flush()
sys.stdout.flush()
# Send the reply.
Fernando Perez
Added zmq kernel file which I forgot
r2598 reply_msg = self.session.msg(u'execute_reply', reply_content, parent)
print>>sys.__stdout__, Message(reply_msg)
self.reply_socket.send(ident, zmq.SNDMORE)
self.reply_socket.send_json(reply_msg)
if reply_msg['content']['status'] == u'error':
self.abort_queue()
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 def raw_input(self, prompt, ident, parent):
# Flush output before making the request.
sys.stderr.flush()
sys.stdout.flush()
# Send the input request.
content = dict(prompt=prompt)
msg = self.session.msg(u'input_request', content, parent)
self.req_socket.send_json(msg)
# Await a response.
reply = self.req_socket.recv_json()
try:
value = reply['content']['value']
except:
print>>sys.__stderr__, "Got bad raw_input reply: "
print>>sys.__stderr__, Message(parent)
value = ''
return value
Fernando Perez
Added zmq kernel file which I forgot
r2598 def complete_request(self, ident, parent):
matches = {'matches' : self.complete(parent),
'status' : 'ok'}
completion_msg = self.session.send(self.reply_socket, 'complete_reply',
matches, parent, ident)
print >> sys.__stdout__, completion_msg
def complete(self, msg):
Brian Granger
First semi-working draft of ipython based kernel.
r2759 return self.shell.complete(msg.content.line)
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Adding object_info_request support to prototype kernel....
r2612 def object_info_request(self, ident, parent):
context = parent['content']['oname'].split('.')
object_info = self.object_info(context)
msg = self.session.send(self.reply_socket, 'object_info_reply',
object_info, parent, ident)
print >> sys.__stdout__, msg
def object_info(self, context):
symbol, leftover = self.symbol_from_context(context)
if symbol is not None and not leftover:
doc = getattr(symbol, '__doc__', '')
else:
doc = ''
object_info = dict(docstring = doc)
return object_info
def symbol_from_context(self, context):
if not context:
return None, context
base_symbol_string = context[0]
Brian Granger
First semi-working draft of ipython based kernel.
r2759 symbol = self.shell.user_ns.get(base_symbol_string, None)
epatters
* Adding object_info_request support to prototype kernel....
r2612 if symbol is None:
symbol = __builtin__.__dict__.get(base_symbol_string, None)
if symbol is None:
return None, context
context = context[1:]
for i, name in enumerate(context):
new_symbol = getattr(symbol, name, None)
if new_symbol is None:
return symbol, context[i:]
else:
symbol = new_symbol
return symbol, []
Fernando Perez
Added zmq kernel file which I forgot
r2598 def start(self):
while True:
ident = self.reply_socket.recv()
epatters
* Change input mechanism: replace raw_input instead of stdin....
r2730 assert self.reply_socket.rcvmore(), "Missing message part."
Fernando Perez
Added zmq kernel file which I forgot
r2598 msg = self.reply_socket.recv_json()
omsg = Message(msg)
Brian Granger
Work on the kernel manager.
r2606 print>>sys.__stdout__
Fernando Perez
Added zmq kernel file which I forgot
r2598 print>>sys.__stdout__, omsg
handler = self.handlers.get(omsg.msg_type, None)
if handler is None:
print >> sys.__stderr__, "UNKNOWN MESSAGE TYPE:", omsg
else:
handler(ident, omsg)
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 #-----------------------------------------------------------------------------
# Kernel main and launch functions
#-----------------------------------------------------------------------------
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 def bind_port(socket, ip, port):
""" Binds the specified ZMQ socket. If the port is less than zero, a random
port is chosen. Returns the port that was bound.
"""
connection = 'tcp://%s' % ip
epatters
Small fix for API consistency.
r2704 if port <= 0:
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 port = socket.bind_to_random_port(connection)
else:
connection += ':%i' % port
socket.bind(connection)
return port
epatters
Kernel subprocess parent polling is now implemented correctly for Unix.
r2713
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 def main():
""" Main entry point for launching a kernel.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 """
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 # Parse command line arguments.
parser = ArgumentParser()
parser.add_argument('--ip', type=str, default='127.0.0.1',
help='set the kernel\'s IP address [default: local]')
Brian Granger
Changing -1=>0 for bind to random ports.
r2690 parser.add_argument('--xrep', type=int, metavar='PORT', default=0,
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 help='set the XREP channel port [default: random]')
Brian Granger
Changing -1=>0 for bind to random ports.
r2690 parser.add_argument('--pub', type=int, metavar='PORT', default=0,
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 help='set the PUB channel port [default: random]')
parser.add_argument('--req', type=int, metavar='PORT', default=0,
help='set the REQ channel port [default: random]')
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 if sys.platform == 'win32':
parser.add_argument('--parent', type=int, metavar='HANDLE',
default=0, help='kill this process if the process '
'with HANDLE dies')
else:
parser.add_argument('--parent', action='store_true',
help='kill this process if its parent dies')
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 namespace = parser.parse_args()
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 # Create a context, a session, and the kernel sockets.
Fernando Perez
Added zmq kernel file which I forgot
r2598 print >>sys.__stdout__, "Starting the kernel..."
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 context = zmq.Context()
Fernando Perez
Added zmq kernel file which I forgot
r2598 session = Session(username=u'kernel')
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 reply_socket = context.socket(zmq.XREP)
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 xrep_port = bind_port(reply_socket, namespace.ip, namespace.xrep)
print >>sys.__stdout__, "XREP Channel on port", xrep_port
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 pub_socket = context.socket(zmq.PUB)
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 pub_port = bind_port(pub_socket, namespace.ip, namespace.pub)
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 print >>sys.__stdout__, "PUB Channel on port", pub_port
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
Progress on raw_input.
r2705 req_socket = context.socket(zmq.XREQ)
req_port = bind_port(req_socket, namespace.ip, namespace.req)
print >>sys.__stdout__, "REQ Channel on port", req_port
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 # Redirect input streams. This needs to be done before the Kernel is done
# because currently the Kernel creates a ZMQInteractiveShell, which
# holds references to sys.stdout and sys.stderr.
Brian Granger
Reenabling output trapping in the kernel.
r2767 sys.stdout = OutStream(session, pub_socket, u'stdout')
sys.stderr = OutStream(session, pub_socket, u'stderr')
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 # Set a displayhook.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 sys.displayhook = DisplayHook(session, pub_socket)
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 # Create the kernel.
Brian Granger
First semi-working draft of ipython based kernel.
r2759 kernel = Kernel(
session=session, reply_socket=reply_socket,
pub_socket=pub_socket, req_socket=req_socket
)
Fernando Perez
Added zmq kernel file which I forgot
r2598
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 # Configure this kernel/process to die on parent termination, if necessary.
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 if namespace.parent:
epatters
Kernel subprocess parent polling is now implemented correctly for Unix.
r2713 if sys.platform == 'win32':
poller = ExitPollerWindows(namespace.parent)
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 else:
epatters
Kernel subprocess parent polling is now implemented correctly for Unix.
r2713 poller = ExitPollerUnix()
poller.start()
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
# Start the kernel mainloop.
Fernando Perez
Added zmq kernel file which I forgot
r2598 kernel.start()
epatters
Small fix for API consistency.
r2704
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 def launch_kernel(xrep_port=0, pub_port=0, req_port=0, independent=False):
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 """ Launches a localhost kernel, binding to the specified ports.
Parameters
----------
xrep_port : int, optional
The port to use for XREP channel.
pub_port : int, optional
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 The port to use for the SUB channel.
req_port : int, optional
The port to use for the REQ (raw input) channel.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 independent : bool, optional (default False)
If set, the kernel process is guaranteed to survive if this process
dies. If not set, an effort is made to ensure that the kernel is killed
when this process dies. Note that in this case it is still good practice
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 to kill kernels manually before exiting.
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
Returns
-------
A tuple of form:
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 (kernel_process, xrep_port, pub_port, req_port)
where kernel_process is a Popen object and the ports are integers.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 """
import socket
from subprocess import Popen
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 # Find open ports as necessary.
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 ports = []
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 ports_needed = int(xrep_port <= 0) + int(pub_port <= 0) + int(req_port <= 0)
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 for i in xrange(ports_needed):
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 sock = socket.socket()
sock.bind(('', 0))
ports.append(sock)
for i, sock in enumerate(ports):
port = sock.getsockname()[1]
sock.close()
ports[i] = port
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 if xrep_port <= 0:
xrep_port = ports.pop(0)
if pub_port <= 0:
pub_port = ports.pop(0)
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 if req_port <= 0:
req_port = ports.pop(0)
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667
epatters
* Added a function for spawning a localhost kernel in a new process on random ports....
r2641 # Spawn a kernel.
Brian Granger
Remaned kernel.py to pykernel.py and create ipkernel.py.
r2755 command = 'from IPython.zmq.ipkernel import main; main()'
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 arguments = [ sys.executable, '-c', command, '--xrep', str(xrep_port),
'--pub', str(pub_port), '--req', str(req_port) ]
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700 if independent:
if sys.platform == 'win32':
proc = Popen(['start', '/b'] + arguments, shell=True)
else:
proc = Popen(arguments, preexec_fn=lambda: os.setsid())
else:
epatters
Kernel subprocess parent polling is now implemented for Windows.
r2712 if sys.platform == 'win32':
from _subprocess import DuplicateHandle, GetCurrentProcess, \
DUPLICATE_SAME_ACCESS
pid = GetCurrentProcess()
handle = DuplicateHandle(pid, pid, pid, 0,
True, # Inheritable by new processes.
DUPLICATE_SAME_ACCESS)
proc = Popen(arguments + ['--parent', str(int(handle))])
else:
proc = Popen(arguments + ['--parent'])
epatters
* Added 'independent' argument to 'launch_kernel' for setting subprocess persistence goals. The case for 'independent=False' is only partially implemented....
r2700
epatters
* Added 'req_port' option to 'launch_kernel' and the kernel entry point....
r2702 return proc, xrep_port, pub_port, req_port
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667
Fernando Perez
Added zmq kernel file which I forgot
r2598
if __name__ == '__main__':
epatters
* Implemented a proper main() function for kernel.py that reads command line input....
r2667 main()