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(client): support response URL for Azure #387

Merged
merged 7 commits into from
Apr 4, 2025
Merged

fix(client): support response URL for Azure #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43e6c73
response url support
mssfang Apr 2, 2025
ac1a4f2
add the missing azureServiceVersion param
mssfang Apr 3, 2025
a1bd63b
add new Azure OpenAI service API version
mssfang Apr 3, 2025
999c052
Merge branch 'main' of https://github.com/openai/openai-java into Azu…
mssfang Apr 3, 2025
1ac37f0
update async client as well
mssfang Apr 3, 2025
959edd0
Spotless: format
mssfang Apr 3, 2025
29cb899
address feedbacks
mssfang Apr 4, 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/azure/AzureOpenAIServiceVersion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AzureOpenAIServiceVersion private constructor(@get:JvmName("value") val va
@JvmStatic
fun latestPreviewVersion(): AzureOpenAIServiceVersion {
// We can update the value every preview announcement.
return V2025_01_01_PREVIEW
return V2025_03_01_PREVIEW
}

@JvmStatic
Expand All @@ -41,6 +41,8 @@ class AzureOpenAIServiceVersion private constructor(@get:JvmName("value") val va
@JvmStatic val V2024_10_01_PREVIEW = fromString("2024-10-01-preview")
@JvmStatic val V2024_12_01_PREVIEW = fromString("2024-12-01-preview")
@JvmStatic val V2025_01_01_PREVIEW = fromString("2025-01-01-preview")
@JvmStatic val V2025_02_01_PREVIEW = fromString("2025-02-01-preview")
@JvmStatic val V2025_03_01_PREVIEW = fromString("2025-03-01-preview")
}

override fun equals(other: Any?): Boolean =
Expand Down
5 changes: 3 additions & 2 deletions openai-java-core/src/main/kotlin/com/openai/azure/HttpRequestBuilderExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ internal fun HttpRequest.Builder.addPathSegmentsForAzure(
clientOptions: ClientOptions,
deploymentModel: String?,
): HttpRequest.Builder = apply {
if (isAzureEndpoint(clientOptions.baseUrl) && deploymentModel != null) {
addPathSegments("openai", "deployments", deploymentModel)
if (isAzureEndpoint(clientOptions.baseUrl)) {
addPathSegment("openai")
deploymentModel?.let { addPathSegments("deployments", it) }
}
}

Expand Down
3 changes: 3 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ private constructor(
@get:JvmName("timeout") val timeout: Timeout,
@get:JvmName("maxRetries") val maxRetries: Int,
@get:JvmName("credential") val credential: Credential,
@get:JvmName("azureServiceVersion") val azureServiceVersion: AzureOpenAIServiceVersion?,
private val organization: String?,
private val project: String?,
) {
Expand Down Expand Up @@ -102,6 +103,7 @@ private constructor(
timeout = clientOptions.timeout
maxRetries = clientOptions.maxRetries
credential = clientOptions.credential
azureServiceVersion = clientOptions.azureServiceVersion
organization = clientOptions.organization
project = clientOptions.project
}
Expand Down Expand Up @@ -350,6 +352,7 @@ private constructor(
timeout,
maxRetries,
credential,
azureServiceVersion,
organization,
project,
)
Expand Down
12 changes: 2 additions & 10 deletions openai-java-core/src/main/kotlin/com/openai/services/async/ResponseServiceAsyncImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ class ResponseServiceAsyncImpl internal constructor(private val clientOptions: C
.addPathSegments("responses")
.body(json(clientOptions.jsonMapper, params._body()))
.build()
.prepareAsync(
clientOptions,
params,
deploymentModel = params.model().toString(),
)
.prepareAsync(clientOptions, params, deploymentModel = null)
val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
return request
.thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) }
Expand Down Expand Up @@ -148,11 +144,7 @@ class ResponseServiceAsyncImpl internal constructor(private val clientOptions: C
)
)
.build()
.prepareAsync(
clientOptions,
params,
deploymentModel = params.model().toString(),
)
.prepareAsync(clientOptions, params, deploymentModel = null)
val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
return request
.thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) }
Expand Down
4 changes: 2 additions & 2 deletions openai-java-core/src/main/kotlin/com/openai/services/blocking/ResponseServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class ResponseServiceImpl internal constructor(private val clientOptions: Client
.addPathSegments("responses")
.body(json(clientOptions.jsonMapper, params._body()))
.build()
.prepare(clientOptions, params, deploymentModel = params.model().toString())
.prepare(clientOptions, params, deploymentModel = null)
val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
val response = clientOptions.httpClient.execute(request, requestOptions)
return response.parseable {
Expand Down Expand Up @@ -128,7 +128,7 @@ class ResponseServiceImpl internal constructor(private val clientOptions: Client
)
)
.build()
.prepare(clientOptions, params, deploymentModel = params.model().toString())
.prepare(clientOptions, params, deploymentModel = null)
val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
val response = clientOptions.httpClient.execute(request, requestOptions)
return response.parseable {
Expand Down
Loading