diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 1eec10e9..f1a48d37 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "4.7.0" + ".": "4.7.1" } \ No newline at end of file diff --git a/.stats.yml b/.stats.yml index 689bfb5c..d697cee1 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 135 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-3c5d1593d7c6f2b38a7d78d7906041465ee9d6e9022f0651e1da194654488108.yml +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai%2Fopenai-eeba8addf3a5f412e5ce8d22031e60c61650cee3f5d9e587a2533f6818a249ea.yml openapi_spec_hash: 0a4d8ad2469823ce24a3fd94f23f1c2b -config_hash: 032995825500a503a76da119f5354905 +config_hash: 0bb1941a78ece0b610a2fbba7d74a84c diff --git a/CHANGELOG.md b/CHANGELOG.md index 5137ae11..679d90a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 4.7.1 (2025-11-04) + +Full Changelog: [v4.7.0...v4.7.1](https://github.com/openai/openai-java/compare/v4.7.0...v4.7.1) + +### Bug Fixes + +* **api:** fix nullability of logprobs ([f1733f8](https://github.com/openai/openai-java/commit/f1733f8e81580b4e6c1a29ea6913af5e98d41607)) + ## 4.7.0 (2025-11-04) Full Changelog: [v4.6.1...v4.7.0](https://github.com/openai/openai-java/compare/v4.6.1...v4.7.0) diff --git a/README.md b/README.md index 518565b6..00fba3ac 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/4.7.0) -[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/4.7.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/4.7.0) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/4.7.1) +[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/4.7.1/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/4.7.1) @@ -11,7 +11,7 @@ The OpenAI Java SDK provides convenient access to the [OpenAI REST API](https:// -The REST API documentation can be found on [platform.openai.com](https://platform.openai.com/docs). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.openai/openai-java/4.7.0). +The REST API documentation can be found on [platform.openai.com](https://platform.openai.com/docs). Javadocs are available on [javadoc.io](https://javadoc.io/doc/com.openai/openai-java/4.7.1). @@ -24,7 +24,7 @@ The REST API documentation can be found on [platform.openai.com](https://platfor ### Gradle ```kotlin -implementation("com.openai:openai-java:4.7.0") +implementation("com.openai:openai-java:4.7.1") ``` ### Maven @@ -33,7 +33,7 @@ implementation("com.openai:openai-java:4.7.0") com.openai openai-java - 4.7.0 + 4.7.1 ``` @@ -1342,7 +1342,7 @@ If you're using Spring Boot, then you can use the SDK's [Spring Boot starter](ht #### Gradle ```kotlin -implementation("com.openai:openai-java-spring-boot-starter:4.7.0") +implementation("com.openai:openai-java-spring-boot-starter:4.7.1") ``` #### Maven @@ -1351,7 +1351,7 @@ implementation("com.openai:openai-java-spring-boot-starter:4.7.0") com.openai openai-java-spring-boot-starter - 4.7.0 + 4.7.1 ``` diff --git a/build.gradle.kts b/build.gradle.kts index c1752622..db96019e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.openai" - version = "4.7.0" // x-release-please-version + version = "4.7.1" // x-release-please-version } subprojects { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseOutputText.kt b/openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseOutputText.kt index c117a3f4..d252e82b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseOutputText.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseOutputText.kt @@ -34,9 +34,9 @@ class ResponseOutputText @JsonCreator(mode = JsonCreator.Mode.DISABLED) private constructor( private val annotations: JsonField>, - private val logprobs: JsonField>, private val text: JsonField, private val type: JsonValue, + private val logprobs: JsonField>, private val additionalProperties: MutableMap, ) { @@ -45,12 +45,12 @@ private constructor( @JsonProperty("annotations") @ExcludeMissing annotations: JsonField> = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing text: JsonField = JsonMissing.of(), + @JsonProperty("type") @ExcludeMissing type: JsonValue = JsonMissing.of(), @JsonProperty("logprobs") @ExcludeMissing logprobs: JsonField> = JsonMissing.of(), - @JsonProperty("text") @ExcludeMissing text: JsonField = JsonMissing.of(), - @JsonProperty("type") @ExcludeMissing type: JsonValue = JsonMissing.of(), - ) : this(annotations, logprobs, text, type, mutableMapOf()) + ) : this(annotations, text, type, logprobs, mutableMapOf()) /** * The annotations of the text output. @@ -60,12 +60,6 @@ private constructor( */ fun annotations(): List = annotations.getRequired("annotations") - /** - * @throws OpenAIInvalidDataException if the JSON field has an unexpected type or is - * unexpectedly missing or null (e.g. if the server responded with an unexpected value). - */ - fun logprobs(): List = logprobs.getRequired("logprobs") - /** * The text output from the model. * @@ -87,6 +81,12 @@ private constructor( */ @JsonProperty("type") @ExcludeMissing fun _type(): JsonValue = type + /** + * @throws OpenAIInvalidDataException if the JSON field has an unexpected type (e.g. if the + * server responded with an unexpected value). + */ + fun logprobs(): Optional> = logprobs.getOptional("logprobs") + /** * Returns the raw JSON value of [annotations]. * @@ -97,18 +97,18 @@ private constructor( fun _annotations(): JsonField> = annotations /** - * Returns the raw JSON value of [logprobs]. + * Returns the raw JSON value of [text]. * - * Unlike [logprobs], this method doesn't throw if the JSON field has an unexpected type. + * Unlike [text], this method doesn't throw if the JSON field has an unexpected type. */ - @JsonProperty("logprobs") @ExcludeMissing fun _logprobs(): JsonField> = logprobs + @JsonProperty("text") @ExcludeMissing fun _text(): JsonField = text /** - * Returns the raw JSON value of [text]. + * Returns the raw JSON value of [logprobs]. * - * Unlike [text], this method doesn't throw if the JSON field has an unexpected type. + * Unlike [logprobs], this method doesn't throw if the JSON field has an unexpected type. */ - @JsonProperty("text") @ExcludeMissing fun _text(): JsonField = text + @JsonProperty("logprobs") @ExcludeMissing fun _logprobs(): JsonField> = logprobs @JsonAnySetter private fun putAdditionalProperty(key: String, value: JsonValue) { @@ -130,7 +130,6 @@ private constructor( * The following fields are required: * ```java * .annotations() - * .logprobs() * .text() * ``` */ @@ -141,17 +140,17 @@ private constructor( class Builder internal constructor() { private var annotations: JsonField>? = null - private var logprobs: JsonField>? = null private var text: JsonField? = null private var type: JsonValue = JsonValue.from("output_text") + private var logprobs: JsonField>? = null private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic internal fun from(responseOutputText: ResponseOutputText) = apply { annotations = responseOutputText.annotations.map { it.toMutableList() } - logprobs = responseOutputText.logprobs.map { it.toMutableList() } text = responseOutputText.text type = responseOutputText.type + logprobs = responseOutputText.logprobs.map { it.toMutableList() } additionalProperties = responseOutputText.additionalProperties.toMutableMap() } @@ -200,31 +199,6 @@ private constructor( fun addAnnotation(filePath: Annotation.FilePath) = addAnnotation(Annotation.ofFilePath(filePath)) - fun logprobs(logprobs: List) = logprobs(JsonField.of(logprobs)) - - /** - * Sets [Builder.logprobs] to an arbitrary JSON value. - * - * You should usually call [Builder.logprobs] with a well-typed `List` value - * instead. This method is primarily for setting the field to an undocumented or not yet - * supported value. - */ - fun logprobs(logprobs: JsonField>) = apply { - this.logprobs = logprobs.map { it.toMutableList() } - } - - /** - * Adds a single [Logprob] to [logprobs]. - * - * @throws IllegalStateException if the field was previously set to a non-list. - */ - fun addLogprob(logprob: Logprob) = apply { - logprobs = - (logprobs ?: JsonField.of(mutableListOf())).also { - checkKnown("logprobs", it).add(logprob) - } - } - /** The text output from the model. */ fun text(text: String) = text(JsonField.of(text)) @@ -250,6 +224,31 @@ private constructor( */ fun type(type: JsonValue) = apply { this.type = type } + fun logprobs(logprobs: List) = logprobs(JsonField.of(logprobs)) + + /** + * Sets [Builder.logprobs] to an arbitrary JSON value. + * + * You should usually call [Builder.logprobs] with a well-typed `List` value + * instead. This method is primarily for setting the field to an undocumented or not yet + * supported value. + */ + fun logprobs(logprobs: JsonField>) = apply { + this.logprobs = logprobs.map { it.toMutableList() } + } + + /** + * Adds a single [Logprob] to [logprobs]. + * + * @throws IllegalStateException if the field was previously set to a non-list. + */ + fun addLogprob(logprob: Logprob) = apply { + logprobs = + (logprobs ?: JsonField.of(mutableListOf())).also { + checkKnown("logprobs", it).add(logprob) + } + } + fun additionalProperties(additionalProperties: Map) = apply { this.additionalProperties.clear() putAllAdditionalProperties(additionalProperties) @@ -277,7 +276,6 @@ private constructor( * The following fields are required: * ```java * .annotations() - * .logprobs() * .text() * ``` * @@ -286,9 +284,9 @@ private constructor( fun build(): ResponseOutputText = ResponseOutputText( checkRequired("annotations", annotations).map { it.toImmutable() }, - checkRequired("logprobs", logprobs).map { it.toImmutable() }, checkRequired("text", text), type, + (logprobs ?: JsonMissing.of()).map { it.toImmutable() }, additionalProperties.toMutableMap(), ) } @@ -301,13 +299,13 @@ private constructor( } annotations().forEach { it.validate() } - logprobs().forEach { it.validate() } text() _type().let { if (it != JsonValue.from("output_text")) { throw OpenAIInvalidDataException("'type' is invalid, received $it") } } + logprobs().ifPresent { it.forEach { it.validate() } } validated = true } @@ -327,9 +325,9 @@ private constructor( @JvmSynthetic internal fun validity(): Int = (annotations.asKnown().getOrNull()?.sumOf { it.validity().toInt() } ?: 0) + - (logprobs.asKnown().getOrNull()?.sumOf { it.validity().toInt() } ?: 0) + (if (text.asKnown().isPresent) 1 else 0) + - type.let { if (it == JsonValue.from("output_text")) 1 else 0 } + type.let { if (it == JsonValue.from("output_text")) 1 else 0 } + + (logprobs.asKnown().getOrNull()?.sumOf { it.validity().toInt() } ?: 0) /** A citation to a file. */ @JsonDeserialize(using = Annotation.Deserializer::class) @@ -2394,18 +2392,18 @@ private constructor( return other is ResponseOutputText && annotations == other.annotations && - logprobs == other.logprobs && text == other.text && type == other.type && + logprobs == other.logprobs && additionalProperties == other.additionalProperties } private val hashCode: Int by lazy { - Objects.hash(annotations, logprobs, text, type, additionalProperties) + Objects.hash(annotations, text, type, logprobs, additionalProperties) } override fun hashCode(): Int = hashCode override fun toString() = - "ResponseOutputText{annotations=$annotations, logprobs=$logprobs, text=$text, type=$type, additionalProperties=$additionalProperties}" + "ResponseOutputText{annotations=$annotations, text=$text, type=$type, logprobs=$logprobs, additionalProperties=$additionalProperties}" } diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCompletedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCompletedEventTest.kt index d84ae08b..09f60ba4 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCompletedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCompletedEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseCompletedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseCompletedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseCompletedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseCompletedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseCompletedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseCompletedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartAddedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartAddedEventTest.kt index c096fe96..cb7901c4 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartAddedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartAddedEventTest.kt @@ -25,6 +25,7 @@ internal class ResponseContentPartAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -39,7 +40,6 @@ internal class ResponseContentPartAddedEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -59,6 +59,7 @@ internal class ResponseContentPartAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -73,7 +74,6 @@ internal class ResponseContentPartAddedEventTest { ) .build() ) - .text("text") .build() ) ) @@ -97,6 +97,7 @@ internal class ResponseContentPartAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -111,7 +112,6 @@ internal class ResponseContentPartAddedEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartDoneEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartDoneEventTest.kt index cc02b1e9..d292a559 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartDoneEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentPartDoneEventTest.kt @@ -25,6 +25,7 @@ internal class ResponseContentPartDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -39,7 +40,6 @@ internal class ResponseContentPartDoneEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -59,6 +59,7 @@ internal class ResponseContentPartDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -73,7 +74,6 @@ internal class ResponseContentPartDoneEventTest { ) .build() ) - .text("text") .build() ) ) @@ -97,6 +97,7 @@ internal class ResponseContentPartDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -111,7 +112,6 @@ internal class ResponseContentPartDoneEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentTest.kt index dbf0ccf1..4770c2ce 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseContentTest.kt @@ -136,6 +136,7 @@ internal class ResponseContentTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -150,7 +151,6 @@ internal class ResponseContentTest { ) .build() ) - .text("text") .build() val responseContent = ResponseContent.ofOutputText(outputText) @@ -176,6 +176,7 @@ internal class ResponseContentTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -190,7 +191,6 @@ internal class ResponseContentTest { ) .build() ) - .text("text") .build() ) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCreatedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCreatedEventTest.kt index e2c7c09c..8c3d8a36 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCreatedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseCreatedEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseCreatedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseCreatedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseCreatedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseCreatedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseCreatedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseCreatedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseFailedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseFailedEventTest.kt index cf7a71b7..52070146 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseFailedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseFailedEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseFailedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseFailedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseFailedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseFailedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseFailedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseFailedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInProgressEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInProgressEventTest.kt index 0f5015ef..bdaac431 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInProgressEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInProgressEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseInProgressEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseInProgressEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseInProgressEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseInProgressEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseInProgressEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseInProgressEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseIncompleteEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseIncompleteEventTest.kt index e2ae86b9..ce16b8b7 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseIncompleteEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseIncompleteEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseIncompleteEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseIncompleteEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseIncompleteEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseIncompleteEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseIncompleteEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseIncompleteEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInputItemTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInputItemTest.kt index 72d7beba..557b79e7 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInputItemTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseInputItemTest.kt @@ -140,6 +140,7 @@ internal class ResponseInputItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -154,7 +155,6 @@ internal class ResponseInputItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -201,6 +201,7 @@ internal class ResponseInputItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -215,7 +216,6 @@ internal class ResponseInputItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseItemTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseItemTest.kt index 2698d995..aa46ea72 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseItemTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseItemTest.kt @@ -82,6 +82,7 @@ internal class ResponseItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -96,7 +97,6 @@ internal class ResponseItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -138,6 +138,7 @@ internal class ResponseItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -152,7 +153,6 @@ internal class ResponseItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemAddedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemAddedEventTest.kt index 162cb01a..fcd2d401 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemAddedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemAddedEventTest.kt @@ -25,6 +25,7 @@ internal class ResponseOutputItemAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -39,7 +40,6 @@ internal class ResponseOutputItemAddedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -63,6 +63,7 @@ internal class ResponseOutputItemAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -77,7 +78,6 @@ internal class ResponseOutputItemAddedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -105,6 +105,7 @@ internal class ResponseOutputItemAddedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -119,7 +120,6 @@ internal class ResponseOutputItemAddedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemDoneEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemDoneEventTest.kt index 13606f81..81972846 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemDoneEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemDoneEventTest.kt @@ -25,6 +25,7 @@ internal class ResponseOutputItemDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -39,7 +40,6 @@ internal class ResponseOutputItemDoneEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -63,6 +63,7 @@ internal class ResponseOutputItemDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -77,7 +78,6 @@ internal class ResponseOutputItemDoneEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -105,6 +105,7 @@ internal class ResponseOutputItemDoneEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -119,7 +120,6 @@ internal class ResponseOutputItemDoneEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemTest.kt index 8fac3b0e..d7615365 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputItemTest.kt @@ -28,6 +28,7 @@ internal class ResponseOutputItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -42,7 +43,6 @@ internal class ResponseOutputItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -81,6 +81,7 @@ internal class ResponseOutputItemTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -95,7 +96,6 @@ internal class ResponseOutputItemTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputMessageTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputMessageTest.kt index 782b891b..f9482d06 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputMessageTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputMessageTest.kt @@ -23,6 +23,7 @@ internal class ResponseOutputMessageTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -37,7 +38,6 @@ internal class ResponseOutputMessageTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -55,6 +55,7 @@ internal class ResponseOutputMessageTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -69,7 +70,6 @@ internal class ResponseOutputMessageTest { ) .build() ) - .text("text") .build() ) ) @@ -92,6 +92,7 @@ internal class ResponseOutputMessageTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -106,7 +107,6 @@ internal class ResponseOutputMessageTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputTextTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputTextTest.kt index b57f289c..a8d2ccca 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputTextTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseOutputTextTest.kt @@ -4,6 +4,7 @@ package com.openai.models.responses import com.fasterxml.jackson.module.kotlin.jacksonTypeRef import com.openai.core.jsonMapper +import kotlin.jvm.optionals.getOrNull import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -20,6 +21,7 @@ internal class ResponseOutputTextTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -34,7 +36,6 @@ internal class ResponseOutputTextTest { ) .build() ) - .text("text") .build() assertThat(responseOutputText.annotations()) @@ -47,7 +48,8 @@ internal class ResponseOutputTextTest { .build() ) ) - assertThat(responseOutputText.logprobs()) + assertThat(responseOutputText.text()).isEqualTo("text") + assertThat(responseOutputText.logprobs().getOrNull()) .containsExactly( ResponseOutputText.Logprob.builder() .token("token") @@ -62,7 +64,6 @@ internal class ResponseOutputTextTest { ) .build() ) - assertThat(responseOutputText.text()).isEqualTo("text") } @Test @@ -77,6 +78,7 @@ internal class ResponseOutputTextTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -91,7 +93,6 @@ internal class ResponseOutputTextTest { ) .build() ) - .text("text") .build() val roundtrippedResponseOutputText = diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseQueuedEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseQueuedEventTest.kt index cdd24e37..927392e6 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseQueuedEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseQueuedEventTest.kt @@ -52,6 +52,7 @@ internal class ResponseQueuedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -66,7 +67,6 @@ internal class ResponseQueuedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -181,6 +181,7 @@ internal class ResponseQueuedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -195,7 +196,6 @@ internal class ResponseQueuedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -312,6 +312,7 @@ internal class ResponseQueuedEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -326,7 +327,6 @@ internal class ResponseQueuedEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseStreamEventTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseStreamEventTest.kt index 2bc07be4..0a2a864b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseStreamEventTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseStreamEventTest.kt @@ -822,6 +822,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -836,7 +837,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -1013,6 +1013,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1028,7 +1029,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -1134,6 +1134,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1148,7 +1149,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -1229,6 +1229,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1243,7 +1244,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -1275,6 +1275,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1289,7 +1290,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -1370,6 +1370,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1384,7 +1385,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .sequenceNumber(0L) @@ -1438,6 +1438,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1452,7 +1453,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -1629,6 +1629,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -1644,7 +1645,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -2310,6 +2310,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -2324,7 +2325,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -2501,6 +2501,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -2516,7 +2517,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -2644,6 +2644,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -2658,7 +2659,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -2835,6 +2835,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -2850,7 +2851,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -2978,6 +2978,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -2992,7 +2993,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -3169,6 +3169,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -3184,7 +3185,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -3290,6 +3290,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -3304,7 +3305,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -3389,6 +3389,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -3403,7 +3404,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -3439,6 +3439,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -3453,7 +3454,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -3538,6 +3538,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -3552,7 +3553,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -5998,6 +5998,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -6012,7 +6013,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -6189,6 +6189,7 @@ internal class ResponseStreamEventTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -6204,7 +6205,6 @@ internal class ResponseStreamEventTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) diff --git a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseTest.kt b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseTest.kt index ec60999b..dba13d8b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/models/responses/ResponseTest.kt @@ -51,6 +51,7 @@ internal class ResponseTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -65,7 +66,6 @@ internal class ResponseTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -175,6 +175,7 @@ internal class ResponseTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -189,7 +190,6 @@ internal class ResponseTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS) @@ -309,6 +309,7 @@ internal class ResponseTest { .index(0L) .build() ) + .text("text") .addLogprob( ResponseOutputText.Logprob.builder() .token("token") @@ -323,7 +324,6 @@ internal class ResponseTest { ) .build() ) - .text("text") .build() ) .status(ResponseOutputMessage.Status.IN_PROGRESS)