2018-11-14 13:15:29 -06:00
|
|
|
|
;;; jupyter-test.el --- Jupyter tests -*- lexical-binding: t -*-
|
2018-01-08 21:38:32 -06:00
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2018 Nathaniel Nicandro
|
|
|
|
|
|
|
|
|
|
;; Author: Nathaniel Nicandro <nathanielnicandro@gmail.com>
|
|
|
|
|
;; Created: 08 Jan 2018
|
2019-05-04 03:25:08 -05:00
|
|
|
|
;; Version: 0.8.0
|
2018-01-08 21:38:32 -06:00
|
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or
|
|
|
|
|
;; modify it under the terms of the GNU General Public License as
|
|
|
|
|
;; published by the Free Software Foundation; either version 2, or (at
|
|
|
|
|
;; your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; This program is distributed in the hope that it will be useful, but
|
|
|
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
;; General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
2018-01-07 14:25:54 -06:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(require 'zmq)
|
|
|
|
|
(require 'jupyter-client)
|
|
|
|
|
(require 'jupyter-repl)
|
|
|
|
|
(require 'jupyter-org-client)
|
|
|
|
|
(require 'jupyter-kernel-manager)
|
|
|
|
|
(require 'cl-lib)
|
|
|
|
|
(require 'ert)
|
2019-03-10 19:53:54 -05:00
|
|
|
|
(require 'subr-x) ; string-trim
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
2019-05-09 08:53:20 -05:00
|
|
|
|
;; Increase timeouts when testing for consistency. I think what is going on is
|
|
|
|
|
;; that communication with subprocesses gets slowed down when many processes
|
|
|
|
|
;; are being open and closed? The kernel processes are cached so they are
|
|
|
|
|
;; re-used for the most part except for tests that explicitly start and stop a
|
|
|
|
|
;; process. Increasing these timeouts seemed to do the trick.
|
|
|
|
|
(when (or (getenv "APPVEYOR") (getenv "TRAVIS"))
|
2019-05-10 15:55:25 -05:00
|
|
|
|
(setq jupyter-long-timeout 120
|
|
|
|
|
jupyter-default-timeout 60))
|
2019-05-09 08:53:20 -05:00
|
|
|
|
|
|
|
|
|
(message "system-configuration %s" system-configuration)
|
|
|
|
|
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(declare-function org-babel-python-table-or-string "ob-python" (results))
|
2018-01-07 14:25:54 -06:00
|
|
|
|
|
|
|
|
|
;; TODO: Required tests
|
2018-08-27 20:37:27 -05:00
|
|
|
|
;; - Jupyter REPL
|
2018-01-07 14:25:54 -06:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Mock
|
|
|
|
|
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(ert-deftest jupyter-echo-client ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(mock)
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-with-echo-client client
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(ert-info ("Mock echo client echo's messages back to channel.")
|
|
|
|
|
(let* ((msg (jupyter-message-execute-request :code "foo"))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(req (jupyter-send client :shell :execute-request msg)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(sleep-for 0.3)
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(setq msgs (nreverse (ring-elements (oref client messages))))
|
|
|
|
|
(should (= (length msgs) 3))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should (equal (jupyter-message-type (car msgs)) :status))
|
|
|
|
|
(should (equal (jupyter-message-parent-id (car msgs))
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(jupyter-request-id req)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should (equal (jupyter-message-get (car msgs) :execution_state) "busy"))
|
|
|
|
|
(should (equal (jupyter-message-type (cadr msgs)) :execute-reply))
|
|
|
|
|
(should (equal (jupyter-message-parent-id (cadr msgs))
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(jupyter-request-id req)))
|
2019-03-29 12:31:00 -05:00
|
|
|
|
(should (equal (jupyter-message-content (cadr msgs))
|
|
|
|
|
(plist-get (jupyter-test-message (jupyter-request) nil msg) :content)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should (equal (jupyter-message-type (caddr msgs)) :status))
|
|
|
|
|
(should (equal (jupyter-message-parent-id (caddr msgs))
|
2018-01-06 13:58:32 -06:00
|
|
|
|
(jupyter-request-id req)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should (equal (jupyter-message-get (caddr msgs) :execution_state) "idle"))))))
|
2017-12-13 11:27:13 -06:00
|
|
|
|
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
;;;; Comm layer
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-comm-layer ()
|
|
|
|
|
:tags '(mock comm)
|
|
|
|
|
(let ((comm (jupyter-mock-comm-layer))
|
|
|
|
|
(obj (make-jupyter-mock-comm-obj)))
|
|
|
|
|
(jupyter-connect-client comm obj)
|
|
|
|
|
(should (= (length (oref comm clients)) 1))
|
|
|
|
|
(should (eq (jupyter-weak-ref-resolve (car (oref comm clients))) obj))
|
|
|
|
|
(should (= (oref comm alive) 1))
|
|
|
|
|
(jupyter-connect-client comm obj)
|
|
|
|
|
(should (= (length (oref comm clients)) 1))
|
|
|
|
|
(should (eq (jupyter-weak-ref-resolve (car (oref comm clients))) obj))
|
|
|
|
|
(should (= (oref comm alive) 1))
|
|
|
|
|
|
|
|
|
|
(should-not (jupyter-mock-comm-obj-event obj))
|
|
|
|
|
(jupyter-event-handler comm '(event))
|
|
|
|
|
;; Events are handled in a timer, not right away
|
|
|
|
|
(sleep-for 0.01)
|
|
|
|
|
(should (equal (jupyter-mock-comm-obj-event obj) '(event)))
|
|
|
|
|
|
|
|
|
|
(jupyter-disconnect-client comm obj)
|
|
|
|
|
(should (= (length (oref comm clients)) 0))
|
|
|
|
|
(should-not (oref comm alive))
|
|
|
|
|
(jupyter-disconnect-client comm obj)))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Callbacks
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-wait-until-idle ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(callbacks)
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-with-echo-client client
|
|
|
|
|
(let ((req (jupyter-send-execute-request client :code "foo")))
|
2018-01-06 14:04:11 -06:00
|
|
|
|
(ert-info ("Blocking callbacks")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-wait-until-idle req)
|
|
|
|
|
(should (jupyter-request-idle-received-p req)))
|
|
|
|
|
(ert-info ("Error after idle message has been received")
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should-error (jupyter-add-callback req :status #'identity))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-callbacks ()
|
|
|
|
|
:tags '(callbacks)
|
|
|
|
|
(jupyter-with-echo-client client
|
|
|
|
|
(ert-info ("Callbacks called on the right message types")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let* ((callback-count 0)
|
|
|
|
|
(cb (lambda (msg)
|
|
|
|
|
(should (eq (jupyter-message-type msg) :status))
|
|
|
|
|
(setq callback-count (1+ callback-count))))
|
|
|
|
|
(req (jupyter-send-execute-request client :code "foo")))
|
|
|
|
|
(jupyter-add-callback req :status cb)
|
|
|
|
|
(jupyter-wait-until-idle req)
|
|
|
|
|
(should (= callback-count 2))))
|
|
|
|
|
(ert-info ("Adding callbacks, message type list")
|
|
|
|
|
(let* ((callback-count 0)
|
|
|
|
|
(cb (lambda (msg)
|
|
|
|
|
(setq callback-count (1+ callback-count))
|
|
|
|
|
(should (memq (jupyter-message-type msg)
|
|
|
|
|
'(:status :execute-reply)))))
|
|
|
|
|
(req (jupyter-send-execute-request client :code "foo")))
|
|
|
|
|
(jupyter-add-callback req '(:status :execute-reply) cb)
|
|
|
|
|
(jupyter-wait-until-idle req)
|
|
|
|
|
(should (= callback-count 3))))))
|
2018-01-06 14:04:11 -06:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; `jupyter-insert'
|
|
|
|
|
|
2018-11-10 13:09:34 -06:00
|
|
|
|
(ert-deftest jupyter-loop-over-mime ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(mime)
|
2018-11-10 13:09:34 -06:00
|
|
|
|
(let ((mimes '(:text/html :text/plain))
|
|
|
|
|
(data (list :text/plain "foo"))
|
|
|
|
|
(metadata nil))
|
|
|
|
|
(ert-info ("No iterations without MIME data")
|
|
|
|
|
(jupyter-loop-over-mime mimes mime data metadata
|
|
|
|
|
(should-not (eq mime :text/html))
|
|
|
|
|
(should (eq mime :text/plain))
|
|
|
|
|
(should (equal data "foo"))
|
|
|
|
|
(should (eq metadata nil))))))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(defvar jupyter-nongraphic-mime-types)
|
|
|
|
|
|
2018-11-09 12:20:38 -06:00
|
|
|
|
(ert-deftest jupyter-insert ()
|
|
|
|
|
"Test the `jupyter-insert' method."
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(mime)
|
2018-11-09 12:20:38 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((msg (list :data (list :text/plain "foo")
|
|
|
|
|
:metadata nil)))
|
|
|
|
|
(ert-info ("Return value is the mimetype inserted")
|
|
|
|
|
(should (eq (jupyter-insert msg) :text/plain))
|
|
|
|
|
(should (equal (buffer-string) "foo\n"))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(ert-info ("Return nil on invalid mimetype")
|
|
|
|
|
(should-not (jupyter-insert :text/foo "bar"))
|
|
|
|
|
(should-not (jupyter-insert (list :data (list :text/foo "bar")))))
|
|
|
|
|
(ert-info ("Calling with data plist directly")
|
|
|
|
|
(should (eq (jupyter-insert (plist-get msg :data)) :text/plain))
|
|
|
|
|
(should (equal (buffer-string) "foo\n"))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(erase-buffer))
|
|
|
|
|
(ert-info ("Calling with message plist directly")
|
|
|
|
|
(should (eq (jupyter-insert msg) :text/plain))
|
|
|
|
|
(should (equal (buffer-string) "foo\n"))
|
2018-11-09 12:20:38 -06:00
|
|
|
|
(erase-buffer)))
|
|
|
|
|
(let ((msg (list :data (list :text/plain "foo"
|
|
|
|
|
:text/html "<b>bar</b>")
|
|
|
|
|
:metadata nil)))
|
|
|
|
|
(ert-info ("Mimetype priority")
|
|
|
|
|
(should (eq (jupyter-insert msg) :text/html))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should (equal (string-trim (buffer-string)) "bar"))
|
2018-11-09 12:20:38 -06:00
|
|
|
|
(erase-buffer)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(let ((data (list :image/jpeg (base64-encode-string "kjdaljk")))
|
|
|
|
|
;; So that this test runs under ert-runner
|
|
|
|
|
(jupyter-nongraphic-mime-types jupyter-mime-types))
|
|
|
|
|
(ert-info ("The right method specializers are called")
|
2018-11-09 12:20:38 -06:00
|
|
|
|
(cl-letf (((symbol-function #'jupyter-insert-image)
|
|
|
|
|
(lambda (data &rest _) (insert data))))
|
|
|
|
|
(cl-letf (((symbol-function #'image-type-available-p)
|
|
|
|
|
(lambda (_typ) nil)))
|
|
|
|
|
(should-not (jupyter-insert data)))
|
|
|
|
|
(should (eq (jupyter-insert data) :image/jpeg))
|
|
|
|
|
(should (equal (buffer-string) "kjdaljk\n"))
|
|
|
|
|
(erase-buffer))))))
|
|
|
|
|
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(defun jupyter-test-display-id-all (id beg end)
|
|
|
|
|
(not (text-property-not-all beg end 'jupyter-display id)))
|
|
|
|
|
|
2018-12-01 00:27:39 -06:00
|
|
|
|
(ert-deftest jupyter-insert-with-ids ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(mime display-id)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((id "1")
|
|
|
|
|
(msg (list :data (list :text/plain "foo"))))
|
|
|
|
|
(ert-info ("`jupyter-display-ids' initialization")
|
|
|
|
|
(should-not jupyter-display-ids)
|
|
|
|
|
(should (eq (jupyter-insert id msg) :text/plain))
|
|
|
|
|
(should (hash-table-p jupyter-display-ids))
|
|
|
|
|
(should (equal (buffer-string) "foo\n")))
|
|
|
|
|
(ert-info ("`jupyter-display-ids' is updated with ID")
|
|
|
|
|
(should (not (null (gethash id jupyter-display-ids)))))
|
|
|
|
|
(ert-info ("IDs are `eq'")
|
|
|
|
|
;; This is done so that they are comparable as text properties.
|
|
|
|
|
(should (eq (gethash id jupyter-display-ids) id)))
|
|
|
|
|
(ert-info ("Text property added to inserted text")
|
|
|
|
|
(should (jupyter-test-display-id-all id (point-min) (point-max)))))))
|
|
|
|
|
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(ert-deftest jupyter-delete-current-display ()
|
|
|
|
|
:tags '(mime display-id)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((id1 "1")
|
|
|
|
|
(id2 "2")
|
|
|
|
|
(msg (list :data (list :text/plain "foo"))))
|
|
|
|
|
(ert-info ("Actually deletes text with display ID")
|
|
|
|
|
(jupyter-insert id1 msg)
|
|
|
|
|
(should (equal (buffer-string) "foo\n"))
|
|
|
|
|
(goto-char (point-min))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(jupyter-delete-current-display)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(should (= (point-min) (point-max))))
|
|
|
|
|
(ert-info ("Does not do anything if no display ID at point")
|
|
|
|
|
(insert "bar")
|
|
|
|
|
(goto-char (point-min))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(jupyter-delete-current-display)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(should (equal (buffer-string) "bar"))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(ert-info ("Deletes only text with the same display ID")
|
|
|
|
|
(jupyter-insert id1 msg)
|
|
|
|
|
(jupyter-insert id2 msg)
|
|
|
|
|
(goto-char (point-min))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(jupyter-delete-current-display)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(should (equal (buffer-string) "foo\n"))
|
|
|
|
|
(should (jupyter-test-display-id-all id2 (point-min) (point-max)))
|
|
|
|
|
(erase-buffer)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-update-display ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(mime display-id)
|
2018-11-10 02:35:03 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((id1 "1")
|
|
|
|
|
(id2 "2")
|
|
|
|
|
(msg1 (list :data (list :text/plain "foo")))
|
|
|
|
|
(msg2 (list :data (list :text/plain "bar"))))
|
|
|
|
|
(ert-info ("Text with matching display ID is actually updated")
|
|
|
|
|
(jupyter-insert id1 msg1)
|
|
|
|
|
(jupyter-insert id2 msg2)
|
|
|
|
|
(should (equal (buffer-string) "foo\nbar\n"))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id1 (point-min) (+ 4 (point-min))))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id2 (- (point-max) 4) (point-max)))
|
|
|
|
|
(jupyter-update-display "1" (list :data (list :text/plain "baz")))
|
|
|
|
|
(should (equal (buffer-string) "baz\nbar\n"))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id1 (point-min) (+ 4 (point-min))))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id2 (- (point-max) 4) (point-max)))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(ert-info ("All displays are updated")
|
|
|
|
|
(jupyter-insert id1 msg1)
|
|
|
|
|
(jupyter-insert id1 msg1)
|
|
|
|
|
(pop-to-buffer (current-buffer))
|
|
|
|
|
(should (equal (buffer-string) "foo\nfoo\n"))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id1 (point-min) (point-max)))
|
|
|
|
|
(jupyter-update-display "1" (list :data (list :text/plain "baz")))
|
|
|
|
|
(should (equal (buffer-string) "baz\nbaz\n"))
|
|
|
|
|
(should (jupyter-test-display-id-all
|
|
|
|
|
id1 (point-min) (point-max)))))))
|
|
|
|
|
|
2018-11-17 15:24:17 -06:00
|
|
|
|
(ert-deftest jupyter-insert-html ()
|
|
|
|
|
:tags '(mime)
|
|
|
|
|
(ert-info ("Correct libxml parser is called depending on prolog")
|
|
|
|
|
(ert-info ("XML prolog means to parse as XML")
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(cl-letf* ((xml-parser-called nil)
|
|
|
|
|
((symbol-function #'libxml-parse-xml-region)
|
|
|
|
|
(lambda (&rest _)
|
|
|
|
|
(prog1 nil
|
|
|
|
|
(setq xml-parser-called t)))))
|
|
|
|
|
(jupyter-insert :text/html "<?xml version=\"1.0\" encoding=\"UTF-8\"?><p>hello</p>")
|
|
|
|
|
(should xml-parser-called))))
|
|
|
|
|
(ert-info ("Parse as html")
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(cl-letf* ((html-parser-called nil)
|
|
|
|
|
((symbol-function #'libxml-parse-html-region)
|
|
|
|
|
(lambda (&rest _)
|
|
|
|
|
(prog1 nil
|
|
|
|
|
(setq html-parser-called t)))))
|
|
|
|
|
(jupyter-insert :text/html "<p>hello</p>")
|
|
|
|
|
(should html-parser-called))))))
|
|
|
|
|
|
2019-02-15 21:48:00 -06:00
|
|
|
|
(ert-deftest jupyter-with-display-buffer ()
|
|
|
|
|
:tags '(buffers)
|
|
|
|
|
(jupyter-with-display-buffer "foo" t)
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(should (= jupyter-display-buffer-marker (point-min)))
|
|
|
|
|
(insert "12345")
|
|
|
|
|
(should (= jupyter-display-buffer-marker (point-max)))
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(should (= (point) (point-max)))
|
|
|
|
|
(should (= jupyter-display-buffer-marker (point-max)))
|
|
|
|
|
(insert "foobar")
|
|
|
|
|
(should (= jupyter-display-buffer-marker (point-max)))
|
|
|
|
|
(should (equal (buffer-string) "12345foobar")))
|
|
|
|
|
(jupyter-with-display-buffer "foo" t
|
|
|
|
|
(should (equal (buffer-string) ""))
|
|
|
|
|
(should (= (point-min) (point-max)))
|
|
|
|
|
(should (= jupyter-display-buffer-marker (point-min)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-with-contol-code-handling ()
|
|
|
|
|
:tags '(buffers)
|
|
|
|
|
(jupyter-with-display-buffer "foo" t)
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(insert "foo\r"))
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(should (equal (buffer-string) "foo\r"))
|
|
|
|
|
(jupyter-test-text-has-property 'invisible t '(4))
|
|
|
|
|
(insert "foo\r"))
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(should (equal (buffer-string) "foo\r"))
|
|
|
|
|
(insert "bar\r\nbaz\rfoo"))
|
|
|
|
|
(jupyter-with-display-buffer "foo" nil
|
|
|
|
|
(should (equal (buffer-string) "bar\nfoo"))))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Messages
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-identities ()
|
|
|
|
|
:tags '(messages)
|
|
|
|
|
(let ((msg (list "123" "323" jupyter-message-delimiter
|
|
|
|
|
"msg1" "msg2" "\0\0")))
|
|
|
|
|
(should (equal (jupyter--split-identities msg)
|
|
|
|
|
(cons (list "123" "323")
|
|
|
|
|
(list "msg1" "msg2" "\0\0"))))
|
|
|
|
|
(setq msg (list "123" "No" "delim" "in" "message"))
|
|
|
|
|
(should-error (jupyter--split-identities msg))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-headers ()
|
|
|
|
|
:tags '(messages)
|
|
|
|
|
(let* ((session (jupyter-session :key (jupyter-new-uuid)))
|
|
|
|
|
(id (jupyter-new-uuid))
|
|
|
|
|
(header (jupyter--message-header session :input-reply id)))
|
|
|
|
|
(should (plist-get header :msg_id))
|
|
|
|
|
(should (plist-get header :date))
|
|
|
|
|
(should (eq (plist-get header :msg_type) :input-reply))
|
|
|
|
|
(should (string= (plist-get header :version) jupyter-protocol-version))
|
|
|
|
|
(should (string= (plist-get header :username) user-login-name))
|
|
|
|
|
(should (string= (plist-get header :session) (jupyter-session-id session)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-time ()
|
|
|
|
|
:tags '(messages)
|
2018-11-17 16:26:03 -06:00
|
|
|
|
(let ((tz (getenv "TZ")))
|
|
|
|
|
(setenv "TZ" "UTC0")
|
|
|
|
|
(should (equal (jupyter--encode-time '(23385 27704 100000))
|
|
|
|
|
"2018-07-26T06:37:44.100000"))
|
|
|
|
|
(should (equal (jupyter--decode-time "2018-07-26T01:37:44.100")
|
|
|
|
|
'(23385 9704 100000 0)))
|
|
|
|
|
(should (equal (jupyter--decode-time "2018-07-26T01:37:44.10011122")
|
|
|
|
|
'(23385 9704 100111 0)))
|
|
|
|
|
(should (equal (jupyter--decode-time "2018-07-26T01:37:44")
|
|
|
|
|
'(23385 9704 0 0)))
|
|
|
|
|
(should (equal (jupyter--decode-time "2018-07-26")
|
|
|
|
|
'(23385 3840 0 0)))
|
|
|
|
|
(setenv "TZ" tz)))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-signing ()
|
|
|
|
|
:tags '(messages)
|
|
|
|
|
(let ((session (jupyter-session :key "foo"))
|
|
|
|
|
(msg (list "" "{\"msg_id\":\"1\",\"msg_type\":\"execute_reply\"}" "{}" "{}" "{}"))
|
|
|
|
|
(signature "f9080fb30e80a1b424895b557b8249157d5f83d6fc897cb96a4d2fa54a1280e6"))
|
|
|
|
|
(should (equal signature
|
|
|
|
|
(jupyter-sign-message session msg #'jupyter-hmac-sha256)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-decoding ()
|
|
|
|
|
:tags '(messages)
|
|
|
|
|
(let ((session (jupyter-session)))
|
|
|
|
|
(ert-info ("Minimum message length")
|
|
|
|
|
(should-error (jupyter-decode-message session (list "1" "2" "3"))))
|
|
|
|
|
(ert-info ("Form of decoded message")
|
|
|
|
|
(let* ((session (jupyter-session :key "foo"))
|
|
|
|
|
(msg (list "f9080fb30e80a1b424895b557b8249157d5f83d6fc897cb96a4d2fa54a1280e6"
|
|
|
|
|
"{\"msg_id\":\"1\",\"msg_type\":\"execute_reply\"}" "{}" "{}" "{}"))
|
|
|
|
|
(plist (jupyter-decode-message session msg)))
|
|
|
|
|
(cl-loop
|
|
|
|
|
with true-msg = (list
|
|
|
|
|
:header '(message-part
|
|
|
|
|
"{\"msg_id\":\"1\",\"msg_type\":\"execute_reply\"}"
|
|
|
|
|
(:msg_id "1" :msg_type :execute-reply))
|
|
|
|
|
:msg_id "1"
|
|
|
|
|
:msg_type :execute-reply
|
|
|
|
|
:parent_header '(message-part "{}" nil)
|
|
|
|
|
:content '(message-part "{}" nil)
|
|
|
|
|
:metadata '(message-part "{}" nil)
|
|
|
|
|
:buffers nil)
|
|
|
|
|
for key in '(:header :msg_id :msg_type :content
|
|
|
|
|
:parent_header :metadata :buffers)
|
|
|
|
|
do (should (equal (plist-get true-msg key) (plist-get plist key))))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-encoding ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(messages)
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;; TODO
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-message-types ()
|
|
|
|
|
:tags '(client messages)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-client client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(ert-info ("Kernel info")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :kernel-info-reply
|
|
|
|
|
(jupyter-send-kernel-info-request client))))
|
|
|
|
|
(should res)
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :kernel-info-reply))))
|
|
|
|
|
(ert-info ("Comm info")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :comm-info-reply
|
|
|
|
|
(jupyter-send-comm-info-request client))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :comm-info-reply))))
|
|
|
|
|
(ert-info ("Execute")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :execute-reply
|
|
|
|
|
(jupyter-send-execute-request client :code "y = 1 + 2"))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :execute-reply))))
|
|
|
|
|
(ert-info ("Input")
|
|
|
|
|
(cl-letf (((symbol-function 'read-from-minibuffer)
|
|
|
|
|
(lambda (_prompt &rest _args) "foo")))
|
|
|
|
|
(let ((res (jupyter-wait-until-received :execute-result
|
|
|
|
|
(jupyter-send-execute-request client :code "input('')"))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :execute-result))
|
|
|
|
|
(should (equal (jupyter-message-data res :text/plain) "'foo'")))))
|
|
|
|
|
(ert-info ("Inspect")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :inspect-reply
|
|
|
|
|
(jupyter-send-inspect-request client
|
|
|
|
|
:code "list((1, 2, 3))"
|
|
|
|
|
:pos 2
|
|
|
|
|
:detail 0))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :inspect-reply))))
|
|
|
|
|
(ert-info ("Complete")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :complete-reply
|
|
|
|
|
(jupyter-send-complete-request client
|
|
|
|
|
:code "foo = lis"
|
|
|
|
|
:pos 8))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :complete-reply))))
|
|
|
|
|
(ert-info ("History")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :history-reply
|
|
|
|
|
(jupyter-send-history-request client
|
|
|
|
|
:hist-access-type "tail" :n 2))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :history-reply))))
|
|
|
|
|
(ert-info ("Is Complete")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :is-complete-reply
|
|
|
|
|
(jupyter-send-is-complete-request client
|
|
|
|
|
:code "for i in range(5):"))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :is-complete-reply))))
|
|
|
|
|
(ert-info ("Shutdown")
|
|
|
|
|
(let ((res (jupyter-wait-until-received :shutdown-reply
|
|
|
|
|
(jupyter-send-shutdown-request client))))
|
|
|
|
|
(should-not (null res))
|
|
|
|
|
(should (json-plist-p res))
|
|
|
|
|
(should (eq (jupyter-message-type res) :shutdown-reply))))))
|
|
|
|
|
|
2019-01-21 23:18:50 -06:00
|
|
|
|
(ert-deftest jupyter-message-lambda ()
|
|
|
|
|
:tags '(messages)
|
|
|
|
|
(let ((msg (jupyter-test-message
|
|
|
|
|
(jupyter-request) :execute-reply
|
|
|
|
|
(list :status "idle" :data (list :text/plain "foo")))))
|
|
|
|
|
(should (equal (funcall (jupyter-message-lambda (status)
|
|
|
|
|
status)
|
|
|
|
|
msg)
|
|
|
|
|
"idle"))
|
|
|
|
|
(should (equal (funcall (jupyter-message-lambda ((res text/plain))
|
|
|
|
|
res)
|
|
|
|
|
msg)
|
|
|
|
|
"foo"))
|
|
|
|
|
(should (equal (funcall (jupyter-message-lambda (status (res text/plain))
|
|
|
|
|
(cons status res))
|
|
|
|
|
msg)
|
|
|
|
|
(cons "idle" "foo")))))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Channels
|
2017-12-13 11:27:13 -06:00
|
|
|
|
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-deftest jupyter-sync-channel ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(channels)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let ((channel (jupyter-sync-channel
|
|
|
|
|
:type :shell
|
|
|
|
|
:endpoint "tcp://127.0.0.1:5555")))
|
|
|
|
|
(ert-info ("Starting the channel")
|
2018-09-30 22:42:59 -05:00
|
|
|
|
(should-not (jupyter-channel-alive-p channel))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-start-channel channel :identity "foo")
|
2018-09-30 22:42:59 -05:00
|
|
|
|
(should (jupyter-channel-alive-p channel))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(should (equal (zmq-socket-get (oref channel socket)
|
|
|
|
|
zmq-ROUTING-ID)
|
|
|
|
|
"foo")))
|
|
|
|
|
(ert-info ("Stopping the channel")
|
|
|
|
|
(let ((sock (oref channel socket)))
|
|
|
|
|
(jupyter-stop-channel channel)
|
|
|
|
|
(should-error (zmq-send sock "foo") :type 'zmq-ENOTSOCK)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-hb-channel ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(channels)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(should (eq (oref (jupyter-hb-channel) type) :hb))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(let ((channel (jupyter-hb-channel
|
|
|
|
|
:endpoint "tcp://127.0.0.1:5556"
|
|
|
|
|
:session (jupyter-session)))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(died-cb-called nil)
|
2019-03-22 19:42:00 -05:00
|
|
|
|
(jupyter-hb-max-failures 1))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(oset channel time-to-dead 0.1)
|
|
|
|
|
(should-not (jupyter-channel-alive-p channel))
|
|
|
|
|
(should-not (jupyter-hb-beating-p channel))
|
|
|
|
|
(should (oref channel paused))
|
|
|
|
|
(oset channel beating t)
|
|
|
|
|
(jupyter-start-channel channel)
|
|
|
|
|
(jupyter-hb-on-kernel-dead channel (lambda () (setq died-cb-called t)))
|
|
|
|
|
(should (jupyter-channel-alive-p channel))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
;; `jupyter-hb-unpause' needs to explicitly called
|
|
|
|
|
(should (oref channel paused))
|
|
|
|
|
(jupyter-hb-unpause channel)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(sleep-for 0.2)
|
|
|
|
|
;; It seems the timers are run after returning from the first `sleep-for'
|
|
|
|
|
;; call.
|
|
|
|
|
(sleep-for 0.1)
|
|
|
|
|
(should (oref channel paused))
|
|
|
|
|
(should-not (oref channel beating))
|
|
|
|
|
(should died-cb-called)
|
|
|
|
|
(should (jupyter-channel-alive-p channel))
|
|
|
|
|
(should-not (jupyter-hb-beating-p channel))))
|
|
|
|
|
|
2019-05-07 00:41:44 -05:00
|
|
|
|
;;; GC
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-weak-ref ()
|
|
|
|
|
:tags '(gc)
|
|
|
|
|
(let (ref)
|
|
|
|
|
(let ((obj (list 1)))
|
|
|
|
|
(setq ref (jupyter-weak-ref obj)))
|
2019-05-09 12:51:00 -05:00
|
|
|
|
(let ((table (make-hash-table)))
|
|
|
|
|
(dotimes (_ gc-cons-threshold)
|
|
|
|
|
(puthash (random) t table)))
|
2019-05-07 20:20:52 -05:00
|
|
|
|
(garbage-collect)
|
|
|
|
|
(garbage-collect)
|
2019-05-07 00:41:44 -05:00
|
|
|
|
(garbage-collect)
|
|
|
|
|
(should-not (jupyter-weak-ref-resolve ref))))
|
|
|
|
|
|
|
|
|
|
(defclass jupyter-test-object (jupyter-finalized-object)
|
|
|
|
|
((val)))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-add-finalizer ()
|
|
|
|
|
:tags '(gc)
|
|
|
|
|
(let ((val (list 1)))
|
|
|
|
|
(let ((obj (jupyter-test-object)))
|
|
|
|
|
(oset obj val val)
|
|
|
|
|
(jupyter-add-finalizer obj
|
|
|
|
|
(lambda () (setcar (oref obj val) nil))))
|
|
|
|
|
(ignore (make-list (* 2 gc-cons-threshold) ?0))
|
|
|
|
|
(garbage-collect)
|
|
|
|
|
(should (null (car val)))))
|
|
|
|
|
|
2018-11-14 13:15:29 -06:00
|
|
|
|
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
;;; Kernel
|
|
|
|
|
|
2019-05-10 17:27:45 -05:00
|
|
|
|
(ert-deftest jupyter-kernel-lifetime ()
|
|
|
|
|
:tags '(kernel)
|
|
|
|
|
(let* ((conn-info (jupyter-create-connection-info))
|
|
|
|
|
(kernel (jupyter-spec-kernel
|
|
|
|
|
:spec (jupyter-guess-kernelspec "python")
|
|
|
|
|
:session (jupyter-session
|
|
|
|
|
:key (plist-get conn-info :key)
|
|
|
|
|
:conn-info conn-info))))
|
|
|
|
|
(should-not (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(jupyter-start-kernel kernel)
|
|
|
|
|
(should (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(should-error (jupyter-start-kernel kernel))
|
|
|
|
|
(jupyter-kill-kernel kernel)
|
|
|
|
|
(should-not (jupyter-kernel-alive-p kernel))
|
|
|
|
|
;; A session should not be re-used across kernels
|
|
|
|
|
(should-not (slot-boundp kernel 'session))
|
|
|
|
|
(setq conn-info (jupyter-create-connection-info))
|
|
|
|
|
(ert-info ("`jupyter-kernel-manager'")
|
|
|
|
|
;; TODO: Should the manager create a session if one isn't present?
|
|
|
|
|
(oset kernel session (jupyter-session
|
|
|
|
|
:key (plist-get conn-info :key)
|
|
|
|
|
:conn-info conn-info))
|
|
|
|
|
(let* ((manager (jupyter-kernel-manager :kernel kernel))
|
|
|
|
|
(control-channel (oref manager control-channel))
|
|
|
|
|
process)
|
|
|
|
|
(should-not (jupyter-kernel-alive-p manager))
|
|
|
|
|
(should-not control-channel)
|
|
|
|
|
(jupyter-start-kernel manager)
|
|
|
|
|
(setq process (oref kernel process))
|
|
|
|
|
(setq control-channel (oref manager control-channel))
|
|
|
|
|
(should (jupyter-sync-channel-p control-channel))
|
|
|
|
|
(should (jupyter-kernel-alive-p manager))
|
|
|
|
|
(should (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(jupyter-shutdown-kernel manager)
|
|
|
|
|
(ert-info ("Kernel shutdown is clean")
|
|
|
|
|
(should-not (process-live-p process))
|
|
|
|
|
(should (zerop (process-exit-status process)))
|
|
|
|
|
(should-not (jupyter-kernel-alive-p manager))
|
|
|
|
|
(should-not (jupyter-kernel-alive-p kernel)))
|
|
|
|
|
(setq control-channel (oref manager control-channel))
|
|
|
|
|
(should-not (jupyter-sync-channel-p control-channel))))))
|
|
|
|
|
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(ert-deftest jupyter-command-kernel ()
|
|
|
|
|
:tags '(kernel)
|
|
|
|
|
(let ((kernel (jupyter-command-kernel
|
|
|
|
|
:spec (jupyter-guess-kernelspec "python"))))
|
|
|
|
|
(ert-info ("Session set after kernel starts")
|
|
|
|
|
(should-not (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(jupyter-start-kernel kernel)
|
|
|
|
|
(should (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(should (oref kernel session)))
|
|
|
|
|
(ert-info ("Session is invalid when kernel is no longer alive")
|
|
|
|
|
(jupyter-kill-kernel kernel)
|
|
|
|
|
(should-not (jupyter-kernel-alive-p kernel))
|
|
|
|
|
(should-not (slot-boundp kernel 'session)))
|
|
|
|
|
(ert-info ("Can we communicate?")
|
|
|
|
|
(let ((manager (jupyter-kernel-manager :kernel kernel)))
|
|
|
|
|
(jupyter-start-kernel manager)
|
2019-05-09 19:04:00 -05:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(let ((jupyter-current-client
|
|
|
|
|
(jupyter-make-client manager 'jupyter-kernel-client)))
|
|
|
|
|
(jupyter-start-channels jupyter-current-client)
|
2019-05-09 21:16:10 -05:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(jupyter-wait-until-startup jupyter-current-client)
|
|
|
|
|
(should (equal (jupyter-eval "1 + 1") "2")))
|
|
|
|
|
(jupyter-stop-channels jupyter-current-client)))
|
2019-05-09 19:04:00 -05:00
|
|
|
|
(jupyter-shutdown-kernel manager))))))
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Client
|
2018-11-08 21:54:20 -06:00
|
|
|
|
|
|
|
|
|
;; TODO: Different values of the session argument
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
;; TODO: Update for new `jupyter-channel-ioloop-comm'
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-deftest jupyter-initialize-connection ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(client init)
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
(skip-unless nil)
|
|
|
|
|
;; The default comm is a jupyter-channel-ioloop-comm
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let ((conn-info (jupyter-test-conn-info-plist))
|
|
|
|
|
(client (jupyter-kernel-client)))
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
(oset client kcomm (jupyter-sync-channel-comm))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-initialize-connection client conn-info)
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
;; kcomm by default is a `jupyter-channel-ioloop-comm'
|
|
|
|
|
(with-slots (session kcomm) client
|
2018-11-13 23:19:07 -06:00
|
|
|
|
(ert-info ("Client session")
|
|
|
|
|
(should (string= (jupyter-session-key session)
|
|
|
|
|
(plist-get conn-info :key)))
|
|
|
|
|
(should (equal (jupyter-session-conn-info session)
|
|
|
|
|
conn-info)))
|
|
|
|
|
(ert-info ("Heartbeat channel initialized")
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
(should (eq session (oref (oref kcomm hb) session)))
|
|
|
|
|
(should (string= (oref (oref kcomm hb) endpoint)
|
2018-11-13 23:19:07 -06:00
|
|
|
|
(format "tcp://127.0.0.1:%d"
|
|
|
|
|
(plist-get conn-info :hb_port)))))
|
|
|
|
|
(ert-info ("Shell, iopub, stdin initialized")
|
|
|
|
|
(cl-loop
|
|
|
|
|
for channel in '(:shell :iopub :stdin)
|
|
|
|
|
for port_sym = (intern (concat (symbol-name channel) "_port"))
|
|
|
|
|
do
|
|
|
|
|
(should (plist-member (plist-get channels channel) :alive-p))
|
|
|
|
|
(should (plist-member (plist-get channels channel) :endpoint))
|
|
|
|
|
(should
|
|
|
|
|
(string= (plist-get (plist-get channels channel) :endpoint)
|
|
|
|
|
(format "tcp://127.0.0.1:%d"
|
|
|
|
|
(plist-get conn-info port_sym))))))
|
|
|
|
|
(ert-info ("Initialization stops any running channels")
|
|
|
|
|
(should-not (jupyter-channels-running-p client))
|
|
|
|
|
(jupyter-start-channels client)
|
|
|
|
|
(should (jupyter-channels-running-p client))
|
|
|
|
|
(jupyter-initialize-connection client conn-info)
|
|
|
|
|
(should-not (jupyter-channels-running-p client)))
|
|
|
|
|
(ert-info ("Invalid signature scheme")
|
|
|
|
|
(plist-put conn-info :signature_scheme "hmac-foo")
|
|
|
|
|
(should-error (jupyter-initialize-connection client conn-info))))))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(ert-deftest jupyter-write-connection-file ()
|
|
|
|
|
:tags '(client)
|
2019-05-12 23:23:20 -05:00
|
|
|
|
(skip-unless (not (memq system-type '(ms-dos windows-nt cygwin))))
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(let (file fun)
|
|
|
|
|
(let* ((session (jupyter-session
|
|
|
|
|
:conn-info (jupyter-create-connection-info)))
|
|
|
|
|
(client (jupyter-kernel-client))
|
|
|
|
|
(hook (copy-sequence kill-emacs-hook)))
|
|
|
|
|
(setq file (jupyter-write-connection-file session client))
|
|
|
|
|
(should (file-exists-p file))
|
|
|
|
|
(should-not (equal kill-emacs-hook hook))
|
|
|
|
|
(setq fun (car (cl-set-difference kill-emacs-hook hook)))
|
|
|
|
|
(should-not (memq fun hook)))
|
2019-05-10 15:55:25 -05:00
|
|
|
|
(garbage-collect)
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(garbage-collect)
|
|
|
|
|
(garbage-collect)
|
|
|
|
|
(garbage-collect)
|
|
|
|
|
(unwind-protect
|
2019-05-12 23:23:20 -05:00
|
|
|
|
;; This fails on Windows, probably has something to do with the file
|
|
|
|
|
;; handle still being opened somehow.
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(should-not (file-exists-p file))
|
|
|
|
|
(when (file-exists-p file)
|
|
|
|
|
(delete-file file)))
|
|
|
|
|
(should-not (memq fun kill-emacs-hook))))
|
|
|
|
|
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-deftest jupyter-client-channels ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(client channels)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-info ("Starting/stopping channels")
|
|
|
|
|
(let ((conn-info (jupyter-test-conn-info-plist))
|
|
|
|
|
(client (jupyter-kernel-client)))
|
Generalize communication with a kernel
The previous mechanism to communicate with a kernel was too low level from the
perspective of a client. The client interfaced directly with the subprocess
abstraction, `jupyter-ioloop`, and had to handle all "events" that occurred in
the `jupyter-ioloop`, e.g. when a channel was started or stopped. But in
reality such events should not be the concern of a client.
A client should only care about events that are directly related to kernel
messages and not events related to the implementation details of *how*
communication occurs.
This commit abstracts out the way in which a client communicates with its
kernel by introducing a new `jupyter-comm-layer` class. The
`jupyter-comm-layer` class takes care of managing the communication channel
between a kernel and its clients as well as sending events to all registered
clients. This way, clients operate solely at the level of events on the
communication layer. All a client does is register itself to receive events on
the communication layer and send events on the layer.
* jupyter-base.el (jupyter-session-endpoints): New function.
* jupyter-client.el (jupyter-kernel-client): Remove ioloop and channels slots.
Add kcomm slot.
(initialize-instance): Unconditionally stop channels.
(jupyter-initialize-connection): Change into a method call.
Call `jupyter-initialize-connection` on the `kcomm` slot.
(jupyter-with-client-buffer): Remove stale comment.
(jupyter-send): Call `jupyter-send` on the `kcomm` slot.
(jupyter-ioloop-handler): Remove all method definitions, replace `sent` and
`message` methods with their `jupyter-event-handler` equivalents.
(jupyter-hb-pause, jupyter-hb-unpause, jupyter-hb-beating):
(jupyter-channel-alive-p, jupyter-start-channel, jupyter-stop-channel):
(jupyter-start-channels, jupyter-stop-channels):
Replace with calls to their equivalents using the `kcomm` slot.
* jupyter-comm-layer.el: New file.
* jupyter-kernel-manager (jupyter-make-client): Set a client's `kcomm` slot to
`jupyter-channel-ioloop-comm`.
* jupyter-messages.el (jupyter-decode-message): Use `list` directly. There
seemed to be issues when using the new `jupyter-sync-channel-comm` due to
using quoted lists.
* test/jupyter-test.el: Add `jupyter-comm-layer` test. Update other tests.
* test/test-helper.el: Add `jupyter-comm-layer` mock objects. Update
`jupyter-echo-client`.
2019-04-08 11:42:00 -05:00
|
|
|
|
(oset client kcomm (jupyter-sync-channel-comm))
|
2018-05-16 20:45:26 -05:00
|
|
|
|
(jupyter-initialize-connection client conn-info)
|
2018-11-13 23:19:07 -06:00
|
|
|
|
(cl-loop
|
|
|
|
|
for channel in '(:hb :shell :iopub :stdin)
|
|
|
|
|
do (should-not (jupyter-channel-alive-p client channel)))
|
|
|
|
|
(jupyter-start-channels client)
|
|
|
|
|
(cl-loop
|
|
|
|
|
for channel in '(:hb :shell :iopub :stdin)
|
|
|
|
|
do (should (jupyter-channel-alive-p client channel)))
|
|
|
|
|
(jupyter-stop-channels client)
|
|
|
|
|
(cl-loop
|
|
|
|
|
for channel in '(:hb :shell :iopub :stdin)
|
|
|
|
|
do (should-not (jupyter-channel-alive-p client channel))))))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-inhibited-handlers ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(client handlers)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-client client
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let* ((jupyter-inhibit-handlers '(:stream))
|
|
|
|
|
(req (jupyter-send-kernel-info-request client)))
|
|
|
|
|
(should (equal (jupyter-request-inhibited-handlers req)
|
|
|
|
|
'(:stream)))
|
2018-11-14 13:15:29 -06:00
|
|
|
|
(should-not (jupyter--run-handler-p
|
|
|
|
|
req (jupyter-test-message
|
|
|
|
|
req :stream (list :name "stdout" :text "foo"))))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(setq jupyter-inhibit-handlers '(:foo))
|
|
|
|
|
(should-error (jupyter-send-kernel-info-request client)))))
|
|
|
|
|
|
2019-03-17 02:00:00 -05:00
|
|
|
|
(ert-deftest jupyter-requests-pending-p ()
|
|
|
|
|
:tags '(client)
|
|
|
|
|
(jupyter-test-with-python-client client
|
2019-05-09 19:07:00 -05:00
|
|
|
|
(let (pending)
|
2019-05-10 15:55:25 -05:00
|
|
|
|
(jupyter-with-timeout (nil jupyter-long-timeout)
|
2019-05-09 19:07:00 -05:00
|
|
|
|
(while (jupyter-requests-pending-p client)
|
|
|
|
|
(when-let* ((last-sent (gethash "last-sent" (oref client requests))))
|
|
|
|
|
(jupyter-wait-until-idle last-sent))))
|
|
|
|
|
;; Don't pass CLIENT to `should-not' because `ert' will attempt to
|
|
|
|
|
;; print the class object on failure and will fail at doing so.
|
|
|
|
|
(setq pending (jupyter-requests-pending-p client))
|
|
|
|
|
(should-not pending)
|
|
|
|
|
(let ((req (jupyter-send-kernel-info-request client)))
|
|
|
|
|
(ert-info ("Pending after send")
|
|
|
|
|
(setq pending (jupyter-requests-pending-p client))
|
|
|
|
|
(should pending)
|
|
|
|
|
(jupyter-wait-until-idle req)
|
|
|
|
|
(setq pending (jupyter-requests-pending-p client))
|
|
|
|
|
(should-not pending))
|
|
|
|
|
(ert-info ("Pending until idle received")
|
|
|
|
|
(setq req (jupyter-send-execute-request client
|
|
|
|
|
:code "import time; time.sleep(0.2)"))
|
|
|
|
|
;; Empty out the pending-requests slot of CLIENT
|
|
|
|
|
(jupyter-wait-until-received :status req)
|
|
|
|
|
(setq pending (jupyter-requests-pending-p client))
|
|
|
|
|
(should pending)
|
|
|
|
|
(jupyter-wait-until-idle req)
|
|
|
|
|
(setq pending (jupyter-requests-pending-p client))
|
|
|
|
|
(should-not pending))))))
|
2019-03-17 02:00:00 -05:00
|
|
|
|
|
2019-05-07 00:41:44 -05:00
|
|
|
|
(ert-deftest jupyter-eval ()
|
|
|
|
|
:tags '(client)
|
|
|
|
|
(jupyter-test-with-python-client client
|
|
|
|
|
(let ((jupyter-current-client client))
|
|
|
|
|
(should (equal (jupyter-eval "1 + 1") "2")))))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; IOloop
|
|
|
|
|
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-deftest jupyter-ioloop-lifetime ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(let ((ioloop (jupyter-ioloop))
|
|
|
|
|
(jupyter-default-timeout 2))
|
|
|
|
|
(should-not (process-live-p (oref ioloop process)))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-ioloop-start ioloop :tag1)
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(should (equal (jupyter-ioloop-last-event ioloop) '(start)))
|
|
|
|
|
(with-slots (process) ioloop
|
|
|
|
|
(should (process-live-p process))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(should (equal (jupyter-ioloop-last-event ioloop) '(quit)))
|
|
|
|
|
(sleep-for 0.1)
|
|
|
|
|
(should-not (process-live-p process)))))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
|
|
|
|
|
(defvar jupyter-ioloop-test-handler-called nil
|
|
|
|
|
"Flag variable used for testing the `juyter-ioloop'.")
|
|
|
|
|
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(cl-defmethod jupyter-ioloop-handler ((_ioloop jupyter-ioloop)
|
|
|
|
|
(_tag (eql :test))
|
|
|
|
|
(event (head test)))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(should (equal (cadr event) "message"))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called t))
|
|
|
|
|
|
2019-05-02 18:53:00 -05:00
|
|
|
|
(ert-deftest jupyter-ioloop-wait-until ()
|
|
|
|
|
:tags '(ioloop)
|
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(should-not (jupyter-ioloop-last-event ioloop))
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
|
|
|
|
(should (equal (jupyter-ioloop-last-event ioloop) '(start)))
|
|
|
|
|
(jupyter-ioloop-stop ioloop)))
|
|
|
|
|
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-deftest jupyter-ioloop-callbacks ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(ert-info ("Callback added before starting the ioloop")
|
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called nil)
|
|
|
|
|
(jupyter-ioloop-add-callback ioloop
|
|
|
|
|
`(lambda () (zmq-prin1 (list 'test "message"))))
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
|
|
|
|
(should jupyter-ioloop-test-handler-called)))
|
|
|
|
|
(ert-info ("Callback added after starting the ioloop")
|
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called nil)
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
2019-05-02 18:53:00 -05:00
|
|
|
|
(should (process-live-p (oref ioloop process)))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-ioloop-add-callback ioloop
|
|
|
|
|
`(lambda () (zmq-prin1 (list 'test "message"))))
|
2019-05-02 18:53:00 -05:00
|
|
|
|
(jupyter-ioloop-wait-until ioloop 'test #'identity)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
|
|
|
|
(should jupyter-ioloop-test-handler-called))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-ioloop-setup ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called nil)
|
|
|
|
|
(jupyter-ioloop-add-setup ioloop
|
|
|
|
|
(zmq-prin1 (list 'test "message")))
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
|
|
|
|
(should jupyter-ioloop-test-handler-called)))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-ioloop-teardown ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called nil)
|
|
|
|
|
(jupyter-ioloop-add-teardown ioloop
|
|
|
|
|
(zmq-prin1 (list 'test "message")))
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
|
|
|
|
(should jupyter-ioloop-test-handler-called)))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-ioloop-add-event ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(let ((ioloop (jupyter-ioloop)))
|
|
|
|
|
(setq jupyter-ioloop-test-handler-called nil)
|
|
|
|
|
(jupyter-ioloop-add-event ioloop test (data)
|
|
|
|
|
"Echo DATA back to the parent process."
|
|
|
|
|
(list 'test data))
|
|
|
|
|
(jupyter-ioloop-start ioloop :test)
|
|
|
|
|
(jupyter-send ioloop 'test "message")
|
|
|
|
|
(jupyter-ioloop-stop ioloop)
|
|
|
|
|
(should jupyter-ioloop-test-handler-called)))
|
|
|
|
|
|
|
|
|
|
(defun jupyter-ioloop-test-eval-ioloop (ioloop ex)
|
|
|
|
|
(eval
|
|
|
|
|
`(progn
|
2018-11-13 23:15:21 -06:00
|
|
|
|
,@(oref ioloop setup)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
,(jupyter-ioloop--event-dispatcher ioloop ex))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-channel-ioloop-send-event ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(cl-letf ((ioloop (jupyter-channel-ioloop))
|
|
|
|
|
(standard-output (current-buffer))
|
|
|
|
|
(jupyter-ioloop-channels (list (jupyter-sync-channel :type :shell)))
|
|
|
|
|
((symbol-function #'jupyter-send)
|
|
|
|
|
(lambda (_channel _msg-type _msg msg-id) msg-id)))
|
|
|
|
|
(let ((msg-id (jupyter-new-uuid)))
|
|
|
|
|
(jupyter-ioloop-test-eval-ioloop
|
|
|
|
|
ioloop `(list 'send :shell :execute-request '(msg) ,msg-id))
|
|
|
|
|
(ert-info ("Return value to parent process")
|
|
|
|
|
(let ((result (read (buffer-string))))
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(should (equal result `(sent :shell ,msg-id)))))))))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-channel-ioloop-start-channel-event ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let* ((ioloop (jupyter-channel-ioloop))
|
|
|
|
|
(standard-output (current-buffer))
|
|
|
|
|
(jupyter-ioloop-channels nil)
|
|
|
|
|
(jupyter-ioloop-session nil)
|
|
|
|
|
(jupyter-ioloop-poller (zmq-poller))
|
|
|
|
|
(channel-endpoint "tcp://127.0.0.1:5555"))
|
2018-11-13 23:15:21 -06:00
|
|
|
|
(jupyter-channel-ioloop--set-session ioloop (jupyter-session :key "foo"))
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(jupyter-ioloop-test-eval-ioloop
|
|
|
|
|
ioloop `(list 'start-channel :shell ,channel-endpoint))
|
|
|
|
|
(should (not (null jupyter-ioloop-channels)))
|
|
|
|
|
(should (jupyter-sync-channel-p (car jupyter-ioloop-channels)))
|
|
|
|
|
(let ((channel (car jupyter-ioloop-channels)))
|
|
|
|
|
(with-slots (type socket endpoint) channel
|
|
|
|
|
(ert-info ("Verify the requested channel was started")
|
|
|
|
|
(should (eq type :shell))
|
|
|
|
|
(should (zmq-socket-p socket))
|
|
|
|
|
(should (equal endpoint channel-endpoint))
|
|
|
|
|
(should (equal (zmq-socket-get socket zmq-LAST-ENDPOINT) channel-endpoint))
|
|
|
|
|
(ert-info ("Identity of socket matches session")
|
|
|
|
|
(should (equal (zmq-socket-get socket zmq-IDENTITY)
|
|
|
|
|
(jupyter-session-id jupyter-ioloop-session)))))
|
|
|
|
|
(ert-info ("Ensure the channel was added to the poller")
|
|
|
|
|
;; Raises an error if the socket wasn't added to the poller.
|
|
|
|
|
(zmq-poller-modify
|
|
|
|
|
jupyter-ioloop-poller socket (list zmq-POLLIN zmq-POLLOUT))))
|
|
|
|
|
(ert-info ("Return value to parent process")
|
|
|
|
|
(let ((result (read (buffer-string))))
|
|
|
|
|
(should (equal result `(start-channel :shell)))))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-channel-ioloop-stop-channel-event ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(ioloop)
|
2018-11-08 21:54:20 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let* ((ioloop (jupyter-channel-ioloop))
|
|
|
|
|
(standard-output (current-buffer))
|
|
|
|
|
(channel (jupyter-sync-channel
|
|
|
|
|
:type :shell
|
|
|
|
|
:endpoint "tcp://127.0.0.1:5555"))
|
|
|
|
|
(jupyter-ioloop-channels (list channel))
|
|
|
|
|
(jupyter-ioloop-session (jupyter-session))
|
|
|
|
|
(jupyter-ioloop-poller (zmq-poller)))
|
|
|
|
|
(jupyter-start-channel channel :identity (jupyter-session-id jupyter-ioloop-session))
|
|
|
|
|
(ert-info ("Verify the requested channel stops")
|
|
|
|
|
(should (jupyter-channel-alive-p channel))
|
|
|
|
|
(zmq-poller-add jupyter-ioloop-poller (oref channel socket) zmq-POLLIN)
|
|
|
|
|
(jupyter-ioloop-test-eval-ioloop ioloop `(list 'stop-channel :shell))
|
|
|
|
|
(should-not (jupyter-channel-alive-p channel)))
|
|
|
|
|
(ert-info ("Ensure the channel was removed from the poller")
|
|
|
|
|
(should-error (zmq-poller-modify (oref channel socket) (list zmq-POLLIN zmq-POLLOUT))))
|
|
|
|
|
(ert-info ("Return value to parent process")
|
|
|
|
|
(let ((result (read (buffer-string))))
|
|
|
|
|
(should (equal result `(stop-channel :shell))))))))
|
2018-01-16 11:08:10 -06:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; Completion
|
2018-08-27 20:37:27 -05:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(ert-deftest jupyter-completion-number-p ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(completion)
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert "0.311")
|
|
|
|
|
(should (jupyter-completion-number-p))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "0311")
|
|
|
|
|
(should (jupyter-completion-number-p))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "0311.")
|
|
|
|
|
(should (jupyter-completion-number-p))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "100foo")
|
|
|
|
|
(should-not (jupyter-completion-number-p))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "foo100")
|
|
|
|
|
(should-not (jupyter-completion-number-p))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-completion-prefetch-p ()
|
|
|
|
|
:tags '(completion)
|
|
|
|
|
(let ((jupyter-completion-cache '("foo")))
|
|
|
|
|
(ert-info ("Prefetch when the cached prefix is more specialized")
|
|
|
|
|
(should (jupyter-completion-prefetch-p "f"))
|
|
|
|
|
(should (jupyter-completion-prefetch-p "")))
|
|
|
|
|
(ert-info ("Don't prefetch when the cached prefix is less specialized")
|
|
|
|
|
(should-not (jupyter-completion-prefetch-p "foo"))
|
|
|
|
|
(should-not (jupyter-completion-prefetch-p "foobar")))
|
|
|
|
|
(ert-info ("Prefetch when starting argument lists")
|
|
|
|
|
(should (jupyter-completion-prefetch-p "foobar("))))
|
|
|
|
|
(let ((jupyter-completion-cache '("")))
|
|
|
|
|
(ert-info ("Prefetch when given some context")
|
|
|
|
|
(should-not (jupyter-completion-prefetch-p ""))
|
|
|
|
|
(should (jupyter-completion-prefetch-p "a"))))
|
|
|
|
|
(let ((jupyter-completion-cache '(fetched "")))
|
|
|
|
|
(ert-info ("Prefetch when not processed")
|
|
|
|
|
(should (jupyter-completion-prefetch-p "a"))
|
|
|
|
|
;; But only if the fetched candidates do not match
|
|
|
|
|
;; the prefix
|
|
|
|
|
(should-not (jupyter-completion-prefetch-p ""))
|
|
|
|
|
(setq jupyter-completion-cache nil)
|
|
|
|
|
(should (jupyter-completion-prefetch-p ""))
|
|
|
|
|
(should (jupyter-completion-prefetch-p "a")))))
|
|
|
|
|
|
|
|
|
|
;;; REPL
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-client-predicates ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(repl)
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should-not (jupyter-repl-client-has-manager-p))
|
|
|
|
|
(should-not (jupyter-repl-connected-p))
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(should (jupyter-repl-client-has-manager-p))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should (jupyter-repl-connected-p))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-cell-predicates ()
|
|
|
|
|
:tags '(repl cell)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-cell-line-p'")
|
|
|
|
|
(should (jupyter-repl-cell-line-p))
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should (jupyter-repl-cell-line-p))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should (jupyter-repl-cell-line-p))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(should-not (jupyter-repl-cell-line-p)))
|
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-cell-finalized-p'")
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(should (jupyter-repl-cell-finalized-p)))
|
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-cell-beginning-p'")
|
|
|
|
|
(should-not (jupyter-repl-cell-beginning-p))
|
|
|
|
|
(goto-char (- (point) 2))
|
|
|
|
|
(should (jupyter-repl-cell-beginning-p))
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-beginning-position))))
|
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-cell-end-p'")
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(should (jupyter-repl-cell-end-p))
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-end-position)))
|
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
|
|
|
|
(let ((end (point-max)))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(should (jupyter-repl-cell-end-p))
|
|
|
|
|
(should (= end (jupyter-repl-cell-end-position)))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-cell-positions ()
|
|
|
|
|
:tags '(repl)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Cell code position info")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 2")
|
|
|
|
|
(should (= (point) (point-max)))
|
|
|
|
|
(goto-char (1- (point)))
|
|
|
|
|
(should (= (char-after) ?2))
|
|
|
|
|
(should (= (jupyter-repl-cell-code-position) 5))
|
|
|
|
|
(goto-char (line-beginning-position))
|
|
|
|
|
(should (= (char-after) ?1))
|
|
|
|
|
(should (= (jupyter-repl-cell-code-position) 1)))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Cell code beginning")
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-code-beginning-position)))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-code-beginning-position)))
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-code-beginning-position))))
|
|
|
|
|
(jupyter-ert-info ("Cell code end")
|
|
|
|
|
(should (= (point-max) (jupyter-repl-cell-code-end-position)))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(should (= (1+ (line-end-position)) (jupyter-repl-cell-code-end-position))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-ret ()
|
|
|
|
|
:tags '(repl)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("`point' before last cell in buffer")
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(let ((tick (buffer-modified-tick)))
|
|
|
|
|
(goto-char (point-min))
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-test-repl-ret-sync)
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should (= (point) (point-max)))
|
|
|
|
|
(should (equal tick (buffer-modified-tick)))))
|
|
|
|
|
(jupyter-ert-info ("No cells in buffer")
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(should-not (next-single-property-change (point-min) 'jupyter-cell))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should (next-single-property-change (point-min) 'jupyter-cell)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-cell-code-replacement ()
|
|
|
|
|
:tags '(repl)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Replacing cell code")
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) ""))
|
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "1 + 1"))
|
|
|
|
|
(jupyter-repl-replace-cell-code "foo\n bar")
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "foo\n bar"))
|
|
|
|
|
(jupyter-repl-replace-cell-code ""))))
|
2018-08-27 20:37:27 -05:00
|
|
|
|
|
2018-06-14 20:57:02 -05:00
|
|
|
|
(defun jupyter-test-set-dummy-repl-history ()
|
|
|
|
|
"Reset `jupyter-repl-history' to a value used for testing.
|
|
|
|
|
The history contains the elements \"1\", \"2\", and \"3\", the
|
|
|
|
|
last element being the newest element added to the history."
|
|
|
|
|
(setq-local jupyter-repl-history (make-ring 5))
|
|
|
|
|
(ring-insert jupyter-repl-history 'jupyter-repl-history)
|
2019-02-14 16:15:00 -06:00
|
|
|
|
(jupyter-repl-history-add "1")
|
|
|
|
|
(jupyter-repl-history-add "2")
|
|
|
|
|
(jupyter-repl-history-add "3"))
|
2018-06-14 20:57:02 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-repl-history ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(repl)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Rotating REPL history ring")
|
2018-06-14 20:57:02 -05:00
|
|
|
|
(jupyter-test-set-dummy-repl-history)
|
|
|
|
|
(should (null (jupyter-repl-history--next 1)))
|
|
|
|
|
(should (equal (jupyter-repl-history--next 0) "3"))
|
|
|
|
|
(should (equal (jupyter-repl-history--previous 1) "2"))
|
|
|
|
|
(should (equal (jupyter-repl-history--next 1) "3"))
|
|
|
|
|
(should (null (jupyter-repl-history--previous 4)))
|
|
|
|
|
(should (equal (ring-ref jupyter-repl-history 0) "1")))
|
|
|
|
|
(ert-info ("Replacing cell contents with history")
|
|
|
|
|
(jupyter-test-set-dummy-repl-history)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) ""))
|
|
|
|
|
(jupyter-repl-history-previous)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "3"))
|
|
|
|
|
(jupyter-repl-history-previous)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "2"))
|
|
|
|
|
(jupyter-repl-history-previous)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "1"))
|
|
|
|
|
(should-error (jupyter-repl-history-previous))
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "1"))
|
|
|
|
|
(jupyter-repl-history-next)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "2"))
|
|
|
|
|
(jupyter-repl-history-next)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "3"))
|
|
|
|
|
(jupyter-repl-history-next)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) ""))
|
|
|
|
|
(should-error (jupyter-repl-history-next))
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "")))))
|
|
|
|
|
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(ert-deftest jupyter-repl-cell-motions ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(repl motion)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-10-31 18:51:40 -05:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-goto-cell'")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let (cell-pos req)
|
|
|
|
|
(setq cell-pos (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char cell-pos)
|
|
|
|
|
(setq req (jupyter-repl-cell-request)))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should (/= (point) cell-pos))
|
|
|
|
|
(jupyter-repl-goto-cell req)
|
|
|
|
|
(should (= (point) cell-pos))))
|
2018-10-31 18:51:40 -05:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-previous-cell'")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let (cell-pos1)
|
|
|
|
|
(setq cell-pos1 (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(goto-char cell-pos1)
|
|
|
|
|
(ert-info ("First motion to beginning of current cell")
|
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
|
|
|
|
(should (/= (point) cell-pos1))
|
|
|
|
|
(should (= (jupyter-repl-previous-cell) 0))
|
|
|
|
|
(should (= (point) cell-pos1))
|
|
|
|
|
(jupyter-repl-replace-cell-code ""))
|
|
|
|
|
(ert-info ("Motion with count")
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(goto-char (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(should (= (jupyter-repl-previous-cell 2) 0))
|
|
|
|
|
(should (= (point) cell-pos1)))
|
|
|
|
|
(ert-info ("First cell of buffer")
|
|
|
|
|
(goto-char cell-pos1)
|
|
|
|
|
(should (= (jupyter-repl-previous-cell) 1))
|
|
|
|
|
(should (= (point) (point-min))))))
|
2018-10-31 18:51:40 -05:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-backward-cell'")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let (cell-pos1)
|
|
|
|
|
(setq cell-pos1 (jupyter-repl-cell-code-beginning-position))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should-not (= (point) cell-pos1))
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(should (= (point) cell-pos1))))
|
2018-10-31 18:51:40 -05:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-next-cell'")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let (cell-pos1 cell-pos2)
|
|
|
|
|
(setq cell-pos1 (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(ert-info ("Motion with count")
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(setq cell-pos2 (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(goto-char cell-pos1)
|
|
|
|
|
(should (= (jupyter-repl-next-cell 2) 0))
|
|
|
|
|
(should (= (point) cell-pos2)))
|
|
|
|
|
(ert-info ("Last cell of buffer")
|
|
|
|
|
(goto-char cell-pos2)
|
|
|
|
|
(should (= (jupyter-repl-next-cell) 1))
|
|
|
|
|
(should (= (point) (point-max))))))
|
2018-10-31 18:51:40 -05:00
|
|
|
|
(jupyter-ert-info ("`jupyter-repl-forward-cell'")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(let (cell-pos1 cell-pos2)
|
|
|
|
|
(setq cell-pos1 (jupyter-repl-cell-code-beginning-position))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(setq cell-pos2 (jupyter-repl-cell-code-beginning-position))
|
|
|
|
|
(goto-char cell-pos1)
|
|
|
|
|
(jupyter-repl-forward-cell)
|
|
|
|
|
(should (= (point) cell-pos2))))))
|
|
|
|
|
|
2019-02-14 16:13:00 -06:00
|
|
|
|
(ert-deftest jupyter-repl-finalize-cell ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(jupyter-ert-info ("Finalize the last cell only")
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(should (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(should-not (= (point) (point-max)))
|
|
|
|
|
(jupyter-repl-finalize-cell nil)
|
|
|
|
|
(should (= (point) (point-max)))
|
|
|
|
|
(should (jupyter-repl-cell-finalized-p)))
|
|
|
|
|
(jupyter-ert-info
|
|
|
|
|
("Don't modify the jupyter-request property of a finalized cell")
|
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(jupyter-repl-backward-cell)
|
|
|
|
|
(let* ((finalized-cell-beg (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(finalized-cell-req
|
|
|
|
|
(get-text-property finalized-cell-beg 'jupyter-request)))
|
|
|
|
|
(should finalized-cell-req)
|
|
|
|
|
(jupyter-repl-finalize-cell nil)
|
|
|
|
|
(should (eq (get-text-property finalized-cell-beg 'jupyter-request)
|
|
|
|
|
finalized-cell-req))))))
|
|
|
|
|
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(ert-deftest jupyter-repl-cell-positions ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(repl motion)
|
2019-01-23 12:57:11 -06:00
|
|
|
|
(jupyter-test-with-python-repl client
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Beginning of a cell")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(should (= (point) (jupyter-repl-cell-code-beginning-position)))
|
|
|
|
|
(should (get-text-property (- (point) 2) 'jupyter-cell))
|
|
|
|
|
(should (jupyter-repl-cell-beginning-p (- (point) 2)))
|
|
|
|
|
(should (= (jupyter-repl-cell-beginning-position) (- (point) 2))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("End of unfinalized cell")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(should-not (get-text-property (point-max) 'jupyter-cell))
|
|
|
|
|
(should (= (jupyter-repl-cell-end-p (point-max))))
|
|
|
|
|
(should (= (jupyter-repl-cell-end-position) (point-max)))
|
|
|
|
|
(should (= (jupyter-repl-cell-code-end-position) (point-max))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("End of finalized cell")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(jupyter-test-repl-ret-sync)
|
|
|
|
|
(should (= (point) (jupyter-repl-cell-code-beginning-position)))
|
|
|
|
|
(goto-char (1- (jupyter-repl-cell-beginning-position)))
|
|
|
|
|
(should (jupyter-repl-cell-end-p))
|
|
|
|
|
(should (= (jupyter-repl-cell-end-position) (point)))
|
2018-12-16 18:48:41 -06:00
|
|
|
|
(should (= (jupyter-repl-cell-code-end-position) (point)))
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(should (jupyter-repl-cell-finalized-p)))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(jupyter-ert-info ("Cell boundary errors")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(jupyter-repl-replace-cell-code "1 + 1")
|
|
|
|
|
(jupyter-wait-until-idle (jupyter-send-execute-request client))
|
|
|
|
|
(forward-line -2)
|
|
|
|
|
(should (eq (car (get-text-property (1- (point)) 'jupyter-cell))
|
|
|
|
|
'out))
|
|
|
|
|
(should-error (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(should-error (jupyter-repl-cell-end-position)))))
|
|
|
|
|
|
2019-03-02 14:28:37 -06:00
|
|
|
|
(ert-deftest jupyter-repl-cell-cond ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert "foo")
|
|
|
|
|
(insert (propertize "bar" 'field 'cell-code))
|
|
|
|
|
(insert "baz")
|
|
|
|
|
(jupyter-repl-cell-cond
|
|
|
|
|
(point-min) (point-max)
|
|
|
|
|
(should (equal (buffer-string) "bar"))
|
|
|
|
|
(should (member (buffer-string) '("foo" "baz"))))
|
|
|
|
|
(jupyter-repl-cell-cond
|
|
|
|
|
(point-min) (point-max)
|
|
|
|
|
(should (equal (buffer-string) "bar")))))
|
|
|
|
|
|
2019-03-02 00:30:09 -06:00
|
|
|
|
(ert-deftest jupyter-repl-restart-kernel ()
|
|
|
|
|
:tags '(repl restart)
|
|
|
|
|
(let ((jupyter-test-with-new-client t))
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(jupyter-ert-info ("Restart without errors")
|
|
|
|
|
(should (equal (oref client execution-state) "idle"))
|
|
|
|
|
;; Increment the cell count just to make sure it gets reset to 1 after
|
|
|
|
|
;; a restart
|
|
|
|
|
(jupyter-repl-update-cell-count 2)
|
|
|
|
|
(let* ((pos (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(restart-p nil)
|
|
|
|
|
(jupyter-include-other-output t)
|
|
|
|
|
(jupyter-iopub-message-hook
|
|
|
|
|
(lambda (_ msg)
|
|
|
|
|
(when (jupyter-message-status-starting-p msg)
|
|
|
|
|
(setq restart-p t)))))
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(jupyter-repl-restart-kernel)
|
2019-03-02 19:26:32 -06:00
|
|
|
|
;; Attempt to catch the status: starting message
|
|
|
|
|
(jupyter-with-timeout (nil jupyter-long-timeout)
|
2019-03-02 00:30:09 -06:00
|
|
|
|
restart-p)
|
2019-03-02 19:26:32 -06:00
|
|
|
|
(should (jupyter-kernel-info client))
|
2019-03-02 00:30:09 -06:00
|
|
|
|
(should (equal (jupyter-repl-cell-code-beginning-position) (point)))
|
|
|
|
|
(should-not (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(should (jupyter-repl-cell-finalized-p))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(should (= (jupyter-repl-cell-count) 1))
|
|
|
|
|
(jupyter-repl-sync-execution-state)
|
|
|
|
|
(should (equal (jupyter-execution-state client) "idle")))))))
|
|
|
|
|
|
2018-08-27 20:37:27 -05:00
|
|
|
|
(ert-deftest jupyter-repl-prompts ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(repl prompt)
|
2019-05-10 17:37:15 -05:00
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(let (cell-prop)
|
|
|
|
|
(jupyter-ert-info ("Prompt properties")
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(let (prompt-overlay)
|
|
|
|
|
(goto-char (jupyter-repl-cell-beginning-position))
|
|
|
|
|
(setq prompt-overlay (car (overlays-at (point))))
|
|
|
|
|
(should-not (null prompt-overlay))
|
2019-05-10 17:37:15 -05:00
|
|
|
|
(setq cell-prop (get-text-property (point) 'jupyter-cell))
|
|
|
|
|
(should (eq (car cell-prop) 'beginning))
|
|
|
|
|
(should (and (numberp (cadr cell-prop))
|
|
|
|
|
(>= (cadr cell-prop) 1)))
|
|
|
|
|
(should (= (jupyter-repl-cell-count) (cadr cell-prop)))))
|
|
|
|
|
(jupyter-ert-info ("Input prompts")
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(goto-char (jupyter-repl-cell-code-beginning-position))
|
|
|
|
|
;; To prevent prompts from inheriting text properties of cell code there is
|
|
|
|
|
;; an invisible character at the end of every prompt. This is because
|
|
|
|
|
;; prompts are implemented as overlays and therefore will inherit the text
|
|
|
|
|
;; properties of adjacent text, we want to prevent that.
|
|
|
|
|
(should (invisible-p (1- (point))))
|
|
|
|
|
(should (jupyter-repl-cell-beginning-p (- (point) 2)))
|
|
|
|
|
(should (eq (char-after (- (point) 2)) ?\n))
|
|
|
|
|
(let* ((props (text-properties-at (- (point) 2)))
|
|
|
|
|
(cell-property (memq 'jupyter-cell props)))
|
|
|
|
|
(should (not (null cell-property)))
|
|
|
|
|
(should (listp (cdr cell-property)))
|
2019-05-10 17:37:15 -05:00
|
|
|
|
(should (equal (cadr cell-property) cell-prop)))))
|
|
|
|
|
(jupyter-ert-info ("Continuation prompts")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
|
2019-05-10 17:37:15 -05:00
|
|
|
|
)
|
|
|
|
|
(jupyter-ert-info ("Output prompts")
|
2018-08-27 20:37:27 -05:00
|
|
|
|
|
2019-05-10 17:37:15 -05:00
|
|
|
|
)))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
2019-02-22 20:51:00 -06:00
|
|
|
|
(ert-deftest jupyter-repl-prompt-margin ()
|
|
|
|
|
:tags '(repl prompt)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(let ((jupyter-repl-prompt-margin-width 2))
|
|
|
|
|
(jupyter-repl--reset-prompts)
|
|
|
|
|
(should (= jupyter-repl-prompt-margin-width 2))
|
|
|
|
|
(should (= left-margin-width 2))
|
|
|
|
|
(jupyter-repl-insert-prompt)
|
|
|
|
|
(should (> left-margin-width 2))
|
|
|
|
|
(should (= left-margin-width jupyter-repl-prompt-margin-width))
|
|
|
|
|
(should (= jupyter-repl-prompt-margin-width
|
|
|
|
|
(length (jupyter-repl-prompt-string)))))))
|
|
|
|
|
|
2019-01-23 12:30:17 -06:00
|
|
|
|
(ert-deftest jupyter-repl-yank ()
|
|
|
|
|
:tags '(repl yank)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(jupyter-ert-info ("Ensure field property exists after yanking")
|
|
|
|
|
(kill-new "import foo")
|
|
|
|
|
(yank)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "import foo"))
|
|
|
|
|
(should-not (text-property-not-all
|
|
|
|
|
(jupyter-repl-cell-code-beginning-position)
|
|
|
|
|
(jupyter-repl-cell-code-end-position)
|
2019-01-24 12:30:35 -06:00
|
|
|
|
'field 'cell-code)))
|
|
|
|
|
(jupyter-ert-info ("Undo rear-nonsticky property inserted by `insert-for-yank'")
|
|
|
|
|
(kill-new "import foo")
|
|
|
|
|
(yank)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "import foo"))
|
|
|
|
|
(should-not (get-text-property (1- (jupyter-repl-cell-code-end-position))
|
|
|
|
|
'rear-nonsticky)))))
|
2019-01-23 12:30:17 -06:00
|
|
|
|
|
2019-02-14 23:06:00 -06:00
|
|
|
|
(ert-deftest jupyter-repl-syntax-propertize-function ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
;; TODO: Test field = `cell-code` path
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((jupyter-current-client client))
|
|
|
|
|
(insert "(foo) bar")
|
|
|
|
|
(jupyter-repl-syntax-propertize-function #'ignore (point-min) (point-max))
|
2019-02-17 23:41:01 -06:00
|
|
|
|
(jupyter-test-text-has-property 'syntax-table '(1 . ?.) '(1 5))
|
2019-02-14 23:06:00 -06:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "(foo)")
|
|
|
|
|
(jupyter-repl-syntax-propertize-function #'ignore (point-min) (point-max))
|
2019-02-17 23:41:01 -06:00
|
|
|
|
(jupyter-test-text-has-property 'syntax-table '(1 . ?.) '(1 5))
|
2019-02-14 23:06:00 -06:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "foo (bar)")
|
|
|
|
|
(jupyter-repl-syntax-propertize-function #'ignore (point-min) (point-max))
|
2019-02-17 23:41:01 -06:00
|
|
|
|
(jupyter-test-text-has-property 'syntax-table '(1 . ?.) '(5 9))))))
|
2019-02-14 23:06:00 -06:00
|
|
|
|
|
2019-02-21 22:54:30 -06:00
|
|
|
|
(ert-deftest jupyter-repl-undo ()
|
|
|
|
|
:tags '(repl yank undo)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
(jupyter-ert-info ("Undo after yank undoes all the yanked text")
|
|
|
|
|
(kill-new "import IPython\ndef foo(x)\n\treturn x")
|
|
|
|
|
(undo-boundary)
|
|
|
|
|
(yank)
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) "import IPython\ndef foo(x)\n\treturn x"))
|
|
|
|
|
(let ((beg (jupyter-repl-cell-beginning-position)))
|
|
|
|
|
(undo)
|
|
|
|
|
(should (get-text-property beg 'jupyter-cell))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(should (equal (jupyter-repl-cell-code) ""))))))
|
|
|
|
|
|
2019-02-27 14:43:50 -06:00
|
|
|
|
(ert-deftest jupyter-repl-after-change ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
|
|
|
|
;; See #38
|
|
|
|
|
(jupyter-ert-info ("Maintain field membership after deleting text at beginning of cell")
|
|
|
|
|
(insert "foo(")
|
|
|
|
|
(should (eql (field-at-pos (jupyter-repl-cell-code-beginning-position)) 'cell-code))
|
|
|
|
|
(backward-char)
|
|
|
|
|
(backward-kill-word 1)
|
|
|
|
|
(should (eql (field-at-pos (jupyter-repl-cell-code-beginning-position)) 'cell-code)))))
|
|
|
|
|
|
2019-04-01 21:45:00 -05:00
|
|
|
|
(ert-deftest jupyter-repl-propagate-client ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(setq jupyter-current-client (jupyter-repl-client))
|
|
|
|
|
(oset jupyter-current-client kernel-info
|
|
|
|
|
(list :language_info
|
|
|
|
|
;; :name is a symbol, see `jupyter-kernel-info'
|
|
|
|
|
(list :name 'python :file_extension "py")))
|
|
|
|
|
(let ((buffer (generate-new-buffer " *temp*")))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(ert-info ("Verify that `jupyter-current-client' is actually set")
|
|
|
|
|
(should-not (buffer-local-value 'jupyter-current-client buffer))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(python-mode))
|
|
|
|
|
(jupyter-repl-propagate-client buffer)
|
|
|
|
|
(should (eq (buffer-local-value 'jupyter-current-client buffer)
|
|
|
|
|
jupyter-current-client)))
|
|
|
|
|
(ert-info ("Robust to bad arguments")
|
|
|
|
|
(jupyter-repl-propagate-client 1)
|
|
|
|
|
(jupyter-repl-propagate-client
|
|
|
|
|
(generate-new-buffer-name "foo"))))
|
|
|
|
|
(when (buffer-live-p buffer)
|
|
|
|
|
(kill-buffer buffer))))))
|
|
|
|
|
|
2019-04-15 20:47:20 -05:00
|
|
|
|
(ert-deftest jupyter-connect-repl ()
|
|
|
|
|
:tags '(repl)
|
|
|
|
|
(jupyter-test-with-python-repl client
|
2019-05-09 21:16:10 -05:00
|
|
|
|
(let ((cclient (jupyter-connect-repl
|
|
|
|
|
(jupyter-session-conn-info
|
|
|
|
|
(oref client session)))))
|
2019-04-15 20:47:20 -05:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(let ((msg (jupyter-wait-until-received :execute-result
|
|
|
|
|
(let ((jupyter-inhibit-handlers t))
|
2019-05-09 21:16:10 -05:00
|
|
|
|
(jupyter-send-execute-request cclient
|
2019-04-15 20:47:20 -05:00
|
|
|
|
:code "1 + 1")))))
|
|
|
|
|
(should msg)
|
|
|
|
|
(should (equal (jupyter-message-data msg :text/plain) "2")))
|
2019-05-09 21:16:10 -05:00
|
|
|
|
(with-current-buffer (oref cclient buffer)
|
|
|
|
|
(jupyter-stop-channels cclient)
|
|
|
|
|
(let ((kill-buffer-query-functions nil))
|
|
|
|
|
(kill-buffer)))))))
|
2019-04-15 20:47:20 -05:00
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;;; `org-mode'
|
2017-12-13 11:27:13 -06:00
|
|
|
|
|
2018-05-16 20:45:26 -05:00
|
|
|
|
(defvar org-babel-jupyter-resource-directory nil)
|
|
|
|
|
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(ert-deftest ob-jupyter-no-results ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block "1 + 1;" ""))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(ert-deftest ob-jupyter-scalar-results ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(org)
|
2019-03-03 16:53:39 -06:00
|
|
|
|
(jupyter-org-test-src-block "1 + 1" ": 2\n")
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(ert-info ("Tables")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"[[1, 2, 3], [4, 5, 6]]"
|
|
|
|
|
"\
|
|
|
|
|
| 1 | 2 | 3 |
|
2019-03-03 16:53:39 -06:00
|
|
|
|
| 4 | 5 | 6 |
|
|
|
|
|
")))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest ob-jupyter-html-results ()
|
|
|
|
|
:tags '(org)
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(jupyter-org-test-src-block
|
2018-11-16 22:14:31 -06:00
|
|
|
|
"\
|
2018-11-18 11:59:55 -06:00
|
|
|
|
from IPython.core.display import HTML
|
2018-11-16 22:14:31 -06:00
|
|
|
|
HTML('<a href=\"http://foo.com\">link</a>')"
|
|
|
|
|
"\
|
2018-02-12 10:49:41 -06:00
|
|
|
|
#+BEGIN_EXPORT html
|
|
|
|
|
<a href=\"http://foo.com\">link</a>
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXPORT
|
|
|
|
|
"))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(ert-deftest ob-jupyter-markdown-results ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
from IPython.core.display import Markdown
|
|
|
|
|
Markdown('*b*')"
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_EXPORT markdown
|
|
|
|
|
*b*
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXPORT
|
|
|
|
|
"))
|
2018-11-18 11:59:55 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest ob-jupyter-latex-results ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
from IPython.core.display import Latex
|
|
|
|
|
Latex(r'$\\alpha$')"
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_EXPORT latex
|
|
|
|
|
$\\alpha$
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXPORT
|
|
|
|
|
")
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(ert-info ("Raw results")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
from IPython.core.display import Latex
|
|
|
|
|
Latex(r'$\\alpha$')"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
"$\\alpha$\n"
|
2018-11-18 11:59:55 -06:00
|
|
|
|
:results "raw")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest ob-jupyter-error-results ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"from IPython."
|
2018-11-24 22:08:26 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: from IPython.
|
|
|
|
|
: ^
|
|
|
|
|
: SyntaxError: invalid syntax"
|
2018-11-18 11:59:55 -06:00
|
|
|
|
:regexp t))
|
|
|
|
|
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(ert-deftest ob-jupyter-image-results ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(let* ((default-directory (file-name-directory
|
|
|
|
|
(locate-library "jupyter")))
|
|
|
|
|
(org-babel-jupyter-resource-directory "./")
|
|
|
|
|
(file (expand-file-name "jupyter.png"))
|
|
|
|
|
(py-version
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(with-current-buffer jupyter-org-test-buffer
|
2018-11-24 22:08:26 -06:00
|
|
|
|
(jupyter-test-ipython-kernel-version
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
(thread-first jupyter-current-client
|
|
|
|
|
(slot-value 'manager)
|
|
|
|
|
(slot-value 'kernel)
|
|
|
|
|
(slot-value 'spec)))))
|
2018-11-24 22:08:26 -06:00
|
|
|
|
;; There is a change in how the IPython kernel prints base64 encoded
|
|
|
|
|
;; images somewhere between [4.6.1, 5.1]. In 5.1, base64 encoded
|
|
|
|
|
;; images are printed with line breaks whereas in 4.6.1 they are not.
|
|
|
|
|
(line-breaks (version< "4.6.1" py-version))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(data (let ((buffer-file-coding-system 'binary))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(set-buffer-multibyte nil)
|
|
|
|
|
(insert-file-contents-literally file)
|
|
|
|
|
(base64-encode-region (point-min) (point-max) line-breaks)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert "\n")
|
|
|
|
|
(buffer-substring-no-properties (point-min) (point-max)))))
|
|
|
|
|
(image-file-name (jupyter-org-image-file-name data "png")))
|
|
|
|
|
(unwind-protect
|
2019-01-10 17:48:37 -06:00
|
|
|
|
(progn
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
(format "\
|
2018-02-12 10:49:41 -06:00
|
|
|
|
from IPython.display import Image
|
2018-11-16 22:14:31 -06:00
|
|
|
|
Image(filename='%s')" file)
|
2019-03-03 16:53:39 -06:00
|
|
|
|
(format "[[file:%s]]\n" image-file-name))
|
2019-01-11 11:38:35 -06:00
|
|
|
|
(ert-info ("Create a drawer containing file links")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
(format "\
|
2019-01-10 17:48:37 -06:00
|
|
|
|
from IPython.display import Image
|
|
|
|
|
from IPython.display import display
|
|
|
|
|
display(Image(filename='%s'))
|
|
|
|
|
Image(filename='%s')" file file)
|
2019-01-11 11:38:35 -06:00
|
|
|
|
(concat
|
2019-03-03 16:53:39 -06:00
|
|
|
|
":RESULTS:\n"
|
2019-01-11 11:38:35 -06:00
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
|
|
|
|
":END:\n")
|
2019-01-11 11:38:35 -06:00
|
|
|
|
:async "yes"))
|
|
|
|
|
(ert-info ("Append a file link to a drawer")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
(format "\
|
2019-01-10 17:48:37 -06:00
|
|
|
|
from IPython.display import Image
|
|
|
|
|
from IPython.display import display
|
|
|
|
|
display(Image(filename='%s'))
|
|
|
|
|
display(Image(filename='%s'))
|
|
|
|
|
Image(filename='%s')" file file file)
|
2019-01-11 11:38:35 -06:00
|
|
|
|
(concat
|
2019-03-03 16:53:39 -06:00
|
|
|
|
":RESULTS:\n"
|
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
2019-01-11 11:38:35 -06:00
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
":END:\n")
|
2019-01-11 11:38:35 -06:00
|
|
|
|
:async "yes"))
|
2019-01-12 20:20:19 -06:00
|
|
|
|
(ert-info ("Image with width and height metadata")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
(format "\
|
|
|
|
|
from IPython.display import Image
|
|
|
|
|
Image(filename='%s', width=300)" file)
|
|
|
|
|
(concat
|
2019-03-03 16:53:39 -06:00
|
|
|
|
":RESULTS:\n"
|
2019-01-12 20:20:19 -06:00
|
|
|
|
"#+ATTR_ORG: :width 300\n"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
(format "[[file:%s]]" image-file-name) "\n"
|
|
|
|
|
":END:\n"))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(when (file-exists-p image-file-name)
|
|
|
|
|
(delete-file image-file-name)))))
|
2018-02-12 10:49:41 -06:00
|
|
|
|
|
2018-11-10 14:26:00 -06:00
|
|
|
|
(ert-deftest jupyter-org-result ()
|
2018-11-14 13:15:29 -06:00
|
|
|
|
:tags '(org)
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(let ((req (jupyter-org-request)))
|
|
|
|
|
(should (equal (jupyter-org-result req (list :text/plain "foo"))
|
2018-11-19 10:41:06 -06:00
|
|
|
|
'(fixed-width (:value "foo"))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should (equal (jupyter-org-result req (list :text/html "foo"))
|
2018-11-19 10:41:06 -06:00
|
|
|
|
'(export-block (:type "html" :value "foo\n"))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;; Calls `org-babel-script-escape' for scalar data
|
|
|
|
|
(should (equal (jupyter-org-result req (list :text/plain "[1, 2, 3]"))
|
2019-01-16 18:50:02 -06:00
|
|
|
|
"| 1 | 2 | 3 |\n"))
|
|
|
|
|
(should (equal (jupyter-org-result req (list :text/plain "[1, 2, 3] Foo"))
|
|
|
|
|
'(fixed-width (:value "[1, 2, 3] Foo"))))))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-org-result-python ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
;; Test that the python language specialized method calls
|
|
|
|
|
;; `org-babel-python-table-or-string', this is more of a test for method
|
|
|
|
|
;; order.
|
|
|
|
|
(cl-letf* ((py-method-called nil)
|
|
|
|
|
(req (jupyter-org-request))
|
|
|
|
|
((symbol-function #'org-babel-python-table-or-string)
|
|
|
|
|
(lambda (results)
|
|
|
|
|
(setq py-method-called t)
|
|
|
|
|
(org-babel-script-escape results)))
|
|
|
|
|
(jupyter-current-client (jupyter-kernel-client)))
|
|
|
|
|
(oset jupyter-current-client kernel-info
|
2019-03-07 22:22:51 -06:00
|
|
|
|
(list :language_info (list :name 'python)))
|
|
|
|
|
(should (equal (jupyter-kernel-language jupyter-current-client) 'python))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
;; Bring in the python specific methods
|
|
|
|
|
(jupyter-load-language-support jupyter-current-client)
|
|
|
|
|
(should (equal (jupyter-org-result req (list :text/plain "[1, 2, 3]"))
|
2018-11-19 10:41:06 -06:00
|
|
|
|
"| 1 | 2 | 3 |\n"))
|
2018-11-16 22:14:31 -06:00
|
|
|
|
(should py-method-called)))
|
2018-01-08 21:38:32 -06:00
|
|
|
|
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(ert-deftest jupyter-org-src-block-cache ()
|
|
|
|
|
:tags '(org)
|
2018-11-24 22:08:26 -06:00
|
|
|
|
(let (jupyter-org--src-block-cache)
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert
|
2019-02-12 08:55:40 -06:00
|
|
|
|
"#+BEGIN_SRC jupyter-python :session " jupyter-org-test-session "\n"
|
2018-11-18 11:59:55 -06:00
|
|
|
|
"imp\n"
|
|
|
|
|
"#+END_SRC\n\n\n#+RESULTS:")
|
|
|
|
|
;; Needed for the text properties
|
|
|
|
|
(font-lock-ensure)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(end-of-line)
|
2018-11-24 22:08:26 -06:00
|
|
|
|
(should-not jupyter-org--src-block-cache)
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(should-not (jupyter-org--same-src-block-p))
|
|
|
|
|
(jupyter-org--set-current-src-block)
|
2018-11-24 22:08:26 -06:00
|
|
|
|
(should jupyter-org--src-block-cache)
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(should (jupyter-org--same-src-block-p))
|
|
|
|
|
(cl-destructuring-bind (params beg end)
|
2018-11-24 22:08:26 -06:00
|
|
|
|
jupyter-org--src-block-cache
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(should (equal (alist-get :session params) jupyter-org-test-session))
|
|
|
|
|
(should (= beg (line-beginning-position)))
|
|
|
|
|
(should (= end (line-beginning-position 2))))
|
|
|
|
|
(ert-info ("End marker updates after insertion")
|
|
|
|
|
(forward-line)
|
|
|
|
|
(insert "new source block text\n")
|
|
|
|
|
;; #+BEGIN_SRC ...
|
|
|
|
|
;; imp
|
|
|
|
|
;; new source block text
|
|
|
|
|
;; |#+END_SRC
|
|
|
|
|
(cl-destructuring-bind (params beg end)
|
2018-11-24 22:08:26 -06:00
|
|
|
|
jupyter-org--src-block-cache
|
2018-11-18 11:59:55 -06:00
|
|
|
|
(should (equal (alist-get :session params) jupyter-org-test-session))
|
|
|
|
|
(should (= beg (line-beginning-position -1)))
|
|
|
|
|
(should (= end (line-beginning-position))))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-org-when-in-src-block ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(ert-info ("In Jupyter blocks")
|
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert
|
2019-02-12 08:55:40 -06:00
|
|
|
|
"#+BEGIN_SRC jupyter-python :session " jupyter-org-test-session "\n"
|
2018-11-18 11:59:55 -06:00
|
|
|
|
"1 + 1\n"
|
|
|
|
|
"#+END_SRC\nfoo")
|
|
|
|
|
;; Needed for the text properties
|
|
|
|
|
(font-lock-ensure)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))))
|
|
|
|
|
(ert-info ("Not in Jupyter block")
|
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert
|
|
|
|
|
"#+BEGIN_SRC python :session " jupyter-org-test-session "\n"
|
|
|
|
|
"1 + 1\n"
|
|
|
|
|
"#+END_SRC\nfoo")
|
|
|
|
|
;; Needed for the text properties
|
|
|
|
|
(font-lock-ensure)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should-not (jupyter-org-when-in-src-block t)))))
|
|
|
|
|
|
2018-12-01 00:27:39 -06:00
|
|
|
|
(ert-deftest jupyter-org--stream-context-p ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(org-mode)
|
|
|
|
|
(dolist
|
|
|
|
|
(res '(("\
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
:RESULTS:
|
|
|
|
|
: Foo
|
|
|
|
|
:END:" . 27)
|
|
|
|
|
("\
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
: Foo
|
|
|
|
|
" . 17)
|
|
|
|
|
("\
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
Foo
|
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
" . 31)
|
|
|
|
|
("\
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
:RESULTS:
|
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
Foo
|
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
:END:
|
|
|
|
|
" . 41)
|
|
|
|
|
("\
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
file:foo
|
|
|
|
|
" . nil)))
|
|
|
|
|
(insert (car res))
|
|
|
|
|
(if (cdr res)
|
|
|
|
|
(should (= (jupyter-org--stream-context-p (org-element-at-point)) (cdr res)))
|
|
|
|
|
(should-not (jupyter-org--stream-context-p (org-element-at-point))))
|
|
|
|
|
(erase-buffer))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-org-coalesce-stream-results ()
|
|
|
|
|
:tags '(org)
|
2019-02-21 11:35:47 -06:00
|
|
|
|
(let ((org-edit-src-content-indentation 0))
|
|
|
|
|
(ert-info ("Synchronous")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\")
|
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
print(\"foo\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
: foo
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
"))
|
2019-02-21 11:35:47 -06:00
|
|
|
|
(ert-info ("Asynchronous")
|
|
|
|
|
(ert-info ("Newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\")
|
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
print(\"foo\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
: foo
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
print(\"foo\", end=\"\", flush=True)
|
|
|
|
|
print(\"foo\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: foofoo
|
|
|
|
|
")
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes")
|
|
|
|
|
(ert-info ("No newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\")
|
|
|
|
|
print(\"foo\", end=\"\", flush=True)
|
|
|
|
|
print(\"bar\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: foobar
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes"))
|
|
|
|
|
(ert-info ("Multiple newlines in appended stream message")
|
|
|
|
|
(ert-info ("Newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\")
|
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
print(\"bar\\nqux\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
: foo
|
|
|
|
|
: bar
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: qux
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes"))
|
|
|
|
|
(ert-info ("No newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"foo\")
|
|
|
|
|
print(\"foo\", end=\"\", flush=True)
|
|
|
|
|
print(\"bar\\nqux\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
: foo
|
|
|
|
|
: foobar
|
2019-03-03 16:53:39 -06:00
|
|
|
|
: qux
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes")))
|
|
|
|
|
(ert-info ("fixed-width to example-block promotion")
|
|
|
|
|
(let ((org-babel-min-lines-for-block-output 2))
|
2019-03-03 16:53:39 -06:00
|
|
|
|
(jupyter-org-test-src-block "print(\"z\")" ": z\n")
|
2019-02-21 11:35:47 -06:00
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"z\", flush=True)
|
|
|
|
|
print(\"z\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
z
|
|
|
|
|
z
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes")
|
|
|
|
|
(ert-info ("Appending after block promotion")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"z\", flush=True)
|
|
|
|
|
print(\"z\", flush=True)
|
|
|
|
|
print(\"z\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
z
|
|
|
|
|
z
|
|
|
|
|
z
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes"))
|
|
|
|
|
(ert-info ("Append to block with newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"z\\nz\", flush=True)
|
|
|
|
|
print(\"z\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
z
|
|
|
|
|
z
|
|
|
|
|
z
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes"))
|
|
|
|
|
(ert-info ("Append to block without newline after first stream message")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
print(\"z\\nz\", end=\"\", flush=True)
|
|
|
|
|
print(\"z\")"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
"\
|
2018-12-01 00:27:39 -06:00
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
z
|
|
|
|
|
zz
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes")))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest jupyter-org-example-block-indentation ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(skip-unless (version<= "9.2" (org-version)))
|
|
|
|
|
(let ((org-babel-min-lines-for-block-output 2)
|
|
|
|
|
(org-edit-src-content-indentation 2))
|
|
|
|
|
(ert-info ("Appending obeys `org-edit-src-content-indentation'")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
print(\"z\", flush=True)
|
|
|
|
|
print(\"z\")"
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_EXAMPLE
|
|
|
|
|
z
|
|
|
|
|
z
|
2019-03-03 16:53:39 -06:00
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
"
|
2019-02-21 11:35:47 -06:00
|
|
|
|
:async "yes"))))
|
2018-12-01 00:27:39 -06:00
|
|
|
|
|
2019-03-03 17:54:31 -06:00
|
|
|
|
(ert-deftest jupyter-org-wrapping-with-drawer ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(ert-info ("Preserve whitespace after wrapping a result")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
1 + 1"
|
|
|
|
|
"\
|
|
|
|
|
:RESULTS:
|
|
|
|
|
: foo
|
|
|
|
|
: 2
|
|
|
|
|
:END:
|
|
|
|
|
"
|
|
|
|
|
:async "yes")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
print(\"foo\", flush=True)
|
|
|
|
|
1 + 1"
|
|
|
|
|
"\
|
|
|
|
|
:RESULTS:
|
|
|
|
|
: foo
|
|
|
|
|
: 2
|
|
|
|
|
:END:
|
|
|
|
|
")))
|
|
|
|
|
|
2019-03-16 16:50:00 -05:00
|
|
|
|
(ert-deftest jupyter-org-font-lock-ansi-escapes ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"print('AB\x1b[43mCD\x1b[0mEF')"
|
|
|
|
|
": AB[43mCD[0mEF\n")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
from IPython.display import publish_display_data
|
|
|
|
|
publish_display_data({'text/plain': 'AB\x1b[43mCD\x1b[0mEF'});"
|
|
|
|
|
": AB[43mCD[0mEF\n")
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(org-mode)
|
|
|
|
|
(jupyter-org-interaction-mode 1)
|
|
|
|
|
(let ((test-fun
|
|
|
|
|
(lambda (face-pos invisible-pos)
|
|
|
|
|
(font-lock-ensure)
|
|
|
|
|
(jupyter-test-text-has-property 'invisible t invisible-pos)
|
|
|
|
|
(should (listp (get-text-property face-pos 'face)))
|
|
|
|
|
(should (get-text-property face-pos 'font-lock-face))
|
|
|
|
|
(should (eq (caar (get-text-property face-pos 'face)) 'background-color)))))
|
|
|
|
|
(insert ": AB[43mCD[0mEF")
|
|
|
|
|
(funcall test-fun 10 '(5 6 7 8 9 12 13 14 15))
|
|
|
|
|
;; Test the cached faces path
|
|
|
|
|
(remove-text-properties (point-min) (point-max) '(face))
|
|
|
|
|
(funcall test-fun 10 '(5 6 7 8 9 12 13 14 15))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "\
|
|
|
|
|
#+begin_example
|
|
|
|
|
AB[43mCD[0mEF
|
|
|
|
|
#+end_example")
|
|
|
|
|
;; Test the cached faces path
|
|
|
|
|
(remove-text-properties (point-min) (point-max) '(face))
|
|
|
|
|
(funcall test-fun 24 '(19 20 21 22 23 26 27 28 29)))))
|
|
|
|
|
|
2019-03-24 00:11:56 -05:00
|
|
|
|
(ert-deftest jupyter-org-closest-jupyter-language ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
x
|
|
|
|
|
|
|
|
|
|
#+BEGIN_SRC jupyter-bar
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+BEGIN_SRC baz
|
|
|
|
|
#+END_SRC
|
|
|
|
|
")
|
|
|
|
|
(re-search-backward "x")
|
|
|
|
|
(should (equal (jupyter-org-closest-jupyter-language)
|
|
|
|
|
"jupyter-bar"))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(should (equal (jupyter-org-closest-jupyter-language)
|
|
|
|
|
"jupyter-foo"))
|
|
|
|
|
(forward-line 2)
|
|
|
|
|
(should (equal (jupyter-org-closest-jupyter-language)
|
|
|
|
|
"jupyter-bar"))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(should (equal (jupyter-org-closest-jupyter-language)
|
|
|
|
|
"jupyter-bar"))
|
|
|
|
|
(forward-line -3)
|
|
|
|
|
(should (equal (jupyter-org-closest-jupyter-language)
|
|
|
|
|
"jupyter-bar"))))
|
|
|
|
|
|
2019-03-23 00:12:06 -05:00
|
|
|
|
(ert-deftest org-babel-jupyter-src-block-session ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo :session bar
|
|
|
|
|
#+END_SRC")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(should-error (org-babel-jupyter-src-block-session))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo :kernel bar
|
|
|
|
|
#+END_SRC")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(should-error (org-babel-jupyter-src-block-session))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo :session bar :kernel bar
|
|
|
|
|
#+END_SRC")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(should (equal (org-babel-jupyter-src-block-session)
|
|
|
|
|
(org-babel-jupyter-session-key
|
|
|
|
|
(nth 2 (org-babel-get-src-block-info 'light)))))
|
|
|
|
|
(erase-buffer)))
|
|
|
|
|
|
2019-05-08 10:25:23 -05:00
|
|
|
|
(ert-deftest org-babel-jupyter-strip-ansi-escapes ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
: AB[43mCD[0mEF\n")
|
|
|
|
|
(org-babel-jupyter-strip-ansi-escapes 'latex)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
: ABCDEF\n"))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
")
|
|
|
|
|
(org-babel-jupyter-strip-ansi-escapes 'latex)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+RESULTS:
|
|
|
|
|
"))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert "\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
")
|
|
|
|
|
(org-babel-jupyter-strip-ansi-escapes 'latex)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"\
|
|
|
|
|
#+BEGIN_SRC jupyter-foo
|
|
|
|
|
#+END_SRC
|
|
|
|
|
"))))
|
|
|
|
|
|
2019-02-22 08:29:00 -06:00
|
|
|
|
(ert-deftest org-babel-jupyter-:results-header-arg ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(ert-info ("scalar suppresses table output")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"[1, 2, 3]"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
"| 1 | 2 | 3 |\n"
|
2019-02-22 08:29:00 -06:00
|
|
|
|
;; Ensure that no interference happens from removing the file header
|
|
|
|
|
;; argument.
|
|
|
|
|
:file "foo"
|
|
|
|
|
;; FIXME: How to handle header arguments consistently in the async vs sync
|
|
|
|
|
;; case.
|
|
|
|
|
:async "yes")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"[1, 2, 3]"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
": [1, 2, 3]\n"
|
2019-02-22 08:29:00 -06:00
|
|
|
|
:results "scalar")))
|
|
|
|
|
|
2019-01-16 17:50:17 -06:00
|
|
|
|
(ert-deftest org-babel-jupyter-:dir-header-arg ()
|
|
|
|
|
:tags '(org)
|
2019-05-02 18:50:00 -05:00
|
|
|
|
(let ((convert-path
|
|
|
|
|
(lambda (s)
|
|
|
|
|
;; Convert forward slashes to backslashes on Windows
|
|
|
|
|
(if (memq system-type '(windows-nt cygwin ms-dos))
|
|
|
|
|
(replace-regexp-in-string "/" "\\\\" s)
|
|
|
|
|
s))))
|
|
|
|
|
(ert-info ("Python")
|
2019-01-16 17:50:17 -06:00
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
import os
|
|
|
|
|
os.path.abspath(os.getcwd())"
|
2019-05-02 18:50:00 -05:00
|
|
|
|
(concat ": " (funcall convert-path (expand-file-name "~")) "\n")
|
|
|
|
|
:dir "~")
|
|
|
|
|
(ert-info ("Directory restored")
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
import os
|
|
|
|
|
os.path.abspath(os.getcwd())"
|
|
|
|
|
(concat ": "
|
|
|
|
|
(funcall convert-path
|
|
|
|
|
(expand-file-name
|
|
|
|
|
(directory-file-name default-directory))) "\n"))))))
|
2019-01-16 17:50:17 -06:00
|
|
|
|
|
2019-02-22 14:56:22 +01:00
|
|
|
|
(ert-deftest jupyter-org--find-mime-types ()
|
|
|
|
|
:tags '(org mime)
|
|
|
|
|
(ert-info ("Mimetype priority overwrite")
|
2019-02-22 08:32:00 -06:00
|
|
|
|
(should (equal (jupyter-org--find-mime-types "text")
|
|
|
|
|
'(:text/plain)))
|
|
|
|
|
(should (equal (jupyter-org--find-mime-types "image")
|
|
|
|
|
'(:image/png)))
|
|
|
|
|
(should (equal (jupyter-org--find-mime-types "plain html")
|
|
|
|
|
'(:text/plain :text/html)))
|
|
|
|
|
(should (equal (jupyter-org--find-mime-types "org jpeg")
|
|
|
|
|
'(:text/org :image/jpeg)))
|
|
|
|
|
(should (equal (jupyter-org--find-mime-types "plain foo html bar")
|
|
|
|
|
'(:text/plain :text/html)))
|
|
|
|
|
(should (equal (jupyter-org--find-mime-types "foo bar")
|
|
|
|
|
'()))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest org-babel-jupyter-:display-header-arg ()
|
|
|
|
|
:tags '(org)
|
|
|
|
|
(jupyter-org-test-src-block
|
|
|
|
|
"\
|
|
|
|
|
from IPython.display import publish_display_data
|
|
|
|
|
publish_display_data({'text/plain': \"foo\", 'text/latex': \"$\\alpha$\"});"
|
2019-03-03 16:53:39 -06:00
|
|
|
|
": foo\n"
|
2019-02-22 08:32:00 -06:00
|
|
|
|
:display "plain"))
|
2019-02-22 14:56:22 +01:00
|
|
|
|
|
2017-12-13 11:27:13 -06:00
|
|
|
|
;; Local Variables:
|
|
|
|
|
;; byte-compile-warnings: (not free-vars)
|
Refactor of `jupyter-kernel-manager.el`
This refactor implements a new class hierarchy to manage the lifetime of a
Jupyter kernel. The first node in this hierarchy is the
`jupyter-kernel-lifetime` class which defines a set of methods to manage the
lifetime of a kernel. An object that inherits from `jupyter-kernel-lifetime` is
stating that it has an association with a kernel and can be used to manage the
lifetime of the associated kernel.
The `jupyter-meta-kernel` class inherits from `jupyter-kernel-lifetime` and
mainly defines a `spec` slot used to hold the `kernelspec` from which a command
can be constructed to start a kernel and a `session` slot used to hold the
`jupyter-session` object that clients can use to establish communication with a
kernel once its live. Concrete classes that actually launch kernels are
intended to inherit from this class and use its slots.
`jupyter-kernel-process` manages the lifetime of a kernel started as a process
using the function `start-file-process`, `jupyter-command-kernel` calls the
`jupyter kernel` shell command to start a kernel, finally `jupyter-spec-kernel`
uses the `spec` slot to construct a shell command to start a kernel.
A `jupyter-kernel-manager` now consists of a `kernel` slot that holds a
`jupyter-meta-kernel` and a `control-channel` slot and inherits from
`jupyter-kernel-lifetime`. The `jupyter-kernel-lifetime` methods of the manager
just defer to those of `kernel` while also taking into account the
`control-channel`.
* jupyter-base.el (jupyter-write-connection-file): New function.
* jupyter-channel-ioloop.el
(jupyter-channel-ioloop-add-start-channel-event): Remove `sleep-for` call.
The startup message is not so important anymore.
* jupyter-client.el (jupyter-wait-until-startup: New function.
* jupyter-kernel-manager.el (jupyter-kernel-lifetime)
(jupyter-kernel, jupyter-kernel-process, jupyter-command-kernel)
(jupyter-spec-kernel): New classes.
(jupyter-kernel-manager): Inherit from jupyter-kernel-lifetime only and
implement its methods.
(jupyter-kernel-manager--cleanup, jupyter-kernel-managers)
(jupyter-delete-all-kernels, jupyter--kernel-sentinel)
(jupyter--start-kernel): Remove and remove related, their functionality has
been generalized in the new classes.
(jupyter-interrupt-kernel, jupyter-shutdown-kernel)
(jupyter-start-channels, jupyter-start-kernel, jupyter-kernel-alive-p)
(jupyter-kill-kernel): Refactor and implement to use the new class hierarchy.
* test/jupyter-test.el: Refactor tests to account for changes.
(jupyter-write-connect-file, jupyter-command-kernel): New tests.
* jupyter-kernelspec.el (jupyter-guess-kernelspec): New function.
2019-05-09 08:31:00 -05:00
|
|
|
|
;; eval: (and (functionp 'aggressive-indent-mode) (aggressive-indent-mode -1))
|
2017-12-13 11:27:13 -06:00
|
|
|
|
;; End:
|
2018-11-14 13:15:29 -06:00
|
|
|
|
;;; jupyter-test.el ends here
|