emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ellama 15c2c57ff1 3/4: Merge pull request #74 from s-ko


From: ELPA Syncer
Subject: [elpa] externals/ellama 15c2c57ff1 3/4: Merge pull request #74 from s-kostyaev/fix-model-switch
Date: Tue, 13 Feb 2024 09:57:58 -0500 (EST)

branch: externals/ellama
commit 15c2c57ff1e85955e0c0f44ada6e3a769d4ae200
Merge: b145091ddc 9694f797f2
Author: Sergey Kostyaev <s-kostyaev@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #74 from s-kostyaev/fix-model-switch
    
    Fix chat on model switching
---
 ellama.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ellama.el b/ellama.el
index ae500febd8..ed0c520e79 100644
--- a/ellama.el
+++ b/ellama.el
@@ -488,7 +488,7 @@ CONTEXT contains context for next request."
 
 (defun ellama-generate-name (provider action prompt)
   "Generate name for ellama ACTION by PROVIDER according to PROMPT."
-  (funcall ellama-naming-scheme provider action prompt))
+  (replace-regexp-in-string "/" "_" (funcall ellama-naming-scheme provider 
action prompt)))
 
 (defvar ellama--new-session-context nil)
 
@@ -805,8 +805,10 @@ failure (with BUFFER current).
 
 :on-done ON-DONE -- ON-DONE a function that's called with the full response 
text
 when the request completes (with BUFFER current)."
-  (let* ((provider (or (plist-get args :provider) ellama-provider))
-        (session (plist-get args :session))
+  (let* ((session (plist-get args :session))
+        (provider (if session
+                      (ellama-session-provider session)
+                    (or (plist-get args :provider) ellama-provider)))
         (buffer (or (plist-get args :buffer)
                     (when (ellama-session-p session)
                       (ellama-get-session-buffer (ellama-session-id session)))
@@ -1224,7 +1226,8 @@ buffer."
     (setq ellama-provider
          (eval (alist-get
                 (completing-read "Select model: " variants)
-                providers nil nil #'string=)))))
+                providers nil nil #'string=)))
+    (setq ellama--current-session-id nil)))
 
 (provide 'ellama)
 ;;; ellama.el ends here.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]