Skip to content

fix: async client timeout in streaming requests #2986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BillionClaw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: async client timeout in streaming requests #2986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/openai/_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from __future__ import annotations

import json
import asyncio
import inspect
from types import TracebackType
from typing import TYPE_CHECKING, Any, Generic, TypeVar, Iterator, Optional, AsyncIterator, cast
Expand All @@ -10,7 +11,7 @@
import httpx

from ._utils import is_mapping, extract_type_var_from_base
from ._exceptions import APIError
from ._exceptions import APIError, APITimeoutError

if TYPE_CHECKING:
from ._client import OpenAI, AsyncOpenAI
Expand Down Expand Up @@ -105,6 +106,8 @@ def __stream__(self) -> Iterator[_T]:
cast_to=cast_to,
response=response,
)
except httpx.TimeoutException as err:
raise APITimeoutError(request=self.response.request) from err
finally:
# Ensure the response is closed even if the consumer doesn't read all data
response.close()
Expand Down Expand Up @@ -215,6 +218,8 @@ async def __stream__(self) -> AsyncIterator[_T]:
cast_to=cast_to,
response=response,
)
except (httpx.TimeoutException, asyncio.TimeoutError) as err:
raise APITimeoutError(request=self.response.request) from err
finally:
# Ensure the response is closed even if the consumer doesn't read all data
await response.aclose()
Expand Down