Skip to content

Fix issue #171 and #172 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
finalpatch wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix issue #171 and #172 #173

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1d8ad1
fix async execution of 'silent' blocks
finalpatch Apr 25, 2018
1e167a1
fix pandas DataFrame output header alignment
finalpatch Apr 25, 2018
4297b42
PR 194
finalpatch Mar 23, 2019
6e56af4
PR 187
finalpatch Mar 23, 2019
9a47fcc
PR 132
finalpatch Mar 23, 2019
fcddf92
Revert "PR 132"
finalpatch Mar 23, 2019
2ae885d
fix PR 187
finalpatch Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions ob-ipython.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
"Directory where resources (e.g images) are stored so that they
can be displayed.")

(defcustom ob-ipython-suppress-execution-count nil
"If non-nil do not show the execution count in output."
:group 'ob-ipython)

;; utils

(defun ob-ipython--write-string-to-file (file string)
Expand Down Expand Up @@ -313,7 +317,7 @@ a new kernel will be started."

(defun ob-ipython--maybe-run-async ()
(when (not (ob-ipython--running-p))
(when-let (val (ob-ipython--dequeue 'ob-ipython--async-queue))
(-when-let (val (ob-ipython--dequeue 'ob-ipython--async-queue))
(cl-destructuring-bind (code name callback args) val
(ob-ipython--run-async code name callback args)))))

Expand Down Expand Up @@ -593,17 +597,19 @@ This function is called by `org-babel-execute-src-block'."
(let* ((file (cdr (assoc :ipyfile params)))
(session (cdr (assoc :session params)))
(result-type (cdr (assoc :result-type params)))
(result-params (cdr (assoc :result-params params)))
(sentinel (ipython--async-gen-sentinel)))
(ob-ipython--create-kernel (ob-ipython--normalize-session session)
(cdr (assoc :kernel params)))
(ob-ipython--execute-request-async
(org-babel-expand-body:generic (encode-coding-string body 'utf-8)
params (org-babel-variable-assignments:python params))
(ob-ipython--normalize-session session)
(lambda (ret sentinel buffer file result-type)
(let ((replacement (ob-ipython--process-response ret file result-type)))
(ipython--async-replace-sentinel sentinel buffer replacement)))
(list sentinel (current-buffer) file result-type))
(lambda (ret sentinel buffer file result-type result-params)
(unless (member "silent" result-params)
(let ((replacement (ob-ipython--process-response ret file result-type)))
(ipython--async-replace-sentinel sentinel buffer replacement))))
(list sentinel (current-buffer) file result-type result-params))
(format "%s - %s" (length ob-ipython--async-queue) sentinel)))

(defun ob-ipython--execute-sync (body params)
Expand All @@ -626,7 +632,9 @@ This function is called by `org-babel-execute-src-block'."
output
(ob-ipython--output output nil)
(s-concat
(format "# Out[%d]:\n" (cdr (assoc :exec-count ret)))
(if ob-ipython-suppress-execution-count
""
(format "# Out[%d]:\n" (cdr (assoc :exec-count ret))))
(s-join "\n" (->> (-map (-partial 'ob-ipython--render file)
(list (cdr (assoc :value result))
(cdr (assoc :display result))))
Expand Down Expand Up @@ -656,7 +664,7 @@ This function is called by `org-babel-execute-src-block'."
(let ((lines (s-lines value)))
(if (cdr lines)
(->> lines
(-map 's-trim)
(-map 's-trim-right)
(s-join "\n ")
(s-concat " ")
(format "#+BEGIN_EXAMPLE\n%s\n#+END_EXAMPLE"))
Expand Down