Skip to content

fix(auth): use get_env_value for base_url_env_var instead of os.getenv (#18757) #18797

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

Closed
shellybotmoyer wants to merge 1 commit into from
Closed

fix(auth): use get_env_value for base_url_env_var instead of os.getenv (#18757) #18797

Show file tree
Hide file tree
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
15 changes: 11 additions & 4 deletions hermes_cli/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3422,9 +3422,11 @@ def get_api_key_provider_status(provider_id: str) -> Dict[str, Any]:
key_source = ""
api_key, key_source = _resolve_api_key_provider_secret(provider_id, pconfig)

from hermes_cli.config import get_env_value

env_url = ""
if pconfig.base_url_env_var:
env_url = os.getenv(pconfig.base_url_env_var, "").strip()
env_url = (get_env_value(pconfig.base_url_env_var) or "").strip()

if provider_id in ("kimi-coding", "kimi-coding-cn"):
base_url = _resolve_kimi_base_url(api_key, pconfig.inference_base_url, env_url)
Expand Down Expand Up @@ -3456,7 +3458,8 @@ def get_external_process_provider_status(provider_id: str) -> Dict[str, Any]:
)
raw_args = os.getenv("HERMES_COPILOT_ACP_ARGS", "").strip()
args = shlex.split(raw_args) if raw_args else ["--acp", "--stdio"]
base_url = os.getenv(pconfig.base_url_env_var, "").strip() if pconfig.base_url_env_var else ""
from hermes_cli.config import get_env_value
base_url = (get_env_value(pconfig.base_url_env_var) or "").strip() if pconfig.base_url_env_var else ""
if not base_url:
base_url = pconfig.inference_base_url

Expand Down Expand Up @@ -3526,9 +3529,11 @@ def resolve_api_key_provider_credentials(provider_id: str) -> Dict[str, Any]:
api_key = LMSTUDIO_NOAUTH_PLACEHOLDER
key_source = key_source or "default"

from hermes_cli.config import get_env_value

env_url = ""
if pconfig.base_url_env_var:
env_url = os.getenv(pconfig.base_url_env_var, "").strip()
env_url = (get_env_value(pconfig.base_url_env_var) or "").strip()

if provider_id in ("kimi-coding", "kimi-coding-cn"):
base_url = _resolve_kimi_base_url(api_key, pconfig.inference_base_url, env_url)
Expand Down Expand Up @@ -3557,7 +3562,9 @@ def resolve_external_process_provider_credentials(provider_id: str) -> Dict[str,
code="invalid_provider",
)

base_url = os.getenv(pconfig.base_url_env_var, "").strip() if pconfig.base_url_env_var else ""
from hermes_cli.config import get_env_value

base_url = (get_env_value(pconfig.base_url_env_var) or "").strip() if pconfig.base_url_env_var else ""
if not base_url:
base_url = pconfig.inference_base_url

Expand Down
4 changes: 3 additions & 1 deletion hermes_cli/runtime_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,9 +842,11 @@ def _resolve_explicit_runtime(

pconfig = PROVIDER_REGISTRY.get(provider)
if pconfig and pconfig.auth_type == "api_key":
from hermes_cli.config import get_env_value

env_url = ""
if pconfig.base_url_env_var:
env_url = os.getenv(pconfig.base_url_env_var, "").strip().rstrip("/")
env_url = (get_env_value(pconfig.base_url_env_var) or "").strip().rstrip("/")

base_url = explicit_base_url
if not base_url:
Expand Down