Skip to content
Open
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
13 changes: 8 additions & 5 deletions google/genai/_api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1224,11 +1224,14 @@ def _build_request(
base_url,
versioned_path,
)
elif(
self.custom_base_url
and patched_http_options.base_url_resource_scope == ResourceScope.COLLECTION
):
url = join_url_path(base_url, path)
elif self.custom_base_url:
if (
patched_http_options.base_url_resource_scope
== ResourceScope.COLLECTION
):
url = join_url_path(base_url, path)
else:
url = join_url_path(base_url, versioned_path)

if self.api_key and self.api_key.startswith('auth_tokens/'):
raise EphemeralTokenAPIKeyError(
Expand Down
9 changes: 6 additions & 3 deletions google/genai/tests/client/test_client_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,11 @@ def test_build_request_with_custom_base_url_no_env_vars(monkeypatch):
build_test_client_no_env_vars(monkeypatch).models._api_client
)
request = request_client._build_request(
'GET',
'test/path',
'POST',
'publishers/google/models/gemini-2.5-flash-image:generateContent',
{'key': 'value'},
)
assert request.url == 'https://custom-base-url.com'
assert request.url == (
'https://custom-base-url.com/v1beta1/'
'publishers/google/models/gemini-2.5-flash-image:generateContent'
)