diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b4e9013ba..6db19b956 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.16.0" + ".": "0.17.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6721301d1..08b74dd9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## 0.17.0 (2025-01-29) + +Full Changelog: [v0.16.0...v0.17.0](https://github.com/openai/openai-java/compare/v0.16.0...v0.17.0) + +### Features + +* **client:** add `_queryParams` and `_headers` methods ([#177](https://github.com/openai/openai-java/issues/177)) ([2d67005](https://github.com/openai/openai-java/commit/2d67005735b554440ed0578de6a182a73b129ffa)) + + +### Refactors + +* **internal:** extract request preparation logic ([2d67005](https://github.com/openai/openai-java/commit/2d67005735b554440ed0578de6a182a73b129ffa)) + ## 0.16.0 (2025-01-28) Full Changelog: [v0.15.1...v0.16.0](https://github.com/openai/openai-java/compare/v0.15.1...v0.16.0) diff --git a/README.md b/README.md index b83e5ab3b..3d8e15351 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.16.0) -[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.16.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.16.0) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.17.0) +[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.17.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.17.0) @@ -25,7 +25,7 @@ The REST API documentation can be found on [platform.openai.com](https://platfor ### Gradle ```kotlin -implementation("com.openai:openai-java:0.16.0") +implementation("com.openai:openai-java:0.17.0") ``` ### Maven @@ -34,7 +34,7 @@ implementation("com.openai:openai-java:0.16.0") com.openai openai-java - 0.16.0 + 0.17.0 ``` diff --git a/build.gradle.kts b/build.gradle.kts index a19523d92..b2f977628 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.openai" - version = "0.16.0" // x-release-please-version + version = "0.17.0" // x-release-please-version } subprojects { diff --git a/openai-java-core/src/main/kotlin/com/openai/azure/HttpRequestBuilderExtensions.kt b/openai-java-core/src/main/kotlin/com/openai/azure/HttpRequestBuilderExtensions.kt index c6b7ff449..c45a696e0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/azure/HttpRequestBuilderExtensions.kt +++ b/openai-java-core/src/main/kotlin/com/openai/azure/HttpRequestBuilderExtensions.kt @@ -8,9 +8,9 @@ import com.openai.credential.BearerTokenCredential @JvmSynthetic internal fun HttpRequest.Builder.addPathSegmentsForAzure( clientOptions: ClientOptions, - deploymentModel: String + deploymentModel: String? ): HttpRequest.Builder = apply { - if (isAzureEndpoint(clientOptions.baseUrl)) { + if (isAzureEndpoint(clientOptions.baseUrl) && deploymentModel != null) { addPathSegments("openai", "deployments", deploymentModel) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/core/Params.kt b/openai-java-core/src/main/kotlin/com/openai/core/Params.kt new file mode 100644 index 000000000..1ce472aee --- /dev/null +++ b/openai-java-core/src/main/kotlin/com/openai/core/Params.kt @@ -0,0 +1,16 @@ +package com.openai.core + +import com.openai.core.http.Headers +import com.openai.core.http.QueryParams + +/** An interface representing parameters passed to a service method. */ +interface Params { + /** The full set of headers in the parameters, including both fixed and additional headers. */ + fun _headers(): Headers + + /** + * The full set of query params in the parameters, including both fixed and additional query + * params. + */ + fun _queryParams(): QueryParams +} diff --git a/openai-java-core/src/main/kotlin/com/openai/core/PrepareRequest.kt b/openai-java-core/src/main/kotlin/com/openai/core/PrepareRequest.kt new file mode 100644 index 000000000..ab0c04b4a --- /dev/null +++ b/openai-java-core/src/main/kotlin/com/openai/core/PrepareRequest.kt @@ -0,0 +1,36 @@ +@file:JvmName("PrepareRequest") + +package com.openai.core + +import com.openai.azure.addPathSegmentsForAzure +import com.openai.azure.replaceBearerTokenForAzure +import com.openai.core.http.HttpRequest +import java.util.concurrent.CompletableFuture + +@JvmSynthetic +internal fun HttpRequest.prepare( + clientOptions: ClientOptions, + params: Params, + deploymentModel: String? +): HttpRequest = + toBuilder() + // Clear the path segments and add them back below after the Azure path segments. + .pathSegments(listOf()) + .addPathSegmentsForAzure(clientOptions, deploymentModel) + .addPathSegments(*pathSegments.toTypedArray()) + .putAllQueryParams(clientOptions.queryParams) + .replaceAllQueryParams(params._queryParams()) + .putAllHeaders(clientOptions.headers) + .replaceBearerTokenForAzure(clientOptions) + .replaceAllHeaders(params._headers()) + .build() + +@JvmSynthetic +internal fun HttpRequest.prepareAsync( + clientOptions: ClientOptions, + params: Params, + deploymentModel: String? +): CompletableFuture = + // This async version exists to make it easier to add async specific preparation logic in the + // future. + CompletableFuture.completedFuture(prepare(clientOptions, params, deploymentModel)) diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt index b335da29e..dd8802350 100644 --- a/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt +++ b/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt @@ -45,6 +45,10 @@ private constructor( fun url(url: String) = apply { this.url = url } + fun pathSegments(pathSegments: List) = apply { + this.pathSegments = pathSegments.toMutableList() + } + fun addPathSegment(pathSegment: String) = apply { pathSegments.add(pathSegment) } fun addPathSegments(vararg pathSegments: String) = apply { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt index a4431b373..7f4ab1bad 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -22,7 +23,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun batchId(): String = batchId @@ -33,12 +34,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt index 1f93018d9..af95eda47 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -27,7 +28,7 @@ private constructor( private val body: BatchCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * The time frame within which the batch should be processed. Currently only `24h` is supported. @@ -91,11 +92,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BatchCreateBody = body + @JvmSynthetic internal fun _body(): BatchCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class BatchCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt index f42f52478..c758f3433 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -15,7 +16,7 @@ private constructor( private val limit: Long?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A cursor for use in pagination. `after` is an object ID that defines your place in the list. @@ -34,10 +35,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.limit?.let { queryParams.put("limit", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt index 926a164bb..5e70eba94 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -14,7 +15,7 @@ private constructor( private val batchId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun batchId(): String = batchId @@ -22,9 +23,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt index 0c44bb42d..c51c7b9a0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -25,7 +26,7 @@ private constructor( private val body: BetaAssistantCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * ID of the model to use. You can use the @@ -178,11 +179,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaAssistantCreateBody = body + @JvmSynthetic internal fun _body(): BetaAssistantCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class BetaAssistantCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt index ac46d252b..23450f021 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun assistantId(): String = assistantId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt index e3125dce5..0a6aa520b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -21,7 +22,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A cursor for use in pagination. `after` is an object ID that defines your place in the list. @@ -53,10 +54,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt index 0b9af4c31..b02400141 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -14,7 +15,7 @@ private constructor( private val assistantId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun assistantId(): String = assistantId @@ -22,9 +23,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt index 8a3da0061..cd4e741fe 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -26,7 +27,7 @@ private constructor( private val body: BetaAssistantUpdateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun assistantId(): String = assistantId @@ -181,11 +182,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaAssistantUpdateBody = body + @JvmSynthetic internal fun _body(): BetaAssistantUpdateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt index 9ceadfeaf..b1880ba87 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -38,7 +39,7 @@ private constructor( private val body: BetaThreadCreateAndRunBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * The ID of the [assistant](https://platform.openai.com/docs/api-reference/assistants) to use @@ -275,11 +276,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadCreateAndRunBody = body + @JvmSynthetic internal fun _body(): BetaThreadCreateAndRunBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class BetaThreadCreateAndRunBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt index cf8895e7a..0fe6aa91f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -38,7 +39,7 @@ private constructor( private val body: BetaThreadCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A list of [messages](https://platform.openai.com/docs/api-reference/messages) to start the @@ -79,11 +80,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadCreateBody = body + @JvmSynthetic internal fun _body(): BetaThreadCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class BetaThreadCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt index f302c9231..00e226e28 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun threadId(): String = threadId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt index 5670491e4..3ed2bf46b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -39,7 +40,7 @@ private constructor( private val body: BetaThreadMessageCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -86,11 +87,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadMessageCreateBody = body + @JvmSynthetic internal fun _body(): BetaThreadMessageCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt index 018151b53..fbb24cd19 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -19,7 +20,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun threadId(): String = threadId @@ -32,12 +33,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt index d23251efc..c17e209d9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -24,7 +25,7 @@ private constructor( private val runId: String?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -61,10 +62,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt index 96c76735b..a5c3a7f33 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -15,7 +16,7 @@ private constructor( private val messageId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -25,9 +26,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt index 5208aee49..00c9f5766 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt @@ -10,6 +10,7 @@ import com.openai.core.ExcludeMissing import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -25,7 +26,7 @@ private constructor( private val body: BetaThreadMessageUpdateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -44,11 +45,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadMessageUpdateBody = body + @JvmSynthetic internal fun _body(): BetaThreadMessageUpdateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt index 5d87c85df..b35a2d18e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -14,7 +15,7 @@ private constructor( private val threadId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -22,9 +23,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt index 009800d00..7cfc8c7d2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -19,7 +20,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun threadId(): String = threadId @@ -32,12 +33,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt index 0957f8a76..b32bb0b10 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -40,7 +41,7 @@ private constructor( private val body: BetaThreadRunCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -290,12 +291,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadRunCreateBody = body + @JvmSynthetic internal fun _body(): BetaThreadRunCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.include?.let { queryParams.put("include[]", it.map(Any::toString)) } queryParams.putAll(additionalQueryParams) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt index 1fe05a632..5f491b323 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -23,7 +24,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -57,10 +58,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt index 8be9b303b..ef89ec493 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -15,7 +16,7 @@ private constructor( private val runId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -25,9 +26,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt index 38683ae07..b002dff43 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -26,7 +27,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -73,10 +74,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt index f5d4bf4ec..83682606e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -19,7 +20,7 @@ private constructor( private val include: List?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -42,10 +43,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.include?.let { queryParams.put("include[]", it.map(Any::toString)) } queryParams.putAll(additionalQueryParams) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt index 38e29422f..d1ef4fc43 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -31,7 +32,7 @@ private constructor( private val body: BetaThreadRunSubmitToolOutputsBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -49,11 +50,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadRunSubmitToolOutputsBody = body + @JvmSynthetic internal fun _body(): BetaThreadRunSubmitToolOutputsBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt index 54d93523f..c79cfbe2b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt @@ -10,6 +10,7 @@ import com.openai.core.ExcludeMissing import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -25,7 +26,7 @@ private constructor( private val body: BetaThreadRunUpdateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -44,11 +45,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadRunUpdateBody = body + @JvmSynthetic internal fun _body(): BetaThreadRunUpdateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt index d09ace2e0..8cb7ecb51 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -26,7 +27,7 @@ private constructor( private val body: BetaThreadUpdateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun threadId(): String = threadId @@ -57,11 +58,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaThreadUpdateBody = body + @JvmSynthetic internal fun _body(): BetaThreadUpdateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt index 876301d33..0cb5b2480 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -26,7 +27,7 @@ private constructor( private val body: BetaVectorStoreCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy. @@ -77,11 +78,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaVectorStoreCreateBody = body + @JvmSynthetic internal fun _body(): BetaVectorStoreCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class BetaVectorStoreCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt index 3288d5534..69ee69de8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt index f8dd68521..b6e8e6707 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -22,7 +23,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -35,12 +36,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt index a2bb9206c..735f7f9be 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -26,7 +27,7 @@ private constructor( private val body: BetaVectorStoreFileBatchCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -60,11 +61,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaVectorStoreFileBatchCreateBody = body + @JvmSynthetic internal fun _body(): BetaVectorStoreFileBatchCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt index 01857f730..9b20c71f0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -25,7 +26,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -64,10 +65,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt index eac542ce7..02f6783b8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -15,7 +16,7 @@ private constructor( private val batchId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -25,9 +26,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt index b3e875a39..344b31094 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -30,7 +31,7 @@ private constructor( private val body: BetaVectorStoreFileCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -64,11 +65,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaVectorStoreFileCreateBody = body + @JvmSynthetic internal fun _body(): BetaVectorStoreFileCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt index c0b44aa2d..e8e48e504 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -23,7 +24,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -36,12 +37,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt index f090899d0..e067f8176 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -24,7 +25,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -61,10 +62,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt index b685ce300..a3e2d9999 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -15,7 +16,7 @@ private constructor( private val fileId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -25,9 +26,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt index d2f883fea..6492ec127 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -21,7 +22,7 @@ private constructor( private val order: Order?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A cursor for use in pagination. `after` is an object ID that defines your place in the list. @@ -53,10 +54,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.before?.let { queryParams.put("before", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt index 9d42c68bf..0894f09fc 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -14,7 +15,7 @@ private constructor( private val vectorStoreId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -22,9 +23,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt index a3d47387e..dbe62443d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -27,7 +28,7 @@ private constructor( private val body: BetaVectorStoreUpdateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun vectorStoreId(): String = vectorStoreId @@ -56,11 +57,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): BetaVectorStoreUpdateBody = body + @JvmSynthetic internal fun _body(): BetaVectorStoreUpdateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt index aa49e72b9..2c4a03f59 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -47,7 +48,7 @@ private constructor( private val body: ChatCompletionCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A list of messages comprising the conversation so far. Depending on the @@ -545,11 +546,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): ChatCompletionCreateBody = body + @JvmSynthetic internal fun _body(): ChatCompletionCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class ChatCompletionCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt index f93a9f943..0e4b846a5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -37,7 +38,7 @@ private constructor( private val body: CompletionCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * ID of the model to use. You can use the @@ -333,11 +334,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): CompletionCreateBody = body + @JvmSynthetic internal fun _body(): CompletionCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class CompletionCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt index e3c682d72..e960fec2c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -37,7 +38,7 @@ private constructor( private val body: EmbeddingCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * Input text to embed, encoded as a string or array of tokens. To embed multiple inputs in a @@ -121,11 +122,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): EmbeddingCreateBody = body + @JvmSynthetic internal fun _body(): EmbeddingCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class EmbeddingCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt index 067892f4f..cb4b350dd 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun fileId(): String = fileId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt index c54a015cc..7a509d51f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -21,7 +22,7 @@ private constructor( private val purpose: String?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A cursor for use in pagination. `after` is an object ID that defines your place in the list. @@ -49,10 +50,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.limit?.let { queryParams.put("limit", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt index 38d9740c3..692fe646c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -14,7 +15,7 @@ private constructor( private val fileId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun fileId(): String = fileId @@ -22,9 +23,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt index 49a321f9d..06a883235 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun fineTuningJobId(): String = fineTuningJobId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt index 8dae2cc46..b18e8a92d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -17,7 +18,7 @@ private constructor( private val limit: Long?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun fineTuningJobId(): String = fineTuningJobId @@ -31,10 +32,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.limit?.let { queryParams.put("limit", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt index 7c0eb147f..525c0c0c7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -44,7 +45,7 @@ private constructor( private val body: FineTuningJobCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * The name of the model to fine-tune. You can select one of the @@ -192,11 +193,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): FineTuningJobCreateBody = body + @JvmSynthetic internal fun _body(): FineTuningJobCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class FineTuningJobCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt index c745b70a7..c97349b6a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -17,7 +18,7 @@ private constructor( private val limit: Long?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun fineTuningJobId(): String = fineTuningJobId @@ -31,10 +32,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.limit?.let { queryParams.put("limit", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt index b8484ceee..6901ffa6f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -15,7 +16,7 @@ private constructor( private val limit: Long?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** Identifier for the last job from the previous pagination request. */ fun after(): Optional = Optional.ofNullable(after) @@ -27,10 +28,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic - internal fun getQueryParams(): QueryParams { + override fun _queryParams(): QueryParams { val queryParams = QueryParams.builder() this.after?.let { queryParams.put("after", listOf(it.toString())) } this.limit?.let { queryParams.put("limit", listOf(it.toString())) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt index eba4b3db7..d8e5516c7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val fineTuningJobId: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun fineTuningJobId(): String = fineTuningJobId @@ -26,9 +27,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt index 21ff71b5f..c657fe5d4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -27,7 +28,7 @@ private constructor( private val body: ImageGenerateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * A text description of the desired image(s). The maximum length is 1000 characters for @@ -131,11 +132,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): ImageGenerateBody = body + @JvmSynthetic internal fun _body(): ImageGenerateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class ImageGenerateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt index c73d74c69..d72931df1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -20,7 +21,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun model(): String = model @@ -31,12 +32,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt index 54b7b0011..53facb684 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -15,15 +16,15 @@ class ModelListParams private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun _additionalHeaders(): Headers = additionalHeaders fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun toBuilder() = Builder().from(this) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt index 52624c927..bce4f926e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -17,7 +18,7 @@ private constructor( private val model: String, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun model(): String = model @@ -25,9 +26,9 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt index 80b5bfa86..b62a70787 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt @@ -20,6 +20,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers @@ -39,7 +40,7 @@ private constructor( private val body: ModerationCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** * Input (or inputs) to classify. Can be a single string, an array of strings, or an array of @@ -73,11 +74,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): ModerationCreateBody = body + @JvmSynthetic internal fun _body(): ModerationCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class ModerationCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt index 84388165a..8908ba2e2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -18,7 +19,7 @@ private constructor( private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, -) { +) : Params { fun uploadId(): String = uploadId @@ -29,12 +30,12 @@ private constructor( fun _additionalBodyProperties(): Map = additionalBodyProperties @JvmSynthetic - internal fun getBody(): Optional> = + internal fun _body(): Optional> = Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt index 4d43e9c17..047aba7c3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -37,7 +38,7 @@ private constructor( private val body: UploadCompleteBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { fun uploadId(): String = uploadId @@ -65,11 +66,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): UploadCompleteBody = body + @JvmSynthetic internal fun _body(): UploadCompleteBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams fun getPathParam(index: Int): String { return when (index) { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt index d87e05352..72a45ce55 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.Params import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -40,7 +41,7 @@ private constructor( private val body: UploadCreateBody, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, -) { +) : Params { /** The number of bytes in the file you are uploading. */ fun bytes(): Long = body.bytes() @@ -92,11 +93,11 @@ private constructor( fun _additionalQueryParams(): QueryParams = additionalQueryParams - @JvmSynthetic internal fun getBody(): UploadCreateBody = body + @JvmSynthetic internal fun _body(): UploadCreateBody = body - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders + override fun _headers(): Headers = additionalHeaders - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams + override fun _queryParams(): QueryParams = additionalQueryParams @NoAutoDetect class UploadCreateBody diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsyncImpl.kt index 62cf3eff3..ae68e2c33 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.Batch import com.openai.models.BatchCancelParams @@ -39,22 +40,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -69,21 +68,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("batches", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -99,22 +96,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BatchListPageAsync.of(this, params, it) } - } + .let { BatchListPageAsync.of(this, params, it) } + } } private val cancelHandler: Handler = @@ -133,21 +128,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("batches", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { cancelHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { cancelHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/CompletionServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/CompletionServiceAsyncImpl.kt index ea2939ea7..de0667679 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/CompletionServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/CompletionServiceAsyncImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.async -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.JsonValue import com.openai.core.RequestOptions @@ -20,6 +18,7 @@ import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.http.toAsync import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.Completion import com.openai.models.CompletionCreateParams @@ -43,25 +42,21 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val createStreamingHandler: Handler> = @@ -76,23 +71,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() - return clientOptions.httpClient - .executeAsync(request, requestOptions) + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .let { createStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/EmbeddingServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/EmbeddingServiceAsyncImpl.kt index dc111f2c1..5581b1231 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/EmbeddingServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/EmbeddingServiceAsyncImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.async -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.RequestOptions import com.openai.core.handlers.errorHandler @@ -13,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.CreateEmbeddingResponse import com.openai.models.EmbeddingCreateParams @@ -37,24 +36,20 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("embeddings") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsyncImpl.kt index 3bc80c1ae..8b331e294 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.FileDeleteParams import com.openai.models.FileDeleted @@ -39,21 +40,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("files", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -69,22 +68,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { FileListPageAsync.of(this, params, it) } - } + .let { FileListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -99,21 +96,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("files", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/ImageServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/ImageServiceAsyncImpl.kt index 7241b4ea6..1fe5300ed 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/ImageServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/ImageServiceAsyncImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.async -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.RequestOptions import com.openai.core.handlers.errorHandler @@ -13,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.ImageGenerateParams import com.openai.models.ImagesResponse @@ -36,24 +35,20 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().get().toString()) .addPathSegments("images", "generations") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { generateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { generateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsyncImpl.kt index 2b420fb1d..78f9f4845 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.Model import com.openai.models.ModelDeleteParams @@ -42,21 +43,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("models", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -75,22 +74,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("models") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { ModelListPageAsync.of(this, params, it) } - } + .let { ModelListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -108,21 +105,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("models", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/ModerationServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/ModerationServiceAsyncImpl.kt index aad70cfce..da760b555 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/ModerationServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/ModerationServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.ModerationCreateParams import com.openai.models.ModerationCreateResponse @@ -39,21 +40,23 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("moderations") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/UploadServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/UploadServiceAsyncImpl.kt index c021524ef..f39d369b0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/UploadServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/UploadServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.Upload import com.openai.models.UploadCancelParams @@ -62,22 +63,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val cancelHandler: Handler = @@ -92,22 +91,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { cancelHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { cancelHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val completeHandler: Handler = @@ -134,21 +131,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads", params.getPathParam(0), "complete") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { completeHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { completeHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsyncImpl.kt index 3e6a56455..64f5d3cdd 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsyncImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.Assistant import com.openai.models.AssistantDeleted @@ -47,23 +48,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("assistants") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -78,22 +77,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val updateHandler: Handler = @@ -108,23 +105,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { updateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().orElse(null)) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { updateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -140,23 +135,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("assistants") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaAssistantListPageAsync.of(this, params, it) } - } + .let { BetaAssistantListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -171,22 +164,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsyncImpl.kt index 5e159cdbe..0a7aa8253 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsyncImpl.kt @@ -19,6 +19,7 @@ import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.http.toAsync import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.AssistantStreamEvent import com.openai.models.BetaThreadCreateAndRunParams @@ -67,23 +68,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -98,22 +97,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val updateHandler: Handler = @@ -128,23 +125,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { updateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { updateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val deleteHandler: Handler = @@ -159,23 +154,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val createAndRunHandler: Handler = @@ -190,23 +183,25 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createAndRunHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createAndRunHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val createAndRunStreamingHandler: Handler> = @@ -223,24 +218,25 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() - return clientOptions.httpClient - .executeAsync(request, requestOptions) + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .let { createAndRunStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsyncImpl.kt index 2c0e1f30e..f4409ffff 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsyncImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreCreateParams import com.openai.models.BetaVectorStoreDeleteParams @@ -61,23 +62,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -92,22 +91,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val updateHandler: Handler = @@ -122,23 +119,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { updateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { updateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -154,23 +149,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaVectorStoreListPageAsync.of(this, params, it) } - } + .let { BetaVectorStoreListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -185,22 +178,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/MessageServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/MessageServiceAsyncImpl.kt index 015906aeb..146ea661f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/MessageServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/MessageServiceAsyncImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.BetaThreadMessageCreateParams import com.openai.models.BetaThreadMessageDeleteParams @@ -47,23 +48,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "messages") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -83,22 +82,20 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val updateHandler: Handler = @@ -118,23 +115,21 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { updateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { updateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -150,23 +145,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "messages") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaThreadMessageListPageAsync.of(this, params, it) } - } + .let { BetaThreadMessageListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -186,22 +179,20 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncImpl.kt index 5592b8fa6..7b2654734 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncImpl.kt @@ -19,6 +19,7 @@ import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.http.toAsync import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.AssistantStreamEvent import com.openai.models.BetaThreadRunCancelParams @@ -61,23 +62,25 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val createStreamingHandler: Handler> = @@ -94,24 +97,25 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() - return clientOptions.httpClient - .executeAsync(request, requestOptions) + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .let { createStreamingHandler.handle(it) } @@ -138,22 +142,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "runs", params.getPathParam(1)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val updateHandler: Handler = @@ -168,23 +170,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs", params.getPathParam(1)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { updateHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { updateHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -200,23 +200,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaThreadRunListPageAsync.of(this, params, it) } - } + .let { BetaThreadRunListPageAsync.of(this, params, it) } + } } private val cancelHandler: Handler = @@ -237,23 +235,21 @@ internal constructor( params.getPathParam(1), "cancel" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { cancelHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { cancelHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val submitToolOutputsHandler: Handler = @@ -278,23 +274,21 @@ internal constructor( params.getPathParam(1), "submit_tool_outputs" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { submitToolOutputsHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { submitToolOutputsHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val submitToolOutputsStreamingHandler: Handler> = @@ -321,24 +315,21 @@ internal constructor( params.getPathParam(1), "submit_tool_outputs" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() - return clientOptions.httpClient - .executeAsync(request, requestOptions) + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .let { submitToolOutputsStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/runs/StepServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/runs/StepServiceAsyncImpl.kt index 317f0e086..883dc2ec8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/runs/StepServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/runs/StepServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.Headers import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.BetaThreadRunStepListPageAsync import com.openai.models.BetaThreadRunStepListParams @@ -49,22 +50,20 @@ internal constructor( "steps", params.getPathParam(2) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -86,22 +85,20 @@ internal constructor( params.getPathParam(1), "steps" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaThreadRunStepListPageAsync.of(this, params, it) } - } + .let { BetaThreadRunStepListPageAsync.of(this, params, it) } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileBatchServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileBatchServiceAsyncImpl.kt index 8a544f93c..6d530dab9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileBatchServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileBatchServiceAsyncImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreFileBatchCancelParams import com.openai.models.BetaVectorStoreFileBatchCreateParams @@ -45,23 +46,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0), "file_batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -81,22 +80,20 @@ internal constructor( "file_batches", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val cancelHandler: Handler = @@ -120,23 +117,21 @@ internal constructor( params.getPathParam(1), "cancel" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { cancelHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { cancelHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listFilesHandler: Handler = @@ -158,22 +153,20 @@ internal constructor( params.getPathParam(1), "files" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listFilesHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listFilesHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaVectorStoreFileBatchListFilesPageAsync.of(this, params, it) } - } + .let { BetaVectorStoreFileBatchListFilesPageAsync.of(this, params, it) } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileServiceAsyncImpl.kt index 00e724395..eb0cfddc7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/vectorStores/FileServiceAsyncImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreFileCreateParams import com.openai.models.BetaVectorStoreFileDeleteParams @@ -50,23 +51,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0), "files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -86,22 +85,20 @@ internal constructor( "files", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -117,23 +114,21 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores", params.getPathParam(0), "files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { BetaVectorStoreFileListPageAsync.of(this, params, it) } - } + .let { BetaVectorStoreFileListPageAsync.of(this, params, it) } + } } private val deleteHandler: Handler = @@ -157,22 +152,20 @@ internal constructor( "files", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { deleteHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { deleteHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/chat/CompletionServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/chat/CompletionServiceAsyncImpl.kt index 15814464e..06b7d616c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/chat/CompletionServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/chat/CompletionServiceAsyncImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.async.chat -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.JsonValue import com.openai.core.RequestOptions @@ -20,6 +18,7 @@ import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.http.toAsync import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.ChatCompletion import com.openai.models.ChatCompletionChunk @@ -54,25 +53,21 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("chat", "completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val createStreamingHandler: Handler> = @@ -99,23 +94,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("chat", "completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() - return clientOptions.httpClient - .executeAsync(request, requestOptions) + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .let { createStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsyncImpl.kt index 49424d8b1..09026b726 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsyncImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.FineTuningJob import com.openai.models.FineTuningJobCancelParams @@ -57,22 +58,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("fine_tuning", "jobs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { createHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, params.model().toString()) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { createHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val retrieveHandler: Handler = @@ -91,21 +90,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { retrieveHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listHandler: Handler = @@ -121,22 +118,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { FineTuningJobListPageAsync.of(this, params, it) } - } + .let { FineTuningJobListPageAsync.of(this, params, it) } + } } private val cancelHandler: Handler = @@ -151,22 +146,20 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { cancelHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { cancelHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - } + } } private val listEventsHandler: Handler = @@ -182,21 +175,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "events") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listEventsHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listEventsHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { FineTuningJobListEventsPageAsync.of(this, params, it) } - } + .let { FineTuningJobListEventsPageAsync.of(this, params, it) } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/jobs/CheckpointServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/jobs/CheckpointServiceAsyncImpl.kt index c69eb8e34..41c1d4f12 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/jobs/CheckpointServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/jobs/CheckpointServiceAsyncImpl.kt @@ -10,6 +10,7 @@ import com.openai.core.handlers.withErrorHandler import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler +import com.openai.core.prepareAsync import com.openai.errors.OpenAIError import com.openai.models.FineTuningJobCheckpointListPageAsync import com.openai.models.FineTuningJobCheckpointListParams @@ -35,21 +36,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "checkpoints") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() - return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response - -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + .prepareAsync(clientOptions, params, deploymentModel = null) + return request + .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } + .thenApply { response -> + response + .use { listHandler.handle(it) } + .apply { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + validate() + } } - } - .let { FineTuningJobCheckpointListPageAsync.of(this, params, it) } - } + .let { FineTuningJobCheckpointListPageAsync.of(this, params, it) } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchServiceImpl.kt index e5571b8f2..5c4e6d47e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.Batch import com.openai.models.BatchCancelParams @@ -35,12 +36,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -61,11 +59,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("batches", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -86,11 +81,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -116,12 +108,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("batches", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { cancelHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/CompletionServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/CompletionServiceImpl.kt index d72fccceb..bd14765d9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/CompletionServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/CompletionServiceImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.blocking -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.JsonValue import com.openai.core.RequestOptions @@ -18,6 +16,7 @@ import com.openai.core.http.HttpResponse.Handler import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.Completion import com.openai.models.CompletionCreateParams @@ -40,15 +39,10 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -72,21 +66,18 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .let { createStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/EmbeddingServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/EmbeddingServiceImpl.kt index 6e3fab7a2..8c3161536 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/EmbeddingServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/EmbeddingServiceImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.blocking -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.RequestOptions import com.openai.core.handlers.errorHandler @@ -13,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.CreateEmbeddingResponse import com.openai.models.EmbeddingCreateParams @@ -36,15 +35,10 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("embeddings") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileServiceImpl.kt index 1aece60f0..21245a636 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.FileDeleteParams import com.openai.models.FileDeleted @@ -35,11 +36,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("files", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -60,11 +58,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -86,12 +81,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("files", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt index d9f4ca28a..189b35350 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.blocking -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.RequestOptions import com.openai.core.handlers.errorHandler @@ -13,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.ImageGenerateParams import com.openai.models.ImagesResponse @@ -35,15 +34,10 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().get().toString()) .addPathSegments("images", "generations") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { generateHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelServiceImpl.kt index 7e9a3e9a8..ef4c4e744 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.Model import com.openai.models.ModelDeleteParams @@ -38,11 +39,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("models", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, params.model()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -66,11 +64,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("models") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -95,12 +90,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("models", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, params.model()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModerationServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModerationServiceImpl.kt index 97074cf5e..23806c5ae 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModerationServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModerationServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.ModerationCreateParams import com.openai.models.ModerationCreateResponse @@ -38,12 +39,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("moderations") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/UploadServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/UploadServiceImpl.kt index 74e9479ba..f5a368d0f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/UploadServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/UploadServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.Upload import com.openai.models.UploadCancelParams @@ -58,12 +59,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -84,12 +82,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { cancelHandler.handle(it) } @@ -122,12 +117,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("uploads", params.getPathParam(0), "complete") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { completeHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantServiceImpl.kt index 80f112d75..20356b03b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantServiceImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.Assistant import com.openai.models.AssistantDeleted @@ -46,13 +47,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("assistants") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -76,12 +74,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -105,13 +100,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().orElse(null)) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { updateHandler.handle(it) } @@ -136,12 +128,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("assistants") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -166,13 +155,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("assistants", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadServiceImpl.kt index f16bcae65..c8393c03d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadServiceImpl.kt @@ -17,6 +17,7 @@ import com.openai.core.http.HttpResponse.Handler import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.AssistantStreamEvent import com.openai.models.BetaThreadCreateAndRunParams @@ -61,13 +62,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -91,12 +89,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -117,13 +112,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { updateHandler.handle(it) } @@ -147,13 +139,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("threads", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } @@ -177,13 +166,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createAndRunHandler.handle(it) } @@ -209,22 +195,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() + .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .let { createAndRunStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreServiceImpl.kt index e95c288b0..51d0bdf05 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreServiceImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreCreateParams import com.openai.models.BetaVectorStoreDeleteParams @@ -58,13 +59,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -88,12 +86,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -117,13 +112,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { updateHandler.handle(it) } @@ -148,12 +140,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -178,13 +167,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("vector_stores", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/MessageServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/MessageServiceImpl.kt index a51a07750..260b4901a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/MessageServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/MessageServiceImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.BetaThreadMessageCreateParams import com.openai.models.BetaThreadMessageDeleteParams @@ -46,13 +47,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "messages") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -81,12 +79,9 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -115,13 +110,10 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { updateHandler.handle(it) } @@ -146,12 +138,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "messages") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -181,13 +170,10 @@ internal constructor( "messages", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/RunServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/RunServiceImpl.kt index 8ac306075..667d55015 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/RunServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/RunServiceImpl.kt @@ -17,6 +17,7 @@ import com.openai.core.http.HttpResponse.Handler import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.AssistantStreamEvent import com.openai.models.BetaThreadRunCancelParams @@ -55,13 +56,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -87,22 +85,19 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() + .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .let { createStreamingHandler.handle(it) } @@ -128,12 +123,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "runs", params.getPathParam(1)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -154,13 +146,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("threads", params.getPathParam(0), "runs", params.getPathParam(1)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { updateHandler.handle(it) } @@ -185,12 +174,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("threads", params.getPathParam(0), "runs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -218,13 +204,10 @@ internal constructor( params.getPathParam(1), "cancel" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { cancelHandler.handle(it) } @@ -258,13 +241,10 @@ internal constructor( params.getPathParam(1), "submit_tool_outputs" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { submitToolOutputsHandler.handle(it) } @@ -300,22 +280,19 @@ internal constructor( params.getPathParam(1), "submit_tool_outputs" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .let { submitToolOutputsStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/runs/StepServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/runs/StepServiceImpl.kt index e009428d8..054f1df98 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/runs/StepServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/runs/StepServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.Headers import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.BetaThreadRunStepListPage import com.openai.models.BetaThreadRunStepListParams @@ -48,12 +49,9 @@ internal constructor( "steps", params.getPathParam(2) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -84,12 +82,9 @@ internal constructor( params.getPathParam(1), "steps" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileBatchServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileBatchServiceImpl.kt index a5bc685c6..4b507ddec 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileBatchServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileBatchServiceImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreFileBatchCancelParams import com.openai.models.BetaVectorStoreFileBatchCreateParams @@ -44,13 +45,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0), "file_batches") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -79,12 +77,9 @@ internal constructor( "file_batches", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -117,13 +112,10 @@ internal constructor( params.getPathParam(1), "cancel" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { cancelHandler.handle(it) } @@ -154,12 +146,9 @@ internal constructor( params.getPathParam(1), "files" ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listFilesHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileServiceImpl.kt index fd30db4f9..c9a7fdc46 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/vectorStores/FileServiceImpl.kt @@ -12,6 +12,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.BetaVectorStoreFileCreateParams import com.openai.models.BetaVectorStoreFileDeleteParams @@ -49,13 +50,10 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("vector_stores", params.getPathParam(0), "files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .putAllHeaders(DEFAULT_HEADERS) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -84,12 +82,9 @@ internal constructor( "files", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -114,12 +109,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("vector_stores", params.getPathParam(0), "files") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) + .putAllHeaders(DEFAULT_HEADERS) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -153,13 +145,10 @@ internal constructor( "files", params.getPathParam(1) ) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(DEFAULT_HEADERS) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .putAllHeaders(DEFAULT_HEADERS) + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { deleteHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/CompletionServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/CompletionServiceImpl.kt index 849416e69..e8c7d00f9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/CompletionServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/CompletionServiceImpl.kt @@ -2,8 +2,6 @@ package com.openai.services.blocking.chat -import com.openai.azure.addPathSegmentsForAzure -import com.openai.azure.replaceBearerTokenForAzure import com.openai.core.ClientOptions import com.openai.core.JsonValue import com.openai.core.RequestOptions @@ -18,6 +16,7 @@ import com.openai.core.http.HttpResponse.Handler import com.openai.core.http.StreamResponse import com.openai.core.http.map import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.ChatCompletion import com.openai.models.ChatCompletionChunk @@ -51,15 +50,10 @@ internal constructor( val request = HttpRequest.builder() .method(HttpMethod.POST) - .addPathSegmentsForAzure(clientOptions, params.model().toString()) .addPathSegments("chat", "completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceBearerTokenForAzure(clientOptions) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -95,21 +89,18 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("chat", "completions") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .body( json( clientOptions.jsonMapper, params - .getBody() + ._body() .toBuilder() .putAdditionalProperty("stream", JsonValue.from(true)) .build() ) ) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .let { createStreamingHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobServiceImpl.kt index ff3f176eb..fe0991656 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobServiceImpl.kt @@ -11,6 +11,7 @@ import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler import com.openai.core.json +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.FineTuningJob import com.openai.models.FineTuningJobCancelParams @@ -54,12 +55,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("fine_tuning", "jobs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .body(json(clientOptions.jsonMapper, params.getBody())) + .body(json(clientOptions.jsonMapper, params._body())) .build() + .prepare(clientOptions, params, params.model().toString()) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { createHandler.handle(it) } @@ -87,11 +85,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { retrieveHandler.handle(it) } @@ -116,11 +111,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } @@ -145,12 +137,9 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "cancel") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) - .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } + .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { cancelHandler.handle(it) } @@ -175,11 +164,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "events") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listEventsHandler.handle(it) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/jobs/CheckpointServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/jobs/CheckpointServiceImpl.kt index 21e98b965..4e33535c1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/jobs/CheckpointServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/jobs/CheckpointServiceImpl.kt @@ -10,6 +10,7 @@ import com.openai.core.handlers.withErrorHandler import com.openai.core.http.HttpMethod import com.openai.core.http.HttpRequest import com.openai.core.http.HttpResponse.Handler +import com.openai.core.prepare import com.openai.errors.OpenAIError import com.openai.models.FineTuningJobCheckpointListPage import com.openai.models.FineTuningJobCheckpointListParams @@ -34,11 +35,8 @@ internal constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "checkpoints") - .putAllQueryParams(clientOptions.queryParams) - .replaceAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .replaceAllHeaders(params.getHeaders()) .build() + .prepare(clientOptions, params, deploymentModel = null) return clientOptions.httpClient.execute(request, requestOptions).let { response -> response .use { listHandler.handle(it) } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt index 76d36c25a..32706bade 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchCreateParamsTest.kt @@ -23,7 +23,7 @@ class BatchCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BatchCreateParams.builder() .completionWindow(BatchCreateParams.CompletionWindow._24H) @@ -35,7 +35,7 @@ class BatchCreateParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.completionWindow()).isEqualTo(BatchCreateParams.CompletionWindow._24H) assertThat(body.endpoint()).isEqualTo(BatchCreateParams.Endpoint.V1_CHAT_COMPLETIONS) @@ -49,14 +49,14 @@ class BatchCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BatchCreateParams.builder() .completionWindow(BatchCreateParams.CompletionWindow._24H) .endpoint(BatchCreateParams.Endpoint.V1_CHAT_COMPLETIONS) .inputFileId("input_file_id") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.completionWindow()).isEqualTo(BatchCreateParams.CompletionWindow._24H) assertThat(body.endpoint()).isEqualTo(BatchCreateParams.Endpoint.V1_CHAT_COMPLETIONS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt index 67b80dc60..07e97b8ab 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchListParamsTest.kt @@ -14,18 +14,18 @@ class BatchListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BatchListParams.builder().after("after").limit(0L).build() val expected = QueryParams.builder() expected.put("after", "after") expected.put("limit", "0") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BatchListParams.builder().build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantCreateParamsTest.kt index 556d35051..a75c7228b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantCreateParamsTest.kt @@ -48,7 +48,7 @@ class BetaAssistantCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaAssistantCreateParams.builder() .model(ChatModel.GPT_4O) @@ -85,7 +85,7 @@ class BetaAssistantCreateParamsTest { .addTool(CodeInterpreterTool.builder().build()) .topP(1.0) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(ChatModel.GPT_4O) assertThat(body.description()).contains("description") @@ -127,9 +127,9 @@ class BetaAssistantCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaAssistantCreateParams.builder().model(ChatModel.GPT_4O).build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(ChatModel.GPT_4O) } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantListParamsTest.kt index 74cce714d..63aa3990a 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantListParamsTest.kt @@ -19,7 +19,7 @@ class BetaAssistantListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaAssistantListParams.builder() .after("after") @@ -32,13 +32,13 @@ class BetaAssistantListParamsTest { expected.put("before", "before") expected.put("limit", "0") expected.put("order", BetaAssistantListParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaAssistantListParams.builder().build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantUpdateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantUpdateParamsTest.kt index a2620cbaa..5aae75d90 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantUpdateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantUpdateParamsTest.kt @@ -39,7 +39,7 @@ class BetaAssistantUpdateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaAssistantUpdateParams.builder() .assistantId("assistant_id") @@ -67,7 +67,7 @@ class BetaAssistantUpdateParamsTest { .addTool(CodeInterpreterTool.builder().build()) .topP(1.0) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.description()).contains("description") assertThat(body.instructions()).contains("instructions") @@ -99,9 +99,9 @@ class BetaAssistantUpdateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaAssistantUpdateParams.builder().assistantId("assistant_id").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateAndRunParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateAndRunParamsTest.kt index 4c83c3362..01b14cd52 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateAndRunParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateAndRunParamsTest.kt @@ -92,7 +92,7 @@ class BetaThreadCreateAndRunParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadCreateAndRunParams.builder() .assistantId("assistant_id") @@ -175,7 +175,7 @@ class BetaThreadCreateAndRunParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.assistantId()).isEqualTo("assistant_id") assertThat(body.instructions()).contains("instructions") @@ -268,9 +268,9 @@ class BetaThreadCreateAndRunParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadCreateAndRunParams.builder().assistantId("assistant_id").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.assistantId()).isEqualTo("assistant_id") } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateParamsTest.kt index 653a3df82..70e97c49c 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadCreateParamsTest.kt @@ -53,7 +53,7 @@ class BetaThreadCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadCreateParams.builder() .addMessage( @@ -95,7 +95,7 @@ class BetaThreadCreateParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.messages()) .contains( @@ -142,9 +142,9 @@ class BetaThreadCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadCreateParams.builder().build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageCreateParamsTest.kt index e226b151c..69a04fc3d 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageCreateParamsTest.kt @@ -25,7 +25,7 @@ class BetaThreadMessageCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadMessageCreateParams.builder() .threadId("thread_id") @@ -39,7 +39,7 @@ class BetaThreadMessageCreateParamsTest { ) .metadata(JsonValue.from(mapOf())) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.content()).isEqualTo(BetaThreadMessageCreateParams.Content.ofText("string")) assertThat(body.role()).isEqualTo(BetaThreadMessageCreateParams.Role.USER) @@ -56,14 +56,14 @@ class BetaThreadMessageCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadMessageCreateParams.builder() .threadId("thread_id") .content("string") .role(BetaThreadMessageCreateParams.Role.USER) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.content()).isEqualTo(BetaThreadMessageCreateParams.Content.ofText("string")) assertThat(body.role()).isEqualTo(BetaThreadMessageCreateParams.Role.USER) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageListParamsTest.kt index 318c99d91..c06ac3f37 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageListParamsTest.kt @@ -21,7 +21,7 @@ class BetaThreadMessageListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaThreadMessageListParams.builder() .threadId("thread_id") @@ -37,14 +37,14 @@ class BetaThreadMessageListParamsTest { expected.put("limit", "0") expected.put("order", BetaThreadMessageListParams.Order.ASC.toString()) expected.put("run_id", "run_id") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaThreadMessageListParams.builder().threadId("thread_id").build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageUpdateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageUpdateParamsTest.kt index af96b929c..3a8db1253 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageUpdateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageUpdateParamsTest.kt @@ -18,26 +18,26 @@ class BetaThreadMessageUpdateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadMessageUpdateParams.builder() .threadId("thread_id") .messageId("message_id") .metadata(JsonValue.from(mapOf())) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body._metadata()).isEqualTo(JsonValue.from(mapOf())) } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadMessageUpdateParams.builder() .threadId("thread_id") .messageId("message_id") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCreateParamsTest.kt index 0addbde1d..11cb4f76b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCreateParamsTest.kt @@ -50,7 +50,7 @@ class BetaThreadRunCreateParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaThreadRunCreateParams.builder() .threadId("thread_id") @@ -93,22 +93,22 @@ class BetaThreadRunCreateParamsTest { "include[]", RunStepInclude.STEP_DETAILS_TOOL_CALLS_FILE_SEARCH_RESULTS_CONTENT.toString() ) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaThreadRunCreateParams.builder() .threadId("thread_id") .assistantId("assistant_id") .build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getBody() { + fun body() { val params = BetaThreadRunCreateParams.builder() .threadId("thread_id") @@ -146,7 +146,7 @@ class BetaThreadRunCreateParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.assistantId()).isEqualTo("assistant_id") assertThat(body.additionalInstructions()).contains("additional_instructions") @@ -191,13 +191,13 @@ class BetaThreadRunCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadRunCreateParams.builder() .threadId("thread_id") .assistantId("assistant_id") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.assistantId()).isEqualTo("assistant_id") } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunListParamsTest.kt index c990ace5b..1ef0e1d13 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunListParamsTest.kt @@ -20,7 +20,7 @@ class BetaThreadRunListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaThreadRunListParams.builder() .threadId("thread_id") @@ -34,14 +34,14 @@ class BetaThreadRunListParamsTest { expected.put("before", "before") expected.put("limit", "0") expected.put("order", BetaThreadRunListParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaThreadRunListParams.builder().threadId("thread_id").build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepListParamsTest.kt index 73ff43b81..b4babe274 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepListParamsTest.kt @@ -22,7 +22,7 @@ class BetaThreadRunStepListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaThreadRunStepListParams.builder() .threadId("thread_id") @@ -42,15 +42,15 @@ class BetaThreadRunStepListParamsTest { ) expected.put("limit", "0") expected.put("order", BetaThreadRunStepListParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaThreadRunStepListParams.builder().threadId("thread_id").runId("run_id").build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepRetrieveParamsTest.kt index 805a68dbc..d61b65e16 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunStepRetrieveParamsTest.kt @@ -19,7 +19,7 @@ class BetaThreadRunStepRetrieveParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaThreadRunStepRetrieveParams.builder() .threadId("thread_id") @@ -32,11 +32,11 @@ class BetaThreadRunStepRetrieveParamsTest { "include[]", RunStepInclude.STEP_DETAILS_TOOL_CALLS_FILE_SEARCH_RESULTS_CONTENT.toString() ) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaThreadRunStepRetrieveParams.builder() .threadId("thread_id") @@ -44,7 +44,7 @@ class BetaThreadRunStepRetrieveParamsTest { .stepId("step_id") .build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParamsTest.kt index 0685d02ba..018e088f6 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParamsTest.kt @@ -22,7 +22,7 @@ class BetaThreadRunSubmitToolOutputsParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadRunSubmitToolOutputsParams.builder() .threadId("thread_id") @@ -34,7 +34,7 @@ class BetaThreadRunSubmitToolOutputsParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.toolOutputs()) .isEqualTo( @@ -48,14 +48,14 @@ class BetaThreadRunSubmitToolOutputsParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadRunSubmitToolOutputsParams.builder() .threadId("thread_id") .runId("run_id") .addToolOutput(BetaThreadRunSubmitToolOutputsParams.ToolOutput.builder().build()) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.toolOutputs()) .isEqualTo(listOf(BetaThreadRunSubmitToolOutputsParams.ToolOutput.builder().build())) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunUpdateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunUpdateParamsTest.kt index 852f04651..b004a9105 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunUpdateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunUpdateParamsTest.kt @@ -18,23 +18,23 @@ class BetaThreadRunUpdateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadRunUpdateParams.builder() .threadId("thread_id") .runId("run_id") .metadata(JsonValue.from(mapOf())) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body._metadata()).isEqualTo(JsonValue.from(mapOf())) } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadRunUpdateParams.builder().threadId("thread_id").runId("run_id").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadUpdateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadUpdateParamsTest.kt index 376d72230..275124be3 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadUpdateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadUpdateParamsTest.kt @@ -31,7 +31,7 @@ class BetaThreadUpdateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaThreadUpdateParams.builder() .threadId("thread_id") @@ -51,7 +51,7 @@ class BetaThreadUpdateParamsTest { .build() ) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body._metadata()).isEqualTo(JsonValue.from(mapOf())) assertThat(body.toolResources()) @@ -72,9 +72,9 @@ class BetaThreadUpdateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaThreadUpdateParams.builder().threadId("thread_id").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreCreateParamsTest.kt index 50f9aad66..37b17f447 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreCreateParamsTest.kt @@ -20,7 +20,7 @@ class BetaVectorStoreCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaVectorStoreCreateParams.builder() .chunkingStrategy(AutoFileChunkingStrategyParam.builder().build()) @@ -29,7 +29,7 @@ class BetaVectorStoreCreateParamsTest { .metadata(JsonValue.from(mapOf())) .name("name") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.chunkingStrategy()) .contains( @@ -43,9 +43,9 @@ class BetaVectorStoreCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaVectorStoreCreateParams.builder().build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParamsTest.kt index 4bf86d77d..b8f977629 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParamsTest.kt @@ -17,14 +17,14 @@ class BetaVectorStoreFileBatchCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaVectorStoreFileBatchCreateParams.builder() .vectorStoreId("vs_abc123") .addFileId("string") .chunkingStrategy(AutoFileChunkingStrategyParam.builder().build()) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.fileIds()).isEqualTo(listOf("string")) assertThat(body.chunkingStrategy()) @@ -34,13 +34,13 @@ class BetaVectorStoreFileBatchCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaVectorStoreFileBatchCreateParams.builder() .vectorStoreId("vs_abc123") .addFileId("string") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.fileIds()).isEqualTo(listOf("string")) } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParamsTest.kt index c9eae7fad..6322618db 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParamsTest.kt @@ -22,7 +22,7 @@ class BetaVectorStoreFileBatchListFilesParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaVectorStoreFileBatchListFilesParams.builder() .vectorStoreId("vector_store_id") @@ -42,18 +42,18 @@ class BetaVectorStoreFileBatchListFilesParamsTest { ) expected.put("limit", "0") expected.put("order", BetaVectorStoreFileBatchListFilesParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaVectorStoreFileBatchListFilesParams.builder() .vectorStoreId("vector_store_id") .batchId("batch_id") .build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileCreateParamsTest.kt index 09ffd082e..5809d691f 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileCreateParamsTest.kt @@ -17,14 +17,14 @@ class BetaVectorStoreFileCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaVectorStoreFileCreateParams.builder() .vectorStoreId("vs_abc123") .fileId("file_id") .chunkingStrategy(AutoFileChunkingStrategyParam.builder().build()) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.fileId()).isEqualTo("file_id") assertThat(body.chunkingStrategy()) @@ -34,13 +34,13 @@ class BetaVectorStoreFileCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaVectorStoreFileCreateParams.builder() .vectorStoreId("vs_abc123") .fileId("file_id") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.fileId()).isEqualTo("file_id") } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileListParamsTest.kt index 9e61f0cbd..c2f83facd 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileListParamsTest.kt @@ -21,7 +21,7 @@ class BetaVectorStoreFileListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaVectorStoreFileListParams.builder() .vectorStoreId("vector_store_id") @@ -37,15 +37,15 @@ class BetaVectorStoreFileListParamsTest { expected.put("filter", BetaVectorStoreFileListParams.Filter.IN_PROGRESS.toString()) expected.put("limit", "0") expected.put("order", BetaVectorStoreFileListParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaVectorStoreFileListParams.builder().vectorStoreId("vector_store_id").build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreListParamsTest.kt index 0c23defb2..eb9a0ded8 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreListParamsTest.kt @@ -19,7 +19,7 @@ class BetaVectorStoreListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = BetaVectorStoreListParams.builder() .after("after") @@ -32,13 +32,13 @@ class BetaVectorStoreListParamsTest { expected.put("before", "before") expected.put("limit", "0") expected.put("order", BetaVectorStoreListParams.Order.ASC.toString()) - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = BetaVectorStoreListParams.builder().build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreUpdateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreUpdateParamsTest.kt index c39e8be1c..78e174709 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreUpdateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreUpdateParamsTest.kt @@ -19,7 +19,7 @@ class BetaVectorStoreUpdateParamsTest { } @Test - fun getBody() { + fun body() { val params = BetaVectorStoreUpdateParams.builder() .vectorStoreId("vector_store_id") @@ -27,7 +27,7 @@ class BetaVectorStoreUpdateParamsTest { .metadata(JsonValue.from(mapOf())) .name("name") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.expiresAfter()) .contains(BetaVectorStoreUpdateParams.ExpiresAfter.builder().days(1L).build()) @@ -36,9 +36,9 @@ class BetaVectorStoreUpdateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = BetaVectorStoreUpdateParams.builder().vectorStoreId("vector_store_id").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt index e5985c029..7060069b2 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ChatCompletionCreateParamsTest.kt @@ -84,7 +84,7 @@ class ChatCompletionCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = ChatCompletionCreateParams.builder() .addMessage( @@ -160,7 +160,7 @@ class ChatCompletionCreateParamsTest { .topP(1.0) .user("user-1234") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.messages()) .isEqualTo( @@ -266,13 +266,13 @@ class ChatCompletionCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = ChatCompletionCreateParams.builder() .addMessage(ChatCompletionDeveloperMessageParam.builder().content("string").build()) .model(ChatModel.O1) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.messages()) .isEqualTo( diff --git a/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt index d13f8397f..9e5e23272 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/CompletionCreateParamsTest.kt @@ -36,7 +36,7 @@ class CompletionCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = CompletionCreateParams.builder() .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT) @@ -61,7 +61,7 @@ class CompletionCreateParamsTest { .topP(1.0) .user("user-1234") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT) assertThat(body.prompt()) @@ -90,13 +90,13 @@ class CompletionCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = CompletionCreateParams.builder() .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT) .prompt("This is a test.") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT) assertThat(body.prompt()) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt index eb1fe2e1c..eca4d536d 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/EmbeddingCreateParamsTest.kt @@ -19,7 +19,7 @@ class EmbeddingCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = EmbeddingCreateParams.builder() .input("The quick brown fox jumped over the lazy dog") @@ -28,7 +28,7 @@ class EmbeddingCreateParamsTest { .encodingFormat(EmbeddingCreateParams.EncodingFormat.FLOAT) .user("user-1234") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.input()) .isEqualTo( @@ -41,13 +41,13 @@ class EmbeddingCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = EmbeddingCreateParams.builder() .input("The quick brown fox jumped over the lazy dog") .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.input()) .isEqualTo( diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt index 0ac2a0b51..08f624d47 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FileListParamsTest.kt @@ -19,7 +19,7 @@ class FileListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = FileListParams.builder() .after("after") @@ -32,13 +32,13 @@ class FileListParamsTest { expected.put("limit", "0") expected.put("order", FileListParams.Order.ASC.toString()) expected.put("purpose", "purpose") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = FileListParams.builder().build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt index b6733ecba..2158bec96 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCheckpointListParamsTest.kt @@ -18,7 +18,7 @@ class FineTuningJobCheckpointListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = FineTuningJobCheckpointListParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") @@ -28,17 +28,17 @@ class FineTuningJobCheckpointListParamsTest { val expected = QueryParams.builder() expected.put("after", "after") expected.put("limit", "0") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = FineTuningJobCheckpointListParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") .build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt index 17c9c697a..c5fd6b181 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCreateParamsTest.kt @@ -67,7 +67,7 @@ class FineTuningJobCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = FineTuningJobCreateParams.builder() .model(FineTuningJobCreateParams.Model.BABBAGE_002) @@ -124,7 +124,7 @@ class FineTuningJobCreateParamsTest { .suffix("x") .validationFile("file-abc123") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(FineTuningJobCreateParams.Model.BABBAGE_002) assertThat(body.trainingFile()).isEqualTo("file-abc123") @@ -187,13 +187,13 @@ class FineTuningJobCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = FineTuningJobCreateParams.builder() .model(FineTuningJobCreateParams.Model.BABBAGE_002) .trainingFile("file-abc123") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.model()).isEqualTo(FineTuningJobCreateParams.Model.BABBAGE_002) assertThat(body.trainingFile()).isEqualTo("file-abc123") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt index 71251b983..3cae4ebf7 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListEventsParamsTest.kt @@ -18,7 +18,7 @@ class FineTuningJobListEventsParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = FineTuningJobListEventsParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") @@ -28,17 +28,17 @@ class FineTuningJobListEventsParamsTest { val expected = QueryParams.builder() expected.put("after", "after") expected.put("limit", "0") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = FineTuningJobListEventsParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") .build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt index 3fb723e38..db06de4d6 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobListParamsTest.kt @@ -14,18 +14,18 @@ class FineTuningJobListParamsTest { } @Test - fun getQueryParams() { + fun queryParams() { val params = FineTuningJobListParams.builder().after("after").limit(0L).build() val expected = QueryParams.builder() expected.put("after", "after") expected.put("limit", "0") - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } @Test - fun getQueryParamsWithoutOptionalFields() { + fun queryParamsWithoutOptionalFields() { val params = FineTuningJobListParams.builder().build() val expected = QueryParams.builder() - assertThat(params.getQueryParams()).isEqualTo(expected.build()) + assertThat(params._queryParams()).isEqualTo(expected.build()) } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt index ffc969303..bb7235113 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ImageGenerateParamsTest.kt @@ -22,7 +22,7 @@ class ImageGenerateParamsTest { } @Test - fun getBody() { + fun body() { val params = ImageGenerateParams.builder() .prompt("A cute baby sea otter") @@ -34,7 +34,7 @@ class ImageGenerateParamsTest { .style(ImageGenerateParams.Style.VIVID) .user("user-1234") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.prompt()).isEqualTo("A cute baby sea otter") assertThat(body.model()).contains(ImageModel.DALL_E_2) @@ -47,9 +47,9 @@ class ImageGenerateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = ImageGenerateParams.builder().prompt("A cute baby sea otter").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.prompt()).isEqualTo("A cute baby sea otter") } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt index f8161d29a..2bb60d113 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ModerationCreateParamsTest.kt @@ -16,13 +16,13 @@ class ModerationCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = ModerationCreateParams.builder() .input("I want to kill them.") .model(ModerationModel.OMNI_MODERATION_LATEST) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.input()) .isEqualTo(ModerationCreateParams.Input.ofString("I want to kill them.")) @@ -30,9 +30,9 @@ class ModerationCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = ModerationCreateParams.builder().input("I want to kill them.").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.input()) .isEqualTo(ModerationCreateParams.Input.ofString("I want to kill them.")) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt index 5c32dfd19..2adcffe04 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCompleteParamsTest.kt @@ -17,24 +17,24 @@ class UploadCompleteParamsTest { } @Test - fun getBody() { + fun body() { val params = UploadCompleteParams.builder() .uploadId("upload_abc123") .addPartId("string") .md5("md5") .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.partIds()).isEqualTo(listOf("string")) assertThat(body.md5()).contains("md5") } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = UploadCompleteParams.builder().uploadId("upload_abc123").addPartId("string").build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.partIds()).isEqualTo(listOf("string")) } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt index 4adb31471..082b6634c 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCreateParamsTest.kt @@ -18,7 +18,7 @@ class UploadCreateParamsTest { } @Test - fun getBody() { + fun body() { val params = UploadCreateParams.builder() .bytes(0L) @@ -26,7 +26,7 @@ class UploadCreateParamsTest { .mimeType("mime_type") .purpose(FilePurpose.ASSISTANTS) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.bytes()).isEqualTo(0L) assertThat(body.filename()).isEqualTo("filename") @@ -35,7 +35,7 @@ class UploadCreateParamsTest { } @Test - fun getBodyWithoutOptionalFields() { + fun bodyWithoutOptionalFields() { val params = UploadCreateParams.builder() .bytes(0L) @@ -43,7 +43,7 @@ class UploadCreateParamsTest { .mimeType("mime_type") .purpose(FilePurpose.ASSISTANTS) .build() - val body = params.getBody() + val body = params._body() assertThat(body).isNotNull assertThat(body.bytes()).isEqualTo(0L) assertThat(body.filename()).isEqualTo("filename")