豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/agents/run_internal/oai_conversation.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,11 @@ def hydrate_from_state(
if isinstance(original_input, list):
normalized_input = prepare_model_input_items(original_input)

# Hydrated initial input is reconstructed during resume, so object identity is not a
# stable dedupe key and can later collide with unrelated freshly allocated items.
for item in ItemHelpers.input_to_new_input_list(normalized_input):
if item is None:
continue
self.sent_items.add(id(item))
item_id = _normalize_server_item_id(
item.get("id") if isinstance(item, dict) else getattr(item, "id", None)
)
Expand Down
35 changes: 35 additions & 0 deletions tests/test_server_conversation_tracker.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,41 @@ def test_prepare_input_filters_items_seen_by_server_and_tool_calls() -> None:
assert tracker.remaining_initial_input is None


def test_hydrate_from_state_does_not_track_string_initial_input_by_object_identity() -> None:
tracker = OpenAIServerConversationTracker(
conversation_id="conv-init-string", previous_response_id=None
)

tracker.hydrate_from_state(
original_input="hello",
generated_items=[],
model_responses=[],
)

assert tracker.sent_items == set()
assert tracker.sent_initial_input is True
assert tracker.remaining_initial_input is None
assert len(tracker.sent_item_fingerprints) == 1


def test_hydrate_from_state_does_not_track_list_initial_input_by_object_identity() -> None:
tracker = OpenAIServerConversationTracker(
conversation_id="conv-init-list", previous_response_id=None
)
original_input = [cast(TResponseInputItem, {"role": "user", "content": "hello"})]

tracker.hydrate_from_state(
original_input=original_input,
generated_items=[],
model_responses=[],
)

assert tracker.sent_items == set()
assert tracker.sent_initial_input is True
assert tracker.remaining_initial_input is None
assert len(tracker.sent_item_fingerprints) == 1


def test_mark_input_as_sent_and_rewind_input_respects_remaining_initial_input() -> None:
tracker = OpenAIServerConversationTracker(conversation_id="conv2", previous_response_id=None)
pending_1: TResponseInputItem = cast(TResponseInputItem, {"id": "p-1", "type": "message"})
Expand Down
Loading