hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

refactor(cli): fold the forced model-container notice into the force branch

Browse Source 
#131435 gate reuse finding: _guard_section_overwrite computed the
mapping/list label twice and carried a second copy of the
"Replacing entire 'model' section" notice for forced containers. Past
the refusal, a container reaching the model branch implies --force, so
one `if force:` branch prints the notice with the right noun. Output
is unchanged. The docstring now names the container refusal, and the
inline comment is cut to one line.
This commit is contained in:
kshitijk4poor
2026-10-05 14:14:40 +05:30
committed by kshitij
parent 1ceaec27c6
commit 8b2fb08dfd
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hermes_cli/config.py
View File

@@ -3528,18 +3528,16 @@ def _exit_if_key_managed(key: str, action: str) -> None:
def _guard_section_overwrite(key: str, value: Any, user_config: Dict[str, Any], force: bool) -> str:
"""Refuse (or with ``force`` allow) a single-segment key overwriting a mapping with a scalar.
Bare ``model`` is a documented shorthand — redirected to ``model.default`` so siblings survive.
Bare ``model`` is a documented shorthand — redirected to ``model.default`` so siblings survive;
a list (or a mapping over an existing section) under it is refused without ``force``.
Returns the (possibly redirected) key."""
existing = user_config.get(key)
# The bare-name shorthand takes a model id. A mapping/list literal under it is a section
# write attempt: redirecting it into model.default would store a container in the string
# slot every model reader ignores while config get echoed it back (#131435) — the same
# silent no-op shape _refuse_container_type_mismatch guards for container slots. A list
# has no reader at all, so it is refused even with no mapping section to protect.
kind = "mapping" if isinstance(value, dict) else "list"
# Containers under the model-id shorthand have no reader slot (#131435).
if key == "model" and not force and (
isinstance(value, list) or (isinstance(value, dict) and isinstance(existing, dict))):
_exit_invalid(
f"✗ Cannot set 'model' to a {'mapping' if isinstance(value, dict) else 'list'} — "
f"✗ Cannot set 'model' to a {kind} — "
"the bare 'model' shorthand takes a model id, and a container value has no "
"slot there.\n"
" Set the section's keys individually instead:\n"
@@ -3550,15 +3548,10 @@ def _guard_section_overwrite(key: str, value: Any, user_config: Dict[str, Any],
if "." in key or not isinstance(existing, dict):
return key
if key == "model":
if isinstance(value, (dict, list)):
print(
f"⚠ Replacing entire 'model' section with the given "
f"{'mapping' if isinstance(value, dict) else 'list'} "
f"(discarding {len(existing)} existing sub-key(s))")
return key
if force:
what = f"the given {kind}" if isinstance(value, (dict, list)) else "a scalar"
print(
f"⚠ Replacing entire 'model' section with a scalar "
f"⚠ Replacing entire 'model' section with {what} "
f"(discarding {len(existing)} existing sub-key(s))")
return key
print(