Fix clear messages to reset usage tokens as well

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix clear messages to reset usage tokens as well.
+
 ## 0.109.4
 
 - Fix clear messages to reset last api used as well.

src/eca/features/chat.clj

@@ -1824,7 +1824,7 @@
            (fn [chat]
              (cond-> chat
                messages (-> (assoc :messages [])
-                            (dissoc :tool-calls :last-api)))))
+                            (dissoc :tool-calls :last-api :usage)))))
     (db/update-workspaces-cache! @db* metrics)))
 
 (defn rollback-chat

src/eca/features/commands.clj

@@ -358,10 +358,10 @@
                       :chats {chat-id {:title (:title chat)
                                        :messages (concat [{:role "system" :content [{:type :text :text (str "Resuming chat: " selected-chat-id)}]}]
                                                          (:messages chat))}}})))
-      "costs" (let [total-input-tokens (get-in db [:chats chat-id :total-input-tokens] 0)
-                    total-input-cache-creation-tokens (get-in db [:chats chat-id :total-input-cache-creation-tokens] nil)
-                    total-input-cache-read-tokens (get-in db [:chats chat-id :total-input-cache-read-tokens] nil)
-                    total-output-tokens (get-in db [:chats chat-id :total-output-tokens] 0)
+      "costs" (let [total-input-tokens (get-in db [:chats chat-id :usage :total-input-tokens] 0)
+                    total-input-cache-creation-tokens (get-in db [:chats chat-id :usage :total-input-cache-creation-tokens] nil)
+                    total-input-cache-read-tokens (get-in db [:chats chat-id :usage :total-input-cache-read-tokens] nil)
+                    total-output-tokens (get-in db [:chats chat-id :usage :total-output-tokens] 0)
                     model-capabilities (get-in db [:models full-model])
                     text (multi-str (str "Total input tokens: " total-input-tokens)
                                     (when total-input-cache-creation-tokens

src/eca/shared.clj

@@ -171,14 +171,14 @@
                           (* output-tokens output-token-cost)))))))
 
 (defn usage-sumary [chat-id full-model db]
-  (let [last-input-tokens (or (get-in db [:chats chat-id :last-input-tokens]) 0)
-        last-output-tokens (or (get-in db [:chats chat-id :last-output-tokens]) 0)
-        last-input-cache-creation-tokens (or (get-in db [:chats chat-id :last-input-cache-creation-tokens]) 0)
-        last-input-cache-read-tokens (or (get-in db [:chats chat-id :last-input-cache-read-tokens]) 0)
-        total-input-tokens (or (get-in db [:chats chat-id :total-input-tokens]) 0)
-        total-input-cache-creation-tokens (or (get-in db [:chats chat-id :total-input-cache-creation-tokens]) 0)
-        total-input-cache-read-tokens (or (get-in db [:chats chat-id :total-input-cache-read-tokens]) 0)
-        total-output-tokens (or (get-in db [:chats chat-id :total-output-tokens]) 0)
+  (let [last-input-tokens (or (get-in db [:chats chat-id :usage :last-input-tokens]) 0)
+        last-output-tokens (or (get-in db [:chats chat-id :usage :last-output-tokens]) 0)
+        last-input-cache-creation-tokens (or (get-in db [:chats chat-id :usage :last-input-cache-creation-tokens]) 0)
+        last-input-cache-read-tokens (or (get-in db [:chats chat-id :usage :last-input-cache-read-tokens]) 0)
+        total-input-tokens (or (get-in db [:chats chat-id :usage :total-input-tokens]) 0)
+        total-input-cache-creation-tokens (or (get-in db [:chats chat-id :usage :total-input-cache-creation-tokens]) 0)
+        total-input-cache-read-tokens (or (get-in db [:chats chat-id :usage :total-input-cache-read-tokens]) 0)
+        total-output-tokens (or (get-in db [:chats chat-id :usage :total-output-tokens]) 0)
         model-capabilities (get-in db [:models full-model])]
     (assoc-some {:session-tokens (+ last-input-tokens
                                     last-input-cache-read-tokens
@@ -198,16 +198,16 @@
    full-model
    {:keys [chat-id db*]}]
   (when (and output-tokens input-tokens)
-    (swap! db* assoc-in [:chats chat-id :last-input-tokens] input-tokens)
-    (swap! db* assoc-in [:chats chat-id :last-output-tokens] output-tokens)
-    (swap! db* update-in [:chats chat-id :total-input-tokens] (fnil + 0) input-tokens)
-    (swap! db* update-in [:chats chat-id :total-output-tokens] (fnil + 0) output-tokens)
+    (swap! db* assoc-in [:chats chat-id :usage :last-input-tokens] input-tokens)
+    (swap! db* assoc-in [:chats chat-id :usage :last-output-tokens] output-tokens)
+    (swap! db* update-in [:chats chat-id :usage :total-input-tokens] (fnil + 0) input-tokens)
+    (swap! db* update-in [:chats chat-id :usage :total-output-tokens] (fnil + 0) output-tokens)
     (when input-cache-creation-tokens
-      (swap! db* assoc-in [:chats chat-id :last-input-cache-creation-tokens] input-cache-creation-tokens)
-      (swap! db* update-in [:chats chat-id :total-input-cache-creation-tokens] (fnil + 0) input-cache-creation-tokens))
+      (swap! db* assoc-in [:chats chat-id :usage :last-input-cache-creation-tokens] input-cache-creation-tokens)
+      (swap! db* update-in [:chats chat-id :usage :total-input-cache-creation-tokens] (fnil + 0) input-cache-creation-tokens))
     (when input-cache-read-tokens
-      (swap! db* assoc-in [:chats chat-id :last-input-cache-read-tokens] input-cache-read-tokens)
-      (swap! db* update-in [:chats chat-id :total-input-cache-read-tokens] (fnil + 0) input-cache-read-tokens))
+      (swap! db* assoc-in [:chats chat-id :usage :last-input-cache-read-tokens] input-cache-read-tokens)
+      (swap! db* update-in [:chats chat-id :usage :total-input-cache-read-tokens] (fnil + 0) input-cache-read-tokens))
     (usage-sumary chat-id full-model @db*)))
 
 (defn map->camel-cased-map [m]
@@ -326,14 +326,7 @@
                                                  (get-in db [:chats chat-id :last-summary]))}]}])))
 
   ;; Zero chat usage
-  (swap! db* assoc-in [:chats chat-id :last-input-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :last-output-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :last-input-cache-creation-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :last-input-cache-read-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :total-input-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :total-output-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :total-input-cache-creation-tokens] nil)
-  (swap! db* assoc-in [:chats chat-id :total-input-cache-read-tokens] nil)
+  (swap! db* update-in [:chats chat-id] dissoc :usage)
   (messenger/chat-content-received
    messenger
    {:chat-id chat-id