add ConsoleWidget.include_other_output

minrk · minrk · commit 8781cc031c9e · 2014-09-27T21:40:35.000-07:00
matches zmq console. Doesn't include `[remote] ` prefix,
because true async output makes it less important.
diff --git a/IPython/qt/base_frontend_mixin.py b/IPython/qt/base_frontend_mixin.py
@@ -136,15 +136,23 @@ def _dispatch(self, msg):
         handler = getattr(self, '_handle_' + msg_type, None)
         if handler:
             handler(msg)
-
-    def _is_from_this_session(self, msg):
-        """ Returns whether a reply from the kernel originated from a request
-            from this frontend.
-        """
-        session = self._kernel_client.session.session
-        parent = msg['parent_header']
-        if not parent:
-            # if the message has no parent, assume it is meant for all frontends
+    
+    def from_here(self, msg):
+        """Return whether a message is from this session"""
+        session_id = self._kernel_client.session.session
+        return msg['parent_header'].get("session", session_id) == session_id
+    
+    def include_output(self, msg):
+        """Return whether we should include a given output message"""
+        if self._hidden:
+            return False
+        from_here = self.from_here(msg)
+        if msg['msg_type'] == 'execute_input':
+            # only echo inputs not from here
+            return self.include_other_output and not from_here
+        
+        if self.include_other_output:
             return True
         else:
-            return parent.get('session') == session
+            return from_here
+    
diff --git a/IPython/qt/console/console_widget.py b/IPython/qt/console/console_widget.py
@@ -519,7 +519,15 @@ def sizeHint(self):
     #---------------------------------------------------------------------------
     # 'ConsoleWidget' public interface
     #---------------------------------------------------------------------------
-
+    
+    include_other_output = Bool(False, config=True,
+        help="""Whether to include output from clients
+        other than this one sharing the same kernel.
+        
+        Outputs are not displayed until enter is pressed.
+        """
+    )
+    
     def can_copy(self):
         """ Returns whether text can be copied to the clipboard.
         """
diff --git a/IPython/qt/console/frontend_widget.py b/IPython/qt/console/frontend_widget.py
@@ -347,7 +347,7 @@ def _insert_continuation_prompt(self, cursor):
     #---------------------------------------------------------------------------
     def _handle_clear_output(self, msg):
         """Handle clear output messages."""
-        if not self._hidden and self._is_from_this_session(msg):
+        if not include_output(msg):
             wait = msg['content'].get('wait', True)
             if wait:
                 self._pending_clearoutput = True
@@ -520,7 +520,7 @@ def _handle_execute_result(self, msg):
         """ Handle display hook output.
         """
         self.log.debug("execute_result: %s", msg.get('content', ''))
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             text = msg['content']['data']
             self._append_plain_text(text + '\n', before_prompt=True)
@@ -529,7 +529,7 @@ def _handle_stream(self, msg):
         """ Handle stdout, stderr, and stdin.
         """
         self.log.debug("stream: %s", msg.get('content', ''))
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             self.append_stream(msg['content']['data'])
 
@@ -538,7 +538,7 @@ def _handle_shutdown_reply(self, msg):
         """
         self.log.info("shutdown: %s", msg.get('content', ''))
         restart = msg.get('content', {}).get('restart', False)
-        if not self._hidden and not self._is_from_this_session(msg):
+        if not self._hidden and not self.from_here(msg):
             # got shutdown reply, request came from session other than ours
             if restart:
                 # someone restarted the kernel, handle it
diff --git a/IPython/qt/console/ipython_widget.py b/IPython/qt/console/ipython_widget.py
@@ -205,11 +205,21 @@ def _handle_history_reply(self, msg):
                 last_cell = cell
         self._set_history(items)
 
+    def _handle_execute_input(self, msg):
+        """Handle an execute_input message"""
+        self.log.debug("execute_input: %s", msg.get('content', ''))
+        if self.include_output(msg):
+            content = msg['content']
+            prompt_number = content.get('execution_count', 0)
+            self._append_html(self._make_in_prompt(prompt_number), True)
+            self._append_plain_text(content['code'], True)
+        
+    
     def _handle_execute_result(self, msg):
         """ Reimplemented for IPython-style "display hook".
         """
         self.log.debug("execute_result: %s", msg.get('content', ''))
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             content = msg['content']
             prompt_number = content.get('execution_count', 0)
@@ -231,7 +241,7 @@ def _handle_display_data(self, msg):
         # For now, we don't display data from other frontends, but we
         # eventually will as this allows all frontends to monitor the display
         # data. But we need to figure out how to handle this in the GUI.
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             data = msg['content']['data']
             metadata = msg['content']['metadata']
diff --git a/IPython/qt/console/rich_ipython_widget.py b/IPython/qt/console/rich_ipython_widget.py
@@ -107,7 +107,7 @@ def _pre_image_append(self, msg, prompt_number):
     def _handle_execute_result(self, msg):
         """ Overridden to handle rich data types, like SVG.
         """
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             content = msg['content']
             prompt_number = content.get('execution_count', 0)
@@ -146,7 +146,7 @@ def _handle_execute_result(self, msg):
     def _handle_display_data(self, msg):
         """ Overridden to handle rich data types, like SVG.
         """
-        if not self._hidden and self._is_from_this_session(msg):
+        if self.include_output(msg):
             self.flush_clearoutput()
             data = msg['content']['data']
             metadata = msg['content']['metadata']
