gptel: Rename :insert-marker

* gptel.el (gptel--url-get-response, gptel--insert-response,
gptel-send): Rename the :insert-marker keyword in the async info
plist to :start-marker.

* gptel-curl.el (gptel--insert-response-stream,
gptel-curl--cleanup-stream, gptel-curl-get-response): Ditto.
This commit is contained in:
Karthik Chikmagalur 2023-04-06 16:18:37 -07:00
parent c22c59d20a
commit 2e34981aa0
2 changed files with 11 additions and 11 deletions

View file

@ -68,7 +68,7 @@ PROMPTS is the data to send, TOKEN is a unique identifier."
INFO is a plist with the following keys: INFO is a plist with the following keys:
- :prompt (the prompt being sent) - :prompt (the prompt being sent)
- :gptel-buffer (the gptel buffer) - :gptel-buffer (the gptel buffer)
- :insert-marker (marker at which to insert the response). - :start-marker (marker at which to insert the response).
Call CALLBACK with the response and INFO afterwards. If omitted Call CALLBACK with the response and INFO afterwards. If omitted
the response is inserted into the current buffer after point." the response is inserted into the current buffer after point."
@ -109,19 +109,19 @@ PROCESS and STATUS are process parameters."
(let* ((info (alist-get process gptel-curl--process-alist)) (let* ((info (alist-get process gptel-curl--process-alist))
(gptel-buffer (plist-get info :gptel-buffer)) (gptel-buffer (plist-get info :gptel-buffer))
(tracking-marker (plist-get info :tracking-marker)) (tracking-marker (plist-get info :tracking-marker))
(start-marker (plist-get info :insert-marker))) (start-marker (plist-get info :start-marker)))
(when start-marker (goto-char start-marker))
(pulse-momentary-highlight-region (+ start-marker 2) tracking-marker) (pulse-momentary-highlight-region (+ start-marker 2) tracking-marker)
(when (equal (plist-get info :http-status) "200")
(with-current-buffer gptel-buffer (with-current-buffer gptel-buffer
(when (equal (plist-get info :http-status) "200")
(gptel--update-header-line " Ready" 'success) (gptel--update-header-line " Ready" 'success)
(when gptel-mode (when gptel-mode
(save-excursion (goto-char tracking-marker) (save-excursion (goto-char tracking-marker)
(insert "\n\n" (gptel-prompt-string))))))) (insert "\n\n" (gptel-prompt-string)))))
(run-hooks 'gptel-post-response-hook)))
(setf (alist-get process gptel-curl--process-alist nil 'remove) nil) (setf (alist-get process gptel-curl--process-alist nil 'remove) nil)
(kill-buffer proc-buf))) (kill-buffer proc-buf)))
(defun gptel--insert-response-stream (response info) (defun gptel-curl--stream-insert-response (response info)
"Insert streaming RESPONSE from ChatGPT into the gptel buffer. "Insert streaming RESPONSE from ChatGPT into the gptel buffer.
INFO is a mutable plist containing information relevant to this buffer. INFO is a mutable plist containing information relevant to this buffer.
@ -129,7 +129,7 @@ See `gptel--url-get-response' for details."
(let ((content-str (plist-get response :content)) (let ((content-str (plist-get response :content))
(status-str (plist-get response :status)) (status-str (plist-get response :status))
(gptel-buffer (plist-get info :gptel-buffer)) (gptel-buffer (plist-get info :gptel-buffer))
(start-marker (plist-get info :insert-marker)) (start-marker (plist-get info :start-marker))
(tracking-marker (plist-get info :tracking-marker)) (tracking-marker (plist-get info :tracking-marker))
(transformer (plist-get info :transformer))) (transformer (plist-get info :transformer)))
(if content-str (if content-str

View file

@ -301,7 +301,7 @@ instead."
#'gptel-curl-get-response #'gptel--url-get-response) #'gptel-curl-get-response #'gptel--url-get-response)
(list :prompt full-prompt (list :prompt full-prompt
:gptel-buffer gptel-buffer :gptel-buffer gptel-buffer
:insert-marker response-pt))) :start-marker response-pt)))
(gptel--update-header-line " Waiting..." 'warning))) (gptel--update-header-line " Waiting..." 'warning)))
(defun gptel--insert-response (response info) (defun gptel--insert-response (response info)
@ -312,7 +312,7 @@ See `gptel--url-get-response' for details."
(let* ((content-str (plist-get response :content)) (let* ((content-str (plist-get response :content))
(status-str (plist-get response :status)) (status-str (plist-get response :status))
(gptel-buffer (plist-get info :gptel-buffer)) (gptel-buffer (plist-get info :gptel-buffer))
(response-pt (plist-get info :insert-marker))) (start-marker (plist-get info :start-marker)))
(if content-str (if content-str
(with-current-buffer gptel-buffer (with-current-buffer gptel-buffer
(setq content-str (gptel--transform-response (setq content-str (gptel--transform-response
@ -420,7 +420,7 @@ BUFFER is the interaction buffer for ChatGPT."
INFO is a plist with the following keys: INFO is a plist with the following keys:
- :prompt (the prompt being sent) - :prompt (the prompt being sent)
- :gptel-buffer (the gptel buffer) - :gptel-buffer (the gptel buffer)
- :insert-marker (marker at which to insert the response). - :start-marker (marker at which to insert the response).
Call CALLBACK with the response and INFO afterwards. If omitted Call CALLBACK with the response and INFO afterwards. If omitted
the response is inserted into the current buffer after point." the response is inserted into the current buffer after point."