branch: externals/ellama
commit e308515eec5ad5e239e2e23f3dfeb0794e4528c6
Merge: 231c2600a5 15adebe14a
Author: Sergey Kostyaev <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #230 from s-kostyaev/fix-auto-scroll
Refactor scrolling logic in ellama.el
---
NEWS.org | 4 +++
ellama.el | 109 ++++++++++++++++++++++++++++++++++----------------------------
2 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/NEWS.org b/NEWS.org
index bcbc9aa2aa..04f19be19e 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,7 @@
+* Version 1.2.4
+- Improve the default behavior of auto-scroll. It will now move the
+ cursor to the end of the ellama-chat buffer and enable auto-scroll
+ for all buffers, not just chat buffers.
* Version 1.2.3
- Remove default ellama provider.
- Use first available ollama chat model if ellama provider not set.
diff --git a/ellama.el b/ellama.el
index 6e46581480..a0fb70161a 100644
--- a/ellama.el
+++ b/ellama.el
@@ -6,7 +6,7 @@
;; URL: http://github.com/s-kostyaev/ellama
;; Keywords: help local tools
;; Package-Requires: ((emacs "28.1") (llm "0.22.0") (spinner "1.7.4")
(transient "0.7") (compat "29.1") (posframe "1.4.0"))
-;; Version: 1.2.3
+;; Version: 1.2.4
;; SPDX-License-Identifier: GPL-3.0-or-later
;; Created: 8th Oct 2023
@@ -1862,58 +1862,55 @@ failure (with BUFFER current).
ellama-fill-paragraphs)
(not (equal major-mode
'org-mode))))))
(fill-region start (point)))
- (goto-char pt))
- (when-let ((ellama-auto-scroll)
- (window (get-buffer-window buffer)))
- (when (ellama-chat-buffer-p buffer)
- (with-selected-window window
- (goto-char (point-max))
- (recenter -1))))
+ (unless ellama-auto-scroll
+ (goto-char pt)))
+ (ellama--scroll buffer)
(undo-amalgamate-change-group ellama--change-group)))))
(setq ellama--change-group (prepare-change-group))
(activate-change-group ellama--change-group)
(ellama-set-markers start end point)
(spinner-start ellama-spinner-type)
- (let ((request (llm-chat-streaming provider
- llm-prompt
- insert-text
- (lambda (text)
- (funcall insert-text
- (string-trim
- (if (and
ellama-output-remove-reasoning
- (not session))
-
(ellama-remove-reasoning text)
- text)))
- (with-current-buffer buffer
- (accept-change-group
ellama--change-group)
- (spinner-stop)
- (if (and (listp donecb)
- (functionp (car
donecb)))
- (mapc (lambda (fn) (funcall
fn text))
- donecb)
- (funcall donecb text))
- (when
ellama-session-hide-org-quotes
- (ellama-collapse-org-quotes))
- (when (and
ellama--current-session
-
ellama-session-remove-reasoning)
- (mapc (lambda (interaction)
- (setf
(llm-chat-prompt-interaction-content
- interaction)
-
(ellama-remove-reasoning
-
(llm-chat-prompt-interaction-content
- interaction))))
-
(llm-chat-prompt-interactions
- (ellama-session-prompt
-
ellama--current-session))))
- (setq ellama--current-request
nil)
- (ellama-request-mode -1)))
- (lambda (_ msg)
- (with-current-buffer buffer
- (cancel-change-group
ellama--change-group)
- (spinner-stop)
- (funcall errcb msg)
- (setq ellama--current-request
nil)
- (ellama-request-mode -1))))))
+ (let ((request (llm-chat-streaming
+ provider
+ llm-prompt
+ insert-text
+ (lambda (text)
+ (funcall insert-text
+ (string-trim
+ (if (and ellama-output-remove-reasoning
+ (not session))
+ (ellama-remove-reasoning text)
+ text)))
+ (with-current-buffer buffer
+ (accept-change-group ellama--change-group)
+ (spinner-stop)
+ (if (and (listp donecb)
+ (functionp (car donecb)))
+ (mapc (lambda (fn) (funcall fn text))
+ donecb)
+ (funcall donecb text))
+ (when ellama-session-hide-org-quotes
+ (ellama-collapse-org-quotes))
+ (when (and ellama--current-session
+ ellama-session-remove-reasoning)
+ (mapc (lambda (interaction)
+ (setf (llm-chat-prompt-interaction-content
+ interaction)
+ (ellama-remove-reasoning
+
(llm-chat-prompt-interaction-content
+ interaction))))
+ (llm-chat-prompt-interactions
+ (ellama-session-prompt
+ ellama--current-session))))
+ (setq ellama--current-request nil)
+ (ellama-request-mode -1)))
+ (lambda (_ msg)
+ (with-current-buffer buffer
+ (cancel-change-group ellama--change-group)
+ (spinner-stop)
+ (funcall errcb msg)
+ (setq ellama--current-request nil)
+ (ellama-request-mode -1))))))
(with-current-buffer buffer
(setq ellama--current-request request)))))))
@@ -2069,6 +2066,17 @@ Extract profession from this message. Be short and
concise."
(search-forward (concat (ellama-get-nick-prefix-for-mode) " "
ellama-user-nick ":\n") nil t)
(buffer-substring-no-properties (point) (point-max)))))))
+(defun ellama--scroll (&optional buffer)
+ "Scroll within BUFFER.
+A function for programmatically scrolling the buffer during text generation."
+ (when-let ((ellama-auto-scroll)
+ (buf (or buffer (current-buffer)))
+ (window (get-buffer-window buf)))
+ (with-selected-window window
+ (when (ellama-chat-buffer-p buffer)
+ (goto-char (point-max)))
+ (recenter -1))))
+
(defun ellama-chat-done (text &optional on-done)
"Chat done.
Will call `ellama-chat-done-callback' and ON-DONE on TEXT."
@@ -2077,6 +2085,7 @@ Will call `ellama-chat-done-callback' and ON-DONE on
TEXT."
(insert "\n\n" (ellama-get-nick-prefix-for-mode) " " ellama-user-nick
":\n")
(when ellama-session-auto-save
(save-buffer)))
+ (ellama--scroll)
(when ellama-chat-done-callback
(funcall ellama-chat-done-callback text))
(when on-done
@@ -2164,11 +2173,11 @@ the full response text when the request completes (with
BUFFER current)."
(interactive "sAsk ellama: ")
(let* ((ollama-binary (executable-find ellama-ollama-binary))
(providers (append
- `(("default model" . ellama-provider)
+ `(("default model" . ellama-provider)
,(if (and ollama-binary
(file-exists-p ollama-binary))
'("ollama model" .
(ellama-get-ollama-local-model))))
- ellama-providers))
+ ellama-providers))
(variants (mapcar #'car providers))
(system (plist-get args :system))
(donecb (plist-get args :on-done))
