branch: externals/llm
commit dda5d1f2d0d1e64bb5a3324b408f9a45ec56a1f6
Author: Roman Scherer <ro...@burningswell.com>
Commit: Roman Scherer <ro...@burningswell.com>
Call handler functions only with the event object
---
llm-claude.el | 4 ++--
llm-openai.el | 2 +-
plz-event-source.el | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/llm-claude.el b/llm-claude.el
index ffd42ed9d4..7972ebf5a4 100644
--- a/llm-claude.el
+++ b/llm-claude.el
@@ -76,11 +76,11 @@
(ping . ignore)
(message_stop . ignore)
(content_block_stop . ignore)
- (error . ,(lambda (_ event)
+ (error . ,(lambda (event)
(funcall err-receiver
(plz-event-source-event-data event))))
(content_block_delta
.
- ,(lambda (_ event)
+ ,(lambda (event)
(let* ((data (plz-event-source-event-data event))
(json (json-parse-string data
:object-type 'alist))
(delta (assoc-default 'delta json))
diff --git a/llm-openai.el b/llm-openai.el
index f281eb9c16..3a4431c5af 100644
--- a/llm-openai.el
+++ b/llm-openai.el
@@ -207,7 +207,7 @@ RESPONSE can be nil if the response is complete."
(plz-event-source:text/event-stream
:events `((message
.
- ,(lambda (_ event)
+ ,(lambda (event)
(let ((data (plz-event-source-event-data event)))
(unless (equal data "[DONE]")
(when-let ((response
(llm-openai--get-partial-chat-response
diff --git a/plz-event-source.el b/plz-event-source.el
index 942661f1a5..d9a71a34e1 100644
--- a/plz-event-source.el
+++ b/plz-event-source.el
@@ -293,10 +293,10 @@
(let ((timer (timer-create)))
(timer-set-time timer (current-time))
(timer-set-function timer
- (lambda (handler source event)
+ (lambda (handler event)
(with-temp-buffer
- (funcall handler source event)))
- (list (cdr pair) source event))
+ (funcall handler event)))
+ (list (cdr pair) event))
(timer-activate timer))))))
(defun plz-event-source-dispatch-events (source events)
@@ -454,13 +454,13 @@ ELSE callbacks will always be set to nil.")
(handler (cdr pair)))
(cond
((equal 'open type)
- (cons type (lambda (source event)
+ (cons type (lambda (event)
(setf (oref event data)
response)
- (funcall handler source
event))))
+ (funcall handler event))))
((equal 'close type)
- (cons type (lambda (source event)
+ (cons type (lambda (event)
(setf (oref event data)
response)
- (funcall handler source
event))))
+ (funcall handler event))))
(t pair))))
(oref media-type events))))))
(setq-local plz-event-source--current source)))
