update packages
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
;;; ob-python.el --- Babel Functions for Python -*- lexical-binding: t; -*-
|
||||
|
||||
;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2009-2025 Free Software Foundation, Inc.
|
||||
|
||||
;; Authors: Eric Schulte
|
||||
;; Dan Davison
|
||||
@@ -36,53 +36,70 @@
|
||||
(require 'org-macs)
|
||||
(require 'python)
|
||||
|
||||
(declare-function py-shell "ext:python-mode" (&rest args))
|
||||
(declare-function py-choose-shell "ext:python-mode" (&optional shell))
|
||||
(declare-function py-shell-send-string "ext:python-mode" (strg &optional process))
|
||||
|
||||
(defvar org-babel-tangle-lang-exts)
|
||||
(add-to-list 'org-babel-tangle-lang-exts '("python" . "py"))
|
||||
|
||||
(defvar org-babel-default-header-args:python '())
|
||||
|
||||
(defcustom org-babel-python-command "python"
|
||||
"Name of the command for executing Python code."
|
||||
:version "24.4"
|
||||
:package-version '(Org . "8.0")
|
||||
(defconst org-babel-header-args:python
|
||||
'((return . :any)
|
||||
(python . :any)
|
||||
(async . ((yes no))))
|
||||
"Python-specific header arguments.")
|
||||
|
||||
(defcustom org-babel-python-command 'auto
|
||||
"Command (including arguments) for interactive and non-interactive Python code.
|
||||
When not `auto', it overrides `org-babel-python-command-session'
|
||||
and `org-babel-python-command-nonsession'."
|
||||
:package-version '(Org . "9.7")
|
||||
:group 'org-babel
|
||||
:type '(choice string (const auto)))
|
||||
|
||||
(defcustom org-babel-python-command-session 'auto
|
||||
"Command (including arguments) for starting interactive Python sessions.
|
||||
If `auto' (the default), uses the values from
|
||||
`python-shell-interpreter' and `python-shell-interpreter-args'.
|
||||
If `org-babel-python-command' is set, then it overrides this
|
||||
option."
|
||||
:package-version '(Org . "9.7")
|
||||
:group 'org-babel
|
||||
:type '(choice string (const auto)))
|
||||
|
||||
(defcustom org-babel-python-command-nonsession "python"
|
||||
"Command (including arguments) for executing non-interactive Python code.
|
||||
If `org-babel-python-command' is set, then it overrides this option."
|
||||
:package-version '(Org . "9.7")
|
||||
:group 'org-babel
|
||||
:type 'string)
|
||||
|
||||
(defcustom org-babel-python-mode
|
||||
(if (featurep 'python-mode) 'python-mode 'python)
|
||||
"Preferred python mode for use in running python interactively.
|
||||
This will typically be either `python' or `python-mode'."
|
||||
:group 'org-babel
|
||||
:version "24.4"
|
||||
:package-version '(Org . "8.0")
|
||||
:type 'symbol)
|
||||
|
||||
(defcustom org-babel-python-hline-to "None"
|
||||
"Replace hlines in incoming tables with this when translating to python."
|
||||
:group 'org-babel
|
||||
:version "24.4"
|
||||
:package-version '(Org . "8.0")
|
||||
:type 'string)
|
||||
|
||||
(defcustom org-babel-python-None-to 'hline
|
||||
"Replace `None' in python tables with this before returning."
|
||||
:group 'org-babel
|
||||
:version "24.4"
|
||||
:package-version '(Org . "8.0")
|
||||
:type 'symbol)
|
||||
|
||||
(defun org-babel-python-associate-session (session)
|
||||
"Associate Python code buffer with an Python session.
|
||||
Make SESSION without earmuffs be the Python buffer name."
|
||||
(setq-local python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs session)))
|
||||
|
||||
(defun org-babel-execute:python (body params)
|
||||
"Execute a block of Python code with Babel.
|
||||
"Execute Python BODY according to PARAMS.
|
||||
This function is called by `org-babel-execute-src-block'."
|
||||
(let* ((org-babel-python-command
|
||||
(or (cdr (assq :python params))
|
||||
org-babel-python-command))
|
||||
(session (org-babel-python-initiate-session
|
||||
(cdr (assq :session params))))
|
||||
(graphics-file (and (member "graphics" (assq :result-params params))
|
||||
(org-babel-graphical-output-file params)))
|
||||
(result-params (cdr (assq :result-params params)))
|
||||
(result-type (cdr (assq :result-type params)))
|
||||
(return-val (when (eq result-type 'value)
|
||||
@@ -98,7 +115,7 @@ This function is called by `org-babel-execute-src-block'."
|
||||
(format (if session "\n%s" "\nreturn %s") return-val))))
|
||||
(result (org-babel-python-evaluate
|
||||
session full-body result-type
|
||||
result-params preamble async)))
|
||||
result-params preamble async graphics-file)))
|
||||
(org-babel-reassemble-table
|
||||
result
|
||||
(org-babel-pick-name (cdr (assq :colname-names params))
|
||||
@@ -130,8 +147,63 @@ VARS contains resolved variable references."
|
||||
|
||||
;; helper functions
|
||||
|
||||
(defconst org-babel-python--output-graphics-wrapper "\
|
||||
import matplotlib.pyplot
|
||||
matplotlib.pyplot.gcf().clear()
|
||||
%s
|
||||
matplotlib.pyplot.savefig('%s')"
|
||||
"Format string for saving Python graphical output.
|
||||
Has two %s escapes, for the Python code to be evaluated, and the
|
||||
file to save the graphics to.")
|
||||
|
||||
(defconst org-babel-python--def-format-value "\
|
||||
def __org_babel_python_format_value(result, result_file, result_params):
|
||||
with open(result_file, 'w') as f:
|
||||
if 'graphics' in result_params:
|
||||
result.savefig(result_file)
|
||||
elif 'pp' in result_params:
|
||||
import pprint
|
||||
f.write(pprint.pformat(result))
|
||||
elif 'list' in result_params and isinstance(result, dict):
|
||||
f.write(str(['{} :: {}'.format(k, v) for k, v in result.items()]))
|
||||
else:
|
||||
if not set(result_params).intersection(\
|
||||
['scalar', 'verbatim', 'raw']):
|
||||
def dict2table(res):
|
||||
if isinstance(res, dict):
|
||||
return [(k, dict2table(v)) for k, v in res.items()]
|
||||
elif isinstance(res, list) or isinstance(res, tuple):
|
||||
return [dict2table(x) for x in res]
|
||||
else:
|
||||
return res
|
||||
if 'table' in result_params:
|
||||
result = dict2table(result)
|
||||
try:
|
||||
import pandas
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
if isinstance(result, pandas.DataFrame) and 'table' in result_params:
|
||||
result = [[result.index.name or ''] + list(result.columns)] + \
|
||||
[None] + [[i] + list(row) for i, row in result.iterrows()]
|
||||
elif isinstance(result, pandas.Series) and 'table' in result_params:
|
||||
result = list(result.items())
|
||||
try:
|
||||
import numpy
|
||||
except ImportError:
|
||||
pass
|
||||
else:
|
||||
if isinstance(result, numpy.ndarray):
|
||||
if 'table' in result_params:
|
||||
result = result.tolist()
|
||||
else:
|
||||
result = repr(result)
|
||||
f.write(str(result))"
|
||||
"Python function to format value result and save it to file.")
|
||||
|
||||
(defun org-babel-variable-assignments:python (params)
|
||||
"Return a list of Python statements assigning the block's variables."
|
||||
"Return a list of Python statements assigning the block's variables.
|
||||
The assignments are defined in PARAMS."
|
||||
(mapcar
|
||||
(lambda (pair)
|
||||
(format "%s=%s"
|
||||
@@ -153,9 +225,13 @@ specifying a variable of the same value."
|
||||
|
||||
(defun org-babel-python-table-or-string (results)
|
||||
"Convert RESULTS into an appropriate elisp value.
|
||||
If the results look like a list or tuple, then convert them into an
|
||||
Emacs-lisp table, otherwise return the results as a string."
|
||||
(let ((res (org-babel-script-escape results)))
|
||||
If the results look like a list or tuple (but not a dict), then
|
||||
convert them into an Emacs-lisp table. Otherwise return the
|
||||
results as a string."
|
||||
(let ((res (if (and (> (length results) 0)
|
||||
(string-equal "{" (substring results 0 1)))
|
||||
results ;don't convert dicts to elisp
|
||||
(org-babel-script-escape results))))
|
||||
(if (listp res)
|
||||
(mapcar (lambda (el) (if (eq el 'None)
|
||||
org-babel-python-None-to el))
|
||||
@@ -169,6 +245,7 @@ Emacs-lisp table, otherwise return the results as a string."
|
||||
(cdr (assoc session org-babel-python-buffers)))
|
||||
|
||||
(defun org-babel-python-with-earmuffs (session)
|
||||
"Return SESSION name as string, ensuring *...* around."
|
||||
(let ((name (if (stringp session) session (format "%s" session))))
|
||||
(if (and (string= "*" (substring name 0 1))
|
||||
(string= "*" (substring name (- (length name) 1))))
|
||||
@@ -176,74 +253,113 @@ Emacs-lisp table, otherwise return the results as a string."
|
||||
(format "*%s*" name))))
|
||||
|
||||
(defun org-babel-python-without-earmuffs (session)
|
||||
"Return SESSION name as string, without *...* around."
|
||||
(let ((name (if (stringp session) session (format "%s" session))))
|
||||
(if (and (string= "*" (substring name 0 1))
|
||||
(string= "*" (substring name (- (length name) 1))))
|
||||
(substring name 1 (- (length name) 1))
|
||||
name)))
|
||||
|
||||
(defvar py-which-bufname)
|
||||
(defvar python-shell-buffer-name)
|
||||
(defun org-babel-session-buffer:python (session &optional _)
|
||||
"Return session buffer name for SESSION."
|
||||
(or (org-babel-python-session-buffer session)
|
||||
(org-babel-python-with-earmuffs session)))
|
||||
|
||||
(defun org-babel-python--python-util-comint-end-of-output-p ()
|
||||
"Return non-nil if the last prompt matches input prompt.
|
||||
Backport of `python-util-comint-end-of-output-p' to emacs28. To
|
||||
be removed after minimum supported version reaches emacs29."
|
||||
(when-let* ((prompt (python-util-comint-last-prompt)))
|
||||
(python-shell-comint-end-of-output-p
|
||||
(buffer-substring-no-properties
|
||||
(car prompt) (cdr prompt)))))
|
||||
|
||||
(defun org-babel-python--command (is-session)
|
||||
"Helper function to return the Python command.
|
||||
This checks `org-babel-python-command', and then
|
||||
`org-babel-python-command-session' (if IS-SESSION) or
|
||||
`org-babel-python-command-nonsession' (if not IS-SESSION). If
|
||||
IS-SESSION, this might return nil, which means to use
|
||||
`python-shell-calculate-command'."
|
||||
(or (unless (eq org-babel-python-command 'auto)
|
||||
org-babel-python-command)
|
||||
(if is-session
|
||||
(unless (eq org-babel-python-command-session 'auto)
|
||||
org-babel-python-command-session)
|
||||
org-babel-python-command-nonsession)))
|
||||
|
||||
(defvar-local org-babel-python--initialized nil
|
||||
"Flag used to mark that python session has been initialized.")
|
||||
(defun org-babel-python--setup-session ()
|
||||
"Babel Python session setup code, to be run once per session.
|
||||
Function should be run from within the Python session buffer.
|
||||
This is often run as a part of `python-shell-first-prompt-hook',
|
||||
unless the Python session was created outside Org."
|
||||
(python-shell-send-string-no-output org-babel-python--def-format-value)
|
||||
(setq-local org-babel-python--initialized t))
|
||||
(defun org-babel-python-initiate-session-by-key (&optional session)
|
||||
"Initiate a python session.
|
||||
If there is not a current inferior-process-buffer in SESSION
|
||||
then create. Return the initialized session."
|
||||
If there is not a current inferior-process-buffer matching
|
||||
SESSION then create it. If inferior process already
|
||||
exists (e.g. if it was manually started with `run-python'), make
|
||||
sure it's configured to work with ob-python. If session has
|
||||
already been configured as such, do nothing. Return the
|
||||
initialized session."
|
||||
(save-window-excursion
|
||||
(let* ((session (if session (intern session) :default))
|
||||
(py-buffer (org-babel-python-session-buffer session))
|
||||
(cmd (if (member system-type '(cygwin windows-nt ms-dos))
|
||||
(concat org-babel-python-command " -i")
|
||||
org-babel-python-command)))
|
||||
(cond
|
||||
((eq 'python org-babel-python-mode) ; python.el
|
||||
(unless py-buffer
|
||||
(setq py-buffer (org-babel-python-with-earmuffs session)))
|
||||
(let ((python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs py-buffer)))
|
||||
(run-python cmd)
|
||||
(with-current-buffer py-buffer
|
||||
(add-hook
|
||||
'python-shell-first-prompt-hook
|
||||
(lambda ()
|
||||
(setq-local org-babel-python--initialized t)
|
||||
(message "I am running!!!"))
|
||||
nil 'local))))
|
||||
((and (eq 'python-mode org-babel-python-mode)
|
||||
(fboundp 'py-shell)) ; python-mode.el
|
||||
(require 'python-mode)
|
||||
;; Make sure that py-which-bufname is initialized, as otherwise
|
||||
;; it will be overwritten the first time a Python buffer is
|
||||
;; created.
|
||||
(py-choose-shell)
|
||||
;; `py-shell' creates a buffer whose name is the value of
|
||||
;; `py-which-bufname' with '*'s at the beginning and end
|
||||
(let* ((bufname (if (and py-buffer (buffer-live-p py-buffer))
|
||||
(replace-regexp-in-string ;; zap surrounding *
|
||||
"^\\*\\([^*]+\\)\\*$" "\\1" py-buffer)
|
||||
(concat "Python-" (symbol-name session))))
|
||||
(py-which-bufname bufname))
|
||||
(setq py-buffer (org-babel-python-with-earmuffs bufname))
|
||||
(py-shell nil nil t org-babel-python-command py-buffer nil nil t nil)))
|
||||
(t
|
||||
(error "No function available for running an inferior Python")))
|
||||
;; Wait until Python initializes.
|
||||
(if (eq 'python org-babel-python-mode) ; python.el
|
||||
;; This is more reliable compared to
|
||||
;; `org-babel-comint-wait-for-output' as python may emit
|
||||
;; multiple prompts during initialization.
|
||||
(with-current-buffer py-buffer
|
||||
(while (not org-babel-python--initialized)
|
||||
(sleep-for 0 10)))
|
||||
(org-babel-comint-wait-for-output py-buffer))
|
||||
(py-buffer (org-babel-session-buffer:python session))
|
||||
(python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs py-buffer))
|
||||
(existing-session-p (comint-check-proc py-buffer))
|
||||
(cmd (org-babel-python--command t)))
|
||||
(if cmd
|
||||
(let* ((cmd-split (split-string-and-unquote cmd))
|
||||
(python-shell-interpreter (car cmd-split))
|
||||
(python-shell-interpreter-args
|
||||
(combine-and-quote-strings
|
||||
(append (cdr cmd-split)
|
||||
(when (member system-type
|
||||
'(cygwin windows-nt ms-dos))
|
||||
(list "-i"))))))
|
||||
(run-python))
|
||||
(run-python))
|
||||
(with-current-buffer py-buffer
|
||||
(if existing-session-p
|
||||
;; Session was created outside Org. Assume first prompt
|
||||
;; already happened; run session setup code directly
|
||||
(unless org-babel-python--initialized
|
||||
;; Ensure first prompt. Based on python-tests.el
|
||||
;; (`python-tests-shell-wait-for-prompt')
|
||||
(while (not (org-babel-python--python-util-comint-end-of-output-p))
|
||||
(sit-for 0.1))
|
||||
(org-babel-python--setup-session))
|
||||
;; Adding to `python-shell-first-prompt-hook' immediately
|
||||
;; after `run-python' should be safe from race conditions,
|
||||
;; because subprocess output only arrives when Emacs is
|
||||
;; waiting (see elisp manual, "Output from Processes")
|
||||
(add-hook
|
||||
'python-shell-first-prompt-hook
|
||||
#'org-babel-python--setup-session
|
||||
nil 'local)))
|
||||
;; Wait until Python initializes
|
||||
;; This is more reliable compared to
|
||||
;; `org-babel-comint-wait-for-output' as python may emit
|
||||
;; multiple prompts during initialization.
|
||||
(with-current-buffer py-buffer
|
||||
(while (not org-babel-python--initialized)
|
||||
(sleep-for 0.010)))
|
||||
(setq org-babel-python-buffers
|
||||
(cons (cons session py-buffer)
|
||||
(assq-delete-all session org-babel-python-buffers)))
|
||||
session)))
|
||||
|
||||
(defun org-babel-python-initiate-session (&optional session _params)
|
||||
"Create a session named SESSION according to PARAMS."
|
||||
"Initiate Python session named SESSION according to PARAMS.
|
||||
If there is not a current inferior-process-buffer matching
|
||||
SESSION then create it. If inferior process already
|
||||
exists (e.g. if it was manually started with `run-python'), make
|
||||
sure it's configured to work with ob-python. If session has
|
||||
already been configured as such, do nothing."
|
||||
(unless (string= session "none")
|
||||
(org-babel-python-session-buffer
|
||||
(org-babel-python-initiate-session-by-key session))))
|
||||
@@ -251,31 +367,10 @@ then create. Return the initialized session."
|
||||
(defvar org-babel-python-eoe-indicator "org_babel_python_eoe"
|
||||
"A string to indicate that evaluation has completed.")
|
||||
|
||||
(defconst org-babel-python-wrapper-method
|
||||
"
|
||||
def main():
|
||||
%s
|
||||
|
||||
open('%s', 'w').write( str(main()) )")
|
||||
(defconst org-babel-python-pp-wrapper-method
|
||||
"
|
||||
import pprint
|
||||
def main():
|
||||
%s
|
||||
|
||||
open('%s', 'w').write( pprint.pformat(main()) )")
|
||||
|
||||
(defconst org-babel-python--exec-tmpfile "\
|
||||
with open('%s') as __org_babel_python_tmpfile:
|
||||
exec(compile(__org_babel_python_tmpfile.read(), __org_babel_python_tmpfile.name, 'exec'))"
|
||||
"Template for Python session command with output results.
|
||||
|
||||
Has a single %s escape, the tempfile containing the source code
|
||||
to evaluate.")
|
||||
|
||||
(defun org-babel-python-format-session-value
|
||||
(src-file result-file result-params)
|
||||
"Return Python code to evaluate SRC-FILE and write result to RESULT-FILE."
|
||||
"Return Python code to evaluate SRC-FILE and write result to RESULT-FILE.
|
||||
RESULT-PARAMS defines the result type."
|
||||
(format "\
|
||||
import ast
|
||||
with open('%s') as __org_babel_python_tmpfile:
|
||||
@@ -286,30 +381,25 @@ if isinstance(__org_babel_python_final, ast.Expr):
|
||||
exec(compile(__org_babel_python_ast, '<string>', 'exec'))
|
||||
__org_babel_python_final = eval(compile(ast.Expression(
|
||||
__org_babel_python_final.value), '<string>', 'eval'))
|
||||
with open('%s', 'w') as __org_babel_python_tmpfile:
|
||||
if %s:
|
||||
import pprint
|
||||
__org_babel_python_tmpfile.write(pprint.pformat(__org_babel_python_final))
|
||||
else:
|
||||
__org_babel_python_tmpfile.write(str(__org_babel_python_final))
|
||||
else:
|
||||
exec(compile(__org_babel_python_ast, '<string>', 'exec'))
|
||||
__org_babel_python_final = None"
|
||||
__org_babel_python_final = None
|
||||
__org_babel_python_format_value(__org_babel_python_final, '%s', %s)"
|
||||
(org-babel-process-file-name src-file 'noquote)
|
||||
(org-babel-process-file-name result-file 'noquote)
|
||||
(if (member "pp" result-params) "True" "False")))
|
||||
(org-babel-python-var-to-python result-params)))
|
||||
|
||||
(defun org-babel-python-evaluate
|
||||
(session body &optional result-type result-params preamble async)
|
||||
(session body &optional result-type result-params preamble async graphics-file)
|
||||
"Evaluate BODY as Python code."
|
||||
(if session
|
||||
(if async
|
||||
(org-babel-python-async-evaluate-session
|
||||
session body result-type result-params)
|
||||
session body result-type result-params graphics-file)
|
||||
(org-babel-python-evaluate-session
|
||||
session body result-type result-params))
|
||||
session body result-type result-params graphics-file))
|
||||
(org-babel-python-evaluate-external-process
|
||||
body result-type result-params preamble)))
|
||||
body result-type result-params preamble graphics-file)))
|
||||
|
||||
(defun org-babel-python--shift-right (body &optional count)
|
||||
(with-temp-buffer
|
||||
@@ -325,33 +415,40 @@ else:
|
||||
(buffer-string)))
|
||||
|
||||
(defun org-babel-python-evaluate-external-process
|
||||
(body &optional result-type result-params preamble)
|
||||
(body &optional result-type result-params preamble graphics-file)
|
||||
"Evaluate BODY in external python process.
|
||||
If RESULT-TYPE equals `output' then return standard output as a
|
||||
string. If RESULT-TYPE equals `value' then return the value of the
|
||||
last statement in BODY, as elisp."
|
||||
string. If RESULT-TYPE equals `value' then return the value of
|
||||
the last statement in BODY, as elisp. If GRAPHICS-FILE is
|
||||
non-nil, then save graphical results to that file instead."
|
||||
(let ((raw
|
||||
(pcase result-type
|
||||
(`output (org-babel-eval org-babel-python-command
|
||||
(`output (org-babel-eval (org-babel-python--command nil)
|
||||
(concat preamble (and preamble "\n")
|
||||
body)))
|
||||
(`value (let ((tmp-file (org-babel-temp-file "python-")))
|
||||
(org-babel-eval
|
||||
org-babel-python-command
|
||||
(if graphics-file
|
||||
(format org-babel-python--output-graphics-wrapper
|
||||
body graphics-file)
|
||||
body))))
|
||||
(`value (let ((results-file (or graphics-file
|
||||
(org-babel-temp-file "python-"))))
|
||||
(org-babel-eval (org-babel-python--command nil)
|
||||
(concat
|
||||
preamble (and preamble "\n")
|
||||
(format
|
||||
(if (member "pp" result-params)
|
||||
org-babel-python-pp-wrapper-method
|
||||
org-babel-python-wrapper-method)
|
||||
(org-babel-python--shift-right body)
|
||||
(org-babel-process-file-name tmp-file 'noquote))))
|
||||
(org-babel-eval-read-file tmp-file))))))
|
||||
(concat org-babel-python--def-format-value "
|
||||
def main():
|
||||
%s
|
||||
|
||||
__org_babel_python_format_value(main(), '%s', %s)")
|
||||
(org-babel-python--shift-right body)
|
||||
(org-babel-process-file-name results-file 'noquote)
|
||||
(org-babel-python-var-to-python result-params))))
|
||||
(org-babel-eval-read-file results-file))))))
|
||||
(org-babel-result-cond result-params
|
||||
raw
|
||||
(org-babel-python-table-or-string (org-trim raw)))))
|
||||
(org-babel-python-table-or-string raw))))
|
||||
|
||||
(defun org-babel-python--send-string (session body)
|
||||
(defun org-babel-python-send-string (session body)
|
||||
"Pass BODY to the Python process in SESSION.
|
||||
Return output."
|
||||
(with-current-buffer session
|
||||
@@ -369,48 +466,54 @@ finally:
|
||||
print('%s')"
|
||||
(org-babel-python--shift-right body 4)
|
||||
org-babel-python-eoe-indicator)))
|
||||
(if (not (eq 'python-mode org-babel-python-mode))
|
||||
(let ((python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs session)))
|
||||
(python-shell-send-string body))
|
||||
(require 'python-mode)
|
||||
(py-shell-send-string body (get-buffer-process session)))
|
||||
(let ((python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs session)))
|
||||
(python-shell-send-string body))
|
||||
;; same as `python-shell-comint-end-of-output-p' in emacs-25.1+
|
||||
(while (not (string-match
|
||||
org-babel-python-eoe-indicator
|
||||
string-buffer))
|
||||
(while (not (and (python-shell-comint-end-of-output-p string-buffer)
|
||||
(string-match
|
||||
org-babel-python-eoe-indicator
|
||||
string-buffer)))
|
||||
(accept-process-output (get-buffer-process (current-buffer))))
|
||||
(org-babel-chomp (substring string-buffer 0 (match-beginning 0))))))
|
||||
|
||||
(defun org-babel-python-evaluate-session
|
||||
(session body &optional result-type result-params)
|
||||
(session body &optional result-type result-params graphics-file)
|
||||
"Pass BODY to the Python process in SESSION.
|
||||
If RESULT-TYPE equals `output' then return standard output as a
|
||||
string. If RESULT-TYPE equals `value' then return the value of the
|
||||
last statement in BODY, as elisp."
|
||||
string. If RESULT-TYPE equals `value' then return the value of
|
||||
the last statement in BODY, as elisp. If GRAPHICS-FILE is
|
||||
non-nil, then save graphical results to that file instead."
|
||||
(let* ((tmp-src-file (org-babel-temp-file "python-"))
|
||||
(results
|
||||
(progn
|
||||
(with-temp-file tmp-src-file (insert body))
|
||||
(with-temp-file tmp-src-file
|
||||
(insert (if (and graphics-file (eq result-type 'output))
|
||||
(format org-babel-python--output-graphics-wrapper
|
||||
body graphics-file)
|
||||
body)))
|
||||
(pcase result-type
|
||||
(`output
|
||||
(let ((body (format org-babel-python--exec-tmpfile
|
||||
(let ((body (format "\
|
||||
with open('%s') as f:
|
||||
exec(compile(f.read(), f.name, 'exec'))"
|
||||
(org-babel-process-file-name
|
||||
tmp-src-file 'noquote))))
|
||||
(org-babel-python--send-string session body)))
|
||||
(org-babel-python-send-string session body)))
|
||||
(`value
|
||||
(let* ((tmp-results-file (org-babel-temp-file "python-"))
|
||||
(let* ((results-file (or graphics-file
|
||||
(org-babel-temp-file "python-")))
|
||||
(body (org-babel-python-format-session-value
|
||||
tmp-src-file tmp-results-file result-params)))
|
||||
(org-babel-python--send-string session body)
|
||||
(sleep-for 0 10)
|
||||
(org-babel-eval-read-file tmp-results-file)))))))
|
||||
tmp-src-file results-file result-params)))
|
||||
(org-babel-python-send-string session body)
|
||||
(sleep-for 0.010)
|
||||
(org-babel-eval-read-file results-file)))))))
|
||||
(org-babel-result-cond result-params
|
||||
results
|
||||
(org-babel-python-table-or-string results))))
|
||||
|
||||
(defun org-babel-python-read-string (string)
|
||||
"Strip \\='s from around Python string."
|
||||
"Strip \\='s from around Python STRING."
|
||||
(if (and (string-prefix-p "'" string)
|
||||
(string-suffix-p "'" string))
|
||||
(substring string 1 -1)
|
||||
@@ -428,36 +531,46 @@ last statement in BODY, as elisp."
|
||||
(org-babel-python-table-or-string results))))
|
||||
|
||||
(defun org-babel-python-async-evaluate-session
|
||||
(session body &optional result-type result-params)
|
||||
(session body &optional result-type result-params graphics-file)
|
||||
"Asynchronously evaluate BODY in SESSION.
|
||||
Returns a placeholder string for insertion, to later be replaced
|
||||
by `org-babel-comint-async-filter'."
|
||||
(org-babel-comint-async-register
|
||||
session (current-buffer)
|
||||
"ob_comint_async_python_\\(.+\\)_\\(.+\\)"
|
||||
'org-babel-chomp 'org-babel-python-async-value-callback)
|
||||
(let ((python-shell-buffer-name (org-babel-python-without-earmuffs session)))
|
||||
(pcase result-type
|
||||
(`output
|
||||
(let ((uuid (md5 (number-to-string (random 100000000)))))
|
||||
(with-temp-buffer
|
||||
(insert (format org-babel-python-async-indicator "start" uuid))
|
||||
(insert "\n")
|
||||
(insert body)
|
||||
(insert "\n")
|
||||
(insert (format org-babel-python-async-indicator "end" uuid))
|
||||
(python-shell-send-buffer))
|
||||
uuid))
|
||||
(`value
|
||||
(let ((tmp-results-file (org-babel-temp-file "python-"))
|
||||
(tmp-src-file (org-babel-temp-file "python-")))
|
||||
(with-temp-file tmp-src-file (insert body))
|
||||
(with-temp-buffer
|
||||
(insert (org-babel-python-format-session-value tmp-src-file tmp-results-file result-params))
|
||||
(insert "\n")
|
||||
(insert (format org-babel-python-async-indicator "file" tmp-results-file))
|
||||
(python-shell-send-buffer))
|
||||
tmp-results-file)))))
|
||||
"ob_comint_async_python_\\(start\\|end\\|file\\)_\\(.+\\)"
|
||||
'org-babel-chomp 'org-babel-python-async-value-callback
|
||||
'disable-prompt-filtering)
|
||||
(pcase result-type
|
||||
(`output
|
||||
(let ((uuid (org-id-uuid)))
|
||||
(with-temp-buffer
|
||||
(insert (format org-babel-python-async-indicator "start" uuid))
|
||||
(insert "\n")
|
||||
(insert (if graphics-file
|
||||
(format org-babel-python--output-graphics-wrapper
|
||||
body graphics-file)
|
||||
body))
|
||||
(insert "\n")
|
||||
(insert (format org-babel-python-async-indicator "end" uuid))
|
||||
(let ((python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs session)))
|
||||
(python-shell-send-buffer)))
|
||||
uuid))
|
||||
(`value
|
||||
(let ((results-file (or graphics-file
|
||||
(org-babel-temp-file "python-")))
|
||||
(tmp-src-file (org-babel-temp-file "python-")))
|
||||
(with-temp-file tmp-src-file (insert body))
|
||||
(with-temp-buffer
|
||||
(insert (org-babel-python-format-session-value
|
||||
tmp-src-file results-file result-params))
|
||||
(insert "\n")
|
||||
(unless graphics-file
|
||||
(insert (format org-babel-python-async-indicator "file" results-file)))
|
||||
(let ((python-shell-buffer-name
|
||||
(org-babel-python-without-earmuffs session)))
|
||||
(python-shell-send-buffer)))
|
||||
results-file))))
|
||||
|
||||
(provide 'ob-python)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user