Fix regression on models with no extraPayload.

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix regression on models with no extraPayload.
+
 ## 0.69.0
 
 - Support multiple model configs with different payloads using same model name via `modelName` config. (Ex: gpt-5 and gpt-5-high but both use gpt-5)

src/eca/shared.clj

@@ -50,11 +50,12 @@
 
 (defn deep-merge [v & vs]
   (letfn [(rec-merge [v1 v2]
-            (if (and (map? v1) (map? v2))
-              (merge-with deep-merge v1 v2)
-              v2))]
-    (when (some identity vs)
-      (reduce #(rec-merge %1 %2) v vs))))
+            (cond
+              (nil? v1) v2
+              (nil? v2) v1
+              (and (map? v1) (map? v2)) (merge-with deep-merge v1 v2)
+              :else v2))]
+    (reduce rec-merge v vs)))
 
 (defn assoc-some
   "Assoc[iate] if the value is not nil. "
@@ -66,7 +67,7 @@
        (if (next kvs)
          (recur ret (first kvs) (second kvs) (nnext kvs))
          (throw (IllegalArgumentException.
-                 "assoc-some expects even number of arguments after map/vector, found odd number")))
+                  "assoc-some expects even number of arguments after map/vector, found odd number")))
        ret))))
 
 (defn update-some

test/eca/shared_test.clj

@@ -2,7 +2,8 @@
   (:require
    [clojure.test :refer [deftest is testing]]
    [eca.shared :as shared]
-   [eca.test-helper :as h]))
+   [eca.test-helper :as h]
+   [matcher-combinators.test :refer [match?]]))
 
 (deftest uri->filename-test
   (testing "should decode special characters in file URI"
@@ -48,3 +49,45 @@
       (is (nil? (shared/tokens->cost 30 nil nil 20 {}))))
     (testing "returns nil when mandatory costs are missing"
       (is (nil? (shared/tokens->cost 30 nil nil 20 {:input-token-cost 0.01}))))))
+
+(deftest deep-merge-test
+  (testing "second map as nil returns first map"
+    (is (match?
+         {:a 1}
+         (shared/deep-merge {:a 1}
+                            nil))))
+  (testing "basic merge"
+    (is (match?
+         {:a 1
+          :b 4
+          :c 3
+          :d 1}
+         (shared/deep-merge {:a 1}
+                            {:b 2}
+                            {:c 3}
+                            {:b 4 :d 1}))))
+  (testing "deep merging"
+    (is (match?
+         {:a 1
+          :b {:c {:d 3
+                  :e 4}}}
+         (shared/deep-merge {:a 1
+                             :b {:c {:d 3}}}
+                            {:b {:c {:e 4}}}))))
+  (testing "deep merging maps with other keys"
+    (is (match?
+         {:a 1
+          :b {:c {:e 3
+                  :f 4}
+              :d 2}}
+         (shared/deep-merge {:a 1
+                             :b {:c {:e 3}
+                                 :d 2}}
+                            {:b {:c {:f 4}}}))))
+  (testing "overrides when leaf values are not maps"
+    (is (= {:a 2}
+           (shared/deep-merge {:a {:b 1}}
+                              {:a 2})))
+    (is (= {:a {:b 1}}
+           (shared/deep-merge {:a 2}
+                              {:a {:b 1}})))))