Skip to content

fix: correct VertexAI endpoint generation for 'global' location #11853

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
SivamuruganP wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct VertexAI endpoint generation for 'global' location #11853

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/VertexAI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,15 @@ private VertexAI(
this.llmClientSupplier =
Suppliers.memoize(llmClientSupplierOpt.orElse(this::newLlmUtilityClient));

this.apiEndpoint =
apiEndpoint.orElse(String.format("%s-aiplatform.googleapis.com", this.location));
if (apiEndpoint.isPresent()) {
this.apiEndpoint = apiEndpoint.get();
} else {
if ("global".equals(this.location)) {
this.apiEndpoint = "aiplatform.googleapis.com";
} else {
this.apiEndpoint = String.format("%s-aiplatform.googleapis.com", this.location);
}
}
}

/** Builder for {@link VertexAI}. */
Expand Down
23 changes: 23 additions & 0 deletions ...-vertexai/google-cloud-vertexai/src/test/java/com/google/cloud/vertexai/VertexAITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
public final class VertexAITest {
private static final String TEST_PROJECT = "test_project";
private static final String TEST_LOCATION = "test_location";
private static final String GLOBAL_LOCATION = "global";
private static final String TEST_ENDPOINT = "test_endpoint";
private static final String GLOBAL_ENDPOINT = "aiplatform.googleapis.com";
private static final String TEST_DEFAULT_ENDPOINT =
String.format("%s-aiplatform.googleapis.com", TEST_LOCATION);
private static final Optional<String> EMPTY_ENV_VAR_OPTIONAL = Optional.ofNullable(null);
Expand Down Expand Up @@ -344,6 +346,27 @@ public void testInstantiateVertexAI_builderLocationFromCLOUD_ML_REGION_shouldCon
}
}

@Test
public void testInstantiateVertexAI_builderLocationFromGLOBAL_REGION_shouldContainRightFields() {
try (MockedStatic mockedStaticVertexAI = mockStatic(VertexAI.class)) {
mockedStaticVertexAI
.when(() -> VertexAI.getEnvironmentVariable("GOOGLE_CLOUD_REGION"))
.thenReturn(Optional.of(GLOBAL_LOCATION));
mockedStaticVertexAI
.when(() -> VertexAI.getEnvironmentVariable("CLOUD_ML_REGION"))
.thenReturn(Optional.empty());
mockedStaticVertexAI
.when(() -> VertexAI.getEnvironmentVariable("GOOGLE_CLOUD_PROJECT"))
.thenReturn(Optional.of(TEST_PROJECT));

vertexAi = new VertexAI.Builder().build();

assertThat(vertexAi.getProjectId()).isEqualTo(TEST_PROJECT);
assertThat(vertexAi.getLocation()).isEqualTo(GLOBAL_LOCATION);
assertThat(vertexAi.getApiEndpoint()).isEqualTo(GLOBAL_ENDPOINT);
}
}

@Test
public void testInstantiateVertexAI_builderWithScopes_throwsIlegalArgumentException()
throws IllegalArgumentException {
Expand Down
Loading