Skip to content

Commit c05731a

Browse files
committed
Add httpx_trust_env arg for openai_compatible model
1 parent 0aaff1d commit c05731a

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

lmms_eval/models/simple/openai_compatible.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from dotenv import find_dotenv, load_dotenv
2323
from loguru import logger as eval_logger
24-
from openai import AzureOpenAI, OpenAI
24+
from openai import AzureOpenAI, DefaultHttpxClient, OpenAI
2525
from PIL import Image
2626

2727
load_dotenv(verbose=True)
@@ -39,8 +39,17 @@ def __init__(
3939
response_persistent_folder: str = None,
4040
azure_openai: bool = False,
4141
max_frames_num: int = 10,
42+
httpx_trust_env: bool = True,
4243
**kwargs,
4344
) -> None:
45+
"""
46+
:param httpx_trust_env: bool
47+
httpx.Client used by openai-python has trust_env set to True by
48+
default. A False value of this param constructs a httpx.Client with
49+
trust_env set to False. Such a httpx.Client ignores environment
50+
variables (HTTP_PROXY, HTTPS_PROXY, ALL_PROXY) and macOS proxy
51+
server settings.
52+
"""
4453
super().__init__()
4554
self.model_version = model_version
4655
self.timeout = timeout
@@ -64,10 +73,11 @@ def __init__(
6473
self.response_cache = {}
6574
self.cache_mode = "start"
6675

76+
http_client = DefaultHttpxClient(trust_env=httpx_trust_env) if not httpx_trust_env else None
6777
self.client = (
68-
OpenAI(api_key=os.getenv("OPENAI_API_KEY"), base_url=os.getenv("OPENAI_API_BASE"))
78+
OpenAI(api_key=os.getenv("OPENAI_API_KEY"), base_url=os.getenv("OPENAI_API_BASE"), http_client=http_client)
6979
if not azure_openai
70-
else AzureOpenAI(api_key=os.getenv("AZURE_OPENAI_API_KEY"), azure_endpoint=os.getenv("AZURE_OPENAI_API_BASE"), api_version=os.getenv("AZURE_OPENAI_API_VERSION"))
80+
else AzureOpenAI(api_key=os.getenv("AZURE_OPENAI_API_KEY"), azure_endpoint=os.getenv("AZURE_OPENAI_API_BASE"), api_version=os.getenv("AZURE_OPENAI_API_VERSION"), http_client=http_client)
7181
)
7282

7383
accelerator = Accelerator()

0 commit comments

Comments
 (0)