tristan/gptel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gptel-transient: More robust dry-run commands

Browse source 
* gptel.el (gptel--inspect-query): `gptel--inspect-query` now
takes data to display as an argument.  Reduce its function to
displaying a buffer with the data.

* gptel-transient.el (gptel-menu, gptel--suffix-send): Fold
dry-run the option into `gptel--suffix-send` and call it with a
dry-run flag instead of using an alternate pathway for dry-runs.
The "Inspect query" suffixes of `gptel-menu` now perform actual
dry-runs, avoiding issues like #276.
This commit is contained in:
Karthik Chikmagalur 2024-04-04 00:27:07 -07:00
parent 567af4d2ee
commit 4d4b61af94
2 changed files with 67 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gptel-transient.el
View file

@ -336,24 +336,19 @@ Also format its value in the Transient menu."
(lambda () (lambda ()
"Inspect the query that will be sent as a lisp object." "Inspect the query that will be sent as a lisp object."
(interactive) (interactive)
(let* ((extra (gptel--get-directive
(transient-args
transient-current-command)))
(gptel--system-message
(concat gptel--system-message extra)))
(gptel--sanitize-model) (gptel--sanitize-model)
(gptel--inspect-query)))) (gptel--inspect-query
(gptel--suffix-send
(cons "I" (transient-args transient-current-command))))))
("J" "Inspect query (JSON)" ("J" "Inspect query (JSON)"
(lambda () (lambda ()
"Inspect the query that will be sent as a JSON object." "Inspect the query that will be sent as a JSON object."
(interactive) (interactive)
(let* ((extra (gptel--get-directive
(transient-args
transient-current-command)))
(gptel--system-message
(concat gptel--system-message extra)))
(gptel--sanitize-model) (gptel--sanitize-model)
(gptel--inspect-query 'json))))]] (gptel--inspect-query
(gptel--suffix-send
(cons "I" (transient-args transient-current-command)))
'json)))]]
(interactive) (interactive)
(gptel--sanitize-model) (gptel--sanitize-model)
(transient-setup 'gptel-menu)) (transient-setup 'gptel-menu))
@ -594,6 +589,7 @@ Or in an extended conversation:
(buffer) (position) (buffer) (position)
(callback) (gptel-buffer-name) (callback) (gptel-buffer-name)
(system-extra (gptel--get-directive args)) (system-extra (gptel--get-directive args))
(dry-run (and (member "I" args) t))
;; Input redirection: grab prompt from elsewhere? ;; Input redirection: grab prompt from elsewhere?
(prompt (prompt
(cond (cond
@ -689,14 +685,14 @@ Or in an extended conversation:
(setq buffer (get-buffer-create gptel-buffer-name)) (setq buffer (get-buffer-create gptel-buffer-name))
(with-current-buffer buffer (setq position (point))))) (with-current-buffer buffer (setq position (point)))))
(gptel-request (prog1 (gptel-request prompt
prompt
:buffer (or buffer (current-buffer)) :buffer (or buffer (current-buffer))
:position position :position position
:in-place (and in-place (not output-to-other-buffer-p)) :in-place (and in-place (not output-to-other-buffer-p))
:stream stream :stream stream
:system (concat gptel--system-message system-extra) :system (concat gptel--system-message system-extra)
:callback callback) :callback callback
:dry-run dry-run)
;; NOTE: Possible future race condition here if Emacs ever drops the GIL. ;; NOTE: Possible future race condition here if Emacs ever drops the GIL.
;; The HTTP request callback might modify the buffer before the in-place ;; The HTTP request callback might modify the buffer before the in-place
@ -726,7 +722,10 @@ Or in an extended conversation:
(display-buffer (display-buffer
buffer '((display-buffer-reuse-window buffer '((display-buffer-reuse-window
display-buffer-pop-up-window) display-buffer-pop-up-window)
(reusable-frames . visible)))))) (reusable-frames . visible)))))))
;; Allow calling from elisp
(put 'gptel--suffix-send 'interactive-only nil)
;; ** Suffix to regenerate response ;; ** Suffix to regenerate response

10
gptel.el
View file

@ -931,14 +931,12 @@ waiting for the response."
(gptel--update-status " Waiting..." 'warning))) (gptel--update-status " Waiting..." 'warning)))
(declare-function json-pretty-print-buffer "json") (declare-function json-pretty-print-buffer "json")
(defun gptel--inspect-query (&optional arg) (defun gptel--inspect-query (request-data &optional arg)
"Show the full LLM query to be sent in a new buffer. "Show REQUEST-DATA, the full LLM query to be sent, in a buffer.
This functions as a dry run of `gptel-send'. If prefix ARG is This functions as a dry run of `gptel-send'. If ARG is
the symbol json, show the encoded JSON query instead of the lisp the symbol json, show the encoded JSON query instead of the lisp
structure gptel uses." structure gptel uses."
(let* ((request-data
(gptel-request nil :stream gptel-stream :dry-run t)))
(with-current-buffer (get-buffer-create "*gptel-query*") (with-current-buffer (get-buffer-create "*gptel-query*")
(let ((standard-output (current-buffer)) (let ((standard-output (current-buffer))
(inhibit-read-only t)) (inhibit-read-only t))
@ -953,7 +951,7 @@ structure gptel uses."
(pp-buffer)) (pp-buffer))
(goto-char (point-min)) (goto-char (point-min))
(view-mode 1) (view-mode 1)
(display-buffer (current-buffer) gptel-display-buffer-action))))) (display-buffer (current-buffer) gptel-display-buffer-action))))
(defun gptel--insert-response (response info) (defun gptel--insert-response (response info)
"Insert the LLM RESPONSE into the gptel buffer. "Insert the LLM RESPONSE into the gptel buffer.