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

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

[nongnu] elpa/gptel b31c9be5e0 238/273: gptel-ollama: Adjust Ollama stre


From: ELPA Syncer
Subject: [nongnu] elpa/gptel b31c9be5e0 238/273: gptel-ollama: Adjust Ollama stream parser for libjansson
Date: Wed, 1 May 2024 10:02:40 -0400 (EDT)

branch: elpa/gptel
commit b31c9be5e01785212c79170bf93de8f9d3d273f1
Author: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
Commit: Karthik Chikmagalur <karthikchikmagalur@gmail.com>

    gptel-ollama: Adjust Ollama stream parser for libjansson
    
    * gptel-ollama.el (gptel-curl--parse-stream): libjansson and
    json.el behave differently w.r.t moving point when there is a
    parsing error.  Fix by explicitly handling point when there is an
    error. (#255)
---
 gptel-ollama.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gptel-ollama.el b/gptel-ollama.el
index 5622136a3c..00b40c9b0e 100644
--- a/gptel-ollama.el
+++ b/gptel-ollama.el
@@ -45,10 +45,10 @@ Ollama models.")
   (when (bobp)
     (re-search-forward "^{")
     (forward-line 0))
-  (let* ((content-strs)
-         (content))
+  (let* ((content-strs) (content) (pt (point)))
     (condition-case nil
         (while (setq content (gptel--json-read))
+          (setq pt (point))
           (let ((done (map-elt content :done))
                 (response (map-elt content :response)))
             (push response content-strs)
@@ -56,7 +56,7 @@ Ollama models.")
               (with-current-buffer (plist-get info :buffer)
                 (setq gptel--ollama-context (map-elt content :context)))
               (goto-char (point-max)))))
-      (error (forward-line 0)))
+      (error (goto-char pt)))
     (apply #'concat (nreverse content-strs))))
 
 (cl-defmethod gptel--parse-response ((_backend gptel-ollama) response info)



reply via email to

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