diff --git a/.release-please-manifest.json b/.release-please-manifest.json index da59f99e..2aca35ae 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.4.0" + ".": "0.5.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9275574e..d71d4b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## 0.5.0 (2024-11-25) + +Full Changelog: [v0.4.0...v0.5.0](https://github.com/openai/openai-java/compare/v0.4.0...v0.5.0) + +### Features + +* **client:** add logging when debug env is set ([#18](https://github.com/openai/openai-java/issues/18)) ([017aae7](https://github.com/openai/openai-java/commit/017aae7a1795fe933e0ea9e8ee2c8d059c6746f4)) + + +### Documentation + +* add note that we're in alpha ([#19](https://github.com/openai/openai-java/issues/19)) ([d49cc28](https://github.com/openai/openai-java/commit/d49cc28f0a621df658a3c83a880735ebd7cc1acc)) +* **readme:** add Microsoft Azure section ([#17](https://github.com/openai/openai-java/issues/17)) ([8f8165f](https://github.com/openai/openai-java/commit/8f8165fd33780e3ee0609df7e7e171c8e7f10029)) +* swap example from `.completions()` to `.chat().completions()` ([#20](https://github.com/openai/openai-java/issues/20)) ([f0423a7](https://github.com/openai/openai-java/commit/f0423a7e9e20d5c1e528077fbb4e87baa822079a)) + + +### Styles + +* **internal:** reorder some params methods and improve consistency of implementations ([#15](https://github.com/openai/openai-java/issues/15)) ([8592cda](https://github.com/openai/openai-java/commit/8592cdad178325e3a8994ef44e854ee5b4853c45)) + ## 0.4.0 (2024-11-21) Full Changelog: [v0.3.0...v0.4.0](https://github.com/openai/openai-java/compare/v0.3.0...v0.4.0) diff --git a/README.md b/README.md index 3afedcc8..662c37e4 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.4.0) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.5.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.4.0") +implementation("com.openai:openai-java:0.5.0") ``` #### Maven @@ -39,7 +39,7 @@ implementation("com.openai:openai-java:0.4.0") com.openai openai-java - 0.4.0 + 0.5.0 ``` @@ -270,6 +270,46 @@ This library throws exceptions in a single hierarchy for easy handling: - We failed to serialize the request body - We failed to parse the response body (has access to response code and body) +## Microsoft Azure OpenAI + +To use this library with [Azure OpenAI](https://learn.microsoft.com/azure/ai-services/openai/overview), use the same +OpenAI client builder but with the Azure-specific configuration. + +```java +OpenAIOkHttpClient.Builder clientBuilder = OpenAIOkHttpClient.builder(); + +/* Azure-specific code starts here */ +// You can either set 'endpoint' directly in the builder. +// or set the env var "AZURE_OPENAI_ENDPOINT" and use fromEnv() method instead +clientBuilder + .baseUrl(System.getenv("AZURE_OPENAI_ENDPOINT")) + .credential(BearerTokenCredential.create( + AuthenticationUtil.getBearerTokenSupplier( + new DefaultAzureCredentialBuilder().build(), "https://cognitiveservices.azure.com/.default") + )); +/* Azure-specific code ends here */ + +OpenAIClient client = clientBuilder.build(); + +ChatCompletionCreateParams params = ChatCompletionCreateParams.builder() + .addMessage(ChatCompletionMessageParam.ofChatCompletionUserMessageParam( + ChatCompletionUserMessageParam.builder() + .role(ChatCompletionUserMessageParam.Role.USER) + .content(ChatCompletionUserMessageParam.Content.ofTextContent("Who won the world series in 2020?")) + .build())) + .model("gpt-4o") + .build(); + +ChatCompletion chatCompletion = client.chat().completions().create(params); + +List choices = chatCompletion.choices(); +for (ChatCompletion.Choice choice : choices) { + System.out.println("Choice content: " + choice.message().content().get()); +} +``` + +See the complete Azure OpenAI examples in the [Azure OpenAI example](https://github.com/openai/openai-java/tree/next/openai-azure-java-example/src/main/java/com.openai.azure.examples). + ## Network options ### Retries @@ -333,6 +373,22 @@ get a map of untyped fields of type `Map`. You can then acces `._additionalProperties().get("secret_prop").asString()` or use other helpers defined on the `JsonValue` class to extract it to a desired type. +## Logging + +We use the standard [OkHttp logging interceptor](https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor). + +You can enable logging by setting the environment variable `OPENAI_LOG` to `info`. + +```sh +$ export OPENAI_LOG=info +``` + +Or to `debug` for more verbose logging. + +```sh +$ export OPENAI_LOG=debug +``` + ## Semantic versioning This package generally follows [SemVer](https://semver.org/spec/v2.0.0.html) conventions, though certain backwards-incompatible changes may be released as minor versions: diff --git a/build.gradle.kts b/build.gradle.kts index 855ac122..bd927c56 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "com.openai" - version = "0.4.0" // x-release-please-version + version = "0.5.0" // x-release-please-version } nexusPublishing { diff --git a/openai-java-client-okhttp/build.gradle.kts b/openai-java-client-okhttp/build.gradle.kts index d979cf9a..4f14e269 100644 --- a/openai-java-client-okhttp/build.gradle.kts +++ b/openai-java-client-okhttp/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { api(project(":openai-java-core")) implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") testImplementation(kotlin("test")) testImplementation("org.assertj:assertj-core:3.25.3") 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 f4a36a33..8862168e 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 @@ -23,6 +23,7 @@ import okhttp3.Request import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response +import okhttp3.logging.HttpLoggingInterceptor import okio.BufferedSink class OkHttpClient @@ -30,14 +31,30 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val HttpClient { private fun getClient(requestOptions: RequestOptions): okhttp3.OkHttpClient { - val timeout = requestOptions.timeout ?: return okHttpClient - return okHttpClient - .newBuilder() - .connectTimeout(timeout) - .readTimeout(timeout) - .writeTimeout(timeout) - .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) - .build() + val clientBuilder = okHttpClient.newBuilder() + + val logLevel = + when (System.getenv("OPENAI_LOG")?.lowercase()) { + "info" -> HttpLoggingInterceptor.Level.BASIC + "debug" -> HttpLoggingInterceptor.Level.BODY + else -> null + } + if (logLevel != null) { + clientBuilder.addNetworkInterceptor( + HttpLoggingInterceptor().setLevel(logLevel).apply { redactHeader("Authorization") } + ) + } + + val timeout = requestOptions.timeout + if (timeout != null) { + clientBuilder + .connectTimeout(timeout) + .readTimeout(timeout) + .writeTimeout(timeout) + .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) + } + + return clientBuilder.build() } override fun execute( diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt index 0cbcd1e3..077f37ad 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt @@ -21,6 +21,12 @@ constructor( fun batchId(): String = batchId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): Optional> { return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) @@ -37,25 +43,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is BatchCancelParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "BatchCancelParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -73,10 +60,10 @@ constructor( @JvmSynthetic internal fun from(batchCancelParams: BatchCancelParams) = apply { - this.batchId = batchCancelParams.batchId - additionalHeaders(batchCancelParams.additionalHeaders) - additionalQueryParams(batchCancelParams.additionalQueryParams) - additionalBodyProperties(batchCancelParams.additionalBodyProperties) + batchId = batchCancelParams.batchId + additionalHeaders = batchCancelParams.additionalHeaders.toBuilder() + additionalQueryParams = batchCancelParams.additionalQueryParams.toBuilder() + additionalBodyProperties = batchCancelParams.additionalBodyProperties.toMutableMap() } fun batchId(batchId: String) = apply { this.batchId = batchId } @@ -209,4 +196,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is BatchCancelParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "BatchCancelParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt index b3a00834..2e8fd5da 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt @@ -39,6 +39,12 @@ constructor( fun metadata(): Optional = Optional.ofNullable(metadata) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): BatchCreateBody { return BatchCreateBody( @@ -204,25 +210,6 @@ constructor( "BatchCreateBody{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is BatchCreateParams && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(completionWindow, endpoint, inputFileId, metadata, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "BatchCreateParams{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -243,13 +230,13 @@ constructor( @JvmSynthetic internal fun from(batchCreateParams: BatchCreateParams) = apply { - this.completionWindow = batchCreateParams.completionWindow - this.endpoint = batchCreateParams.endpoint - this.inputFileId = batchCreateParams.inputFileId - this.metadata = batchCreateParams.metadata - additionalHeaders(batchCreateParams.additionalHeaders) - additionalQueryParams(batchCreateParams.additionalQueryParams) - additionalBodyProperties(batchCreateParams.additionalBodyProperties) + completionWindow = batchCreateParams.completionWindow + endpoint = batchCreateParams.endpoint + inputFileId = batchCreateParams.inputFileId + metadata = batchCreateParams.metadata + additionalHeaders = batchCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = batchCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = batchCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -591,4 +578,17 @@ constructor( override fun toString() = "Metadata{additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is BatchCreateParams && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(completionWindow, endpoint, inputFileId, metadata, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "BatchCreateParams{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt index 4603a417..5931f5ab 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt @@ -21,6 +21,10 @@ constructor( fun limit(): Optional = Optional.ofNullable(limit) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic @@ -32,23 +36,6 @@ constructor( return queryParams.build() } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is BatchListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "BatchListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -66,10 +53,10 @@ constructor( @JvmSynthetic internal fun from(batchListParams: BatchListParams) = apply { - this.after = batchListParams.after - this.limit = batchListParams.limit - additionalHeaders(batchListParams.additionalHeaders) - additionalQueryParams(batchListParams.additionalQueryParams) + after = batchListParams.after + limit = batchListParams.limit + additionalHeaders = batchListParams.additionalHeaders.toBuilder() + additionalQueryParams = batchListParams.additionalQueryParams.toBuilder() } /** @@ -192,4 +179,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is BatchListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "BatchListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt index af8a9898..31ae3165 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt @@ -17,6 +17,10 @@ constructor( fun batchId(): String = batchId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams @@ -28,23 +32,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is BatchRetrieveParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "BatchRetrieveParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -61,9 +48,9 @@ constructor( @JvmSynthetic internal fun from(batchRetrieveParams: BatchRetrieveParams) = apply { - this.batchId = batchRetrieveParams.batchId - additionalHeaders(batchRetrieveParams.additionalHeaders) - additionalQueryParams(batchRetrieveParams.additionalQueryParams) + batchId = batchRetrieveParams.batchId + additionalHeaders = batchRetrieveParams.additionalHeaders.toBuilder() + additionalQueryParams = batchRetrieveParams.additionalQueryParams.toBuilder() } fun batchId(batchId: String) = apply { this.batchId = batchId } @@ -173,4 +160,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is BatchRetrieveParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "BatchRetrieveParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } 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 44ed9fe9..af12f6a8 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 @@ -120,6 +120,12 @@ constructor( fun user(): Optional = Optional.ofNullable(user) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): ChatCompletionCreateBody { return ChatCompletionCreateBody( @@ -881,25 +887,6 @@ constructor( "ChatCompletionCreateBody{messages=$messages, model=$model, audio=$audio, frequencyPenalty=$frequencyPenalty, functionCall=$functionCall, functions=$functions, logitBias=$logitBias, logprobs=$logprobs, maxCompletionTokens=$maxCompletionTokens, maxTokens=$maxTokens, metadata=$metadata, modalities=$modalities, n=$n, parallelToolCalls=$parallelToolCalls, prediction=$prediction, presencePenalty=$presencePenalty, responseFormat=$responseFormat, seed=$seed, serviceTier=$serviceTier, stop=$stop, store=$store, streamOptions=$streamOptions, temperature=$temperature, toolChoice=$toolChoice, tools=$tools, topLogprobs=$topLogprobs, topP=$topP, user=$user, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ChatCompletionCreateParams && messages == other.messages && model == other.model && audio == other.audio && frequencyPenalty == other.frequencyPenalty && functionCall == other.functionCall && functions == other.functions && logitBias == other.logitBias && logprobs == other.logprobs && maxCompletionTokens == other.maxCompletionTokens && maxTokens == other.maxTokens && metadata == other.metadata && modalities == other.modalities && n == other.n && parallelToolCalls == other.parallelToolCalls && prediction == other.prediction && presencePenalty == other.presencePenalty && responseFormat == other.responseFormat && seed == other.seed && serviceTier == other.serviceTier && stop == other.stop && store == other.store && streamOptions == other.streamOptions && temperature == other.temperature && toolChoice == other.toolChoice && tools == other.tools && topLogprobs == other.topLogprobs && topP == other.topP && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(messages, model, audio, frequencyPenalty, functionCall, functions, logitBias, logprobs, maxCompletionTokens, maxTokens, metadata, modalities, n, parallelToolCalls, prediction, presencePenalty, responseFormat, seed, serviceTier, stop, store, streamOptions, temperature, toolChoice, tools, topLogprobs, topP, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "ChatCompletionCreateParams{messages=$messages, model=$model, audio=$audio, frequencyPenalty=$frequencyPenalty, functionCall=$functionCall, functions=$functions, logitBias=$logitBias, logprobs=$logprobs, maxCompletionTokens=$maxCompletionTokens, maxTokens=$maxTokens, metadata=$metadata, modalities=$modalities, n=$n, parallelToolCalls=$parallelToolCalls, prediction=$prediction, presencePenalty=$presencePenalty, responseFormat=$responseFormat, seed=$seed, serviceTier=$serviceTier, stop=$stop, store=$store, streamOptions=$streamOptions, temperature=$temperature, toolChoice=$toolChoice, tools=$tools, topLogprobs=$topLogprobs, topP=$topP, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -944,37 +931,38 @@ constructor( @JvmSynthetic internal fun from(chatCompletionCreateParams: ChatCompletionCreateParams) = apply { - this.messages(chatCompletionCreateParams.messages) - this.model = chatCompletionCreateParams.model - this.audio = chatCompletionCreateParams.audio - this.frequencyPenalty = chatCompletionCreateParams.frequencyPenalty - this.functionCall = chatCompletionCreateParams.functionCall - this.functions(chatCompletionCreateParams.functions ?: listOf()) - this.logitBias = chatCompletionCreateParams.logitBias - this.logprobs = chatCompletionCreateParams.logprobs - this.maxCompletionTokens = chatCompletionCreateParams.maxCompletionTokens - this.maxTokens = chatCompletionCreateParams.maxTokens - this.metadata = chatCompletionCreateParams.metadata - this.modalities(chatCompletionCreateParams.modalities ?: listOf()) - this.n = chatCompletionCreateParams.n - this.parallelToolCalls = chatCompletionCreateParams.parallelToolCalls - this.prediction = chatCompletionCreateParams.prediction - this.presencePenalty = chatCompletionCreateParams.presencePenalty - this.responseFormat = chatCompletionCreateParams.responseFormat - this.seed = chatCompletionCreateParams.seed - this.serviceTier = chatCompletionCreateParams.serviceTier - this.stop = chatCompletionCreateParams.stop - this.store = chatCompletionCreateParams.store - this.streamOptions = chatCompletionCreateParams.streamOptions - this.temperature = chatCompletionCreateParams.temperature - this.toolChoice = chatCompletionCreateParams.toolChoice - this.tools(chatCompletionCreateParams.tools ?: listOf()) - this.topLogprobs = chatCompletionCreateParams.topLogprobs - this.topP = chatCompletionCreateParams.topP - this.user = chatCompletionCreateParams.user - additionalHeaders(chatCompletionCreateParams.additionalHeaders) - additionalQueryParams(chatCompletionCreateParams.additionalQueryParams) - additionalBodyProperties(chatCompletionCreateParams.additionalBodyProperties) + messages = chatCompletionCreateParams.messages.toMutableList() + model = chatCompletionCreateParams.model + audio = chatCompletionCreateParams.audio + frequencyPenalty = chatCompletionCreateParams.frequencyPenalty + functionCall = chatCompletionCreateParams.functionCall + functions = chatCompletionCreateParams.functions?.toMutableList() ?: mutableListOf() + logitBias = chatCompletionCreateParams.logitBias + logprobs = chatCompletionCreateParams.logprobs + maxCompletionTokens = chatCompletionCreateParams.maxCompletionTokens + maxTokens = chatCompletionCreateParams.maxTokens + metadata = chatCompletionCreateParams.metadata + modalities = chatCompletionCreateParams.modalities?.toMutableList() ?: mutableListOf() + n = chatCompletionCreateParams.n + parallelToolCalls = chatCompletionCreateParams.parallelToolCalls + prediction = chatCompletionCreateParams.prediction + presencePenalty = chatCompletionCreateParams.presencePenalty + responseFormat = chatCompletionCreateParams.responseFormat + seed = chatCompletionCreateParams.seed + serviceTier = chatCompletionCreateParams.serviceTier + stop = chatCompletionCreateParams.stop + store = chatCompletionCreateParams.store + streamOptions = chatCompletionCreateParams.streamOptions + temperature = chatCompletionCreateParams.temperature + toolChoice = chatCompletionCreateParams.toolChoice + tools = chatCompletionCreateParams.tools?.toMutableList() ?: mutableListOf() + topLogprobs = chatCompletionCreateParams.topLogprobs + topP = chatCompletionCreateParams.topP + user = chatCompletionCreateParams.user + additionalHeaders = chatCompletionCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = chatCompletionCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = + chatCompletionCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -1563,18 +1551,18 @@ constructor( fun build(): ChatCompletionCreateParams = ChatCompletionCreateParams( - checkNotNull(messages) { "`messages` is required but was not set" }.toImmutable(), + messages.toImmutable(), checkNotNull(model) { "`model` is required but was not set" }, audio, frequencyPenalty, functionCall, - if (functions.size == 0) null else functions.toImmutable(), + functions.toImmutable().ifEmpty { null }, logitBias, logprobs, maxCompletionTokens, maxTokens, metadata, - if (modalities.size == 0) null else modalities.toImmutable(), + modalities.toImmutable().ifEmpty { null }, n, parallelToolCalls, prediction, @@ -1587,7 +1575,7 @@ constructor( streamOptions, temperature, toolChoice, - if (tools.size == 0) null else tools.toImmutable(), + tools.toImmutable().ifEmpty { null }, topLogprobs, topP, user, @@ -2617,4 +2605,17 @@ constructor( } } } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ChatCompletionCreateParams && messages == other.messages && model == other.model && audio == other.audio && frequencyPenalty == other.frequencyPenalty && functionCall == other.functionCall && functions == other.functions && logitBias == other.logitBias && logprobs == other.logprobs && maxCompletionTokens == other.maxCompletionTokens && maxTokens == other.maxTokens && metadata == other.metadata && modalities == other.modalities && n == other.n && parallelToolCalls == other.parallelToolCalls && prediction == other.prediction && presencePenalty == other.presencePenalty && responseFormat == other.responseFormat && seed == other.seed && serviceTier == other.serviceTier && stop == other.stop && store == other.store && streamOptions == other.streamOptions && temperature == other.temperature && toolChoice == other.toolChoice && tools == other.tools && topLogprobs == other.topLogprobs && topP == other.topP && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(messages, model, audio, frequencyPenalty, functionCall, functions, logitBias, logprobs, maxCompletionTokens, maxTokens, metadata, modalities, n, parallelToolCalls, prediction, presencePenalty, responseFormat, seed, serviceTier, stop, store, streamOptions, temperature, toolChoice, tools, topLogprobs, topP, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "ChatCompletionCreateParams{messages=$messages, model=$model, audio=$audio, frequencyPenalty=$frequencyPenalty, functionCall=$functionCall, functions=$functions, logitBias=$logitBias, logprobs=$logprobs, maxCompletionTokens=$maxCompletionTokens, maxTokens=$maxTokens, metadata=$metadata, modalities=$modalities, n=$n, parallelToolCalls=$parallelToolCalls, prediction=$prediction, presencePenalty=$presencePenalty, responseFormat=$responseFormat, seed=$seed, serviceTier=$serviceTier, stop=$stop, store=$store, streamOptions=$streamOptions, temperature=$temperature, toolChoice=$toolChoice, tools=$tools, topLogprobs=$topLogprobs, topP=$topP, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt index 944f82c8..ae346fc7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt @@ -87,6 +87,12 @@ constructor( fun user(): Optional = Optional.ofNullable(user) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): CompletionCreateBody { return CompletionCreateBody( @@ -560,25 +566,6 @@ constructor( "CompletionCreateBody{model=$model, prompt=$prompt, bestOf=$bestOf, echo=$echo, frequencyPenalty=$frequencyPenalty, logitBias=$logitBias, logprobs=$logprobs, maxTokens=$maxTokens, n=$n, presencePenalty=$presencePenalty, seed=$seed, stop=$stop, streamOptions=$streamOptions, suffix=$suffix, temperature=$temperature, topP=$topP, user=$user, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is CompletionCreateParams && model == other.model && prompt == other.prompt && bestOf == other.bestOf && echo == other.echo && frequencyPenalty == other.frequencyPenalty && logitBias == other.logitBias && logprobs == other.logprobs && maxTokens == other.maxTokens && n == other.n && presencePenalty == other.presencePenalty && seed == other.seed && stop == other.stop && streamOptions == other.streamOptions && suffix == other.suffix && temperature == other.temperature && topP == other.topP && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, prompt, bestOf, echo, frequencyPenalty, logitBias, logprobs, maxTokens, n, presencePenalty, seed, stop, streamOptions, suffix, temperature, topP, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "CompletionCreateParams{model=$model, prompt=$prompt, bestOf=$bestOf, echo=$echo, frequencyPenalty=$frequencyPenalty, logitBias=$logitBias, logprobs=$logprobs, maxTokens=$maxTokens, n=$n, presencePenalty=$presencePenalty, seed=$seed, stop=$stop, streamOptions=$streamOptions, suffix=$suffix, temperature=$temperature, topP=$topP, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -612,26 +599,27 @@ constructor( @JvmSynthetic internal fun from(completionCreateParams: CompletionCreateParams) = apply { - this.model = completionCreateParams.model - this.prompt = completionCreateParams.prompt - this.bestOf = completionCreateParams.bestOf - this.echo = completionCreateParams.echo - this.frequencyPenalty = completionCreateParams.frequencyPenalty - this.logitBias = completionCreateParams.logitBias - this.logprobs = completionCreateParams.logprobs - this.maxTokens = completionCreateParams.maxTokens - this.n = completionCreateParams.n - this.presencePenalty = completionCreateParams.presencePenalty - this.seed = completionCreateParams.seed - this.stop = completionCreateParams.stop - this.streamOptions = completionCreateParams.streamOptions - this.suffix = completionCreateParams.suffix - this.temperature = completionCreateParams.temperature - this.topP = completionCreateParams.topP - this.user = completionCreateParams.user - additionalHeaders(completionCreateParams.additionalHeaders) - additionalQueryParams(completionCreateParams.additionalQueryParams) - additionalBodyProperties(completionCreateParams.additionalBodyProperties) + model = completionCreateParams.model + prompt = completionCreateParams.prompt + bestOf = completionCreateParams.bestOf + echo = completionCreateParams.echo + frequencyPenalty = completionCreateParams.frequencyPenalty + logitBias = completionCreateParams.logitBias + logprobs = completionCreateParams.logprobs + maxTokens = completionCreateParams.maxTokens + n = completionCreateParams.n + presencePenalty = completionCreateParams.presencePenalty + seed = completionCreateParams.seed + stop = completionCreateParams.stop + streamOptions = completionCreateParams.streamOptions + suffix = completionCreateParams.suffix + temperature = completionCreateParams.temperature + topP = completionCreateParams.topP + user = completionCreateParams.user + additionalHeaders = completionCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = completionCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = + completionCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -1404,4 +1392,17 @@ constructor( } } } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is CompletionCreateParams && model == other.model && prompt == other.prompt && bestOf == other.bestOf && echo == other.echo && frequencyPenalty == other.frequencyPenalty && logitBias == other.logitBias && logprobs == other.logprobs && maxTokens == other.maxTokens && n == other.n && presencePenalty == other.presencePenalty && seed == other.seed && stop == other.stop && streamOptions == other.streamOptions && suffix == other.suffix && temperature == other.temperature && topP == other.topP && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, prompt, bestOf, echo, frequencyPenalty, logitBias, logprobs, maxTokens, n, presencePenalty, seed, stop, streamOptions, suffix, temperature, topP, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "CompletionCreateParams{model=$model, prompt=$prompt, bestOf=$bestOf, echo=$echo, frequencyPenalty=$frequencyPenalty, logitBias=$logitBias, logprobs=$logprobs, maxTokens=$maxTokens, n=$n, presencePenalty=$presencePenalty, seed=$seed, stop=$stop, streamOptions=$streamOptions, suffix=$suffix, temperature=$temperature, topP=$topP, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } 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 d1920aad..42acdd14 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 @@ -51,6 +51,12 @@ constructor( fun user(): Optional = Optional.ofNullable(user) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): EmbeddingCreateBody { return EmbeddingCreateBody( @@ -231,25 +237,6 @@ constructor( "EmbeddingCreateBody{input=$input, model=$model, dimensions=$dimensions, encodingFormat=$encodingFormat, user=$user, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is EmbeddingCreateParams && input == other.input && model == other.model && dimensions == other.dimensions && encodingFormat == other.encodingFormat && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(input, model, dimensions, encodingFormat, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "EmbeddingCreateParams{input=$input, model=$model, dimensions=$dimensions, encodingFormat=$encodingFormat, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -271,14 +258,14 @@ constructor( @JvmSynthetic internal fun from(embeddingCreateParams: EmbeddingCreateParams) = apply { - this.input = embeddingCreateParams.input - this.model = embeddingCreateParams.model - this.dimensions = embeddingCreateParams.dimensions - this.encodingFormat = embeddingCreateParams.encodingFormat - this.user = embeddingCreateParams.user - additionalHeaders(embeddingCreateParams.additionalHeaders) - additionalQueryParams(embeddingCreateParams.additionalQueryParams) - additionalBodyProperties(embeddingCreateParams.additionalBodyProperties) + input = embeddingCreateParams.input + model = embeddingCreateParams.model + dimensions = embeddingCreateParams.dimensions + encodingFormat = embeddingCreateParams.encodingFormat + user = embeddingCreateParams.user + additionalHeaders = embeddingCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = embeddingCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = embeddingCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -785,4 +772,17 @@ constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is EmbeddingCreateParams && input == other.input && model == other.model && dimensions == other.dimensions && encodingFormat == other.encodingFormat && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(input, model, dimensions, encodingFormat, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "EmbeddingCreateParams{input=$input, model=$model, dimensions=$dimensions, encodingFormat=$encodingFormat, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt index a69aa9b4..dd693376 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt @@ -21,6 +21,12 @@ constructor( fun fileId(): String = fileId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): Optional> { return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) @@ -37,25 +43,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FileDeleteParams && fileId == other.fileId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fileId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "FileDeleteParams{fileId=$fileId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -73,10 +60,10 @@ constructor( @JvmSynthetic internal fun from(fileDeleteParams: FileDeleteParams) = apply { - this.fileId = fileDeleteParams.fileId - additionalHeaders(fileDeleteParams.additionalHeaders) - additionalQueryParams(fileDeleteParams.additionalQueryParams) - additionalBodyProperties(fileDeleteParams.additionalBodyProperties) + fileId = fileDeleteParams.fileId + additionalHeaders = fileDeleteParams.additionalHeaders.toBuilder() + additionalQueryParams = fileDeleteParams.additionalQueryParams.toBuilder() + additionalBodyProperties = fileDeleteParams.additionalBodyProperties.toMutableMap() } fun fileId(fileId: String) = apply { this.fileId = fileId } @@ -209,4 +196,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FileDeleteParams && fileId == other.fileId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fileId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "FileDeleteParams{fileId=$fileId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt index 7daa59f6..f4da19ba 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt @@ -32,6 +32,10 @@ constructor( fun purpose(): Optional = Optional.ofNullable(purpose) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic @@ -45,23 +49,6 @@ constructor( return queryParams.build() } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FileListParams && after == other.after && limit == other.limit && order == other.order && purpose == other.purpose && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, order, purpose, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FileListParams{after=$after, limit=$limit, order=$order, purpose=$purpose, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -81,12 +68,12 @@ constructor( @JvmSynthetic internal fun from(fileListParams: FileListParams) = apply { - this.after = fileListParams.after - this.limit = fileListParams.limit - this.order = fileListParams.order - this.purpose = fileListParams.purpose - additionalHeaders(fileListParams.additionalHeaders) - additionalQueryParams(fileListParams.additionalQueryParams) + after = fileListParams.after + limit = fileListParams.limit + order = fileListParams.order + purpose = fileListParams.purpose + additionalHeaders = fileListParams.additionalHeaders.toBuilder() + additionalQueryParams = fileListParams.additionalQueryParams.toBuilder() } /** @@ -277,4 +264,17 @@ constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FileListParams && after == other.after && limit == other.limit && order == other.order && purpose == other.purpose && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, order, purpose, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FileListParams{after=$after, limit=$limit, order=$order, purpose=$purpose, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt index 5922b544..3ee4d2ce 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt @@ -17,6 +17,10 @@ constructor( fun fileId(): String = fileId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams @@ -28,23 +32,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FileRetrieveParams && fileId == other.fileId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fileId, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FileRetrieveParams{fileId=$fileId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -61,9 +48,9 @@ constructor( @JvmSynthetic internal fun from(fileRetrieveParams: FileRetrieveParams) = apply { - this.fileId = fileRetrieveParams.fileId - additionalHeaders(fileRetrieveParams.additionalHeaders) - additionalQueryParams(fileRetrieveParams.additionalQueryParams) + fileId = fileRetrieveParams.fileId + additionalHeaders = fileRetrieveParams.additionalHeaders.toBuilder() + additionalQueryParams = fileRetrieveParams.additionalQueryParams.toBuilder() } fun fileId(fileId: String) = apply { this.fileId = fileId } @@ -173,4 +160,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FileRetrieveParams && fileId == other.fileId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fileId, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FileRetrieveParams{fileId=$fileId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt index 8c20c578..c1c3e221 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt @@ -21,6 +21,12 @@ constructor( fun fineTuningJobId(): String = fineTuningJobId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): Optional> { return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) @@ -37,25 +43,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobCancelParams && fineTuningJobId == other.fineTuningJobId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "FineTuningJobCancelParams{fineTuningJobId=$fineTuningJobId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -73,10 +60,11 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobCancelParams: FineTuningJobCancelParams) = apply { - this.fineTuningJobId = fineTuningJobCancelParams.fineTuningJobId - additionalHeaders(fineTuningJobCancelParams.additionalHeaders) - additionalQueryParams(fineTuningJobCancelParams.additionalQueryParams) - additionalBodyProperties(fineTuningJobCancelParams.additionalBodyProperties) + fineTuningJobId = fineTuningJobCancelParams.fineTuningJobId + additionalHeaders = fineTuningJobCancelParams.additionalHeaders.toBuilder() + additionalQueryParams = fineTuningJobCancelParams.additionalQueryParams.toBuilder() + additionalBodyProperties = + fineTuningJobCancelParams.additionalBodyProperties.toMutableMap() } fun fineTuningJobId(fineTuningJobId: String) = apply { @@ -211,4 +199,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobCancelParams && fineTuningJobId == other.fineTuningJobId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "FineTuningJobCancelParams{fineTuningJobId=$fineTuningJobId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt index aebdee67..cdeba105 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt @@ -24,6 +24,10 @@ constructor( fun limit(): Optional = Optional.ofNullable(limit) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic @@ -42,23 +46,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobCheckpointListParams && fineTuningJobId == other.fineTuningJobId && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FineTuningJobCheckpointListParams{fineTuningJobId=$fineTuningJobId, after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -78,11 +65,12 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobCheckpointListParams: FineTuningJobCheckpointListParams) = apply { - this.fineTuningJobId = fineTuningJobCheckpointListParams.fineTuningJobId - this.after = fineTuningJobCheckpointListParams.after - this.limit = fineTuningJobCheckpointListParams.limit - additionalHeaders(fineTuningJobCheckpointListParams.additionalHeaders) - additionalQueryParams(fineTuningJobCheckpointListParams.additionalQueryParams) + fineTuningJobId = fineTuningJobCheckpointListParams.fineTuningJobId + after = fineTuningJobCheckpointListParams.after + limit = fineTuningJobCheckpointListParams.limit + additionalHeaders = fineTuningJobCheckpointListParams.additionalHeaders.toBuilder() + additionalQueryParams = + fineTuningJobCheckpointListParams.additionalQueryParams.toBuilder() } fun fineTuningJobId(fineTuningJobId: String) = apply { @@ -202,4 +190,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobCheckpointListParams && fineTuningJobId == other.fineTuningJobId && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FineTuningJobCheckpointListParams{fineTuningJobId=$fineTuningJobId, after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt index ee821c6f..62cf23a6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt @@ -57,6 +57,12 @@ constructor( fun validationFile(): Optional = Optional.ofNullable(validationFile) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): FineTuningJobCreateBody { return FineTuningJobCreateBody( @@ -300,25 +306,6 @@ constructor( "FineTuningJobCreateBody{model=$model, trainingFile=$trainingFile, hyperparameters=$hyperparameters, integrations=$integrations, seed=$seed, suffix=$suffix, validationFile=$validationFile, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobCreateParams && model == other.model && trainingFile == other.trainingFile && hyperparameters == other.hyperparameters && integrations == other.integrations && seed == other.seed && suffix == other.suffix && validationFile == other.validationFile && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, trainingFile, hyperparameters, integrations, seed, suffix, validationFile, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "FineTuningJobCreateParams{model=$model, trainingFile=$trainingFile, hyperparameters=$hyperparameters, integrations=$integrations, seed=$seed, suffix=$suffix, validationFile=$validationFile, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -342,16 +329,18 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobCreateParams: FineTuningJobCreateParams) = apply { - this.model = fineTuningJobCreateParams.model - this.trainingFile = fineTuningJobCreateParams.trainingFile - this.hyperparameters = fineTuningJobCreateParams.hyperparameters - this.integrations(fineTuningJobCreateParams.integrations ?: listOf()) - this.seed = fineTuningJobCreateParams.seed - this.suffix = fineTuningJobCreateParams.suffix - this.validationFile = fineTuningJobCreateParams.validationFile - additionalHeaders(fineTuningJobCreateParams.additionalHeaders) - additionalQueryParams(fineTuningJobCreateParams.additionalQueryParams) - additionalBodyProperties(fineTuningJobCreateParams.additionalBodyProperties) + model = fineTuningJobCreateParams.model + trainingFile = fineTuningJobCreateParams.trainingFile + hyperparameters = fineTuningJobCreateParams.hyperparameters + integrations = + fineTuningJobCreateParams.integrations?.toMutableList() ?: mutableListOf() + seed = fineTuningJobCreateParams.seed + suffix = fineTuningJobCreateParams.suffix + validationFile = fineTuningJobCreateParams.validationFile + additionalHeaders = fineTuningJobCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = fineTuningJobCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = + fineTuningJobCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -554,7 +543,7 @@ constructor( checkNotNull(model) { "`model` is required but was not set" }, checkNotNull(trainingFile) { "`trainingFile` is required but was not set" }, hyperparameters, - if (integrations.size == 0) null else integrations.toImmutable(), + integrations.toImmutable().ifEmpty { null }, seed, suffix, validationFile, @@ -1527,4 +1516,17 @@ constructor( override fun toString() = "Integration{type=$type, wandb=$wandb, additionalProperties=$additionalProperties}" } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobCreateParams && model == other.model && trainingFile == other.trainingFile && hyperparameters == other.hyperparameters && integrations == other.integrations && seed == other.seed && suffix == other.suffix && validationFile == other.validationFile && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, trainingFile, hyperparameters, integrations, seed, suffix, validationFile, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "FineTuningJobCreateParams{model=$model, trainingFile=$trainingFile, hyperparameters=$hyperparameters, integrations=$integrations, seed=$seed, suffix=$suffix, validationFile=$validationFile, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt index 3c2b3b3a..cb7d9512 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt @@ -24,6 +24,10 @@ constructor( fun limit(): Optional = Optional.ofNullable(limit) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic @@ -42,23 +46,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobListEventsParams && fineTuningJobId == other.fineTuningJobId && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FineTuningJobListEventsParams{fineTuningJobId=$fineTuningJobId, after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -77,11 +64,11 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobListEventsParams: FineTuningJobListEventsParams) = apply { - this.fineTuningJobId = fineTuningJobListEventsParams.fineTuningJobId - this.after = fineTuningJobListEventsParams.after - this.limit = fineTuningJobListEventsParams.limit - additionalHeaders(fineTuningJobListEventsParams.additionalHeaders) - additionalQueryParams(fineTuningJobListEventsParams.additionalQueryParams) + fineTuningJobId = fineTuningJobListEventsParams.fineTuningJobId + after = fineTuningJobListEventsParams.after + limit = fineTuningJobListEventsParams.limit + additionalHeaders = fineTuningJobListEventsParams.additionalHeaders.toBuilder() + additionalQueryParams = fineTuningJobListEventsParams.additionalQueryParams.toBuilder() } fun fineTuningJobId(fineTuningJobId: String) = apply { @@ -201,4 +188,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobListEventsParams && fineTuningJobId == other.fineTuningJobId && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FineTuningJobListEventsParams{fineTuningJobId=$fineTuningJobId, after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt index 2591dbc9..eb4e7af8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt @@ -21,6 +21,10 @@ constructor( fun limit(): Optional = Optional.ofNullable(limit) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic @@ -32,23 +36,6 @@ constructor( return queryParams.build() } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FineTuningJobListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -66,10 +53,10 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobListParams: FineTuningJobListParams) = apply { - this.after = fineTuningJobListParams.after - this.limit = fineTuningJobListParams.limit - additionalHeaders(fineTuningJobListParams.additionalHeaders) - additionalQueryParams(fineTuningJobListParams.additionalQueryParams) + after = fineTuningJobListParams.after + limit = fineTuningJobListParams.limit + additionalHeaders = fineTuningJobListParams.additionalHeaders.toBuilder() + additionalQueryParams = fineTuningJobListParams.additionalQueryParams.toBuilder() } /** Identifier for the last job from the previous pagination request. */ @@ -184,4 +171,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FineTuningJobListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt index e8d1fde8..b025cdd4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt @@ -17,6 +17,10 @@ constructor( fun fineTuningJobId(): String = fineTuningJobId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams @@ -28,23 +32,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is FineTuningJobRetrieveParams && fineTuningJobId == other.fineTuningJobId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "FineTuningJobRetrieveParams{fineTuningJobId=$fineTuningJobId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -61,9 +48,9 @@ constructor( @JvmSynthetic internal fun from(fineTuningJobRetrieveParams: FineTuningJobRetrieveParams) = apply { - this.fineTuningJobId = fineTuningJobRetrieveParams.fineTuningJobId - additionalHeaders(fineTuningJobRetrieveParams.additionalHeaders) - additionalQueryParams(fineTuningJobRetrieveParams.additionalQueryParams) + fineTuningJobId = fineTuningJobRetrieveParams.fineTuningJobId + additionalHeaders = fineTuningJobRetrieveParams.additionalHeaders.toBuilder() + additionalQueryParams = fineTuningJobRetrieveParams.additionalQueryParams.toBuilder() } fun fineTuningJobId(fineTuningJobId: String) = apply { @@ -175,4 +162,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is FineTuningJobRetrieveParams && fineTuningJobId == other.fineTuningJobId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(fineTuningJobId, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "FineTuningJobRetrieveParams{fineTuningJobId=$fineTuningJobId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } 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 fa6339c2..4550132e 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 @@ -51,6 +51,12 @@ constructor( fun user(): Optional = Optional.ofNullable(user) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): ImageGenerateBody { return ImageGenerateBody( @@ -270,25 +276,6 @@ constructor( "ImageGenerateBody{prompt=$prompt, model=$model, n=$n, quality=$quality, responseFormat=$responseFormat, size=$size, style=$style, user=$user, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ImageGenerateParams && prompt == other.prompt && model == other.model && n == other.n && quality == other.quality && responseFormat == other.responseFormat && size == other.size && style == other.style && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(prompt, model, n, quality, responseFormat, size, style, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "ImageGenerateParams{prompt=$prompt, model=$model, n=$n, quality=$quality, responseFormat=$responseFormat, size=$size, style=$style, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -313,17 +300,17 @@ constructor( @JvmSynthetic internal fun from(imageGenerateParams: ImageGenerateParams) = apply { - this.prompt = imageGenerateParams.prompt - this.model = imageGenerateParams.model - this.n = imageGenerateParams.n - this.quality = imageGenerateParams.quality - this.responseFormat = imageGenerateParams.responseFormat - this.size = imageGenerateParams.size - this.style = imageGenerateParams.style - this.user = imageGenerateParams.user - additionalHeaders(imageGenerateParams.additionalHeaders) - additionalQueryParams(imageGenerateParams.additionalQueryParams) - additionalBodyProperties(imageGenerateParams.additionalBodyProperties) + prompt = imageGenerateParams.prompt + model = imageGenerateParams.model + n = imageGenerateParams.n + quality = imageGenerateParams.quality + responseFormat = imageGenerateParams.responseFormat + size = imageGenerateParams.size + style = imageGenerateParams.style + user = imageGenerateParams.user + additionalHeaders = imageGenerateParams.additionalHeaders.toBuilder() + additionalQueryParams = imageGenerateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = imageGenerateParams.additionalBodyProperties.toMutableMap() } /** @@ -818,4 +805,17 @@ constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ImageGenerateParams && prompt == other.prompt && model == other.model && n == other.n && quality == other.quality && responseFormat == other.responseFormat && size == other.size && style == other.style && user == other.user && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(prompt, model, n, quality, responseFormat, size, style, user, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "ImageGenerateParams{prompt=$prompt, model=$model, n=$n, quality=$quality, responseFormat=$responseFormat, size=$size, style=$style, user=$user, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt index 257d3ec9..1a98bc46 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt @@ -21,6 +21,12 @@ constructor( fun model(): String = model + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): Optional> { return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) @@ -37,25 +43,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ModelDeleteParams && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "ModelDeleteParams{model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -73,10 +60,10 @@ constructor( @JvmSynthetic internal fun from(modelDeleteParams: ModelDeleteParams) = apply { - this.model = modelDeleteParams.model - additionalHeaders(modelDeleteParams.additionalHeaders) - additionalQueryParams(modelDeleteParams.additionalQueryParams) - additionalBodyProperties(modelDeleteParams.additionalBodyProperties) + model = modelDeleteParams.model + additionalHeaders = modelDeleteParams.additionalHeaders.toBuilder() + additionalQueryParams = modelDeleteParams.additionalQueryParams.toBuilder() + additionalBodyProperties = modelDeleteParams.additionalBodyProperties.toMutableMap() } fun model(model: String) = apply { this.model = model } @@ -209,4 +196,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ModelDeleteParams && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "ModelDeleteParams{model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt index c8ce82f2..5c844b83 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt @@ -14,26 +14,13 @@ constructor( private val additionalQueryParams: QueryParams, ) { - @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - - @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams - fun _additionalHeaders(): Headers = additionalHeaders fun _additionalQueryParams(): QueryParams = additionalQueryParams - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ModelListParams && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(additionalHeaders, additionalQueryParams) /* spotless:on */ + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders - override fun toString() = - "ModelListParams{additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" + @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams fun toBuilder() = Builder().from(this) @@ -50,8 +37,8 @@ constructor( @JvmSynthetic internal fun from(modelListParams: ModelListParams) = apply { - additionalHeaders(modelListParams.additionalHeaders) - additionalQueryParams(modelListParams.additionalQueryParams) + additionalHeaders = modelListParams.additionalHeaders.toBuilder() + additionalQueryParams = modelListParams.additionalQueryParams.toBuilder() } fun additionalHeaders(additionalHeaders: Headers) = apply { @@ -155,4 +142,17 @@ constructor( fun build(): ModelListParams = ModelListParams(additionalHeaders.build(), additionalQueryParams.build()) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ModelListParams && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "ModelListParams{additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt index ccf3d37c..48bc296c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt @@ -17,6 +17,10 @@ constructor( fun model(): String = model + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + @JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders @JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams @@ -28,23 +32,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ModelRetrieveParams && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, additionalHeaders, additionalQueryParams) /* spotless:on */ - - override fun toString() = - "ModelRetrieveParams{model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" - fun toBuilder() = Builder().from(this) companion object { @@ -61,9 +48,9 @@ constructor( @JvmSynthetic internal fun from(modelRetrieveParams: ModelRetrieveParams) = apply { - this.model = modelRetrieveParams.model - additionalHeaders(modelRetrieveParams.additionalHeaders) - additionalQueryParams(modelRetrieveParams.additionalQueryParams) + model = modelRetrieveParams.model + additionalHeaders = modelRetrieveParams.additionalHeaders.toBuilder() + additionalQueryParams = modelRetrieveParams.additionalQueryParams.toBuilder() } fun model(model: String) = apply { this.model = model } @@ -173,4 +160,17 @@ constructor( additionalQueryParams.build(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ModelRetrieveParams && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(model, additionalHeaders, additionalQueryParams) /* spotless:on */ + + override fun toString() = + "ModelRetrieveParams{model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}" } 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 f09c4d89..a18acf30 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 @@ -42,6 +42,12 @@ constructor( fun model(): Optional = Optional.ofNullable(model) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): ModerationCreateBody { return ModerationCreateBody( @@ -154,25 +160,6 @@ constructor( "ModerationCreateBody{input=$input, model=$model, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is ModerationCreateParams && input == other.input && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(input, model, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "ModerationCreateParams{input=$input, model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -191,11 +178,12 @@ constructor( @JvmSynthetic internal fun from(moderationCreateParams: ModerationCreateParams) = apply { - this.input = moderationCreateParams.input - this.model = moderationCreateParams.model - additionalHeaders(moderationCreateParams.additionalHeaders) - additionalQueryParams(moderationCreateParams.additionalQueryParams) - additionalBodyProperties(moderationCreateParams.additionalBodyProperties) + input = moderationCreateParams.input + model = moderationCreateParams.model + additionalHeaders = moderationCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = moderationCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = + moderationCreateParams.additionalBodyProperties.toMutableMap() } /** @@ -576,4 +564,17 @@ constructor( fun asString(): String = _value().asStringOrThrow() } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is ModerationCreateParams && input == other.input && model == other.model && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(input, model, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "ModerationCreateParams{input=$input, model=$model, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt index 86722065..4d993018 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt @@ -21,6 +21,12 @@ constructor( fun uploadId(): String = uploadId + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): Optional> { return Optional.ofNullable(additionalBodyProperties.ifEmpty { null }) @@ -37,25 +43,6 @@ constructor( } } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is UploadCancelParams && uploadId == other.uploadId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(uploadId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "UploadCancelParams{uploadId=$uploadId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -73,10 +60,10 @@ constructor( @JvmSynthetic internal fun from(uploadCancelParams: UploadCancelParams) = apply { - this.uploadId = uploadCancelParams.uploadId - additionalHeaders(uploadCancelParams.additionalHeaders) - additionalQueryParams(uploadCancelParams.additionalQueryParams) - additionalBodyProperties(uploadCancelParams.additionalBodyProperties) + uploadId = uploadCancelParams.uploadId + additionalHeaders = uploadCancelParams.additionalHeaders.toBuilder() + additionalQueryParams = uploadCancelParams.additionalQueryParams.toBuilder() + additionalBodyProperties = uploadCancelParams.additionalBodyProperties.toMutableMap() } fun uploadId(uploadId: String) = apply { this.uploadId = uploadId } @@ -209,4 +196,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is UploadCancelParams && uploadId == other.uploadId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(uploadId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "UploadCancelParams{uploadId=$uploadId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt index a3c1abec..0e97dbe8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt @@ -32,6 +32,12 @@ constructor( fun md5(): Optional = Optional.ofNullable(md5) + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): UploadCompleteBody { return UploadCompleteBody( @@ -144,25 +150,6 @@ constructor( "UploadCompleteBody{partIds=$partIds, md5=$md5, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is UploadCompleteParams && uploadId == other.uploadId && partIds == other.partIds && md5 == other.md5 && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(uploadId, partIds, md5, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "UploadCompleteParams{uploadId=$uploadId, partIds=$partIds, md5=$md5, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -182,12 +169,12 @@ constructor( @JvmSynthetic internal fun from(uploadCompleteParams: UploadCompleteParams) = apply { - this.uploadId = uploadCompleteParams.uploadId - this.partIds(uploadCompleteParams.partIds) - this.md5 = uploadCompleteParams.md5 - additionalHeaders(uploadCompleteParams.additionalHeaders) - additionalQueryParams(uploadCompleteParams.additionalQueryParams) - additionalBodyProperties(uploadCompleteParams.additionalBodyProperties) + uploadId = uploadCompleteParams.uploadId + partIds = uploadCompleteParams.partIds.toMutableList() + md5 = uploadCompleteParams.md5 + additionalHeaders = uploadCompleteParams.additionalHeaders.toBuilder() + additionalQueryParams = uploadCompleteParams.additionalQueryParams.toBuilder() + additionalBodyProperties = uploadCompleteParams.additionalBodyProperties.toMutableMap() } fun uploadId(uploadId: String) = apply { this.uploadId = uploadId } @@ -330,11 +317,24 @@ constructor( fun build(): UploadCompleteParams = UploadCompleteParams( checkNotNull(uploadId) { "`uploadId` is required but was not set" }, - checkNotNull(partIds) { "`partIds` is required but was not set" }.toImmutable(), + partIds.toImmutable(), md5, additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is UploadCompleteParams && uploadId == other.uploadId && partIds == other.partIds && md5 == other.md5 && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(uploadId, partIds, md5, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "UploadCompleteParams{uploadId=$uploadId, partIds=$partIds, md5=$md5, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt index a6086a83..e6a4f6e7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt @@ -34,6 +34,12 @@ constructor( fun purpose(): FilePurpose = purpose + fun _additionalHeaders(): Headers = additionalHeaders + + fun _additionalQueryParams(): QueryParams = additionalQueryParams + + fun _additionalBodyProperties(): Map = additionalBodyProperties + @JvmSynthetic internal fun getBody(): UploadCreateBody { return UploadCreateBody( @@ -177,25 +183,6 @@ constructor( "UploadCreateBody{bytes=$bytes, filename=$filename, mimeType=$mimeType, purpose=$purpose, additionalProperties=$additionalProperties}" } - fun _additionalHeaders(): Headers = additionalHeaders - - fun _additionalQueryParams(): QueryParams = additionalQueryParams - - fun _additionalBodyProperties(): Map = additionalBodyProperties - - override fun equals(other: Any?): Boolean { - if (this === other) { - return true - } - - return /* spotless:off */ other is UploadCreateParams && bytes == other.bytes && filename == other.filename && mimeType == other.mimeType && purpose == other.purpose && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ - } - - override fun hashCode(): Int = /* spotless:off */ Objects.hash(bytes, filename, mimeType, purpose, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ - - override fun toString() = - "UploadCreateParams{bytes=$bytes, filename=$filename, mimeType=$mimeType, purpose=$purpose, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" - fun toBuilder() = Builder().from(this) companion object { @@ -216,13 +203,13 @@ constructor( @JvmSynthetic internal fun from(uploadCreateParams: UploadCreateParams) = apply { - this.bytes = uploadCreateParams.bytes - this.filename = uploadCreateParams.filename - this.mimeType = uploadCreateParams.mimeType - this.purpose = uploadCreateParams.purpose - additionalHeaders(uploadCreateParams.additionalHeaders) - additionalQueryParams(uploadCreateParams.additionalQueryParams) - additionalBodyProperties(uploadCreateParams.additionalBodyProperties) + bytes = uploadCreateParams.bytes + filename = uploadCreateParams.filename + mimeType = uploadCreateParams.mimeType + purpose = uploadCreateParams.purpose + additionalHeaders = uploadCreateParams.additionalHeaders.toBuilder() + additionalQueryParams = uploadCreateParams.additionalQueryParams.toBuilder() + additionalBodyProperties = uploadCreateParams.additionalBodyProperties.toMutableMap() } /** The number of bytes in the file you are uploading. */ @@ -378,4 +365,17 @@ constructor( additionalBodyProperties.toImmutable(), ) } + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return /* spotless:off */ other is UploadCreateParams && bytes == other.bytes && filename == other.filename && mimeType == other.mimeType && purpose == other.purpose && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */ + } + + override fun hashCode(): Int = /* spotless:off */ Objects.hash(bytes, filename, mimeType, purpose, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */ + + override fun toString() = + "UploadCreateParams{bytes=$bytes, filename=$filename, mimeType=$mimeType, purpose=$purpose, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}" }