Skip to content

fix(client): trim '/' and empty character in base URL #424

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

Merged
merged 3 commits into from
Apr 8, 2025
Merged

fix(client): trim '/' and empty character in base URL #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fb7e8f
trimmed base url
mssfang Apr 8, 2025
84be6f4
spotless check
mssfang Apr 8, 2025
8447431
Merge branch 'next' of https://github.com/openai/openai-java into Azu…
mssfang Apr 8, 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
4 changes: 3 additions & 1 deletion openai-java-core/src/main/kotlin/com/openai/core/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ internal fun Any?.contentToString(): String {
internal fun isAzureEndpoint(baseUrl: String): Boolean {
// Azure Endpoint should be in the format of `https://<region>.openai.azure.com`.
// Or `https://<region>.azure-api.net` for Azure OpenAI Management URL.
return baseUrl.endsWith(".openai.azure.com", true) || baseUrl.endsWith(".azure-api.net", true)
val trimmedBaseUrl = baseUrl.trim().trimEnd('/')
return trimmedBaseUrl.endsWith(".openai.azure.com", true) ||
trimmedBaseUrl.endsWith(".azure-api.net", true)
}

internal interface Enum
16 changes: 16 additions & 0 deletions openai-java-core/src/test/kotlin/com/openai/core/UtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,20 @@ internal class UtilsTest {
assertThat(arrayOf(byteArrayOf(1, 2), byteArrayOf(3)).contentToString())
.isEqualTo("[[1, 2], [3]]")
}

@Test
fun isAzureEndpoint() {
// Valid Azure endpoints
assertThat(isAzureEndpoint("https://region.openai.azure.com")).isTrue()
assertThat(isAzureEndpoint("https://region.openai.azure.com/")).isTrue()
assertThat(isAzureEndpoint("https://region.azure-api.net")).isTrue()
assertThat(isAzureEndpoint("https://region.azure-api.net/")).isTrue()

// Invalid Azure endpoints
assertThat(isAzureEndpoint("https://example.com")).isFalse()
assertThat(isAzureEndpoint("https://region.openai.com")).isFalse()
assertThat(isAzureEndpoint("https://region.azure.com")).isFalse()
assertThat(isAzureEndpoint("")).isFalse()
assertThat(isAzureEndpoint(" ")).isFalse()
}
}
Loading