Skip to content

Commit c8e501c

Browse files
committed
Merge upstream/main into feat/sprites-sandbox
Conflict was uv.lock only — regenerated with `uv lock` against the merged pyproject.toml so all extras (sprites + upstream's recent ones) lock consistently. pyproject.toml auto-merged: our [sprites] extra and the upstream 0.14.6→0.14.7 version bump and compaction changes coexist. Verified: 725 sandbox+sprites tests pass, mypy/ruff clean repo-wide.
2 parents 30df3dd + 8d7f05b commit c8e501c

5 files changed

Lines changed: 10 additions & 4 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "openai-agents"
3-
version = "0.14.6"
3+
version = "0.14.7"
44
description = "OpenAI Agents SDK"
55
readme = "README.md"
66
requires-python = ">=3.10"

src/agents/sandbox/capabilities/compaction.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def _model_context_windows(models: tuple[str, ...], context_window: int) -> dict
3030
"gpt-5.4-pro",
3131
"gpt-5.4-pro-2026-03-05",
3232
"gpt-5.5",
33+
"gpt-5.5-2026-04-23",
34+
"gpt-5.5-pro",
35+
"gpt-5.5-pro-2026-04-23",
3336
"gpt-4.1",
3437
"gpt-4.1-2025-04-14",
3538
"gpt-4.1-mini",

src/agents/sandbox/memory/phase_two.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ async def run_phase_two(
3434
selection=selection,
3535
extra_prompt=config.extra_prompt,
3636
)
37-
await Runner.run(agent, prompt, run_config=run_config)
37+
await Runner.run(agent, prompt, run_config=run_config, max_turns=500)

tests/sandbox/test_compaction.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
("gpt-5.4", 1_047_576),
1010
("gpt-5.4-pro", 1_047_576),
1111
("gpt-5.5", 1_047_576),
12+
("gpt-5.5-2026-04-23", 1_047_576),
13+
("gpt-5.5-pro", 1_047_576),
14+
("gpt-5.5-pro-2026-04-23", 1_047_576),
1215
("gpt-5.3-codex", 400_000),
1316
("gpt-5.4-mini", 400_000),
1417
("gpt-4.1", 1_047_576),

uv.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)