Skip to content

fix: resolve callable API keys in auxiliary custom endpoint (#79121) #79150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RelaxJonh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve callable API keys in auxiliary custom endpoint (#79121) #79150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 1 deletion agent/auxiliary_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5949,6 +5949,11 @@ def _wrap_if_needed(client_obj, final_model_str: str, base_url_str: str = "",
custom_key = ""
if explicit_base_url:
custom_base = _to_openai_base_url(explicit_base_url).strip()
# Resolve callable API keys (short-lived credential suppliers)
# before string operations — the runtime path preserves callables
# but auxiliary resolution must invoke them first. (#79121)
if callable(explicit_api_key):
explicit_api_key = str(explicit_api_key() or "").strip()
custom_key = (
(explicit_api_key or "").strip()
or _scoped_key_env("OPENAI_API_KEY")
Expand All @@ -5969,7 +5974,10 @@ def _wrap_if_needed(client_obj, final_model_str: str, base_url_str: str = "",
# OpenRouter or a wrong API-key provider — the main agent already
# solved this, we just need to reuse its answer. (#45472)
_main_base = str(main_runtime.get("base_url") or "").strip().rstrip("/")
_main_key = str(main_runtime.get("api_key") or "").strip()
_main_raw = main_runtime.get("api_key")
if callable(_main_raw):
_main_raw = _main_raw()
_main_key = str(_main_raw or "").strip()
if _main_base and _main_key:
custom_base = _main_base
custom_key = _main_key
Expand Down
Loading