Support use API keys even if subscription is logged.

Fixes #175

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Support use API keys even if subscription is logged. #175
+
 ## 0.73.4
 
 - Fix tool call approval ignoring eca tools.

src/eca/llm_api.clj

@@ -84,9 +84,8 @@
         provider-config (get-in config [:providers provider])
         model-config (get-in provider-config [:models model])
         extra-payload (:extraPayload model-config)
-        api-key (llm-util/provider-api-key provider provider-auth config)
+        [auth-type api-key] (llm-util/provider-api-key provider provider-auth config)
         api-url (llm-util/provider-api-url provider config)
-        provider-auth-type (:type provider-auth)
         callbacks (when-not sync?
                     {:on-message-received on-message-received
                      :on-error on-error
@@ -115,7 +114,7 @@
                                   extra-payload)
             :api-url api-url
             :api-key api-key
-            :auth-type provider-auth-type}
+            :auth-type auth-type}
            callbacks)
 
           (= "anthropic" provider)
@@ -132,7 +131,7 @@
             :extra-payload extra-payload
             :api-url api-url
             :api-key api-key
-            :auth-type provider-auth-type}
+            :auth-type auth-type}
            callbacks)
 
           (= "github-copilot" provider)

src/eca/llm_util.clj

@@ -95,12 +95,16 @@
      :challenge (-> verifier str->sha256 ->base64 ->base64url (string/replace "=" ""))}))
 
 (defn provider-api-key [provider provider-auth config]
-  (or (get-in config [:providers (name provider) :key])
-      (:api-key provider-auth)
-      (when-let [key-rc (get-in config [:providers (name provider) :keyRc])]
-        (secrets/get-credential key-rc))
-      (some-> (get-in config [:providers (name provider) :keyEnv])
-              config/get-env)))
+  (or (when-let [key (get-in config [:providers (name provider) :key])]
+        [:auth/token key])
+      (when-let [key (:api-key provider-auth)]
+        [:auth/oauth key])
+      (when-let [key (some-> (get-in config [:providers (name provider) :keyRc])
+                             (secrets/get-credential))]
+        [:auth/token key])
+      (when-let [key (some-> (get-in config [:providers (name provider) :keyEnv])
+                             config/get-env)]
+        [:auth/token key])))
 
 (defn provider-api-url [provider config]
   (or (get-in config [:providers (name provider) :url])

test/eca/llm_util_test.clj

@@ -69,7 +69,7 @@
                         {"openai" {:url "https://api.openai.com"
                                    :keyRc "api.openai.com"}}}
                 result (llm-util/provider-api-key "openai" nil config)]
-            (is (= "sk-test-from-netrc" result))))
+            (is (= [:auth/token "sk-test-from-netrc"] result))))
         (finally
           (.delete temp-file))))))
 
@@ -87,20 +87,20 @@
                         {"openai" {:key "sk-explicit-key"
                                    :keyRc "api.openai.com"}}}
                 result (llm-util/provider-api-key "openai" nil config)]
-            (is (= "sk-explicit-key" result)))
+            (is (= [:auth/token "sk-explicit-key"] result)))
 
           ;; Test 2: oauth token takes precedence over keyRc
           (let [config {:providers
                         {"openai" {:keyRc "api.openai.com"}}}
                 provider-auth {:api-key "sk-oauth-token"}
                 result (llm-util/provider-api-key "openai" provider-auth config)]
-            (is (= "sk-oauth-token" result)))
+            (is (= [:auth/oauth "sk-oauth-token"] result)))
 
           ;; Test 3: keyRc is used when key and oauth are not available
           (let [config {:providers
                         {"openai" {:keyRc "api.openai.com"}}}
                 result (llm-util/provider-api-key "openai" nil config)]
-            (is (= "sk-test-from-netrc" result))))
+            (is (= [:auth/token "sk-test-from-netrc"] result))))
         (finally
           (.delete temp-file))))))
 
@@ -118,13 +118,13 @@
           (let [config {:providers
                         {"anthropic" {:keyRc "[email protected]"}}}
                 result (llm-util/provider-api-key "anthropic" nil config)]
-            (is (= "sk-ant-work-key" result)))
+            (is (= [:auth/token "sk-ant-work-key"] result)))
 
           ;; Test with different login
           (let [config {:providers
                         {"anthropic" {:keyRc "[email protected]"}}}
                 result (llm-util/provider-api-key "anthropic" nil config)]
-            (is (= "sk-ant-personal-key" result))))
+            (is (= [:auth/token "sk-ant-personal-key"] result))))
         (finally
           (.delete temp-file))))))