diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml index a2d30a392..c16be2ae8 100644 --- a/.github/workflows/create-releases.yml +++ b/.github/workflows/create-releases.yml @@ -38,11 +38,13 @@ jobs: - name: Publish to Sonatype if: ${{ steps.release.outputs.releases_created }} - run: | + run: |- + export -- GPG_SIGNING_KEY_ID + printenv -- GPG_SIGNING_KEY | gpg --batch --passphrase-fd 3 --import 3<<< "$GPG_SIGNING_PASSWORD" + GPG_SIGNING_KEY_ID="$(gpg --with-colons --list-keys | awk -F : -- '/^pub:/ { getline; print "0x" substr($10, length($10) - 7) }')" ./gradlew --parallel --no-daemon publish env: SONATYPE_USERNAME: ${{ secrets.OPENAI_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.OPENAI_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }} - GPG_SIGNING_KEY_ID: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY_ID || secrets.GPG_SIGNING_KEY_ID }} GPG_SIGNING_KEY: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY || secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSWORD: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_PASSWORD || secrets.GPG_SIGNING_PASSWORD }} diff --git a/.github/workflows/publish-sonatype.yml b/.github/workflows/publish-sonatype.yml index 86f8a1ac6..a7784791a 100644 --- a/.github/workflows/publish-sonatype.yml +++ b/.github/workflows/publish-sonatype.yml @@ -25,11 +25,13 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Publish to Sonatype - run: | + run: |- + export -- GPG_SIGNING_KEY_ID + printenv -- GPG_SIGNING_KEY | gpg --batch --passphrase-fd 3 --import 3<<< "$GPG_SIGNING_PASSWORD" + GPG_SIGNING_KEY_ID="$(gpg --with-colons --list-keys | awk -F : -- '/^pub:/ { getline; print "0x" substr($10, length($10) - 7) }')" ./gradlew --parallel --no-daemon publish env: SONATYPE_USERNAME: ${{ secrets.OPENAI_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.OPENAI_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }} - GPG_SIGNING_KEY_ID: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY_ID || secrets.GPG_SIGNING_KEY_ID }} GPG_SIGNING_KEY: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY || secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSWORD: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_PASSWORD || secrets.GPG_SIGNING_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/release-doctor.yml b/.github/workflows/release-doctor.yml index 3d5837264..af2a074c8 100644 --- a/.github/workflows/release-doctor.yml +++ b/.github/workflows/release-doctor.yml @@ -22,6 +22,5 @@ jobs: STAINLESS_API_KEY: ${{ secrets.STAINLESS_API_KEY }} SONATYPE_USERNAME: ${{ secrets.OPENAI_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.OPENAI_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }} - GPG_SIGNING_KEY_ID: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY_ID || secrets.GPG_SIGNING_KEY_ID }} GPG_SIGNING_KEY: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_KEY || secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSWORD: ${{ secrets.OPENAI_SONATYPE_GPG_SIGNING_PASSWORD || secrets.GPG_SIGNING_PASSWORD }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d04f223f8..4208b5cb7 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.5.1" + ".": "0.6.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d935595cb..2ad25adc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## 0.6.0 (2024-11-27) + +Full Changelog: [v0.5.1...v0.6.0](https://github.com/openai/openai-java/compare/v0.5.1...v0.6.0) + +### ⚠ BREAKING CHANGES + +* **client:** remove duplicated classes + +### Features + +* derive gpg release key's id via gpg itself ([#25](https://github.com/openai/openai-java/issues/25)) ([6aad041](https://github.com/openai/openai-java/commit/6aad041b56bc39ee8e9c48e48738081652bf4ed2)) + + +### Bug Fixes + +* **client:** remove duplicated classes ([8a8f11f](https://github.com/openai/openai-java/commit/8a8f11fc20c415877f1f673ec0be3948126d1c11)) + ## 0.5.1 (2024-11-26) Full Changelog: [v0.5.0...v0.5.1](https://github.com/openai/openai-java/compare/v0.5.0...v0.5.1) diff --git a/README.md b/README.md index 4f8f0ae27..fae04d093 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.5.1) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.6.0) @@ -30,7 +30,7 @@ The REST API documentation can be found on [platform.openai.com](https://platfo ```kotlin -implementation("com.openai:openai-java:0.5.1") +implementation("com.openai:openai-java:0.6.0") ``` #### Maven @@ -39,7 +39,7 @@ implementation("com.openai:openai-java:0.5.1") com.openai openai-java - 0.5.1 + 0.6.0 ``` diff --git a/build.gradle.kts b/build.gradle.kts index d5568ef88..6492eef66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "com.openai" - version = "0.5.1" // x-release-please-version + version = "0.6.0" // x-release-please-version } nexusPublishing { 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 af12f6a87..aabf057e9 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 @@ -32,7 +32,7 @@ import java.util.Optional class ChatCompletionCreateParams constructor( private val messages: List, - private val model: Model, + private val model: ChatModel, private val audio: ChatCompletionAudioParam?, private val frequencyPenalty: Double?, private val functionCall: FunctionCall?, @@ -66,7 +66,7 @@ constructor( fun messages(): List = messages - fun model(): Model = model + fun model(): ChatModel = model fun audio(): Optional = Optional.ofNullable(audio) @@ -170,7 +170,7 @@ constructor( class ChatCompletionCreateBody internal constructor( private val messages: List?, - private val model: Model?, + private val model: ChatModel?, private val audio: ChatCompletionAudioParam?, private val frequencyPenalty: Double?, private val functionCall: FunctionCall?, @@ -215,7 +215,7 @@ constructor( * [model endpoint compatibility](https://platform.openai.com/docs/models#model-endpoint-compatibility) * table for details on which models work with the Chat API. */ - @JsonProperty("model") fun model(): Model? = model + @JsonProperty("model") fun model(): ChatModel? = model /** * Parameters for audio output. Required when audio output is requested with `modalities: @@ -463,7 +463,7 @@ constructor( class Builder { private var messages: List? = null - private var model: Model? = null + private var model: ChatModel? = null private var audio: ChatCompletionAudioParam? = null private var frequencyPenalty: Double? = null private var functionCall: FunctionCall? = null @@ -543,7 +543,7 @@ constructor( * [model endpoint compatibility](https://platform.openai.com/docs/models#model-endpoint-compatibility) * table for details on which models work with the Chat API. */ - @JsonProperty("model") fun model(model: Model) = apply { this.model = model } + @JsonProperty("model") fun model(model: ChatModel) = apply { this.model = model } /** * Parameters for audio output. Required when audio output is requested with @@ -898,7 +898,7 @@ constructor( class Builder { private var messages: MutableList = mutableListOf() - private var model: Model? = null + private var model: ChatModel? = null private var audio: ChatCompletionAudioParam? = null private var frequencyPenalty: Double? = null private var functionCall: FunctionCall? = null @@ -993,14 +993,14 @@ constructor( * [model endpoint compatibility](https://platform.openai.com/docs/models#model-endpoint-compatibility) * table for details on which models work with the Chat API. */ - fun model(model: Model) = apply { this.model = model } + fun model(model: ChatModel) = apply { this.model = model } /** * ID of the model to use. See the * [model endpoint compatibility](https://platform.openai.com/docs/models#model-endpoint-compatibility) * table for details on which models work with the Chat API. */ - fun model(value: String) = apply { this.model = Model.of(value) } + fun model(value: String) = apply { this.model = ChatModel.of(value) } /** * Parameters for audio output. Required when audio output is requested with `modalities: @@ -1585,259 +1585,6 @@ constructor( ) } - class Model - @JsonCreator - private constructor( - private val value: JsonField, - ) : Enum { - - @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value - - 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() - - companion object { - - @JvmField val O1_PREVIEW = Model(JsonField.of("o1-preview")) - - @JvmField val O1_PREVIEW_2024_09_12 = Model(JsonField.of("o1-preview-2024-09-12")) - - @JvmField val O1_MINI = Model(JsonField.of("o1-mini")) - - @JvmField val O1_MINI_2024_09_12 = Model(JsonField.of("o1-mini-2024-09-12")) - - @JvmField val GPT_4O = Model(JsonField.of("gpt-4o")) - - @JvmField val GPT_4O_2024_11_20 = Model(JsonField.of("gpt-4o-2024-11-20")) - - @JvmField val GPT_4O_2024_08_06 = Model(JsonField.of("gpt-4o-2024-08-06")) - - @JvmField val GPT_4O_2024_05_13 = Model(JsonField.of("gpt-4o-2024-05-13")) - - @JvmField val GPT_4O_REALTIME_PREVIEW = Model(JsonField.of("gpt-4o-realtime-preview")) - - @JvmField - val GPT_4O_REALTIME_PREVIEW_2024_10_01 = - Model(JsonField.of("gpt-4o-realtime-preview-2024-10-01")) - - @JvmField val GPT_4O_AUDIO_PREVIEW = Model(JsonField.of("gpt-4o-audio-preview")) - - @JvmField - val GPT_4O_AUDIO_PREVIEW_2024_10_01 = - Model(JsonField.of("gpt-4o-audio-preview-2024-10-01")) - - @JvmField val CHATGPT_4O_LATEST = Model(JsonField.of("chatgpt-4o-latest")) - - @JvmField val GPT_4O_MINI = Model(JsonField.of("gpt-4o-mini")) - - @JvmField val GPT_4O_MINI_2024_07_18 = Model(JsonField.of("gpt-4o-mini-2024-07-18")) - - @JvmField val GPT_4_TURBO = Model(JsonField.of("gpt-4-turbo")) - - @JvmField val GPT_4_TURBO_2024_04_09 = Model(JsonField.of("gpt-4-turbo-2024-04-09")) - - @JvmField val GPT_4_0125_PREVIEW = Model(JsonField.of("gpt-4-0125-preview")) - - @JvmField val GPT_4_TURBO_PREVIEW = Model(JsonField.of("gpt-4-turbo-preview")) - - @JvmField val GPT_4_1106_PREVIEW = Model(JsonField.of("gpt-4-1106-preview")) - - @JvmField val GPT_4_VISION_PREVIEW = Model(JsonField.of("gpt-4-vision-preview")) - - @JvmField val GPT_4 = Model(JsonField.of("gpt-4")) - - @JvmField val GPT_4_0314 = Model(JsonField.of("gpt-4-0314")) - - @JvmField val GPT_4_0613 = Model(JsonField.of("gpt-4-0613")) - - @JvmField val GPT_4_32K = Model(JsonField.of("gpt-4-32k")) - - @JvmField val GPT_4_32K_0314 = Model(JsonField.of("gpt-4-32k-0314")) - - @JvmField val GPT_4_32K_0613 = Model(JsonField.of("gpt-4-32k-0613")) - - @JvmField val GPT_3_5_TURBO = Model(JsonField.of("gpt-3.5-turbo")) - - @JvmField val GPT_3_5_TURBO_16K = Model(JsonField.of("gpt-3.5-turbo-16k")) - - @JvmField val GPT_3_5_TURBO_0301 = Model(JsonField.of("gpt-3.5-turbo-0301")) - - @JvmField val GPT_3_5_TURBO_0613 = Model(JsonField.of("gpt-3.5-turbo-0613")) - - @JvmField val GPT_3_5_TURBO_1106 = Model(JsonField.of("gpt-3.5-turbo-1106")) - - @JvmField val GPT_3_5_TURBO_0125 = Model(JsonField.of("gpt-3.5-turbo-0125")) - - @JvmField val GPT_3_5_TURBO_16K_0613 = Model(JsonField.of("gpt-3.5-turbo-16k-0613")) - - @JvmStatic fun of(value: String) = Model(JsonField.of(value)) - } - - enum class Known { - O1_PREVIEW, - O1_PREVIEW_2024_09_12, - O1_MINI, - O1_MINI_2024_09_12, - GPT_4O, - GPT_4O_2024_11_20, - GPT_4O_2024_08_06, - GPT_4O_2024_05_13, - GPT_4O_REALTIME_PREVIEW, - GPT_4O_REALTIME_PREVIEW_2024_10_01, - GPT_4O_AUDIO_PREVIEW, - GPT_4O_AUDIO_PREVIEW_2024_10_01, - CHATGPT_4O_LATEST, - 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_0301, - GPT_3_5_TURBO_0613, - GPT_3_5_TURBO_1106, - GPT_3_5_TURBO_0125, - GPT_3_5_TURBO_16K_0613, - } - - enum class Value { - O1_PREVIEW, - O1_PREVIEW_2024_09_12, - O1_MINI, - O1_MINI_2024_09_12, - GPT_4O, - GPT_4O_2024_11_20, - GPT_4O_2024_08_06, - GPT_4O_2024_05_13, - GPT_4O_REALTIME_PREVIEW, - GPT_4O_REALTIME_PREVIEW_2024_10_01, - GPT_4O_AUDIO_PREVIEW, - GPT_4O_AUDIO_PREVIEW_2024_10_01, - CHATGPT_4O_LATEST, - 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_0301, - GPT_3_5_TURBO_0613, - GPT_3_5_TURBO_1106, - GPT_3_5_TURBO_0125, - GPT_3_5_TURBO_16K_0613, - _UNKNOWN, - } - - fun value(): Value = - when (this) { - O1_PREVIEW -> Value.O1_PREVIEW - O1_PREVIEW_2024_09_12 -> Value.O1_PREVIEW_2024_09_12 - O1_MINI -> Value.O1_MINI - O1_MINI_2024_09_12 -> Value.O1_MINI_2024_09_12 - 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_REALTIME_PREVIEW -> Value.GPT_4O_REALTIME_PREVIEW - GPT_4O_REALTIME_PREVIEW_2024_10_01 -> Value.GPT_4O_REALTIME_PREVIEW_2024_10_01 - GPT_4O_AUDIO_PREVIEW -> Value.GPT_4O_AUDIO_PREVIEW - GPT_4O_AUDIO_PREVIEW_2024_10_01 -> Value.GPT_4O_AUDIO_PREVIEW_2024_10_01 - CHATGPT_4O_LATEST -> Value.CHATGPT_4O_LATEST - 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_0301 -> Value.GPT_3_5_TURBO_0301 - 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 - } - - fun known(): Known = - when (this) { - O1_PREVIEW -> Known.O1_PREVIEW - O1_PREVIEW_2024_09_12 -> Known.O1_PREVIEW_2024_09_12 - O1_MINI -> Known.O1_MINI - O1_MINI_2024_09_12 -> Known.O1_MINI_2024_09_12 - 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_REALTIME_PREVIEW -> Known.GPT_4O_REALTIME_PREVIEW - GPT_4O_REALTIME_PREVIEW_2024_10_01 -> Known.GPT_4O_REALTIME_PREVIEW_2024_10_01 - GPT_4O_AUDIO_PREVIEW -> Known.GPT_4O_AUDIO_PREVIEW - GPT_4O_AUDIO_PREVIEW_2024_10_01 -> Known.GPT_4O_AUDIO_PREVIEW_2024_10_01 - CHATGPT_4O_LATEST -> Known.CHATGPT_4O_LATEST - 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_0301 -> Known.GPT_3_5_TURBO_0301 - 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() - } - @JsonDeserialize(using = FunctionCall.Deserializer::class) @JsonSerialize(using = FunctionCall.Serializer::class) class FunctionCall diff --git a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt index 42acdd147..806aac33d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt @@ -32,7 +32,7 @@ import java.util.Optional class EmbeddingCreateParams constructor( private val input: Input, - private val model: Model, + private val model: EmbeddingModel, private val dimensions: Long?, private val encodingFormat: EncodingFormat?, private val user: String?, @@ -43,7 +43,7 @@ constructor( fun input(): Input = input - fun model(): Model = model + fun model(): EmbeddingModel = model fun dimensions(): Optional = Optional.ofNullable(dimensions) @@ -78,7 +78,7 @@ constructor( class EmbeddingCreateBody internal constructor( private val input: Input?, - private val model: Model?, + private val model: EmbeddingModel?, private val dimensions: Long?, private val encodingFormat: EncodingFormat?, private val user: String?, @@ -101,7 +101,7 @@ constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - @JsonProperty("model") fun model(): Model? = model + @JsonProperty("model") fun model(): EmbeddingModel? = model /** * The number of dimensions the resulting output embeddings should have. Only supported in @@ -136,7 +136,7 @@ constructor( class Builder { private var input: Input? = null - private var model: Model? = null + private var model: EmbeddingModel? = null private var dimensions: Long? = null private var encodingFormat: EncodingFormat? = null private var user: String? = null @@ -169,7 +169,7 @@ constructor( * all of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - @JsonProperty("model") fun model(model: Model) = apply { this.model = model } + @JsonProperty("model") fun model(model: EmbeddingModel) = apply { this.model = model } /** * The number of dimensions the resulting output embeddings should have. Only supported @@ -248,7 +248,7 @@ constructor( class Builder { private var input: Input? = null - private var model: Model? = null + private var model: EmbeddingModel? = null private var dimensions: Long? = null private var encodingFormat: EncodingFormat? = null private var user: String? = null @@ -330,7 +330,7 @@ constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(model: Model) = apply { this.model = model } + fun model(model: EmbeddingModel) = apply { this.model = model } /** * ID of the model to use. You can use the @@ -338,7 +338,7 @@ constructor( * of your available models, or see our * [Model overview](https://platform.openai.com/docs/models) for descriptions of them. */ - fun model(value: String) = apply { this.model = Model.of(value) } + fun model(value: String) = apply { this.model = EmbeddingModel.of(value) } /** * The number of dimensions the resulting output embeddings should have. Only supported in @@ -653,69 +653,6 @@ constructor( } } - class Model - @JsonCreator - private constructor( - private val value: JsonField, - ) : Enum { - - @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value - - 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() - - companion object { - - @JvmField val TEXT_EMBEDDING_ADA_002 = Model(JsonField.of("text-embedding-ada-002")) - - @JvmField val TEXT_EMBEDDING_3_SMALL = Model(JsonField.of("text-embedding-3-small")) - - @JvmField val TEXT_EMBEDDING_3_LARGE = Model(JsonField.of("text-embedding-3-large")) - - @JvmStatic fun of(value: String) = Model(JsonField.of(value)) - } - - enum class Known { - TEXT_EMBEDDING_ADA_002, - TEXT_EMBEDDING_3_SMALL, - TEXT_EMBEDDING_3_LARGE, - } - - enum class Value { - TEXT_EMBEDDING_ADA_002, - TEXT_EMBEDDING_3_SMALL, - TEXT_EMBEDDING_3_LARGE, - _UNKNOWN, - } - - fun value(): Value = - when (this) { - TEXT_EMBEDDING_ADA_002 -> Value.TEXT_EMBEDDING_ADA_002 - TEXT_EMBEDDING_3_SMALL -> Value.TEXT_EMBEDDING_3_SMALL - TEXT_EMBEDDING_3_LARGE -> Value.TEXT_EMBEDDING_3_LARGE - else -> Value._UNKNOWN - } - - fun known(): Known = - when (this) { - TEXT_EMBEDDING_ADA_002 -> Known.TEXT_EMBEDDING_ADA_002 - TEXT_EMBEDDING_3_SMALL -> Known.TEXT_EMBEDDING_3_SMALL - TEXT_EMBEDDING_3_LARGE -> Known.TEXT_EMBEDDING_3_LARGE - else -> throw OpenAIInvalidDataException("Unknown Model: $value") - } - - fun asString(): String = _value().asStringOrThrow() - } - class EncodingFormat @JsonCreator private constructor( diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt index 4550132ec..78768d7cf 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt @@ -23,7 +23,7 @@ import java.util.Optional class ImageGenerateParams constructor( private val prompt: String, - private val model: Model?, + private val model: ImageModel?, private val n: Long?, private val quality: Quality?, private val responseFormat: ResponseFormat?, @@ -37,7 +37,7 @@ constructor( fun prompt(): String = prompt - fun model(): Optional = Optional.ofNullable(model) + fun model(): Optional = Optional.ofNullable(model) fun n(): Optional = Optional.ofNullable(n) @@ -81,7 +81,7 @@ constructor( class ImageGenerateBody internal constructor( private val prompt: String?, - private val model: Model?, + private val model: ImageModel?, private val n: Long?, private val quality: Quality?, private val responseFormat: ResponseFormat?, @@ -98,7 +98,7 @@ constructor( @JsonProperty("prompt") fun prompt(): String? = prompt /** The model to use for image generation. */ - @JsonProperty("model") fun model(): Model? = model + @JsonProperty("model") fun model(): ImageModel? = model /** * The number of images to generate. Must be between 1 and 10. For `dall-e-3`, only `n=1` is @@ -154,7 +154,7 @@ constructor( class Builder { private var prompt: String? = null - private var model: Model? = null + private var model: ImageModel? = null private var n: Long? = null private var quality: Quality? = null private var responseFormat: ResponseFormat? = null @@ -183,7 +183,7 @@ constructor( @JsonProperty("prompt") fun prompt(prompt: String) = apply { this.prompt = prompt } /** The model to use for image generation. */ - @JsonProperty("model") fun model(model: Model) = apply { this.model = model } + @JsonProperty("model") fun model(model: ImageModel) = apply { this.model = model } /** * The number of images to generate. Must be between 1 and 10. For `dall-e-3`, only @@ -287,7 +287,7 @@ constructor( class Builder { private var prompt: String? = null - private var model: Model? = null + private var model: ImageModel? = null private var n: Long? = null private var quality: Quality? = null private var responseFormat: ResponseFormat? = null @@ -320,10 +320,10 @@ constructor( fun prompt(prompt: String) = apply { this.prompt = prompt } /** The model to use for image generation. */ - fun model(model: Model) = apply { this.model = model } + fun model(model: ImageModel) = apply { this.model = model } /** The model to use for image generation. */ - fun model(value: String) = apply { this.model = Model.of(value) } + fun model(value: String) = apply { this.model = ImageModel.of(value) } /** * The number of images to generate. Must be between 1 and 10. For `dall-e-3`, only `n=1` is @@ -503,63 +503,6 @@ constructor( ) } - class Model - @JsonCreator - private constructor( - private val value: JsonField, - ) : Enum { - - @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value - - 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() - - companion object { - - @JvmField val DALL_E_2 = Model(JsonField.of("dall-e-2")) - - @JvmField val DALL_E_3 = Model(JsonField.of("dall-e-3")) - - @JvmStatic fun of(value: String) = Model(JsonField.of(value)) - } - - enum class Known { - DALL_E_2, - DALL_E_3, - } - - enum class Value { - DALL_E_2, - DALL_E_3, - _UNKNOWN, - } - - fun value(): Value = - when (this) { - DALL_E_2 -> Value.DALL_E_2 - DALL_E_3 -> Value.DALL_E_3 - else -> Value._UNKNOWN - } - - fun known(): Known = - when (this) { - DALL_E_2 -> Known.DALL_E_2 - DALL_E_3 -> Known.DALL_E_3 - else -> throw OpenAIInvalidDataException("Unknown Model: $value") - } - - fun asString(): String = _value().asStringOrThrow() - } - class Quality @JsonCreator private constructor( diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt index a18acf30e..89aaaba65 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt @@ -4,7 +4,6 @@ package com.openai.models 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.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.ObjectCodec @@ -15,9 +14,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.module.kotlin.jacksonTypeRef import com.openai.core.BaseDeserializer import com.openai.core.BaseSerializer -import com.openai.core.Enum import com.openai.core.ExcludeMissing -import com.openai.core.JsonField import com.openai.core.JsonValue import com.openai.core.NoAutoDetect import com.openai.core.getOrThrow @@ -32,7 +29,7 @@ import java.util.Optional class ModerationCreateParams constructor( private val input: Input, - private val model: Model?, + private val model: ModerationModel?, private val additionalHeaders: Headers, private val additionalQueryParams: QueryParams, private val additionalBodyProperties: Map, @@ -40,7 +37,7 @@ constructor( fun input(): Input = input - fun model(): Optional = Optional.ofNullable(model) + fun model(): Optional = Optional.ofNullable(model) fun _additionalHeaders(): Headers = additionalHeaders @@ -66,7 +63,7 @@ constructor( class ModerationCreateBody internal constructor( private val input: Input?, - private val model: Model?, + private val model: ModerationModel?, private val additionalProperties: Map, ) { @@ -81,7 +78,7 @@ constructor( * [the moderation guide](https://platform.openai.com/docs/guides/moderation), and learn * about available models [here](https://platform.openai.com/docs/models#moderation). */ - @JsonProperty("model") fun model(): Model? = model + @JsonProperty("model") fun model(): ModerationModel? = model @JsonAnyGetter @ExcludeMissing @@ -97,7 +94,7 @@ constructor( class Builder { private var input: Input? = null - private var model: Model? = null + private var model: ModerationModel? = null private var additionalProperties: MutableMap = mutableMapOf() @JvmSynthetic @@ -118,7 +115,7 @@ constructor( * [the moderation guide](https://platform.openai.com/docs/guides/moderation), and learn * about available models [here](https://platform.openai.com/docs/models#moderation). */ - @JsonProperty("model") fun model(model: Model) = apply { this.model = model } + @JsonProperty("model") fun model(model: ModerationModel) = apply { this.model = model } fun additionalProperties(additionalProperties: Map) = apply { this.additionalProperties.clear() @@ -171,7 +168,7 @@ constructor( class Builder { private var input: Input? = null - private var model: Model? = null + private var model: ModerationModel? = null private var additionalHeaders: Headers.Builder = Headers.builder() private var additionalQueryParams: QueryParams.Builder = QueryParams.builder() private var additionalBodyProperties: MutableMap = mutableMapOf() @@ -217,14 +214,14 @@ constructor( * [the moderation guide](https://platform.openai.com/docs/guides/moderation), and learn * about available models [here](https://platform.openai.com/docs/models#moderation). */ - fun model(model: Model) = apply { this.model = model } + fun model(model: ModerationModel) = apply { this.model = model } /** * The content moderation model you would like to use. Learn more in * [the moderation guide](https://platform.openai.com/docs/guides/moderation), and learn * about available models [here](https://platform.openai.com/docs/models#moderation). */ - fun model(value: String) = apply { this.model = Model.of(value) } + fun model(value: String) = apply { this.model = ModerationModel.of(value) } fun additionalHeaders(additionalHeaders: Headers) = apply { this.additionalHeaders.clear() @@ -495,76 +492,6 @@ constructor( } } - class Model - @JsonCreator - private constructor( - private val value: JsonField, - ) : Enum { - - @com.fasterxml.jackson.annotation.JsonValue fun _value(): JsonField = value - - 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() - - companion object { - - @JvmField val OMNI_MODERATION_LATEST = Model(JsonField.of("omni-moderation-latest")) - - @JvmField - val OMNI_MODERATION_2024_09_26 = Model(JsonField.of("omni-moderation-2024-09-26")) - - @JvmField val TEXT_MODERATION_LATEST = Model(JsonField.of("text-moderation-latest")) - - @JvmField val TEXT_MODERATION_STABLE = Model(JsonField.of("text-moderation-stable")) - - @JvmStatic fun of(value: String) = Model(JsonField.of(value)) - } - - enum class Known { - OMNI_MODERATION_LATEST, - OMNI_MODERATION_2024_09_26, - TEXT_MODERATION_LATEST, - TEXT_MODERATION_STABLE, - } - - enum class Value { - OMNI_MODERATION_LATEST, - OMNI_MODERATION_2024_09_26, - TEXT_MODERATION_LATEST, - TEXT_MODERATION_STABLE, - _UNKNOWN, - } - - fun value(): Value = - when (this) { - OMNI_MODERATION_LATEST -> Value.OMNI_MODERATION_LATEST - OMNI_MODERATION_2024_09_26 -> Value.OMNI_MODERATION_2024_09_26 - TEXT_MODERATION_LATEST -> Value.TEXT_MODERATION_LATEST - TEXT_MODERATION_STABLE -> Value.TEXT_MODERATION_STABLE - else -> Value._UNKNOWN - } - - fun known(): Known = - when (this) { - OMNI_MODERATION_LATEST -> Known.OMNI_MODERATION_LATEST - OMNI_MODERATION_2024_09_26 -> Known.OMNI_MODERATION_2024_09_26 - TEXT_MODERATION_LATEST -> Known.TEXT_MODERATION_LATEST - TEXT_MODERATION_STABLE -> Known.TEXT_MODERATION_STABLE - else -> throw OpenAIInvalidDataException("Unknown Model: $value") - } - - fun asString(): String = _value().asStringOrThrow() - } - override fun equals(other: Any?): Boolean { if (this === other) { return true 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 a2f6328ab..500c69f3e 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 @@ -24,7 +24,7 @@ class ChatCompletionCreateParamsTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .audio( ChatCompletionAudioParam.builder() .format(ChatCompletionAudioParam.Format.WAV) @@ -115,7 +115,7 @@ class ChatCompletionCreateParamsTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .audio( ChatCompletionAudioParam.builder() .format(ChatCompletionAudioParam.Format.WAV) @@ -203,7 +203,7 @@ class ChatCompletionCreateParamsTest { ) ) ) - assertThat(body.model()).isEqualTo(ChatCompletionCreateParams.Model.O1_PREVIEW) + assertThat(body.model()).isEqualTo(ChatModel.O1_PREVIEW) assertThat(body.audio()) .isEqualTo( ChatCompletionAudioParam.builder() @@ -301,7 +301,7 @@ class ChatCompletionCreateParamsTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .build() val body = params.getBody() assertThat(body).isNotNull @@ -318,6 +318,6 @@ class ChatCompletionCreateParamsTest { ) ) ) - assertThat(body.model()).isEqualTo(ChatCompletionCreateParams.Model.O1_PREVIEW) + assertThat(body.model()).isEqualTo(ChatModel.O1_PREVIEW) } } 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 58b0dc99c..910bb2c4b 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 @@ -12,7 +12,7 @@ class EmbeddingCreateParamsTest { fun createEmbeddingCreateParams() { EmbeddingCreateParams.builder() .input(EmbeddingCreateParams.Input.ofString("This is a test.")) - .model(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) .dimensions(1L) .encodingFormat(EmbeddingCreateParams.EncodingFormat.FLOAT) .user("user-1234") @@ -24,7 +24,7 @@ class EmbeddingCreateParamsTest { val params = EmbeddingCreateParams.builder() .input(EmbeddingCreateParams.Input.ofString("This is a test.")) - .model(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) .dimensions(1L) .encodingFormat(EmbeddingCreateParams.EncodingFormat.FLOAT) .user("user-1234") @@ -32,7 +32,7 @@ class EmbeddingCreateParamsTest { val body = params.getBody() assertThat(body).isNotNull assertThat(body.input()).isEqualTo(EmbeddingCreateParams.Input.ofString("This is a test.")) - assertThat(body.model()).isEqualTo(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + assertThat(body.model()).isEqualTo(EmbeddingModel.TEXT_EMBEDDING_ADA_002) assertThat(body.dimensions()).isEqualTo(1L) assertThat(body.encodingFormat()).isEqualTo(EmbeddingCreateParams.EncodingFormat.FLOAT) assertThat(body.user()).isEqualTo("user-1234") @@ -43,11 +43,11 @@ class EmbeddingCreateParamsTest { val params = EmbeddingCreateParams.builder() .input(EmbeddingCreateParams.Input.ofString("This is a test.")) - .model(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) .build() val body = params.getBody() assertThat(body).isNotNull assertThat(body.input()).isEqualTo(EmbeddingCreateParams.Input.ofString("This is a test.")) - assertThat(body.model()).isEqualTo(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + assertThat(body.model()).isEqualTo(EmbeddingModel.TEXT_EMBEDDING_ADA_002) } } 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 17324fb0e..73e9e7abb 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 @@ -12,7 +12,7 @@ class ImageGenerateParamsTest { fun createImageGenerateParams() { ImageGenerateParams.builder() .prompt("A cute baby sea otter") - .model(ImageGenerateParams.Model.DALL_E_2) + .model(ImageModel.DALL_E_2) .n(1L) .quality(ImageGenerateParams.Quality.STANDARD) .responseFormat(ImageGenerateParams.ResponseFormat.URL) @@ -27,7 +27,7 @@ class ImageGenerateParamsTest { val params = ImageGenerateParams.builder() .prompt("A cute baby sea otter") - .model(ImageGenerateParams.Model.DALL_E_2) + .model(ImageModel.DALL_E_2) .n(1L) .quality(ImageGenerateParams.Quality.STANDARD) .responseFormat(ImageGenerateParams.ResponseFormat.URL) @@ -38,7 +38,7 @@ class ImageGenerateParamsTest { val body = params.getBody() assertThat(body).isNotNull assertThat(body.prompt()).isEqualTo("A cute baby sea otter") - assertThat(body.model()).isEqualTo(ImageGenerateParams.Model.DALL_E_2) + assertThat(body.model()).isEqualTo(ImageModel.DALL_E_2) assertThat(body.n()).isEqualTo(1L) assertThat(body.quality()).isEqualTo(ImageGenerateParams.Quality.STANDARD) assertThat(body.responseFormat()).isEqualTo(ImageGenerateParams.ResponseFormat.URL) 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 03ea142a7..a005fb75a 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 @@ -12,7 +12,7 @@ class ModerationCreateParamsTest { fun createModerationCreateParams() { ModerationCreateParams.builder() .input(ModerationCreateParams.Input.ofString("I want to kill them.")) - .model(ModerationCreateParams.Model.OMNI_MODERATION_LATEST) + .model(ModerationModel.OMNI_MODERATION_LATEST) .build() } @@ -21,13 +21,13 @@ class ModerationCreateParamsTest { val params = ModerationCreateParams.builder() .input(ModerationCreateParams.Input.ofString("I want to kill them.")) - .model(ModerationCreateParams.Model.OMNI_MODERATION_LATEST) + .model(ModerationModel.OMNI_MODERATION_LATEST) .build() val body = params.getBody() assertThat(body).isNotNull assertThat(body.input()) .isEqualTo(ModerationCreateParams.Input.ofString("I want to kill them.")) - assertThat(body.model()).isEqualTo(ModerationCreateParams.Model.OMNI_MODERATION_LATEST) + assertThat(body.model()).isEqualTo(ModerationModel.OMNI_MODERATION_LATEST) } @Test diff --git a/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt index 9e6a20c96..b93e15de4 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/ServiceParamsTest.kt @@ -71,7 +71,7 @@ class ServiceParamsTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .audio( ChatCompletionAudioParam.builder() .format(ChatCompletionAudioParam.Format.WAV) diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt index 7408aead2..5dae5d0c8 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/EmbeddingServiceTest.kt @@ -23,7 +23,7 @@ class EmbeddingServiceTest { embeddingService.create( EmbeddingCreateParams.builder() .input(EmbeddingCreateParams.Input.ofString("This is a test.")) - .model(EmbeddingCreateParams.Model.TEXT_EMBEDDING_ADA_002) + .model(EmbeddingModel.TEXT_EMBEDDING_ADA_002) .dimensions(1L) .encodingFormat(EmbeddingCreateParams.EncodingFormat.FLOAT) .user("user-1234") diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt index 042960773..575ec1644 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ImageServiceTest.kt @@ -23,7 +23,7 @@ class ImageServiceTest { imageService.generate( ImageGenerateParams.builder() .prompt("A cute baby sea otter") - .model(ImageGenerateParams.Model.DALL_E_2) + .model(ImageModel.DALL_E_2) .n(1L) .quality(ImageGenerateParams.Quality.STANDARD) .responseFormat(ImageGenerateParams.ResponseFormat.URL) diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt index 17958098c..473e513f8 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModerationServiceTest.kt @@ -23,7 +23,7 @@ class ModerationServiceTest { moderationService.create( ModerationCreateParams.builder() .input(ModerationCreateParams.Input.ofString("I want to kill them.")) - .model(ModerationCreateParams.Model.OMNI_MODERATION_LATEST) + .model(ModerationModel.OMNI_MODERATION_LATEST) .build() ) println(moderationCreateResponse) diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt index c72708da4..894841aad 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/chat/CompletionServiceTest.kt @@ -37,7 +37,7 @@ class CompletionServiceTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .audio( ChatCompletionAudioParam.builder() .format(ChatCompletionAudioParam.Format.WAV) @@ -143,7 +143,7 @@ class CompletionServiceTest { ) ) ) - .model(ChatCompletionCreateParams.Model.O1_PREVIEW) + .model(ChatModel.O1_PREVIEW) .audio( ChatCompletionAudioParam.builder() .format(ChatCompletionAudioParam.Format.WAV) diff --git a/openai-java-example/src/main/java/com/openai/example/Main.java b/openai-java-example/src/main/java/com/openai/example/Main.java index 64a5b29a8..45c94a5b5 100644 --- a/openai-java-example/src/main/java/com/openai/example/Main.java +++ b/openai-java-example/src/main/java/com/openai/example/Main.java @@ -11,7 +11,7 @@ private Main() {} public static void main(String[] args) { OpenAIClient client = OpenAIOkHttpClient.fromEnv(); ChatCompletionCreateParams completionCreateParams = ChatCompletionCreateParams.builder() - .model(ChatCompletionCreateParams.Model.GPT_3_5_TURBO) + .model(ChatModel.GPT_3_5_TURBO) .maxTokens(1024) .addMessage(ChatCompletionMessageParam.ofChatCompletionUserMessageParam( ChatCompletionUserMessageParam.builder()