Skip to content
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

Fix inconsistent base_url behavior in module client and OpenAIClient #2157

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −3
Open

Fix inconsistent base_url behavior in module client and OpenAIClient #2157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e89bca
Fix inconsistent base_url behavior in module client and OpenAIClient
SmartManoj Mar 2, 2025
85739b0
Merge branch 'main' into fix-base-url
SmartManoj Apr 1, 2025
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/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def project(self, value: str | None) -> None: # type: ignore
@override
def base_url(self) -> _httpx.URL:
if base_url is not None:
return _httpx.URL(base_url)
return self._enforce_trailing_slash(_httpx.URL(base_url))

return super().base_url

Expand Down Expand Up @@ -245,6 +245,11 @@ def _client(self, value: _httpx.Client) -> None: # type: ignore

http_client = value

def _enforce_trailing_slash(self, url: _httpx.URL) -> _httpx.URL:
if url.raw_path.endswith(b"/"):
return url
return url.copy_with(raw_path=url.raw_path + b"/")


class _AzureModuleClient(_ModuleClient, AzureOpenAI): # type: ignore
...
Expand Down
4 changes: 2 additions & 2 deletions tests/test_module_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def test_base_url_option() -> None:

openai.base_url = "http://foo.com"

assert openai.base_url == URL("http://foo.com")
assert openai.completions._client.base_url == URL("http://foo.com")
assert openai.base_url == URL("http://foo.com/")
assert openai.completions._client.base_url == URL("http://foo.com/")


def test_timeout_option() -> None:
Expand Down