Skip to content

feat(azure): Add HttpRequest.Builder extension methods #9

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 6 commits into from
Nov 21, 2024
Merged

feat(azure): Add HttpRequest.Builder extension methods #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c6a820
Added HttpRequest.Builder extension methods
mssfang Nov 20, 2024
270d0c2
resolved conflict
mssfang Nov 20, 2024
239c37a
Merge branch 'next' into AzureOpenAI-ExtensionMethods
RobertCraigie Nov 21, 2024
2bb4e6f
remove unused imports
RobertCraigie Nov 21, 2024
8e0c2c2
resolved conflict
mssfang Nov 21, 2024
3bd345f
Merge branch 'AzureOpenAI-ExtensionMethods' of https://github.com/mss…
mssfang Nov 21, 2024
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
27 changes: 27 additions & 0 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
@@ -0,0 +1,27 @@
package com.openai.azure

import com.openai.core.ClientOptions
import com.openai.core.http.HttpRequest
import com.openai.core.isAzureEndpoint
import com.openai.credential.BearerTokenCredential

@JvmSynthetic
internal fun HttpRequest.Builder.addPathSegmentsForAzure(
clientOptions: ClientOptions,
deploymentModel: String
): HttpRequest.Builder = apply {
if (isAzureEndpoint(clientOptions.baseUrl)) {
addPathSegments("openai", "deployments", deploymentModel)
}
}

@JvmSynthetic
internal fun HttpRequest.Builder.replaceBearerTokenForAzure(
clientOptions: ClientOptions
): HttpRequest.Builder = apply {
if (
isAzureEndpoint(clientOptions.baseUrl) && clientOptions.credential is BearerTokenCredential
) {
replaceHeaders("Authorization", "Bearer ${clientOptions.credential.token()}")
}
}
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/async/CompletionServiceAsyncImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.async

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.JsonValue
import com.openai.core.RequestOptions
Expand Down Expand Up @@ -41,10 +43,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("completions")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/async/EmbeddingServiceAsyncImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.async

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.RequestOptions
import com.openai.core.handlers.errorHandler
Expand Down Expand Up @@ -35,10 +37,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("embeddings")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/async/ImageServiceAsyncImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.async

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.RequestOptions
import com.openai.core.handlers.errorHandler
Expand Down Expand Up @@ -34,10 +36,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().get().toString())
.addPathSegments("images", "generations")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
19 changes: 4 additions & 15 deletions ...ai-java-core/src/main/kotlin/com/openai/services/async/chat/CompletionServiceAsyncImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.async.chat

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.JsonValue
import com.openai.core.RequestOptions
Expand All @@ -17,9 +19,7 @@ import com.openai.core.http.HttpRequest
import com.openai.core.http.HttpResponse.Handler
import com.openai.core.http.StreamResponse
import com.openai.core.http.toAsync
import com.openai.core.isAzureEndpoint
import com.openai.core.json
import com.openai.credential.BearerTokenCredential
import com.openai.errors.OpenAIError
import com.openai.models.ChatCompletion
import com.openai.models.ChatCompletionChunk
Expand Down Expand Up @@ -49,23 +49,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.apply {
if (isAzureEndpoint(clientOptions.baseUrl)) {
addPathSegments("openai", "deployments", params.model().toString())
}
}
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("chat", "completions")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.apply {
if (
isAzureEndpoint(clientOptions.baseUrl) &&
clientOptions.credential is BearerTokenCredential
) {
putHeader("Authorization", "Bearer ${clientOptions.credential.token()}")
}
}
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/blocking/CompletionServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.blocking

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.JsonValue
import com.openai.core.RequestOptions
Expand Down Expand Up @@ -38,10 +40,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("completions")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/blocking/EmbeddingServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.blocking

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.RequestOptions
import com.openai.core.handlers.errorHandler
Expand Down Expand Up @@ -34,10 +36,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("embeddings")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
4 changes: 4 additions & 0 deletions openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.blocking

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.RequestOptions
import com.openai.core.handlers.errorHandler
Expand Down Expand Up @@ -33,10 +35,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.addPathSegmentsForAzure(clientOptions, params.model().get().toString())
.addPathSegments("images", "generations")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
19 changes: 4 additions & 15 deletions openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/CompletionServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

package com.openai.services.blocking.chat

import com.openai.azure.addPathSegmentsForAzure
import com.openai.azure.replaceBearerTokenForAzure
import com.openai.core.ClientOptions
import com.openai.core.JsonValue
import com.openai.core.RequestOptions
Expand All @@ -15,9 +17,7 @@ import com.openai.core.http.HttpMethod
import com.openai.core.http.HttpRequest
import com.openai.core.http.HttpResponse.Handler
import com.openai.core.http.StreamResponse
import com.openai.core.isAzureEndpoint
import com.openai.core.json
import com.openai.credential.BearerTokenCredential
import com.openai.errors.OpenAIError
import com.openai.models.ChatCompletion
import com.openai.models.ChatCompletionChunk
Expand Down Expand Up @@ -46,23 +46,12 @@ constructor(
val request =
HttpRequest.builder()
.method(HttpMethod.POST)
.apply {
if (isAzureEndpoint(clientOptions.baseUrl)) {
addPathSegments("openai", "deployments", params.model().toString())
}
}
.addPathSegmentsForAzure(clientOptions, params.model().toString())
.addPathSegments("chat", "completions")
.putAllQueryParams(clientOptions.queryParams)
.replaceAllQueryParams(params.getQueryParams())
.putAllHeaders(clientOptions.headers)
.apply {
if (
isAzureEndpoint(clientOptions.baseUrl) &&
clientOptions.credential is BearerTokenCredential
) {
putHeader("Authorization", "Bearer ${clientOptions.credential.token()}")
}
}
.replaceBearerTokenForAzure(clientOptions)
.replaceAllHeaders(params.getHeaders())
.body(json(clientOptions.jsonMapper, params.getBody()))
.build()
Expand Down
Loading