Show More
@@ -1,570 +1,572 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """terminal client to the IPython kernel""" |
|
2 | """terminal client to the IPython kernel""" | |
3 |
|
3 | |||
4 | # Copyright (c) IPython Development Team. |
|
4 | # Copyright (c) IPython Development Team. | |
5 | # Distributed under the terms of the Modified BSD License. |
|
5 | # Distributed under the terms of the Modified BSD License. | |
6 |
|
6 | |||
7 | from __future__ import print_function |
|
7 | from __future__ import print_function | |
8 |
|
8 | |||
9 | import base64 |
|
9 | import base64 | |
10 | import bdb |
|
10 | import bdb | |
11 | import signal |
|
11 | import signal | |
12 | import os |
|
12 | import os | |
13 | import sys |
|
13 | import sys | |
14 | import time |
|
14 | import time | |
15 | import subprocess |
|
15 | import subprocess | |
16 | from getpass import getpass |
|
16 | from getpass import getpass | |
17 | from io import BytesIO |
|
17 | from io import BytesIO | |
18 |
|
18 | |||
19 | try: |
|
19 | try: | |
20 | from queue import Empty # Py 3 |
|
20 | from queue import Empty # Py 3 | |
21 | except ImportError: |
|
21 | except ImportError: | |
22 | from Queue import Empty # Py 2 |
|
22 | from Queue import Empty # Py 2 | |
23 |
|
23 | |||
24 | from IPython.core import page |
|
24 | from IPython.core import page | |
25 | from IPython.core import release |
|
25 | from IPython.core import release | |
26 | from IPython.utils.warn import warn, error |
|
26 | from IPython.utils.warn import warn, error | |
27 | from IPython.utils import io |
|
27 | from IPython.utils import io | |
28 | from IPython.utils.py3compat import string_types, input |
|
28 | from IPython.utils.py3compat import string_types, input | |
29 | from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode, Float, Bool |
|
29 | from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode, Float, Bool | |
30 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
|
30 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory | |
31 |
|
31 | |||
32 | from IPython.terminal.interactiveshell import TerminalInteractiveShell |
|
32 | from IPython.terminal.interactiveshell import TerminalInteractiveShell | |
33 | from IPython.terminal.console.completer import ZMQCompleter |
|
33 | from IPython.terminal.console.completer import ZMQCompleter | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | class ZMQTerminalInteractiveShell(TerminalInteractiveShell): |
|
36 | class ZMQTerminalInteractiveShell(TerminalInteractiveShell): | |
37 | """A subclass of TerminalInteractiveShell that uses the 0MQ kernel""" |
|
37 | """A subclass of TerminalInteractiveShell that uses the 0MQ kernel""" | |
38 | _executing = False |
|
38 | _executing = False | |
39 | _execution_state = Unicode('') |
|
39 | _execution_state = Unicode('') | |
40 | _pending_clearoutput = False |
|
40 | _pending_clearoutput = False | |
41 | kernel_banner = Unicode('') |
|
41 | kernel_banner = Unicode('') | |
42 | kernel_timeout = Float(60, config=True, |
|
42 | kernel_timeout = Float(60, config=True, | |
43 | help="""Timeout for giving up on a kernel (in seconds). |
|
43 | help="""Timeout for giving up on a kernel (in seconds). | |
44 |
|
44 | |||
45 | On first connect and restart, the console tests whether the |
|
45 | On first connect and restart, the console tests whether the | |
46 | kernel is running and responsive by sending kernel_info_requests. |
|
46 | kernel is running and responsive by sending kernel_info_requests. | |
47 | This sets the timeout in seconds for how long the kernel can take |
|
47 | This sets the timeout in seconds for how long the kernel can take | |
48 | before being presumed dead. |
|
48 | before being presumed dead. | |
49 | """ |
|
49 | """ | |
50 | ) |
|
50 | ) | |
51 |
|
51 | |||
52 | image_handler = Enum(('PIL', 'stream', 'tempfile', 'callable'), |
|
52 | image_handler = Enum(('PIL', 'stream', 'tempfile', 'callable'), | |
53 | config=True, help= |
|
53 | config=True, help= | |
54 | """ |
|
54 | """ | |
55 | Handler for image type output. This is useful, for example, |
|
55 | Handler for image type output. This is useful, for example, | |
56 | when connecting to the kernel in which pylab inline backend is |
|
56 | when connecting to the kernel in which pylab inline backend is | |
57 | activated. There are four handlers defined. 'PIL': Use |
|
57 | activated. There are four handlers defined. 'PIL': Use | |
58 | Python Imaging Library to popup image; 'stream': Use an |
|
58 | Python Imaging Library to popup image; 'stream': Use an | |
59 | external program to show the image. Image will be fed into |
|
59 | external program to show the image. Image will be fed into | |
60 | the STDIN of the program. You will need to configure |
|
60 | the STDIN of the program. You will need to configure | |
61 | `stream_image_handler`; 'tempfile': Use an external program to |
|
61 | `stream_image_handler`; 'tempfile': Use an external program to | |
62 | show the image. Image will be saved in a temporally file and |
|
62 | show the image. Image will be saved in a temporally file and | |
63 | the program is called with the temporally file. You will need |
|
63 | the program is called with the temporally file. You will need | |
64 | to configure `tempfile_image_handler`; 'callable': You can set |
|
64 | to configure `tempfile_image_handler`; 'callable': You can set | |
65 | any Python callable which is called with the image data. You |
|
65 | any Python callable which is called with the image data. You | |
66 | will need to configure `callable_image_handler`. |
|
66 | will need to configure `callable_image_handler`. | |
67 | """ |
|
67 | """ | |
68 | ) |
|
68 | ) | |
69 |
|
69 | |||
70 | stream_image_handler = List(config=True, help= |
|
70 | stream_image_handler = List(config=True, help= | |
71 | """ |
|
71 | """ | |
72 | Command to invoke an image viewer program when you are using |
|
72 | Command to invoke an image viewer program when you are using | |
73 | 'stream' image handler. This option is a list of string where |
|
73 | 'stream' image handler. This option is a list of string where | |
74 | the first element is the command itself and reminders are the |
|
74 | the first element is the command itself and reminders are the | |
75 | options for the command. Raw image data is given as STDIN to |
|
75 | options for the command. Raw image data is given as STDIN to | |
76 | the program. |
|
76 | the program. | |
77 | """ |
|
77 | """ | |
78 | ) |
|
78 | ) | |
79 |
|
79 | |||
80 | tempfile_image_handler = List(config=True, help= |
|
80 | tempfile_image_handler = List(config=True, help= | |
81 | """ |
|
81 | """ | |
82 | Command to invoke an image viewer program when you are using |
|
82 | Command to invoke an image viewer program when you are using | |
83 | 'tempfile' image handler. This option is a list of string |
|
83 | 'tempfile' image handler. This option is a list of string | |
84 | where the first element is the command itself and reminders |
|
84 | where the first element is the command itself and reminders | |
85 | are the options for the command. You can use {file} and |
|
85 | are the options for the command. You can use {file} and | |
86 | {format} in the string to represent the location of the |
|
86 | {format} in the string to represent the location of the | |
87 | generated image file and image format. |
|
87 | generated image file and image format. | |
88 | """ |
|
88 | """ | |
89 | ) |
|
89 | ) | |
90 |
|
90 | |||
91 | callable_image_handler = Any(config=True, help= |
|
91 | callable_image_handler = Any(config=True, help= | |
92 | """ |
|
92 | """ | |
93 | Callable object called via 'callable' image handler with one |
|
93 | Callable object called via 'callable' image handler with one | |
94 | argument, `data`, which is `msg["content"]["data"]` where |
|
94 | argument, `data`, which is `msg["content"]["data"]` where | |
95 | `msg` is the message from iopub channel. For exmaple, you can |
|
95 | `msg` is the message from iopub channel. For exmaple, you can | |
96 | find base64 encoded PNG data as `data['image/png']`. |
|
96 | find base64 encoded PNG data as `data['image/png']`. | |
97 | """ |
|
97 | """ | |
98 | ) |
|
98 | ) | |
99 |
|
99 | |||
100 | mime_preference = List( |
|
100 | mime_preference = List( | |
101 | default_value=['image/png', 'image/jpeg', 'image/svg+xml'], |
|
101 | default_value=['image/png', 'image/jpeg', 'image/svg+xml'], | |
102 | config=True, allow_none=False, help= |
|
102 | config=True, allow_none=False, help= | |
103 | """ |
|
103 | """ | |
104 | Preferred object representation MIME type in order. First |
|
104 | Preferred object representation MIME type in order. First | |
105 | matched MIME type will be used. |
|
105 | matched MIME type will be used. | |
106 | """ |
|
106 | """ | |
107 | ) |
|
107 | ) | |
108 |
|
108 | |||
109 | manager = Instance('IPython.kernel.KernelManager') |
|
109 | manager = Instance('IPython.kernel.KernelManager') | |
110 | client = Instance('IPython.kernel.KernelClient') |
|
110 | client = Instance('IPython.kernel.KernelClient') | |
111 | def _client_changed(self, name, old, new): |
|
111 | def _client_changed(self, name, old, new): | |
112 | self.session_id = new.session.session |
|
112 | self.session_id = new.session.session | |
113 | session_id = Unicode() |
|
113 | session_id = Unicode() | |
114 |
|
114 | |||
115 | def init_completer(self): |
|
115 | def init_completer(self): | |
116 | """Initialize the completion machinery. |
|
116 | """Initialize the completion machinery. | |
117 |
|
117 | |||
118 | This creates completion machinery that can be used by client code, |
|
118 | This creates completion machinery that can be used by client code, | |
119 | either interactively in-process (typically triggered by the readline |
|
119 | either interactively in-process (typically triggered by the readline | |
120 | library), programmatically (such as in test suites) or out-of-process |
|
120 | library), programmatically (such as in test suites) or out-of-process | |
121 | (typically over the network by remote frontends). |
|
121 | (typically over the network by remote frontends). | |
122 | """ |
|
122 | """ | |
123 | from IPython.core.completerlib import (module_completer, |
|
123 | from IPython.core.completerlib import (module_completer, | |
124 | magic_run_completer, cd_completer) |
|
124 | magic_run_completer, cd_completer) | |
125 |
|
125 | |||
126 | self.Completer = ZMQCompleter(self, self.client, config=self.config) |
|
126 | self.Completer = ZMQCompleter(self, self.client, config=self.config) | |
127 |
|
127 | |||
128 |
|
128 | |||
129 | self.set_hook('complete_command', module_completer, str_key = 'import') |
|
129 | self.set_hook('complete_command', module_completer, str_key = 'import') | |
130 | self.set_hook('complete_command', module_completer, str_key = 'from') |
|
130 | self.set_hook('complete_command', module_completer, str_key = 'from') | |
131 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') |
|
131 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') | |
132 | self.set_hook('complete_command', cd_completer, str_key = '%cd') |
|
132 | self.set_hook('complete_command', cd_completer, str_key = '%cd') | |
133 |
|
133 | |||
134 | # Only configure readline if we truly are using readline. IPython can |
|
134 | # Only configure readline if we truly are using readline. IPython can | |
135 | # do tab-completion over the network, in GUIs, etc, where readline |
|
135 | # do tab-completion over the network, in GUIs, etc, where readline | |
136 | # itself may be absent |
|
136 | # itself may be absent | |
137 | if self.has_readline: |
|
137 | if self.has_readline: | |
138 | self.set_readline_completer() |
|
138 | self.set_readline_completer() | |
139 |
|
139 | |||
140 | def run_cell(self, cell, store_history=True): |
|
140 | def run_cell(self, cell, store_history=True): | |
141 | """Run a complete IPython cell. |
|
141 | """Run a complete IPython cell. | |
142 |
|
142 | |||
143 | Parameters |
|
143 | Parameters | |
144 | ---------- |
|
144 | ---------- | |
145 | cell : str |
|
145 | cell : str | |
146 | The code (including IPython code such as %magic functions) to run. |
|
146 | The code (including IPython code such as %magic functions) to run. | |
147 | store_history : bool |
|
147 | store_history : bool | |
148 | If True, the raw and translated cell will be stored in IPython's |
|
148 | If True, the raw and translated cell will be stored in IPython's | |
149 | history. For user code calling back into IPython's machinery, this |
|
149 | history. For user code calling back into IPython's machinery, this | |
150 | should be set to False. |
|
150 | should be set to False. | |
151 | """ |
|
151 | """ | |
152 | if (not cell) or cell.isspace(): |
|
152 | if (not cell) or cell.isspace(): | |
153 | # pressing enter flushes any pending display |
|
153 | # pressing enter flushes any pending display | |
154 | self.handle_iopub() |
|
154 | self.handle_iopub() | |
155 | return |
|
155 | return | |
156 |
|
156 | |||
157 | # flush stale replies, which could have been ignored, due to missed heartbeats |
|
157 | # flush stale replies, which could have been ignored, due to missed heartbeats | |
158 | while self.client.shell_channel.msg_ready(): |
|
158 | while self.client.shell_channel.msg_ready(): | |
159 | self.client.shell_channel.get_msg() |
|
159 | self.client.shell_channel.get_msg() | |
160 | # shell_channel.execute takes 'hidden', which is the inverse of store_hist |
|
160 | # shell_channel.execute takes 'hidden', which is the inverse of store_hist | |
161 | msg_id = self.client.shell_channel.execute(cell, not store_history) |
|
161 | msg_id = self.client.shell_channel.execute(cell, not store_history) | |
162 |
|
162 | |||
163 | # first thing is wait for any side effects (output, stdin, etc.) |
|
163 | # first thing is wait for any side effects (output, stdin, etc.) | |
164 | self._executing = True |
|
164 | self._executing = True | |
165 | self._execution_state = "busy" |
|
165 | self._execution_state = "busy" | |
166 | while self._execution_state != 'idle' and self.client.is_alive(): |
|
166 | while self._execution_state != 'idle' and self.client.is_alive(): | |
167 | try: |
|
167 | try: | |
168 | self.handle_input_request(msg_id, timeout=0.05) |
|
168 | self.handle_input_request(msg_id, timeout=0.05) | |
169 | except Empty: |
|
169 | except Empty: | |
170 | # display intermediate print statements, etc. |
|
170 | # display intermediate print statements, etc. | |
171 | self.handle_iopub(msg_id) |
|
171 | self.handle_iopub(msg_id) | |
172 |
|
172 | |||
173 | # after all of that is done, wait for the execute reply |
|
173 | # after all of that is done, wait for the execute reply | |
174 | while self.client.is_alive(): |
|
174 | while self.client.is_alive(): | |
175 | try: |
|
175 | try: | |
176 | self.handle_execute_reply(msg_id, timeout=0.05) |
|
176 | self.handle_execute_reply(msg_id, timeout=0.05) | |
177 | except Empty: |
|
177 | except Empty: | |
178 | pass |
|
178 | pass | |
179 | else: |
|
179 | else: | |
180 | break |
|
180 | break | |
181 | self._executing = False |
|
181 | self._executing = False | |
182 |
|
182 | |||
183 | #----------------- |
|
183 | #----------------- | |
184 | # message handlers |
|
184 | # message handlers | |
185 | #----------------- |
|
185 | #----------------- | |
186 |
|
186 | |||
187 | def handle_execute_reply(self, msg_id, timeout=None): |
|
187 | def handle_execute_reply(self, msg_id, timeout=None): | |
188 | msg = self.client.shell_channel.get_msg(block=False, timeout=timeout) |
|
188 | msg = self.client.shell_channel.get_msg(block=False, timeout=timeout) | |
189 | if msg["parent_header"].get("msg_id", None) == msg_id: |
|
189 | if msg["parent_header"].get("msg_id", None) == msg_id: | |
190 |
|
190 | |||
191 | self.handle_iopub(msg_id) |
|
191 | self.handle_iopub(msg_id) | |
192 |
|
192 | |||
193 | content = msg["content"] |
|
193 | content = msg["content"] | |
194 | status = content['status'] |
|
194 | status = content['status'] | |
195 |
|
195 | |||
196 | if status == 'aborted': |
|
196 | if status == 'aborted': | |
197 | self.write('Aborted\n') |
|
197 | self.write('Aborted\n') | |
198 | return |
|
198 | return | |
199 | elif status == 'ok': |
|
199 | elif status == 'ok': | |
200 | # handle payloads |
|
200 | # handle payloads | |
201 | for item in content["payload"]: |
|
201 | for item in content["payload"]: | |
202 | source = item['source'] |
|
202 | source = item['source'] | |
203 | if source == 'page': |
|
203 | if source == 'page': | |
204 | page.page(item['data']['text/plain']) |
|
204 | page.page(item['data']['text/plain']) | |
205 | elif source == 'set_next_input': |
|
205 | elif source == 'set_next_input': | |
206 | self.set_next_input(item['text']) |
|
206 | self.set_next_input(item['text']) | |
207 | elif source == 'ask_exit': |
|
207 | elif source == 'ask_exit': | |
208 | self.ask_exit() |
|
208 | self.ask_exit() | |
209 |
|
209 | |||
210 | elif status == 'error': |
|
210 | elif status == 'error': | |
211 | for frame in content["traceback"]: |
|
211 | for frame in content["traceback"]: | |
212 | print(frame, file=io.stderr) |
|
212 | print(frame, file=io.stderr) | |
213 |
|
213 | |||
214 | self.execution_count = int(content["execution_count"] + 1) |
|
214 | self.execution_count = int(content["execution_count"] + 1) | |
215 |
|
215 | |||
216 | include_other_output = Bool(False, config=True, |
|
216 | include_other_output = Bool(False, config=True, | |
217 | help="""Whether to include output from clients |
|
217 | help="""Whether to include output from clients | |
218 | other than this one sharing the same kernel. |
|
218 | other than this one sharing the same kernel. | |
219 |
|
219 | |||
220 | Outputs are not displayed until enter is pressed. |
|
220 | Outputs are not displayed until enter is pressed. | |
221 | """ |
|
221 | """ | |
222 | ) |
|
222 | ) | |
223 | other_output_prefix = Unicode("[remote] ", config=True, |
|
223 | other_output_prefix = Unicode("[remote] ", config=True, | |
224 | help="""Prefix to add to outputs coming from clients other than this one. |
|
224 | help="""Prefix to add to outputs coming from clients other than this one. | |
225 |
|
225 | |||
226 | Only relevant if include_other_output is True. |
|
226 | Only relevant if include_other_output is True. | |
227 | """ |
|
227 | """ | |
228 | ) |
|
228 | ) | |
229 |
|
229 | |||
230 | def from_here(self, msg): |
|
230 | def from_here(self, msg): | |
231 | """Return whether a message is from this session""" |
|
231 | """Return whether a message is from this session""" | |
232 | return msg['parent_header'].get("session", self.session_id) == self.session_id |
|
232 | return msg['parent_header'].get("session", self.session_id) == self.session_id | |
233 |
|
233 | |||
234 | def include_output(self, msg): |
|
234 | def include_output(self, msg): | |
235 | """Return whether we should include a given output message""" |
|
235 | """Return whether we should include a given output message""" | |
236 | from_here = self.from_here(msg) |
|
236 | from_here = self.from_here(msg) | |
237 | if msg['msg_type'] == 'execute_input': |
|
237 | if msg['msg_type'] == 'execute_input': | |
238 | # only echo inputs not from here |
|
238 | # only echo inputs not from here | |
239 | return self.include_other_output and not from_here |
|
239 | return self.include_other_output and not from_here | |
240 |
|
240 | |||
241 | if self.include_other_output: |
|
241 | if self.include_other_output: | |
242 | return True |
|
242 | return True | |
243 | else: |
|
243 | else: | |
244 | return from_here |
|
244 | return from_here | |
245 |
|
245 | |||
246 | def handle_iopub(self, msg_id=''): |
|
246 | def handle_iopub(self, msg_id=''): | |
247 | """Process messages on the IOPub channel |
|
247 | """Process messages on the IOPub channel | |
248 |
|
248 | |||
249 | This method consumes and processes messages on the IOPub channel, |
|
249 | This method consumes and processes messages on the IOPub channel, | |
250 | such as stdout, stderr, execute_result and status. |
|
250 | such as stdout, stderr, execute_result and status. | |
251 |
|
251 | |||
252 | It only displays output that is caused by this session. |
|
252 | It only displays output that is caused by this session. | |
253 | """ |
|
253 | """ | |
254 | while self.client.iopub_channel.msg_ready(): |
|
254 | while self.client.iopub_channel.msg_ready(): | |
255 | sub_msg = self.client.iopub_channel.get_msg() |
|
255 | sub_msg = self.client.iopub_channel.get_msg() | |
256 | msg_type = sub_msg['header']['msg_type'] |
|
256 | msg_type = sub_msg['header']['msg_type'] | |
257 | parent = sub_msg["parent_header"] |
|
257 | parent = sub_msg["parent_header"] | |
258 |
|
258 | |||
259 | if self.include_output(sub_msg): |
|
259 | if self.include_output(sub_msg): | |
260 | if msg_type == 'status': |
|
260 | if msg_type == 'status': | |
261 | self._execution_state = sub_msg["content"]["execution_state"] |
|
261 | self._execution_state = sub_msg["content"]["execution_state"] | |
262 | elif msg_type == 'stream': |
|
262 | elif msg_type == 'stream': | |
263 | if sub_msg["content"]["name"] == "stdout": |
|
263 | if sub_msg["content"]["name"] == "stdout": | |
264 | if self._pending_clearoutput: |
|
264 | if self._pending_clearoutput: | |
265 | print("\r", file=io.stdout, end="") |
|
265 | print("\r", file=io.stdout, end="") | |
266 | self._pending_clearoutput = False |
|
266 | self._pending_clearoutput = False | |
267 | print(sub_msg["content"]["text"], file=io.stdout, end="") |
|
267 | print(sub_msg["content"]["text"], file=io.stdout, end="") | |
268 | io.stdout.flush() |
|
268 | io.stdout.flush() | |
269 | elif sub_msg["content"]["name"] == "stderr": |
|
269 | elif sub_msg["content"]["name"] == "stderr": | |
270 | if self._pending_clearoutput: |
|
270 | if self._pending_clearoutput: | |
271 | print("\r", file=io.stderr, end="") |
|
271 | print("\r", file=io.stderr, end="") | |
272 | self._pending_clearoutput = False |
|
272 | self._pending_clearoutput = False | |
273 | print(sub_msg["content"]["text"], file=io.stderr, end="") |
|
273 | print(sub_msg["content"]["text"], file=io.stderr, end="") | |
274 | io.stderr.flush() |
|
274 | io.stderr.flush() | |
275 |
|
275 | |||
276 | elif msg_type == 'execute_result': |
|
276 | elif msg_type == 'execute_result': | |
277 | if self._pending_clearoutput: |
|
277 | if self._pending_clearoutput: | |
278 | print("\r", file=io.stdout, end="") |
|
278 | print("\r", file=io.stdout, end="") | |
279 | self._pending_clearoutput = False |
|
279 | self._pending_clearoutput = False | |
280 | self.execution_count = int(sub_msg["content"]["execution_count"]) |
|
280 | self.execution_count = int(sub_msg["content"]["execution_count"]) | |
281 | if not self.from_here(sub_msg): |
|
281 | if not self.from_here(sub_msg): | |
282 | sys.stdout.write(self.other_output_prefix) |
|
282 | sys.stdout.write(self.other_output_prefix) | |
283 | format_dict = sub_msg["content"]["data"] |
|
283 | format_dict = sub_msg["content"]["data"] | |
284 | self.handle_rich_data(format_dict) |
|
284 | self.handle_rich_data(format_dict) | |
285 |
|
285 | |||
286 | # taken from DisplayHook.__call__: |
|
286 | # taken from DisplayHook.__call__: | |
287 | hook = self.displayhook |
|
287 | hook = self.displayhook | |
288 | hook.start_displayhook() |
|
288 | hook.start_displayhook() | |
289 | hook.write_output_prompt() |
|
289 | hook.write_output_prompt() | |
290 | hook.write_format_data(format_dict) |
|
290 | hook.write_format_data(format_dict) | |
291 | hook.log_output(format_dict) |
|
291 | hook.log_output(format_dict) | |
292 | hook.finish_displayhook() |
|
292 | hook.finish_displayhook() | |
293 |
|
293 | |||
294 | elif msg_type == 'display_data': |
|
294 | elif msg_type == 'display_data': | |
295 | data = sub_msg["content"]["data"] |
|
295 | data = sub_msg["content"]["data"] | |
296 | handled = self.handle_rich_data(data) |
|
296 | handled = self.handle_rich_data(data) | |
297 | if not handled: |
|
297 | if not handled: | |
298 | if not self.from_here(sub_msg): |
|
298 | if not self.from_here(sub_msg): | |
299 | sys.stdout.write(self.other_output_prefix) |
|
299 | sys.stdout.write(self.other_output_prefix) | |
300 | # if it was an image, we handled it by now |
|
300 | # if it was an image, we handled it by now | |
301 | if 'text/plain' in data: |
|
301 | if 'text/plain' in data: | |
302 | print(data['text/plain']) |
|
302 | print(data['text/plain']) | |
303 |
|
303 | |||
304 | elif msg_type == 'execute_input': |
|
304 | elif msg_type == 'execute_input': | |
305 | content = sub_msg['content'] |
|
305 | content = sub_msg['content'] | |
306 | self.execution_count = content['execution_count'] |
|
306 | self.execution_count = content['execution_count'] | |
307 | if not self.from_here(sub_msg): |
|
307 | if not self.from_here(sub_msg): | |
308 | sys.stdout.write(self.other_output_prefix) |
|
308 | sys.stdout.write(self.other_output_prefix) | |
309 | sys.stdout.write(self.prompt_manager.render('in')) |
|
309 | sys.stdout.write(self.prompt_manager.render('in')) | |
310 | sys.stdout.write(content['code']) |
|
310 | sys.stdout.write(content['code']) | |
311 |
|
311 | |||
312 | elif msg_type == 'clear_output': |
|
312 | elif msg_type == 'clear_output': | |
313 | if sub_msg["content"]["wait"]: |
|
313 | if sub_msg["content"]["wait"]: | |
314 | self._pending_clearoutput = True |
|
314 | self._pending_clearoutput = True | |
315 | else: |
|
315 | else: | |
316 | print("\r", file=io.stdout, end="") |
|
316 | print("\r", file=io.stdout, end="") | |
317 |
|
317 | |||
318 | _imagemime = { |
|
318 | _imagemime = { | |
319 | 'image/png': 'png', |
|
319 | 'image/png': 'png', | |
320 | 'image/jpeg': 'jpeg', |
|
320 | 'image/jpeg': 'jpeg', | |
321 | 'image/svg+xml': 'svg', |
|
321 | 'image/svg+xml': 'svg', | |
322 | } |
|
322 | } | |
323 |
|
323 | |||
324 | def handle_rich_data(self, data): |
|
324 | def handle_rich_data(self, data): | |
325 | for mime in self.mime_preference: |
|
325 | for mime in self.mime_preference: | |
326 | if mime in data and mime in self._imagemime: |
|
326 | if mime in data and mime in self._imagemime: | |
327 | self.handle_image(data, mime) |
|
327 | self.handle_image(data, mime) | |
328 | return True |
|
328 | return True | |
329 |
|
329 | |||
330 | def handle_image(self, data, mime): |
|
330 | def handle_image(self, data, mime): | |
331 | handler = getattr( |
|
331 | handler = getattr( | |
332 | self, 'handle_image_{0}'.format(self.image_handler), None) |
|
332 | self, 'handle_image_{0}'.format(self.image_handler), None) | |
333 | if handler: |
|
333 | if handler: | |
334 | handler(data, mime) |
|
334 | handler(data, mime) | |
335 |
|
335 | |||
336 | def handle_image_PIL(self, data, mime): |
|
336 | def handle_image_PIL(self, data, mime): | |
337 | if mime not in ('image/png', 'image/jpeg'): |
|
337 | if mime not in ('image/png', 'image/jpeg'): | |
338 | return |
|
338 | return | |
339 | import PIL.Image |
|
339 | import PIL.Image | |
340 | raw = base64.decodestring(data[mime].encode('ascii')) |
|
340 | raw = base64.decodestring(data[mime].encode('ascii')) | |
341 | img = PIL.Image.open(BytesIO(raw)) |
|
341 | img = PIL.Image.open(BytesIO(raw)) | |
342 | img.show() |
|
342 | img.show() | |
343 |
|
343 | |||
344 | def handle_image_stream(self, data, mime): |
|
344 | def handle_image_stream(self, data, mime): | |
345 | raw = base64.decodestring(data[mime].encode('ascii')) |
|
345 | raw = base64.decodestring(data[mime].encode('ascii')) | |
346 | imageformat = self._imagemime[mime] |
|
346 | imageformat = self._imagemime[mime] | |
347 | fmt = dict(format=imageformat) |
|
347 | fmt = dict(format=imageformat) | |
348 | args = [s.format(**fmt) for s in self.stream_image_handler] |
|
348 | args = [s.format(**fmt) for s in self.stream_image_handler] | |
349 | with open(os.devnull, 'w') as devnull: |
|
349 | with open(os.devnull, 'w') as devnull: | |
350 | proc = subprocess.Popen( |
|
350 | proc = subprocess.Popen( | |
351 | args, stdin=subprocess.PIPE, |
|
351 | args, stdin=subprocess.PIPE, | |
352 | stdout=devnull, stderr=devnull) |
|
352 | stdout=devnull, stderr=devnull) | |
353 | proc.communicate(raw) |
|
353 | proc.communicate(raw) | |
354 |
|
354 | |||
355 | def handle_image_tempfile(self, data, mime): |
|
355 | def handle_image_tempfile(self, data, mime): | |
356 | raw = base64.decodestring(data[mime].encode('ascii')) |
|
356 | raw = base64.decodestring(data[mime].encode('ascii')) | |
357 | imageformat = self._imagemime[mime] |
|
357 | imageformat = self._imagemime[mime] | |
358 | filename = 'tmp.{0}'.format(imageformat) |
|
358 | filename = 'tmp.{0}'.format(imageformat) | |
359 | with NamedFileInTemporaryDirectory(filename) as f, \ |
|
359 | with NamedFileInTemporaryDirectory(filename) as f, \ | |
360 | open(os.devnull, 'w') as devnull: |
|
360 | open(os.devnull, 'w') as devnull: | |
361 | f.write(raw) |
|
361 | f.write(raw) | |
362 | f.flush() |
|
362 | f.flush() | |
363 | fmt = dict(file=f.name, format=imageformat) |
|
363 | fmt = dict(file=f.name, format=imageformat) | |
364 | args = [s.format(**fmt) for s in self.tempfile_image_handler] |
|
364 | args = [s.format(**fmt) for s in self.tempfile_image_handler] | |
365 | subprocess.call(args, stdout=devnull, stderr=devnull) |
|
365 | subprocess.call(args, stdout=devnull, stderr=devnull) | |
366 |
|
366 | |||
367 | def handle_image_callable(self, data, mime): |
|
367 | def handle_image_callable(self, data, mime): | |
368 | self.callable_image_handler(data) |
|
368 | self.callable_image_handler(data) | |
369 |
|
369 | |||
370 | def handle_input_request(self, msg_id, timeout=0.1): |
|
370 | def handle_input_request(self, msg_id, timeout=0.1): | |
371 | """ Method to capture raw_input |
|
371 | """ Method to capture raw_input | |
372 | """ |
|
372 | """ | |
373 | req = self.client.stdin_channel.get_msg(timeout=timeout) |
|
373 | req = self.client.stdin_channel.get_msg(timeout=timeout) | |
374 | # in case any iopub came while we were waiting: |
|
374 | # in case any iopub came while we were waiting: | |
375 | self.handle_iopub(msg_id) |
|
375 | self.handle_iopub(msg_id) | |
376 | if msg_id == req["parent_header"].get("msg_id"): |
|
376 | if msg_id == req["parent_header"].get("msg_id"): | |
377 | # wrap SIGINT handler |
|
377 | # wrap SIGINT handler | |
378 | real_handler = signal.getsignal(signal.SIGINT) |
|
378 | real_handler = signal.getsignal(signal.SIGINT) | |
379 | def double_int(sig,frame): |
|
379 | def double_int(sig,frame): | |
380 | # call real handler (forwards sigint to kernel), |
|
380 | # call real handler (forwards sigint to kernel), | |
381 | # then raise local interrupt, stopping local raw_input |
|
381 | # then raise local interrupt, stopping local raw_input | |
382 | real_handler(sig,frame) |
|
382 | real_handler(sig,frame) | |
383 | raise KeyboardInterrupt |
|
383 | raise KeyboardInterrupt | |
384 | signal.signal(signal.SIGINT, double_int) |
|
384 | signal.signal(signal.SIGINT, double_int) | |
385 | content = req['content'] |
|
385 | content = req['content'] | |
386 | read = getpass if content.get('password', False) else input |
|
386 | read = getpass if content.get('password', False) else input | |
387 | try: |
|
387 | try: | |
388 | raw_data = read(content["prompt"]) |
|
388 | raw_data = read(content["prompt"]) | |
389 | except EOFError: |
|
389 | except EOFError: | |
390 | # turn EOFError into EOF character |
|
390 | # turn EOFError into EOF character | |
391 | raw_data = '\x04' |
|
391 | raw_data = '\x04' | |
392 | except KeyboardInterrupt: |
|
392 | except KeyboardInterrupt: | |
393 | sys.stdout.write('\n') |
|
393 | sys.stdout.write('\n') | |
394 | return |
|
394 | return | |
395 | finally: |
|
395 | finally: | |
396 | # restore SIGINT handler |
|
396 | # restore SIGINT handler | |
397 | signal.signal(signal.SIGINT, real_handler) |
|
397 | signal.signal(signal.SIGINT, real_handler) | |
398 |
|
398 | |||
399 | # only send stdin reply if there *was not* another request |
|
399 | # only send stdin reply if there *was not* another request | |
400 | # or execution finished while we were reading. |
|
400 | # or execution finished while we were reading. | |
401 | if not (self.client.stdin_channel.msg_ready() or self.client.shell_channel.msg_ready()): |
|
401 | if not (self.client.stdin_channel.msg_ready() or self.client.shell_channel.msg_ready()): | |
402 | self.client.stdin_channel.input(raw_data) |
|
402 | self.client.stdin_channel.input(raw_data) | |
403 |
|
403 | |||
404 | def mainloop(self, display_banner=False): |
|
404 | def mainloop(self, display_banner=False): | |
405 | while True: |
|
405 | while True: | |
406 | try: |
|
406 | try: | |
407 | self.interact(display_banner=display_banner) |
|
407 | self.interact(display_banner=display_banner) | |
408 | #self.interact_with_readline() |
|
408 | #self.interact_with_readline() | |
409 | # XXX for testing of a readline-decoupled repl loop, call |
|
409 | # XXX for testing of a readline-decoupled repl loop, call | |
410 | # interact_with_readline above |
|
410 | # interact_with_readline above | |
411 | break |
|
411 | break | |
412 | except KeyboardInterrupt: |
|
412 | except KeyboardInterrupt: | |
413 | # this should not be necessary, but KeyboardInterrupt |
|
413 | # this should not be necessary, but KeyboardInterrupt | |
414 | # handling seems rather unpredictable... |
|
414 | # handling seems rather unpredictable... | |
415 | self.write("\nKeyboardInterrupt in interact()\n") |
|
415 | self.write("\nKeyboardInterrupt in interact()\n") | |
416 |
|
416 | |||
|
417 | self.client.shell_channel.shutdown() | |||
|
418 | ||||
417 | def _banner1_default(self): |
|
419 | def _banner1_default(self): | |
418 | return "IPython Console {version}\n".format(version=release.version) |
|
420 | return "IPython Console {version}\n".format(version=release.version) | |
419 |
|
421 | |||
420 | def compute_banner(self): |
|
422 | def compute_banner(self): | |
421 | super(ZMQTerminalInteractiveShell, self).compute_banner() |
|
423 | super(ZMQTerminalInteractiveShell, self).compute_banner() | |
422 | if self.client and not self.kernel_banner: |
|
424 | if self.client and not self.kernel_banner: | |
423 | msg_id = self.client.kernel_info() |
|
425 | msg_id = self.client.kernel_info() | |
424 | while True: |
|
426 | while True: | |
425 | try: |
|
427 | try: | |
426 | reply = self.client.get_shell_msg(timeout=1) |
|
428 | reply = self.client.get_shell_msg(timeout=1) | |
427 | except Empty: |
|
429 | except Empty: | |
428 | break |
|
430 | break | |
429 | else: |
|
431 | else: | |
430 | if reply['parent_header'].get('msg_id') == msg_id: |
|
432 | if reply['parent_header'].get('msg_id') == msg_id: | |
431 | self.kernel_banner = reply['content'].get('banner', '') |
|
433 | self.kernel_banner = reply['content'].get('banner', '') | |
432 | break |
|
434 | break | |
433 | self.banner += self.kernel_banner |
|
435 | self.banner += self.kernel_banner | |
434 |
|
436 | |||
435 | def wait_for_kernel(self, timeout=None): |
|
437 | def wait_for_kernel(self, timeout=None): | |
436 | """method to wait for a kernel to be ready""" |
|
438 | """method to wait for a kernel to be ready""" | |
437 | tic = time.time() |
|
439 | tic = time.time() | |
438 | self.client.hb_channel.unpause() |
|
440 | self.client.hb_channel.unpause() | |
439 | while True: |
|
441 | while True: | |
440 | msg_id = self.client.kernel_info() |
|
442 | msg_id = self.client.kernel_info() | |
441 | reply = None |
|
443 | reply = None | |
442 | while True: |
|
444 | while True: | |
443 | try: |
|
445 | try: | |
444 | reply = self.client.get_shell_msg(timeout=1) |
|
446 | reply = self.client.get_shell_msg(timeout=1) | |
445 | except Empty: |
|
447 | except Empty: | |
446 | break |
|
448 | break | |
447 | else: |
|
449 | else: | |
448 | if reply['parent_header'].get('msg_id') == msg_id: |
|
450 | if reply['parent_header'].get('msg_id') == msg_id: | |
449 | return True |
|
451 | return True | |
450 | if timeout is not None \ |
|
452 | if timeout is not None \ | |
451 | and (time.time() - tic) > timeout \ |
|
453 | and (time.time() - tic) > timeout \ | |
452 | and not self.client.hb_channel.is_beating(): |
|
454 | and not self.client.hb_channel.is_beating(): | |
453 | # heart failed |
|
455 | # heart failed | |
454 | return False |
|
456 | return False | |
455 | return True |
|
457 | return True | |
456 |
|
458 | |||
457 | def interact(self, display_banner=None): |
|
459 | def interact(self, display_banner=None): | |
458 | """Closely emulate the interactive Python console.""" |
|
460 | """Closely emulate the interactive Python console.""" | |
459 |
|
461 | |||
460 | # batch run -> do not interact |
|
462 | # batch run -> do not interact | |
461 | if self.exit_now: |
|
463 | if self.exit_now: | |
462 | return |
|
464 | return | |
463 |
|
465 | |||
464 | if display_banner is None: |
|
466 | if display_banner is None: | |
465 | display_banner = self.display_banner |
|
467 | display_banner = self.display_banner | |
466 |
|
468 | |||
467 | if isinstance(display_banner, string_types): |
|
469 | if isinstance(display_banner, string_types): | |
468 | self.show_banner(display_banner) |
|
470 | self.show_banner(display_banner) | |
469 | elif display_banner: |
|
471 | elif display_banner: | |
470 | self.show_banner() |
|
472 | self.show_banner() | |
471 |
|
473 | |||
472 | more = False |
|
474 | more = False | |
473 |
|
475 | |||
474 | # run a non-empty no-op, so that we don't get a prompt until |
|
476 | # run a non-empty no-op, so that we don't get a prompt until | |
475 | # we know the kernel is ready. This keeps the connection |
|
477 | # we know the kernel is ready. This keeps the connection | |
476 | # message above the first prompt. |
|
478 | # message above the first prompt. | |
477 | if not self.wait_for_kernel(self.kernel_timeout): |
|
479 | if not self.wait_for_kernel(self.kernel_timeout): | |
478 | error("Kernel did not respond\n") |
|
480 | error("Kernel did not respond\n") | |
479 | return |
|
481 | return | |
480 |
|
482 | |||
481 | if self.has_readline: |
|
483 | if self.has_readline: | |
482 | self.readline_startup_hook(self.pre_readline) |
|
484 | self.readline_startup_hook(self.pre_readline) | |
483 | hlen_b4_cell = self.readline.get_current_history_length() |
|
485 | hlen_b4_cell = self.readline.get_current_history_length() | |
484 | else: |
|
486 | else: | |
485 | hlen_b4_cell = 0 |
|
487 | hlen_b4_cell = 0 | |
486 | # exit_now is set by a call to %Exit or %Quit, through the |
|
488 | # exit_now is set by a call to %Exit or %Quit, through the | |
487 | # ask_exit callback. |
|
489 | # ask_exit callback. | |
488 |
|
490 | |||
489 | while not self.exit_now: |
|
491 | while not self.exit_now: | |
490 | if not self.client.is_alive(): |
|
492 | if not self.client.is_alive(): | |
491 | # kernel died, prompt for action or exit |
|
493 | # kernel died, prompt for action or exit | |
492 |
|
494 | |||
493 | action = "restart" if self.manager else "wait for restart" |
|
495 | action = "restart" if self.manager else "wait for restart" | |
494 | ans = self.ask_yes_no("kernel died, %s ([y]/n)?" % action, default='y') |
|
496 | ans = self.ask_yes_no("kernel died, %s ([y]/n)?" % action, default='y') | |
495 | if ans: |
|
497 | if ans: | |
496 | if self.manager: |
|
498 | if self.manager: | |
497 | self.manager.restart_kernel(True) |
|
499 | self.manager.restart_kernel(True) | |
498 | self.wait_for_kernel(self.kernel_timeout) |
|
500 | self.wait_for_kernel(self.kernel_timeout) | |
499 | else: |
|
501 | else: | |
500 | self.exit_now = True |
|
502 | self.exit_now = True | |
501 | continue |
|
503 | continue | |
502 | try: |
|
504 | try: | |
503 | # protect prompt block from KeyboardInterrupt |
|
505 | # protect prompt block from KeyboardInterrupt | |
504 | # when sitting on ctrl-C |
|
506 | # when sitting on ctrl-C | |
505 | self.hooks.pre_prompt_hook() |
|
507 | self.hooks.pre_prompt_hook() | |
506 | if more: |
|
508 | if more: | |
507 | try: |
|
509 | try: | |
508 | prompt = self.prompt_manager.render('in2') |
|
510 | prompt = self.prompt_manager.render('in2') | |
509 | except Exception: |
|
511 | except Exception: | |
510 | self.showtraceback() |
|
512 | self.showtraceback() | |
511 | if self.autoindent: |
|
513 | if self.autoindent: | |
512 | self.rl_do_indent = True |
|
514 | self.rl_do_indent = True | |
513 |
|
515 | |||
514 | else: |
|
516 | else: | |
515 | try: |
|
517 | try: | |
516 | prompt = self.separate_in + self.prompt_manager.render('in') |
|
518 | prompt = self.separate_in + self.prompt_manager.render('in') | |
517 | except Exception: |
|
519 | except Exception: | |
518 | self.showtraceback() |
|
520 | self.showtraceback() | |
519 |
|
521 | |||
520 | line = self.raw_input(prompt) |
|
522 | line = self.raw_input(prompt) | |
521 | if self.exit_now: |
|
523 | if self.exit_now: | |
522 | # quick exit on sys.std[in|out] close |
|
524 | # quick exit on sys.std[in|out] close | |
523 | break |
|
525 | break | |
524 | if self.autoindent: |
|
526 | if self.autoindent: | |
525 | self.rl_do_indent = False |
|
527 | self.rl_do_indent = False | |
526 |
|
528 | |||
527 | except KeyboardInterrupt: |
|
529 | except KeyboardInterrupt: | |
528 | #double-guard against keyboardinterrupts during kbdint handling |
|
530 | #double-guard against keyboardinterrupts during kbdint handling | |
529 | try: |
|
531 | try: | |
530 | self.write('\nKeyboardInterrupt\n') |
|
532 | self.write('\nKeyboardInterrupt\n') | |
531 | source_raw = self.input_splitter.raw_reset() |
|
533 | source_raw = self.input_splitter.raw_reset() | |
532 | hlen_b4_cell = self._replace_rlhist_multiline(source_raw, hlen_b4_cell) |
|
534 | hlen_b4_cell = self._replace_rlhist_multiline(source_raw, hlen_b4_cell) | |
533 | more = False |
|
535 | more = False | |
534 | except KeyboardInterrupt: |
|
536 | except KeyboardInterrupt: | |
535 | pass |
|
537 | pass | |
536 | except EOFError: |
|
538 | except EOFError: | |
537 | if self.autoindent: |
|
539 | if self.autoindent: | |
538 | self.rl_do_indent = False |
|
540 | self.rl_do_indent = False | |
539 | if self.has_readline: |
|
541 | if self.has_readline: | |
540 | self.readline_startup_hook(None) |
|
542 | self.readline_startup_hook(None) | |
541 | self.write('\n') |
|
543 | self.write('\n') | |
542 | self.exit() |
|
544 | self.exit() | |
543 | except bdb.BdbQuit: |
|
545 | except bdb.BdbQuit: | |
544 | warn('The Python debugger has exited with a BdbQuit exception.\n' |
|
546 | warn('The Python debugger has exited with a BdbQuit exception.\n' | |
545 | 'Because of how pdb handles the stack, it is impossible\n' |
|
547 | 'Because of how pdb handles the stack, it is impossible\n' | |
546 | 'for IPython to properly format this particular exception.\n' |
|
548 | 'for IPython to properly format this particular exception.\n' | |
547 | 'IPython will resume normal operation.') |
|
549 | 'IPython will resume normal operation.') | |
548 | except: |
|
550 | except: | |
549 | # exceptions here are VERY RARE, but they can be triggered |
|
551 | # exceptions here are VERY RARE, but they can be triggered | |
550 | # asynchronously by signal handlers, for example. |
|
552 | # asynchronously by signal handlers, for example. | |
551 | self.showtraceback() |
|
553 | self.showtraceback() | |
552 | else: |
|
554 | else: | |
553 | try: |
|
555 | try: | |
554 | self.input_splitter.push(line) |
|
556 | self.input_splitter.push(line) | |
555 | more = self.input_splitter.push_accepts_more() |
|
557 | more = self.input_splitter.push_accepts_more() | |
556 | except SyntaxError: |
|
558 | except SyntaxError: | |
557 | # Run the code directly - run_cell takes care of displaying |
|
559 | # Run the code directly - run_cell takes care of displaying | |
558 | # the exception. |
|
560 | # the exception. | |
559 | more = False |
|
561 | more = False | |
560 | if (self.SyntaxTB.last_syntax_error and |
|
562 | if (self.SyntaxTB.last_syntax_error and | |
561 | self.autoedit_syntax): |
|
563 | self.autoedit_syntax): | |
562 | self.edit_syntax_error() |
|
564 | self.edit_syntax_error() | |
563 | if not more: |
|
565 | if not more: | |
564 | source_raw = self.input_splitter.raw_reset() |
|
566 | source_raw = self.input_splitter.raw_reset() | |
565 | hlen_b4_cell = self._replace_rlhist_multiline(source_raw, hlen_b4_cell) |
|
567 | hlen_b4_cell = self._replace_rlhist_multiline(source_raw, hlen_b4_cell) | |
566 | self.run_cell(source_raw) |
|
568 | self.run_cell(source_raw) | |
567 |
|
569 | |||
568 |
|
570 | |||
569 | # Turn off the exit flag, so the mainloop can be restarted if desired |
|
571 | # Turn off the exit flag, so the mainloop can be restarted if desired | |
570 | self.exit_now = False |
|
572 | self.exit_now = False |
General Comments 0
You need to be logged in to leave comments.
Login now