Fix tests

Author: ericdallo

integration-test/integration/chat/custom_provider_test.clj

@@ -161,6 +161,7 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock "})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "knock!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -184,6 +185,7 @@
 
         (match-content chat-id "user" {:type "text" :text "Who's there?\n"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Foo"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
@@ -213,6 +215,7 @@
         (match-content chat-id "assistant" {:type "text" :text "Fo"})
         (match-content chat-id "assistant" {:type "text" :text "o "})
         (match-content chat-id "assistant" {:type "text" :text "bar"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "!\n\nHa!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?

integration-test/integration/chat/github_copilot_test.clj

@@ -34,6 +34,7 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knock "})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "knock!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -57,6 +58,7 @@
 
         (match-content chat-id "user" {:type "text" :text "Who's there?\n"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Foo"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
@@ -88,6 +90,7 @@
         (match-content chat-id "assistant" {:type "text" :text "Fo"})
         (match-content chat-id "assistant" {:type "text" :text "o "})
         (match-content chat-id "assistant" {:type "text" :text "bar"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "!\n\nHa!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -128,6 +131,7 @@
         (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "y hello"})
         (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
         (match-content chat-id "assistant" {:type "text" :text "hello "})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "there!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -158,6 +162,7 @@
         (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "ay fine"})
         (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
         (match-content chat-id "assistant" {:type "text" :text "I'm"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "  fine"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?

integration-test/integration/chat/google_test.clj

@@ -34,6 +34,7 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Knoc"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "k knock!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -57,6 +58,7 @@
 
         (match-content chat-id "user" {:type "text" :text "Who's there?\n"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Waiting model"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Foo"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
@@ -87,6 +89,7 @@
         (match-content chat-id "system" {:type "progress" :state "running" :text "Generating"})
         (match-content chat-id "assistant" {:type "text" :text "Fo"})
         (match-content chat-id "assistant" {:type "text" :text "o b"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "ar!\n\nHa!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -127,6 +130,7 @@
         (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text "say hello"})
         (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
         (match-content chat-id "assistant" {:type "text" :text "hell"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "o there!"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?
@@ -157,6 +161,7 @@
         (match-content chat-id "assistant" {:type "reasonText" :id (m/pred string?) :text " say fine"})
         (match-content chat-id "assistant" {:type "reasonFinished" :id (m/pred string?) :totalTimeMs (m/pred number?)})
         (match-content chat-id "assistant" {:type "text" :text "I"})
+        (match-content chat-id "system" {:type "usage"})
         (match-content chat-id "assistant" {:type "text" :text "'m  fine"})
         (match-content chat-id "system" {:type "progress" :state "finished"})
         (is (match?

src/eca/llm_providers/openai_chat.clj

@@ -301,13 +301,6 @@
         ;; Incremental parser buffer for content to detect thinking tags across chunks
         content-buffer* (atom "")
         handle-response (fn handle-response [event data tool-calls-atom rid]
-                          (when-let [usage (:usage data)]
-                            (on-usage-updated (let [input-cache-read-tokens (-> usage :prompt_tokens_details :cached_tokens)]
-                                                {:input-tokens (if input-cache-read-tokens
-                                                                 (- (:prompt_tokens usage) input-cache-read-tokens)
-                                                                 (:prompt_tokens usage))
-                                                 :output-tokens (:completion_tokens usage)
-                                                 :input-cache-read-tokens input-cache-read-tokens})))
                           (if (= event "stream-end")
                             (do
                               ;; Flush any leftover buffered content and finish reasoning if needed
@@ -405,7 +398,14 @@
                                       (reset! reasoning-type* nil))
                                     ;; Handle regular finish
                                     (when (not= finish-reason "tool_calls")
-                                      (on-message-received {:type :finish :finish-reason finish-reason}))))))))
+                                      (on-message-received {:type :finish :finish-reason finish-reason})))))))
+                          (when-let [usage (:usage data)]
+                            (on-usage-updated (let [input-cache-read-tokens (-> usage :prompt_tokens_details :cached_tokens)]
+                                                {:input-tokens (if input-cache-read-tokens
+                                                                 (- (:prompt_tokens usage) input-cache-read-tokens)
+                                                                 (:prompt_tokens usage))
+                                                 :output-tokens (:completion_tokens usage)
+                                                 :input-cache-read-tokens input-cache-read-tokens}))))
         rid (llm-util/gen-rid)]
     (base-request!
      {:rid rid