branch: externals/llm commit 66de85d8bc2acc0090e85310aa31963ac0d8bc98 Author: Andrew Hyatt <ahy...@gmail.com> Commit: Andrew Hyatt <ahy...@gmail.com>
Fix various byte compilation errors, with one actual issue in Vertex --- NEWS.org | 4 +++- llm-gemini.el | 2 +- llm-provider-utils.el | 2 +- llm-vertex.el | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NEWS.org b/NEWS.org index eb8604402d..f24fc540ce 100644 --- a/NEWS.org +++ b/NEWS.org @@ -1,4 +1,6 @@ -* Veresion 0.14 +* Veresion 0.14.1 +- Fix various issues with the 0.14 release +* Version 0.14 - Introduce new way of creating prompts: llm-make-chat-prompt, deprecating the older ways. - Improve Vertex error handling * Version 0.13 diff --git a/llm-gemini.el b/llm-gemini.el index f11c00d61d..0e1a0451bd 100644 --- a/llm-gemini.el +++ b/llm-gemini.el @@ -53,7 +53,7 @@ You can get this at https://makersuite.google.com/app/apikey." `((model . ,(llm-gemini-embedding-model provider)) (content . ((parts . (((text . ,string)))))))) -(cl-defmethod llm-provider-embedding-extract-result ((provider llm-gemini) response) +(cl-defmethod llm-provider-embedding-extract-result ((_ llm-gemini) response) (assoc-default 'values (assoc-default 'embedding response))) ;; from https://ai.google.dev/tutorials/rest_quickstart diff --git a/llm-provider-utils.el b/llm-provider-utils.el index ed1fea3e41..825121adca 100644 --- a/llm-provider-utils.el +++ b/llm-provider-utils.el @@ -168,7 +168,7 @@ CALLS are a list of `llm-provider-utils-function-call'.") :data (llm-provider-embedding-request provider string) :on-success (lambda (data) (if-let ((err-msg (llm-provider-embedding-extract-error provider data))) - (llm-request-callback-in-buffer + (llm-provider-utils-callback-in-buffer buf error-callback 'error err-msg) (llm-provider-utils-callback-in-buffer diff --git a/llm-vertex.el b/llm-vertex.el index 86ca4debb2..01165ca2aa 100644 --- a/llm-vertex.el +++ b/llm-vertex.el @@ -131,16 +131,16 @@ KEY-GENTIME keeps track of when the key was generated, because the key must be r (format "Could not finish due to detected Gemini safety violations: %s" (assoc-default 'safetyRatings (aref candidates 0)))))))) -(cl-defmethod llm-provider-embedding-request ((provider llm-vertex) string) +(cl-defmethod llm-provider-embedding-request ((_ llm-vertex) string) `(("instances" . [(("content" . ,string))]))) (cl-defmethod llm-provider-headers ((provider llm-vertex)) `(("Authorization" . ,(format "Bearer %s" (llm-vertex-key provider))))) -(cl-defmethod llm-provider-chat-extract-result ((_ llm-google) response) +(cl-defmethod llm-provider-chat-extract-result ((provider llm-google) response) (pcase (type-of response) ('vector (when (> (length response) 0) - (let ((parts (mapcar #'llm-provider-chat-extract-response response))) + (let ((parts (mapcar #'llm-provider-chat-extract-result provider response))) (if (stringp (car parts)) (mapconcat #'identity parts "") (car parts)))))