Improve default model logic

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Improve default model logic to check for configs and env vars of known models.
+
 ## 0.3.0
 
 - Support stop chat prompts via `chat/promptStop` notification.

src/eca/db.clj

@@ -21,7 +21,6 @@
                                :web-search true}
             "claude-3-5-haiku-latest" {:tools true
                                        :web-search true}} ;; + ollama local models
-   :default-model "claude-sonnet-4-0" ;; unless a ollama model is running.
    :mcp-clients {}})
 
 (defonce db* (atom initial-db))

src/eca/features/chat.clj

@@ -1,17 +1,16 @@
 (ns eca.features.chat
   (:require
    [babashka.fs :as fs]
+   [cheshire.core :as json]
    [clojure.set :as set]
    [clojure.string :as string]
-   [eca.config :as config]
    [eca.features.index :as f.index]
    [eca.features.rules :as f.rules]
    [eca.features.tools :as f.tools]
    [eca.llm-api :as llm-api]
    [eca.logger :as logger]
    [eca.messenger :as messenger]
-   [eca.shared :as shared]
-   [cheshire.core :as json]))
+   [eca.shared :as shared]))
 
 (set! *warn-on-reflection* true)
 
@@ -57,10 +56,8 @@
     "chat" "Help with code changes only if user requested/agreed, ask first before do changes, answer questions, and provide explanations."
     "agent" "Help with code changes when applicable, suggesting you do the changes itself, answer questions, and provide explanations."))
 
-(defn default-model [db]
-  (if-let [ollama-model (first (filter #(string/starts-with? % config/ollama-model-prefix) (vals (:models db))))]
-    ollama-model
-    (:default-model db)))
+(defn default-model [db config]
+  (llm-api/default-model db config))
 
 (defn finish-chat-prompt! [chat-id status messenger db*]
   (swap! db* assoc-in [:chats chat-id :status] status)
@@ -112,7 +109,7 @@
                            {:behavior (behavior->behavior-str (or behavior (:chat-default-behavior db)))})
         refined-contexts (raw-contexts->refined contexts)
         context-str (build-context-str refined-contexts rules)
-        chosen-model (or model (default-model db))
+        chosen-model (or model (default-model db config))
         past-messages (get-in db [:chats chat-id :messages] [])
         user-prompt message
         all-tools (f.tools/all-tools @db* config)

src/eca/handlers.clj

@@ -37,7 +37,7 @@
       db*
       config))
    {:models (keys (:models @db*))
-    :chat-default-model (f.chat/default-model @db*)
+    :chat-default-model (f.chat/default-model @db* config)
     :chat-behaviors (:chat-behaviors @db*)
     :chat-default-behavior (:chat-default-behavior @db*)
     :chat-welcome-message (:welcomeMessage (:chat config))}))

src/eca/llm_api.clj

@@ -9,6 +9,8 @@
 
 (set! *warn-on-reflection* true)
 
+(def ^:private logger-tag "[LLM-API]")
+
 (defn extra-models [config]
   (llm-providers.ollama/list-models {:host (:host (:ollama config))
                                      :port (:port (:ollama config))}))
@@ -17,6 +19,30 @@
   ;; TODO ask LLM for the most relevant parts of the path
   (slurp path))
 
+(defn ^:private anthropic-api-key [config]
+  (or (:anthropicApiKey config)
+      (System/getenv "ANTHROPIC_API_KEY")))
+
+(defn ^:private openai-api-key [config]
+  (or (:openaiApiKey config)
+      (System/getenv "OPENAI_API_KEY")))
+
+(defn default-model
+  "Returns the default LLM model checking this waterfall:
+  - Anthropic api key set
+  - Openai api key set
+  - Ollama first model if running
+  - Anthropic default model."
+  [db config]
+  (let [[decision model] (or (first (filter #(string/starts-with? % config/ollama-model-prefix) (vals (:models db))))
+                             (when (anthropic-api-key config)
+                               [:api-key-found "claude-sonnet-4-0"])
+                             (when (openai-api-key config)
+                               [:api-key-found "o4-mini"])
+                             [:default "claude-sonnet-4-0"])]
+    (logger/info logger-tag (format "Default LLM model '%s' decision '%s'" model decision))
+    model))
+
 (defn ^:private tool->llm-tool [tool]
   (assoc (select-keys tool [:name :description :parameters])
          :type "function"))
@@ -43,48 +69,48 @@
                    "o3"
                    "gpt-4.1"} model)
       (llm-providers.openai/completion!
-        {:model model
-         :context context
-         :user-prompt user-prompt
-         :past-messages past-messages
-         :tools tools
-         :web-search web-search
-         :api-key (:openaiApiKey config)}
-        {:on-message-received on-message-received-wrapper
-         :on-error on-error-wrapper
-         :on-prepare-tool-call on-prepare-tool-call
-         :on-tool-called on-tool-called
-         :on-reason on-reason})
+       {:model model
+        :context context
+        :user-prompt user-prompt
+        :past-messages past-messages
+        :tools tools
+        :web-search web-search
+        :api-key (openai-api-key config)}
+       {:on-message-received on-message-received-wrapper
+        :on-error on-error-wrapper
+        :on-prepare-tool-call on-prepare-tool-call
+        :on-tool-called on-tool-called
+        :on-reason on-reason})
 
       (contains? #{"claude-sonnet-4-0"
                    "claude-opus-4-0"
                    "claude-3-5-haiku-latest"} model)
       (llm-providers.anthropic/completion!
-        {:model model
-         :context context
-         :user-prompt user-prompt
-         :past-messages past-messages
-         :tools tools
-         :web-search web-search
-         :api-key (:anthropicApiKey config)}
-        {:on-message-received on-message-received-wrapper
-         :on-error on-error-wrapper
-         :on-prepare-tool-call on-prepare-tool-call
-         :on-tool-called on-tool-called})
+       {:model model
+        :context context
+        :user-prompt user-prompt
+        :past-messages past-messages
+        :tools tools
+        :web-search web-search
+        :api-key (anthropic-api-key config)}
+       {:on-message-received on-message-received-wrapper
+        :on-error on-error-wrapper
+        :on-prepare-tool-call on-prepare-tool-call
+        :on-tool-called on-tool-called})
 
       (string/starts-with? model config/ollama-model-prefix)
       (llm-providers.ollama/completion!
-        {:host (-> config :ollama :host)
-         :port (-> config :ollama :port)
-         :model (string/replace-first model config/ollama-model-prefix "")
-         :past-messages past-messages
-         :context context
-         :tools tools
-         :user-prompt user-prompt}
-        {:on-message-received on-message-received-wrapper
-         :on-error on-error-wrapper
-         :on-prepare-tool-call on-prepare-tool-call
-         :on-tool-called on-tool-called})
+       {:host (-> config :ollama :host)
+        :port (-> config :ollama :port)
+        :model (string/replace-first model config/ollama-model-prefix "")
+        :past-messages past-messages
+        :context context
+        :tools tools
+        :user-prompt user-prompt}
+       {:on-message-received on-message-received-wrapper
+        :on-error on-error-wrapper
+        :on-prepare-tool-call on-prepare-tool-call
+        :on-tool-called on-tool-called})
 
       :else
       (on-error-wrapper {:msg (str "ECA Unsupported model: " model)}))))

src/eca/llm_providers/anthropic.clj

@@ -31,9 +31,7 @@
                       :cache_control {:type "ephemeral"}})))
 
 (defn ^:private base-request! [{:keys [rid body api-key content-block* on-error on-response]}]
-  (let [api-key (or api-key
-                    (System/getenv "ANTHROPIC_API_KEY"))
-        url (url messages-path)]
+  (let [url (url messages-path)]
     (llm-util/log-request logger-tag rid url body)
     (http/post
      url

src/eca/llm_providers/openai.clj

@@ -20,9 +20,7 @@
           path))
 
 (defn ^:private base-completion-request! [{:keys [rid body api-key on-error on-response]}]
-  (let [api-key (or api-key
-                    (System/getenv "OPENAI_API_KEY"))
-        url (url responses-path)]
+  (let [url (url responses-path)]
     (llm-util/log-request logger-tag rid url body)
     (http/post
      url