|
1 | 1 | package com.openai.client.okhttp
|
2 | 2 |
|
3 | 3 | import com.openai.core.RequestOptions
|
| 4 | +import com.openai.core.Timeout |
4 | 5 | import com.openai.core.checkRequired
|
5 | 6 | import com.openai.core.http.Headers
|
6 | 7 | import com.openai.core.http.HttpClient
|
@@ -88,13 +89,12 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
|
88 | 89 | )
|
89 | 90 | }
|
90 | 91 |
|
91 |
| - val timeout = requestOptions.timeout |
92 |
| - if (timeout != null) { |
| 92 | + requestOptions.timeout?.let { |
93 | 93 | clientBuilder
|
94 |
| - .connectTimeout(timeout) |
95 |
| - .readTimeout(timeout) |
96 |
| - .writeTimeout(timeout) |
97 |
| - .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) |
| 94 | + .connectTimeout(it.connect()) |
| 95 | + .readTimeout(it.read()) |
| 96 | + .writeTimeout(it.write()) |
| 97 | + .callTimeout(it.request()) |
98 | 98 | }
|
99 | 99 |
|
100 | 100 | val client = clientBuilder.build()
|
@@ -195,23 +195,24 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
|
195 | 195 | class Builder internal constructor() {
|
196 | 196 |
|
197 | 197 | private var baseUrl: HttpUrl? = null
|
198 |
| - // The default timeout is 10 minutes. |
199 |
| - private var timeout: Duration = Duration.ofSeconds(600) |
| 198 | + private var timeout: Timeout = Timeout.default() |
200 | 199 | private var proxy: Proxy? = null
|
201 | 200 |
|
202 | 201 | fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl.toHttpUrl() }
|
203 | 202 |
|
204 |
| - fun timeout(timeout: Duration) = apply { this.timeout = timeout } |
| 203 | + fun timeout(timeout: Timeout) = apply { this.timeout = timeout } |
| 204 | + |
| 205 | + fun timeout(timeout: Duration) = timeout(Timeout.builder().request(timeout).build()) |
205 | 206 |
|
206 | 207 | fun proxy(proxy: Proxy?) = apply { this.proxy = proxy }
|
207 | 208 |
|
208 | 209 | fun build(): OkHttpClient =
|
209 | 210 | OkHttpClient(
|
210 | 211 | okhttp3.OkHttpClient.Builder()
|
211 |
| - .connectTimeout(timeout) |
212 |
| - .readTimeout(timeout) |
213 |
| - .writeTimeout(timeout) |
214 |
| - .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) |
| 212 | + .connectTimeout(timeout.connect()) |
| 213 | + .readTimeout(timeout.read()) |
| 214 | + .writeTimeout(timeout.write()) |
| 215 | + .callTimeout(timeout.request()) |
215 | 216 | .proxy(proxy)
|
216 | 217 | .build(),
|
217 | 218 | checkRequired("baseUrl", baseUrl),
|
|
0 commit comments