diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 6c7bc2ea..cb9d2541 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.21.1" + ".": "0.22.0" } \ No newline at end of file diff --git a/.stats.yml b/.stats.yml index 58a71565..920dcbc3 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,2 +1,2 @@ configured_endpoints: 61 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai-fc5dbc19505b0035f9e7f88868619f4fb519b048bde011f6154f3132d4be71fb.yml +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai-dfb00c627f58e5180af7a9b29ed2f2aa0764a3b9daa6a32a1cc45bc8e48dfe15.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index cafcd974..38f4bec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # Changelog +## 0.22.0 (2025-02-06) + +Full Changelog: [v0.21.1...v0.22.0](https://github.com/openai/openai-java/compare/v0.21.1...v0.22.0) + +### Features + +* **api:** Add more new Azure service versions ([#208](https://github.com/openai/openai-java/issues/208)) ([a117892](https://github.com/openai/openai-java/commit/a11789220599540173f09d6cc9583365abe5f4e0)) +* **pagination:** avoid fetching when has_more: false ([#209](https://github.com/openai/openai-java/issues/209)) ([183b132](https://github.com/openai/openai-java/commit/183b132bba24beb90168fa77df84a93f0ea92fbe)) + + +### Bug Fixes + +* **api:** add missing `@MustBeClosed` annotations ([#205](https://github.com/openai/openai-java/issues/205)) ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) +* **api:** add missing reasoning effort + model enums ([#207](https://github.com/openai/openai-java/issues/207)) ([8eb2394](https://github.com/openai/openai-java/commit/8eb2394b4ea937b19720d97dae84ed56660845c0)) +* **api:** switch `CompletableFuture<Void>` to `CompletableFuture` ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) +* **client:** add missing validation calls on response ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) +* **client:** always provide a body for `PATCH` methods ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) +* deploymentModel arg ([3ab4110](https://github.com/openai/openai-java/commit/3ab41105d8b3fbb3db24ee96e825611f27713bb2)) + + +### Chores + +* **internal:** minor formatting/style changes ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) +* **internal:** rename some tests ([0a60b9a](https://github.com/openai/openai-java/commit/0a60b9a40ad7f97ed51be3f6a70d674a6a9f1854)) + ## 0.21.1 (2025-02-05) Full Changelog: [v0.21.0...v0.21.1](https://github.com/openai/openai-java/compare/v0.21.0...v0.21.1) diff --git a/README.md b/README.md index fb928517..c415eb30 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.21.1) -[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.21.1/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.21.1) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.22.0) +[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.22.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.22.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.21.1") +implementation("com.openai:openai-java:0.22.0") ``` ### Maven @@ -34,7 +34,7 @@ implementation("com.openai:openai-java:0.21.1") com.openai openai-java - 0.21.1 + 0.22.0 ``` diff --git a/build.gradle.kts b/build.gradle.kts index 52b479b9..792a52cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.openai" - version = "0.21.1" // x-release-please-version + version = "0.22.0" // x-release-please-version } subprojects { diff --git a/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt b/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt index 6cbaeacc..7aa0a252 100644 --- a/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt +++ b/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt @@ -106,8 +106,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val private fun HttpRequest.toRequest(client: okhttp3.OkHttpClient): Request { var body: RequestBody? = body?.toRequestBody() - // OkHttpClient always requires a request body for PUT and POST methods. - if (body == null && (method == HttpMethod.PUT || method == HttpMethod.POST)) { + if (body == null && requiresBody(method)) { body = "".toRequestBody() } @@ -134,6 +133,15 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val return builder.build() } + /** `OkHttpClient` always requires a request body for some methods. */ + private fun requiresBody(method: HttpMethod): Boolean = + when (method) { + HttpMethod.POST, + HttpMethod.PUT, + HttpMethod.PATCH -> true + else -> false + } + private fun HttpRequest.toUrl(): String { url?.let { return it diff --git a/openai-java-core/src/main/kotlin/com/openai/azure/AzureOpenAIServiceVersion.kt b/openai-java-core/src/main/kotlin/com/openai/azure/AzureOpenAIServiceVersion.kt index 1188d2fb..d12665c4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/azure/AzureOpenAIServiceVersion.kt +++ b/openai-java-core/src/main/kotlin/com/openai/azure/AzureOpenAIServiceVersion.kt @@ -16,6 +16,7 @@ class AzureOpenAIServiceVersion private constructor(@get:JvmName("value") val va @JvmStatic val V2023_05_15 = fromString("2023-05-15") @JvmStatic val V2024_02_01 = fromString("2024-02-01") @JvmStatic val V2024_06_01 = fromString("2024-06-01") + @JvmStatic val V2024_10_21 = fromString("2024-10-21") @JvmStatic val V2023_06_01_PREVIEW = fromString("2023-06-01-preview") @JvmStatic val V2023_07_01_PREVIEW = fromString("2023-07-01-preview") @JvmStatic val V2024_02_15_PREVIEW = fromString("2024-02-15-preview") @@ -25,6 +26,9 @@ class AzureOpenAIServiceVersion private constructor(@get:JvmName("value") val va @JvmStatic val V2024_07_01_PREVIEW = fromString("2024-07-01-preview") @JvmStatic val V2024_08_01_PREVIEW = fromString("2024-08-01-preview") @JvmStatic val V2024_09_01_PREVIEW = fromString("2024-09-01-preview") + @JvmStatic val V2024_10_01_PREVIEW = fromString("2024-10-01-preview") + @JvmStatic val V2024_12_01_PREVIEW = fromString("2024-12-01-preview") + @JvmStatic val V2025_01_01_PREVIEW = fromString("2025-01-01-preview") } override fun equals(other: Any?): Boolean = diff --git a/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt b/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt index d23b8222..4aff18a9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt +++ b/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt @@ -4,7 +4,7 @@ package com.openai.core import com.fasterxml.jackson.databind.json.JsonMapper import com.openai.azure.AzureOpenAIServiceVersion -import com.openai.azure.AzureOpenAIServiceVersion.Companion.V2024_06_01 +import com.openai.azure.AzureOpenAIServiceVersion.Companion.V2024_10_21 import com.openai.azure.credential.AzureApiKeyCredential import com.openai.core.http.Headers import com.openai.core.http.HttpClient @@ -262,7 +262,7 @@ private constructor( // Default Azure OpenAI version is used if Azure user doesn't // specific a service API version in 'queryParams'. // We can update the default value every major announcement if needed. - replaceQueryParams("api-version", (azureServiceVersion ?: V2024_06_01).value) + replaceQueryParams("api-version", (azureServiceVersion ?: V2024_10_21).value) } headers.replaceAll(this.headers.build()) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListPage.kt index 87579414..7a39f3aa 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -78,15 +80,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -99,6 +107,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -109,12 +118,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -124,11 +134,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -136,11 +148,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListPageAsync.kt index 2e19ef4c..a1799551 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -81,15 +83,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -102,6 +110,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -112,12 +121,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -127,11 +137,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -139,11 +151,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } 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 27f6d24b..51a37772 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import com.openai.core.Enum import com.openai.core.ExcludeMissing import com.openai.core.JsonField import com.openai.core.JsonMissing @@ -17,6 +18,7 @@ import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable +import com.openai.errors.OpenAIInvalidDataException import java.util.Objects import java.util.Optional @@ -57,6 +59,16 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(): Optional = body.name() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = body.reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -136,6 +148,16 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun _name(): JsonField = body._name() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun _reasoningEffort(): JsonField = body._reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -217,6 +239,9 @@ private constructor( @JsonProperty("name") @ExcludeMissing private val name: JsonField = JsonMissing.of(), + @JsonProperty("reasoning_effort") + @ExcludeMissing + private val reasoningEffort: JsonField = JsonMissing.of(), @JsonProperty("response_format") @ExcludeMissing private val responseFormat: JsonField = JsonMissing.of(), @@ -268,6 +293,17 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(): Optional = Optional.ofNullable(name.getNullable("name")) + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = + Optional.ofNullable(reasoningEffort.getNullable("reasoning_effort")) + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -356,6 +392,18 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ @JsonProperty("name") @ExcludeMissing fun _name(): JsonField = name + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + @JsonProperty("reasoning_effort") + @ExcludeMissing + fun _reasoningEffort(): JsonField = reasoningEffort + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -429,6 +477,7 @@ private constructor( instructions() metadata().ifPresent { it.validate() } name() + reasoningEffort() responseFormat().ifPresent { it.validate() } temperature() toolResources().ifPresent { it.validate() } @@ -452,6 +501,7 @@ private constructor( private var instructions: JsonField = JsonMissing.of() private var metadata: JsonField = JsonMissing.of() private var name: JsonField = JsonMissing.of() + private var reasoningEffort: JsonField = JsonMissing.of() private var responseFormat: JsonField = JsonMissing.of() private var temperature: JsonField = JsonMissing.of() private var toolResources: JsonField = JsonMissing.of() @@ -466,6 +516,7 @@ private constructor( instructions = betaAssistantCreateBody.instructions metadata = betaAssistantCreateBody.metadata name = betaAssistantCreateBody.name + reasoningEffort = betaAssistantCreateBody.reasoningEffort responseFormat = betaAssistantCreateBody.responseFormat temperature = betaAssistantCreateBody.temperature toolResources = betaAssistantCreateBody.toolResources @@ -570,6 +621,40 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: JsonField) = apply { this.name = name } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = + reasoningEffort(JsonField.ofNullable(reasoningEffort)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + this.reasoningEffort = reasoningEffort + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -906,6 +991,7 @@ private constructor( instructions, metadata, name, + reasoningEffort, responseFormat, temperature, toolResources, @@ -920,17 +1006,17 @@ private constructor( return true } - return /* spotless:off */ other is BetaAssistantCreateBody && model == other.model && description == other.description && instructions == other.instructions && metadata == other.metadata && name == other.name && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is BetaAssistantCreateBody && model == other.model && description == other.description && instructions == other.instructions && metadata == other.metadata && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */ } /* spotless:off */ - private val hashCode: Int by lazy { Objects.hash(model, description, instructions, metadata, name, responseFormat, temperature, toolResources, tools, topP, additionalProperties) } + private val hashCode: Int by lazy { Objects.hash(model, description, instructions, metadata, name, reasoningEffort, responseFormat, temperature, toolResources, tools, topP, additionalProperties) } /* spotless:on */ override fun hashCode(): Int = hashCode override fun toString() = - "BetaAssistantCreateBody{model=$model, description=$description, instructions=$instructions, metadata=$metadata, name=$name, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}" + "BetaAssistantCreateBody{model=$model, description=$description, instructions=$instructions, metadata=$metadata, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}" } fun toBuilder() = Builder().from(this) @@ -1047,6 +1133,41 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: JsonField) = apply { body.name(name) } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = apply { + body.reasoningEffort(reasoningEffort) + } + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + body.reasoningEffort(reasoningEffort) + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -1453,6 +1574,115 @@ private constructor( ) } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + class ReasoningEffort + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + /** + * Returns this class instance's raw value. + * + * This is usually only useful if this instance was deserialized from data that doesn't + * match any known member, and you want to know that value. For example, if the SDK is on an + * older version than the API, then the API may respond with new members that the SDK is + * unaware of. + */ + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + companion object { + + @JvmField val LOW = of("low") + + @JvmField val MEDIUM = of("medium") + + @JvmField val HIGH = of("high") + + @JvmStatic fun of(value: String) = ReasoningEffort(JsonField.of(value)) + } + + /** An enum containing [ReasoningEffort]'s known values. */ + enum class Known { + LOW, + MEDIUM, + HIGH, + } + + /** + * An enum containing [ReasoningEffort]'s known values, as well as an [_UNKNOWN] member. + * + * An instance of [ReasoningEffort] can contain an unknown value in a couple of cases: + * - It was deserialized from data that doesn't match any known member. For example, if the + * SDK is on an older version than the API, then the API may respond with new members that + * the SDK is unaware of. + * - It was constructed with an arbitrary value using the [of] method. + */ + enum class Value { + LOW, + MEDIUM, + HIGH, + /** + * An enum member indicating that [ReasoningEffort] was instantiated with an unknown + * value. + */ + _UNKNOWN, + } + + /** + * Returns an enum member corresponding to this class instance's value, or [Value._UNKNOWN] + * if the class was instantiated with an unknown value. + * + * Use the [known] method instead if you're certain the value is always known or if you want + * to throw for the unknown case. + */ + fun value(): Value = + when (this) { + LOW -> Value.LOW + MEDIUM -> Value.MEDIUM + HIGH -> Value.HIGH + else -> Value._UNKNOWN + } + + /** + * Returns an enum member corresponding to this class instance's value. + * + * Use the [value] method instead if you're uncertain the value is always known and don't + * want to throw for the unknown case. + * + * @throws OpenAIInvalidDataException if this class instance's value is a not a known + * member. + */ + fun known(): Known = + when (this) { + LOW -> Known.LOW + MEDIUM -> Known.MEDIUM + HIGH -> Known.HIGH + else -> throw OpenAIInvalidDataException("Unknown ReasoningEffort: $value") + } + + fun asString(): String = _value().asStringOrThrow() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ReasoningEffort && value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + } + /** * A set of resources that are used by the assistant's tools. The resources are specific to the * type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPage.kt index 3e49df03..83ef8f81 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -84,15 +86,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -105,6 +113,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -115,12 +124,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -130,11 +140,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -142,11 +154,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPageAsync.kt index d03e0703..8547031a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } 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 4890dd0e..18bae55b 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import com.openai.core.Enum import com.openai.core.ExcludeMissing import com.openai.core.JsonField import com.openai.core.JsonMissing @@ -17,6 +18,7 @@ import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable +import com.openai.errors.OpenAIInvalidDataException import java.util.Objects import java.util.Optional @@ -55,11 +57,21 @@ private constructor( * your available models, or see our [Model overview](https://platform.openai.com/docs/models) * for descriptions of them. */ - fun model(): Optional = body.model() + fun model(): Optional = body.model() /** The name of the assistant. The maximum length is 256 characters. */ fun name(): Optional = body.name() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = body.reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -134,11 +146,21 @@ private constructor( * your available models, or see our [Model overview](https://platform.openai.com/docs/models) * for descriptions of them. */ - fun _model(): JsonField = body._model() + fun _model(): JsonField = body._model() /** The name of the assistant. The maximum length is 256 characters. */ fun _name(): JsonField = body._name() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun _reasoningEffort(): JsonField = body._reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -223,10 +245,13 @@ private constructor( private val metadata: JsonField = JsonMissing.of(), @JsonProperty("model") @ExcludeMissing - private val model: JsonField = JsonMissing.of(), + private val model: JsonField = JsonMissing.of(), @JsonProperty("name") @ExcludeMissing private val name: JsonField = JsonMissing.of(), + @JsonProperty("reasoning_effort") + @ExcludeMissing + private val reasoningEffort: JsonField = JsonMissing.of(), @JsonProperty("response_format") @ExcludeMissing private val responseFormat: JsonField = JsonMissing.of(), @@ -273,11 +298,22 @@ private constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(): Optional = Optional.ofNullable(model.getNullable("model")) + fun model(): Optional = Optional.ofNullable(model.getNullable("model")) /** The name of the assistant. The maximum length is 256 characters. */ fun name(): Optional = Optional.ofNullable(name.getNullable("name")) + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = + Optional.ofNullable(reasoningEffort.getNullable("reasoning_effort")) + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -361,11 +397,23 @@ private constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - @JsonProperty("model") @ExcludeMissing fun _model(): JsonField = model + @JsonProperty("model") @ExcludeMissing fun _model(): JsonField = model /** The name of the assistant. The maximum length is 256 characters. */ @JsonProperty("name") @ExcludeMissing fun _name(): JsonField = name + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + @JsonProperty("reasoning_effort") + @ExcludeMissing + fun _reasoningEffort(): JsonField = reasoningEffort + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -439,6 +487,7 @@ private constructor( metadata().ifPresent { it.validate() } model() name() + reasoningEffort() responseFormat().ifPresent { it.validate() } temperature() toolResources().ifPresent { it.validate() } @@ -460,8 +509,9 @@ private constructor( private var description: JsonField = JsonMissing.of() private var instructions: JsonField = JsonMissing.of() private var metadata: JsonField = JsonMissing.of() - private var model: JsonField = JsonMissing.of() + private var model: JsonField = JsonMissing.of() private var name: JsonField = JsonMissing.of() + private var reasoningEffort: JsonField = JsonMissing.of() private var responseFormat: JsonField = JsonMissing.of() private var temperature: JsonField = JsonMissing.of() private var toolResources: JsonField = JsonMissing.of() @@ -476,6 +526,7 @@ private constructor( metadata = betaAssistantUpdateBody.metadata model = betaAssistantUpdateBody.model name = betaAssistantUpdateBody.name + reasoningEffort = betaAssistantUpdateBody.reasoningEffort responseFormat = betaAssistantUpdateBody.responseFormat temperature = betaAssistantUpdateBody.temperature toolResources = betaAssistantUpdateBody.toolResources @@ -553,7 +604,15 @@ private constructor( * all of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(model: String) = model(JsonField.of(model)) + fun model(model: Model) = model(JsonField.of(model)) + + /** + * ID of the model to use. You can use the + * [List models](https://platform.openai.com/docs/api-reference/models/list) API to see + * all of your available models, or see our + * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. + */ + fun model(model: JsonField) = apply { this.model = model } /** * ID of the model to use. You can use the @@ -561,7 +620,7 @@ private constructor( * all of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(model: JsonField) = apply { this.model = model } + fun model(value: String) = model(Model.of(value)) /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: String?) = name(JsonField.ofNullable(name)) @@ -572,6 +631,40 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: JsonField) = apply { this.name = name } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = + reasoningEffort(JsonField.ofNullable(reasoningEffort)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + this.reasoningEffort = reasoningEffort + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -908,6 +1001,7 @@ private constructor( metadata, model, name, + reasoningEffort, responseFormat, temperature, toolResources, @@ -922,17 +1016,17 @@ private constructor( return true } - return /* spotless:off */ other is BetaAssistantUpdateBody && description == other.description && instructions == other.instructions && metadata == other.metadata && model == other.model && name == other.name && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is BetaAssistantUpdateBody && description == other.description && instructions == other.instructions && metadata == other.metadata && model == other.model && name == other.name && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolResources == other.toolResources && tools == other.tools && topP == other.topP && additionalProperties == other.additionalProperties /* spotless:on */ } /* spotless:off */ - private val hashCode: Int by lazy { Objects.hash(description, instructions, metadata, model, name, responseFormat, temperature, toolResources, tools, topP, additionalProperties) } + private val hashCode: Int by lazy { Objects.hash(description, instructions, metadata, model, name, reasoningEffort, responseFormat, temperature, toolResources, tools, topP, additionalProperties) } /* spotless:on */ override fun hashCode(): Int = hashCode override fun toString() = - "BetaAssistantUpdateBody{description=$description, instructions=$instructions, metadata=$metadata, model=$model, name=$name, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}" + "BetaAssistantUpdateBody{description=$description, instructions=$instructions, metadata=$metadata, model=$model, name=$name, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolResources=$toolResources, tools=$tools, topP=$topP, additionalProperties=$additionalProperties}" } fun toBuilder() = Builder().from(this) @@ -1026,7 +1120,7 @@ private constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(model: String) = apply { body.model(model) } + fun model(model: Model) = apply { body.model(model) } /** * ID of the model to use. You can use the @@ -1034,7 +1128,15 @@ private constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(model: JsonField) = apply { body.model(model) } + fun model(model: JsonField) = apply { body.model(model) } + + /** + * ID of the model to use. You can use the + * [List models](https://platform.openai.com/docs/api-reference/models/list) API to see all + * of your available models, or see our + * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. + */ + fun model(value: String) = apply { body.model(value) } /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: String?) = apply { body.name(name) } @@ -1045,6 +1147,41 @@ private constructor( /** The name of the assistant. The maximum length is 256 characters. */ fun name(name: JsonField) = apply { body.name(name) } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = apply { + body.reasoningEffort(reasoningEffort) + } + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + body.reasoningEffort(reasoningEffort) + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -1452,6 +1589,369 @@ private constructor( ) } + /** + * ID of the model to use. You can use the + * [List models](https://platform.openai.com/docs/api-reference/models/list) API to see all of + * your available models, or see our [Model overview](https://platform.openai.com/docs/models) + * for descriptions of them. + */ + class Model + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + /** + * Returns this class instance's raw value. + * + * This is usually only useful if this instance was deserialized from data that doesn't + * match any known member, and you want to know that value. For example, if the SDK is on an + * older version than the API, then the API may respond with new members that the SDK is + * unaware of. + */ + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + companion object { + + @JvmField val O3_MINI = of("o3-mini") + + @JvmField val O3_MINI_2025_01_31 = of("o3-mini-2025-01-31") + + @JvmField val O1 = of("o1") + + @JvmField val O1_2024_12_17 = of("o1-2024-12-17") + + @JvmField val GPT_4O = of("gpt-4o") + + @JvmField val GPT_4O_2024_11_20 = of("gpt-4o-2024-11-20") + + @JvmField val GPT_4O_2024_08_06 = of("gpt-4o-2024-08-06") + + @JvmField val GPT_4O_2024_05_13 = of("gpt-4o-2024-05-13") + + @JvmField val GPT_4O_MINI = of("gpt-4o-mini") + + @JvmField val GPT_4O_MINI_2024_07_18 = of("gpt-4o-mini-2024-07-18") + + @JvmField val GPT_4_TURBO = of("gpt-4-turbo") + + @JvmField val GPT_4_TURBO_2024_04_09 = of("gpt-4-turbo-2024-04-09") + + @JvmField val GPT_4_0125_PREVIEW = of("gpt-4-0125-preview") + + @JvmField val GPT_4_TURBO_PREVIEW = of("gpt-4-turbo-preview") + + @JvmField val GPT_4_1106_PREVIEW = of("gpt-4-1106-preview") + + @JvmField val GPT_4_VISION_PREVIEW = of("gpt-4-vision-preview") + + @JvmField val GPT_4 = of("gpt-4") + + @JvmField val GPT_4_0314 = of("gpt-4-0314") + + @JvmField val GPT_4_0613 = of("gpt-4-0613") + + @JvmField val GPT_4_32K = of("gpt-4-32k") + + @JvmField val GPT_4_32K_0314 = of("gpt-4-32k-0314") + + @JvmField val GPT_4_32K_0613 = of("gpt-4-32k-0613") + + @JvmField val GPT_3_5_TURBO = of("gpt-3.5-turbo") + + @JvmField val GPT_3_5_TURBO_16K = of("gpt-3.5-turbo-16k") + + @JvmField val GPT_3_5_TURBO_0613 = of("gpt-3.5-turbo-0613") + + @JvmField val GPT_3_5_TURBO_1106 = of("gpt-3.5-turbo-1106") + + @JvmField val GPT_3_5_TURBO_0125 = of("gpt-3.5-turbo-0125") + + @JvmField val GPT_3_5_TURBO_16K_0613 = of("gpt-3.5-turbo-16k-0613") + + @JvmStatic fun of(value: String) = Model(JsonField.of(value)) + } + + /** An enum containing [Model]'s known values. */ + enum class Known { + O3_MINI, + O3_MINI_2025_01_31, + O1, + O1_2024_12_17, + GPT_4O, + GPT_4O_2024_11_20, + GPT_4O_2024_08_06, + GPT_4O_2024_05_13, + GPT_4O_MINI, + GPT_4O_MINI_2024_07_18, + GPT_4_TURBO, + GPT_4_TURBO_2024_04_09, + GPT_4_0125_PREVIEW, + GPT_4_TURBO_PREVIEW, + GPT_4_1106_PREVIEW, + GPT_4_VISION_PREVIEW, + GPT_4, + GPT_4_0314, + GPT_4_0613, + GPT_4_32K, + GPT_4_32K_0314, + GPT_4_32K_0613, + GPT_3_5_TURBO, + GPT_3_5_TURBO_16K, + GPT_3_5_TURBO_0613, + GPT_3_5_TURBO_1106, + GPT_3_5_TURBO_0125, + GPT_3_5_TURBO_16K_0613, + } + + /** + * An enum containing [Model]'s known values, as well as an [_UNKNOWN] member. + * + * An instance of [Model] can contain an unknown value in a couple of cases: + * - It was deserialized from data that doesn't match any known member. For example, if the + * SDK is on an older version than the API, then the API may respond with new members that + * the SDK is unaware of. + * - It was constructed with an arbitrary value using the [of] method. + */ + enum class Value { + O3_MINI, + O3_MINI_2025_01_31, + O1, + O1_2024_12_17, + GPT_4O, + GPT_4O_2024_11_20, + GPT_4O_2024_08_06, + GPT_4O_2024_05_13, + GPT_4O_MINI, + GPT_4O_MINI_2024_07_18, + GPT_4_TURBO, + GPT_4_TURBO_2024_04_09, + GPT_4_0125_PREVIEW, + GPT_4_TURBO_PREVIEW, + GPT_4_1106_PREVIEW, + GPT_4_VISION_PREVIEW, + GPT_4, + GPT_4_0314, + GPT_4_0613, + GPT_4_32K, + GPT_4_32K_0314, + GPT_4_32K_0613, + GPT_3_5_TURBO, + GPT_3_5_TURBO_16K, + GPT_3_5_TURBO_0613, + GPT_3_5_TURBO_1106, + GPT_3_5_TURBO_0125, + GPT_3_5_TURBO_16K_0613, + /** An enum member indicating that [Model] was instantiated with an unknown value. */ + _UNKNOWN, + } + + /** + * Returns an enum member corresponding to this class instance's value, or [Value._UNKNOWN] + * if the class was instantiated with an unknown value. + * + * Use the [known] method instead if you're certain the value is always known or if you want + * to throw for the unknown case. + */ + fun value(): Value = + when (this) { + O3_MINI -> Value.O3_MINI + O3_MINI_2025_01_31 -> Value.O3_MINI_2025_01_31 + O1 -> Value.O1 + O1_2024_12_17 -> Value.O1_2024_12_17 + GPT_4O -> Value.GPT_4O + GPT_4O_2024_11_20 -> Value.GPT_4O_2024_11_20 + GPT_4O_2024_08_06 -> Value.GPT_4O_2024_08_06 + GPT_4O_2024_05_13 -> Value.GPT_4O_2024_05_13 + GPT_4O_MINI -> Value.GPT_4O_MINI + GPT_4O_MINI_2024_07_18 -> Value.GPT_4O_MINI_2024_07_18 + GPT_4_TURBO -> Value.GPT_4_TURBO + GPT_4_TURBO_2024_04_09 -> Value.GPT_4_TURBO_2024_04_09 + GPT_4_0125_PREVIEW -> Value.GPT_4_0125_PREVIEW + GPT_4_TURBO_PREVIEW -> Value.GPT_4_TURBO_PREVIEW + GPT_4_1106_PREVIEW -> Value.GPT_4_1106_PREVIEW + GPT_4_VISION_PREVIEW -> Value.GPT_4_VISION_PREVIEW + GPT_4 -> Value.GPT_4 + GPT_4_0314 -> Value.GPT_4_0314 + GPT_4_0613 -> Value.GPT_4_0613 + GPT_4_32K -> Value.GPT_4_32K + GPT_4_32K_0314 -> Value.GPT_4_32K_0314 + GPT_4_32K_0613 -> Value.GPT_4_32K_0613 + GPT_3_5_TURBO -> Value.GPT_3_5_TURBO + GPT_3_5_TURBO_16K -> Value.GPT_3_5_TURBO_16K + GPT_3_5_TURBO_0613 -> Value.GPT_3_5_TURBO_0613 + GPT_3_5_TURBO_1106 -> Value.GPT_3_5_TURBO_1106 + GPT_3_5_TURBO_0125 -> Value.GPT_3_5_TURBO_0125 + GPT_3_5_TURBO_16K_0613 -> Value.GPT_3_5_TURBO_16K_0613 + else -> Value._UNKNOWN + } + + /** + * Returns an enum member corresponding to this class instance's value. + * + * Use the [value] method instead if you're uncertain the value is always known and don't + * want to throw for the unknown case. + * + * @throws OpenAIInvalidDataException if this class instance's value is a not a known + * member. + */ + fun known(): Known = + when (this) { + O3_MINI -> Known.O3_MINI + O3_MINI_2025_01_31 -> Known.O3_MINI_2025_01_31 + O1 -> Known.O1 + O1_2024_12_17 -> Known.O1_2024_12_17 + GPT_4O -> Known.GPT_4O + GPT_4O_2024_11_20 -> Known.GPT_4O_2024_11_20 + GPT_4O_2024_08_06 -> Known.GPT_4O_2024_08_06 + GPT_4O_2024_05_13 -> Known.GPT_4O_2024_05_13 + GPT_4O_MINI -> Known.GPT_4O_MINI + GPT_4O_MINI_2024_07_18 -> Known.GPT_4O_MINI_2024_07_18 + GPT_4_TURBO -> Known.GPT_4_TURBO + GPT_4_TURBO_2024_04_09 -> Known.GPT_4_TURBO_2024_04_09 + GPT_4_0125_PREVIEW -> Known.GPT_4_0125_PREVIEW + GPT_4_TURBO_PREVIEW -> Known.GPT_4_TURBO_PREVIEW + GPT_4_1106_PREVIEW -> Known.GPT_4_1106_PREVIEW + GPT_4_VISION_PREVIEW -> Known.GPT_4_VISION_PREVIEW + GPT_4 -> Known.GPT_4 + GPT_4_0314 -> Known.GPT_4_0314 + GPT_4_0613 -> Known.GPT_4_0613 + GPT_4_32K -> Known.GPT_4_32K + GPT_4_32K_0314 -> Known.GPT_4_32K_0314 + GPT_4_32K_0613 -> Known.GPT_4_32K_0613 + GPT_3_5_TURBO -> Known.GPT_3_5_TURBO + GPT_3_5_TURBO_16K -> Known.GPT_3_5_TURBO_16K + GPT_3_5_TURBO_0613 -> Known.GPT_3_5_TURBO_0613 + GPT_3_5_TURBO_1106 -> Known.GPT_3_5_TURBO_1106 + GPT_3_5_TURBO_0125 -> Known.GPT_3_5_TURBO_0125 + GPT_3_5_TURBO_16K_0613 -> Known.GPT_3_5_TURBO_16K_0613 + else -> throw OpenAIInvalidDataException("Unknown Model: $value") + } + + fun asString(): String = _value().asStringOrThrow() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is Model && value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + } + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + class ReasoningEffort + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + /** + * Returns this class instance's raw value. + * + * This is usually only useful if this instance was deserialized from data that doesn't + * match any known member, and you want to know that value. For example, if the SDK is on an + * older version than the API, then the API may respond with new members that the SDK is + * unaware of. + */ + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + companion object { + + @JvmField val LOW = of("low") + + @JvmField val MEDIUM = of("medium") + + @JvmField val HIGH = of("high") + + @JvmStatic fun of(value: String) = ReasoningEffort(JsonField.of(value)) + } + + /** An enum containing [ReasoningEffort]'s known values. */ + enum class Known { + LOW, + MEDIUM, + HIGH, + } + + /** + * An enum containing [ReasoningEffort]'s known values, as well as an [_UNKNOWN] member. + * + * An instance of [ReasoningEffort] can contain an unknown value in a couple of cases: + * - It was deserialized from data that doesn't match any known member. For example, if the + * SDK is on an older version than the API, then the API may respond with new members that + * the SDK is unaware of. + * - It was constructed with an arbitrary value using the [of] method. + */ + enum class Value { + LOW, + MEDIUM, + HIGH, + /** + * An enum member indicating that [ReasoningEffort] was instantiated with an unknown + * value. + */ + _UNKNOWN, + } + + /** + * Returns an enum member corresponding to this class instance's value, or [Value._UNKNOWN] + * if the class was instantiated with an unknown value. + * + * Use the [known] method instead if you're certain the value is always known or if you want + * to throw for the unknown case. + */ + fun value(): Value = + when (this) { + LOW -> Value.LOW + MEDIUM -> Value.MEDIUM + HIGH -> Value.HIGH + else -> Value._UNKNOWN + } + + /** + * Returns an enum member corresponding to this class instance's value. + * + * Use the [value] method instead if you're uncertain the value is always known and don't + * want to throw for the unknown case. + * + * @throws OpenAIInvalidDataException if this class instance's value is a not a known + * member. + */ + fun known(): Known = + when (this) { + LOW -> Known.LOW + MEDIUM -> Known.MEDIUM + HIGH -> Known.HIGH + else -> throw OpenAIInvalidDataException("Unknown ReasoningEffort: $value") + } + + fun asString(): String = _value().asStringOrThrow() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ReasoningEffort && value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + } + /** * A set of resources that are used by the assistant's tools. The resources are specific to the * type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPage.kt index dbb0e55d..eb321ae8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -84,15 +86,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -105,6 +113,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -115,12 +124,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -130,11 +140,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -142,11 +154,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPageAsync.kt index f2f02294..bd34ed34 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } 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 2dbc4ffc..b4085618 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 @@ -118,6 +118,16 @@ private constructor( */ fun parallelToolCalls(): Optional = body.parallelToolCalls() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = body.reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -239,6 +249,16 @@ private constructor( */ fun _parallelToolCalls(): JsonField = body._parallelToolCalls() + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + fun _reasoningEffort(): JsonField = body._reasoningEffort() + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -353,6 +373,9 @@ private constructor( @JsonProperty("parallel_tool_calls") @ExcludeMissing private val parallelToolCalls: JsonField = JsonMissing.of(), + @JsonProperty("reasoning_effort") + @ExcludeMissing + private val reasoningEffort: JsonField = JsonMissing.of(), @JsonProperty("response_format") @ExcludeMissing private val responseFormat: JsonField = JsonMissing.of(), @@ -444,6 +467,17 @@ private constructor( fun parallelToolCalls(): Optional = Optional.ofNullable(parallelToolCalls.getNullable("parallel_tool_calls")) + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(): Optional = + Optional.ofNullable(reasoningEffort.getNullable("reasoning_effort")) + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -585,6 +619,18 @@ private constructor( @ExcludeMissing fun _parallelToolCalls(): JsonField = parallelToolCalls + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + @JsonProperty("reasoning_effort") + @ExcludeMissing + fun _reasoningEffort(): JsonField = reasoningEffort + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -673,6 +719,7 @@ private constructor( metadata().ifPresent { it.validate() } model() parallelToolCalls() + reasoningEffort() responseFormat().ifPresent { it.validate() } temperature() toolChoice().ifPresent { it.validate() } @@ -701,6 +748,7 @@ private constructor( private var metadata: JsonField = JsonMissing.of() private var model: JsonField = JsonMissing.of() private var parallelToolCalls: JsonField = JsonMissing.of() + private var reasoningEffort: JsonField = JsonMissing.of() private var responseFormat: JsonField = JsonMissing.of() private var temperature: JsonField = JsonMissing.of() private var toolChoice: JsonField = JsonMissing.of() @@ -721,6 +769,7 @@ private constructor( metadata = betaThreadRunCreateBody.metadata model = betaThreadRunCreateBody.model parallelToolCalls = betaThreadRunCreateBody.parallelToolCalls + reasoningEffort = betaThreadRunCreateBody.reasoningEffort responseFormat = betaThreadRunCreateBody.responseFormat temperature = betaThreadRunCreateBody.temperature toolChoice = betaThreadRunCreateBody.toolChoice @@ -979,6 +1028,40 @@ private constructor( this.parallelToolCalls = parallelToolCalls } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = + reasoningEffort(JsonField.ofNullable(reasoningEffort)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + this.reasoningEffort = reasoningEffort + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -1372,6 +1455,7 @@ private constructor( metadata, model, parallelToolCalls, + reasoningEffort, responseFormat, temperature, toolChoice, @@ -1387,17 +1471,17 @@ private constructor( return true } - return /* spotless:off */ other is BetaThreadRunCreateBody && assistantId == other.assistantId && additionalInstructions == other.additionalInstructions && additionalMessages == other.additionalMessages && instructions == other.instructions && maxCompletionTokens == other.maxCompletionTokens && maxPromptTokens == other.maxPromptTokens && metadata == other.metadata && model == other.model && parallelToolCalls == other.parallelToolCalls && responseFormat == other.responseFormat && temperature == other.temperature && toolChoice == other.toolChoice && tools == other.tools && topP == other.topP && truncationStrategy == other.truncationStrategy && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is BetaThreadRunCreateBody && assistantId == other.assistantId && additionalInstructions == other.additionalInstructions && additionalMessages == other.additionalMessages && instructions == other.instructions && maxCompletionTokens == other.maxCompletionTokens && maxPromptTokens == other.maxPromptTokens && metadata == other.metadata && model == other.model && parallelToolCalls == other.parallelToolCalls && reasoningEffort == other.reasoningEffort && responseFormat == other.responseFormat && temperature == other.temperature && toolChoice == other.toolChoice && tools == other.tools && topP == other.topP && truncationStrategy == other.truncationStrategy && additionalProperties == other.additionalProperties /* spotless:on */ } /* spotless:off */ - private val hashCode: Int by lazy { Objects.hash(assistantId, additionalInstructions, additionalMessages, instructions, maxCompletionTokens, maxPromptTokens, metadata, model, parallelToolCalls, responseFormat, temperature, toolChoice, tools, topP, truncationStrategy, additionalProperties) } + private val hashCode: Int by lazy { Objects.hash(assistantId, additionalInstructions, additionalMessages, instructions, maxCompletionTokens, maxPromptTokens, metadata, model, parallelToolCalls, reasoningEffort, responseFormat, temperature, toolChoice, tools, topP, truncationStrategy, additionalProperties) } /* spotless:on */ override fun hashCode(): Int = hashCode override fun toString() = - "BetaThreadRunCreateBody{assistantId=$assistantId, additionalInstructions=$additionalInstructions, additionalMessages=$additionalMessages, instructions=$instructions, maxCompletionTokens=$maxCompletionTokens, maxPromptTokens=$maxPromptTokens, metadata=$metadata, model=$model, parallelToolCalls=$parallelToolCalls, responseFormat=$responseFormat, temperature=$temperature, toolChoice=$toolChoice, tools=$tools, topP=$topP, truncationStrategy=$truncationStrategy, additionalProperties=$additionalProperties}" + "BetaThreadRunCreateBody{assistantId=$assistantId, additionalInstructions=$additionalInstructions, additionalMessages=$additionalMessages, instructions=$instructions, maxCompletionTokens=$maxCompletionTokens, maxPromptTokens=$maxPromptTokens, metadata=$metadata, model=$model, parallelToolCalls=$parallelToolCalls, reasoningEffort=$reasoningEffort, responseFormat=$responseFormat, temperature=$temperature, toolChoice=$toolChoice, tools=$tools, topP=$topP, truncationStrategy=$truncationStrategy, additionalProperties=$additionalProperties}" } fun toBuilder() = Builder().from(this) @@ -1698,6 +1782,41 @@ private constructor( body.parallelToolCalls(parallelToolCalls) } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: ReasoningEffort?) = apply { + body.reasoningEffort(reasoningEffort) + } + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: JsonField) = apply { + body.reasoningEffort(reasoningEffort) + } + /** * Specifies the format that the model must output. Compatible with * [GPT-4o](https://platform.openai.com/docs/models#gpt-4o), [GPT-4 @@ -2997,6 +3116,115 @@ private constructor( "AdditionalMessage{content=$content, role=$role, attachments=$attachments, metadata=$metadata, additionalProperties=$additionalProperties}" } + /** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported + * values are `low`, `medium`, and `high`. Reducing reasoning effort can result in faster + * responses and fewer tokens used on reasoning in a response. + */ + class ReasoningEffort + @JsonCreator + private constructor( + private val value: JsonField, + ) : Enum { + + /** + * Returns this class instance's raw value. + * + * This is usually only useful if this instance was deserialized from data that doesn't + * match any known member, and you want to know that value. For example, if the SDK is on an + * older version than the API, then the API may respond with new members that the SDK is + * unaware of. + */ + @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value + + companion object { + + @JvmField val LOW = of("low") + + @JvmField val MEDIUM = of("medium") + + @JvmField val HIGH = of("high") + + @JvmStatic fun of(value: String) = ReasoningEffort(JsonField.of(value)) + } + + /** An enum containing [ReasoningEffort]'s known values. */ + enum class Known { + LOW, + MEDIUM, + HIGH, + } + + /** + * An enum containing [ReasoningEffort]'s known values, as well as an [_UNKNOWN] member. + * + * An instance of [ReasoningEffort] can contain an unknown value in a couple of cases: + * - It was deserialized from data that doesn't match any known member. For example, if the + * SDK is on an older version than the API, then the API may respond with new members that + * the SDK is unaware of. + * - It was constructed with an arbitrary value using the [of] method. + */ + enum class Value { + LOW, + MEDIUM, + HIGH, + /** + * An enum member indicating that [ReasoningEffort] was instantiated with an unknown + * value. + */ + _UNKNOWN, + } + + /** + * Returns an enum member corresponding to this class instance's value, or [Value._UNKNOWN] + * if the class was instantiated with an unknown value. + * + * Use the [known] method instead if you're certain the value is always known or if you want + * to throw for the unknown case. + */ + fun value(): Value = + when (this) { + LOW -> Value.LOW + MEDIUM -> Value.MEDIUM + HIGH -> Value.HIGH + else -> Value._UNKNOWN + } + + /** + * Returns an enum member corresponding to this class instance's value. + * + * Use the [value] method instead if you're uncertain the value is always known and don't + * want to throw for the unknown case. + * + * @throws OpenAIInvalidDataException if this class instance's value is a not a known + * member. + */ + fun known(): Known = + when (this) { + LOW -> Known.LOW + MEDIUM -> Known.MEDIUM + HIGH -> Known.HIGH + else -> throw OpenAIInvalidDataException("Unknown ReasoningEffort: $value") + } + + fun asString(): String = _value().asStringOrThrow() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ReasoningEffort && value == other.value /* spotless:on */ + } + + override fun hashCode() = value.hashCode() + + override fun toString() = value.toString() + } + /** * Controls for how a thread will be truncated prior to the run. Use this to control the intial * context window of the run. diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPage.kt index 9862f53f..510ecfce 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -80,15 +82,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -101,6 +109,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -111,12 +120,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -126,11 +136,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -138,11 +150,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPageAsync.kt index 93818d05..1665ab37 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -83,15 +85,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -104,6 +112,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -114,12 +123,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -129,11 +139,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -141,11 +153,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPage.kt index 118cc989..d86d1244 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -80,15 +82,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -101,6 +109,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -111,12 +120,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -126,11 +136,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -138,11 +150,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPageAsync.kt index ce1a43bb..b634b4b3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPage.kt index 246327ce..2b11cc90 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPageAsync.kt index 34534aae..6a7963dd 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -90,15 +92,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -111,6 +119,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -121,12 +130,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -136,11 +146,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -148,11 +160,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPage.kt index 5f4735d2..6156ca31 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -84,15 +86,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -105,6 +113,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -115,12 +124,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -130,11 +140,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -142,11 +154,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPageAsync.kt index ceadd99d..bafa4766 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPage.kt index 29d7e5ce..d4e72e30 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -84,15 +86,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -105,6 +113,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -115,12 +124,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -130,11 +140,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -142,11 +154,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPageAsync.kt index dce8c329..6327f038 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -87,15 +89,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -108,6 +116,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -118,12 +127,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -133,11 +143,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -145,11 +157,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } 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 f9f80086..eee050f0 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 @@ -189,7 +189,7 @@ private constructor( fun presencePenalty(): Optional = body.presencePenalty() /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported @@ -438,7 +438,7 @@ private constructor( fun _presencePenalty(): JsonField = body._presencePenalty() /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported @@ -801,7 +801,7 @@ private constructor( Optional.ofNullable(presencePenalty.getNullable("presence_penalty")) /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently @@ -1087,7 +1087,7 @@ private constructor( fun _presencePenalty(): JsonField = presencePenalty /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently @@ -2013,18 +2013,29 @@ private constructor( } /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can * result in faster responses and fewer tokens used on reasoning in a response. */ - fun reasoningEffort(reasoningEffort: ChatCompletionReasoningEffort) = - reasoningEffort(JsonField.of(reasoningEffort)) + fun reasoningEffort(reasoningEffort: ChatCompletionReasoningEffort?) = + reasoningEffort(JsonField.ofNullable(reasoningEffort)) /** - * **o1 models only** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can + * result in faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently @@ -3175,19 +3186,30 @@ private constructor( } /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in * faster responses and fewer tokens used on reasoning in a response. */ - fun reasoningEffort(reasoningEffort: ChatCompletionReasoningEffort) = apply { + fun reasoningEffort(reasoningEffort: ChatCompletionReasoningEffort?) = apply { body.reasoningEffort(reasoningEffort) } /** - * **o1 models only** + * **o1 and o3-mini models only** + * + * Constrains effort on reasoning for + * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently + * supported values are `low`, `medium`, and `high`. Reducing reasoning effort can result in + * faster responses and fewer tokens used on reasoning in a response. + */ + fun reasoningEffort(reasoningEffort: Optional) = + reasoningEffort(reasoningEffort.orElse(null)) + + /** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionReasoningEffort.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionReasoningEffort.kt index d485fdad..1b15b0e1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionReasoningEffort.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionReasoningEffort.kt @@ -8,7 +8,7 @@ import com.openai.core.JsonField import com.openai.errors.OpenAIInvalidDataException /** - * **o1 models only** + * **o1 and o3-mini models only** * * Constrains effort on reasoning for * [reasoning models](https://platform.openai.com/docs/guides/reasoning). Currently supported values diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListPage.kt index ebbe3da2..c37a055e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -78,15 +80,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -99,6 +107,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -109,12 +118,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -124,11 +134,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -136,11 +148,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListPageAsync.kt index af210973..3ea12069 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -81,15 +83,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -102,6 +110,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -112,12 +121,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -127,11 +137,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -139,11 +151,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPage.kt index f9672f7a..7fd952a4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -88,15 +90,21 @@ private constructor( constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -109,6 +117,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -119,12 +128,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -134,11 +144,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -146,11 +158,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPageAsync.kt index fc1a59a8..9ee40c7e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -91,15 +93,21 @@ private constructor( constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -112,6 +120,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -122,12 +131,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -137,11 +147,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -149,11 +161,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPage.kt index 1f28a89e..579cafcf 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -81,15 +83,21 @@ private constructor( constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -102,6 +110,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -112,12 +121,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -127,11 +137,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -139,11 +151,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPageAsync.kt index 5e22aa66..2aa588a2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -88,15 +90,21 @@ private constructor( constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -109,6 +117,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -119,12 +128,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -134,11 +144,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -146,11 +158,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPage.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPage.kt index 56aeb64b..900b92b3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPage.kt @@ -31,6 +31,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -80,15 +82,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -101,6 +109,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -111,12 +120,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -126,11 +136,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -138,11 +150,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPageAsync.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPageAsync.kt index 3852a960..72f65457 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPageAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListPageAsync.kt @@ -32,6 +32,8 @@ private constructor( fun data(): List = response().data() + fun hasMore(): Optional = response().hasMore() + override fun equals(other: Any?): Boolean { if (this === other) { return true @@ -83,15 +85,21 @@ private constructor( @JsonCreator constructor( @JsonProperty("data") private val data: JsonField> = JsonMissing.of(), + @JsonProperty("has_more") private val hasMore: JsonField = JsonMissing.of(), @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun data(): List = data.getNullable("data") ?: listOf() + fun hasMore(): Optional = Optional.ofNullable(hasMore.getNullable("has_more")) + @JsonProperty("data") fun _data(): Optional>> = Optional.ofNullable(data) + @JsonProperty("has_more") + fun _hasMore(): Optional> = Optional.ofNullable(hasMore) + @JsonAnyGetter @ExcludeMissing fun _additionalProperties(): Map = additionalProperties @@ -104,6 +112,7 @@ private constructor( } data().map { it.validate() } + hasMore() validated = true } @@ -114,12 +123,13 @@ private constructor( return true } - return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */ + return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */ } - override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */ + override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */ - override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}" + override fun toString() = + "Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}" companion object { @@ -129,11 +139,13 @@ private constructor( class Builder { private var data: JsonField> = JsonMissing.of() + private var hasMore: JsonField = JsonMissing.of() private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(page: Response) = apply { this.data = page.data + this.hasMore = page.hasMore this.additionalProperties.putAll(page.additionalProperties) } @@ -141,11 +153,20 @@ private constructor( fun data(data: JsonField>) = apply { this.data = data } + fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore)) + + fun hasMore(hasMore: JsonField) = apply { this.hasMore = hasMore } + fun putAdditionalProperty(key: String, value: JsonValue) = apply { this.additionalProperties.put(key, value) } - fun build() = Response(data, additionalProperties.toImmutable()) + fun build() = + Response( + data, + hasMore, + additionalProperties.toImmutable(), + ) } } 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 ae68e2c3..048bef50 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 @@ -48,9 +48,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -75,9 +75,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -103,9 +103,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BatchListPageAsync.of(this, params, it) } @@ -136,9 +136,9 @@ internal constructor( .thenApply { response -> response .use { cancelHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 de066767..22e266ad 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 @@ -51,9 +51,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } 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 5581b123..d3b23903 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 @@ -45,9 +45,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt index 4dcad1cd..f3eb996d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt @@ -4,6 +4,7 @@ package com.openai.services.async +import com.google.errorprone.annotations.MustBeClosed import com.openai.core.RequestOptions import com.openai.core.http.HttpResponse import com.openai.models.FileContentParams @@ -40,6 +41,7 @@ interface FileServiceAsync { /** Returns the contents of the specified file. */ @JvmOverloads + @MustBeClosed fun content( params: FileContentParams, requestOptions: RequestOptions = RequestOptions.none() 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 c76c52b2..c6f39654 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 @@ -49,9 +49,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -77,9 +77,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { FileListPageAsync.of(this, params, it) } @@ -106,9 +106,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 1fe5300e..9cab5447 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 @@ -44,9 +44,9 @@ internal constructor( .thenApply { response -> response .use { generateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 78f9f484..0a6414e5 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 @@ -50,9 +50,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -81,9 +81,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { ModelListPageAsync.of(this, params, it) } @@ -113,9 +113,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 da760b55..eae5eb56 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 @@ -52,9 +52,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 f39d369b..7a45bb47 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 @@ -71,9 +71,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -99,9 +99,9 @@ internal constructor( .thenApply { response -> response .use { cancelHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -139,9 +139,9 @@ internal constructor( .thenApply { response -> response .use { completeHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 64f5d3cd..7a00e4ee 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 @@ -57,9 +57,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -85,9 +85,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -108,15 +108,19 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .body(json(clientOptions.jsonMapper, params._body())) .build() - .prepareAsync(clientOptions, params, params.model().orElse(null)) + .prepareAsync( + clientOptions, + params, + params.model().map { it.toString() }.orElse(null) + ) return request .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) } .thenApply { response -> response .use { updateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -143,9 +147,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BetaAssistantListPageAsync.of(this, params, it) } @@ -173,9 +177,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 0a7aa825..26eeafae 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 @@ -77,9 +77,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -105,9 +105,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -134,9 +134,9 @@ internal constructor( .thenApply { response -> response .use { updateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -163,9 +163,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -196,9 +196,9 @@ internal constructor( .thenApply { response -> response .use { createAndRunHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } 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 f4409fff..fe02977e 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 @@ -71,9 +71,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -99,9 +99,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -128,9 +128,9 @@ internal constructor( .thenApply { response -> response .use { updateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -157,9 +157,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BetaVectorStoreListPageAsync.of(this, params, it) } @@ -187,9 +187,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 146ea661..48d35d3f 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 @@ -57,9 +57,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -90,9 +90,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -124,9 +124,9 @@ internal constructor( .thenApply { response -> response .use { updateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -153,9 +153,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BetaThreadMessageListPageAsync.of(this, params, it) } @@ -188,9 +188,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 7b265473..ea516ded 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 @@ -75,9 +75,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -150,9 +150,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -179,9 +179,9 @@ internal constructor( .thenApply { response -> response .use { updateHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -208,9 +208,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BetaThreadRunListPageAsync.of(this, params, it) } @@ -244,9 +244,9 @@ internal constructor( .thenApply { response -> response .use { cancelHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -283,9 +283,9 @@ internal constructor( .thenApply { response -> response .use { submitToolOutputsHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } 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 883dc2ec..5156e0cc 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 @@ -58,9 +58,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -93,9 +93,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .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 6d530dab..b804dbed 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 @@ -55,9 +55,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -88,9 +88,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -126,9 +126,9 @@ internal constructor( .thenApply { response -> response .use { cancelHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -161,9 +161,9 @@ internal constructor( .thenApply { response -> response .use { listFilesHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .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 eb0cfddc..900f4a56 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 @@ -60,9 +60,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -93,9 +93,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -122,9 +122,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { BetaVectorStoreFileListPageAsync.of(this, params, it) } @@ -161,9 +161,9 @@ internal constructor( .thenApply { response -> response .use { deleteHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.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 06b7d616..09bfb902 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 @@ -62,9 +62,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } 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 09026b72..afc15724 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 @@ -66,9 +66,9 @@ internal constructor( .thenApply { response -> response .use { createHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -97,9 +97,9 @@ internal constructor( .thenApply { response -> response .use { retrieveHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -125,9 +125,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .let { FineTuningJobListPageAsync.of(this, params, it) } @@ -154,9 +154,9 @@ internal constructor( .thenApply { response -> response .use { cancelHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } } @@ -182,9 +182,9 @@ internal constructor( .thenApply { response -> response .use { listEventsHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .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 41c1d4f1..ce5fb27b 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 @@ -43,9 +43,9 @@ internal constructor( .thenApply { response -> response .use { listHandler.handle(it) } - .apply { + .also { if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() + it.validate() } } .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 5c4e6d47..f493c583 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 @@ -39,15 +39,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -61,15 +60,14 @@ internal constructor( .addPathSegments("batches", params.getPathParam(0)) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -83,16 +81,15 @@ internal constructor( .addPathSegments("batches") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BatchListPage.of(this, params, it) } - } + } + .let { BatchListPage.of(this, params, it) } } private val cancelHandler: Handler = @@ -111,14 +108,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { cancelHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 bd14765d..cbfa8e37 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 @@ -43,15 +43,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val createStreamingHandler: Handler> = @@ -78,16 +77,15 @@ internal constructor( ) .build() .prepare(clientOptions, params, params.model().toString()) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .let { createStreamingHandler.handle(it) } - .let { streamResponse -> - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - streamResponse.map { it.validate() } - } else { - streamResponse - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .let { createStreamingHandler.handle(it) } + .let { streamResponse -> + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + streamResponse.map { it.validate() } + } else { + streamResponse } - } + } } } 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 8c316153..08be01e1 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 @@ -39,14 +39,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt index 13e95c5b..691d0eeb 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt @@ -4,6 +4,7 @@ package com.openai.services.blocking +import com.google.errorprone.annotations.MustBeClosed import com.openai.core.RequestOptions import com.openai.core.http.HttpResponse import com.openai.models.FileContentParams @@ -39,6 +40,7 @@ interface FileService { /** Returns the contents of the specified file. */ @JvmOverloads + @MustBeClosed fun content( params: FileContentParams, requestOptions: RequestOptions = RequestOptions.none() 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 e69137ed..6e9df206 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 @@ -40,15 +40,14 @@ internal constructor( .addPathSegments("files", params.getPathParam(0)) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -62,16 +61,15 @@ internal constructor( .addPathSegments("files") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { FileListPage.of(this, params, it) } - } + } + .let { FileListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -86,15 +84,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } /** Returns the contents of the specified file. */ 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 189b3535..6eb260c6 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 @@ -38,14 +38,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { generateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 ef4c4e74..95f9f8bc 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 @@ -41,15 +41,14 @@ internal constructor( .addPathSegments("models", params.getPathParam(0)) .build() .prepare(clientOptions, params, params.model()) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -66,16 +65,15 @@ internal constructor( .addPathSegments("models") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { ModelListPage.of(this, params, it) } - } + } + .let { ModelListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -93,14 +91,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 23806c5a..276e0da4 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 @@ -42,14 +42,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 f5a368d0..23c02ea8 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 @@ -62,15 +62,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val cancelHandler: Handler = @@ -85,15 +84,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { cancelHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val completeHandler: Handler = @@ -120,14 +118,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { completeHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 20356b03..ab14a017 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 @@ -51,15 +51,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -77,15 +76,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val updateHandler: Handler = @@ -103,16 +101,15 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { updateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -131,16 +128,15 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaAssistantListPage.of(this, params, it) } - } + } + .let { BetaAssistantListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -159,14 +155,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 c8393c03..4cd75fb0 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 @@ -66,15 +66,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -92,15 +91,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val updateHandler: Handler = @@ -116,15 +114,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { updateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val deleteHandler: Handler = @@ -143,15 +140,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val createAndRunHandler: Handler = @@ -170,15 +166,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createAndRunHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val createAndRunStreamingHandler: Handler> = @@ -208,16 +203,15 @@ internal constructor( ) .build() .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .let { createAndRunStreamingHandler.handle(it) } - .let { streamResponse -> - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - streamResponse.map { it.validate() } - } else { - streamResponse - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .let { createAndRunStreamingHandler.handle(it) } + .let { streamResponse -> + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + streamResponse.map { it.validate() } + } else { + streamResponse } - } + } } } 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 51d0bdf0..44be9bab 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 @@ -63,15 +63,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -89,15 +88,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val updateHandler: Handler = @@ -116,15 +114,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { updateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -143,16 +140,15 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaVectorStoreListPage.of(this, params, it) } - } + } + .let { BetaVectorStoreListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -171,14 +167,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 260b4901..3050e803 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 @@ -51,15 +51,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -82,15 +81,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val updateHandler: Handler = @@ -114,15 +112,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { updateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -141,16 +138,15 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaThreadMessageListPage.of(this, params, it) } - } + } + .let { BetaThreadMessageListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -174,14 +170,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 667d5501..8431a35a 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 @@ -60,15 +60,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val createStreamingHandler: Handler> = @@ -98,17 +97,16 @@ internal constructor( ) .build() .prepare(clientOptions, params, params.model().map { it.toString() }.orElse(null)) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .let { createStreamingHandler.handle(it) } - .let { streamResponse -> - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - streamResponse.map { it.validate() } - } else { - streamResponse - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .let { createStreamingHandler.handle(it) } + .let { streamResponse -> + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + streamResponse.map { it.validate() } + } else { + streamResponse } - } + } } private val retrieveHandler: Handler = @@ -126,15 +124,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val updateHandler: Handler = @@ -150,15 +147,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { updateHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -177,16 +173,15 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaThreadRunListPage.of(this, params, it) } - } + } + .let { BetaThreadRunListPage.of(this, params, it) } } private val cancelHandler: Handler = @@ -208,15 +203,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { cancelHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val submitToolOutputsHandler: Handler = @@ -245,15 +239,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { submitToolOutputsHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val submitToolOutputsStreamingHandler: Handler> = @@ -293,16 +286,15 @@ internal constructor( ) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .let { submitToolOutputsStreamingHandler.handle(it) } - .let { streamResponse -> - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - streamResponse.map { it.validate() } - } else { - streamResponse - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .let { submitToolOutputsStreamingHandler.handle(it) } + .let { streamResponse -> + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + streamResponse.map { it.validate() } + } else { + streamResponse } - } + } } } 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 054f1df9..da59fd2d 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 @@ -52,15 +52,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -85,15 +84,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaThreadRunStepListPage.of(this, params, it) } - } + } + .let { BetaThreadRunStepListPage.of(this, params, 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 4b507dde..d1142615 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 @@ -49,15 +49,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -80,15 +79,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val cancelHandler: Handler = @@ -116,15 +114,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { cancelHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listFilesHandler: Handler = @@ -149,15 +146,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listFilesHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listFilesHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaVectorStoreFileBatchListFilesPage.of(this, params, it) } - } + } + .let { BetaVectorStoreFileBatchListFilesPage.of(this, params, 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 c9a7fdc4..64ace0f0 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 @@ -54,15 +54,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -85,15 +84,14 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -112,16 +110,15 @@ internal constructor( .putAllHeaders(DEFAULT_HEADERS) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { BetaVectorStoreFileListPage.of(this, params, it) } - } + } + .let { BetaVectorStoreFileListPage.of(this, params, it) } } private val deleteHandler: Handler = @@ -149,14 +146,13 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { deleteHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } } 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 e8c7d00f..6770ef2d 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 @@ -54,15 +54,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val createStreamingHandler: Handler> = @@ -101,16 +100,15 @@ internal constructor( ) .build() .prepare(clientOptions, params, params.model().toString()) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .let { createStreamingHandler.handle(it) } - .let { streamResponse -> - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - streamResponse.map { it.validate() } - } else { - streamResponse - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .let { createStreamingHandler.handle(it) } + .let { streamResponse -> + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + streamResponse.map { it.validate() } + } else { + streamResponse } - } + } } } 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 fe099165..5f5527ef 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 @@ -58,15 +58,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { createHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val retrieveHandler: Handler = @@ -87,15 +86,14 @@ internal constructor( .addPathSegments("fine_tuning", "jobs", params.getPathParam(0)) .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { retrieveHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { retrieveHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listHandler: Handler = @@ -113,16 +111,15 @@ internal constructor( .addPathSegments("fine_tuning", "jobs") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { FineTuningJobListPage.of(this, params, it) } - } + } + .let { FineTuningJobListPage.of(this, params, it) } } private val cancelHandler: Handler = @@ -140,15 +137,14 @@ internal constructor( .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) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { cancelHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - } + } } private val listEventsHandler: Handler = @@ -166,15 +162,14 @@ internal constructor( .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "events") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listEventsHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listEventsHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { FineTuningJobListEventsPage.of(this, params, it) } - } + } + .let { FineTuningJobListEventsPage.of(this, params, 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 4e33535c..d00f2d6c 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 @@ -37,15 +37,14 @@ internal constructor( .addPathSegments("fine_tuning", "jobs", params.getPathParam(0), "checkpoints") .build() .prepare(clientOptions, params, deploymentModel = null) - return clientOptions.httpClient.execute(request, requestOptions).let { response -> - response - .use { listHandler.handle(it) } - .apply { - if (requestOptions.responseValidation ?: clientOptions.responseValidation) { - validate() - } + val response = clientOptions.httpClient.execute(request, requestOptions) + return response + .use { listHandler.handle(it) } + .also { + if (requestOptions.responseValidation ?: clientOptions.responseValidation) { + it.validate() } - .let { FineTuningJobCheckpointListPage.of(this, params, it) } - } + } + .let { FineTuningJobCheckpointListPage.of(this, params, it) } } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt index c1b46775..9de79292 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchCancelParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BatchCancelParamsTest { @Test - fun createBatchCancelParams() { + fun create() { BatchCancelParams.builder().batchId("batch_id").build() } 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 964d947d..1c63f7fb 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BatchCreateParamsTest { @Test - fun createBatchCreateParams() { + fun create() { BatchCreateParams.builder() .completionWindow(BatchCreateParams.CompletionWindow._24H) .endpoint(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 07e97b8a..ae4ce91f 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BatchListParamsTest { @Test - fun createBatchListParams() { + fun create() { BatchListParams.builder().after("after").limit(0L).build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt index 8c2c910b..a97770a1 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BatchRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BatchRetrieveParamsTest { @Test - fun createBatchRetrieveParams() { + fun create() { BatchRetrieveParams.builder().batchId("batch_id").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 8de66932..a02e1470 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaAssistantCreateParamsTest { @Test - fun createBetaAssistantCreateParams() { + fun create() { BetaAssistantCreateParams.builder() .model(ChatModel.O3_MINI) .description("description") @@ -18,6 +18,7 @@ class BetaAssistantCreateParamsTest { Metadata.builder().putAdditionalProperty("foo", JsonValue.from("string")).build() ) .name("name") + .reasoningEffort(BetaAssistantCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( @@ -66,6 +67,7 @@ class BetaAssistantCreateParamsTest { .build() ) .name("name") + .reasoningEffort(BetaAssistantCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( @@ -112,6 +114,7 @@ class BetaAssistantCreateParamsTest { Metadata.builder().putAdditionalProperty("foo", JsonValue.from("string")).build() ) assertThat(body.name()).contains("name") + assertThat(body.reasoningEffort()).contains(BetaAssistantCreateParams.ReasoningEffort.LOW) assertThat(body.responseFormat()).contains(AssistantResponseFormatOption.ofAuto()) assertThat(body.temperature()).contains(1.0) assertThat(body.toolResources()) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantDeleteParamsTest.kt index c220e047..20c18008 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaAssistantDeleteParamsTest { @Test - fun createBetaAssistantDeleteParams() { + fun create() { BetaAssistantDeleteParams.builder().assistantId("assistant_id").build() } 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 63aa3990..facb2d19 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaAssistantListParamsTest { @Test - fun createBetaAssistantListParams() { + fun create() { BetaAssistantListParams.builder() .after("after") .before("before") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantRetrieveParamsTest.kt index f173e02f..e0c41446 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaAssistantRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaAssistantRetrieveParamsTest { @Test - fun createBetaAssistantRetrieveParams() { + fun create() { BetaAssistantRetrieveParams.builder().assistantId("assistant_id").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 997a2f3b..c24672c4 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaAssistantUpdateParamsTest { @Test - fun createBetaAssistantUpdateParams() { + fun create() { BetaAssistantUpdateParams.builder() .assistantId("assistant_id") .description("description") @@ -17,8 +17,9 @@ class BetaAssistantUpdateParamsTest { .metadata( Metadata.builder().putAdditionalProperty("foo", JsonValue.from("string")).build() ) - .model("model") + .model(BetaAssistantUpdateParams.Model.O3_MINI) .name("name") + .reasoningEffort(BetaAssistantUpdateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( @@ -52,8 +53,9 @@ class BetaAssistantUpdateParamsTest { .putAdditionalProperty("foo", JsonValue.from("string")) .build() ) - .model("model") + .model(BetaAssistantUpdateParams.Model.O3_MINI) .name("name") + .reasoningEffort(BetaAssistantUpdateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( @@ -81,8 +83,9 @@ class BetaAssistantUpdateParamsTest { .contains( Metadata.builder().putAdditionalProperty("foo", JsonValue.from("string")).build() ) - assertThat(body.model()).contains("model") + assertThat(body.model()).contains(BetaAssistantUpdateParams.Model.O3_MINI) assertThat(body.name()).contains("name") + assertThat(body.reasoningEffort()).contains(BetaAssistantUpdateParams.ReasoningEffort.LOW) assertThat(body.responseFormat()).contains(AssistantResponseFormatOption.ofAuto()) assertThat(body.temperature()).contains(1.0) assertThat(body.toolResources()) 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 06cdde3f..37aecdde 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadCreateAndRunParamsTest { @Test - fun createBetaThreadCreateAndRunParams() { + fun create() { BetaThreadCreateAndRunParams.builder() .assistantId("assistant_id") .instructions("instructions") 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 d4bfa65b..f2f33b90 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadCreateParamsTest { @Test - fun createBetaThreadCreateParams() { + fun create() { BetaThreadCreateParams.builder() .addMessage( BetaThreadCreateParams.Message.builder() diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadDeleteParamsTest.kt index a8645c89..a341ced2 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadDeleteParamsTest { @Test - fun createBetaThreadDeleteParams() { + fun create() { BetaThreadDeleteParams.builder().threadId("thread_id").build() } 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 64f63543..cf981274 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadMessageCreateParamsTest { @Test - fun createBetaThreadMessageCreateParams() { + fun create() { BetaThreadMessageCreateParams.builder() .threadId("thread_id") .content("string") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageDeleteParamsTest.kt index ce62fc82..56e724dd 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadMessageDeleteParamsTest { @Test - fun createBetaThreadMessageDeleteParams() { + fun create() { BetaThreadMessageDeleteParams.builder() .threadId("thread_id") .messageId("message_id") 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 c06ac3f3..d838f8a2 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadMessageListParamsTest { @Test - fun createBetaThreadMessageListParams() { + fun create() { BetaThreadMessageListParams.builder() .threadId("thread_id") .after("after") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageRetrieveParamsTest.kt index 3fdadd17..0421306b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadMessageRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadMessageRetrieveParamsTest { @Test - fun createBetaThreadMessageRetrieveParams() { + fun create() { BetaThreadMessageRetrieveParams.builder() .threadId("thread_id") .messageId("message_id") 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 84714f7e..2d4a90c9 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadMessageUpdateParamsTest { @Test - fun createBetaThreadMessageUpdateParams() { + fun create() { BetaThreadMessageUpdateParams.builder() .threadId("thread_id") .messageId("message_id") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRetrieveParamsTest.kt index a081c583..b4ac17a8 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadRetrieveParamsTest { @Test - fun createBetaThreadRetrieveParams() { + fun create() { BetaThreadRetrieveParams.builder().threadId("thread_id").build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCancelParamsTest.kt index aaa77f0e..344fab4d 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCancelParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunCancelParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunCancelParamsTest { @Test - fun createBetaThreadRunCancelParams() { + fun create() { BetaThreadRunCancelParams.builder().threadId("thread_id").runId("run_id").build() } 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 deb8e9cd..8e1e0d89 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 @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunCreateParamsTest { @Test - fun createBetaThreadRunCreateParams() { + fun create() { BetaThreadRunCreateParams.builder() .threadId("thread_id") .assistantId("assistant_id") @@ -41,6 +41,7 @@ class BetaThreadRunCreateParamsTest { ) .model(ChatModel.O3_MINI) .parallelToolCalls(true) + .reasoningEffort(BetaThreadRunCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolChoice(AssistantToolChoiceOption.Auto.NONE) @@ -90,6 +91,7 @@ class BetaThreadRunCreateParamsTest { ) .model(ChatModel.O3_MINI) .parallelToolCalls(true) + .reasoningEffort(BetaThreadRunCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolChoice(AssistantToolChoiceOption.Auto.NONE) @@ -156,6 +158,7 @@ class BetaThreadRunCreateParamsTest { ) .model(ChatModel.O3_MINI) .parallelToolCalls(true) + .reasoningEffort(BetaThreadRunCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolChoice(AssistantToolChoiceOption.Auto.NONE) @@ -201,6 +204,7 @@ class BetaThreadRunCreateParamsTest { ) assertThat(body.model()).contains(ChatModel.O3_MINI) assertThat(body.parallelToolCalls()).contains(true) + assertThat(body.reasoningEffort()).contains(BetaThreadRunCreateParams.ReasoningEffort.LOW) assertThat(body.responseFormat()).contains(AssistantResponseFormatOption.ofAuto()) assertThat(body.temperature()).contains(1.0) assertThat(body.toolChoice()) 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 1ef0e1d1..f05433de 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunListParamsTest { @Test - fun createBetaThreadRunListParams() { + fun create() { BetaThreadRunListParams.builder() .threadId("thread_id") .after("after") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunRetrieveParamsTest.kt index badef1b2..829c372c 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaThreadRunRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunRetrieveParamsTest { @Test - fun createBetaThreadRunRetrieveParams() { + fun create() { BetaThreadRunRetrieveParams.builder().threadId("thread_id").runId("run_id").build() } 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 b4babe27..483b50e1 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunStepListParamsTest { @Test - fun createBetaThreadRunStepListParams() { + fun create() { BetaThreadRunStepListParams.builder() .threadId("thread_id") .runId("run_id") 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 d61b65e1..570ce7d1 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunStepRetrieveParamsTest { @Test - fun createBetaThreadRunStepRetrieveParams() { + fun create() { BetaThreadRunStepRetrieveParams.builder() .threadId("thread_id") .runId("run_id") 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 018e088f..d85eb70f 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunSubmitToolOutputsParamsTest { @Test - fun createBetaThreadRunSubmitToolOutputsParams() { + fun create() { BetaThreadRunSubmitToolOutputsParams.builder() .threadId("thread_id") .runId("run_id") 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 ab2db717..b73fd5b3 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadRunUpdateParamsTest { @Test - fun createBetaThreadRunUpdateParams() { + fun create() { BetaThreadRunUpdateParams.builder() .threadId("thread_id") .runId("run_id") 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 093f1c2a..284ec30e 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaThreadUpdateParamsTest { @Test - fun createBetaThreadUpdateParams() { + fun create() { BetaThreadUpdateParams.builder() .threadId("thread_id") .metadata( 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 166d6896..14205f2f 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreCreateParamsTest { @Test - fun createBetaVectorStoreCreateParams() { + fun create() { BetaVectorStoreCreateParams.builder() .chunkingStrategy(AutoFileChunkingStrategyParam.builder().build()) .expiresAfter(BetaVectorStoreCreateParams.ExpiresAfter.builder().days(1L).build()) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreDeleteParamsTest.kt index a1f521b2..0b89c6f1 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreDeleteParamsTest { @Test - fun createBetaVectorStoreDeleteParams() { + fun create() { BetaVectorStoreDeleteParams.builder().vectorStoreId("vector_store_id").build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParamsTest.kt index 2c6d223f..d84d9145 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileBatchCancelParamsTest { @Test - fun createBetaVectorStoreFileBatchCancelParams() { + fun create() { BetaVectorStoreFileBatchCancelParams.builder() .vectorStoreId("vector_store_id") .batchId("batch_id") 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 b8f97762..37a2723b 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileBatchCreateParamsTest { @Test - fun createBetaVectorStoreFileBatchCreateParams() { + fun create() { BetaVectorStoreFileBatchCreateParams.builder() .vectorStoreId("vs_abc123") .addFileId("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 6322618d..599d56f6 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileBatchListFilesParamsTest { @Test - fun createBetaVectorStoreFileBatchListFilesParams() { + fun create() { BetaVectorStoreFileBatchListFilesParams.builder() .vectorStoreId("vector_store_id") .batchId("batch_id") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParamsTest.kt index 8a6ed2b6..49a3ba11 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileBatchRetrieveParamsTest { @Test - fun createBetaVectorStoreFileBatchRetrieveParams() { + fun create() { BetaVectorStoreFileBatchRetrieveParams.builder() .vectorStoreId("vs_abc123") .batchId("vsfb_abc123") 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 5809d691..73f25e86 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileCreateParamsTest { @Test - fun createBetaVectorStoreFileCreateParams() { + fun create() { BetaVectorStoreFileCreateParams.builder() .vectorStoreId("vs_abc123") .fileId("file_id") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileDeleteParamsTest.kt index d7c69ed5..2116ef2f 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileDeleteParamsTest { @Test - fun createBetaVectorStoreFileDeleteParams() { + fun create() { BetaVectorStoreFileDeleteParams.builder() .vectorStoreId("vector_store_id") .fileId("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 c2f83fac..e943aed4 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileListParamsTest { @Test - fun createBetaVectorStoreFileListParams() { + fun create() { BetaVectorStoreFileListParams.builder() .vectorStoreId("vector_store_id") .after("after") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParamsTest.kt index f8cd9114..ab9d1be1 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreFileRetrieveParamsTest { @Test - fun createBetaVectorStoreFileRetrieveParams() { + fun create() { BetaVectorStoreFileRetrieveParams.builder() .vectorStoreId("vs_abc123") .fileId("file-abc123") 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 eb9a0ded..70767bb7 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreListParamsTest { @Test - fun createBetaVectorStoreListParams() { + fun create() { BetaVectorStoreListParams.builder() .after("after") .before("before") diff --git a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreRetrieveParamsTest.kt index b1adeb12..36ce65b5 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/BetaVectorStoreRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreRetrieveParamsTest { @Test - fun createBetaVectorStoreRetrieveParams() { + fun create() { BetaVectorStoreRetrieveParams.builder().vectorStoreId("vector_store_id").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 84fe5c33..c83cc7f6 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class BetaVectorStoreUpdateParamsTest { @Test - fun createBetaVectorStoreUpdateParams() { + fun create() { BetaVectorStoreUpdateParams.builder() .vectorStoreId("vector_store_id") .expiresAfter(BetaVectorStoreUpdateParams.ExpiresAfter.builder().days(1L).build()) 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 0527e841..7fe32a58 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class ChatCompletionCreateParamsTest { @Test - fun createChatCompletionCreateParams() { + fun create() { ChatCompletionCreateParams.builder() .addMessage( ChatCompletionDeveloperMessageParam.builder().content("string").name("name").build() 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 9e5e2327..445e76b1 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class CompletionCreateParamsTest { @Test - fun createCompletionCreateParams() { + fun create() { CompletionCreateParams.builder() .model(CompletionCreateParams.Model.GPT_3_5_TURBO_INSTRUCT) .prompt("This is a test.") 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 eca4d536..346d90fc 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class EmbeddingCreateParamsTest { @Test - fun createEmbeddingCreateParams() { + fun create() { EmbeddingCreateParams.builder() .input("The quick brown fox jumped over the lazy dog") .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileContentParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileContentParamsTest.kt index 423cded0..b9b36e29 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FileContentParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FileContentParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FileContentParamsTest { @Test - fun createFileContentParams() { + fun create() { FileContentParams.builder().fileId("file_id").build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt index 4ba95c51..616dbc8a 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FileDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FileDeleteParamsTest { @Test - fun createFileDeleteParams() { + fun create() { FileDeleteParams.builder().fileId("file_id").build() } 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 08f624d4..39f6d367 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class FileListParamsTest { @Test - fun createFileListParams() { + fun create() { FileListParams.builder() .after("after") .limit(0L) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt index c7560941..3fc3da72 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FileRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FileRetrieveParamsTest { @Test - fun createFileRetrieveParams() { + fun create() { FileRetrieveParams.builder().fileId("file_id").build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt index 5191b8a2..cc8c6d89 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobCancelParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FineTuningJobCancelParamsTest { @Test - fun createFineTuningJobCancelParams() { + fun create() { FineTuningJobCancelParams.builder().fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F").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 2158bec9..d4b27314 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class FineTuningJobCheckpointListParamsTest { @Test - fun createFineTuningJobCheckpointListParams() { + fun create() { FineTuningJobCheckpointListParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") .after("after") 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 c5fd6b18..c79ef199 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FineTuningJobCreateParamsTest { @Test - fun createFineTuningJobCreateParams() { + fun create() { FineTuningJobCreateParams.builder() .model(FineTuningJobCreateParams.Model.BABBAGE_002) .trainingFile("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 3cae4ebf..334d8290 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class FineTuningJobListEventsParamsTest { @Test - fun createFineTuningJobListEventsParams() { + fun create() { FineTuningJobListEventsParams.builder() .fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F") .after("after") 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 db06de4d..46b8b4d7 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 @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test class FineTuningJobListParamsTest { @Test - fun createFineTuningJobListParams() { + fun create() { FineTuningJobListParams.builder().after("after").limit(0L).build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt index 6573901a..afb90241 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/FineTuningJobRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class FineTuningJobRetrieveParamsTest { @Test - fun createFineTuningJobRetrieveParams() { + fun create() { FineTuningJobRetrieveParams.builder().fineTuningJobId("ft-AF1WoRqd3aJAHsqc9NY7iL8F").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 bb723511..fbbe9b24 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class ImageGenerateParamsTest { @Test - fun createImageGenerateParams() { + fun create() { ImageGenerateParams.builder() .prompt("A cute baby sea otter") .model(ImageModel.DALL_E_2) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt index 7f20f4db..d191100c 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelDeleteParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class ModelDeleteParamsTest { @Test - fun createModelDeleteParams() { + fun create() { ModelDeleteParams.builder().model("ft:gpt-4o-mini:acemeco:suffix:abc123").build() } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt index e54e8043..0eba7234 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelListParamsTest.kt @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test class ModelListParamsTest { @Test - fun createModelListParams() { + fun create() { ModelListParams.builder().build() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt index fd3f32f7..94c18e82 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/ModelRetrieveParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class ModelRetrieveParamsTest { @Test - fun createModelRetrieveParams() { + fun create() { ModelRetrieveParams.builder().model("gpt-4o-mini").build() } 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 2bb60d11..4d7c42ef 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class ModerationCreateParamsTest { @Test - fun createModerationCreateParams() { + fun create() { ModerationCreateParams.builder() .input("I want to kill them.") .model(ModerationModel.OMNI_MODERATION_LATEST) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt index e77b71aa..21e82dfb 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/UploadCancelParamsTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class UploadCancelParamsTest { @Test - fun createUploadCancelParams() { + fun create() { UploadCancelParams.builder().uploadId("upload_abc123").build() } 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 2adcffe0..4f77a5ce 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class UploadCompleteParamsTest { @Test - fun createUploadCompleteParams() { + fun create() { UploadCompleteParams.builder() .uploadId("upload_abc123") .addPartId("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 082b6634..c24d5afb 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 @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class UploadCreateParamsTest { @Test - fun createUploadCreateParams() { + fun create() { UploadCreateParams.builder() .bytes(0L) .filename("filename") diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt index bbd9f8b3..08a6b696 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt @@ -40,6 +40,7 @@ class AssistantServiceTest { .build() ) .name("name") + .reasoningEffort(BetaAssistantCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( @@ -117,8 +118,9 @@ class AssistantServiceTest { .putAdditionalProperty("foo", JsonValue.from("string")) .build() ) - .model("model") + .model(BetaAssistantUpdateParams.Model.O3_MINI) .name("name") + .reasoningEffort(BetaAssistantUpdateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolResources( diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/threads/RunServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/threads/RunServiceTest.kt index 3d0f31f3..820b2347 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/threads/RunServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/threads/RunServiceTest.kt @@ -64,6 +64,7 @@ class RunServiceTest { ) .model(ChatModel.O3_MINI) .parallelToolCalls(true) + .reasoningEffort(BetaThreadRunCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolChoice(AssistantToolChoiceOption.Auto.NONE) @@ -124,6 +125,7 @@ class RunServiceTest { ) .model(ChatModel.O3_MINI) .parallelToolCalls(true) + .reasoningEffort(BetaThreadRunCreateParams.ReasoningEffort.LOW) .responseFormatAuto() .temperature(1.0) .toolChoice(AssistantToolChoiceOption.Auto.NONE)