mirror of
https://github.com/usestrix/strix.git
synced 2026-08-21 18:52:47 +02:00
Replace the separate STRIX_AUTH_MODE flag with a sentinel model value: STRIX_LLM=openai/subscription selects the authenticated ChatGPT subscription, and any other value is a normal API-key model. The env vars that already run Strix are now the single source of truth — no second mode to keep in sync. Encapsulate the behavior instead of branching everywhere: - StrixProvider.get_model routes the sentinel to a _CodexResponsesModel backed by a cached OAuth client (no global default-client mutation, no per-call client churn). - _CodexResponsesModel self-enforces the backend's requirements — streaming, store=false, encrypted reasoning, and the configured reasoning effort — so the runner, warm-up, and make_model_settings no longer special-case subscription. Remove now-unneeded machinery: STRIX_AUTH_MODE/AuthMode, the "incompatible model" warning, the non-OpenAI model coercion, the make_model_settings codex flag, and the global set_default_openai_client wiring. run.json still records a derived auth_mode so the viewer/telemetry/cost display are unchanged. Switching modes is now just editing STRIX_LLM. Sentinel-only (no per-model override): a subscription run uses gpt-5.4. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
162 lines
5.3 KiB
Python
162 lines
5.3 KiB
Python
"""Regression test for the ChatGPT Codex backend's streaming requirement.
|
|
|
|
The backend rejects non-streamed requests with ``{"detail": "Stream must be set
|
|
to true"}``. ``_CodexResponsesModel`` must therefore issue a streamed request
|
|
even from the non-streaming ``get_response`` path and aggregate the events into
|
|
a single response. A local server that mimics that behaviour proves the wrapper
|
|
works where the stock responses model would fail.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import threading
|
|
from http.server import BaseHTTPRequestHandler, HTTPServer
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
import pytest
|
|
from agents.model_settings import ModelSettings
|
|
from agents.models.interface import ModelTracing
|
|
from agents.models.openai_responses import OpenAIResponsesModel
|
|
from openai import AsyncOpenAI, BadRequestError
|
|
|
|
from strix.config.models import _CodexResponsesModel
|
|
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Iterator
|
|
|
|
|
|
def _response_payload() -> dict[str, Any]:
|
|
return {
|
|
"id": "resp_1",
|
|
"object": "response",
|
|
"created_at": 0,
|
|
"status": "completed",
|
|
"model": "gpt-5.5",
|
|
"output": [
|
|
{
|
|
"type": "message",
|
|
"id": "m1",
|
|
"status": "completed",
|
|
"role": "assistant",
|
|
"content": [{"type": "output_text", "text": "OK", "annotations": []}],
|
|
}
|
|
],
|
|
"usage": {
|
|
"input_tokens": 1,
|
|
"output_tokens": 1,
|
|
"total_tokens": 2,
|
|
"input_tokens_details": {"cached_tokens": 0},
|
|
"output_tokens_details": {"reasoning_tokens": 0},
|
|
},
|
|
"parallel_tool_calls": False,
|
|
"tool_choice": "auto",
|
|
"tools": [],
|
|
"metadata": {},
|
|
"temperature": 1.0,
|
|
"top_p": 1.0,
|
|
"error": None,
|
|
"incomplete_details": None,
|
|
"instructions": None,
|
|
"max_output_tokens": None,
|
|
}
|
|
|
|
|
|
_CAPTURED: dict[str, Any] = {}
|
|
|
|
|
|
class _Handler(BaseHTTPRequestHandler):
|
|
def log_message(self, *args: Any) -> None:
|
|
pass
|
|
|
|
def do_POST(self) -> None:
|
|
length = int(self.headers.get("Content-Length", 0))
|
|
body = json.loads(self.rfile.read(length) or b"{}")
|
|
_CAPTURED.clear()
|
|
_CAPTURED.update(body)
|
|
if not body.get("stream"):
|
|
payload = json.dumps({"detail": "Stream must be set to true"}).encode()
|
|
self.send_response(400)
|
|
self.send_header("Content-Type", "application/json")
|
|
self.send_header("Content-Length", str(len(payload)))
|
|
self.end_headers()
|
|
self.wfile.write(payload)
|
|
return
|
|
event = {
|
|
"type": "response.completed",
|
|
"sequence_number": 0,
|
|
"response": _response_payload(),
|
|
}
|
|
frame = f"event: response.completed\ndata: {json.dumps(event)}\n\n".encode()
|
|
self.send_response(200)
|
|
self.send_header("Content-Type", "text/event-stream")
|
|
self.end_headers()
|
|
self.wfile.write(frame)
|
|
|
|
|
|
@pytest.fixture
|
|
def backend_url() -> Iterator[str]:
|
|
server = HTTPServer(("127.0.0.1", 0), _Handler)
|
|
thread = threading.Thread(target=server.serve_forever, daemon=True)
|
|
thread.start()
|
|
try:
|
|
yield f"http://127.0.0.1:{server.server_address[1]}/backend-api/codex"
|
|
finally:
|
|
server.shutdown()
|
|
server.server_close()
|
|
|
|
|
|
def _client(base_url: str) -> AsyncOpenAI:
|
|
return AsyncOpenAI(api_key="tok", base_url=base_url)
|
|
|
|
|
|
def _call_kwargs() -> dict[str, Any]:
|
|
return {
|
|
"system_instructions": "s",
|
|
"input": "hi",
|
|
"model_settings": ModelSettings(
|
|
store=False, response_include=["reasoning.encrypted_content"]
|
|
),
|
|
"tools": [],
|
|
"output_schema": None,
|
|
"handoffs": [],
|
|
"tracing": ModelTracing.DISABLED,
|
|
"previous_response_id": None,
|
|
"conversation_id": None,
|
|
"prompt": None,
|
|
}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_stock_model_fails_on_non_streamed_backend(backend_url: str) -> None:
|
|
model = OpenAIResponsesModel(model="gpt-5.5", openai_client=_client(backend_url))
|
|
with pytest.raises(BadRequestError, match="Stream must be set to true"):
|
|
await model.get_response(**_call_kwargs())
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_codex_model_streams_and_aggregates(backend_url: str) -> None:
|
|
model = _CodexResponsesModel(model="gpt-5.5", openai_client=_client(backend_url))
|
|
response = await model.get_response(**_call_kwargs())
|
|
assert response.output[0].content[0].text == "OK"
|
|
assert response.usage.total_tokens == 2
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_codex_model_self_enforces_backend_requirements(backend_url: str) -> None:
|
|
# The caller passes ordinary settings; the model must impose the backend's
|
|
# requirements (stream, store=false, encrypted reasoning) and the configured
|
|
# reasoning effort itself.
|
|
model = _CodexResponsesModel(
|
|
model="gpt-5.4", openai_client=_client(backend_url), reasoning_effort="high"
|
|
)
|
|
kwargs = _call_kwargs()
|
|
kwargs["model_settings"] = ModelSettings() # nothing special from the caller
|
|
await model.get_response(**kwargs)
|
|
|
|
assert _CAPTURED["stream"] is True
|
|
assert _CAPTURED["store"] is False
|
|
assert _CAPTURED["include"] == ["reasoning.encrypted_content"]
|
|
assert _CAPTURED["reasoning"] == {"effort": "high"}
|