move defaultModel to root

Author: ericdallo

integration-test/integration/chat/custom_provider_test.clj

@@ -21,7 +21,7 @@
          (eca/request! (fixture/initialize-request
                         {:initializationOptions
                          (merge fixture/default-init-options
-                                {:defaultModel "foo-1"
+                                {:defaultModel "myProvider/foo-1"
                                  :customProviders
                                  {"myProvider"
                                   {:api "openai-responses"
@@ -144,7 +144,7 @@
          (eca/request! (fixture/initialize-request
                         {:initializationOptions
                          (merge fixture/default-init-options
-                                {:defaultModel "deepseek-coder"
+                                {:defaultModel "myProvider/deepseek-coder"
                                  :customProviders
                                  {"myProvider"
                                   {:api "openai-chat"

integration-test/integration/initialize_test.clj

@@ -82,7 +82,7 @@
           :chatWelcomeMessage "Welcome to ECA!\n\nType '/' for commands\n\n"}
          (eca/request! (fixture/initialize-request
                         {:initializationOptions (merge fixture/default-init-options
-                                                       {:defaultModel "bar-2"
+                                                       {:defaultModel "myCustom/bar-2"
                                                         :customProviders
                                                         {"myCustom" {:api "openai"
                                                                      :urlEnv "MY_CUSTOM_API_URL"

src/eca/handlers.clj

@@ -24,15 +24,16 @@
                     (fn [models [custom-provider {provider-models :models}]]
                       (reduce
                        (fn [m model]
-                         (let [known-model (get all-models model)]
+                         (let [known-model (get all-models model)
+                               full-model (str (name custom-provider) "/" model)]
                            (assoc m
-                                  (str (name custom-provider) "/" model)
+                                  full-model
                                   {:tools (or (:tools known-model) true)
                                    :reason? (or (:reason? known-model) true)
                                    :web-search (or (:web-search known-model) true)
                                    :max-output-tokens (:max-output-tokens known-model)
                                    :custom-provider? true
-                                   :default-model? (= model (:defaultModel config))})))
+                                   :default-model? (= full-model (:defaultModel config))})))
                        models
                        provider-models))
                     {}

src/eca/llm_api.clj

@@ -63,12 +63,8 @@
   - Anthropic default model."
   [db config]
   (let [[decision model]
-        (or (when-let [custom-provider-default-model (first (keep (fn [[model config]]
-                                                                    (when (and (:custom-provider? config)
-                                                                               (:default-model? config))
-                                                                      model))
-                                                                  (:models db)))]
-              [:custom-provider-default-model custom-provider-default-model])
+        (or (when-let [config-default-model (:defaultModel config)]
+              [:config-default-model config-default-model])
             (when (provider-api-key "anthropic" config)
               [:api-key-found "anthropic/claude-sonnet-4-20250514"])
             (when (provider-api-key "openai" config)

test/eca/llm_api_test.clj

@@ -10,8 +10,8 @@
 (deftest default-model-test
   (testing "Custom provider default-model? present"
     (with-redefs [config/get-env (constantly nil)]
-      (let [db {:models {"my-provider/my-model" {:custom-provider? true :default-model? true}}}
-            config {}]
+      (let [db {}
+            config {:defaultModel "my-provider/my-model"}]
         (is (= "my-provider/my-model" (llm-api/default-model db config))))))
 
   (testing "Ollama running model present"