Skip to content

The agent engineering platform.

fix(openai): broaden condition for ContextOverflowError to accommodate other providers (#37457)

ccurme2259d2923163
diff --git a/libs/partners/openai/langchain_openai/chat_models/base.py b/libs/partners/openai/langchain_openai/chat_models/base.py
index 6686ffa2e3..4b7b5bd8ec 100644
--- a/libs/partners/openai/langchain_openai/chat_models/base.py
+++ b/libs/partners/openai/langchain_openai/chat_models/base.py
@@ -521,6 +521,7 @@ def _handle_openai_bad_request(e: openai.BadRequestError) -> None:
if (
"context_length_exceeded" in str(e)
or "Input tokens exceed the configured limit" in e.message
+ or "prompt is too long" in e.message
):
raise OpenAIContextOverflowError(
message=e.message, response=e.response, body=e.body
diff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_base.py b/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
index 08b0850fd5..64d6237d60 100644
--- a/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
+++ b/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
@@ -3597,6 +3597,33 @@ async def test_context_overflow_error_stream_async_responses_api() -> None:
assert "exceeds the context window" in str(exc_info.value)
+def test_context_overflow_error_prompt_too_long() -> None:
+ """Test context overflow error triggered by 'prompt is too long' message."""
+ error_body = {
+ "error": {
+ "message": "prompt is too long: 300000 tokens > 200000 maximum",
+ "type": "invalid_request_error",
+ "param": "messages",
+ "code": "invalid_request_error",
+ }
+ }
+ bad_request_error = openai.BadRequestError(
+ message=error_body["error"]["message"],
+ response=MagicMock(status_code=400),
+ body=error_body,
+ )
+ llm = ChatOpenAI()
+
+ with ( # noqa: PT012
+ patch.object(llm.client, "with_raw_response") as mock_client,
+ pytest.raises(ContextOverflowError) as exc_info,
+ ):
+ mock_client.create.side_effect = bad_request_error
+ llm.invoke([HumanMessage(content="test")])
+
+ assert "prompt is too long" in str(exc_info.value)
+
+
def test_context_overflow_error_backwards_compatibility() -> None:
"""Test that ContextOverflowError can be caught as BadRequestError."""
llm = ChatOpenAI()