Fix models with slash on custom provider

Author: ericdallo

src/eca/config.clj

@@ -140,7 +140,10 @@
         models' (when models
                   (into {}
                         (map (fn [[k v]]
-                               [(if (or (keyword? k) (symbol? k)) (name k) (str k)) v])
+                               [(if (or (keyword? k) (symbol? k))
+                                  (string/replace-first (str k) ":" "")
+                                  (str k))
+                                v])
                              models)))
         provider' (dissoc provider "models")]
     (if models'

src/eca/handlers.clj

@@ -25,8 +25,8 @@
                                       full-model (str provider "/" model)
                                       model-capabilities (merge
                                                           (or (get all-models full-model)
-                                                                 ;; we guess the capabilities from
-                                                                 ;; the first model with same name
+                                                              ;; we guess the capabilities from
+                                                              ;; the first model with same name
                                                               (when-let [found-full-model (first (filter #(= model (second (string/split % #"/" 2)))
                                                                                                          (keys all-models)))]
                                                                 (get all-models found-full-model))

test/eca/config_test.clj

@@ -26,11 +26,13 @@
   (testing "providers and models are updated correctly"
     (reset! config/initialization-config* {:pureConfig true
                                            :providers {"customProvider" {:key "123"
-                                                                         :models {:gpt-5 {}}}}})
+                                                                         :models {:gpt-5 {}}}
+                                                       "openrouter" {:models {"openai/o4-mini" {}}}}})
     (is (match?
          {:pureConfig true
           :providers {"custom-provider" {:key "123"
-                                         :models {"gpt-5" {}}}}}
+                                         :models {"gpt-5" {}}}
+                      "openrouter" {:models {"openai/o4-mini" {}}}}}
          (config/all {})))))
 
 (deftest deep-merge-test
@@ -69,3 +71,23 @@
          (#'config/deep-merge {:providers {"github-copilot" {:models {"gpt-5" {}}}}}
                               {:pureConfig true
                                :providers {"github-copilot" {:key "123"}}})))))
+
+(deftest normalize-fields-test
+  (is (match?
+       {:pureConfig true
+        :providers {"custom-provider" {:key "123"
+                                       :models {"gpt-5" {}}}
+                    "openrouter" {:models {"openai/o4-mini" {}}}}}
+       (#'config/normalize-fields {:pureConfig true
+                                   :providers {"custom-provider" {:key "123"
+                                                                  :models {"gpt-5" {}}}
+                                               "openrouter" {:models {"openai/o4-mini" {}}}}})))
+  (is (match?
+       {:pureConfig true
+        :providers {"custom-provider" {:key "123"
+                                       :models {"gpt-5" {}}}
+                    "openrouter" {:models {"openai/o4-mini" {}}}}}
+       (#'config/normalize-fields {:pureConfig true
+                                   :providers {:customProvider {:key "123"
+                                                                :models {"gpt-5" {}}}
+                                               :openrouter {:models {:openai/o4-mini {}}}}}))))

test/eca/test_helper.clj

@@ -47,7 +47,9 @@
 (defn config! [config]
   (swap! components* update :config shared/deep-merge config))
 
-(defn reset-components! [] (reset! components* (make-components)))
+(defn reset-components! []
+  (reset! config/initialization-config* {})
+  (reset! components* (make-components)))
 (defn reset-components-before-test []
   (use-fixtures :each (fn [f] (reset-components!) (f))))
 (defn reset-messenger! [] (swap! components* assoc :messenger (:messenger (make-components))))