Improve rewrite error handling

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fix token renew when using rewrite feature.
+- Improve rewrite error handling.
 
 ## 0.77.0
 

src/eca/features/rewrite.clj

@@ -35,7 +35,9 @@
              :rewrite-id id}
         _ (f.login/maybe-renew-auth-token!
            {:provider provider
-            :on-error (fn [error-msg] (logger/error logger-tag (format "Auth token renew failed: %s" error-msg)))}
+            :on-error (fn [error-msg]
+                        (logger/error logger-tag (format "Auth token renew failed: %s" error-msg))
+                        (throw (ex-info error-msg {:error-response {:message error-msg}})))}
            ctx)]
     (future* config
       (llm-api/sync-or-async-prompt!

src/eca/handlers.clj

@@ -162,7 +162,19 @@
   (metrics/task metrics :eca/completion-inline
     (f.completion/complete params db* config messenger metrics)))
 
+(defmacro handle-expected-errors
+  "Executes body, catching any ExceptionInfo with :error-response.
+  If caught, return {:error error-response}"
+  [& body]
+  `(try
+     ~@body
+     (catch clojure.lang.ExceptionInfo e#
+       (if-let [error-response# (:error-response (ex-data e#))]
+         {:error error-response#}
+         (throw e#)))))
+
 (defn rewrite-prompt
   [{:keys [db* config metrics messenger]} params]
   (metrics/task metrics :eca/rewrite-prompt
-    (f.rewrite/prompt params db* config messenger metrics)))
+    (handle-expected-errors
+      (f.rewrite/prompt params db* config messenger metrics))))