Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/cantrip/llm.ex
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ defmodule Cantrip.LLM do
defp env(opts, key, env_key, default \\ nil) do
case fetch_option(opts, key) do
{:ok, value} -> value
:error -> System.get_env(env_key) || default
:error -> trim_env(System.get_env(env_key)) || default
end
end

Expand All @@ -131,14 +131,20 @@ defmodule Cantrip.LLM do

defp env_first(keys) do
Enum.find_value(keys, fn key ->
case System.get_env(key) do
case trim_env(System.get_env(key)) do
nil -> nil
"" -> nil
val -> val
end
end)
end

# Env-provided secrets (especially CI-injected ones) frequently carry a
# trailing newline. An untrimmed value smuggled into an HTTP header like
# `x-api-key` is rejected as a non-printable character, so normalize here.
defp trim_env(nil), do: nil
defp trim_env(value) when is_binary(value), do: String.trim(value)

defp maybe_put(map, _key, nil), do: map
defp maybe_put(map, _key, ""), do: map
defp maybe_put(map, key, value), do: Map.put(map, key, value)
Expand Down
18 changes: 18 additions & 0 deletions test/real_llm_config_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,24 @@ defmodule Cantrip.RealLLMConfigTest do
assert state.api_key == "sk-test"
end

test "LLM.from_env trims whitespace from env-provided secrets" do
anthropic_model = System.get_env("ANTHROPIC_MODEL")
anthropic_api_key = System.get_env("ANTHROPIC_API_KEY")

on_exit(fn ->
restore_env("ANTHROPIC_MODEL", anthropic_model)
restore_env("ANTHROPIC_API_KEY", anthropic_api_key)
end)

System.put_env("CANTRIP_LLM_PROVIDER", "anthropic")
System.put_env("ANTHROPIC_MODEL", " claude-test \n")
System.put_env("ANTHROPIC_API_KEY", "sk-ant-secret\n")

assert {:ok, {_module, state}} = Cantrip.LLM.from_env()
assert state.model == "anthropic:claude-test"
assert state.api_key == "sk-ant-secret"
end

defp restore_env(key, nil), do: System.delete_env(key)

defp restore_env(key, value) do
Expand Down