Skip to content

1. Add onClientCreated And onConfigClient parameter #224

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.

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
wants to merge 2 commits into
base: main
Choose a base branch
from
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 3.3.3
> Published 30 Jul 2023

### Added
1. **onClientCreated** parameter to set request interceptors for httpClient.
2. **onConfigClient** parameter to configure HttpClient, such as adding a cookie manager.

# 3.3.2
> Published 21 Jul 2023

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.aallam.openai.api.http.Timeout
import com.aallam.openai.client.internal.OpenAIApi
import com.aallam.openai.client.internal.createHttpClient
import com.aallam.openai.client.internal.http.HttpTransport
import io.ktor.client.*
import kotlin.time.Duration.Companion.seconds

/**
Expand Down Expand Up @@ -34,6 +35,8 @@ public fun OpenAI(
host: OpenAIHost = OpenAIHost.OpenAI,
proxy: ProxyConfig? = null,
retry: RetryStrategy = RetryStrategy(),
onConfigClient: (HttpClientConfig<*>.() -> Unit)? = null,
onClientCreated: ((client: HttpClient) -> Unit)? = null,
): OpenAI = OpenAI(
config = OpenAIConfig(
token = token,
Expand All @@ -44,6 +47,8 @@ public fun OpenAI(
host = host,
proxy = proxy,
retry = retry,
onConfigClient = onConfigClient,
onClientCreated = onClientCreated
)
)

Expand All @@ -54,6 +59,7 @@ public fun OpenAI(
*/
public fun OpenAI(config: OpenAIConfig): OpenAI {
val httpClient = createHttpClient(config)
config.onClientCreated?.invoke(httpClient)
val transport = HttpTransport(httpClient)
return OpenAIApi(transport)
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.aallam.openai.client
import com.aallam.openai.api.http.Timeout
import com.aallam.openai.api.logging.LogLevel
import com.aallam.openai.api.logging.Logger
import io.ktor.client.*
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds

Expand All @@ -28,6 +29,8 @@ public class OpenAIConfig(
public val host: OpenAIHost = OpenAIHost.OpenAI,
public val proxy: ProxyConfig? = null,
public val retry: RetryStrategy = RetryStrategy(),
public val onConfigClient: (HttpClientConfig<*>.() -> Unit)? = null,
public val onClientCreated: ((client: HttpClient) -> Unit)? = null,
) {

@Deprecated(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ internal fun createHttpClient(config: OpenAIConfig): HttpClient {
exponentialDelay(config.retry.base, config.retry.maxDelay.inWholeMilliseconds)
}

config.onConfigClient?.invoke(this)

defaultRequest {
url(config.host.baseUrl)
config.host.queryParams.onEach { (key, value) -> url.parameters.appendIfNameAbsent(key, value) }
Expand Down