Support openai login via /login

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Support more providers login via `/login`.
+  - openai
+
 ## 0.46.0
 
 - Remove the need to pass `requestId` on prompt messages.

src/eca/config.clj

@@ -109,8 +109,11 @@
                             (io/file (get-property "user.home") ".config"))]
     (io/file xdg-config-home "eca")))
 
+(defn global-config-file ^File []
+  (io/file (global-config-dir) "config.json"))
+
 (defn ^:private config-from-global-file* []
-  (let [config-file (io/file (global-config-dir) "config.json")]
+  (let [config-file (global-config-file)]
     (when (.exists config-file)
       (safe-read-json-string (slurp config-file) (var *global-config-error*)))))
 
@@ -190,25 +193,28 @@
                           :else m*))]
     (normalize-map [] m)))
 
+(def ^:private eca-config-normalization-rules
+  {:kebab-case
+   [[:providers]]
+   :stringfy
+   [[:providers]
+    [:providers :ANY :models]
+    [:toolCall :approval :allow]
+    [:toolCall :approval :allow :ANY :argsMatchers]
+    [:toolCall :approval :ask]
+    [:toolCall :approval :ask :ANY :argsMatchers]
+    [:toolCall :approval :deny]
+    [:toolCall :approval :deny :ANY :argsMatchers]
+    [:customTools]
+    [:customTools :ANY :schema :properties]
+    [:mcpServers]]})
+
 (defn all [db]
   (let [initialization-config @initialization-config*
         pure-config? (:pureConfig initialization-config)]
     (deep-merge initial-config
                 (normalize-fields
-                 {:kebab-case
-                  [[:providers]]
-                  :stringfy
-                  [[:providers]
-                   [:providers :ANY :models]
-                   [:toolCall :approval :allow]
-                   [:toolCall :approval :allow :ANY :argsMatchers]
-                   [:toolCall :approval :ask]
-                   [:toolCall :approval :ask :ANY :argsMatchers]
-                   [:toolCall :approval :deny]
-                   [:toolCall :approval :deny :ANY :argsMatchers]
-                   [:customTools]
-                   [:customTools :ANY :schema :properties]
-                   [:mcpServers]]}
+                 eca-config-normalization-rules
                  (deep-merge initialization-config
                              (when-not pure-config? (config-from-envvar))
                              (when-not pure-config? (config-from-global-file))
@@ -285,3 +291,12 @@
     (when (seq config-to-notify)
       (swap! db* update :last-config-notified shared/deep-merge config-to-notify)
       (messenger/config-updated messenger config-to-notify))))
+
+(defn update-global-config! [config]
+  (let [global-config-file (global-config-file)
+        current-config (normalize-fields eca-config-normalization-rules (config-from-global-file))
+        new-config (deep-merge current-config
+                               (normalize-fields eca-config-normalization-rules config))
+        new-config-json (json/generate-string new-config {:pretty true})]
+    (io/make-parents global-config-file)
+    (spit global-config-file new-config-json)))

src/eca/db.clj

@@ -31,7 +31,8 @@
    ;; cacheable, bump cache when changing
    :chats {}
    :auth {"anthropic" {}
-          "github-copilot" {}}})
+          "github-copilot" {}
+          "openai" {}}})
 
 (defonce db* (atom initial-db))
 

src/eca/features/login.clj

@@ -1,6 +1,7 @@
 (ns eca.features.login
   (:require
    [clojure.string :as string]
+   [eca.config :as config]
    [eca.db :as db]
    [eca.messenger :as messenger]
    [eca.models :as models]))
@@ -73,10 +74,10 @@
     (catch Exception e
       (on-error (.getMessage e)))))
 
-(defn login-done! [{:keys [chat-id db* config messenger provider send-msg!]} & [silent]]
+(defn login-done! [{:keys [chat-id db* messenger provider send-msg!]} & [silent]]
   (db/update-global-cache! @db*)
   (models/sync-models! db*
-                       config
+                       (config/all @db*) ;; force get updated config
                        (fn [new-models]
                          (messenger/config-updated
                           messenger

src/eca/llm_providers/openai.clj

@@ -3,6 +3,8 @@
    [cheshire.core :as json]
    [clojure.java.io :as io]
    [clojure.string :as string]
+   [eca.config :as config]
+   [eca.features.login :as f.login]
    [eca.llm-util :as llm-util]
    [eca.logger :as logger]
    [hato.client :as http]))
@@ -194,3 +196,18 @@
       :api-key api-key
       :on-error on-error
       :on-response on-response-fn})))
+
+(defmethod f.login/login-step ["openai" :login/start] [{:keys [db* chat-id provider send-msg!]}]
+  (swap! db* assoc-in [:chats chat-id :login-provider] provider)
+  (swap! db* assoc-in [:auth provider] {:step :login/waiting-api-key})
+  (send-msg! "Paste your API Key"))
+
+(defmethod f.login/login-step ["openai" :login/waiting-api-key] [{:keys [input db* provider send-msg!] :as ctx}]
+  (if (string/starts-with? input "sk-")
+    (do (swap! db* assoc-in [:auth provider] {:step :login/done
+                                              :type :auth/token
+                                              :api-key input})
+        (config/update-global-config! {:providers {"openai" {:key input}}})
+        (send-msg! (str "API key saved in " (.getCanonicalPath (config/global-config-file))))
+        (f.login/login-done! ctx))
+    (send-msg! (format "Invalid API key '%s'" input))))