Improve login support

Author: ericdallo

src/eca/features/commands.clj

@@ -148,7 +148,7 @@
               :clear-history-after-finished? true
               :prompt (f.prompt/build-init-prompt db)}
       "login" (let [[msg error?] (if-let [provider (first args)]
-                                   (let [{:keys [message error]} (f.login/start-login chat-id provider db*)]
+                                   (let [{:keys [message error]} (f.login/start chat-id provider db*)]
                                      (if error
                                        [error true]
                                        [message]))

src/eca/features/login.clj

@@ -2,87 +2,57 @@
   (:require
    [clojure.string :as string]
    [eca.db :as db]
-   [eca.llm-providers.anthropic :as llm-providers.anthropic]
-   [eca.llm-providers.copilot :as llm-providers.copilot]
    [eca.messenger :as messenger]))
 
-(defn start-login [chat-id provider db*]
-  (case provider
-    "anthropic"
-    (let [{:keys [verifier url]} (llm-providers.anthropic/oauth-url :console)]
-      (swap! db* assoc-in [:chats chat-id :login-provider] provider)
-      (swap! db* assoc-in [:auth provider] {:step :login/waiting-provider-code
-                                            :verifier verifier})
-      {:message (format "Open your browser at `%s` and authenticate at Anthropic.\nThen paste the code generated in the chat and send it to continue the authentication."
-                        url)})
-    "github-copilot"
-    (let [{:keys [user-code device-code url]} (llm-providers.copilot/oauth-url)]
-      (swap! db* assoc-in [:chats chat-id :login-provider] provider)
-      (swap! db* assoc-in [:auth provider] {:step :login/waiting-user-confirmation
-                                            :device-code device-code})
-      {:message (format "Open your browser at `%s` and authenticate using the code: `%s`\nThen type anything in the chat and send it to continue the authentication."
-                        url
-                        user-code)})
-    {:message "Unknown provider-id"}))
+(defmulti login-step (fn [ctx] [(:provider ctx) (:step ctx)]))
+
+(defmethod login-step :default [_] "Unkown provider-id")
+
+(defn start [chat-id provider db*]
+  (let [result (login-step {:chat-id chat-id
+                            :step :login/start
+                            :provider provider
+                            :db* db*})]
+    result))
 
 (defn continue [{:keys [message chat-id request-id]} db* messenger]
   (let [provider (get-in @db* [:chats chat-id :login-provider])
-        step (get-in @db* [:auth provider :step])]
-    (case step
-      :login/waiting-provider-code
-      (case provider
-        "anthropic" (let [provider-code (string/trim message)
-                          {:keys [access-token refresh-token expires-at]} (llm-providers.anthropic/oauth-credentials provider-code (get-in @db* [:auth provider :verifier]))
-                          api-key (llm-providers.anthropic/create-api-key access-token)]
-                      (swap! db* update-in [:auth provider] merge {:step :login/done
-                                                                   :access-token access-token
-                                                                   :refresh-token refresh-token
-                                                                   :api-token api-key
-                                                                   :expires-at expires-at})
-                      (swap! db* update-in [:chats chat-id :status] :idle)
-                      (messenger/chat-content-received
-                       messenger
-                       {:chat-id chat-id
-                        :request-id request-id
-                        :role "system"
-                        :content {:type :text
-                                  :text "Login successful! You can now use the 'anthropic' models."}})
-                      (messenger/chat-content-received
-                       messenger
-                       {:chat-id chat-id
-                        :request-id request-id
-                        :role "system"
-                        :content {:type :progress
-                                  :state :finished}})))
-      :login/waiting-user-confirmation
-      (case provider
-        "github-copilot" (let [access-token (llm-providers.copilot/oauth-access-token (get-in @db* [:auth provider :device-code]))
-                               {:keys [api-token expires-at]} (llm-providers.copilot/oauth-renew-token access-token)]
-                           (swap! db* update-in [:auth provider] merge {:step :login/done
-                                                                        :access-token access-token
-                                                                        :api-token api-token
-                                                                        :expires-at expires-at})
-                           (swap! db* update-in [:chats chat-id :status] :idle)
-                           (messenger/chat-content-received
-                            messenger
-                            {:chat-id chat-id
-                             :request-id request-id
-                             :role "system"
-                             :content {:type :text
-                                       :text "Login successful! You can now use the 'github-copilot' models."}})
-                           (messenger/chat-content-received
-                            messenger
-                            {:chat-id chat-id
-                             :request-id request-id
-                             :role "system"
-                             :content {:type :progress
-                                       :state :finished}}))))
-    (db/update-global-cache! @db*)))
+        step (get-in @db* [:auth provider :step])
+        input (string/trim message)
+        ctx {:chat-id chat-id
+             :step step
+             :input input
+             :db* db*
+             :provider provider
+             :send-msg! (fn [msg]
+                          (messenger/chat-content-received
+                           messenger
+                           {:chat-id chat-id
+                            :request-id request-id
+                            :role "system"
+                            :content {:type :text
+                                      :text msg}})
+                          (messenger/chat-content-received
+                           messenger
+                           {:chat-id chat-id
+                            :request-id request-id
+                            :role "system"
+                            :content {:type :progress
+                                      :state :finished}}))}]
+    (messenger/chat-content-received
+     messenger
+     {:chat-id chat-id
+      :request-id request-id
+      :role "user"
+      :content {:type :text
+                :text (str input "\n")}})
+    (login-step ctx)
+    (db/update-global-cache! @db*)
+    {:chat-id chat-id
+     :status step}))
 
 (defn renew-auth! [provider db*]
-  (case provider
-    "github-copilot"
-    (let [access-token (get-in @db* [:auth provider :access-token])
-          {:keys [api-token expires-at]} (llm-providers.copilot/oauth-renew-token access-token)]
-      (swap! db* update-in [:auth provider] merge {:api-token api-token
-                                                   :expires-at expires-at}))))
+  (login-step
+   {:provider provider
+    :step :login/renew-token
+    :db* db*}))

src/eca/llm_api.clj

@@ -33,7 +33,7 @@
 
 (defn ^:private provider-api-key [provider provider-auth config]
   (or (get-in config [:providers (name provider) :key])
-      (:api-token provider-auth)
+      (:api-key provider-auth)
       (some-> (get-in config [:providers (name provider) :keyEnv]) config/get-env)))
 
 (defn ^:private provider-api-url [provider config]
@@ -110,6 +110,7 @@
         extra-payload (:extraPayload model-config)
         provider-api-key (provider-api-key provider provider-auth config)
         provider-api-url (provider-api-url provider config)
+        provider-auth-type (:type provider-auth)
         callbacks {:on-message-received on-message-received-wrapper
                    :on-error on-error-wrapper
                    :on-prepare-tool-call on-prepare-tool-call-wrapper
@@ -120,64 +121,65 @@
       (cond
         (= "openai" provider)
         (llm-providers.openai/completion!
-          {:model model
-           :instructions instructions
-           :user-messages user-messages
-           :max-output-tokens max-output-tokens
-           :reason? reason?
-           :past-messages past-messages
-           :tools tools
-           :web-search web-search
-           :extra-payload extra-payload
-           :api-url provider-api-url
-           :api-key provider-api-key}
-          callbacks)
+         {:model model
+          :instructions instructions
+          :user-messages user-messages
+          :max-output-tokens max-output-tokens
+          :reason? reason?
+          :past-messages past-messages
+          :tools tools
+          :web-search web-search
+          :extra-payload extra-payload
+          :api-url provider-api-url
+          :api-key provider-api-key}
+         callbacks)
 
         (= "anthropic" provider)
         (llm-providers.anthropic/completion!
-          {:model model
-           :instructions instructions
-           :user-messages user-messages
-           :max-output-tokens max-output-tokens
-           :reason? reason?
-           :past-messages past-messages
-           :tools tools
-           :web-search web-search
-           :extra-payload extra-payload
-           :api-url provider-api-url
-           :api-key provider-api-key}
-          callbacks)
+         {:model model
+          :instructions instructions
+          :user-messages user-messages
+          :max-output-tokens max-output-tokens
+          :reason? reason?
+          :past-messages past-messages
+          :tools tools
+          :web-search web-search
+          :extra-payload extra-payload
+          :api-url provider-api-url
+          :api-key provider-api-key
+          :auth-type provider-auth-type}
+         callbacks)
 
         (= "github-copilot" provider)
         (llm-providers.openai-chat/completion!
-          {:model model
-           :instructions instructions
-           :user-messages user-messages
-           :max-output-tokens max-output-tokens
-           :reason? reason?
-           :past-messages past-messages
-           :tools tools
-           :extra-payload extra-payload
-           :api-url provider-api-url
-           :api-key provider-api-key
-           :extra-headers {"openai-intent" "conversation-panel"
-                           "x-request-id" (str (random-uuid))
-                           "vscode-sessionid" ""
-                           "vscode-machineid" ""
-                           "copilot-integration-id" "vscode-chat"}}
-          callbacks)
+         {:model model
+          :instructions instructions
+          :user-messages user-messages
+          :max-output-tokens max-output-tokens
+          :reason? reason?
+          :past-messages past-messages
+          :tools tools
+          :extra-payload extra-payload
+          :api-url provider-api-url
+          :api-key provider-api-key
+          :extra-headers {"openai-intent" "conversation-panel"
+                          "x-request-id" (str (random-uuid))
+                          "vscode-sessionid" ""
+                          "vscode-machineid" ""
+                          "copilot-integration-id" "vscode-chat"}}
+         callbacks)
 
         (= "ollama" provider)
         (llm-providers.ollama/completion!
-          {:api-url provider-api-url
-           :reason? (:reason? model-capabilities)
-           :model model
-           :instructions instructions
-           :user-messages user-messages
-           :past-messages past-messages
-           :tools tools
-           :extra-payload extra-payload}
-          callbacks)
+         {:api-url provider-api-url
+          :reason? (:reason? model-capabilities)
+          :model model
+          :instructions instructions
+          :user-messages user-messages
+          :past-messages past-messages
+          :tools tools
+          :extra-payload extra-payload}
+         callbacks)
 
         model-config
         (let [provider-fn (case (:api provider-config)
@@ -188,18 +190,18 @@
                             (on-error-wrapper {:message (format "Unknown model %s for provider %s" (:api provider-config) provider)}))
               url-relative-path (:completionUrlRelativePath provider-config)]
           (provider-fn
-            {:model model
-             :instructions instructions
-             :user-messages user-messages
-             :max-output-tokens max-output-tokens
-             :reason? reason?
-             :past-messages past-messages
-             :tools tools
-             :extra-payload extra-payload
-             :url-relative-path url-relative-path
-             :api-url provider-api-url
-             :api-key provider-api-key}
-            callbacks))
+           {:model model
+            :instructions instructions
+            :user-messages user-messages
+            :max-output-tokens max-output-tokens
+            :reason? reason?
+            :past-messages past-messages
+            :tools tools
+            :extra-payload extra-payload
+            :url-relative-path url-relative-path
+            :api-url provider-api-url
+            :api-key provider-api-key}
+           callbacks))
 
         :else
         (on-error-wrapper {:message (format "ECA Unsupported model %s for provider %s" model provider)}))