Deprecate :urlEnv in favor of :url

Author: ericdallo

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Support default env values in `${env:MY_ENV:default-value}`.
 - Deprecate configs: 
   - `systemPromptFile` in favor of `systemPrompt` using `${file:...}` or `${classpath:...}`
+  - `urlEnv` in favor of `url` using `${env:...}`
 
 ## 0.83.0
 

docs/models.md

@@ -64,8 +64,7 @@ Schema:
 | Option                        | Type   | Description                                                                                                  | Required |
 |-------------------------------|--------|--------------------------------------------------------------------------------------------------------------|----------|
 | `api`                         | string | The API schema to use (`"openai-responses"`, `"openai-chat"`, or `"anthropic"`)                              | Yes      |
-| `urlEnv`                      | string | Environment variable name containing the API URL                                                             | No*      |
-| `url`                         | string | Direct API URL (use instead of `urlEnv`)                                                                     | No*      |
+| `url`                         | string | API URL (with support for env like `${env:MY_URL}`)                                                          | No*      |
 | `keyEnv`                      | string | Environment variable name containing the API key                                                             | No*      |
 | `keyRc`                       | string | Lookup specification to read the API key from Unix RC [credential files](#credential-file-authentication)    | No*      |
 | `key`                         | string | Direct API key (use instead of `keyEnv`)                                                                     | No*      |

src/eca/config.clj

@@ -40,7 +40,7 @@
 
 (def ^:private initial-config*
   {:providers {"openai" {:api "openai-responses"
-                         :url "https://api.openai.com"
+                         :url "${env:OPENAI_API_URL:https://api.openai.com}"
                          :key nil
                          :keyEnv "OPENAI_API_KEY"
                          :requiresAuth? true
@@ -53,7 +53,7 @@
                                   "o4-mini" {}
                                   "o3" {}}}
                "anthropic" {:api "anthropic"
-                            :url "https://api.anthropic.com"
+                            :url "${env:ANTHROPIC_API_URL:https://api.anthropic.com}"
                             :key nil
                             :keyEnv "ANTHROPIC_API_KEY"
                             :requiresAuth? true
@@ -62,7 +62,7 @@
                                      "claude-opus-4.1" {:modelName "claude-opus-4-1-20250805"}
                                      "claude-haiku-4.5" {:modelName "claude-haiku-4-5-20251001"}}}
                "github-copilot" {:api "openai-chat"
-                                 :url "https://api.githubcopilot.com"
+                                 :url "${env:GITHUB_COPILOT_API_URL:https://api.githubcopilot.com}"
                                  :key nil ;; not supported, requires login auth
                                  :keyEnv nil ;; not supported, requires login auth
                                  :requiresAuth? true
@@ -78,7 +78,7 @@
                                           "grok-code-fast-1" {}
                                           "gemini-2.5-pro" {}}}
                "google" {:api "openai-chat"
-                         :url "https://generativelanguage.googleapis.com/v1beta/openai"
+                         :url "${env:GOOGLE_API_URL:https://generativelanguage.googleapis.com/v1beta/openai}"
                          :key nil
                          :keyEnv "GOOGLE_API_KEY"
                          :requiresAuth? true

src/eca/llm_util.clj

@@ -5,7 +5,8 @@
    [eca.config :as config]
    [eca.logger :as logger]
    [eca.secrets :as secrets]
-   [eca.shared :as shared])
+   [eca.shared :as shared]
+   [camel-snake-kebab.core :as csk])
   (:import
    [java.io BufferedReader]
    [java.nio.charset StandardCharsets]
@@ -112,4 +113,6 @@
 
 (defn provider-api-url [provider config]
   (or (get-in config [:providers (name provider) :url])
-      (some-> (get-in config [:providers (name provider) :urlEnv]) config/get-env)))
+      (config/get-env (str (csk/->SCREAMING_SNAKE_CASE (name provider)) "_API_URL"))
+      (some-> (get-in config [:providers (name provider) :urlEnv]) config/get-env) ;; legacy
+      ))