hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-05 07:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement jupyter-comm-(start|stop) methods for a jupyter-server-kernel-manager

Browse source 
These are wrappers around calls to the same method for the `comm` slot of a
`jupyter-server-kernel-manager`.
This commit is contained in:
Nathaniel Nicandro 2019-06-18 12:51:01 -05:00 • committed by Nathaniel Nicandro
parent bed724f2fe
commit 7d3de9e6b2
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
jupyter-server.el
View file

@ -320,6 +320,26 @@ ID of the kernel associated with COMM."
(kernel :type jupyter-server-kernel :initarg :kernel) (kernel :type jupyter-server-kernel :initarg :kernel)
(comm :type jupyter-server-kernel-comm))) (comm :type jupyter-server-kernel-comm)))
(cl-defmethod jupyter-comm-start ((manager jupyter-server-kernel-manager))
"Start a websocket connection to MANAGER's kernel.
MANAGER's COMM slot will be set to the `jupyter-comm-layer'
receiving events on the websocket when this method returns."
(with-slots (kernel server) manager
(unless (slot-boundp manager 'comm)
(oset manager comm (jupyter-server-kernel-comm
:kernel kernel
:server server)))
(with-slots (comm) manager
(unless (jupyter-comm-alive-p comm)
(jupyter-comm-start comm)))))
(cl-defmethod jupyter-comm-stop ((manager jupyter-server-kernel-manager))
"Stop a websocket connection to MANAGER's kernel."
(when (slot-boundp manager 'comm)
(with-slots (comm) manager
(when (jupyter-comm-alive-p comm)
(jupyter-comm-stop comm)))))
(cl-defmethod jupyter-kernel-alive-p ((manager jupyter-server-kernel-manager)) (cl-defmethod jupyter-kernel-alive-p ((manager jupyter-server-kernel-manager))
(with-slots (server kernel) manager (with-slots (server kernel) manager
(and (jupyter-kernel-alive-p kernel) (and (jupyter-kernel-alive-p kernel)
@ -330,12 +350,7 @@ ID of the kernel associated with COMM."
(with-slots (server kernel) manager (with-slots (server kernel) manager
(unless (jupyter-kernel-alive-p kernel) (unless (jupyter-kernel-alive-p kernel)
(jupyter-start-kernel kernel server)) (jupyter-start-kernel kernel server))
(unless (and (slot-boundp manager 'comm) (jupyter-comm-start manager)))
(jupyter-comm-alive-p (oref manager comm)))
(oset manager comm (jupyter-server-kernel-comm
:kernel kernel
:server server))
(jupyter-comm-start (oref manager comm)))))
(cl-defmethod jupyter-interrupt-kernel ((manager jupyter-server-kernel-manager)) (cl-defmethod jupyter-interrupt-kernel ((manager jupyter-server-kernel-manager))
(with-slots (server kernel) manager (with-slots (server kernel) manager
@ -347,18 +362,14 @@ ID of the kernel associated with COMM."
(cl-defmethod jupyter-shutdown-kernel ((manager jupyter-server-kernel-manager) &optional restart _timeout) (cl-defmethod jupyter-shutdown-kernel ((manager jupyter-server-kernel-manager) &optional restart _timeout)
(with-slots (server kernel comm) manager (with-slots (server kernel comm) manager
(if restart (jupyter-api-restart-kernel server (oref kernel id)) (if restart (jupyter-api-restart-kernel server (oref kernel id))
(jupyter-comm-stop comm) (jupyter-comm-stop manager)
(when (jupyter-kernel-alive-p manager) (when (jupyter-kernel-alive-p manager)
(jupyter-api-shutdown-kernel server (oref kernel id)))))) (jupyter-api-shutdown-kernel server (oref kernel id))))))
(cl-defmethod jupyter-make-client ((manager jupyter-server-kernel-manager) _class &rest _slots) (cl-defmethod jupyter-make-client ((manager jupyter-server-kernel-manager) _class &rest _slots)
(let ((client (cl-call-next-method))) (let ((client (cl-call-next-method)))
(prog1 client (prog1 client
(unless (slot-boundp manager 'comm) (jupyter-comm-start manager)
(oset manager comm (jupyter-server-kernel-comm
:kernel (oref manager kernel)
:server (oref manager server)))
(jupyter-comm-start (oref manager comm)))
(oset client kcomm (oref manager comm))))) (oset client kcomm (oref manager comm)))))
;;; Finding exisisting kernel managers and servers ;;; Finding exisisting kernel managers and servers