refactor(task): 引入 MutableRequestBodyState 替代 request_body_ref 字典容器

将请求体可变状态从 {"body": dict} 字典容器重构为独立的
MutableRequestBodyState 类,统一管理 original_body / current_body /
build_attempt_body / rectify 等语义,消除各层通过 ref["body"] 间接
读写的隐式约定。

- 新增 src/services/task/request_state.py 定义 Protocol 与实现
- handler/executor/mixin 层改用 request_state 参数传递
- error_handler/state_transition 通过 request_state 判断整流状态
- 新增 request_state 单元测试与 chat/cli 请求体隔离测试
This commit is contained in:
fawney19
2026-03-18 13:43:39 +08:00
parent 53ef35ec80
commit cbb66a5667
16 changed files with 374 additions and 85 deletions

View File

@@ -109,7 +109,7 @@ async def test_execute_sync_unified_temporarily_disables_expire_on_commit(
is_stream=True,
capability_requirements=None,
preferred_key_ids=None,
request_body_ref=None,
request_body_state=None,
request_headers=None,
request_body=None,
)

View File

@@ -14,6 +14,7 @@ from src.services.task.execute.state_transition import (
SyncExecutionState,
resolve_execution_error_transition,
)
from src.services.task.request_state import MutableRequestBodyState
def _make_candidate() -> SimpleNamespace:
@@ -41,10 +42,11 @@ def test_classify_candidate_error_action(
def test_resolve_execution_error_transition_retry_and_consume_rectify_flag() -> None:
request_body_ref = {"_rectified_this_turn": True}
request_body_state = MutableRequestBodyState({})
request_body_state.mark_rectified({}, stage=1)
state = SyncExecutionState(
candidate_record_map={},
request_body_ref=request_body_ref,
request_body_state=request_body_state,
)
transition = resolve_execution_error_transition(
@@ -56,13 +58,15 @@ def test_resolve_execution_error_transition_retry_and_consume_rectify_flag() ->
assert transition.failover_action == FailoverAction.RETRY
assert transition.max_retries == 3
assert request_body_ref["_rectified_this_turn"] is False
assert request_body_state.consume_rectified_this_turn() is False
def test_resolve_execution_error_transition_next_candidate() -> None:
request_body_state = MutableRequestBodyState({})
request_body_state.mark_rectified({}, stage=1)
state = SyncExecutionState(
candidate_record_map={},
request_body_ref={"_rectified_this_turn": True},
request_body_state=request_body_state,
)
transition = resolve_execution_error_transition(
@@ -74,13 +78,14 @@ def test_resolve_execution_error_transition_next_candidate() -> None:
assert transition.failover_action == FailoverAction.CONTINUE
assert transition.max_retries is None
assert state.request_body_ref == {"_rectified_this_turn": True}
assert state.request_body_state is request_body_state
assert request_body_state.consume_rectified_this_turn() is True
def test_sync_execution_state_resolve_candidate_record_id_fallback() -> None:
state = SyncExecutionState(
candidate_record_map={(2, 0): "r20"},
request_body_ref=None,
request_body_state=None,
)
assert state.resolve_candidate_record_id(candidate_index=2, record_id=None) == "r20"
@@ -92,7 +97,7 @@ def test_sync_execution_state_raise_classified_error_uses_last_error() -> None:
candidate = _make_candidate()
state = SyncExecutionState(
candidate_record_map={},
request_body_ref=None,
request_body_state=None,
last_error=err,
last_candidate=candidate,
)
@@ -117,7 +122,7 @@ def test_sync_execution_state_raise_classified_error_uses_last_error() -> None:
def test_sync_execution_state_raise_classified_error_fallback_error() -> None:
state = SyncExecutionState(
candidate_record_map={},
request_body_ref=None,
request_body_state=None,
)
failure_ops = MagicMock()

View File

@@ -10,8 +10,8 @@ from src.services.candidate.schema import CandidateKey
from src.services.candidate.submit import SubmitOutcome
from src.services.task.core.context import TaskMode
from src.services.task.core.protocol import AttemptKind
from src.services.task.service import pool_on_error
from src.services.task.service import TaskService
from src.services.task.request_state import MutableRequestBodyState
from src.services.task.service import TaskService, pool_on_error
@pytest.mark.asyncio
@@ -87,7 +87,7 @@ async def test_task_service_execute_sync_passes_request_headers_and_body() -> No
request_headers = {"authorization": "Bearer test", "x-trace-id": "abc123"}
request_body = {"model": "gpt-4o-mini", "messages": [{"role": "user", "content": "hi"}]}
request_body_ref = {"body": request_body}
request_body_state = MutableRequestBodyState(request_body)
result = await svc.execute(
task_type="chat",
@@ -100,7 +100,7 @@ async def test_task_service_execute_sync_passes_request_headers_and_body() -> No
is_stream=True,
request_headers=request_headers,
request_body=request_body,
request_body_ref=request_body_ref,
request_body_state=request_body_state,
)
assert result is sentinel_result
@@ -108,7 +108,7 @@ async def test_task_service_execute_sync_passes_request_headers_and_body() -> No
kwargs = svc._sync_ops.execute_sync_unified.await_args.kwargs # type: ignore[attr-defined, union-attr]
assert kwargs["request_headers"] == request_headers
assert kwargs["request_body"] == request_body
assert kwargs["request_body_ref"] == request_body_ref
assert kwargs["request_body_state"] is request_body_state
@pytest.mark.asyncio