Merge branch 'goog-model-discovery' of github.com:DinoChiesa/chatgpt-shell into goog-model-discovery

Author: DinoChiesa

README.org

@@ -92,18 +92,23 @@ VALIDATE-COMMAND handler."
   (list
    ;; https://docs.anthropic.com/en/docs/about-claude/models#model-comparison-table
    ;; A token is equivalent to _about_ 4 characters.
-   (chatgpt-shell-anthropic--make-model :version "claude-3-5-sonnet-20241022"
-                                        :short-version "3-5-sonnet-20241022"
+   (chatgpt-shell-anthropic--make-model :version "claude-3-7-sonnet-latest"
+                                        :short-version "3.7-sonnet"
                                         :token-width  4
                                         :max-tokens 8192
                                         :context-window 200000)
-   (chatgpt-shell-anthropic--make-model :version "claude-3-5-haiku-20241022"
-                                        :short-version "3-5-haiku-20241022"
+   (chatgpt-shell-anthropic--make-model :version "claude-3-5-sonnet-latest"
+                                        :short-version "3.5-sonnet"
                                         :token-width  4
                                         :max-tokens 8192
                                         :context-window 200000)
-   (chatgpt-shell-anthropic--make-model :version "claude-3-opus-20240229"
-                                        :short-version "3-opus-20240229"
+   (chatgpt-shell-anthropic--make-model :version "claude-3-5-haiku-latest"
+                                        :short-version "3.5-haiku"
+                                        :token-width  4
+                                        :max-tokens 8192
+                                        :context-window 200000)
+   (chatgpt-shell-anthropic--make-model :version "claude-3-opus-latest"
+                                        :short-version "3-opus"
                                         :token-width  4
                                         :max-tokens 4096
                                         :context-window 200000)))

chatgpt-shell-anthropic.el

@@ -0,0 +1,129 @@
+;;; chatgpt-shell-deepseek.el --- Deepseek-specific logic -*- lexical-binding: t; -*-
+
+;; Author: Alvaro Ramirez https://xenodium.com
+;; URL: https://github.com/xenodium/chatgpt-shell
+
+;; This package is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This package is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;;; Commentary:
+
+;; Adds DeepSeek specifics for `chatgpt-shell'.
+
+;;; Code:
+
+(declare-function chatgpt-shell-validate-no-system-prompt "chatgpt-shell")
+
+(cl-defun chatgpt-shell-deepseek-make-model (&key label version short-version token-width context-window validate-command other-params)
+  "Create an DeepSeek model.
+
+Set LABEL, VERSION, SHORT-VERSION, TOKEN-WIDTH, CONTEXT-WINDOW,
+VALIDATE-COMMAND and OTHER-PARAMS for `chatgpt-shell-openai-make-model'."
+  (chatgpt-shell-openai-make-model
+   :label label
+   :version version
+   :short-version short-version
+   :token-width token-width
+   :context-window context-window
+   :other-params other-params
+   :validate-command #'chatgpt-shell-deepseek--validate-command
+   :url-base 'chatgpt-shell-deepseek-api-url-base
+   :path "/chat/completions"
+   :provider "DeepSeek"
+   :validate-command validate-command
+   :key #'chatgpt-shell-deepseek-key
+   :headers #'chatgpt-shell-deepseek--make-headers
+   :handler #'chatgpt-shell-deepseek--handle-command
+   :filter #'chatgpt-shell-deepseek--filter-output))
+
+(defun chatgpt-shell-deepseek-models ()
+  "Build a list of DeepSeek LLM models."
+  (list (chatgpt-shell-deepseek-make-model
+         :version "deepseek-reasoner"
+         :short-version "reasoner"
+         :label "DeepSeek"
+         ;; See https://api-docs.deepseek.com/quick_start/token_usage
+         :token-width 3
+         ;; See https://api-docs.deepseek.com/quick_start/pricing.
+         :context-window 65536)
+        (chatgpt-shell-deepseek-make-model
+         :version "deepseek-chat"
+         :short-version "chat"
+         :label "DeepSeek"
+         ;; See https://api-docs.deepseek.com/quick_start/token_usage
+         :token-width 3
+         ;; See https://api-docs.deepseek.com/quick_start/pricing.
+         :context-window 65536)))
+
+(defcustom chatgpt-shell-deepseek-api-url-base "https://api.deepseek.com"
+  "DeepSeek API's base URL.
+
+API url = base + path.
+
+If you use DeepSeek through a proxy service, change the URL base."
+  :type 'string
+  :safe #'stringp
+  :group 'chatgpt-shell)
+
+(defcustom chatgpt-shell-deepseek-key nil
+  "DeepSeek key as a string or a function that loads and returns it."
+  :type '(choice (function :tag "Function")
+                 (string :tag "String"))
+  :group 'chatgpt-shell)
+
+(defun chatgpt-shell-deepseek-key ()
+  "Get the DeepSeek key."
+  (cond ((stringp chatgpt-shell-deepseek-key)
+         chatgpt-shell-deepseek-key)
+        ((functionp chatgpt-shell-deepseek-key)
+         (condition-case _err
+             (funcall chatgpt-shell-deepseek-key)
+           (error
+            "KEY-NOT-FOUND")))
+        (t
+         nil)))
+
+(cl-defun chatgpt-shell-deepseek--handle-command (&key model command context shell settings)
+  "Handle ChatGPT COMMAND (prompt) using ARGS, MODEL, CONTEXT, SHELL, and SETTINGS."
+  (chatgpt-shell-openai--handle-chatgpt-command
+   :model model
+   :command command
+   :context context
+   :shell shell
+   :settings settings
+   :key #'chatgpt-shell-deepseek-key
+   :filter #'chatgpt-shell-deepseek--filter-output
+   :missing-key-msg "Your chatgpt-shell-deepseek-key is missing"))
+
+(defun chatgpt-shell-deepseek--filter-output (raw-response)
+  "Filter RAW-RESPONSE when processing responses are sent."
+  (chatgpt-shell-openai--filter-output raw-response))
+
+(defun chatgpt-shell-deepseek--make-headers (&rest args)
+  "Create the API headers.
+
+ARGS are the same as for `chatgpt-shell-openai--make-headers'."
+  (apply #'chatgpt-shell-openai--make-headers
+         :key #'chatgpt-shell-deepseek-key
+         args))
+
+(defun chatgpt-shell-deepseek--validate-command (_command _model _settings)
+  "Return error string if command/setup isn't valid."
+  (unless chatgpt-shell-deepseek-key
+    "Variable `chatgpt-shell-deepseek-key' needs to be set to your key.
+
+Try M-x set-variable chatgpt-shell-deepseek-key
+
+or
+
+(setq chatgpt-shell-deepseek-key \"my-key\")"))
+
+(provide 'chatgpt-shell-deepseek)
+;;; chatgpt-shell-deepseek.el ends here

chatgpt-shell-deepseek.el

@@ -35,6 +35,7 @@
 
 ;; Muffle warning about free variable.
 (defvar chatgpt-shell-models)
+(defvar chatgpt-shell-request-timeout)
 (declare-function chatgpt-shell-crop-context "chatgpt-shell")
 (declare-function chatgpt-shell--make-chatgpt-url "chatgpt-shell")
 (declare-function chatgpt-shell-openai--user-assistant-messages "chatgpt-shell-openai")
@@ -179,6 +180,7 @@ replace all models with locally installed ollama models."
                                                   (list (cons command nil)))
                                                 :settings settings)
    :filter #'chatgpt-shell-ollama--extract-ollama-response
+   :timeout chatgpt-shell-request-timeout
    :shell shell))
 
 (cl-defun chatgpt-shell-ollama--make-url (&key _command _model _settings)

chatgpt-shell-ollama.el

@@ -86,6 +86,12 @@ HANDLER, FILTER and OTHER-PARAMS."
                (when (map-elt settings :system-prompt)
                  (format "Model \"%s\" does not support system prompts. Please unset via \"M-x chatgpt-shell-swap-system-prompt\" by selecting None."
                          (map-elt model :version))))))
+        (chatgpt-shell-openai-make-model
+         :version "o1"
+         :token-width 3
+         ;; https://platform.openai.com/docs/models/o1
+         :context-window 200000
+         :validate-command #'chatgpt-shell-validate-no-system-prompt)
         (chatgpt-shell-openai-make-model
          :version "o1-preview"
          :token-width 3
@@ -104,6 +110,11 @@ HANDLER, FILTER and OTHER-PARAMS."
                (when (map-elt settings :system-prompt)
                  (format "Model \"%s\" does not support system prompts. Please unset via \"M-x chatgpt-shell-swap-system-prompt\" by selecting None."
                          (map-elt model :version))))))
+        (chatgpt-shell-openai-make-model
+         :version "gpt-4.5-preview"
+         :token-width 3
+         ;; https://platform.openai.com/docs/models#gpt-4-5
+         :context-window 128000)
         (chatgpt-shell-openai-make-model
          :version "gpt-4o"
          :token-width 3
@@ -236,8 +247,10 @@ Otherwise:
                                  (let-alist obj
                                    (mapconcat (lambda (choice)
                                                 (let-alist choice
-                                                  (or .delta.content
-                                                      .message.content)))
+                                                  (or (and (not (eq .delta.content :null))
+                                                           .delta.content)
+                                                      .message.content
+                                                      "")))
                                               .choices "")))))
                     (unless (string-empty-p text)
                       (setq response (concat response text)))

chatgpt-shell-openai.el

@@ -76,6 +76,22 @@ VALIDATE-COMMAND and OTHER-PARAMS for `chatgpt-shell-openai-make-model'."
          ;;
          ;; See https://openrouter.ai/qwen/qwq-32b-preview
          :other-params '((provider (quantizations . ["bf16"]))))
+        (chatgpt-shell-openrouter-make-model
+         :version "openai/o3-mini-high"
+         :short-version "o3-mini-high"
+         :label "ChatGPT"
+         :token-width 3
+         ;; See https://openrouter.ai/openai/o3-mini-high
+         :context-window 200000
+         :validate-command #'chatgpt-shell-validate-no-system-prompt)
+        (chatgpt-shell-openrouter-make-model
+         :version "openai/o3-mini"
+         :short-version "o3-mini"
+         :label "ChatGPT"
+         :token-width 3
+         ;; See https://openrouter.ai/openai/o1-2024-12-17
+         :context-window 200000
+         :validate-command #'chatgpt-shell-validate-no-system-prompt)
         (chatgpt-shell-openrouter-make-model
          :version "openai/o1"
          :short-version "o1"

chatgpt-shell-openrouter.el

@@ -4,9 +4,9 @@
 
 ;; Author: Alvaro Ramirez https://xenodium.com
 ;; URL: https://github.com/xenodium/chatgpt-shell
-;; Version: 2.12.2
+;; Version: 2.16.1
 ;; Package-Requires: ((emacs "28.1") (shell-maker "0.76.2"))
-(defconst chatgpt-shell--version "2.12.2")
+(defconst chatgpt-shell--version "2.16.1")
 
 ;; This package is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -36,10 +36,12 @@
 ;;
 ;; You must set an API key for most cloud services.  Check out:
 ;;
-;;   `chatgpt-shell-openai-key'.
 ;;   `chatgpt-shell-anthropic-key'.
+;;   `chatgpt-shell-deepseek-key'
 ;;   `chatgpt-shell-google-key'.
 ;;   `chatgpt-shell-kagi-key'.
+;;   `chatgpt-shell-openai-key'.
+;;   `chatgpt-shell-openrouter-key'
 ;;   `chatgpt-shell-perplexity-key'.
 ;;
 ;; Alternatively, local services like Ollama do not require an API key.
@@ -67,14 +69,15 @@
 (require 'ob-core)
 (require 'color)
 
-(require 'chatgpt-shell-prompt-compose)
 (require 'chatgpt-shell-anthropic)
+(require 'chatgpt-shell-deepseek)
 (require 'chatgpt-shell-google)
 (require 'chatgpt-shell-kagi)
 (require 'chatgpt-shell-ollama)
 (require 'chatgpt-shell-openai)
-(require 'chatgpt-shell-perplexity)
 (require 'chatgpt-shell-openrouter)
+(require 'chatgpt-shell-perplexity)
+(require 'chatgpt-shell-prompt-compose)
 
 (defcustom chatgpt-shell-request-timeout 600
   "How long to wait for a request to time out in seconds."
@@ -233,13 +236,14 @@ Can be used compile or run source block at point."
 
 This function aggregates models from OpenAI, Anthropic, Google, and Ollama.
 It returns a list containing all available models from these providers."
-  (append (chatgpt-shell-openai-models)
-          (chatgpt-shell-anthropic-models)
+  (append (chatgpt-shell-anthropic-models)
+          (chatgpt-shell-deepseek-models)
           (chatgpt-shell-google-models)
           (chatgpt-shell-kagi-models)
           (chatgpt-shell-ollama-models)
-          (chatgpt-shell-perplexity-models)
-          (chatgpt-shell-openrouter-models)))
+          (chatgpt-shell-openai-models)
+          (chatgpt-shell-openrouter-models)
+          (chatgpt-shell-perplexity-models)))
 
 (defcustom chatgpt-shell-models
   (chatgpt-shell--make-default-models)
@@ -435,7 +439,7 @@ Or nil if none."
 
 (defun chatgpt-shell-validate-no-system-prompt (command model settings)
   "Perform validation for COMMAND with MODEL and SETTINGS.
-Then enforce that there is no system prompt. This is useful for models like
+Then enforce that there is no system prompt.  This is useful for models like
 OpenAI's o1 that do not allow one."
     (or (chatgpt-shell-openai--validate-command command model settings)
         (when (map-elt settings :system-prompt)
@@ -517,6 +521,32 @@ Downloaded from https://github.com/f/awesome-chatgpt-prompts."
   (setq chatgpt-shell-models (chatgpt-shell--make-default-models))
   (message "Reloaded %d models" (length chatgpt-shell-models)))
 
+(defcustom chatgpt-shell-model-filter nil
+  "Filter models to swap from using this function as a filter.
+
+See `chatgpt-shell-allow-model-versions' and
+`chatgpt-shell-ignore-model-versions' as examples."
+  :type 'function
+  :group 'chatgpt-shell)
+
+(defun chatgpt-shell-allow-model-versions (versions)
+  "Return a filter function to keep known model VERSIONS only.
+
+Use with `chatgpt-shell-model-filter'."
+  (lambda (models)
+    (seq-filter (lambda (model)
+                  (member (map-elt model :version) versions))
+                models)))
+
+(defun chatgpt-shell-ignore-model-versions (versions)
+  "Return a filter function to drop model VERSIONS.
+
+Use with `chatgpt-shell-model-filter'."
+  (lambda (models)
+    (seq-filter (lambda (model)
+                  (not (member (map-elt model :version) versions)))
+                models)))
+
 (defun chatgpt-shell-swap-model ()
   "Swap model version from `chatgpt-shell-models'."
   (interactive)
@@ -535,7 +565,9 @@ Downloaded from https://github.com/f/awesome-chatgpt-prompts."
                                (format (format "%%-%ds   %%s" width)
                                        (map-elt model :provider)
                                        (map-elt model :version)))
-                             chatgpt-shell-models))
+                             (if chatgpt-shell-model-filter
+                                 (funcall chatgpt-shell-model-filter chatgpt-shell-models)
+                               chatgpt-shell-models)))
             (selection (nth 1 (split-string (completing-read "Model version: "
                                                              models nil t)))))
       (progn
@@ -1571,16 +1603,17 @@ With prefix REVIEW prompt before sending to ChatGPT."
         (prin1-to-string
          `(progn
             (interactive)
-            (load ,(find-library-name "shell-maker") nil t)
-            (load ,(find-library-name "chatgpt-shell-openai") nil t)
-            (load ,(find-library-name "chatgpt-shell-openrouter") nil t)
-            (load ,(find-library-name "chatgpt-shell-google") nil t)
+            (load ,(find-library-name "chatgpt-shell") nil t)
             (load ,(find-library-name "chatgpt-shell-anthropic") nil t)
-            (load ,(find-library-name "chatgpt-shell-ollama") nil t)
+            (load ,(find-library-name "chatgpt-shell-deepseek") nil t)
+            (load ,(find-library-name "chatgpt-shell-google") nil t)
             (load ,(find-library-name "chatgpt-shell-kagi") nil t)
+            (load ,(find-library-name "chatgpt-shell-ollama") nil t)
+            (load ,(find-library-name "chatgpt-shell-openai") nil t)
+            (load ,(find-library-name "chatgpt-shell-openrouter") nil t)
             (load ,(find-library-name "chatgpt-shell-perplexity") nil t)
             (load ,(find-library-name "chatgpt-shell-prompt-compose") nil t)
-            (load ,(find-library-name "chatgpt-shell") nil t)
+            (load ,(find-library-name "shell-maker") nil t)
             (setq chatgpt-shell-model-temperature 0)
             (setq chatgpt-shell-openai-key ,(chatgpt-shell-openai-key))
             (chatgpt-shell-command-line-from-prompt-file ,prompt-file)))
@@ -3179,11 +3212,12 @@ Of the form
                    (line-beginning-position)))
           (end (region-end)))
       ;; Barf trailing space from selection.
-      (when (string-match "[ \n\t]+$"
-                          (buffer-substring-no-properties
-                           start
-                           end))
-        (setq end (- end (length (match-string 0)))))
+      (let ((text (buffer-substring-no-properties
+                   start
+                   end)))
+        (when (string-match "[ \n\t]+$"
+                            text)
+          (setq end (- end (length (match-string 0 text))))))
       (list (cons :start start)
             (cons :end end)
             (cons :buffer (current-buffer))