Fix regression: completion broken after rewrite feature API changes.

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix regression: completion broken after rewrite feature API changes.
+
 ## 0.78.0
 
 - Prefix tool name with server to LLM: <server>__<toolname>. #196

src/eca/features/completion.clj

@@ -60,20 +60,23 @@
         {:keys [line character]} position
         input-code (insert-completion-tag doc-text position)
         instructions (f.prompt/inline-completion-prompt config)
-        {:keys [error result]} (deref (future
-                                        (llm-api/sync-prompt!
-                                         {:provider provider
-                                          :model model
-                                          :config config
-                                          :prompt input-code
-                                          :instructions instructions
-                                          :provider-auth provider-auth
-                                          :model-capabilities (assoc model-capabilities
-                                                                     :reason? false
-                                                                     :tools false
-                                                                     :web-search false)}))
-                                      30000 ;; TODO move to config
-                                      {:error {:message "Timeout waiting for completion"}})]
+        {:keys [error output-text]} (deref (future
+                                             (try
+                                               (llm-api/sync-prompt!
+                                                {:provider provider
+                                                 :model model
+                                                 :config config
+                                                 :prompt input-code
+                                                 :instructions instructions
+                                                 :provider-auth provider-auth
+                                                 :model-capabilities (assoc model-capabilities
+                                                                            :reason? false
+                                                                            :tools false
+                                                                            :web-search false)})
+                                               (catch Exception e
+                                                 {:error {:exception e}})))
+                                           30000 ;; TODO move to config
+                                           {:error {:message "Timeout waiting for completion"}})]
     (cond
       (:message error)
       {:error {:type :warning
@@ -85,12 +88,12 @@
         {:error {:type :warning
                  :message (:message (.getMessage ^Exception (:exception error)))}})
 
-      (not result)
+      (not output-text)
       {:error {:type :info
                :message "No suggestions found"}}
 
       :else
-      {:items [{:text (normalize-code-result result)
+      {:items [{:text (normalize-code-result output-text)
                 :doc-version doc-version
                 :range {:start {:line line :character character}
                         :end {:line line :character character}}}]})))

src/eca/llm_providers/openai.clj

@@ -26,17 +26,22 @@
                         json/parse-string)]
     (get-in payload ["https://api.openai.com/auth" "chatgpt_account_id"])))
 
+(defn ^:private response-body->result [body]
+  {:output-text (reduce
+                 #(str %1 (:text %2))
+                 ""
+                 (:content (last (:output body))))})
+
 (defn ^:private base-responses-request! [{:keys [rid body api-url auth-type url-relative-path api-key on-error on-stream]}]
   (let [oauth? (= :auth/oauth auth-type)
         url (if oauth?
               codex-url
               (str api-url (or url-relative-path responses-path)))
-        response* (atom nil)
         on-error (if on-stream
                    on-error
                    (fn [error-data]
                      (llm-util/log-response logger-tag rid "response-error" body)
-                     (reset! response* {:error error-data})))]
+                     {:error error-data}))]
     (llm-util/log-request logger-tag rid url body)
     @(http/post
       url
@@ -64,16 +69,11 @@
                   (on-stream event data)))
               (do
                 (llm-util/log-response logger-tag rid "response" body)
-                (reset! response*
-                        {:output-text (reduce
-                                       #(str %1 (:text %2))
-                                       ""
-                                       (:content (last (:output body))))}))))
+                (response-body->result body))))
           (catch Exception e
             (on-error {:exception e}))))
       (fn [e]
-        (on-error {:exception e})))
-    @response*))
+        (on-error {:exception e})))))
 
 (defn ^:private normalize-messages [messages supports-image?]
   (keep (fn [{:keys [role content] :as msg}]