Merge pull request #301 from ccqpein/main

Update models

Author: xenodium

chatgpt-shell-google.el

@@ -85,29 +85,24 @@ VALIDATE-COMMAND handler."
   "Build a list of Google LLM models available."
   ;; Context windows have been verified as of 11/26/2024. See
   ;; https://ai.google.dev/gemini-api/docs/models/gemini.
-  (list (chatgpt-shell-google-make-model :version "gemini-1.5-pro-latest"
+  (list (chatgpt-shell-google-make-model :version "gemini-2.0-flash"
+                                         :short-version "2.0-flash"
+                                         :path "/v1beta/models/gemini-2.0-flash"
+                                         :token-width 4
+                                         :context-window 1048576)
+        (chatgpt-shell-google-make-model :version "gemini-1.5-pro-latest"
                                          :short-version "1.5-pro-latest"
                                          :path "/v1beta/models/gemini-1.5-pro-latest"
                                          :token-width 4
                                          :context-window 2097152)
-        (chatgpt-shell-google-make-model :version "gemini-exp-1206"
-                                         :short-version "exp-1206"
-                                         :path "/v1beta/models/gemini-exp-1206"
-                                         :token-width 4
-                                         :context-window 2097152)
         (chatgpt-shell-google-make-model :version "gemini-1.5-flash-latest"
                                          :short-version "1.5-flash-latest"
                                          :path "/v1beta/models/gemini-1.5-flash-latest"
                                          :token-width 4
                                          :context-window 1048576)
-        (chatgpt-shell-google-make-model :version "gemini-2.0-flash-exp"
-                                         :short-version "2.0-flash-exp"
-                                         :path "/v1beta/models/gemini-2.0-flash-exp"
-                                         :token-width 4
-                                         :context-window 1048576)
-        (chatgpt-shell-google-make-model :version "gemini-2.0-flash-thinking-exp-1219"
+        (chatgpt-shell-google-make-model :version "gemini-2.0-flash-thinking-exp-01-21"
                                          :short-version "2.0-flash-thinking-exp"
-                                         :path "/v1beta/models/gemini-2.0-flash-thinking-exp-1219"
+                                         :path "/v1beta/models/gemini-2.0-flash-thinking-exp-01-21"
                                          :token-width 4
                                          :context-window 32767)))
 

chatgpt-shell-openai.el

@@ -75,6 +75,17 @@ HANDLER, FILTER and OTHER-PARAMS."
          :token-width 3
          ;; https://platform.openai.com/docs/models/gpt-4o
          :context-window 128000)
+        (chatgpt-shell-openai-make-model
+         :version "o3-mini"
+         :token-width 3
+         :context-window 200000
+         :validate-command
+         ;; TODO: Standardize whether or not a model supports system prompts.
+         (lambda (command model settings)
+           (or (chatgpt-shell-openai--validate-command command model settings)
+               (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-preview"
          :token-width 3