Skip to content

gptel-gemini: Support thoughtSignature in tool calls #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

gptel-gemini: Support thoughtSignature in tool calls #1154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions gptel-gemini.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ list."
(cl-loop
for part across parts
for tx = (plist-get part :text)
for sig = (plist-get part :thoughtSignature)
if (and tx (not (eq tx :null)))
if (plist-get part :thought)
do (unless (plist-get info :reasoning-block)
Expand All @@ -90,7 +91,12 @@ list."
(plist-put info :reasoning-block t))
and collect tx into content-strs end
else if (plist-get part :functionCall)
collect (copy-sequence it) into tool-use
collect (let ((fc (copy-sequence (plist-get part :functionCall))))
;; Store thoughtSignature in :id to persist it via gptel properties
(when sig (plist-put fc :id sig))
fc)
into tool-use
do (when sig (plist-put info :gemini-thought-signature sig))
finally do ;Add text and tool-calls to prompts list
(when (or tool-use include-text)
(let* ((data (plist-get info :data))
Expand All @@ -109,7 +115,12 @@ list."
(plist-put info :tool-use
(nconc (plist-get info :tool-use) tool-use)))
finally return
(and content-strs (apply #'concat content-strs)))))
(and content-strs
(let ((response-text (apply #'concat content-strs)))
(if-let ((sig (plist-get info :gemini-thought-signature)))
;; Attach thoughtSignature to text response as a property
(propertize response-text 'gptel-gemini-thought-signature sig)
response-text))))))

(cl-defmethod gptel--request-data ((backend gptel-gemini) prompts)
"JSON encode PROMPTS for sending to Gemini."
Expand Down Expand Up @@ -262,8 +273,8 @@ See generic implementation for full documentation."
full-prompt))
(`(tool . ,call)
(push (list :role "model"
:parts (vector `(:functionCall ( :name ,(plist-get call :name)
:args ,(plist-get call :args)))))
:parts `[(:functionCall (:name ,(plist-get call :name)
:args ,(plist-get call :args)))])
full-prompt)
(push (gptel--parse-tool-results backend (list (cdr entry))) full-prompt))))
(nreverse full-prompt))
Expand All @@ -272,7 +283,7 @@ See generic implementation for full documentation."
if text
if role
collect (list :role "user" :parts `[(:text ,text)]) into prompts
else collect (list :role "model" :parts `(:text ,text)) into prompts
else collect (list :role "model" :parts `[(:text ,text)]) into prompts
finally return prompts)))

(cl-defmethod gptel--parse-buffer ((backend gptel-gemini) &optional max-entries)
Expand All @@ -284,24 +295,30 @@ See generic implementation for full documentation."
(not (= (point) prev-pt)))
(pcase (get-char-property (point) 'gptel)
('response
(when-let* ((content (gptel--trim-prefixes
(buffer-substring-no-properties (point) prev-pt))))
(push (list :role "model" :parts (list :text content)) prompts)))
(`(tool . ,_id)
(let ((sig (get-char-property (point) 'gptel-gemini-thought-signature)))
(when-let* ((content (gptel--trim-prefixes
(buffer-substring-no-properties (point) prev-pt))))
(push `(:role "model"
:parts ,(if sig
'[(:text content :thoughtSignature sig)]
'[(:text content)]))
prompts))))
(`(tool . ,sig)
(save-excursion
(condition-case nil
(let* ((tool-call (read (current-buffer)))
(name (plist-get tool-call :name))
(arguments (plist-get tool-call :args)))
(arguments (plist-get tool-call :args))
(part `(:functionCall (:name ,name
:args ,arguments))))
(when sig (plist-put part :thoughtSignature sig))
(plist-put tool-call :result
(string-trim (buffer-substring-no-properties
(point) prev-pt)))
(push (gptel--parse-tool-results backend (list tool-call))
prompts)
(push (list :role "model"
:parts
(vector `(:functionCall ( :name ,name
:args ,arguments))))
:parts (vector part))
prompts))
((end-of-file invalid-read-syntax)
(message (format "Could not parse tool-call on line %s"
Expand Down