First semi-working draft of ipython based kernel.

ellisonbg · ellisonbg · commit f19d51df55a9 · 2010-08-12T14:39:56.000-07:00
diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py
@@ -26,28 +26,31 @@
 import zmq
 
 # Local imports.
+from IPython.config.configurable import Configurable
+from IPython.core.iplib import InteractiveShell, InteractiveShellABC
 from IPython.external.argparse import ArgumentParser
-from session import Session, Message
+from IPython.utils.traitlets import Instance
+from IPython.zmq.session import Session, Message
 from completer import KernelCompleter
-from .iostream import OutStream
-from .displayhook import DisplayHook
-from .exitpoller import ExitPollerUnix, ExitPollerWindows
+from iostream import OutStream
+from displayhook import DisplayHook
+from exitpoller import ExitPollerUnix, ExitPollerWindows
 
 #-----------------------------------------------------------------------------
 # Main kernel class
 #-----------------------------------------------------------------------------
 
-class Kernel(object):
-
-    def __init__(self, session, reply_socket, pub_socket, req_socket):
-        self.session = session
-        self.reply_socket = reply_socket
-        self.pub_socket = pub_socket
-        self.req_socket = req_socket
-        self.user_ns = {}
-        self.history = []
-        self.compiler = CommandCompiler()
-        self.completer = KernelCompleter(self.user_ns)
+class Kernel(Configurable):
+
+    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    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)
+        self.shell = InteractiveShell.instance()
         
         # Build dict of handlers for message types
         msg_types = [ 'execute_request', 'complete_request', 
@@ -89,8 +92,6 @@ def execute_request(self, ident, parent):
         self.pub_socket.send_json(pyin_msg)
 
         try:
-            comp_code = self.compiler(code, '<zmq-kernel>')
-
             # 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)
@@ -99,7 +100,8 @@ def execute_request(self, ident, parent):
             # Configure the display hook.
             sys.displayhook.set_parent(parent)
 
-            exec comp_code in self.user_ns, self.user_ns
+            self.shell.runlines(code)
+            # exec comp_code in self.user_ns, self.user_ns
         except:
             etype, evalue, tb = sys.exc_info()
             tb = traceback.format_exception(etype, evalue, tb)
@@ -155,7 +157,7 @@ def complete_request(self, ident, parent):
         print >> sys.__stdout__, completion_msg
 
     def complete(self, msg):
-        return self.completer.complete(msg.content.line, msg.content.text)
+        return self.shell.complete(msg.content.line)
 
     def object_info_request(self, ident, parent):
         context = parent['content']['oname'].split('.')
@@ -178,7 +180,7 @@ def symbol_from_context(self, context):
             return None, context
 
         base_symbol_string = context[0]
-        symbol = self.user_ns.get(base_symbol_string, None)
+        symbol = self.shell.user_ns.get(base_symbol_string, None)
         if symbol is None:
             symbol = __builtin__.__dict__.get(base_symbol_string, None)
         if symbol is None:
@@ -270,7 +272,10 @@ def main():
     sys.displayhook = DisplayHook(session, pub_socket)
 
     # Create the kernel.
-    kernel = Kernel(session, reply_socket, pub_socket, req_socket)
+    kernel = Kernel(
+        session=session, reply_socket=reply_socket,
+        pub_socket=pub_socket, req_socket=req_socket
+    )
 
     # Configure this kernel/process to die on parent termination, if necessary.
     if namespace.parent:
diff --git a/IPython/zmq/kernelmanager.py b/IPython/zmq/kernelmanager.py
@@ -30,7 +30,7 @@
 
 # Local imports.
 from IPython.utils.traitlets import HasTraits, Any, Instance, Type, TCPAddress
-from .ipkernel import launch_kernel
+from ipkernel import launch_kernel
 from session import Session
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/zmq/pykernel.py b/IPython/zmq/pykernel.py
@@ -29,9 +29,9 @@
 from IPython.external.argparse import ArgumentParser
 from session import Session, Message
 from completer import KernelCompleter
-from .iostream import OutStream
-from .displayhook import DisplayHook
-from .exitpoller import ExitPollerUnix, ExitPollerWindows
+from iostream import OutStream
+from displayhook import DisplayHook
+from exitpoller import ExitPollerUnix, ExitPollerWindows
 
 #-----------------------------------------------------------------------------
 # Main kernel class
