2026-04-24 05:02:58 -07:00
|
|
|
"""Regression guard for #14782: json.JSONDecodeError must not be classified
|
|
|
|
|
as a local validation error by the main agent loop.
|
|
|
|
|
|
|
|
|
|
`json.JSONDecodeError` inherits from `ValueError`. The agent loop's
|
|
|
|
|
non-retryable classifier at run_agent.py treats `ValueError` / `TypeError`
|
|
|
|
|
as local programming bugs and skips retry. Without an explicit carve-out,
|
|
|
|
|
a transient provider hiccup (malformed response body, truncated stream,
|
|
|
|
|
routing-layer corruption) that surfaces as a JSONDecodeError would bypass
|
|
|
|
|
the retry path and fail the turn immediately.
|
|
|
|
|
|
|
|
|
|
This test mirrors the exact predicate shape used in run_agent.py so that
|
|
|
|
|
any future refactor of that predicate must preserve the invariant:
|
|
|
|
|
|
|
|
|
|
JSONDecodeError → NOT local validation error (retryable)
|
|
|
|
|
UnicodeEncodeError → NOT local validation error (surrogate path)
|
|
|
|
|
bare ValueError → IS local validation error (programming bug)
|
|
|
|
|
bare TypeError → IS local validation error (programming bug)
|
|
|
|
|
"""
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
import json
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _mirror_agent_predicate(err: BaseException) -> bool:
|
|
|
|
|
"""Exact shape of run_agent.py's is_local_validation_error check.
|
|
|
|
|
|
|
|
|
|
Kept in lock-step with the source. If you change one, change both —
|
|
|
|
|
or, better, refactor the check into a shared helper and have both
|
|
|
|
|
sites import it.
|
|
|
|
|
"""
|
2026-05-27 11:20:41 -07:00
|
|
|
import ssl
|
|
|
|
|
|
2026-04-24 05:02:58 -07:00
|
|
|
return (
|
|
|
|
|
isinstance(err, (ValueError, TypeError))
|
|
|
|
|
and not isinstance(err, (UnicodeEncodeError, json.JSONDecodeError))
|
2026-05-27 11:20:41 -07:00
|
|
|
and not isinstance(err, ssl.SSLError)
|
|
|
|
|
# NoneType-is-not-iterable shape errors come from upstream SDK /
|
|
|
|
|
# provider response mismatches, not local programming bugs. See
|
|
|
|
|
# the agent/conversation_loop.py inline comment for #33136.
|
|
|
|
|
and not (
|
|
|
|
|
isinstance(err, TypeError)
|
|
|
|
|
and "nonetype" in str(err).lower()
|
|
|
|
|
and "not iterable" in str(err).lower()
|
|
|
|
|
)
|
2026-04-24 05:02:58 -07:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestJSONDecodeErrorIsRetryable:
|
|
|
|
|
|
|
|
|
|
def test_json_decode_error_is_not_local_validation(self):
|
|
|
|
|
"""Provider returning malformed JSON surfaces as JSONDecodeError —
|
|
|
|
|
must be treated as transient so the retry path runs."""
|
|
|
|
|
try:
|
|
|
|
|
json.loads("{not valid json")
|
|
|
|
|
except json.JSONDecodeError as exc:
|
|
|
|
|
assert not _mirror_agent_predicate(exc), (
|
|
|
|
|
"json.JSONDecodeError must be excluded from the "
|
|
|
|
|
"ValueError/TypeError local-validation classification."
|
|
|
|
|
)
|
|
|
|
|
else:
|
|
|
|
|
raise AssertionError("json.loads should have raised")
|
|
|
|
|
|
|
|
|
|
def test_unicode_encode_error_is_not_local_validation(self):
|
|
|
|
|
"""Existing carve-out — surrogate sanitization handles this separately."""
|
|
|
|
|
try:
|
|
|
|
|
"\ud800".encode("utf-8")
|
|
|
|
|
except UnicodeEncodeError as exc:
|
|
|
|
|
assert not _mirror_agent_predicate(exc)
|
|
|
|
|
else:
|
|
|
|
|
raise AssertionError("encoding lone surrogate should raise")
|
|
|
|
|
|
|
|
|
|
def test_bare_value_error_is_local_validation(self):
|
|
|
|
|
"""Programming bugs that raise bare ValueError must still be
|
|
|
|
|
classified as local validation errors (non-retryable)."""
|
|
|
|
|
assert _mirror_agent_predicate(ValueError("bad arg"))
|
|
|
|
|
|
|
|
|
|
def test_bare_type_error_is_local_validation(self):
|
|
|
|
|
assert _mirror_agent_predicate(TypeError("wrong type"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestAgentLoopSourceStillHasCarveOut:
|
|
|
|
|
"""Belt-and-suspenders: the production source must actually include
|
|
|
|
|
the json.JSONDecodeError carve-out. Protects against an accidental
|
|
|
|
|
revert that happens to leave the test file intact."""
|
|
|
|
|
|
|
|
|
|
def test_run_agent_excludes_jsondecodeerror_from_local_validation(self):
|
|
|
|
|
import inspect
|
refactor(run_agent): extract run_conversation to agent/conversation_loop.py
The 3,877-line run_conversation body — the agent loop itself — moves out
of run_agent.py into a dedicated module. AIAgent.run_conversation is
now a thin forwarder that delegates to agent.conversation_loop.run_conversation
with the AIAgent instance as the first argument.
This is the largest single extraction in the run_agent.py refactor.
The body keeps all 163 self.X references intact (rewritten as agent.X),
all nested closures, all retry/backoff/compression machinery. Symbols
that tests or callers patch on run_agent (_set_interrupt,
handle_function_call, AIAgent class attrs) are resolved through _ra()
inside the extracted module so the patch surface is preserved.
Five tests doing inspect.getsource(AIAgent.run_conversation) updated to
scan agent.conversation_loop.run_conversation. Two source-introspection
tests (TestMemoryNudgeCounterPersistence, TestMemoryProviderTurnStart)
updated to accept either self.X (legacy) or agent.X (extracted
form) in the matched assertions.
Live E2E verified on three model paths:
* openai/gpt-5.4 (OpenAI chat completions via OpenRouter)
* anthropic/claude-sonnet-4.6 (Anthropic Messages via OpenRouter)
* moonshotai/kimi-k2-thinking (reasoning model, reasoning_content path)
Plus read_file tool execution, terminal tool, web_search.
tests/run_agent/ + tests/agent/: 4313 passed, 1 pre-existing failure
(test_auxiliary_client::test_custom_endpoint... — same as on main).
run_agent.py: 9800 -> 5944 lines (-3856).
Total reduction since baseline: 16083 -> 5944 (-10139, 63%).
2026-05-16 19:26:52 -07:00
|
|
|
from agent import conversation_loop
|
refactor(run_agent): review fixes — keyword-forward __init__, drop dead code, tighten guards
Four fixes from PR #27248 review:
1. **__init__ forwarder is now keyword-forwarded** (daimon-nous review).
Previously the run_agent.AIAgent.__init__ wrapper forwarded all 64
params positionally to agent.agent_init.init_agent, so adding a
65th param on main would require three lockstep edits (signature,
init_agent signature, forwarder call) or silently shift every value.
Keyword forwarding makes this trivially safe — adding a param now
only needs the two signatures and one extra keyword line.
2. **Drop dead _ra() in agent/codex_runtime.py** (daimon-nous + Copilot).
The lazy run_agent reference was defined but never called inside
this module — the codex paths use agent.* accessors only.
3. **Drop unused imports in agent/codex_runtime.py** (Copilot):
contextvars, threading, time, uuid, Optional. Carried over from
run_agent.py during the original extraction.
4. **Tighten three source-introspection test guards** (Copilot):
- test_memory_nudge_counter_hydration.py — was scanning the
concatenated source of run_agent.py + agent/conversation_loop.py
and matching self.X or agent.X form. Now asserts the
hydration block lives in agent/conversation_loop.py specifically
with the agent.X form — the body never moves back, so if it
ever drifts a future re-introduction fails the guard.
- test_run_agent.py::TestMemoryNudgeCounterPersistence — anchor on
agent.iteration_budget = IterationBudget exactly (was just
iteration_budget = IterationBudget) so an unrelated identifier
ending in iteration_budget can't match.
- test_run_agent.py::TestMemoryProviderTurnStart — assert the
agent._user_turn_count form directly (the extracted body uses
agent.X, not self.X — accepting either was a transitional fudge).
- test_jsondecodeerror_retryable.py — scan agent/conversation_loop.py
only, not the concatenation.
Not addressed in this commit:
* Pre-existing bugs in agent/tool_executor.py (heartbeat index
mismatch when calls are blocked, _current_tool clobber in result
loop, blocked-counted-as-completed in spinner summary, dead
result_preview computation). These were preserved byte-for-byte from
the original _execute_tool_calls_concurrent — worth a separate
follow-up PR with proper tests.
* _OpenAIProxy.__instancecheck__ concern — pre-existing, not flagged
by any of the original test patches (nothing actually does
isinstance(x, OpenAI) against the proxy instance).
* agent_init.py:949 mem_config potential NameError — pre-existing;
only triggers if _agent_cfg.get('memory', {}) itself raises, which
it can't with a stock dict.
tests/run_agent/ + tests/agent/: 4313 passed, 1 pre-existing
test_auxiliary_client failure (unchanged).
run_agent.py: 3821 -> 3937 lines (+116 from the keyword-forwarded
init call's verbosity). Final: 16083 -> 3937 (-12146, 75% reduction).
2026-05-16 22:55:49 -07:00
|
|
|
# The agent loop body lives in agent/conversation_loop.py after
|
|
|
|
|
# the run_agent.py refactor. Assert the carve-out is present in
|
|
|
|
|
# the extracted module specifically — if it ever moves back or
|
|
|
|
|
# disappears, this fails loudly rather than silently passing
|
|
|
|
|
# against a non-existent inline replica.
|
|
|
|
|
src = inspect.getsource(conversation_loop)
|
2026-04-24 05:02:58 -07:00
|
|
|
# The predicate we care about must reference json.JSONDecodeError
|
|
|
|
|
# in its exclusion tuple. We check for the specific co-occurrence
|
|
|
|
|
# rather than the literal string so harmless reformatting doesn't
|
|
|
|
|
# break us.
|
|
|
|
|
assert "is_local_validation_error" in src
|
|
|
|
|
assert "JSONDecodeError" in src, (
|
refactor(run_agent): review fixes — keyword-forward __init__, drop dead code, tighten guards
Four fixes from PR #27248 review:
1. **__init__ forwarder is now keyword-forwarded** (daimon-nous review).
Previously the run_agent.AIAgent.__init__ wrapper forwarded all 64
params positionally to agent.agent_init.init_agent, so adding a
65th param on main would require three lockstep edits (signature,
init_agent signature, forwarder call) or silently shift every value.
Keyword forwarding makes this trivially safe — adding a param now
only needs the two signatures and one extra keyword line.
2. **Drop dead _ra() in agent/codex_runtime.py** (daimon-nous + Copilot).
The lazy run_agent reference was defined but never called inside
this module — the codex paths use agent.* accessors only.
3. **Drop unused imports in agent/codex_runtime.py** (Copilot):
contextvars, threading, time, uuid, Optional. Carried over from
run_agent.py during the original extraction.
4. **Tighten three source-introspection test guards** (Copilot):
- test_memory_nudge_counter_hydration.py — was scanning the
concatenated source of run_agent.py + agent/conversation_loop.py
and matching self.X or agent.X form. Now asserts the
hydration block lives in agent/conversation_loop.py specifically
with the agent.X form — the body never moves back, so if it
ever drifts a future re-introduction fails the guard.
- test_run_agent.py::TestMemoryNudgeCounterPersistence — anchor on
agent.iteration_budget = IterationBudget exactly (was just
iteration_budget = IterationBudget) so an unrelated identifier
ending in iteration_budget can't match.
- test_run_agent.py::TestMemoryProviderTurnStart — assert the
agent._user_turn_count form directly (the extracted body uses
agent.X, not self.X — accepting either was a transitional fudge).
- test_jsondecodeerror_retryable.py — scan agent/conversation_loop.py
only, not the concatenation.
Not addressed in this commit:
* Pre-existing bugs in agent/tool_executor.py (heartbeat index
mismatch when calls are blocked, _current_tool clobber in result
loop, blocked-counted-as-completed in spinner summary, dead
result_preview computation). These were preserved byte-for-byte from
the original _execute_tool_calls_concurrent — worth a separate
follow-up PR with proper tests.
* _OpenAIProxy.__instancecheck__ concern — pre-existing, not flagged
by any of the original test patches (nothing actually does
isinstance(x, OpenAI) against the proxy instance).
* agent_init.py:949 mem_config potential NameError — pre-existing;
only triggers if _agent_cfg.get('memory', {}) itself raises, which
it can't with a stock dict.
tests/run_agent/ + tests/agent/: 4313 passed, 1 pre-existing
test_auxiliary_client failure (unchanged).
run_agent.py: 3821 -> 3937 lines (+116 from the keyword-forwarded
init call's verbosity). Final: 16083 -> 3937 (-12146, 75% reduction).
2026-05-16 22:55:49 -07:00
|
|
|
"agent/conversation_loop.py must carve out json.JSONDecodeError "
|
|
|
|
|
"from the is_local_validation_error classification — see #14782."
|
2026-04-24 05:02:58 -07:00
|
|
|
)
|
2026-05-27 11:20:41 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestNoneTypeNotIterableIsRetryable:
|
|
|
|
|
"""Regression for #33136 / closes lingering Telegram \"Non-retryable error (HTTP None)\".
|
|
|
|
|
|
|
|
|
|
The chatgpt.com Codex backend (and any other upstream SDK / provider shim)
|
|
|
|
|
can surface ``TypeError: 'NoneType' object is not iterable`` as a wire-shape
|
|
|
|
|
mismatch, not a local programming bug. Even after #33042 made our own
|
|
|
|
|
consumer immune, third-party paths and mocked clients can still produce
|
|
|
|
|
this shape. The classifier should treat it as retryable so the normal
|
|
|
|
|
retry/fallback chain runs.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def test_nonetype_not_iterable_is_retryable(self):
|
|
|
|
|
err = TypeError("'NoneType' object is not iterable")
|
|
|
|
|
assert not _mirror_agent_predicate(err), (
|
|
|
|
|
"TypeError('NoneType ... not iterable') must be excluded from "
|
|
|
|
|
"is_local_validation_error — it is a provider/SDK shape mismatch, "
|
|
|
|
|
"not a local bug. See #33136."
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def test_nonetype_not_iterable_uppercase_variants_still_retryable(self):
|
|
|
|
|
# The carve-out is case-insensitive; SDK message phrasing can vary.
|
|
|
|
|
for msg in [
|
|
|
|
|
"'NoneType' object is not iterable",
|
|
|
|
|
"NoneType object is not iterable",
|
|
|
|
|
"argument of type 'NoneType' is not iterable",
|
|
|
|
|
]:
|
|
|
|
|
err = TypeError(msg)
|
|
|
|
|
assert not _mirror_agent_predicate(err), (
|
|
|
|
|
f"Variant {msg!r} should be classified as retryable provider shape error."
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def test_unrelated_type_error_remains_local_validation(self):
|
|
|
|
|
"""TypeError without the NoneType-not-iterable pattern still aborts (programming bug)."""
|
|
|
|
|
assert _mirror_agent_predicate(TypeError("tools must be a list"))
|
|
|
|
|
assert _mirror_agent_predicate(TypeError("expected str, got int"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestAgentLoopSourceHasNoneTypeCarveOut:
|
|
|
|
|
"""Belt-and-suspenders: the production source must include the carve-out."""
|
|
|
|
|
|
|
|
|
|
def test_conversation_loop_excludes_nonetype_not_iterable_from_local_validation(self):
|
|
|
|
|
import inspect
|
|
|
|
|
from agent import conversation_loop
|
|
|
|
|
src = inspect.getsource(conversation_loop)
|
|
|
|
|
assert "is_local_validation_error" in src
|
|
|
|
|
# The specific check must be present.
|
|
|
|
|
assert "nonetype" in src.lower() and "not iterable" in src.lower(), (
|
|
|
|
|
"agent/conversation_loop.py must carve out 'NoneType is not iterable' "
|
|
|
|
|
"TypeErrors from the is_local_validation_error classification — see #33136."
|
|
|
|
|
)
|