From 7a316eb8ac069709a1da52f49ff62b5966f47c09 Mon Sep 17 00:00:00 2001 From: SaladDay <1203511142@qq.com> Date: Thu, 8 Oct 2026 21:39:21 +0000 Subject: [PATCH] Allow the existing admission budget in native acceptance --- scripts/acceptance/acceptance.py | 6 +++--- services/core/tests/official_environment_files_native.py | 2 +- services/core/tests/official_hosted_functions_native.py | 2 +- services/core/tests/official_native_policies.py | 2 +- services/core/tests/qualify_public_native.py | 6 +++--- services/core/tests/qualify_public_native_test.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/acceptance/acceptance.py b/scripts/acceptance/acceptance.py index 078ddeeb2..94fe8b40e 100644 --- a/scripts/acceptance/acceptance.py +++ b/scripts/acceptance/acceptance.py @@ -136,7 +136,7 @@ def __init__(self, base, token, evidence): self.evidence = evidence self.opener = build_opener(ProxyHandler({}), NoRedirect()) - def request(self, method, path, operation, body=None, query=None, key=None, binary=False): + def request(self, method, path, operation, body=None, query=None, key=None, binary=False, timeout=30): headers = {"Authorization": "Bearer " + self.token, "OpenAI-Beta": "agents=v1"} data = None if body is not None: @@ -148,7 +148,7 @@ def request(self, method, path, operation, body=None, query=None, key=None, bina entry = {"operation": operation, "method": method} self.evidence.append(entry) try: - with self.opener.open(Request(url, data=data, headers=headers, method=method), timeout=30) as response: + with self.opener.open(Request(url, data=data, headers=headers, method=method), timeout=timeout) as response: entry["http_status"] = response.status request_id = response.headers.get("x-request-id", "") if re.fullmatch(r"[A-Za-z0-9_.:-]{1,200}", request_id): @@ -222,7 +222,7 @@ def submit(api, record, text): event = {"type": "agent.session.input.message", "input": [ {"role": "user", "content": [{"type": "input_text", "text": text}]}]} api.request("POST", session_path(record) + "/events", "events.message", - body={"events": [event]}, key=uuid.uuid4().hex) + body={"events": [event]}, key=uuid.uuid4().hex, timeout=360) def items(api, record): diff --git a/services/core/tests/official_environment_files_native.py b/services/core/tests/official_environment_files_native.py index 6fcdeb74c..4822b96c1 100644 --- a/services/core/tests/official_environment_files_native.py +++ b/services/core/tests/official_environment_files_native.py @@ -91,7 +91,7 @@ def main(): assert tokens[0] != tokens[1], "Distinct tenant credentials required" base = settings["base"].rstrip("/") + "/v1" with httpx2.Client(trust_env=False, timeout=30) as http: - clients = [OpenAI(api_key=token, base_url=base, timeout=240, max_retries=0, _strict_response_validation=True, + clients = [OpenAI(api_key=token, base_url=base, timeout=360, max_retries=0, _strict_response_validation=True, http_client=http) for token in tokens] generated = [generate_files(client, tenant["session_id"], str(index)) for index, (client, tenant) in enumerate(zip(clients, settings["tenants"]))] diff --git a/services/core/tests/official_hosted_functions_native.py b/services/core/tests/official_hosted_functions_native.py index 5dbc8b1b8..636837ff9 100644 --- a/services/core/tests/official_hosted_functions_native.py +++ b/services/core/tests/official_hosted_functions_native.py @@ -58,7 +58,7 @@ def invoke(text, key, handler): observed.append(events) if saved is not None: proof["saved"]["events"].append(events) - with sessions.stream(session.id, input=text, tool_handlers={"lookup": handler}, idempotency_key=key, timeout=240) as stream: + with sessions.stream(session.id, input=text, tool_handlers={"lookup": handler}, idempotency_key=key, timeout=360) as stream: events.extend(event.to_dict() for event in stream) terminals = [e for e in events if e["type"] in ("agent.session.turn.completed", "agent.session.turn.failed", "agent.session.turn.cancelled")] assert len(terminals) == 1 and terminals[0]["type"] == "agent.session.turn.completed" diff --git a/services/core/tests/official_native_policies.py b/services/core/tests/official_native_policies.py index 21a11bf88..cf4755fb0 100644 --- a/services/core/tests/official_native_policies.py +++ b/services/core/tests/official_native_policies.py @@ -52,7 +52,7 @@ def run(session, label, prompt, marker, verbosity="medium"): assert session.agent.instructions == instructions and session.agent.model == agent_options["model"] assert session.agent.text.verbosity == verbosity assert [tool.to_dict() for tool in session.agent.tools] == resolved - with sessions.stream(sid, input=prompt, timeout=240) as stream: + with sessions.stream(sid, input=prompt, timeout=360) as stream: for event in stream: run_proof["events"].append(event.to_dict()) assert event.type not in {"agent.session.requires_action", "agent.session.failed", "agent.session.turn.failed", "agent.session.turn.cancelled"}, label + " requires a completed native Turn; unsupported verbosity is not a pass" diff --git a/services/core/tests/qualify_public_native.py b/services/core/tests/qualify_public_native.py index 9cf7a21b2..bef4e8b13 100644 --- a/services/core/tests/qualify_public_native.py +++ b/services/core/tests/qualify_public_native.py @@ -58,7 +58,7 @@ def verify_none(client, foreign, http, agent_options, session_options, ready, re restart() stream = sessions.stream(session.id, input="Recall the string from our previous turn. Reply with exactly that string. Do not use tools.", - idempotency_key=key + "-continue", timeout=240) + idempotency_key=key + "-continue", timeout=360) events = [] proof["runs"].append(events) with stream: @@ -226,8 +226,8 @@ def restart(): with httpx2.Client(trust_env=False, timeout=30) as http: # Input admission can prepare a native executor before returning. - client = OpenAI(base_url=base, api_key=key, timeout=240, max_retries=0, _strict_response_validation=True, http_client=http) - foreign = OpenAI(base_url=base, api_key=foreign_key, timeout=240, max_retries=0, _strict_response_validation=True, http_client=http) + client = OpenAI(base_url=base, api_key=key, timeout=360, max_retries=0, _strict_response_validation=True, http_client=http) + foreign = OpenAI(base_url=base, api_key=foreign_key, timeout=360, max_retries=0, _strict_response_validation=True, http_client=http) def ready(session): if placement == "none": diff --git a/services/core/tests/qualify_public_native_test.py b/services/core/tests/qualify_public_native_test.py index b1a6f56b0..f44364c86 100644 --- a/services/core/tests/qualify_public_native_test.py +++ b/services/core/tests/qualify_public_native_test.py @@ -83,7 +83,7 @@ def suite(client, foreign, http, *args, **kwargs): with self.assertRaises(BadRequestError): sdk.beta.agents.sessions.events.create("fixture-session", events=[{ "type": "agent.session.input.message", "input": [{"role": "user", "content": [{"type": "input_text", "text": "fixture"}]}]}]) - self.assertEqual(requests[-1].extensions["timeout"]["read"], 240) + self.assertEqual(requests[-1].extensions["timeout"]["read"], 360) http.get("https://core.example/v1/agents/sessions/fixture-session") self.assertEqual(requests[-1].extensions["timeout"]["read"], 30) return []