mirror of
https://github.com/langchain-ai/langsmith-java.git
synced 2026-08-24 12:22:55 -04:00
release: 0.1.0-alpha.20 (#85)
* feat(api): api update * codegen metadata * codegen metadata * feat(api): api update * feat(api): api update * feat(api): api update * codegen metadata * feat(api): api update * feat(api): api update * codegen metadata * codegen metadata * codegen metadata * feat(api): api update * codegen metadata * codegen metadata * feat(client): add `HttpRequest#url()` method * codegen metadata * codegen metadata * codegen metadata * codegen metadata * feat(client): allow configuring dispatcher executor service * codegen metadata * codegen metadata * codegen metadata * codegen metadata * release: 0.1.0-alpha.20 --------- Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com>
This commit is contained in:
stainless-app[bot]
committed by
GitHub
GitHub
parent
5572d09902
commit
ded153ef51
+22
@@ -18,6 +18,7 @@ import java.time.Clock
|
||||
import java.time.Duration
|
||||
import java.util.Optional
|
||||
import java.util.concurrent.Executor
|
||||
import java.util.concurrent.ExecutorService
|
||||
import javax.net.ssl.HostnameVerifier
|
||||
import javax.net.ssl.SSLSocketFactory
|
||||
import javax.net.ssl.X509TrustManager
|
||||
@@ -46,11 +47,31 @@ class LangsmithOkHttpClient private constructor() {
|
||||
class Builder internal constructor() {
|
||||
|
||||
private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
|
||||
private var dispatcherExecutorService: ExecutorService? = null
|
||||
private var proxy: Proxy? = null
|
||||
private var sslSocketFactory: SSLSocketFactory? = null
|
||||
private var trustManager: X509TrustManager? = null
|
||||
private var hostnameVerifier: HostnameVerifier? = null
|
||||
|
||||
/**
|
||||
* The executor service to use for running HTTP requests.
|
||||
*
|
||||
* Defaults to OkHttp's
|
||||
* [default executor service](https://github.com/square/okhttp/blob/ace792f443b2ffb17974f5c0d1cecdf589309f26/okhttp/src/commonJvmAndroid/kotlin/okhttp3/Dispatcher.kt#L98-L104).
|
||||
*
|
||||
* This class takes ownership of the executor service and shuts it down when closed.
|
||||
*/
|
||||
fun dispatcherExecutorService(dispatcherExecutorService: ExecutorService?) = apply {
|
||||
this.dispatcherExecutorService = dispatcherExecutorService
|
||||
}
|
||||
|
||||
/**
|
||||
* Alias for calling [Builder.dispatcherExecutorService] with
|
||||
* `dispatcherExecutorService.orElse(null)`.
|
||||
*/
|
||||
fun dispatcherExecutorService(dispatcherExecutorService: Optional<ExecutorService>) =
|
||||
dispatcherExecutorService(dispatcherExecutorService.getOrNull())
|
||||
|
||||
fun proxy(proxy: Proxy?) = apply { this.proxy = proxy }
|
||||
|
||||
/** Alias for calling [Builder.proxy] with `proxy.orElse(null)`. */
|
||||
@@ -334,6 +355,7 @@ class LangsmithOkHttpClient private constructor() {
|
||||
OkHttpClient.builder()
|
||||
.timeout(clientOptions.timeout())
|
||||
.proxy(proxy)
|
||||
.dispatcherExecutorService(dispatcherExecutorService)
|
||||
.sslSocketFactory(sslSocketFactory)
|
||||
.trustManager(trustManager)
|
||||
.hostnameVerifier(hostnameVerifier)
|
||||
|
||||
+22
@@ -18,6 +18,7 @@ import java.time.Clock
|
||||
import java.time.Duration
|
||||
import java.util.Optional
|
||||
import java.util.concurrent.Executor
|
||||
import java.util.concurrent.ExecutorService
|
||||
import javax.net.ssl.HostnameVerifier
|
||||
import javax.net.ssl.SSLSocketFactory
|
||||
import javax.net.ssl.X509TrustManager
|
||||
@@ -46,11 +47,31 @@ class LangsmithOkHttpClientAsync private constructor() {
|
||||
class Builder internal constructor() {
|
||||
|
||||
private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
|
||||
private var dispatcherExecutorService: ExecutorService? = null
|
||||
private var proxy: Proxy? = null
|
||||
private var sslSocketFactory: SSLSocketFactory? = null
|
||||
private var trustManager: X509TrustManager? = null
|
||||
private var hostnameVerifier: HostnameVerifier? = null
|
||||
|
||||
/**
|
||||
* The executor service to use for running HTTP requests.
|
||||
*
|
||||
* Defaults to OkHttp's
|
||||
* [default executor service](https://github.com/square/okhttp/blob/ace792f443b2ffb17974f5c0d1cecdf589309f26/okhttp/src/commonJvmAndroid/kotlin/okhttp3/Dispatcher.kt#L98-L104).
|
||||
*
|
||||
* This class takes ownership of the executor service and shuts it down when closed.
|
||||
*/
|
||||
fun dispatcherExecutorService(dispatcherExecutorService: ExecutorService?) = apply {
|
||||
this.dispatcherExecutorService = dispatcherExecutorService
|
||||
}
|
||||
|
||||
/**
|
||||
* Alias for calling [Builder.dispatcherExecutorService] with
|
||||
* `dispatcherExecutorService.orElse(null)`.
|
||||
*/
|
||||
fun dispatcherExecutorService(dispatcherExecutorService: Optional<ExecutorService>) =
|
||||
dispatcherExecutorService(dispatcherExecutorService.getOrNull())
|
||||
|
||||
fun proxy(proxy: Proxy?) = apply { this.proxy = proxy }
|
||||
|
||||
/** Alias for calling [Builder.proxy] with `proxy.orElse(null)`. */
|
||||
@@ -334,6 +355,7 @@ class LangsmithOkHttpClientAsync private constructor() {
|
||||
OkHttpClient.builder()
|
||||
.timeout(clientOptions.timeout())
|
||||
.proxy(proxy)
|
||||
.dispatcherExecutorService(dispatcherExecutorService)
|
||||
.sslSocketFactory(sslSocketFactory)
|
||||
.trustManager(trustManager)
|
||||
.hostnameVerifier(hostnameVerifier)
|
||||
|
||||
+11
-2
@@ -15,11 +15,13 @@ import java.net.Proxy
|
||||
import java.time.Duration
|
||||
import java.util.concurrent.CancellationException
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import java.util.concurrent.ExecutorService
|
||||
import javax.net.ssl.HostnameVerifier
|
||||
import javax.net.ssl.SSLSocketFactory
|
||||
import javax.net.ssl.X509TrustManager
|
||||
import okhttp3.Call
|
||||
import okhttp3.Callback
|
||||
import okhttp3.Dispatcher
|
||||
import okhttp3.HttpUrl.Companion.toHttpUrl
|
||||
import okhttp3.MediaType
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
@@ -93,9 +95,9 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien
|
||||
clientBuilder.addNetworkInterceptor(
|
||||
HttpLoggingInterceptor().setLevel(logLevel).apply {
|
||||
redactHeader("X-API-Key")
|
||||
redactHeader("X-Tenant-Id")
|
||||
redactHeader("Authorization")
|
||||
redactHeader("X-Organization-Id")
|
||||
redactHeader("Authorization")
|
||||
redactHeader("X-Tenant-Id")
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -203,6 +205,7 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien
|
||||
|
||||
private var timeout: Timeout = Timeout.default()
|
||||
private var proxy: Proxy? = null
|
||||
private var dispatcherExecutorService: ExecutorService? = null
|
||||
private var sslSocketFactory: SSLSocketFactory? = null
|
||||
private var trustManager: X509TrustManager? = null
|
||||
private var hostnameVerifier: HostnameVerifier? = null
|
||||
@@ -213,6 +216,10 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien
|
||||
|
||||
fun proxy(proxy: Proxy?) = apply { this.proxy = proxy }
|
||||
|
||||
fun dispatcherExecutorService(dispatcherExecutorService: ExecutorService?) = apply {
|
||||
this.dispatcherExecutorService = dispatcherExecutorService
|
||||
}
|
||||
|
||||
fun sslSocketFactory(sslSocketFactory: SSLSocketFactory?) = apply {
|
||||
this.sslSocketFactory = sslSocketFactory
|
||||
}
|
||||
@@ -234,6 +241,8 @@ private constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClien
|
||||
.callTimeout(timeout.request())
|
||||
.proxy(proxy)
|
||||
.apply {
|
||||
dispatcherExecutorService?.let { dispatcher(Dispatcher(it)) }
|
||||
|
||||
val sslSocketFactory = sslSocketFactory
|
||||
val trustManager = trustManager
|
||||
if (sslSocketFactory != null && trustManager != null) {
|
||||
|
||||
Reference in New Issue
Block a user