Skip to content

Commit 376606d

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore(internal): use better test example values (#222)
chore(internal): rename internal body classes chore(internal): make body class constructors private chore(internal): make body classes for multipart requests chore(internal): misc formatting changes
1 parent 0622daa commit 376606d

File tree

49 files changed

+568
-505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+568
-505
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import java.util.Optional
2525
/** Creates and executes a batch from an uploaded file of requests */
2626
class BatchCreateParams
2727
private constructor(
28-
private val body: BatchCreateBody,
28+
private val body: Body,
2929
private val additionalHeaders: Headers,
3030
private val additionalQueryParams: QueryParams,
3131
) : Params {
@@ -106,16 +106,16 @@ private constructor(
106106

107107
fun _additionalQueryParams(): QueryParams = additionalQueryParams
108108

109-
@JvmSynthetic internal fun _body(): BatchCreateBody = body
109+
@JvmSynthetic internal fun _body(): Body = body
110110

111111
override fun _headers(): Headers = additionalHeaders
112112

113113
override fun _queryParams(): QueryParams = additionalQueryParams
114114

115115
@NoAutoDetect
116-
class BatchCreateBody
116+
class Body
117117
@JsonCreator
118-
internal constructor(
118+
private constructor(
119119
@JsonProperty("completion_window")
120120
@ExcludeMissing
121121
private val completionWindow: JsonField<CompletionWindow> = JsonMissing.of(),
@@ -216,7 +216,7 @@ private constructor(
216216

217217
private var validated: Boolean = false
218218

219-
fun validate(): BatchCreateBody = apply {
219+
fun validate(): Body = apply {
220220
if (validated) {
221221
return@apply
222222
}
@@ -235,7 +235,7 @@ private constructor(
235235
@JvmStatic fun builder() = Builder()
236236
}
237237

238-
/** A builder for [BatchCreateBody]. */
238+
/** A builder for [Body]. */
239239
class Builder internal constructor() {
240240

241241
private var completionWindow: JsonField<CompletionWindow>? = null
@@ -245,12 +245,12 @@ private constructor(
245245
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
246246

247247
@JvmSynthetic
248-
internal fun from(batchCreateBody: BatchCreateBody) = apply {
249-
completionWindow = batchCreateBody.completionWindow
250-
endpoint = batchCreateBody.endpoint
251-
inputFileId = batchCreateBody.inputFileId
252-
metadata = batchCreateBody.metadata
253-
additionalProperties = batchCreateBody.additionalProperties.toMutableMap()
248+
internal fun from(body: Body) = apply {
249+
completionWindow = body.completionWindow
250+
endpoint = body.endpoint
251+
inputFileId = body.inputFileId
252+
metadata = body.metadata
253+
additionalProperties = body.additionalProperties.toMutableMap()
254254
}
255255

256256
/**
@@ -361,8 +361,8 @@ private constructor(
361361
keys.forEach(::removeAdditionalProperty)
362362
}
363363

364-
fun build(): BatchCreateBody =
365-
BatchCreateBody(
364+
fun build(): Body =
365+
Body(
366366
checkRequired("completionWindow", completionWindow),
367367
checkRequired("endpoint", endpoint),
368368
checkRequired("inputFileId", inputFileId),
@@ -376,7 +376,7 @@ private constructor(
376376
return true
377377
}
378378

379-
return /* spotless:off */ other is BatchCreateBody && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalProperties == other.additionalProperties /* spotless:on */
379+
return /* spotless:off */ other is Body && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalProperties == other.additionalProperties /* spotless:on */
380380
}
381381

382382
/* spotless:off */
@@ -386,7 +386,7 @@ private constructor(
386386
override fun hashCode(): Int = hashCode
387387

388388
override fun toString() =
389-
"BatchCreateBody{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalProperties=$additionalProperties}"
389+
"Body{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalProperties=$additionalProperties}"
390390
}
391391

392392
fun toBuilder() = Builder().from(this)
@@ -400,7 +400,7 @@ private constructor(
400400
@NoAutoDetect
401401
class Builder internal constructor() {
402402

403-
private var body: BatchCreateBody.Builder = BatchCreateBody.builder()
403+
private var body: Body.Builder = Body.builder()
404404
private var additionalHeaders: Headers.Builder = Headers.builder()
405405
private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
406406

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import java.util.Optional
2525
/** Create an assistant with a model and instructions. */
2626
class BetaAssistantCreateParams
2727
private constructor(
28-
private val body: BetaAssistantCreateBody,
28+
private val body: Body,
2929
private val additionalHeaders: Headers,
3030
private val additionalQueryParams: QueryParams,
3131
) : Params {
@@ -214,16 +214,16 @@ private constructor(
214214

215215
fun _additionalQueryParams(): QueryParams = additionalQueryParams
216216

217-
@JvmSynthetic internal fun _body(): BetaAssistantCreateBody = body
217+
@JvmSynthetic internal fun _body(): Body = body
218218

219219
override fun _headers(): Headers = additionalHeaders
220220

221221
override fun _queryParams(): QueryParams = additionalQueryParams
222222

223223
@NoAutoDetect
224-
class BetaAssistantCreateBody
224+
class Body
225225
@JsonCreator
226-
internal constructor(
226+
private constructor(
227227
@JsonProperty("model")
228228
@ExcludeMissing
229229
private val model: JsonField<ChatModel> = JsonMissing.of(),
@@ -467,7 +467,7 @@ private constructor(
467467

468468
private var validated: Boolean = false
469469

470-
fun validate(): BetaAssistantCreateBody = apply {
470+
fun validate(): Body = apply {
471471
if (validated) {
472472
return@apply
473473
}
@@ -493,7 +493,7 @@ private constructor(
493493
@JvmStatic fun builder() = Builder()
494494
}
495495

496-
/** A builder for [BetaAssistantCreateBody]. */
496+
/** A builder for [Body]. */
497497
class Builder internal constructor() {
498498

499499
private var model: JsonField<ChatModel>? = null
@@ -510,19 +510,19 @@ private constructor(
510510
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
511511

512512
@JvmSynthetic
513-
internal fun from(betaAssistantCreateBody: BetaAssistantCreateBody) = apply {
514-
model = betaAssistantCreateBody.model
515-
description = betaAssistantCreateBody.description
516-
instructions = betaAssistantCreateBody.instructions
517-
metadata = betaAssistantCreateBody.metadata
518-
name = betaAssistantCreateBody.name
519-
reasoningEffort = betaAssistantCreateBody.reasoningEffort
520-
responseFormat = betaAssistantCreateBody.responseFormat
521-
temperature = betaAssistantCreateBody.temperature
522-
toolResources = betaAssistantCreateBody.toolResources
523-
tools = betaAssistantCreateBody.tools.map { it.toMutableList() }
524-
topP = betaAssistantCreateBody.topP
525-
additionalProperties = betaAssistantCreateBody.additionalProperties.toMutableMap()
513+
internal fun from(body: Body) = apply {
514+
model = body.model
515+
description = body.description
516+
instructions = body.instructions
517+
metadata = body.metadata
518+
name = body.name
519+
reasoningEffort = body.reasoningEffort
520+
responseFormat = body.responseFormat
521+
temperature = body.temperature
522+
toolResources = body.toolResources
523+
tools = body.tools.map { it.toMutableList() }
524+
topP = body.topP
525+
additionalProperties = body.additionalProperties.toMutableMap()
526526
}
527527

528528
/**
@@ -984,8 +984,8 @@ private constructor(
984984
keys.forEach(::removeAdditionalProperty)
985985
}
986986

987-
fun build(): BetaAssistantCreateBody =
988-
BetaAssistantCreateBody(
987+
fun build(): Body =
988+
Body(
989989
checkRequired("model", model),
990990
description,
991991
instructions,
@@ -1006,7 +1006,7 @@ private constructor(
10061006
return true
10071007
}
10081008

1009-
return /* spotless:off */ other is BetaAssistantCreateBody && model == other.model && description == other.description && instructions == other.instructions && metadata == other.metadata && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */
1009+
return /* spotless:off */ other is Body && model == other.model && description == other.description && instructions == other.instructions && metadata == other.metadata && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */
10101010
}
10111011

10121012
/* spotless:off */
@@ -1016,7 +1016,7 @@ private constructor(
10161016
override fun hashCode(): Int = hashCode
10171017

10181018
override fun toString() =
1019-
"BetaAssistantCreateBody{model=$model, description=$description, instructions=$instructions, metadata=$metadata, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}"
1019+
"Body{model=$model, description=$description, instructions=$instructions, metadata=$metadata, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}"
10201020
}
10211021

10221022
fun toBuilder() = Builder().from(this)
@@ -1030,7 +1030,7 @@ private constructor(
10301030
@NoAutoDetect
10311031
class Builder internal constructor() {
10321032

1033-
private var body: BetaAssistantCreateBody.Builder = BetaAssistantCreateBody.builder()
1033+
private var body: Body.Builder = Body.builder()
10341034
private var additionalHeaders: Headers.Builder = Headers.builder()
10351035
private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
10361036

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.util.Optional
2626
class BetaAssistantUpdateParams
2727
private constructor(
2828
private val assistantId: String,
29-
private val body: BetaAssistantUpdateBody,
29+
private val body: Body,
3030
private val additionalHeaders: Headers,
3131
private val additionalQueryParams: QueryParams,
3232
) : Params {
@@ -217,7 +217,7 @@ private constructor(
217217

218218
fun _additionalQueryParams(): QueryParams = additionalQueryParams
219219

220-
@JvmSynthetic internal fun _body(): BetaAssistantUpdateBody = body
220+
@JvmSynthetic internal fun _body(): Body = body
221221

222222
override fun _headers(): Headers = additionalHeaders
223223

@@ -231,9 +231,9 @@ private constructor(
231231
}
232232

233233
@NoAutoDetect
234-
class BetaAssistantUpdateBody
234+
class Body
235235
@JsonCreator
236-
internal constructor(
236+
private constructor(
237237
@JsonProperty("description")
238238
@ExcludeMissing
239239
private val description: JsonField<String> = JsonMissing.of(),
@@ -477,7 +477,7 @@ private constructor(
477477

478478
private var validated: Boolean = false
479479

480-
fun validate(): BetaAssistantUpdateBody = apply {
480+
fun validate(): Body = apply {
481481
if (validated) {
482482
return@apply
483483
}
@@ -503,7 +503,7 @@ private constructor(
503503
@JvmStatic fun builder() = Builder()
504504
}
505505

506-
/** A builder for [BetaAssistantUpdateBody]. */
506+
/** A builder for [Body]. */
507507
class Builder internal constructor() {
508508

509509
private var description: JsonField<String> = JsonMissing.of()
@@ -520,19 +520,19 @@ private constructor(
520520
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
521521

522522
@JvmSynthetic
523-
internal fun from(betaAssistantUpdateBody: BetaAssistantUpdateBody) = apply {
524-
description = betaAssistantUpdateBody.description
525-
instructions = betaAssistantUpdateBody.instructions
526-
metadata = betaAssistantUpdateBody.metadata
527-
model = betaAssistantUpdateBody.model
528-
name = betaAssistantUpdateBody.name
529-
reasoningEffort = betaAssistantUpdateBody.reasoningEffort
530-
responseFormat = betaAssistantUpdateBody.responseFormat
531-
temperature = betaAssistantUpdateBody.temperature
532-
toolResources = betaAssistantUpdateBody.toolResources
533-
tools = betaAssistantUpdateBody.tools.map { it.toMutableList() }
534-
topP = betaAssistantUpdateBody.topP
535-
additionalProperties = betaAssistantUpdateBody.additionalProperties.toMutableMap()
523+
internal fun from(body: Body) = apply {
524+
description = body.description
525+
instructions = body.instructions
526+
metadata = body.metadata
527+
model = body.model
528+
name = body.name
529+
reasoningEffort = body.reasoningEffort
530+
responseFormat = body.responseFormat
531+
temperature = body.temperature
532+
toolResources = body.toolResources
533+
tools = body.tools.map { it.toMutableList() }
534+
topP = body.topP
535+
additionalProperties = body.additionalProperties.toMutableMap()
536536
}
537537

538538
/** The description of the assistant. The maximum length is 512 characters. */
@@ -994,8 +994,8 @@ private constructor(
994994
keys.forEach(::removeAdditionalProperty)
995995
}
996996

997-
fun build(): BetaAssistantUpdateBody =
998-
BetaAssistantUpdateBody(
997+
fun build(): Body =
998+
Body(
999999
description,
10001000
instructions,
10011001
metadata,
@@ -1016,7 +1016,7 @@ private constructor(
10161016
return true
10171017
}
10181018

1019-
return /* spotless:off */ other is BetaAssistantUpdateBody && description == other.description && instructions == other.instructions && metadata == other.metadata && model == other.model && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */
1019+
return /* spotless:off */ other is Body && description == other.description && instructions == other.instructions && metadata == other.metadata && model == other.model && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */
10201020
}
10211021

10221022
/* spotless:off */
@@ -1026,7 +1026,7 @@ private constructor(
10261026
override fun hashCode(): Int = hashCode
10271027

10281028
override fun toString() =
1029-
"BetaAssistantUpdateBody{description=$description, instructions=$instructions, metadata=$metadata, model=$model, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}"
1029+
"Body{description=$description, instructions=$instructions, metadata=$metadata, model=$model, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}"
10301030
}
10311031

10321032
fun toBuilder() = Builder().from(this)
@@ -1041,7 +1041,7 @@ private constructor(
10411041
class Builder internal constructor() {
10421042

10431043
private var assistantId: String? = null
1044-
private var body: BetaAssistantUpdateBody.Builder = BetaAssistantUpdateBody.builder()
1044+
private var body: Body.Builder = Body.builder()
10451045
private var additionalHeaders: Headers.Builder = Headers.builder()
10461046
private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
10471047

0 commit comments

Comments
 (0)