mirror of
https://github.com/vale981/emacs-jupyter
synced 2025-03-05 07:41:37 -05:00
b40b7de837
Having the `jupyter-comm-layer` abstraction means we do not need to do so. * jupyter-base.el (zmq): Un-require. (jupyter-socket-types): Move to `jupyter-channels.el`. (jupyter-session): Don't mention zmq in doc string. (jupyter-available-local-ports, jupyter-make-ssh-tunnel): New functions. (jupyter-tunnel-connection): Use them. * jupyter-channel-ioloop-comm.el: New file. * jupyter-channels.el (jupyter-messages): Un-require. (jupyter-comm-layer, zmq): New requires. (jupyter-socket-types): Moved from `jupyter-base.el`. (jupyter-send, jupyter-recv): Implementations for `jupyter-session` moved from `jupyter-messages.el`. (jupyter-sync-channel-comm): `jupyter-comm-layer` implementation for `jupyter-sync-channel` objects moved from `jupyter-comm-layer.el`. * jupyter-comm-layer.el (jupyter-channel-ioloop): Un-require. (jupyter-sync-channel-comm): Move implementation to `jupyter-channels.el`. (jupyter-ioloop-comm): Move implementation to new file `jupyter-ioloop-comm.el`. (jupyter-channel-ioloop-comm): Move implementation to new file `jupyter-channel-ioloop-comm.el`. * jupyter-ioloop-comm.el: New file. * jupyter-ioloop.el (zmq): Require. * jupyter-kernel-manager.el (jupyter-make-client): Ensure `jupyter-channel-ioloop-comm` is required. * jupyter-messages.el (jupyter-send) (jupyter-recv): Moved to `jupyter-channels.el` * jupyter-repl.el (jupyter-connect-repl): Ensure `jupyter-channel-ioloop-comm` is required. * test/jupyter-test.el (jupyter-available-local-ports): New test. * test/test-helper.el (jupyter-channel-ioloop-comm): New require.
67 lines
2.5 KiB
EmacsLisp
67 lines
2.5 KiB
EmacsLisp
;;; jupyter-ioloop-comm.el --- Communication layer using jupyter-ioloop -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2019 Nathaniel Nicandro
|
|
|
|
;; Author: Nathaniel Nicandro <nathanielnicandro@gmail.com>
|
|
;; Created: 27 Jun 2019
|
|
;; Version: 0.8.0
|
|
|
|
;; 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 3, 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:
|
|
|
|
;; Implement the `jupyter-comm-layer' interface on-top of a `jupyter-ioloop'.
|
|
;; Note this class only implements a subset of the `jupyter-comm-layer'
|
|
;; interface needed for a `jupyter-kernel-client' and is usually sub-classed to
|
|
;; be usable by a `jupyter-kernel-client'. See `jupyter-channel-ioloop-comm'.
|
|
|
|
;;; Code:
|
|
|
|
(require 'jupyter-comm-layer)
|
|
(require 'jupyter-ioloop)
|
|
|
|
(defclass jupyter-ioloop-comm (jupyter-comm-layer)
|
|
((ioloop :type jupyter-ioloop))
|
|
:abstract t)
|
|
|
|
;; Fall back method that catches IOLoop events that have not been handled by
|
|
;; the communication layer already.
|
|
(cl-defmethod jupyter-ioloop-handler ((_ioloop jupyter-ioloop)
|
|
(comm jupyter-ioloop-comm)
|
|
event)
|
|
(unless (memq (car event) '(start quit))
|
|
(jupyter-event-handler comm event)))
|
|
|
|
(cl-defmethod jupyter-send ((comm jupyter-ioloop-comm) &rest event)
|
|
(apply #'jupyter-send (oref comm ioloop) event))
|
|
|
|
(cl-defmethod jupyter-comm-start ((comm jupyter-ioloop-comm))
|
|
(with-slots (ioloop) comm
|
|
(unless (jupyter-ioloop-alive-p ioloop)
|
|
(jupyter-ioloop-start ioloop comm))))
|
|
|
|
(cl-defmethod jupyter-comm-stop ((comm jupyter-ioloop-comm))
|
|
(with-slots (ioloop) comm
|
|
(when (jupyter-ioloop-alive-p ioloop)
|
|
(jupyter-ioloop-stop ioloop))))
|
|
|
|
(cl-defmethod jupyter-comm-alive-p ((comm jupyter-ioloop-comm))
|
|
(and (slot-boundp comm 'ioloop)
|
|
(jupyter-ioloop-alive-p (oref comm ioloop))))
|
|
|
|
(provide 'jupyter-ioloop-comm)
|
|
|
|
;;; jupyter-ioloop-comm.el ends here
|