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

Allow supplying a client class in run-jupyter-repl and connect-jupyter-repl

Browse source
This commit is contained in:
Nathaniel Nicandro 2018-06-01 23:14:38 -05:00
parent aab35e6eed
commit 4566fce2e3
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
jupyter-repl.el
View file

@ -2303,7 +2303,7 @@ buffer slot, raise an error."
(jupyter-repl-insert-prompt 'in)))))) (jupyter-repl-insert-prompt 'in))))))
;;;###autoload ;;;###autoload
(defun run-jupyter-repl (kernel-name &optional associate-buffer) (defun run-jupyter-repl (kernel-name &optional associate-buffer client-class)
"Run a Jupyter REPL connected to a kernel with name, KERNEL-NAME. "Run a Jupyter REPL connected to a kernel with name, KERNEL-NAME.
KERNEL-NAME will be passed to `jupyter-find-kernelspecs' and the KERNEL-NAME will be passed to `jupyter-find-kernelspecs' and the
first kernel found will be used to start the new kernel. first kernel found will be used to start the new kernel.
@ -2315,18 +2315,26 @@ ASSOCIATE-BUFFER is set to t. If the `current-buffer's
`major-mode' does not correspond to the language of the kernel `major-mode' does not correspond to the language of the kernel
started, ASSOCIATE-BUFFER has no effect. started, ASSOCIATE-BUFFER has no effect.
Optional argument CLIENT-CLASS is the class that will be passed
to `jupyter-start-new-kernel' and should be a subclass of
`jupyter-repl-client', which is the default.
When called interactively, display the new REPL buffer. When called interactively, display the new REPL buffer.
Otherwise, in a non-interactive call, return the Otherwise, in a non-interactive call, return the
`jupyter-repl-client' connect to the kernel." `jupyter-repl-client' connect to the kernel."
(interactive (list (car (jupyter-completing-read-kernelspec (interactive (list (car (jupyter-completing-read-kernelspec
nil current-prefix-arg)) nil current-prefix-arg))
t)) t
nil))
(or client-class (setq client-class 'jupyter-repl-client))
(unless (called-interactively-p 'interactive) (unless (called-interactively-p 'interactive)
(setq kernel-name (caar (jupyter-find-kernelspecs kernel-name)))) (setq kernel-name (caar (jupyter-find-kernelspecs kernel-name))))
(unless kernel-name (unless kernel-name
(error "No kernel found for prefix (%s)" kernel-name)) (error "No kernel found for prefix (%s)" kernel-name))
(unless (child-of-class-p client-class 'jupyter-repl-client)
(error "Class should be a subclass of `jupyter-repl-client' (`%s')" client-class))
(cl-destructuring-bind (_manager client info) (cl-destructuring-bind (_manager client info)
(jupyter-start-new-kernel kernel-name 'jupyter-repl-client) (jupyter-start-new-kernel kernel-name client-class)
(oset client kernel-info info) (oset client kernel-info info)
(jupyter-repl--new-repl client) (jupyter-repl--new-repl client)
(when (and associate-buffer (when (and associate-buffer
@ -2337,16 +2345,23 @@ Otherwise, in a non-interactive call, return the
client))) client)))
;;;###autoload ;;;###autoload
(defun connect-jupyter-repl (file-or-plist &optional associate-buffer) (defun connect-jupyter-repl (file-or-plist &optional associate-buffer client-class)
"Run a Jupyter REPL using a kernel's connection FILE-OR-PLIST. "Run a Jupyter REPL using a kernel's connection FILE-OR-PLIST.
FILE-OR-PLIST can be either a file holding the connection FILE-OR-PLIST can be either a file holding the connection
information or a property list of connection information. information or a property list of connection information.
ASSOCIATE-BUFFER has the same meaning as in `run-jupyter-repl'. ASSOCIATE-BUFFER has the same meaning as in `run-jupyter-repl'.
Optional argument CLIENT-CLASS is the class of the client that
will be used to initialize the REPL and should be a subclass of
`jupyter-repl-client', which is the default.
Return the `jupyter-repl-client' connected to the kernel. When Return the `jupyter-repl-client' connected to the kernel. When
called interactively, display the new REPL buffer as well." called interactively, display the new REPL buffer as well."
(interactive (list (read-file-name "Connection file: ") t)) (interactive (list (read-file-name "Connection file: ") t nil))
(let ((client (make-instance 'jupyter-repl-client))) (or client-class (setq client-class 'jupyter-repl-client))
(unless (child-of-class-p client-class 'jupyter-repl-client)
(error "Class should be a subclass of `jupyter-repl-client' (`%s')" client-class))
(let ((client (make-instance client-class)))
(jupyter-initialize-connection client file-or-plist) (jupyter-initialize-connection client file-or-plist)
(jupyter-start-channels client) (jupyter-start-channels client)
(message "Requesting kernel info...") (message "Requesting kernel info...")