fix(straiker): seed the derived session on the preamble and the first user turn

An OpenAI chat body carries its system prompt as messages[0], and the derived
session seeded on the Anthropic `system` field plus messages[0] with no role
check. For that shape the seed was the system prompt twice and the first user
turn never counted, so every unnamed conversation behind one system prompt
collapsed into one Straiker session. The seed now takes the preamble from
wherever the API puts it (`system`, `instructions`, or a leading system or
developer message) and the first message with role `user`, else a Responses
`input` string, else `prompt`. Two conversations sharing a system prompt are
two sessions again; a replayed conversation stays one.
This commit is contained in:
Phimmasone Phonpaseuth 2026-09-19 16:41:15 -04:00
parent fb39fedeb4
commit 516b33cce0
2 changed files with 85 additions and 11 deletions

View file

@ -669,27 +669,50 @@ def _v3_session_id(
return V3_DERIVED_SESSION_PREFIX + hashlib.md5(seed.encode("utf-8"), usedforsecurity=False).hexdigest()
_V3_PREAMBLE_ROLES: Final = frozenset({"system", "developer"})
def _v3_message_text(message: object) -> str:
content: Final = message.get("content") if isinstance(message, Mapping) else None
if isinstance(content, str):
return content
if isinstance(content, (list, tuple)) and content and isinstance(content[0], Mapping):
return str(content[0].get("text") or "")
return ""
def _v3_messages(request_body: Mapping[str, object]) -> tuple[Mapping[str, object], ...]:
messages: Final = request_body.get("messages") or request_body.get("input")
if isinstance(messages, (list, tuple)):
return tuple(message for message in messages if isinstance(message, Mapping))
return ()
def _v3_system_text(request_body: Mapping[str, object]) -> str | None:
"""The preamble, wherever the API puts it: Anthropic's `system`, the Responses API's
`instructions`, or the leading system or developer message of an OpenAI chat body."""
system: Final = request_body.get("system")
if isinstance(system, str):
return system
if system is not None:
return json.dumps(system, default=str)
instructions: Final = request_body.get("instructions")
return instructions if isinstance(instructions, str) else None
if isinstance(instructions, str):
return instructions
preamble: Final = next((m for m in _v3_messages(request_body) if m.get("role") in _V3_PREAMBLE_ROLES), None)
return _v3_message_text(preamble) if preamble is not None else None
def _v3_first_message_text(request_body: Mapping[str, object]) -> str:
messages: Final = request_body.get("messages") or request_body.get("input")
if isinstance(messages, (list, tuple)) and messages and isinstance(messages[0], Mapping):
content: Final = messages[0].get("content")
if isinstance(content, str):
return content
if isinstance(content, list) and content and isinstance(content[0], Mapping):
return str(content[0].get("text") or "")
return ""
prompt: Final = request_body.get("prompt")
return prompt if isinstance(prompt, str) else ""
"""What the user first said: the first `user` message, never the system prompt that an
OpenAI chat body carries as `messages[0]`, else a Responses `input` string, else `prompt`."""
first_user: Final = next((m for m in _v3_messages(request_body) if m.get("role") == "user"), None)
if first_user is not None:
return _v3_message_text(first_user)
plain: Final = (
request_body.get("input") if isinstance(request_body.get("input"), str) else request_body.get("prompt")
)
return plain if isinstance(plain, str) else ""
def _v3_user(envelope: StraikerWebhookRequest) -> str | None:

View file

@ -2134,3 +2134,54 @@ async def test_v3_a_completion_prompt_that_cannot_be_rendered_is_relayed_as_sent
payload = _posted_payload(g)
assert payload["prompt"] == prompt
assert "messages" not in payload
@pytest.mark.asyncio
async def test_v3_openai_format_conversations_that_share_a_system_prompt_get_their_own_sessions():
"""An OpenAI chat body carries its system prompt as messages[0]. The derived session must
seed on that preamble plus the first user turn, so two conversations behind one
system prompt are two sessions and a replayed conversation stays one."""
async def session_for(messages):
g = _make_guardrail(api_key=V3_KEY)
g.async_handler.post.return_value = _v3_mock(V3_GATEWAY_ALLOW)
body = {"input": messages} if isinstance(messages, str) else {"messages": messages}
data = _v3_request_data(metadata={"user_api_key_end_user_id": "alice.chen@example.com"}, **body)
if isinstance(messages, str):
data.pop("messages")
data["proxy_server_request"] = {"headers": {}}
await g.apply_guardrail(
inputs={"texts": ["x"]}, request_data=data, input_type="request", logging_obj=_logging_obj()
)
return _posted_payload(g)["session_id"]
system = {"role": "system", "content": "You are the refunds assistant."}
refund = await session_for([system, {"role": "user", "content": "Refund order 12345"}])
refund_again = await session_for(
[
system,
{"role": "user", "content": "Refund order 12345"},
{"role": "assistant", "content": "Done."},
{"role": "user", "content": "Thanks"},
]
)
cancel = await session_for([system, {"role": "user", "content": "Cancel my subscription"}])
developer = await session_for(
[
{"role": "developer", "content": "You are the refunds assistant."},
{"role": "user", "content": "Refund order 12345"},
]
)
other_preamble = await session_for(
[
{"role": "system", "content": "You are the billing assistant."},
{"role": "user", "content": "Refund order 12345"},
]
)
responses_input = await session_for("Refund order 12345")
assert refund == refund_again and refund.startswith("litellm-")
assert refund != cancel
assert refund != other_preamble
assert developer == refund and developer != other_preamble
assert responses_input.startswith("litellm-")