-
Notifications
You must be signed in to change notification settings - Fork 271
/
test_api.py
547 lines (434 loc) · 17.3 KB
/
test_api.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
import json
import os
import shutil
import time
import jupyter_client
import pytest
import tornado
from jupyter_client.ioloop import AsyncIOLoopKernelManager
from nbformat import writes
from nbformat.v4 import new_notebook
from tornado.httpclient import HTTPClientError
from traitlets import default
from jupyter_server.services.kernels.kernelmanager import AsyncMappingKernelManager
from jupyter_server.utils import url_path_join
from ...utils import expected_http_error
TEST_TIMEOUT = 60
def j(r):
return json.loads(r.body.decode())
class NewPortsKernelManager(AsyncIOLoopKernelManager):
@default("cache_ports")
def _default_cache_ports(self) -> bool:
return False
async def restart_kernel(self, now: bool = False, newports: bool = True, **kw) -> None:
self.log.debug(f"DEBUG**** calling super().restart_kernel with newports={newports}")
return await super().restart_kernel(now=now, newports=newports, **kw)
class NewPortsMappingKernelManager(AsyncMappingKernelManager):
@default("kernel_manager_class")
def _default_kernel_manager_class(self):
self.log.debug("NewPortsMappingKernelManager in _default_kernel_manager_class!")
return "tests.services.sessions.test_api.NewPortsKernelManager"
configs = [
{
"ServerApp": {
"kernel_manager_class": "jupyter_server.services.kernels.kernelmanager.MappingKernelManager"
}
},
{
"ServerApp": {
"kernel_manager_class": "jupyter_server.services.kernels.kernelmanager.AsyncMappingKernelManager"
}
},
{
"ServerApp": {
"kernel_manager_class": "tests.services.sessions.test_api.NewPortsMappingKernelManager"
}
},
]
# Pending kernels was released in Jupyter Client 7.1
# It is currently broken on Windows (Jan 2022). When fixed, we can remove the Windows check.
# See https://github.com/jupyter-server/jupyter_server/issues/672
if os.name != "nt" and jupyter_client._version.version_info >= (7, 1):
# Add a pending kernels condition
c = {
"ServerApp": {
"kernel_manager_class": "tests.services.sessions.test_api.NewPortsMappingKernelManager"
},
"AsyncMappingKernelManager": {"use_pending_kernels": True},
}
configs.append(c)
@pytest.fixture(params=configs)
def jp_server_config(request):
return request.param
class SessionClient:
def __init__(self, fetch_callable):
self.jp_fetch = fetch_callable
async def _req(self, *args, method, body=None):
if body is not None:
body = json.dumps(body)
r = await self.jp_fetch(
"api",
"sessions",
*args,
method=method,
body=body,
allow_nonstandard_methods=True,
)
return r
async def list(self):
return await self._req(method="GET")
async def get(self, id):
return await self._req(id, method="GET")
async def create(self, path, type="notebook", kernel_name=None, kernel_id=None):
body = {
"path": path,
"type": type,
"kernel": {"name": kernel_name, "id": kernel_id},
}
return await self._req(method="POST", body=body)
def create_deprecated(self, path):
body = {"notebook": {"path": path}, "kernel": {"name": "python", "id": "foo"}}
return self._req(method="POST", body=body)
def modify_path(self, id, path):
body = {"path": path}
return self._req(id, method="PATCH", body=body)
def modify_path_deprecated(self, id, path):
body = {"notebook": {"path": path}}
return self._req(id, method="PATCH", body=body)
def modify_type(self, id, type):
body = {"type": type}
return self._req(id, method="PATCH", body=body)
def modify_kernel_name(self, id, kernel_name):
body = {"kernel": {"name": kernel_name}}
return self._req(id, method="PATCH", body=body)
def modify_kernel_id(self, id, kernel_id):
# Also send a dummy name to show that id takes precedence.
body = {"kernel": {"id": kernel_id, "name": "foo"}}
return self._req(id, method="PATCH", body=body)
async def delete(self, id):
return await self._req(id, method="DELETE")
async def cleanup(self):
resp = await self.list()
sessions = j(resp)
for session in sessions:
await self.delete(session["id"])
time.sleep(0.1)
@pytest.fixture
def session_is_ready(jp_serverapp):
"""Wait for the kernel started by a session to be ready.
This is useful when working with pending kernels.
"""
async def _(session_id):
mkm = jp_serverapp.kernel_manager
if getattr(mkm, "use_pending_kernels", False):
sm = jp_serverapp.session_manager
session = await sm.get_session(session_id=session_id)
kernel_id = session["kernel"]["id"]
kernel = mkm.get_kernel(kernel_id)
if getattr(kernel, "ready", None):
await kernel.ready
return _
@pytest.fixture
def session_client(jp_root_dir, jp_fetch):
subdir = jp_root_dir.joinpath("foo")
subdir.mkdir()
# Write a notebook to subdir.
nb = new_notebook()
nb_str = writes(nb, version=4)
nbpath = subdir.joinpath("nb1.ipynb")
nbpath.write_text(nb_str, encoding="utf-8")
# Yield a session client
client = SessionClient(jp_fetch)
yield client
# Remove subdir
shutil.rmtree(str(subdir), ignore_errors=True)
def assert_kernel_equality(actual, expected):
"""Compares kernel models after taking into account that execution_states
may differ from 'starting' to 'idle'. The 'actual' argument is the
current state (which may have an 'idle' status) while the 'expected'
argument is the previous state (which may have a 'starting' status).
"""
actual.pop("execution_state", None)
actual.pop("last_activity", None)
expected.pop("execution_state", None)
expected.pop("last_activity", None)
assert actual == expected
def assert_session_equality(actual, expected):
"""Compares session models. `actual` is the most current session,
while `expected` is the target of the comparison. This order
matters when comparing the kernel sub-models.
"""
assert actual["id"] == expected["id"]
assert actual["path"] == expected["path"]
assert actual["type"] == expected["type"]
assert_kernel_equality(actual["kernel"], expected["kernel"])
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create(session_client, jp_base_url, jp_serverapp):
# Make sure no sessions exist.
resp = await session_client.list()
sessions = j(resp)
assert len(sessions) == 0
# Create a session.
resp = await session_client.create("foo/nb1.ipynb")
assert resp.code == 201
new_session = j(resp)
assert "id" in new_session
assert new_session["path"] == "foo/nb1.ipynb"
assert new_session["type"] == "notebook"
assert resp.headers["Location"] == url_path_join(
jp_base_url, "/api/sessions/", new_session["id"]
)
# Make sure kernel is in expected state
kid = new_session["kernel"]["id"]
kernel = jp_serverapp.kernel_manager.get_kernel(kid)
if hasattr(kernel, "ready") and os.name != "nt":
km = jp_serverapp.kernel_manager
if isinstance(km, AsyncMappingKernelManager):
assert kernel.ready.done() == (not km.use_pending_kernels)
else:
assert kernel.ready.done()
# Check that the new session appears in list.
resp = await session_client.list()
sessions = j(resp)
assert len(sessions) == 1
assert_session_equality(sessions[0], new_session)
# Retrieve that session.
sid = new_session["id"]
resp = await session_client.get(sid)
got = j(resp)
assert_session_equality(got, new_session)
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_bad(session_client, jp_base_url, jp_serverapp, jp_kernelspecs):
if getattr(jp_serverapp.kernel_manager, "use_pending_kernels", False):
return
# Make sure no sessions exist.
jp_serverapp.kernel_manager.default_kernel_name = "bad"
resp = await session_client.list()
sessions = j(resp)
assert len(sessions) == 0
# Create a session.
with pytest.raises(HTTPClientError):
await session_client.create("foo/nb1.ipynb")
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_bad_pending(
session_client,
jp_base_url,
jp_ws_fetch,
jp_serverapp,
jp_kernelspecs,
):
if not getattr(jp_serverapp.kernel_manager, "use_pending_kernels", False):
return
# Make sure no sessions exist.
jp_serverapp.kernel_manager.default_kernel_name = "bad"
resp = await session_client.list()
sessions = j(resp)
assert len(sessions) == 0
# Create a session.
resp = await session_client.create("foo/nb1.ipynb")
assert resp.code == 201
# Open a websocket connection.
kid = j(resp)["kernel"]["id"]
with pytest.raises(HTTPClientError):
await jp_ws_fetch("api", "kernels", kid, "channels")
# Get the updated kernel state
resp = await session_client.list()
session = j(resp)[0]
assert session["kernel"]["execution_state"] == "dead"
if os.name != "nt":
assert "non_existent_path" in session["kernel"]["reason"]
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_file_session(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.py", type="file")
assert resp.code == 201
newsession = j(resp)
assert newsession["path"] == "foo/nb1.py"
assert newsession["type"] == "file"
sid = newsession["id"]
await session_is_ready(sid)
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_console_session(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/abc123", type="console")
assert resp.code == 201
newsession = j(resp)
assert newsession["path"] == "foo/abc123"
assert newsession["type"] == "console"
sid = newsession["id"]
await session_is_ready(sid)
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_deprecated(session_client, jp_serverapp):
resp = await session_client.create_deprecated("foo/nb1.ipynb")
assert resp.code == 201
newsession = j(resp)
assert newsession["path"] == "foo/nb1.ipynb"
assert newsession["type"] == "notebook"
assert newsession["notebook"]["path"] == "foo/nb1.ipynb"
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_with_kernel_id(session_client, jp_fetch, jp_base_url, jp_serverapp):
# create a new kernel
resp = await jp_fetch("api/kernels", method="POST", allow_nonstandard_methods=True)
kernel = j(resp)
resp = await session_client.create("foo/nb1.ipynb", kernel_id=kernel["id"])
assert resp.code == 201
new_session = j(resp)
assert "id" in new_session
assert new_session["path"] == "foo/nb1.ipynb"
assert new_session["kernel"]["id"] == kernel["id"]
assert resp.headers["Location"] == url_path_join(
jp_base_url, "/api/sessions/{}".format(new_session["id"])
)
resp = await session_client.list()
sessions = j(resp)
assert len(sessions) == 1
assert_session_equality(sessions[0], new_session)
# Retrieve it
sid = new_session["id"]
resp = await session_client.get(sid)
got = j(resp)
assert_session_equality(got, new_session)
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_create_with_bad_kernel_id(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.py", type="file")
assert resp.code == 201
newsession = j(resp)
sid = newsession["id"]
await session_is_ready(sid)
# TODO
assert newsession["path"] == "foo/nb1.py"
assert newsession["type"] == "file"
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_delete(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
newsession = j(resp)
sid = newsession["id"]
await session_is_ready(sid)
resp = await session_client.delete(sid)
assert resp.code == 204
resp = await session_client.list()
sessions = j(resp)
assert sessions == []
with pytest.raises(tornado.httpclient.HTTPClientError) as e:
await session_client.get(sid)
assert expected_http_error(e, 404)
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_modify_path(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
newsession = j(resp)
sid = newsession["id"]
await session_is_ready(sid)
resp = await session_client.modify_path(sid, "nb2.ipynb")
changed = j(resp)
assert changed["id"] == sid
assert changed["path"] == "nb2.ipynb"
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_modify_path_deprecated(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
newsession = j(resp)
sid = newsession["id"]
await session_is_ready(sid)
resp = await session_client.modify_path_deprecated(sid, "nb2.ipynb")
changed = j(resp)
assert changed["id"] == sid
assert changed["notebook"]["path"] == "nb2.ipynb"
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_modify_type(session_client, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
newsession = j(resp)
sid = newsession["id"]
await session_is_ready(sid)
resp = await session_client.modify_type(sid, "console")
changed = j(resp)
assert changed["id"] == sid
assert changed["type"] == "console"
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_modify_kernel_name(session_client, jp_fetch, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
before = j(resp)
sid = before["id"]
await session_is_ready(sid)
resp = await session_client.modify_kernel_name(sid, before["kernel"]["name"])
after = j(resp)
assert after["id"] == sid
assert after["path"] == before["path"]
assert after["type"] == before["type"]
assert after["kernel"]["id"] != before["kernel"]["id"]
# check kernel list, to be sure previous kernel was cleaned up
resp = await jp_fetch("api/kernels", method="GET")
kernel_list = j(resp)
after["kernel"].pop("last_activity")
[k.pop("last_activity") for k in kernel_list]
if not getattr(jp_serverapp.kernel_manager, "use_pending_kernels", False):
assert kernel_list == [after["kernel"]]
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_modify_kernel_id(session_client, jp_fetch, jp_serverapp, session_is_ready):
resp = await session_client.create("foo/nb1.ipynb")
before = j(resp)
sid = before["id"]
await session_is_ready(sid)
# create a new kernel
resp = await jp_fetch("api/kernels", method="POST", allow_nonstandard_methods=True)
kernel = j(resp)
# Attach our session to the existing kernel
resp = await session_client.modify_kernel_id(sid, kernel["id"])
after = j(resp)
assert after["id"] == sid
assert after["path"] == before["path"]
assert after["type"] == before["type"]
assert after["kernel"]["id"] != before["kernel"]["id"]
assert after["kernel"]["id"] == kernel["id"]
# check kernel list, to be sure previous kernel was cleaned up
resp = await jp_fetch("api/kernels", method="GET")
kernel_list = j(resp)
kernel.pop("last_activity")
[k.pop("last_activity") for k in kernel_list]
if not getattr(jp_serverapp.kernel_manager, "use_pending_kernels", False):
assert kernel_list == [kernel]
@pytest.mark.timeout(TEST_TIMEOUT)
async def test_restart_kernel(session_client, jp_base_url, jp_fetch, jp_ws_fetch, session_is_ready):
# Create a session.
resp = await session_client.create("foo/nb1.ipynb")
assert resp.code == 201
new_session = j(resp)
assert "id" in new_session
assert new_session["path"] == "foo/nb1.ipynb"
assert new_session["type"] == "notebook"
assert resp.headers["Location"] == url_path_join(
jp_base_url, "/api/sessions/", new_session["id"]
)
sid = new_session["id"]
await session_is_ready(sid)
kid = new_session["kernel"]["id"]
# Get kernel info
r = await jp_fetch("api", "kernels", kid, method="GET")
model = json.loads(r.body.decode())
assert model["connections"] == 0
# Open a websocket connection.
ws = await jp_ws_fetch("api", "kernels", kid, "channels")
# Test that it was opened.
r = await jp_fetch("api", "kernels", kid, method="GET")
model = json.loads(r.body.decode())
assert model["connections"] == 1
# Restart kernel
r = await jp_fetch(
"api", "kernels", kid, "restart", method="POST", allow_nonstandard_methods=True
)
restarted_kernel = json.loads(r.body.decode())
assert restarted_kernel["id"] == kid
# Close/open websocket
ws.close()
# give it some time to close on the other side:
for _ in range(10):
r = await jp_fetch("api", "kernels", kid, method="GET")
model = json.loads(r.body.decode())
if model["connections"] > 0:
time.sleep(0.1)
else:
break
r = await jp_fetch("api", "kernels", kid, method="GET")
model = json.loads(r.body.decode())
assert model["connections"] == 0
# Open a websocket connection.
await jp_ws_fetch("api", "kernels", kid, "channels")
r = await jp_fetch("api", "kernels", kid, method="GET")
model = json.loads(r.body.decode())
assert model["connections"] == 1