fix(moa): preserve facade across client rebuilds
This commit is contained in:
+22
-2
@@ -5011,14 +5011,34 @@ class AIAgent:
|
||||
exc,
|
||||
)
|
||||
|
||||
def _build_primary_client_for_active_provider(self, *, reason: str) -> Any:
|
||||
"""Build the shared client shape required by the active provider.
|
||||
|
||||
MoA is a virtual provider whose ``client`` is an in-process facade,
|
||||
not an OpenAI SDK client. Generic rebuild paths (credential rotation,
|
||||
timeout application, and dead-connection cleanup) still pass through
|
||||
this helper, so they must preserve that provider/client invariant.
|
||||
"""
|
||||
if (getattr(self, "provider", "") or "").strip().lower() == "moa":
|
||||
from agent.moa_loop import build_moa_facade
|
||||
|
||||
return build_moa_facade(self, self.model)
|
||||
return self._create_openai_client(
|
||||
self._client_kwargs,
|
||||
reason=reason,
|
||||
shared=True,
|
||||
)
|
||||
|
||||
def _replace_primary_openai_client(self, *, reason: str) -> bool:
|
||||
with self._openai_client_lock():
|
||||
old_client = getattr(self, "client", None)
|
||||
try:
|
||||
new_client = self._create_openai_client(self._client_kwargs, reason=reason, shared=True)
|
||||
new_client = self._build_primary_client_for_active_provider(
|
||||
reason=reason,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning(
|
||||
"Failed to rebuild shared OpenAI client (%s) %s error=%s",
|
||||
"Failed to rebuild shared primary client (%s) %s error=%s",
|
||||
reason,
|
||||
self._client_log_context(),
|
||||
exc,
|
||||
|
||||
@@ -215,6 +215,93 @@ moa:
|
||||
assert ref_event[2] == {"moa_index": 0, "moa_count": 1}
|
||||
|
||||
|
||||
def test_moa_generic_client_rebuild_preserves_virtual_facade(monkeypatch, tmp_path):
|
||||
"""Generic client replacement must not install a native OpenAI client.
|
||||
|
||||
Credential rotation and timeout/dead-connection recovery call the shared
|
||||
replacement helper. If it rebuilds from stale fallback ``_client_kwargs``,
|
||||
the next prepared MoA request leaks its private kwarg into the OpenAI SDK.
|
||||
"""
|
||||
from agent.chat_completion_helpers import _dispatch_nonstreaming_api_request
|
||||
from agent.moa_loop import MoAClient
|
||||
|
||||
home = tmp_path / ".hermes"
|
||||
home.mkdir()
|
||||
(home / "config.yaml").write_text(
|
||||
"""
|
||||
moa:
|
||||
default_preset: review
|
||||
presets:
|
||||
review:
|
||||
reference_models:
|
||||
- provider: openai-codex
|
||||
model: gpt-5.5
|
||||
aggregator:
|
||||
provider: openrouter
|
||||
model: anthropic/claude-opus-4.8
|
||||
""".strip(),
|
||||
encoding="utf-8",
|
||||
)
|
||||
monkeypatch.setenv("HERMES_HOME", str(home))
|
||||
|
||||
agent = AIAgent(
|
||||
api_key="moa-virtual-provider",
|
||||
base_url="moa://local",
|
||||
model="review",
|
||||
provider="moa",
|
||||
quiet_mode=True,
|
||||
skip_context_files=True,
|
||||
skip_memory=True,
|
||||
enabled_toolsets=["file"],
|
||||
max_iterations=1,
|
||||
)
|
||||
original_client = agent.client
|
||||
agent._client_kwargs = {
|
||||
"api_key": "stale-fallback-key",
|
||||
"base_url": "https://relay.example/v1",
|
||||
}
|
||||
monkeypatch.setattr(
|
||||
agent,
|
||||
"_create_openai_client",
|
||||
lambda *_args, **_kwargs: (_ for _ in ()).throw(
|
||||
AssertionError("MoA replacement must rebuild its facade")
|
||||
),
|
||||
)
|
||||
|
||||
assert agent._replace_primary_openai_client(reason="credential_rotation") is True
|
||||
assert isinstance(agent.client, MoAClient)
|
||||
assert agent.client is not original_client
|
||||
|
||||
captured = {}
|
||||
|
||||
def accept_prepared(prepared, api_kwargs):
|
||||
captured["prepared"] = prepared
|
||||
captured["api_kwargs"] = api_kwargs
|
||||
return "aggregated"
|
||||
|
||||
monkeypatch.setattr(
|
||||
agent.client.chat.completions,
|
||||
"_call_prepared_aggregator",
|
||||
accept_prepared,
|
||||
)
|
||||
prepared = {"messages": [], "guidance": "advice"}
|
||||
result = _dispatch_nonstreaming_api_request(
|
||||
agent,
|
||||
{
|
||||
"model": "review",
|
||||
"messages": [],
|
||||
"_moa_prepared_request": prepared,
|
||||
},
|
||||
make_client=lambda *_args, **_kwargs: pytest.fail(
|
||||
"MoA dispatch must not build a request-local OpenAI client"
|
||||
),
|
||||
)
|
||||
|
||||
assert result == "aggregated"
|
||||
assert captured["prepared"] is prepared
|
||||
assert "_moa_prepared_request" not in captured["api_kwargs"]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user