Merge branch 'karthink:master' into master

Author: munen

README.org

@@ -1205,7 +1205,7 @@ To use MCP servers with gptel, you thus need three pieces:
 2. MCP servers configured for and running via mcp.el.
 3. gptel and access to an LLM
 
-While mcp.el [[https://github.com/lizqwerscott/mcp.el?tab=readme-ov-file#use-with-gptel][provides instructions]] for accessing MCP-provided tools from gptel, gptel includes =gptel-integrations=, a small library to make this more convenient.  This library is not automatically loaded by gptel, so if you would like to use it you have to require it:
+gptel includes =gptel-integrations=, a small library to make this more convenient.  This library is not automatically loaded by gptel, so if you would like to use it you have to require it:
 
 #+begin_src emacs-lisp
 (require 'gptel-integrations)
@@ -1221,6 +1221,12 @@ MCP-provided tools can be used as normal with gptel.  Here is a screencast of th
 https://github.com/user-attachments/assets/f3ea7ac0-a322-4a59-b5b2-b3f592554f8a
 #+html: </p>
 
+Here's an example of using these tools:
+
+#+html: <p align="center">
+https://github.com/user-attachments/assets/b48a6a24-a130-4da7-a2ee-6ea568e10c85
+#+html: </p>
+
 #+html: </details>
 
 

gptel-anthropic.el

@@ -591,7 +591,7 @@ Keys:
 Information about the Anthropic models was obtained from the following
 comparison table:
 
-<https://docs.anthropic.com/en/docs/about-claude/models#model-comparison-table>")
+URL `https://docs.anthropic.com/en/docs/about-claude/models#model-comparison-table'")
 
 ;;;###autoload
 (cl-defun gptel-make-anthropic
@@ -676,3 +676,8 @@ for."
 
 (provide 'gptel-anthropic)
 ;;; gptel-anthropic.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not docstrings)
+;; End:
+

gptel-context.el

@@ -84,6 +84,21 @@ context chunk.  This is accessible as, for example:
   :group 'gptel
   :type 'function)
 
+(defun gptel-context-add-current-kill (&optional arg)
+  "Add current-kill to gptel, accumulating if arg is non-nil"
+  (interactive "P")
+  (let ((kill (current-kill 0)))
+    (with-current-buffer (get-buffer-create " *gptel-kill-ring-context*")
+      (if (not arg)
+          (kill-region (point-min) (point-max))
+        (goto-char (point-max))
+        (unless (bobp)
+          (insert "\n----\n")))
+      (insert kill)
+      (gptel-context--add-region (current-buffer)
+                                 (point-min) (point-max))
+      (message "*current-kill* has been added as context."))))
+
 (defun gptel-context-add (&optional arg confirm)
   "Add context to gptel in a DWIM fashion.
 

gptel-curl.el

@@ -90,7 +90,8 @@ REQUEST-DATA is the data to send, TOKEN is a unique identifier."
     (append
      gptel-curl--common-args
      gptel-curl-extra-args
-     (gptel-backend-curl-args gptel-backend)
+     (and-let* ((curl-args (gptel-backend-curl-args gptel-backend)))
+       (if (functionp curl-args) (funcall curl-args) curl-args))
      (list (format "-w(%s . %%{size_header})" token))
      (if (length< data-json gptel-curl-file-size-threshold)
          (list (format "-d%s" data-json))
@@ -133,18 +134,25 @@ the response is inserted into the current buffer after point."
                              (random) (emacs-pid) (user-full-name)
                              (recent-keys))))
          (info (gptel-fsm-info fsm))
+         (backend (plist-get info :backend))
          (args (gptel-curl--get-args info token))
          (stream (plist-get info :stream))
          (process (apply #'start-process "gptel-curl"
-                         (gptel--temp-buffer " *gptel-curl*") "curl" args)))
-    ;; Don't try to convert cr-lf to cr on Windows so that curl's "header size
-    ;; in bytes" stays correct. Explicitly set utf-8 for non-win systems too,
-    ;; for cases when buffer coding system is not set to utf-8.
-    (set-process-coding-system process 'utf-8-unix 'utf-8-unix)
+                         (gptel--temp-buffer " *gptel-curl*") (gptel--curl-path) args)))
     (when (eq gptel-log-level 'debug)
-      (gptel--log (mapconcat #'shell-quote-argument (cons "curl" args) " \\\n")
+      (gptel--log (mapconcat #'shell-quote-argument (cons (gptel--curl-path) args) " \\\n")
                   "request Curl command" 'no-json))
     (with-current-buffer (process-buffer process)
+      (cond
+       ((eq (gptel-backend-coding-system backend) 'binary)
+        ;; set-buffer-file-coding-system is not needed since we don't save this buffer
+        (set-buffer-multibyte nil)
+        (set-process-coding-system process 'binary 'binary))
+       (t
+	;; Don't try to convert cr-lf to cr on Windows so that curl's "header size
+	;; in bytes" stays correct. Explicitly set utf-8 for non-win systems too,
+	;; for cases when buffer coding system is not set to utf-8.
+	(set-process-coding-system process 'utf-8-unix 'utf-8-unix)))
       (set-process-query-on-exit-flag process nil)
       (if (plist-get info :token)       ;not the first run, set only the token
           (plist-put info :token token)

gptel-gemini.el

@@ -463,6 +463,15 @@ files in the context."
      :input-cost 0.15
      :output-cost 0.60 ; 3.50 for thinking
      :cutoff-date "2025-01")
+    (gemini-2.5-flash-preview-05-20
+     :description "Best Gemini model in terms of price-performance, offering well-rounded capabilities"
+     :capabilities (tool-use json media)
+     :mime-types ("image/png" "image/jpeg" "image/webp" "image/heic" "image/heif"
+                  "application/pdf" "text/plain" "text/csv" "text/html")
+     :context-window 1048 ; 65536 output token limit
+     :input-cost 0.15
+     :output-cost 0.60 ; 3.50 for thinking
+     :cutoff-date "2025-01")
     (gemini-2.5-pro-preview-05-06
      :description "Most powerful Gemini thinking model with maximum response accuracy and state-of-the-art performance"
      :capabilities (tool-use json media)

gptel-gh.el

@@ -364,3 +364,7 @@ for."
 
 (provide 'gptel-gh)
 ;;; gptel-gh.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not docstrings)
+;; End:

gptel-kagi.el

@@ -190,3 +190,7 @@ Example:
 
 (provide 'gptel-kagi)
 ;;; gptel-kagi.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not docstrings)
+;; End:

gptel-ollama.el

@@ -239,7 +239,8 @@ format."
                                        &optional inject-media)
   "Wrap the last user prompt in PROMPTS with the context string.
 
-If INJECT-MEDIA is non-nil wrap it with base64-encoded media files in the context."
+If INJECT-MEDIA is non-nil wrap it with base64-encoded media
+files in the context."
   (if inject-media
       ;; Wrap the first user prompt with included media files/contexts
       (when-let* ((media-list (gptel-context--collect-media))

gptel-openai-extras.el

@@ -219,7 +219,7 @@ the response."
 ;;;###autoload
 (cl-defun gptel-make-perplexity
     (name &key curl-args stream key
-          (header 
+          (header
            (lambda () (when-let* ((key (gptel--get-api-key)))
                    `(("Authorization" . ,(concat "Bearer " key))))))
           (host "api.perplexity.ai")
@@ -309,7 +309,7 @@ parameters."
     (when (and (stringp reasoning) (length> reasoning 0))
       (plist-put info :reasoning reasoning))))
 
-(cl-defmethod gptel--parse-buffer :around ((_backend gptel-deepseek) max-entries)
+(cl-defmethod gptel--parse-buffer :around ((_backend gptel-deepseek) _max-entries)
   "Merge successive prompts in the prompts list that have the same role.
 
 The Deepseek API requires strictly alternating roles (user/assistant) in messages."
@@ -346,7 +346,9 @@ The Deepseek API requires strictly alternating roles (user/assistant) in message
                      :context-window 64
                      :input-cost 0.27
                      :output-cost 1.10))))
-  "Register a DeepSeek backend for gptel with NAME."
+  "Register a DeepSeek backend for gptel with NAME.
+
+For the meanings of the keyword arguments, see `gptel-make-openai'."
   (declare (indent 1))
   (let ((backend (gptel--make-deepseek
                   :name name
@@ -438,3 +440,7 @@ see `gptel-make-openai'."
 
 (provide 'gptel-openai-extras)
 ;;; gptel-openai-extras.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not docstrings)
+;; End:

gptel-openai.el

@@ -151,7 +151,8 @@ Throw an error if there is no match."
                    (:copier gptel--copy-backend))
   name host header protocol stream
   endpoint key models url request-params
-  curl-args)
+  curl-args
+  (coding-system nil :documentation "Can be set to `binary' if the backend expects non UTF-8 output."))
 
 ;;; OpenAI (ChatGPT)
 (cl-defstruct (gptel-openai (:constructor gptel--make-openai)
@@ -521,7 +522,7 @@ information, in the form
  (model-name . plist)
 
 For a list of currently recognized plist keys, see
-`gptel--openai-models'. An example of a model specification
+`gptel--openai-models'.  An example of a model specification
 including both kinds of specs:
 
 :models
@@ -689,3 +690,7 @@ Example:
 
 (provide 'gptel-openai)
 ;;; gptel-openai.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not docstrings)
+;; End: