Skip to content

Commit 80ca5d9

Browse files
stainless-botStainless Bot
stainless-bot
authored and
Stainless Bot
committed
feat(client)!: add/rename methods for headers/query params
chore: unknown commit message
1 parent 4fd6c23 commit 80ca5d9

27 files changed

+982
-54
lines changed

‎openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClient.kt

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,21 @@ class OpenAIOkHttpClient private constructor() {
5050
clientOptions.putAllHeaders(headers)
5151
}
5252

53-
fun removeHeader(name: String) = apply { clientOptions.removeHeader(name) }
53+
fun replaceHeaders(name: String, value: String) = apply {
54+
clientOptions.replaceHeaders(name, value)
55+
}
56+
57+
fun replaceHeaders(name: String, values: Iterable<String>) = apply {
58+
clientOptions.replaceHeaders(name, values)
59+
}
60+
61+
fun replaceAllHeaders(headers: Map<String, Iterable<String>>) = apply {
62+
clientOptions.replaceAllHeaders(headers)
63+
}
64+
65+
fun removeHeaders(name: String) = apply { clientOptions.removeHeaders(name) }
66+
67+
fun removeAllHeaders(names: Set<String>) = apply { clientOptions.removeAllHeaders(names) }
5468

5569
fun queryParams(queryParams: Map<String, Iterable<String>>) = apply {
5670
clientOptions.queryParams(queryParams)
@@ -68,7 +82,23 @@ class OpenAIOkHttpClient private constructor() {
6882
clientOptions.putAllQueryParams(queryParams)
6983
}
7084

71-
fun removeQueryParam(key: String) = apply { clientOptions.removeQueryParam(key) }
85+
fun replaceQueryParams(key: String, value: String) = apply {
86+
clientOptions.replaceQueryParams(key, value)
87+
}
88+
89+
fun replaceQueryParams(key: String, values: Iterable<String>) = apply {
90+
clientOptions.replaceQueryParams(key, values)
91+
}
92+
93+
fun replaceAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
94+
clientOptions.replaceAllQueryParams(queryParams)
95+
}
96+
97+
fun removeQueryParams(key: String) = apply { clientOptions.removeQueryParams(key) }
98+
99+
fun removeAllQueryParams(keys: Set<String>) = apply {
100+
clientOptions.removeAllQueryParams(keys)
101+
}
72102

73103
fun timeout(timeout: Duration) = apply { this.timeout = timeout }
74104

‎openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClientAsync.kt

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,21 @@ class OpenAIOkHttpClientAsync private constructor() {
5050
clientOptions.putAllHeaders(headers)
5151
}
5252

53-
fun removeHeader(name: String) = apply { clientOptions.removeHeader(name) }
53+
fun replaceHeaders(name: String, value: String) = apply {
54+
clientOptions.replaceHeaders(name, value)
55+
}
56+
57+
fun replaceHeaders(name: String, values: Iterable<String>) = apply {
58+
clientOptions.replaceHeaders(name, values)
59+
}
60+
61+
fun replaceAllHeaders(headers: Map<String, Iterable<String>>) = apply {
62+
clientOptions.replaceAllHeaders(headers)
63+
}
64+
65+
fun removeHeaders(name: String) = apply { clientOptions.removeHeaders(name) }
66+
67+
fun removeAllHeaders(names: Set<String>) = apply { clientOptions.removeAllHeaders(names) }
5468

5569
fun queryParams(queryParams: Map<String, Iterable<String>>) = apply {
5670
clientOptions.queryParams(queryParams)
@@ -68,7 +82,23 @@ class OpenAIOkHttpClientAsync private constructor() {
6882
clientOptions.putAllQueryParams(queryParams)
6983
}
7084

71-
fun removeQueryParam(key: String) = apply { clientOptions.removeQueryParam(key) }
85+
fun replaceQueryParams(key: String, value: String) = apply {
86+
clientOptions.replaceQueryParams(key, value)
87+
}
88+
89+
fun replaceQueryParams(key: String, values: Iterable<String>) = apply {
90+
clientOptions.replaceQueryParams(key, values)
91+
}
92+
93+
fun replaceAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
94+
clientOptions.replaceAllQueryParams(queryParams)
95+
}
96+
97+
fun removeQueryParams(key: String) = apply { clientOptions.removeQueryParams(key) }
98+
99+
fun removeAllQueryParams(keys: Set<String>) = apply {
100+
clientOptions.removeAllQueryParams(keys)
101+
}
72102

73103
fun timeout(timeout: Duration) = apply { this.timeout = timeout }
74104

‎openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,21 @@ private constructor(
8989
headers.forEach(::putHeaders)
9090
}
9191

92-
fun removeHeader(name: String) = apply { headers.removeAll(name) }
92+
fun replaceHeaders(name: String, value: String) = apply {
93+
headers.replaceValues(name, listOf(value))
94+
}
95+
96+
fun replaceHeaders(name: String, values: Iterable<String>) = apply {
97+
headers.replaceValues(name, values)
98+
}
99+
100+
fun replaceAllHeaders(headers: Map<String, Iterable<String>>) = apply {
101+
headers.forEach(::replaceHeaders)
102+
}
103+
104+
fun removeHeaders(name: String) = apply { headers.removeAll(name) }
105+
106+
fun removeAllHeaders(names: Set<String>) = apply { names.forEach(::removeHeaders) }
93107

94108
fun queryParams(queryParams: Map<String, Iterable<String>>) = apply {
95109
this.queryParams.clear()
@@ -106,7 +120,21 @@ private constructor(
106120
queryParams.forEach(::putQueryParams)
107121
}
108122

109-
fun removeQueryParam(key: String) = apply { queryParams.removeAll(key) }
123+
fun replaceQueryParams(key: String, value: String) = apply {
124+
queryParams.replaceValues(key, listOf(value))
125+
}
126+
127+
fun replaceQueryParams(key: String, values: Iterable<String>) = apply {
128+
queryParams.replaceValues(key, values)
129+
}
130+
131+
fun replaceAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
132+
queryParams.forEach(::replaceQueryParams)
133+
}
134+
135+
fun removeQueryParams(key: String) = apply { queryParams.removeAll(key) }
136+
137+
fun removeAllQueryParams(keys: Set<String>) = apply { keys.forEach(::removeQueryParams) }
110138

111139
fun responseValidation(responseValidation: Boolean) = apply {
112140
this.responseValidation = responseValidation

‎openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,23 @@ constructor(
100100
additionalHeaders.forEach(::putAdditionalHeaders)
101101
}
102102

103-
fun removeAdditionalHeader(name: String) = apply { additionalHeaders.removeAll(name) }
103+
fun replaceAdditionalHeaders(name: String, value: String) = apply {
104+
additionalHeaders.replaceValues(name, listOf(value))
105+
}
106+
107+
fun replaceAdditionalHeaders(name: String, values: Iterable<String>) = apply {
108+
additionalHeaders.replaceValues(name, values)
109+
}
110+
111+
fun replaceAllAdditionalHeaders(additionalHeaders: Map<String, Iterable<String>>) = apply {
112+
additionalHeaders.forEach(::replaceAdditionalHeaders)
113+
}
114+
115+
fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.removeAll(name) }
116+
117+
fun removeAllAdditionalHeaders(names: Set<String>) = apply {
118+
names.forEach(::removeAdditionalHeaders)
119+
}
104120

105121
fun additionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) = apply {
106122
this.additionalQueryParams.clear()
@@ -120,7 +136,26 @@ constructor(
120136
additionalQueryParams.forEach(::putAdditionalQueryParams)
121137
}
122138

123-
fun removeAdditionalQueryParam(key: String) = apply { additionalQueryParams.removeAll(key) }
139+
fun replaceAdditionalQueryParams(key: String, value: String) = apply {
140+
additionalQueryParams.replaceValues(key, listOf(value))
141+
}
142+
143+
fun replaceAdditionalQueryParams(key: String, values: Iterable<String>) = apply {
144+
additionalQueryParams.replaceValues(key, values)
145+
}
146+
147+
fun replaceAllAdditionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) =
148+
apply {
149+
additionalQueryParams.forEach(::replaceAdditionalQueryParams)
150+
}
151+
152+
fun removeAdditionalQueryParams(key: String) = apply {
153+
additionalQueryParams.removeAll(key)
154+
}
155+
156+
fun removeAllAdditionalQueryParams(keys: Set<String>) = apply {
157+
keys.forEach(::removeAdditionalQueryParams)
158+
}
124159

125160
fun additionalBodyProperties(additionalBodyProperties: Map<String, JsonValue>) = apply {
126161
this.additionalBodyProperties.clear()

‎openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,23 @@ constructor(
306306
additionalHeaders.forEach(::putAdditionalHeaders)
307307
}
308308

309-
fun removeAdditionalHeader(name: String) = apply { additionalHeaders.removeAll(name) }
309+
fun replaceAdditionalHeaders(name: String, value: String) = apply {
310+
additionalHeaders.replaceValues(name, listOf(value))
311+
}
312+
313+
fun replaceAdditionalHeaders(name: String, values: Iterable<String>) = apply {
314+
additionalHeaders.replaceValues(name, values)
315+
}
316+
317+
fun replaceAllAdditionalHeaders(additionalHeaders: Map<String, Iterable<String>>) = apply {
318+
additionalHeaders.forEach(::replaceAdditionalHeaders)
319+
}
320+
321+
fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.removeAll(name) }
322+
323+
fun removeAllAdditionalHeaders(names: Set<String>) = apply {
324+
names.forEach(::removeAdditionalHeaders)
325+
}
310326

311327
fun additionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) = apply {
312328
this.additionalQueryParams.clear()
@@ -326,7 +342,26 @@ constructor(
326342
additionalQueryParams.forEach(::putAdditionalQueryParams)
327343
}
328344

329-
fun removeAdditionalQueryParam(key: String) = apply { additionalQueryParams.removeAll(key) }
345+
fun replaceAdditionalQueryParams(key: String, value: String) = apply {
346+
additionalQueryParams.replaceValues(key, listOf(value))
347+
}
348+
349+
fun replaceAdditionalQueryParams(key: String, values: Iterable<String>) = apply {
350+
additionalQueryParams.replaceValues(key, values)
351+
}
352+
353+
fun replaceAllAdditionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) =
354+
apply {
355+
additionalQueryParams.forEach(::replaceAdditionalQueryParams)
356+
}
357+
358+
fun removeAdditionalQueryParams(key: String) = apply {
359+
additionalQueryParams.removeAll(key)
360+
}
361+
362+
fun removeAllAdditionalQueryParams(keys: Set<String>) = apply {
363+
keys.forEach(::removeAdditionalQueryParams)
364+
}
330365

331366
fun additionalBodyProperties(additionalBodyProperties: Map<String, JsonValue>) = apply {
332367
this.additionalBodyProperties.clear()

‎openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,23 @@ constructor(
106106
additionalHeaders.forEach(::putAdditionalHeaders)
107107
}
108108

109-
fun removeAdditionalHeader(name: String) = apply { additionalHeaders.removeAll(name) }
109+
fun replaceAdditionalHeaders(name: String, value: String) = apply {
110+
additionalHeaders.replaceValues(name, listOf(value))
111+
}
112+
113+
fun replaceAdditionalHeaders(name: String, values: Iterable<String>) = apply {
114+
additionalHeaders.replaceValues(name, values)
115+
}
116+
117+
fun replaceAllAdditionalHeaders(additionalHeaders: Map<String, Iterable<String>>) = apply {
118+
additionalHeaders.forEach(::replaceAdditionalHeaders)
119+
}
120+
121+
fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.removeAll(name) }
122+
123+
fun removeAllAdditionalHeaders(names: Set<String>) = apply {
124+
names.forEach(::removeAdditionalHeaders)
125+
}
110126

111127
fun additionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) = apply {
112128
this.additionalQueryParams.clear()
@@ -126,7 +142,26 @@ constructor(
126142
additionalQueryParams.forEach(::putAdditionalQueryParams)
127143
}
128144

129-
fun removeAdditionalQueryParam(key: String) = apply { additionalQueryParams.removeAll(key) }
145+
fun replaceAdditionalQueryParams(key: String, value: String) = apply {
146+
additionalQueryParams.replaceValues(key, listOf(value))
147+
}
148+
149+
fun replaceAdditionalQueryParams(key: String, values: Iterable<String>) = apply {
150+
additionalQueryParams.replaceValues(key, values)
151+
}
152+
153+
fun replaceAllAdditionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) =
154+
apply {
155+
additionalQueryParams.forEach(::replaceAdditionalQueryParams)
156+
}
157+
158+
fun removeAdditionalQueryParams(key: String) = apply {
159+
additionalQueryParams.removeAll(key)
160+
}
161+
162+
fun removeAllAdditionalQueryParams(keys: Set<String>) = apply {
163+
keys.forEach(::removeAdditionalQueryParams)
164+
}
130165

131166
fun build(): BatchListParams =
132167
BatchListParams(

‎openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,23 @@ constructor(
8888
additionalHeaders.forEach(::putAdditionalHeaders)
8989
}
9090

91-
fun removeAdditionalHeader(name: String) = apply { additionalHeaders.removeAll(name) }
91+
fun replaceAdditionalHeaders(name: String, value: String) = apply {
92+
additionalHeaders.replaceValues(name, listOf(value))
93+
}
94+
95+
fun replaceAdditionalHeaders(name: String, values: Iterable<String>) = apply {
96+
additionalHeaders.replaceValues(name, values)
97+
}
98+
99+
fun replaceAllAdditionalHeaders(additionalHeaders: Map<String, Iterable<String>>) = apply {
100+
additionalHeaders.forEach(::replaceAdditionalHeaders)
101+
}
102+
103+
fun removeAdditionalHeaders(name: String) = apply { additionalHeaders.removeAll(name) }
104+
105+
fun removeAllAdditionalHeaders(names: Set<String>) = apply {
106+
names.forEach(::removeAdditionalHeaders)
107+
}
92108

93109
fun additionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) = apply {
94110
this.additionalQueryParams.clear()
@@ -108,7 +124,26 @@ constructor(
108124
additionalQueryParams.forEach(::putAdditionalQueryParams)
109125
}
110126

111-
fun removeAdditionalQueryParam(key: String) = apply { additionalQueryParams.removeAll(key) }
127+
fun replaceAdditionalQueryParams(key: String, value: String) = apply {
128+
additionalQueryParams.replaceValues(key, listOf(value))
129+
}
130+
131+
fun replaceAdditionalQueryParams(key: String, values: Iterable<String>) = apply {
132+
additionalQueryParams.replaceValues(key, values)
133+
}
134+
135+
fun replaceAllAdditionalQueryParams(additionalQueryParams: Map<String, Iterable<String>>) =
136+
apply {
137+
additionalQueryParams.forEach(::replaceAdditionalQueryParams)
138+
}
139+
140+
fun removeAdditionalQueryParams(key: String) = apply {
141+
additionalQueryParams.removeAll(key)
142+
}
143+
144+
fun removeAllAdditionalQueryParams(keys: Set<String>) = apply {
145+
keys.forEach(::removeAdditionalQueryParams)
146+
}
112147

113148
fun build(): BatchRetrieveParams =
114149
BatchRetrieveParams(

0 commit comments

Comments
 (0)