Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions openai/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

if TYPE_CHECKING:
from aiohttp import ClientSession
import requests

api_key = os.environ.get("OPENAI_API_KEY")
# Path of a file with an API key, whose contents can change. Supercedes
Expand All @@ -47,6 +48,10 @@
debug = False
log = None # Set to either 'debug' or 'info', controls console logging

session: ContextVar[Optional["requests.Session"]] = ContextVar(
"requests-session", default=None
)

aiosession: ContextVar[Optional["ClientSession"]] = ContextVar(
"aiohttp-session", default=None
) # Acts as a global aiohttp ClientSession that reuses connections.
Expand Down
5 changes: 4 additions & 1 deletion openai/api_requestor.py
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,10 @@ def request_raw(
)

if not hasattr(_thread_context, "session"):
_thread_context.session = _make_session()
session = openai.session.get()
if not session:
session = _make_session()
_thread_context.session = session
try:
result = _thread_context.session.request(
method,
Expand Down
9 changes: 9 additions & 0 deletions openai/tests/test_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import json

import pytest
import requests

import openai
from openai import error
Expand Down Expand Up @@ -86,3 +87,11 @@ def test_timeout_does_not_error():
model="ada",
request_timeout=10,
)


def test_user_passed_session():
with requests.Session() as session:
openai.session.set(session)

completion = openai.Completion.create(prompt="test", model="ada")
assert completion