p6micgy9w
/
monkeyking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix jupyter_client warning

Browse Source
pull/6178/head
martinRenou 4 years ago
parent 65e9701d03
commit 257e6e5478
4 changed files with 77 additions and 57 deletions
Show Stats Download Patch File Download Diff File

35
notebook/base/zmqhandlers.py
Unescape View File

@ -14,7 +14,12 @@ from tornado.iostream import StreamClosedError
from tornado.websocket import WebSocketHandler, WebSocketClosedError
from jupyter_client.session import Session
from jupyter_client.jsonutil import date_default, extract_dates
try:
from jupyter_client.jsonutil import json_default, extract_dates
except ImportError:
from jupyter_client.jsonutil import (
date_default as json_default, extract_dates
)
from ipython_genutils.py3compat import cast_unicode
from notebook.utils import maybe_future
@ -40,7 +45,7 @@ def serialize_binary_message(msg):
# don't modify msg or buffer list in-place
msg = msg.copy()
buffers = list(msg.pop('buffers'))
bmsg = json.dumps(msg, default=date_default).encode('utf8')
bmsg = json.dumps(msg, default=json_default).encode('utf8')
buffers.insert(0, bmsg)
nbufs = len(buffers)
offsets = [4 * (nbufs + 1)]
@ -88,15 +93,15 @@ class WebSocketMixin(object):
last_ping = 0
last_pong = 0
stream = None
@property
def ping_interval(self):
"""The interval for websocket keep-alive pings.
Set ws_ping_interval = 0 to disable pings.
"""
return self.settings.get('ws_ping_interval', WS_PING_INTERVAL)
@property
def ping_timeout(self):
"""If no ping is received in this many milliseconds,
@ -109,7 +114,7 @@ class WebSocketMixin(object):
def check_origin(self, origin=None):
"""Check Origin == Host or Access-Control-Allow-Origin.
Tornado >= 4 calls this method automatically, raising 403 if it returns False.
"""
@ -120,18 +125,18 @@ class WebSocketMixin(object):
host = self.request.headers.get("Host")
if origin is None:
origin = self.get_origin()
# If no origin or host header is provided, assume from script
if origin is None or host is None:
return True
origin = origin.lower()
origin_host = urlparse(origin).netloc
# OK if origin matches host
if origin_host == host:
return True
# Check CORS headers
if self.allow_origin:
allow = self.allow_origin == origin
@ -193,7 +198,7 @@ class WebSocketMixin(object):
class ZMQStreamHandler(WebSocketMixin, WebSocketHandler):
if tornado.version_info < (4,1):
"""Backport send_error from tornado 4.1 to 4.0"""
def send_error(self, *args, **kwargs):
@ -206,17 +211,17 @@ class ZMQStreamHandler(WebSocketMixin, WebSocketHandler):
# we can close the connection more gracefully.
self.stream.close()
def _reserialize_reply(self, msg_or_list, channel=None):
"""Reserialize a reply message using JSON.
msg_or_list can be an already-deserialized msg dict or the zmq buffer list.
If it is the zmq list, it will be deserialized with self.session.
This takes the msg list from the ZMQ socket and serializes the result for the websocket.
This method should be used by self._on_zmq_reply to build messages that can
be sent back to the browser.
"""
if isinstance(msg_or_list, dict):
# already unpacked
@ -230,7 +235,7 @@ class ZMQStreamHandler(WebSocketMixin, WebSocketHandler):
buf = serialize_binary_message(msg)
return buf
else:
smsg = json.dumps(msg, default=date_default)
smsg = json.dumps(msg, default=json_default)
return cast_unicode(smsg)
def _on_zmq_reply(self, stream, msg_list):

25
notebook/services/contents/handlers.py
Unescape View File

@ -11,7 +11,12 @@ import json
from tornado import gen, web
from notebook.utils import maybe_future, url_path_join, url_escape
from jupyter_client.jsonutil import date_default
try:
from jupyter_client.jsonutil import json_default
except ImportError:
from jupyter_client.jsonutil import (
date_default as json_default
)
from notebook.base.handlers import (
IPythonHandler, APIHandler, path_regex,
@ -85,7 +90,7 @@ class ContentsHandler(APIHandler):
self.set_header('Location', location)
self.set_header('Last-Modified', model['last_modified'])
self.set_header('Content-Type', 'application/json')
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
@web.authenticated
@gen.coroutine
@ -107,7 +112,7 @@ class ContentsHandler(APIHandler):
if content not in {'0', '1'}:
raise web.HTTPError(400, u'Content %r is invalid' % content)
content = int(content)
model = yield maybe_future(self.contents_manager.get(
path=path, type=type, format=format, content=content,
))
@ -125,7 +130,7 @@ class ContentsHandler(APIHandler):
model = yield maybe_future(cm.update(model, path))
validate_model(model, expect_content=False)
self._finish_model(model)
@gen.coroutine
def _copy(self, copy_from, copy_to=None):
"""Copy a file, optionally specifying a target directory."""
@ -146,7 +151,7 @@ class ContentsHandler(APIHandler):
self.set_status(201)
validate_model(model, expect_content=False)
self._finish_model(model)
@gen.coroutine
def _new_untitled(self, path, type='', ext=''):
"""Create a new, empty untitled entity"""
@ -155,13 +160,13 @@ class ContentsHandler(APIHandler):
self.set_status(201)
validate_model(model, expect_content=False)
self._finish_model(model)
@gen.coroutine
def _save(self, model, path):
"""Save an existing file."""
chunk = model.get("chunk", None)
chunk = model.get("chunk", None)
if not chunk or chunk == -1: # Avoid tedious log information
self.log.info(u"Saving file at %s", path)
self.log.info(u"Saving file at %s", path)
model = yield maybe_future(self.contents_manager.save(model, path))
validate_model(model, expect_content=False)
self._finish_model(model)
@ -247,7 +252,7 @@ class CheckpointsHandler(APIHandler):
"""get lists checkpoints for a file"""
cm = self.contents_manager
checkpoints = yield maybe_future(cm.list_checkpoints(path))
data = json.dumps(checkpoints, default=date_default)
data = json.dumps(checkpoints, default=json_default)
self.finish(data)
@web.authenticated
@ -256,7 +261,7 @@ class CheckpointsHandler(APIHandler):
"""post creates a new checkpoint"""
cm = self.contents_manager
checkpoint = yield maybe_future(cm.create_checkpoint(path))
data = json.dumps(checkpoint, default=date_default)
data = json.dumps(checkpoint, default=json_default)
location = url_path_join(self.base_url, 'api/contents',
url_escape(path), 'checkpoints', url_escape(checkpoint['id']))
self.set_header('Location', location)

59
notebook/services/kernels/handlers.py
Unescape View File

@ -15,7 +15,12 @@ from tornado.concurrent import Future
from tornado.ioloop import IOLoop
from jupyter_client import protocol_version as client_protocol_version
from jupyter_client.jsonutil import date_default
try:
from jupyter_client.jsonutil import json_default
except ImportError:
from jupyter_client.jsonutil import (
date_default as json_default
)
from ipython_genutils.py3compat import cast_unicode
from notebook.utils import maybe_future, url_path_join, url_escape
@ -29,7 +34,7 @@ class MainKernelHandler(APIHandler):
def get(self):
km = self.kernel_manager
kernels = yield maybe_future(km.list_kernels())
self.finish(json.dumps(kernels, default=date_default))
self.finish(json.dumps(kernels, default=json_default))
@web.authenticated
@gen.coroutine
@ -48,7 +53,7 @@ class MainKernelHandler(APIHandler):
location = url_path_join(self.base_url, 'api', 'kernels', url_escape(kernel_id))
self.set_header('Location', location)
self.set_status(201)
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
class KernelHandler(APIHandler):
@ -58,7 +63,7 @@ class KernelHandler(APIHandler):
def get(self, kernel_id):
km = self.kernel_manager
model = yield maybe_future(km.kernel_model(kernel_id))
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
@web.authenticated
@gen.coroutine
@ -87,7 +92,7 @@ class KernelActionHandler(APIHandler):
self.set_status(500)
else:
model = yield maybe_future(km.kernel_model(kernel_id))
self.write(json.dumps(model, default=date_default))
self.write(json.dumps(model, default=json_default))
self.finish()
@ -95,7 +100,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
'''There is one ZMQChannelsHandler per running kernel and it oversees all
the sessions.
'''
# class-level registry of open sessions
# allows checking for conflict on session-id,
# which is used as a zmq identity and must be unique.
@ -128,7 +133,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
meth = getattr(km, "connect_" + channel)
self.channels[channel] = stream = meth(self.kernel_id, identity=identity)
stream.channel = channel
def nudge(self):
"""Nudge the zmq connections with kernel_info_requests
@ -268,7 +273,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
def _handle_kernel_info_reply(self, msg):
"""process the kernel_info_reply
enabling msg spec adaptation, if necessary
"""
idents,msg = self.session.feed_identities(msg)
@ -285,15 +290,15 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self.log.error("Kernel info request failed, assuming current %s", info)
info = {}
self._finish_kernel_info(info)
# close the kernel_info channel, we don't need it anymore
if self.kernel_info_channel:
self.kernel_info_channel.close()
self.kernel_info_channel = None
def _finish_kernel_info(self, info):
"""Finish handling kernel_info reply
Set up protocol adaptation, if needed,
and signal that connection can continue.
"""
@ -303,7 +308,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self.log.info("Adapting from protocol version {protocol_version} (kernel {kernel_id}) to {client_protocol_version} (client).".format(protocol_version=protocol_version, kernel_id=self.kernel_id, client_protocol_version=client_protocol_version))
if not self._kernel_info_future.done():
self._kernel_info_future.set_result(info)
def initialize(self):
super().initialize()
self.zmq_stream = None
@ -336,7 +341,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
kernel = self.kernel_manager.get_kernel(self.kernel_id)
self.session.key = kernel.session.key
future = self.request_kernel_info()
def give_up():
"""Don't wait forever for the kernel to reply"""
if future.done():
@ -347,16 +352,16 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
loop.add_timeout(loop.time() + self.kernel_info_timeout, give_up)
# actually wait for it
yield future
@gen.coroutine
def get(self, kernel_id):
self.kernel_id = cast_unicode(kernel_id, 'ascii')
yield super().get(kernel_id=kernel_id)
@gen.coroutine
def _register_session(self):
"""Ensure we aren't creating a duplicate session.
If a previous identical session is still open, close it to avoid collisions.
This is likely due to a client reconnecting from a lost network connection,
where the socket on our side has not been cleaned up yet.
@ -379,7 +384,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self.log.info("Restoring connection for %s", self.session_key)
self.channels = buffer_info['channels']
connected = self.nudge()
def replay(value):
replay_buffer = buffer_info['buffer']
if replay_buffer:
@ -449,7 +454,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
parent=parent
)
msg['channel'] = 'iopub'
self.write_message(json.dumps(msg, default=date_default))
self.write_message(json.dumps(msg, default=json_default))
channel = getattr(stream, 'channel', None)
msg_type = msg['header']['msg_type']
@ -463,7 +468,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self._iopub_data_exceeded = False
if channel == 'iopub' and msg_type not in {'status', 'comm_open', 'execute_input'}:
# Remove the counts queued for removal.
now = IOLoop.current().time()
while len(self._iopub_window_byte_queue) > 0:
@ -484,16 +489,16 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
else:
byte_count = 0
self._iopub_window_byte_count += byte_count
# Queue a removal of the byte and message count for a time in the
# Queue a removal of the byte and message count for a time in the
# future, when we are no longer interested in it.
self._iopub_window_byte_queue.append((now + self.rate_limit_window, byte_count))
# Check the limits, set the limit flags, and reset the
# message and data counts.
msg_rate = float(self._iopub_window_msg_count) / self.rate_limit_window
data_rate = float(self._iopub_window_byte_count) / self.rate_limit_window
# Check the msg rate
if self.iopub_msg_rate_limit > 0 and msg_rate > self.iopub_msg_rate_limit:
if not self._iopub_msgs_exceeded:
@ -504,7 +509,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
to the client in order to avoid crashing it.
To change this limit, set the config variable
`--NotebookApp.iopub_msg_rate_limit`.
Current values:
NotebookApp.iopub_msg_rate_limit={} (msgs/sec)
NotebookApp.rate_limit_window={} (secs)
@ -526,7 +531,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
to the client in order to avoid crashing it.
To change this limit, set the config variable
`--NotebookApp.iopub_data_rate_limit`.
Current values:
NotebookApp.iopub_data_rate_limit={} (bytes/sec)
NotebookApp.rate_limit_window={} (secs)
@ -537,7 +542,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self._iopub_data_exceeded = False
if not self._iopub_msgs_exceeded:
self.log.warning("iopub messages resumed")
# If either of the limit flags are set, do not send the message.
if self._iopub_msgs_exceeded or self._iopub_data_exceeded:
# we didn't send it, remove the current message from the calculus
@ -595,7 +600,7 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
{'execution_state': status}
)
msg['channel'] = 'iopub'
self.write_message(json.dumps(msg, default=date_default))
self.write_message(json.dumps(msg, default=json_default))
def on_kernel_restarted(self):
logging.warn("kernel %s restarted", self.kernel_id)

15
notebook/services/sessions/handlers.py
Unescape View File

@ -11,7 +11,12 @@ import json
from tornado import gen, web
from ...base.handlers import APIHandler
from jupyter_client.jsonutil import date_default
try:
from jupyter_client.jsonutil import json_default
except ImportError:
from jupyter_client.jsonutil import (
date_default as json_default
)
from notebook.utils import maybe_future, url_path_join
from jupyter_client.kernelspec import NoSuchKernel
@ -24,7 +29,7 @@ class SessionRootHandler(APIHandler):
# Return a list of running sessions
sm = self.session_manager
sessions = yield maybe_future(sm.list_sessions())
self.finish(json.dumps(sessions, default=date_default))
self.finish(json.dumps(sessions, default=json_default))
@web.authenticated
@gen.coroutine
@ -82,7 +87,7 @@ class SessionRootHandler(APIHandler):
location = url_path_join(self.base_url, 'api', 'sessions', model['id'])
self.set_header('Location', location)
self.set_status(201)
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
class SessionHandler(APIHandler):
@ -93,7 +98,7 @@ class SessionHandler(APIHandler):
# Returns the JSON model for a single session
sm = self.session_manager
model = yield maybe_future(sm.get_session(session_id=session_id))
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
@web.authenticated
@gen.coroutine
@ -146,7 +151,7 @@ class SessionHandler(APIHandler):
yield maybe_future(
km.shutdown_kernel(before['kernel']['id'])
)
self.finish(json.dumps(model, default=date_default))
self.finish(json.dumps(model, default=json_default))
@web.authenticated
@gen.coroutine

Write Preview
Loading…
Cancel
Save