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

Remove the need for the src block info in org-babel-execute:jupyter

Browse source
This commit is contained in:
Nathaniel Nicandro 2018-02-03 23:47:18 -06:00
parent f804f6fbfd
commit d15ba28956
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ob-jupyter.el
View file

@ -61,21 +61,6 @@ See `org-babel-jupyter-file-name'."
(defvar org-babel-jupyter-language-regex "^[ \t]*#\\+begin_src[ \t]+jupyter-\\([^ \f\t\n\r\v]+\\)[ \t]*" (defvar org-babel-jupyter-language-regex "^[ \t]*#\\+begin_src[ \t]+jupyter-\\([^ \f\t\n\r\v]+\\)[ \t]*"
"Regular expression used to extract a source block's language name.") "Regular expression used to extract a source block's language name.")
(defun org-babel-jupyter--get-src-block-info (&optional light context)
"Similar to `org-babel-get-src-block-info', but handle inline-babel-call.
LIGHT and CONTEXT have the same meaning as in
`org-babel-get-src-block-info'.
If CONTEXT corresponds to an inline-babel-call, go to the named
src block and return its info. Otherwise the behavior is the same
as `org-babel-get-src-block-info'."
(or context (setq context (org-element-context)))
(save-excursion
(when (eq (org-element-type context) 'inline-babel-call)
(org-babel-goto-named-src-block
(org-element-property :call context)))
(org-babel-get-src-block-info light context)))
;; TODO: Handle the case when the kernel changes ;; TODO: Handle the case when the kernel changes
;; ;;
;; TODO: How to cache results properly? To handle the case when the kernel ;; TODO: How to cache results properly? To handle the case when the kernel
@ -424,12 +409,9 @@ BODY is the code to execute for the current Jupyter `:session' of
PARAMS." PARAMS."
(let* ((session (alist-get :session params)) (let* ((session (alist-get :session params))
(repl-buffer (org-babel-jupyter-initiate-session session params)) (repl-buffer (org-babel-jupyter-initiate-session session params))
;; TODO: Figure out if the current context is always a source block (kernel-lang (plist-get (cdr (jupyter-get-kernelspec
;; context for the various commands that can execute code blocks. (alist-get :kernel params)))
;; Since this function is only given a body and params, I am assuming :language))
;; it should be written to not depend on a context.
(block-info (org-babel-jupyter--get-src-block-info))
(kernel-lang (cadr (org-split-string (car block-info) "-")))
(code (org-babel-expand-body:jupyter (code (org-babel-expand-body:jupyter
body params (org-babel-variable-assignments:jupyter body params (org-babel-variable-assignments:jupyter
params kernel-lang) params kernel-lang)