From 97ff1f5ad485d7e23b6e8076cf3e2dcb11113f5f Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Wed, 2 Sep 2026 22:56:54 -0700 Subject: [PATCH] refactor(hermes_cli): _Switch.resolve_runtime; _PickerBuild norm properties --- hermes_cli/model_switch.py | 30 ++++++++++++---------------- hermes_cli/model_switch_providers.py | 12 ++++++----- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/hermes_cli/model_switch.py b/hermes_cli/model_switch.py index 08988d5380..1c69e24dfc 100644 --- a/hermes_cli/model_switch.py +++ b/hermes_cli/model_switch.py @@ -901,14 +901,6 @@ def _resolve_named_custom_model_id(model_name: str, target_provider: str, custom # --- Core model-switching pipeline -def _runtime_creds(fallback_headers: dict, **kwargs) -> tuple[str, str, str, dict]: - """``resolve_runtime_provider`` unpacked as ``(api_key, base_url, api_mode, extra_headers)``; - ``extra_headers`` falls back to *fallback_headers*.""" - from hermes_cli.runtime_provider import resolve_runtime_provider - rt = resolve_runtime_provider(**kwargs) - return rt.get("api_key", ""), rt.get("base_url", ""), rt.get("api_mode", ""), rt.get("extra_headers") or fallback_headers - - def _entry_configured_key(cfg: dict, read_env) -> str: """Inline ``api_key`` (a ``${VAR}`` template resolves via *read_env*), else ``key_env``/``api_key_env`` via *read_env*.""" @@ -1099,6 +1091,14 @@ class _Switch: def provider_changed(self) -> bool: return self.target_provider != self.current_provider + def resolve_runtime(self, **kwargs) -> None: + """Fill api_key / base_url / api_mode / validation_headers from ``resolve_runtime_provider`` + for ``new_model``; headers keep their current value when the resolver returns none.""" + from hermes_cli.runtime_provider import resolve_runtime_provider + rt = resolve_runtime_provider(target_model=self.new_model, **kwargs) + self.api_key, self.base_url, self.api_mode = rt.get("api_key", ""), rt.get("base_url", ""), rt.get("api_mode", "") + self.validation_headers = rt.get("extra_headers") or self.validation_headers + def _route_explicit_provider(st: _Switch) -> Optional[ModelSwitchResult]: """PATH A (``--provider`` given): resolve the provider, auto-detect a model from a local @@ -1293,11 +1293,9 @@ def _creds_for_switched_provider(st: _Switch) -> Optional[ModelSwitchResult]: ukey = _entry_configured_key(ucfg, _scoped_key_env) st.validation_headers = _extra_headers_from_config(ucfg) try: - api_key, base_url, st.api_mode, st.validation_headers = _runtime_creds( - st.validation_headers, requested=st.target_provider, explicit_api_key=ukey or None, - explicit_base_url=user_pdef.base_url, target_model=st.new_model) - st.api_key = api_key or ukey - st.base_url = base_url or user_pdef.base_url + st.resolve_runtime( + requested=st.target_provider, explicit_api_key=ukey or None, explicit_base_url=user_pdef.base_url) + st.api_key, st.base_url = st.api_key or ukey, st.base_url or user_pdef.base_url except Exception: st.api_key, st.base_url, st.api_mode = ukey, user_pdef.base_url, "" elif st.target_provider == "custom" and st.current_base_url: @@ -1305,8 +1303,7 @@ def _creds_for_switched_provider(st: _Switch) -> Optional[ModelSwitchResult]: st.api_mode = determine_api_mode(st.target_provider, st.base_url) else: try: - st.api_key, st.base_url, st.api_mode, st.validation_headers = _runtime_creds( - st.validation_headers, requested=st.target_provider, target_model=st.new_model) + st.resolve_runtime(requested=st.target_provider) except Exception as e: return st.fail_on_target(f"Could not resolve credentials for provider '{st.provider_label}': {e}") return None @@ -1340,8 +1337,7 @@ def _creds_for_current_provider(st: _Switch) -> None: st.validation_headers = ollama_headers else: try: - st.api_key, st.base_url, st.api_mode, st.validation_headers = _runtime_creds( - st.validation_headers, requested=st.current_provider, target_model=st.new_model) + st.resolve_runtime(requested=st.current_provider) except Exception: pass diff --git a/hermes_cli/model_switch_providers.py b/hermes_cli/model_switch_providers.py index 5a40877eff..9acbf726f2 100644 --- a/hermes_cli/model_switch_providers.py +++ b/hermes_cli/model_switch_providers.py @@ -602,12 +602,14 @@ class _PickerBuild: builtin_endpoints: set = field(default_factory=set) # (display_name, base_url) pairs from section 3 so section 4 skips overlapping rows. section3_pairs: set = field(default_factory=set) - current_provider_norm: str = field(init=False) - current_base_url_norm: str = field(init=False) - def __post_init__(self): - self.current_provider_norm = self.current_provider.lower() - self.current_base_url_norm = self.current_base_url.rstrip("/").lower() + @property + def current_provider_norm(self) -> str: + return self.current_provider.lower() + + @property + def current_base_url_norm(self) -> str: + return self.current_base_url.rstrip("/").lower() def can_probe_custom(self, *, row_is_current: bool) -> bool: return bool(self.probe_custom_providers or (self.probe_current_custom_provider and row_is_current))