bram/kagi.el
1
0
Fork 0
Code Issues Activity

Isolate the prompt construction in a separate function

Browse source
This commit is contained in:
Bram Schoenmakers 2024-03-22 23:45:09 +01:00
parent 2b9ab2fa0a
commit 554a19285b
Signed by: bram
GPG key ID: 0CCD19DFDC63258F
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kagi.el
View file

@ -416,6 +416,25 @@ the text manually."
((< 0 (length buffer-or-text)) buffer-or-text)
(t (error "No buffer or text entered"))))))
(defun kagi--fastgpt-construct-prompt ()
"Construct a prompt, either a predefined one or entered by the user.
When the selected prompt contains %s, then the value is
interactively obtained from the user (the region, buffer content
or text input)."
(let* ((user-text)
(prompt-name (completing-read "fastgpt> " kagi-fastgpt-prompts))
(prompt-template (alist-get prompt-name kagi-fastgpt-prompts prompt-name nil #'string=)))
(replace-regexp-in-string (rx (seq "%" anychar))
(lambda (match)
(pcase match
("%%" "%")
;; call (kagi--get-text-for-prompt) only once
;; when %s appears multiple times
("%s" (or user-text (setq user-text (kagi--get-text-for-prompt))))
(_ match)))
prompt-template t t)))
;;;###autoload
(defun kagi-fastgpt-prompt (prompt &optional insert interactive-p)
"Feed the given PROMPT to FastGPT.
@ -435,18 +454,7 @@ buffer.
If INTERACTIVE-P is nil, the result is returned as a
string (suitable for invocations from Emacs Lisp)."
(interactive (list (let* ((user-text)
(prompt-name (completing-read "fastgpt> " kagi-fastgpt-prompts))
(prompt-template (alist-get prompt-name kagi-fastgpt-prompts prompt-name nil #'string=)))
(replace-regexp-in-string (rx (seq "%" anychar))
(lambda (match)
(pcase match
("%%" "%")
;; call (kagi--get-text-for-prompt) only once
;; when %s appears multiple times
("%s" (or user-text (setq user-text (kagi--get-text-for-prompt))))
(_ match)))
prompt-template t t))
(interactive (list (kagi--fastgpt-construct-prompt)
current-prefix-arg
t))
(let* ((result (kagi--fastgpt prompt))