From b63b2b159bd6c9d01d22a64980a13bfcc3f64863 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:43:47 +0000 Subject: [PATCH] chore(internal): extract a `checkRequired` function (#113) --- .../src/main/kotlin/com/openai/core/Check.kt | 7 + .../kotlin/com/openai/core/ClientOptions.kt | 4 +- .../kotlin/com/openai/models/Assistant.kt | 20 +-- .../com/openai/models/AssistantDeleted.kt | 7 +- .../com/openai/models/AssistantStreamEvent.kt | 97 ++++++------- .../com/openai/models/AssistantToolChoice.kt | 3 +- .../models/AssistantToolChoiceFunction.kt | 3 +- .../models/AutoFileChunkingStrategyParam.kt | 3 +- .../main/kotlin/com/openai/models/Batch.kt | 15 +- .../com/openai/models/BatchCancelParams.kt | 3 +- .../com/openai/models/BatchCreateParams.kt | 9 +- .../com/openai/models/BatchRequestCounts.kt | 7 +- .../com/openai/models/BatchRetrieveParams.kt | 3 +- .../models/BetaAssistantCreateParams.kt | 3 +- .../models/BetaAssistantDeleteParams.kt | 3 +- .../models/BetaAssistantRetrieveParams.kt | 3 +- .../models/BetaAssistantUpdateParams.kt | 3 +- .../models/BetaThreadCreateAndRunParams.kt | 11 +- .../openai/models/BetaThreadCreateParams.kt | 7 +- .../openai/models/BetaThreadDeleteParams.kt | 3 +- .../models/BetaThreadMessageCreateParams.kt | 12 +- .../models/BetaThreadMessageDeleteParams.kt | 5 +- .../models/BetaThreadMessageListParams.kt | 3 +- .../models/BetaThreadMessageRetrieveParams.kt | 5 +- .../models/BetaThreadMessageUpdateParams.kt | 5 +- .../openai/models/BetaThreadRetrieveParams.kt | 3 +- .../models/BetaThreadRunCancelParams.kt | 5 +- .../models/BetaThreadRunCreateParams.kt | 13 +- .../openai/models/BetaThreadRunListParams.kt | 3 +- .../models/BetaThreadRunRetrieveParams.kt | 5 +- .../models/BetaThreadRunStepListParams.kt | 5 +- .../models/BetaThreadRunStepRetrieveParams.kt | 7 +- .../BetaThreadRunSubmitToolOutputsParams.kt | 8 +- .../models/BetaThreadRunUpdateParams.kt | 5 +- .../openai/models/BetaThreadUpdateParams.kt | 3 +- .../models/BetaVectorStoreCreateParams.kt | 5 +- .../models/BetaVectorStoreDeleteParams.kt | 3 +- .../BetaVectorStoreFileBatchCancelParams.kt | 5 +- .../BetaVectorStoreFileBatchCreateParams.kt | 6 +- ...BetaVectorStoreFileBatchListFilesParams.kt | 5 +- .../BetaVectorStoreFileBatchRetrieveParams.kt | 5 +- .../models/BetaVectorStoreFileCreateParams.kt | 5 +- .../models/BetaVectorStoreFileDeleteParams.kt | 5 +- .../models/BetaVectorStoreFileListParams.kt | 3 +- .../BetaVectorStoreFileRetrieveParams.kt | 5 +- .../models/BetaVectorStoreRetrieveParams.kt | 3 +- .../models/BetaVectorStoreUpdateParams.kt | 7 +- .../com/openai/models/ChatCompletion.kt | 26 ++-- .../ChatCompletionAssistantMessageParam.kt | 13 +- .../com/openai/models/ChatCompletionAudio.kt | 9 +- .../openai/models/ChatCompletionAudioParam.kt | 5 +- .../com/openai/models/ChatCompletionChunk.kt | 26 ++-- .../models/ChatCompletionContentPartImage.kt | 7 +- .../ChatCompletionContentPartInputAudio.kt | 9 +- .../ChatCompletionContentPartRefusal.kt | 5 +- .../models/ChatCompletionContentPartText.kt | 5 +- .../models/ChatCompletionCreateParams.kt | 8 +- .../ChatCompletionDeveloperMessageParam.kt | 5 +- .../ChatCompletionFunctionCallOption.kt | 3 +- .../ChatCompletionFunctionMessageParam.kt | 7 +- .../openai/models/ChatCompletionMessage.kt | 11 +- .../models/ChatCompletionMessageToolCall.kt | 11 +- .../models/ChatCompletionNamedToolChoice.kt | 10 +- .../models/ChatCompletionPredictionContent.kt | 5 +- .../ChatCompletionSystemMessageParam.kt | 5 +- .../models/ChatCompletionTokenLogprob.kt | 18 ++- .../com/openai/models/ChatCompletionTool.kt | 5 +- .../models/ChatCompletionToolMessageParam.kt | 7 +- .../models/ChatCompletionUserMessageParam.kt | 5 +- .../com/openai/models/CodeInterpreterLogs.kt | 5 +- .../models/CodeInterpreterOutputImage.kt | 5 +- .../com/openai/models/CodeInterpreterTool.kt | 6 +- .../openai/models/CodeInterpreterToolCall.kt | 22 +-- .../models/CodeInterpreterToolCallDelta.kt | 5 +- .../kotlin/com/openai/models/Completion.kt | 12 +- .../com/openai/models/CompletionChoice.kt | 9 +- .../openai/models/CompletionCreateParams.kt | 5 +- .../com/openai/models/CompletionUsage.kt | 7 +- .../openai/models/CreateEmbeddingResponse.kt | 14 +- .../kotlin/com/openai/models/Embedding.kt | 8 +- .../openai/models/EmbeddingCreateParams.kt | 5 +- .../kotlin/com/openai/models/ErrorObject.kt | 9 +- .../openai/models/FileCitationAnnotation.kt | 16 +-- .../models/FileCitationDeltaAnnotation.kt | 5 +- .../com/openai/models/FileDeleteParams.kt | 3 +- .../kotlin/com/openai/models/FileDeleted.kt | 7 +- .../kotlin/com/openai/models/FileObject.kt | 15 +- .../com/openai/models/FilePathAnnotation.kt | 16 +-- .../openai/models/FilePathDeltaAnnotation.kt | 5 +- .../com/openai/models/FileRetrieveParams.kt | 3 +- .../com/openai/models/FileSearchTool.kt | 7 +- .../com/openai/models/FileSearchToolCall.kt | 19 ++- .../openai/models/FileSearchToolCallDelta.kt | 7 +- .../kotlin/com/openai/models/FineTuningJob.kt | 38 ++--- .../models/FineTuningJobCancelParams.kt | 3 +- .../openai/models/FineTuningJobCheckpoint.kt | 17 ++- .../FineTuningJobCheckpointListParams.kt | 3 +- .../models/FineTuningJobCreateParams.kt | 11 +- .../com/openai/models/FineTuningJobEvent.kt | 11 +- .../models/FineTuningJobListEventsParams.kt | 3 +- .../models/FineTuningJobRetrieveParams.kt | 3 +- .../models/FineTuningJobWandbIntegration.kt | 3 +- .../FineTuningJobWandbIntegrationObject.kt | 5 +- .../com/openai/models/FunctionDefinition.kt | 3 +- .../kotlin/com/openai/models/FunctionTool.kt | 5 +- .../com/openai/models/FunctionToolCall.kt | 13 +- .../openai/models/FunctionToolCallDelta.kt | 5 +- .../kotlin/com/openai/models/ImageFile.kt | 3 +- .../openai/models/ImageFileContentBlock.kt | 5 +- .../com/openai/models/ImageFileDeltaBlock.kt | 5 +- .../com/openai/models/ImageGenerateParams.kt | 3 +- .../main/kotlin/com/openai/models/ImageUrl.kt | 3 +- .../com/openai/models/ImageUrlContentBlock.kt | 5 +- .../com/openai/models/ImageUrlDeltaBlock.kt | 5 +- .../com/openai/models/ImagesResponse.kt | 6 +- .../main/kotlin/com/openai/models/Message.kt | 37 +++-- .../models/MessageCreationStepDetails.kt | 7 +- .../com/openai/models/MessageDeleted.kt | 7 +- .../com/openai/models/MessageDeltaEvent.kt | 7 +- .../com/openai/models/MessageStreamEvent.kt | 21 +-- .../main/kotlin/com/openai/models/Model.kt | 9 +- .../com/openai/models/ModelDeleteParams.kt | 3 +- .../kotlin/com/openai/models/ModelDeleted.kt | 7 +- .../com/openai/models/ModelRetrieveParams.kt | 3 +- .../kotlin/com/openai/models/Moderation.kt | 130 +++++++----------- .../openai/models/ModerationCreateParams.kt | 3 +- .../openai/models/ModerationCreateResponse.kt | 8 +- .../openai/models/ModerationImageUrlInput.kt | 10 +- .../com/openai/models/ModerationTextInput.kt | 5 +- .../models/OtherFileChunkingStrategyObject.kt | 3 +- .../com/openai/models/RefusalContentBlock.kt | 5 +- .../com/openai/models/RefusalDeltaBlock.kt | 5 +- .../models/RequiredActionFunctionToolCall.kt | 11 +- .../openai/models/ResponseFormatJsonObject.kt | 3 +- .../openai/models/ResponseFormatJsonSchema.kt | 7 +- .../com/openai/models/ResponseFormatText.kt | 6 +- .../src/main/kotlin/com/openai/models/Run.kt | 83 +++++------ .../main/kotlin/com/openai/models/RunStep.kt | 45 +++--- .../com/openai/models/RunStepDeltaEvent.kt | 7 +- .../openai/models/RunStepDeltaMessageDelta.kt | 3 +- .../com/openai/models/RunStepStreamEvent.kt | 29 ++-- .../com/openai/models/RunStreamEvent.kt | 41 +++--- .../models/StaticFileChunkingStrategy.kt | 9 +- .../StaticFileChunkingStrategyObject.kt | 5 +- .../models/StaticFileChunkingStrategyParam.kt | 5 +- .../src/main/kotlin/com/openai/models/Text.kt | 6 +- .../com/openai/models/TextContentBlock.kt | 5 +- .../openai/models/TextContentBlockParam.kt | 5 +- .../com/openai/models/TextDeltaBlock.kt | 5 +- .../main/kotlin/com/openai/models/Thread.kt | 11 +- .../kotlin/com/openai/models/ThreadDeleted.kt | 7 +- .../com/openai/models/ThreadStreamEvent.kt | 5 +- .../com/openai/models/ToolCallDeltaObject.kt | 3 +- .../com/openai/models/ToolCallsStepDetails.kt | 6 +- .../main/kotlin/com/openai/models/Upload.kt | 17 +-- .../com/openai/models/UploadCancelParams.kt | 3 +- .../com/openai/models/UploadCompleteParams.kt | 6 +- .../com/openai/models/UploadCreateParams.kt | 9 +- .../kotlin/com/openai/models/UploadPart.kt | 9 +- .../kotlin/com/openai/models/VectorStore.kt | 33 ++--- .../com/openai/models/VectorStoreDeleted.kt | 7 +- .../com/openai/models/VectorStoreFile.kt | 19 +-- .../com/openai/models/VectorStoreFileBatch.kt | 23 ++-- .../openai/models/VectorStoreFileDeleted.kt | 7 +- 164 files changed, 850 insertions(+), 796 deletions(-) create mode 100644 openai-java-core/src/main/kotlin/com/openai/core/Check.kt diff --git a/openai-java-core/src/main/kotlin/com/openai/core/Check.kt b/openai-java-core/src/main/kotlin/com/openai/core/Check.kt new file mode 100644 index 00000000..02b6972d --- /dev/null +++ b/openai-java-core/src/main/kotlin/com/openai/core/Check.kt @@ -0,0 +1,7 @@ +@file:JvmName("Check") + +package com.openai.core + +@JvmSynthetic +internal fun checkRequired(name: String, value: T?): T = + checkNotNull(value) { "`$name` is required but was not set" } diff --git a/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt b/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt index da225055..9d40f48a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt +++ b/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt @@ -230,8 +230,8 @@ private constructor( } fun build(): ClientOptions { - checkNotNull(httpClient) { "`httpClient` is required but was not set" } - checkNotNull(credential) { "`credential` is required but was not set" } + checkRequired("httpClient", httpClient) + checkRequired("credential", credential) val headers = Headers.builder() val queryParams = QueryParams.builder() diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt b/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt index cf5da283..aaa80bda 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -688,16 +689,15 @@ private constructor( fun build(): Assistant = Assistant( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(description) { "`description` is required but was not set" }, - checkNotNull(instructions) { "`instructions` is required but was not set" }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(tools) { "`tools` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("description", description), + checkRequired("instructions", instructions), + checkRequired("metadata", metadata), + checkRequired("model", model), + checkRequired("name", name), + checkRequired("object_", object_), + checkRequired("tools", tools).map { it.toImmutable() }, responseFormat, temperature, toolResources, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt index 89af8d21..f736691f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): AssistantDeleted = AssistantDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantStreamEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantStreamEvent.kt index 71bc213f..0f8d3530 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/AssistantStreamEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/AssistantStreamEvent.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -1255,8 +1256,8 @@ private constructor( fun build(): ThreadCreated = ThreadCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), enabled, additionalProperties.toImmutable(), ) @@ -1436,8 +1437,8 @@ private constructor( fun build(): ThreadRunCreated = ThreadRunCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1616,8 +1617,8 @@ private constructor( fun build(): ThreadRunQueued = ThreadRunQueued( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1796,8 +1797,8 @@ private constructor( fun build(): ThreadRunInProgress = ThreadRunInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1976,8 +1977,8 @@ private constructor( fun build(): ThreadRunRequiresAction = ThreadRunRequiresAction( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2155,8 +2156,8 @@ private constructor( fun build(): ThreadRunCompleted = ThreadRunCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2335,8 +2336,8 @@ private constructor( fun build(): ThreadRunIncomplete = ThreadRunIncomplete( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2512,8 +2513,8 @@ private constructor( fun build(): ThreadRunFailed = ThreadRunFailed( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2692,8 +2693,8 @@ private constructor( fun build(): ThreadRunCancelling = ThreadRunCancelling( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2871,8 +2872,8 @@ private constructor( fun build(): ThreadRunCancelled = ThreadRunCancelled( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3048,8 +3049,8 @@ private constructor( fun build(): ThreadRunExpired = ThreadRunExpired( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3218,8 +3219,8 @@ private constructor( fun build(): ThreadRunStepCreated = ThreadRunStepCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3389,8 +3390,8 @@ private constructor( fun build(): ThreadRunStepInProgress = ThreadRunStepInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3564,8 +3565,8 @@ private constructor( fun build(): ThreadRunStepDelta = ThreadRunStepDelta( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3735,8 +3736,8 @@ private constructor( fun build(): ThreadRunStepCompleted = ThreadRunStepCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -3905,8 +3906,8 @@ private constructor( fun build(): ThreadRunStepFailed = ThreadRunStepFailed( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4076,8 +4077,8 @@ private constructor( fun build(): ThreadRunStepCancelled = ThreadRunStepCancelled( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4246,8 +4247,8 @@ private constructor( fun build(): ThreadRunStepExpired = ThreadRunStepExpired( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4428,8 +4429,8 @@ private constructor( fun build(): ThreadMessageCreated = ThreadMessageCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4610,8 +4611,8 @@ private constructor( fun build(): ThreadMessageInProgress = ThreadMessageInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4780,8 +4781,8 @@ private constructor( fun build(): ThreadMessageDelta = ThreadMessageDelta( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -4962,8 +4963,8 @@ private constructor( fun build(): ThreadMessageCompleted = ThreadMessageCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -5144,8 +5145,8 @@ private constructor( fun build(): ThreadMessageIncomplete = ThreadMessageIncomplete( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -5310,8 +5311,8 @@ private constructor( fun build(): ErrorEvent = ErrorEvent( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoice.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoice.kt index b8435ef9..19e5c2c9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoice.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoice.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -112,7 +113,7 @@ private constructor( fun build(): AssistantToolChoice = AssistantToolChoice( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), function, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoiceFunction.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoiceFunction.kt index e39d922f..bb98ae88 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoiceFunction.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/AssistantToolChoiceFunction.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -89,7 +90,7 @@ private constructor( fun build(): AssistantToolChoiceFunction = AssistantToolChoiceFunction( - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("name", name), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AutoFileChunkingStrategyParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/AutoFileChunkingStrategyParam.kt index f14c462a..3fc9617b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/AutoFileChunkingStrategyParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/AutoFileChunkingStrategyParam.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -95,7 +96,7 @@ private constructor( fun build(): AutoFileChunkingStrategyParam = AutoFileChunkingStrategyParam( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Batch.kt b/openai-java-core/src/main/kotlin/com/openai/models/Batch.kt index 8b3f54e6..f8ec56ca 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Batch.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Batch.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -455,13 +456,13 @@ private constructor( fun build(): Batch = Batch( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(completionWindow) { "`completionWindow` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(endpoint) { "`endpoint` is required but was not set" }, - checkNotNull(inputFileId) { "`inputFileId` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, + checkRequired("id", id), + checkRequired("completionWindow", completionWindow), + checkRequired("createdAt", createdAt), + checkRequired("endpoint", endpoint), + checkRequired("inputFileId", inputFileId), + checkRequired("object_", object_), + checkRequired("status", status), cancelledAt, cancellingAt, completedAt, 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 1dd6bd6c..d02dc5fb 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -193,7 +194,7 @@ constructor( fun build(): BatchCancelParams = BatchCancelParams( - checkNotNull(batchId) { "`batchId` is required but was not set" }, + checkRequired("batchId", batchId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), 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 df69f560..17433e38 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -311,11 +312,9 @@ constructor( fun build(): BatchCreateBody = BatchCreateBody( - checkNotNull(completionWindow) { - "`completionWindow` is required but was not set" - }, - checkNotNull(endpoint) { "`endpoint` is required but was not set" }, - checkNotNull(inputFileId) { "`inputFileId` is required but was not set" }, + checkRequired("completionWindow", completionWindow), + checkRequired("endpoint", endpoint), + checkRequired("inputFileId", inputFileId), metadata, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchRequestCounts.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchRequestCounts.kt index 3d750ee2..b0e21491 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchRequestCounts.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchRequestCounts.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -124,9 +125,9 @@ private constructor( fun build(): BatchRequestCounts = BatchRequestCounts( - checkNotNull(completed) { "`completed` is required but was not set" }, - checkNotNull(failed) { "`failed` is required but was not set" }, - checkNotNull(total) { "`total` is required but was not set" }, + checkRequired("completed", completed), + checkRequired("failed", failed), + checkRequired("total", total), additionalProperties.toImmutable(), ) } 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 cc65fe36..95fe9a24 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -155,7 +156,7 @@ constructor( fun build(): BatchRetrieveParams = BatchRetrieveParams( - checkNotNull(batchId) { "`batchId` is required but was not set" }, + checkRequired("batchId", batchId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt index 9dadc748..9e16f049 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -843,7 +844,7 @@ constructor( fun build(): BetaAssistantCreateBody = BetaAssistantCreateBody( - checkNotNull(model) { "`model` is required but was not set" }, + checkRequired("model", model), description, instructions, metadata, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt index dbfe9b9a..be53fc09 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -190,7 +191,7 @@ constructor( fun build(): BetaAssistantDeleteParams = BetaAssistantDeleteParams( - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, + checkRequired("assistantId", assistantId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt index 11fa751b..e703b41c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -155,7 +156,7 @@ constructor( fun build(): BetaAssistantRetrieveParams = BetaAssistantRetrieveParams( - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, + checkRequired("assistantId", assistantId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt index 63410f3b..c5a48b67 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantUpdateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -1361,7 +1362,7 @@ constructor( fun build(): BetaAssistantUpdateParams = BetaAssistantUpdateParams( - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, + checkRequired("assistantId", assistantId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt index c78dfe40..b1940482 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateAndRunParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -1248,7 +1249,7 @@ constructor( fun build(): BetaThreadCreateAndRunBody = BetaThreadCreateAndRunBody( - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, + checkRequired("assistantId", assistantId), instructions, maxCompletionTokens, maxPromptTokens, @@ -2353,8 +2354,8 @@ constructor( fun build(): Message = Message( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), (attachments ?: JsonMissing.of()).map { it.toImmutable() }, metadata, additionalProperties.toImmutable(), @@ -2927,7 +2928,7 @@ constructor( fun build(): FileSearch = FileSearch( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } @@ -4492,7 +4493,7 @@ constructor( fun build(): TruncationStrategy = TruncationStrategy( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), lastMessages, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt index fb582c5d..3e50c5e0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -681,8 +682,8 @@ constructor( fun build(): Message = Message( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), (attachments ?: JsonMissing.of()).map { it.toImmutable() }, metadata, additionalProperties.toImmutable(), @@ -1246,7 +1247,7 @@ constructor( fun build(): FileSearch = FileSearch( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt index 31d441d6..a330ca7c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -190,7 +191,7 @@ constructor( fun build(): BetaThreadDeleteParams = BetaThreadDeleteParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt index 771fc972..980e6b28 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -288,8 +289,8 @@ constructor( fun build(): BetaThreadMessageCreateBody = BetaThreadMessageCreateBody( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), (attachments ?: JsonMissing.of()).map { it.toImmutable() }, metadata, additionalProperties.toImmutable(), @@ -518,7 +519,7 @@ constructor( fun build(): BetaThreadMessageCreateParams = BetaThreadMessageCreateParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), @@ -1072,10 +1073,7 @@ constructor( } fun build(): FileSearch = - FileSearch( - checkNotNull(type) { "`type` is required but was not set" }, - additionalProperties.toImmutable() - ) + FileSearch(checkRequired("type", type), additionalProperties.toImmutable()) } class Type diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt index b8aea35d..692f31e5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -198,8 +199,8 @@ constructor( fun build(): BetaThreadMessageDeleteParams = BetaThreadMessageDeleteParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(messageId) { "`messageId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("messageId", messageId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt index 4609331f..1afc7b1b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -283,7 +284,7 @@ constructor( fun build(): BetaThreadMessageListParams = BetaThreadMessageListParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), after, before, limit, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt index d880d8ba..c256eb46 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -165,8 +166,8 @@ constructor( fun build(): BetaThreadMessageRetrieveParams = BetaThreadMessageRetrieveParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(messageId) { "`messageId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("messageId", messageId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt index ca37d82b..4d85f2d5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadMessageUpdateParams.kt @@ -10,6 +10,7 @@ import com.openai.core.ExcludeMissing import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -312,8 +313,8 @@ constructor( fun build(): BetaThreadMessageUpdateParams = BetaThreadMessageUpdateParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(messageId) { "`messageId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("messageId", messageId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt index 2f2c981b..e2b19ef1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -155,7 +156,7 @@ constructor( fun build(): BetaThreadRetrieveParams = BetaThreadRetrieveParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt index ac3309db..b4d4155c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -198,8 +199,8 @@ constructor( fun build(): BetaThreadRunCancelParams = BetaThreadRunCancelParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt index d8110750..95bc3edc 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -1306,7 +1307,7 @@ constructor( fun build(): BetaThreadRunCreateBody = BetaThreadRunCreateBody( - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, + checkRequired("assistantId", assistantId), additionalInstructions, (additionalMessages ?: JsonMissing.of()).map { it.toImmutable() }, instructions, @@ -2069,7 +2070,7 @@ constructor( fun build(): BetaThreadRunCreateParams = BetaThreadRunCreateParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), include?.toImmutable(), body.build(), additionalHeaders.build(), @@ -2266,8 +2267,8 @@ constructor( fun build(): AdditionalMessage = AdditionalMessage( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), (attachments ?: JsonMissing.of()).map { it.toImmutable() }, metadata, additionalProperties.toImmutable(), @@ -2831,7 +2832,7 @@ constructor( fun build(): FileSearch = FileSearch( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } @@ -3091,7 +3092,7 @@ constructor( fun build(): TruncationStrategy = TruncationStrategy( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), lastMessages, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt index f54f659d..b5c58e49 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -270,7 +271,7 @@ constructor( fun build(): BetaThreadRunListParams = BetaThreadRunListParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), after, before, limit, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt index 1c2f84f4..27d7ceb6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -163,8 +164,8 @@ constructor( fun build(): BetaThreadRunRetrieveParams = BetaThreadRunRetrieveParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt index 99dddc89..9c7d1d6e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -331,8 +332,8 @@ constructor( fun build(): BetaThreadRunStepListParams = BetaThreadRunStepListParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), after, before, include?.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt index 04452444..5377bd09 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunStepRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -232,9 +233,9 @@ constructor( fun build(): BetaThreadRunStepRetrieveParams = BetaThreadRunStepRetrieveParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, - checkNotNull(stepId) { "`stepId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), + checkRequired("stepId", stepId), include?.toImmutable(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt index c2f831d2..fba9c4a6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunSubmitToolOutputsParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -161,8 +162,7 @@ constructor( fun build(): BetaThreadRunSubmitToolOutputsBody = BetaThreadRunSubmitToolOutputsBody( - checkNotNull(toolOutputs) { "`toolOutputs` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("toolOutputs", toolOutputs).map { it.toImmutable() }, additionalProperties.toImmutable() ) } @@ -348,8 +348,8 @@ constructor( fun build(): BetaThreadRunSubmitToolOutputsParams = BetaThreadRunSubmitToolOutputsParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt index cff5b0b3..e6eb33e3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadRunUpdateParams.kt @@ -10,6 +10,7 @@ import com.openai.core.ExcludeMissing import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -310,8 +311,8 @@ constructor( fun build(): BetaThreadRunUpdateParams = BetaThreadRunUpdateParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, + checkRequired("threadId", threadId), + checkRequired("runId", runId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt index 6d3bde18..e696f757 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadUpdateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -404,7 +405,7 @@ constructor( fun build(): BetaThreadUpdateParams = BetaThreadUpdateParams( - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("threadId", threadId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt index 1d8d49c6..22a34760 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreCreateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -660,8 +661,8 @@ constructor( fun build(): ExpiresAfter = ExpiresAfter( - checkNotNull(anchor) { "`anchor` is required but was not set" }, - checkNotNull(days) { "`days` is required but was not set" }, + checkRequired("anchor", anchor), + checkRequired("days", days), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt index 6249c7b7..c69b153f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -190,7 +191,7 @@ constructor( fun build(): BetaVectorStoreDeleteParams = BetaVectorStoreDeleteParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt index 860f978a..31af752c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -204,8 +205,8 @@ constructor( fun build(): BetaVectorStoreFileBatchCancelParams = BetaVectorStoreFileBatchCancelParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, - checkNotNull(batchId) { "`batchId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), + checkRequired("batchId", batchId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt index dd7f2024..8fe1242c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -241,8 +242,7 @@ constructor( fun build(): BetaVectorStoreFileBatchCreateBody = BetaVectorStoreFileBatchCreateBody( - checkNotNull(fileIds) { "`fileIds` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("fileIds", fileIds).map { it.toImmutable() }, chunkingStrategy, additionalProperties.toImmutable(), ) @@ -465,7 +465,7 @@ constructor( fun build(): BetaVectorStoreFileBatchCreateParams = BetaVectorStoreFileBatchCreateParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt index 31c09551..426fbbcc 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchListFilesParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -295,8 +296,8 @@ constructor( fun build(): BetaVectorStoreFileBatchListFilesParams = BetaVectorStoreFileBatchListFilesParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, - checkNotNull(batchId) { "`batchId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), + checkRequired("batchId", batchId), after, before, filter, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt index 805a7f39..00fd4a06 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileBatchRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -166,8 +167,8 @@ constructor( fun build(): BetaVectorStoreFileBatchRetrieveParams = BetaVectorStoreFileBatchRetrieveParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, - checkNotNull(batchId) { "`batchId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), + checkRequired("batchId", batchId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt index b59c2cda..1a04148a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -225,7 +226,7 @@ constructor( fun build(): BetaVectorStoreFileCreateBody = BetaVectorStoreFileCreateBody( - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("fileId", fileId), chunkingStrategy, additionalProperties.toImmutable(), ) @@ -441,7 +442,7 @@ constructor( fun build(): BetaVectorStoreFileCreateParams = BetaVectorStoreFileCreateParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt index 88e8b89e..5ec60749 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -204,8 +205,8 @@ constructor( fun build(): BetaVectorStoreFileDeleteParams = BetaVectorStoreFileDeleteParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), + checkRequired("fileId", fileId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt index 35d3c8a2..b392f529 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileListParams.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.openai.core.Enum import com.openai.core.JsonField import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.errors.OpenAIInvalidDataException @@ -283,7 +284,7 @@ constructor( fun build(): BetaVectorStoreFileListParams = BetaVectorStoreFileListParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), after, before, filter, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt index 5ec5b6c3..6988a814 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreFileRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -165,8 +166,8 @@ constructor( fun build(): BetaVectorStoreFileRetrieveParams = BetaVectorStoreFileRetrieveParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), + checkRequired("fileId", fileId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt index 593eefd8..b0c75672 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -155,7 +156,7 @@ constructor( fun build(): BetaVectorStoreRetrieveParams = BetaVectorStoreRetrieveParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt index d51f3006..d4f9bad0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreUpdateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -393,7 +394,7 @@ constructor( fun build(): BetaVectorStoreUpdateParams = BetaVectorStoreUpdateParams( - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("vectorStoreId", vectorStoreId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), @@ -506,8 +507,8 @@ constructor( fun build(): ExpiresAfter = ExpiresAfter( - checkNotNull(anchor) { "`anchor` is required but was not set" }, - checkNotNull(days) { "`days` is required but was not set" }, + checkRequired("anchor", anchor), + checkRequired("days", days), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletion.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletion.kt index 6ef089b9..fe32cdad 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletion.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletion.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -282,12 +283,11 @@ private constructor( fun build(): ChatCompletion = ChatCompletion( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(choices) { "`choices` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(created) { "`created` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("choices", choices).map { it.toImmutable() }, + checkRequired("created", created), + checkRequired("model", model), + checkRequired("object_", object_), serviceTier, systemFingerprint, usage, @@ -461,10 +461,10 @@ private constructor( fun build(): Choice = Choice( - checkNotNull(finishReason) { "`finishReason` is required but was not set" }, - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(logprobs) { "`logprobs` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, + checkRequired("finishReason", finishReason), + checkRequired("index", index), + checkRequired("logprobs", logprobs), + checkRequired("message", message), additionalProperties.toImmutable(), ) } @@ -691,10 +691,8 @@ private constructor( fun build(): Logprobs = Logprobs( - checkNotNull(content) { "`content` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(refusal) { "`refusal` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("content", content).map { it.toImmutable() }, + checkRequired("refusal", refusal).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAssistantMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAssistantMessageParam.kt index c39a2fec..37261d5b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAssistantMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAssistantMessageParam.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -318,7 +319,7 @@ private constructor( fun build(): ChatCompletionAssistantMessageParam = ChatCompletionAssistantMessageParam( - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("role", role), audio, content, functionCall, @@ -457,11 +458,7 @@ private constructor( keys.forEach(::removeAdditionalProperty) } - fun build(): Audio = - Audio( - checkNotNull(id) { "`id` is required but was not set" }, - additionalProperties.toImmutable() - ) + fun build(): Audio = Audio(checkRequired("id", id), additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -962,8 +959,8 @@ private constructor( fun build(): FunctionCall = FunctionCall( - checkNotNull(arguments) { "`arguments` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("arguments", arguments), + checkRequired("name", name), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudio.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudio.kt index b083d7df..89ed3130 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudio.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudio.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -167,10 +168,10 @@ private constructor( fun build(): ChatCompletionAudio = ChatCompletionAudio( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(expiresAt) { "`expiresAt` is required but was not set" }, - checkNotNull(transcript) { "`transcript` is required but was not set" }, + checkRequired("id", id), + checkRequired("data", data), + checkRequired("expiresAt", expiresAt), + checkRequired("transcript", transcript), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudioParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudioParam.kt index 0aa86f29..d8352f4d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudioParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionAudioParam.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -139,8 +140,8 @@ private constructor( fun build(): ChatCompletionAudioParam = ChatCompletionAudioParam( - checkNotNull(format) { "`format` is required but was not set" }, - checkNotNull(voice) { "`voice` is required but was not set" }, + checkRequired("format", format), + checkRequired("voice", voice), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionChunk.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionChunk.kt index a6f73c60..aee2da49 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionChunk.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionChunk.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -336,12 +337,11 @@ private constructor( fun build(): ChatCompletionChunk = ChatCompletionChunk( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(choices) { "`choices` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(created) { "`created` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("choices", choices).map { it.toImmutable() }, + checkRequired("created", created), + checkRequired("model", model), + checkRequired("object_", object_), serviceTier, systemFingerprint, usage, @@ -523,9 +523,9 @@ private constructor( fun build(): Choice = Choice( - checkNotNull(delta) { "`delta` is required but was not set" }, - checkNotNull(finishReason) { "`finishReason` is required but was not set" }, - checkNotNull(index) { "`index` is required but was not set" }, + checkRequired("delta", delta), + checkRequired("finishReason", finishReason), + checkRequired("index", index), logprobs, additionalProperties.toImmutable(), ) @@ -1080,7 +1080,7 @@ private constructor( fun build(): ToolCall = ToolCall( - checkNotNull(index) { "`index` is required but was not set" }, + checkRequired("index", index), id, function, type, @@ -1546,10 +1546,8 @@ private constructor( fun build(): Logprobs = Logprobs( - checkNotNull(content) { "`content` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(refusal) { "`refusal` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("content", content).map { it.toImmutable() }, + checkRequired("refusal", refusal).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartImage.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartImage.kt index 441125c4..baa3e3fe 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartImage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartImage.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -108,8 +109,8 @@ private constructor( fun build(): ChatCompletionContentPartImage = ChatCompletionContentPartImage( - checkNotNull(imageUrl) { "`imageUrl` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("imageUrl", imageUrl), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -219,7 +220,7 @@ private constructor( fun build(): ImageUrl = ImageUrl( - checkNotNull(url) { "`url` is required but was not set" }, + checkRequired("url", url), detail, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartInputAudio.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartInputAudio.kt index 98574b7d..a5259d2d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartInputAudio.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartInputAudio.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -111,8 +112,8 @@ private constructor( fun build(): ChatCompletionContentPartInputAudio = ChatCompletionContentPartInputAudio( - checkNotNull(inputAudio) { "`inputAudio` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("inputAudio", inputAudio), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -212,8 +213,8 @@ private constructor( fun build(): InputAudio = InputAudio( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(format) { "`format` is required but was not set" }, + checkRequired("data", data), + checkRequired("format", format), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartRefusal.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartRefusal.kt index a39edf52..286ba4e2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartRefusal.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartRefusal.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -111,8 +112,8 @@ private constructor( fun build(): ChatCompletionContentPartRefusal = ChatCompletionContentPartRefusal( - checkNotNull(refusal) { "`refusal` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("refusal", refusal), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartText.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartText.kt index 3d2523f5..7a18c16d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartText.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionContentPartText.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -108,8 +109,8 @@ private constructor( fun build(): ChatCompletionContentPartText = ChatCompletionContentPartText( - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt index 3a5b2955..7086e3d4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -2407,9 +2408,8 @@ constructor( fun build(): ChatCompletionCreateBody = ChatCompletionCreateBody( - checkNotNull(messages) { "`messages` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(model) { "`model` is required but was not set" }, + checkRequired("messages", messages).map { it.toImmutable() }, + checkRequired("model", model), audio, frequencyPenalty, functionCall, @@ -3993,7 +3993,7 @@ constructor( fun build(): Function = Function( - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("name", name), description, parameters, additionalProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionDeveloperMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionDeveloperMessageParam.kt index 217c3de6..f2e29c04 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionDeveloperMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionDeveloperMessageParam.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -165,8 +166,8 @@ private constructor( fun build(): ChatCompletionDeveloperMessageParam = ChatCompletionDeveloperMessageParam( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), name, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionCallOption.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionCallOption.kt index 5295def7..a8ff50a6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionCallOption.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionCallOption.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -95,7 +96,7 @@ private constructor( fun build(): ChatCompletionFunctionCallOption = ChatCompletionFunctionCallOption( - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("name", name), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionMessageParam.kt index 1ede6762..d27388f1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionFunctionMessageParam.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -131,9 +132,9 @@ private constructor( fun build(): ChatCompletionFunctionMessageParam = ChatCompletionFunctionMessageParam( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("name", name), + checkRequired("role", role), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessage.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessage.kt index 1170ba22..aadd5c3a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessage.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -244,9 +245,9 @@ private constructor( fun build(): ChatCompletionMessage = ChatCompletionMessage( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(refusal) { "`refusal` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("refusal", refusal), + checkRequired("role", role), audio, functionCall, (toolCalls ?: JsonMissing.of()).map { it.toImmutable() }, @@ -424,8 +425,8 @@ private constructor( fun build(): FunctionCall = FunctionCall( - checkNotNull(arguments) { "`arguments` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("arguments", arguments), + checkRequired("name", name), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessageToolCall.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessageToolCall.kt index ae4d5cff..9a556456 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessageToolCall.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionMessageToolCall.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -125,9 +126,9 @@ private constructor( fun build(): ChatCompletionMessageToolCall = ChatCompletionMessageToolCall( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("id", id), + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -248,8 +249,8 @@ private constructor( fun build(): Function = Function( - checkNotNull(arguments) { "`arguments` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("arguments", arguments), + checkRequired("name", name), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionNamedToolChoice.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionNamedToolChoice.kt index 486c82fb..cda251b5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionNamedToolChoice.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionNamedToolChoice.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -106,8 +107,8 @@ private constructor( fun build(): ChatCompletionNamedToolChoice = ChatCompletionNamedToolChoice( - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -188,10 +189,7 @@ private constructor( } fun build(): Function = - Function( - checkNotNull(name) { "`name` is required but was not set" }, - additionalProperties.toImmutable() - ) + Function(checkRequired("name", name), additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionPredictionContent.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionPredictionContent.kt index c600fa7f..53ef0f59 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionPredictionContent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionPredictionContent.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -163,8 +164,8 @@ private constructor( fun build(): ChatCompletionPredictionContent = ChatCompletionPredictionContent( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("content", content), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionSystemMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionSystemMessageParam.kt index 60f642d0..a027f864 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionSystemMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionSystemMessageParam.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -164,8 +165,8 @@ private constructor( fun build(): ChatCompletionSystemMessageParam = ChatCompletionSystemMessageParam( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), name, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTokenLogprob.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTokenLogprob.kt index fcd021bd..ea153449 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTokenLogprob.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTokenLogprob.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -238,12 +239,10 @@ private constructor( fun build(): ChatCompletionTokenLogprob = ChatCompletionTokenLogprob( - checkNotNull(token) { "`token` is required but was not set" }, - checkNotNull(bytes) { "`bytes` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(logprob) { "`logprob` is required but was not set" }, - checkNotNull(topLogprobs) { "`topLogprobs` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("token", token), + checkRequired("bytes", bytes).map { it.toImmutable() }, + checkRequired("logprob", logprob), + checkRequired("topLogprobs", topLogprobs).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } @@ -422,10 +421,9 @@ private constructor( fun build(): TopLogprob = TopLogprob( - checkNotNull(token) { "`token` is required but was not set" }, - checkNotNull(bytes) { "`bytes` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(logprob) { "`logprob` is required but was not set" }, + checkRequired("token", token), + checkRequired("bytes", bytes).map { it.toImmutable() }, + checkRequired("logprob", logprob), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTool.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTool.kt index 37c40671..1f5856fa 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTool.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionTool.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -107,8 +108,8 @@ private constructor( fun build(): ChatCompletionTool = ChatCompletionTool( - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionToolMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionToolMessageParam.kt index 79c585fd..5070842c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionToolMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionToolMessageParam.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -149,9 +150,9 @@ private constructor( fun build(): ChatCompletionToolMessageParam = ChatCompletionToolMessageParam( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, - checkNotNull(toolCallId) { "`toolCallId` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), + checkRequired("toolCallId", toolCallId), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionUserMessageParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionUserMessageParam.kt index 8170970c..985c3253 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionUserMessageParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ChatCompletionUserMessageParam.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -161,8 +162,8 @@ private constructor( fun build(): ChatCompletionUserMessageParam = ChatCompletionUserMessageParam( - checkNotNull(content) { "`content` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, + checkRequired("content", content), + checkRequired("role", role), name, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterLogs.kt b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterLogs.kt index c67f9aaf..424be89e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterLogs.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterLogs.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -125,8 +126,8 @@ private constructor( fun build(): CodeInterpreterLogs = CodeInterpreterLogs( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), logs, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterOutputImage.kt b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterOutputImage.kt index 7e106f68..7f010728 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterOutputImage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterOutputImage.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -120,8 +121,8 @@ private constructor( fun build(): CodeInterpreterOutputImage = CodeInterpreterOutputImage( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), image, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterTool.kt b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterTool.kt index 4d62760c..7e4412a2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterTool.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterTool.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -90,10 +91,7 @@ private constructor( } fun build(): CodeInterpreterTool = - CodeInterpreterTool( - checkNotNull(type) { "`type` is required but was not set" }, - additionalProperties.toImmutable() - ) + CodeInterpreterTool(checkRequired("type", type), additionalProperties.toImmutable()) } class Type diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCall.kt b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCall.kt index e3addea8..ce665070 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCall.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCall.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -155,9 +156,9 @@ private constructor( fun build(): CodeInterpreterToolCall = CodeInterpreterToolCall( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(codeInterpreter) { "`codeInterpreter` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("id", id), + checkRequired("codeInterpreter", codeInterpreter), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -304,9 +305,8 @@ private constructor( fun build(): CodeInterpreter = CodeInterpreter( - checkNotNull(input) { "`input` is required but was not set" }, - checkNotNull(outputs) { "`outputs` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("input", input), + checkRequired("outputs", outputs).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } @@ -543,8 +543,8 @@ private constructor( fun build(): LogsOutput = LogsOutput( - checkNotNull(logs) { "`logs` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("logs", logs), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -713,8 +713,8 @@ private constructor( fun build(): ImageOutput = ImageOutput( - checkNotNull(image) { "`image` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("image", image), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -814,7 +814,7 @@ private constructor( fun build(): Image = Image( - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("fileId", fileId), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCallDelta.kt b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCallDelta.kt index 98750c97..8814a0ee 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCallDelta.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CodeInterpreterToolCallDelta.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -172,8 +173,8 @@ private constructor( fun build(): CodeInterpreterToolCallDelta = CodeInterpreterToolCallDelta( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), id, codeInterpreter, additionalProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Completion.kt b/openai-java-core/src/main/kotlin/com/openai/models/Completion.kt index 02c8fcbc..88cd0de7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Completion.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Completion.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -246,12 +247,11 @@ private constructor( fun build(): Completion = Completion( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(choices) { "`choices` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(created) { "`created` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("choices", choices).map { it.toImmutable() }, + checkRequired("created", created), + checkRequired("model", model), + checkRequired("object_", object_), systemFingerprint, usage, additionalProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CompletionChoice.kt b/openai-java-core/src/main/kotlin/com/openai/models/CompletionChoice.kt index 2abfcfd8..58d1cdfc 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionChoice.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionChoice.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -158,10 +159,10 @@ private constructor( fun build(): CompletionChoice = CompletionChoice( - checkNotNull(finishReason) { "`finishReason` is required but was not set" }, - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(logprobs) { "`logprobs` is required but was not set" }, - checkNotNull(text) { "`text` is required but was not set" }, + checkRequired("finishReason", finishReason), + checkRequired("index", index), + checkRequired("logprobs", logprobs), + checkRequired("text", text), additionalProperties.toImmutable(), ) } 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 36e66b69..3adbb94c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -1422,8 +1423,8 @@ constructor( fun build(): CompletionCreateBody = CompletionCreateBody( - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(prompt) { "`prompt` is required but was not set" }, + checkRequired("model", model), + checkRequired("prompt", prompt), bestOf, echo, frequencyPenalty, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CompletionUsage.kt b/openai-java-core/src/main/kotlin/com/openai/models/CompletionUsage.kt index 136c23dd..e925a966 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CompletionUsage.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CompletionUsage.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -185,9 +186,9 @@ private constructor( fun build(): CompletionUsage = CompletionUsage( - checkNotNull(completionTokens) { "`completionTokens` is required but was not set" }, - checkNotNull(promptTokens) { "`promptTokens` is required but was not set" }, - checkNotNull(totalTokens) { "`totalTokens` is required but was not set" }, + checkRequired("completionTokens", completionTokens), + checkRequired("promptTokens", promptTokens), + checkRequired("totalTokens", totalTokens), completionTokensDetails, promptTokensDetails, additionalProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/CreateEmbeddingResponse.kt b/openai-java-core/src/main/kotlin/com/openai/models/CreateEmbeddingResponse.kt index e93a5816..46edf49a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/CreateEmbeddingResponse.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/CreateEmbeddingResponse.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -159,11 +160,10 @@ private constructor( fun build(): CreateEmbeddingResponse = CreateEmbeddingResponse( - checkNotNull(data) { "`data` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(usage) { "`usage` is required but was not set" }, + checkRequired("data", data).map { it.toImmutable() }, + checkRequired("model", model), + checkRequired("object_", object_), + checkRequired("usage", usage), additionalProperties.toImmutable(), ) } @@ -321,8 +321,8 @@ private constructor( fun build(): Usage = Usage( - checkNotNull(promptTokens) { "`promptTokens` is required but was not set" }, - checkNotNull(totalTokens) { "`totalTokens` is required but was not set" }, + checkRequired("promptTokens", promptTokens), + checkRequired("totalTokens", totalTokens), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Embedding.kt b/openai-java-core/src/main/kotlin/com/openai/models/Embedding.kt index 6e00c5ee..23eca76b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Embedding.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Embedding.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -162,10 +163,9 @@ private constructor( fun build(): Embedding = Embedding( - checkNotNull(embedding) { "`embedding` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("embedding", embedding).map { it.toImmutable() }, + checkRequired("index", index), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } 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 f7b82f8e..31e2e5c8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/EmbeddingCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -392,8 +393,8 @@ constructor( fun build(): EmbeddingCreateBody = EmbeddingCreateBody( - checkNotNull(input) { "`input` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, + checkRequired("input", input), + checkRequired("model", model), dimensions, encodingFormat, user, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ErrorObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/ErrorObject.kt index b89112b2..a6c46c5d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ErrorObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ErrorObject.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -128,10 +129,10 @@ private constructor( fun build(): ErrorObject = ErrorObject( - checkNotNull(code) { "`code` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, - checkNotNull(param) { "`param` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("code", code), + checkRequired("message", message), + checkRequired("param", param), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileCitationAnnotation.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileCitationAnnotation.kt index f0aac133..ab545443 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileCitationAnnotation.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileCitationAnnotation.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -158,11 +159,11 @@ private constructor( fun build(): FileCitationAnnotation = FileCitationAnnotation( - checkNotNull(endIndex) { "`endIndex` is required but was not set" }, - checkNotNull(fileCitation) { "`fileCitation` is required but was not set" }, - checkNotNull(startIndex) { "`startIndex` is required but was not set" }, - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("endIndex", endIndex), + checkRequired("fileCitation", fileCitation), + checkRequired("startIndex", startIndex), + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -243,10 +244,7 @@ private constructor( } fun build(): FileCitation = - FileCitation( - checkNotNull(fileId) { "`fileId` is required but was not set" }, - additionalProperties.toImmutable() - ) + FileCitation(checkRequired("fileId", fileId), additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileCitationDeltaAnnotation.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileCitationDeltaAnnotation.kt index 971a3fd0..0eb36de5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileCitationDeltaAnnotation.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileCitationDeltaAnnotation.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -176,8 +177,8 @@ private constructor( fun build(): FileCitationDeltaAnnotation = FileCitationDeltaAnnotation( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), endIndex, fileCitation, startIndex, 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 d7e0d94b..bd5a41e3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -189,7 +190,7 @@ constructor( fun build(): FileDeleteParams = FileDeleteParams( - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("fileId", fileId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleted.kt index c61b9f7f..3af7a22d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): FileDeleted = FileDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileObject.kt index 89c3a14f..7b71c555 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -258,13 +259,13 @@ private constructor( fun build(): FileObject = FileObject( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(bytes) { "`bytes` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(filename) { "`filename` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(purpose) { "`purpose` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, + checkRequired("id", id), + checkRequired("bytes", bytes), + checkRequired("createdAt", createdAt), + checkRequired("filename", filename), + checkRequired("object_", object_), + checkRequired("purpose", purpose), + checkRequired("status", status), statusDetails, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FilePathAnnotation.kt b/openai-java-core/src/main/kotlin/com/openai/models/FilePathAnnotation.kt index 88111741..36d47a2e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FilePathAnnotation.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FilePathAnnotation.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -153,11 +154,11 @@ private constructor( fun build(): FilePathAnnotation = FilePathAnnotation( - checkNotNull(endIndex) { "`endIndex` is required but was not set" }, - checkNotNull(filePath) { "`filePath` is required but was not set" }, - checkNotNull(startIndex) { "`startIndex` is required but was not set" }, - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("endIndex", endIndex), + checkRequired("filePath", filePath), + checkRequired("startIndex", startIndex), + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -238,10 +239,7 @@ private constructor( } fun build(): FilePath = - FilePath( - checkNotNull(fileId) { "`fileId` is required but was not set" }, - additionalProperties.toImmutable() - ) + FilePath(checkRequired("fileId", fileId), additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FilePathDeltaAnnotation.kt b/openai-java-core/src/main/kotlin/com/openai/models/FilePathDeltaAnnotation.kt index 3b13877b..613ef30b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FilePathDeltaAnnotation.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FilePathDeltaAnnotation.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -170,8 +171,8 @@ private constructor( fun build(): FilePathDeltaAnnotation = FilePathDeltaAnnotation( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), endIndex, filePath, startIndex, 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 b628cac5..411a2a53 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -155,7 +156,7 @@ constructor( fun build(): FileRetrieveParams = FileRetrieveParams( - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("fileId", fileId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchTool.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchTool.kt index 6891cd71..228fee63 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchTool.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchTool.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -113,7 +114,7 @@ private constructor( fun build(): FileSearchTool = FileSearchTool( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), fileSearch, additionalProperties.toImmutable(), ) @@ -478,9 +479,7 @@ private constructor( fun build(): RankingOptions = RankingOptions( - checkNotNull(scoreThreshold) { - "`scoreThreshold` is required but was not set" - }, + checkRequired("scoreThreshold", scoreThreshold), ranker, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCall.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCall.kt index cb69faef..9561d021 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCall.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCall.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -138,9 +139,9 @@ private constructor( fun build(): FileSearchToolCall = FileSearchToolCall( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(fileSearch) { "`fileSearch` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("id", id), + checkRequired("fileSearch", fileSearch), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -385,10 +386,8 @@ private constructor( fun build(): RankingOptions = RankingOptions( - checkNotNull(ranker) { "`ranker` is required but was not set" }, - checkNotNull(scoreThreshold) { - "`scoreThreshold` is required but was not set" - }, + checkRequired("ranker", ranker), + checkRequired("scoreThreshold", scoreThreshold), additionalProperties.toImmutable(), ) } @@ -641,9 +640,9 @@ private constructor( fun build(): Result = Result( - checkNotNull(fileId) { "`fileId` is required but was not set" }, - checkNotNull(fileName) { "`fileName` is required but was not set" }, - checkNotNull(score) { "`score` is required but was not set" }, + checkRequired("fileId", fileId), + checkRequired("fileName", fileName), + checkRequired("score", score), (content ?: JsonMissing.of()).map { it.toImmutable() }, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCallDelta.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCallDelta.kt index c86b80f1..1358a2c7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCallDelta.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileSearchToolCallDelta.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -145,9 +146,9 @@ private constructor( fun build(): FileSearchToolCallDelta = FileSearchToolCallDelta( - checkNotNull(fileSearch) { "`fileSearch` is required but was not set" }, - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("fileSearch", fileSearch), + checkRequired("index", index), + checkRequired("type", type), id, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJob.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJob.kt index b2f90a2b..73816649 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJob.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJob.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -673,22 +674,21 @@ private constructor( fun build(): FineTuningJob = FineTuningJob( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(error) { "`error` is required but was not set" }, - checkNotNull(fineTunedModel) { "`fineTunedModel` is required but was not set" }, - checkNotNull(finishedAt) { "`finishedAt` is required but was not set" }, - checkNotNull(hyperparameters) { "`hyperparameters` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(organizationId) { "`organizationId` is required but was not set" }, - checkNotNull(resultFiles) { "`resultFiles` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(seed) { "`seed` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(trainedTokens) { "`trainedTokens` is required but was not set" }, - checkNotNull(trainingFile) { "`trainingFile` is required but was not set" }, - checkNotNull(validationFile) { "`validationFile` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("error", error), + checkRequired("fineTunedModel", fineTunedModel), + checkRequired("finishedAt", finishedAt), + checkRequired("hyperparameters", hyperparameters), + checkRequired("model", model), + checkRequired("object_", object_), + checkRequired("organizationId", organizationId), + checkRequired("resultFiles", resultFiles).map { it.toImmutable() }, + checkRequired("seed", seed), + checkRequired("status", status), + checkRequired("trainedTokens", trainedTokens), + checkRequired("trainingFile", trainingFile), + checkRequired("validationFile", validationFile), estimatedFinish, (integrations ?: JsonMissing.of()).map { it.toImmutable() }, method, @@ -831,9 +831,9 @@ private constructor( fun build(): Error = Error( - checkNotNull(code) { "`code` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, - checkNotNull(param) { "`param` is required but was not set" }, + checkRequired("code", code), + checkRequired("message", message), + checkRequired("param", param), additionalProperties.toImmutable(), ) } 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 cef079e8..0da5154f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -192,7 +193,7 @@ constructor( fun build(): FineTuningJobCancelParams = FineTuningJobCancelParams( - checkNotNull(fineTuningJobId) { "`fineTuningJobId` is required but was not set" }, + checkRequired("fineTuningJobId", fineTuningJobId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpoint.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpoint.kt index 0359c117..0f28ab0f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpoint.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpoint.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -215,15 +216,13 @@ private constructor( fun build(): FineTuningJobCheckpoint = FineTuningJobCheckpoint( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(fineTunedModelCheckpoint) { - "`fineTunedModelCheckpoint` is required but was not set" - }, - checkNotNull(fineTuningJobId) { "`fineTuningJobId` is required but was not set" }, - checkNotNull(metrics) { "`metrics` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(stepNumber) { "`stepNumber` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("fineTunedModelCheckpoint", fineTunedModelCheckpoint), + checkRequired("fineTuningJobId", fineTuningJobId), + checkRequired("metrics", metrics), + checkRequired("object_", object_), + checkRequired("stepNumber", stepNumber), additionalProperties.toImmutable(), ) } 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 bf5594ac..d6d9ef7f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCheckpointListParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -195,7 +196,7 @@ constructor( fun build(): FineTuningJobCheckpointListParams = FineTuningJobCheckpointListParams( - checkNotNull(fineTuningJobId) { "`fineTuningJobId` is required but was not set" }, + checkRequired("fineTuningJobId", fineTuningJobId), after, limit, additionalHeaders.build(), 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 26d1aa51..c0b5d640 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobCreateParams.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -661,8 +662,8 @@ constructor( fun build(): FineTuningJobCreateBody = FineTuningJobCreateBody( - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(trainingFile) { "`trainingFile` is required but was not set" }, + checkRequired("model", model), + checkRequired("trainingFile", trainingFile), hyperparameters, (integrations ?: JsonMissing.of()).map { it.toImmutable() }, method, @@ -1978,8 +1979,8 @@ constructor( fun build(): Integration = Integration( - checkNotNull(type) { "`type` is required but was not set" }, - checkNotNull(wandb) { "`wandb` is required but was not set" }, + checkRequired("type", type), + checkRequired("wandb", wandb), additionalProperties.toImmutable(), ) } @@ -2250,7 +2251,7 @@ constructor( fun build(): Wandb = Wandb( - checkNotNull(project) { "`project` is required but was not set" }, + checkRequired("project", project), entity, name, (tags ?: JsonMissing.of()).map { it.toImmutable() }, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobEvent.kt index 7fd22c7a..d629b0d0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobEvent.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -188,11 +189,11 @@ private constructor( fun build(): FineTuningJobEvent = FineTuningJobEvent( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(level) { "`level` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("level", level), + checkRequired("message", message), + checkRequired("object_", object_), data, type, additionalProperties.toImmutable(), 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 c118aff7..9caa5569 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListEventsParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -193,7 +194,7 @@ constructor( fun build(): FineTuningJobListEventsParams = FineTuningJobListEventsParams( - checkNotNull(fineTuningJobId) { "`fineTuningJobId` is required but was not set" }, + checkRequired("fineTuningJobId", fineTuningJobId), after, limit, additionalHeaders.build(), 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 870026a5..d194b49d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -161,7 +162,7 @@ constructor( fun build(): FineTuningJobRetrieveParams = FineTuningJobRetrieveParams( - checkNotNull(fineTuningJobId) { "`fineTuningJobId` is required but was not set" }, + checkRequired("fineTuningJobId", fineTuningJobId), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegration.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegration.kt index cb3a2945..607c663e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegration.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegration.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -211,7 +212,7 @@ private constructor( fun build(): FineTuningJobWandbIntegration = FineTuningJobWandbIntegration( - checkNotNull(project) { "`project` is required but was not set" }, + checkRequired("project", project), entity, name, (tags ?: JsonMissing.of()).map { it.toImmutable() }, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegrationObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegrationObject.kt index 0c3fb97d..d57f9259 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegrationObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobWandbIntegrationObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -134,8 +135,8 @@ private constructor( fun build(): FineTuningJobWandbIntegrationObject = FineTuningJobWandbIntegrationObject( - checkNotNull(type) { "`type` is required but was not set" }, - checkNotNull(wandb) { "`wandb` is required but was not set" }, + checkRequired("type", type), + checkRequired("wandb", wandb), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FunctionDefinition.kt b/openai-java-core/src/main/kotlin/com/openai/models/FunctionDefinition.kt index 9914035c..da68f6a6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FunctionDefinition.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FunctionDefinition.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -239,7 +240,7 @@ private constructor( fun build(): FunctionDefinition = FunctionDefinition( - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("name", name), description, parameters, strict, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FunctionTool.kt b/openai-java-core/src/main/kotlin/com/openai/models/FunctionTool.kt index 6ab82950..c2e640ab 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FunctionTool.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FunctionTool.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -107,8 +108,8 @@ private constructor( fun build(): FunctionTool = FunctionTool( - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCall.kt b/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCall.kt index e5182202..76704526 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCall.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCall.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -130,9 +131,9 @@ private constructor( fun build(): FunctionToolCall = FunctionToolCall( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("id", id), + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -272,9 +273,9 @@ private constructor( fun build(): Function = Function( - checkNotNull(arguments) { "`arguments` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, - checkNotNull(output) { "`output` is required but was not set" }, + checkRequired("arguments", arguments), + checkRequired("name", name), + checkRequired("output", output), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCallDelta.kt b/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCallDelta.kt index fffc9a51..0b31b466 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCallDelta.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FunctionToolCallDelta.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -146,8 +147,8 @@ private constructor( fun build(): FunctionToolCallDelta = FunctionToolCallDelta( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), id, function, additionalProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageFile.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageFile.kt index 0ca0284e..7c6413b6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageFile.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageFile.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -140,7 +141,7 @@ private constructor( fun build(): ImageFile = ImageFile( - checkNotNull(fileId) { "`fileId` is required but was not set" }, + checkRequired("fileId", fileId), detail, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageFileContentBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageFileContentBlock.kt index 84ab256b..c8bc8f81 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageFileContentBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageFileContentBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -109,8 +110,8 @@ private constructor( fun build(): ImageFileContentBlock = ImageFileContentBlock( - checkNotNull(imageFile) { "`imageFile` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("imageFile", imageFile), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageFileDeltaBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageFileDeltaBlock.kt index bdde7fd8..191a82b5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageFileDeltaBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageFileDeltaBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -129,8 +130,8 @@ private constructor( fun build(): ImageFileDeltaBlock = ImageFileDeltaBlock( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), imageFile, additionalProperties.toImmutable(), ) 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 27ef104b..5e3fa301 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageGenerateParams.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -484,7 +485,7 @@ constructor( fun build(): ImageGenerateBody = ImageGenerateBody( - checkNotNull(prompt) { "`prompt` is required but was not set" }, + checkRequired("prompt", prompt), model, n, quality, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrl.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrl.kt index cccd7a82..49455b09 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrl.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -132,7 +133,7 @@ private constructor( fun build(): ImageUrl = ImageUrl( - checkNotNull(url) { "`url` is required but was not set" }, + checkRequired("url", url), detail, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlContentBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlContentBlock.kt index 38a08674..c1decb36 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlContentBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlContentBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -106,8 +107,8 @@ private constructor( fun build(): ImageUrlContentBlock = ImageUrlContentBlock( - checkNotNull(imageUrl) { "`imageUrl` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("imageUrl", imageUrl), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlDeltaBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlDeltaBlock.kt index 56532832..6970211c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlDeltaBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImageUrlDeltaBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -123,8 +124,8 @@ private constructor( fun build(): ImageUrlDeltaBlock = ImageUrlDeltaBlock( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), imageUrl, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ImagesResponse.kt b/openai-java-core/src/main/kotlin/com/openai/models/ImagesResponse.kt index 2741b411..1d4cdbd2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ImagesResponse.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ImagesResponse.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -116,9 +117,8 @@ private constructor( fun build(): ImagesResponse = ImagesResponse( - checkNotNull(created) { "`created` is required but was not set" }, - checkNotNull(data) { "`data` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("created", created), + checkRequired("data", data).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Message.kt b/openai-java-core/src/main/kotlin/com/openai/models/Message.kt index 2c31c78b..205cc6b2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Message.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Message.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -495,24 +496,20 @@ private constructor( fun build(): Message = Message( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, - checkNotNull(attachments) { "`attachments` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(completedAt) { "`completedAt` is required but was not set" }, - checkNotNull(content) { "`content` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(incompleteAt) { "`incompleteAt` is required but was not set" }, - checkNotNull(incompleteDetails) { - "`incompleteDetails` is required but was not set" - }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(role) { "`role` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(threadId) { "`threadId` is required but was not set" }, + checkRequired("id", id), + checkRequired("assistantId", assistantId), + checkRequired("attachments", attachments).map { it.toImmutable() }, + checkRequired("completedAt", completedAt), + checkRequired("content", content).map { it.toImmutable() }, + checkRequired("createdAt", createdAt), + checkRequired("incompleteAt", incompleteAt), + checkRequired("incompleteDetails", incompleteDetails), + checkRequired("metadata", metadata), + checkRequired("object_", object_), + checkRequired("role", role), + checkRequired("runId", runId), + checkRequired("status", status), + checkRequired("threadId", threadId), additionalProperties.toImmutable(), ) } @@ -872,7 +869,7 @@ private constructor( fun build(): AssistantToolsFileSearchTypeOnly = AssistantToolsFileSearchTypeOnly( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } @@ -1044,7 +1041,7 @@ private constructor( fun build(): IncompleteDetails = IncompleteDetails( - checkNotNull(reason) { "`reason` is required but was not set" }, + checkRequired("reason", reason), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/MessageCreationStepDetails.kt b/openai-java-core/src/main/kotlin/com/openai/models/MessageCreationStepDetails.kt index dedd57e6..353200b7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/MessageCreationStepDetails.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/MessageCreationStepDetails.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -111,8 +112,8 @@ private constructor( fun build(): MessageCreationStepDetails = MessageCreationStepDetails( - checkNotNull(messageCreation) { "`messageCreation` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("messageCreation", messageCreation), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -194,7 +195,7 @@ private constructor( fun build(): MessageCreation = MessageCreation( - checkNotNull(messageId) { "`messageId` is required but was not set" }, + checkRequired("messageId", messageId), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/MessageDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/MessageDeleted.kt index 0dcc34df..305b335a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/MessageDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/MessageDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): MessageDeleted = MessageDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/MessageDeltaEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/MessageDeltaEvent.kt index 7b549c91..81fffa52 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/MessageDeltaEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/MessageDeltaEvent.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -128,9 +129,9 @@ private constructor( fun build(): MessageDeltaEvent = MessageDeltaEvent( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(delta) { "`delta` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("delta", delta), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/MessageStreamEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/MessageStreamEvent.kt index 4b431034..2d52203b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/MessageStreamEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/MessageStreamEvent.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -443,8 +444,8 @@ private constructor( fun build(): ThreadMessageCreated = ThreadMessageCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -625,8 +626,8 @@ private constructor( fun build(): ThreadMessageInProgress = ThreadMessageInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -795,8 +796,8 @@ private constructor( fun build(): ThreadMessageDelta = ThreadMessageDelta( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -977,8 +978,8 @@ private constructor( fun build(): ThreadMessageCompleted = ThreadMessageCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1159,8 +1160,8 @@ private constructor( fun build(): ThreadMessageIncomplete = ThreadMessageIncomplete( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Model.kt b/openai-java-core/src/main/kotlin/com/openai/models/Model.kt index bb38d877..ddd6610b 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Model.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Model.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -146,10 +147,10 @@ private constructor( fun build(): Model = Model( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(created) { "`created` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(ownedBy) { "`ownedBy` is required but was not set" }, + checkRequired("id", id), + checkRequired("created", created), + checkRequired("object_", object_), + checkRequired("ownedBy", ownedBy), additionalProperties.toImmutable(), ) } 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 861576ed..00e872f7 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleteParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -191,7 +192,7 @@ constructor( fun build(): ModelDeleteParams = ModelDeleteParams( - checkNotNull(model) { "`model` is required but was not set" }, + checkRequired("model", model), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleted.kt index 88097011..fdc49e8a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelDeleted.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -113,9 +114,9 @@ private constructor( fun build(): ModelDeleted = ModelDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } 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 9b3025b3..0ce7815f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelRetrieveParams.kt @@ -3,6 +3,7 @@ package com.openai.models import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import java.util.Objects @@ -158,7 +159,7 @@ constructor( fun build(): ModelRetrieveParams = ModelRetrieveParams( - checkNotNull(model) { "`model` is required but was not set" }, + checkRequired("model", model), additionalHeaders.build(), additionalQueryParams.build(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Moderation.kt b/openai-java-core/src/main/kotlin/com/openai/models/Moderation.kt index 65e931c0..8cf10d48 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Moderation.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Moderation.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -161,12 +162,10 @@ private constructor( fun build(): Moderation = Moderation( - checkNotNull(categories) { "`categories` is required but was not set" }, - checkNotNull(categoryAppliedInputTypes) { - "`categoryAppliedInputTypes` is required but was not set" - }, - checkNotNull(categoryScores) { "`categoryScores` is required but was not set" }, - checkNotNull(flagged) { "`flagged` is required but was not set" }, + checkRequired("categories", categories), + checkRequired("categoryAppliedInputTypes", categoryAppliedInputTypes), + checkRequired("categoryScores", categoryScores), + checkRequired("flagged", flagged), additionalProperties.toImmutable(), ) } @@ -623,27 +622,19 @@ private constructor( fun build(): Categories = Categories( - checkNotNull(harassment) { "`harassment` is required but was not set" }, - checkNotNull(harassmentThreatening) { - "`harassmentThreatening` is required but was not set" - }, - checkNotNull(hate) { "`hate` is required but was not set" }, - checkNotNull(hateThreatening) { - "`hateThreatening` is required but was not set" - }, - checkNotNull(illicit) { "`illicit` is required but was not set" }, - checkNotNull(illicitViolent) { "`illicitViolent` is required but was not set" }, - checkNotNull(selfHarm) { "`selfHarm` is required but was not set" }, - checkNotNull(selfHarmInstructions) { - "`selfHarmInstructions` is required but was not set" - }, - checkNotNull(selfHarmIntent) { "`selfHarmIntent` is required but was not set" }, - checkNotNull(sexual) { "`sexual` is required but was not set" }, - checkNotNull(sexualMinors) { "`sexualMinors` is required but was not set" }, - checkNotNull(violence) { "`violence` is required but was not set" }, - checkNotNull(violenceGraphic) { - "`violenceGraphic` is required but was not set" - }, + checkRequired("harassment", harassment), + checkRequired("harassmentThreatening", harassmentThreatening), + checkRequired("hate", hate), + checkRequired("hateThreatening", hateThreatening), + checkRequired("illicit", illicit), + checkRequired("illicitViolent", illicitViolent), + checkRequired("selfHarm", selfHarm), + checkRequired("selfHarmInstructions", selfHarmInstructions), + checkRequired("selfHarmIntent", selfHarmIntent), + checkRequired("sexual", sexual), + checkRequired("sexualMinors", sexualMinors), + checkRequired("violence", violence), + checkRequired("violenceGraphic", violenceGraphic), additionalProperties.toImmutable(), ) } @@ -1207,40 +1198,23 @@ private constructor( fun build(): CategoryAppliedInputTypes = CategoryAppliedInputTypes( - checkNotNull(harassment) { "`harassment` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(harassmentThreatening) { - "`harassmentThreatening` is required but was not set" - } - .map { it.toImmutable() }, - checkNotNull(hate) { "`hate` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(hateThreatening) { - "`hateThreatening` is required but was not set" - } - .map { it.toImmutable() }, - checkNotNull(illicit) { "`illicit` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(illicitViolent) { "`illicitViolent` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(selfHarm) { "`selfHarm` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(selfHarmInstructions) { - "`selfHarmInstructions` is required but was not set" - } - .map { it.toImmutable() }, - checkNotNull(selfHarmIntent) { "`selfHarmIntent` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(sexual) { "`sexual` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(sexualMinors) { "`sexualMinors` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(violence) { "`violence` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(violenceGraphic) { - "`violenceGraphic` is required but was not set" - } - .map { it.toImmutable() }, + checkRequired("harassment", harassment).map { it.toImmutable() }, + checkRequired("harassmentThreatening", harassmentThreatening).map { + it.toImmutable() + }, + checkRequired("hate", hate).map { it.toImmutable() }, + checkRequired("hateThreatening", hateThreatening).map { it.toImmutable() }, + checkRequired("illicit", illicit).map { it.toImmutable() }, + checkRequired("illicitViolent", illicitViolent).map { it.toImmutable() }, + checkRequired("selfHarm", selfHarm).map { it.toImmutable() }, + checkRequired("selfHarmInstructions", selfHarmInstructions).map { + it.toImmutable() + }, + checkRequired("selfHarmIntent", selfHarmIntent).map { it.toImmutable() }, + checkRequired("sexual", sexual).map { it.toImmutable() }, + checkRequired("sexualMinors", sexualMinors).map { it.toImmutable() }, + checkRequired("violence", violence).map { it.toImmutable() }, + checkRequired("violenceGraphic", violenceGraphic).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } @@ -2295,27 +2269,19 @@ private constructor( fun build(): CategoryScores = CategoryScores( - checkNotNull(harassment) { "`harassment` is required but was not set" }, - checkNotNull(harassmentThreatening) { - "`harassmentThreatening` is required but was not set" - }, - checkNotNull(hate) { "`hate` is required but was not set" }, - checkNotNull(hateThreatening) { - "`hateThreatening` is required but was not set" - }, - checkNotNull(illicit) { "`illicit` is required but was not set" }, - checkNotNull(illicitViolent) { "`illicitViolent` is required but was not set" }, - checkNotNull(selfHarm) { "`selfHarm` is required but was not set" }, - checkNotNull(selfHarmInstructions) { - "`selfHarmInstructions` is required but was not set" - }, - checkNotNull(selfHarmIntent) { "`selfHarmIntent` is required but was not set" }, - checkNotNull(sexual) { "`sexual` is required but was not set" }, - checkNotNull(sexualMinors) { "`sexualMinors` is required but was not set" }, - checkNotNull(violence) { "`violence` is required but was not set" }, - checkNotNull(violenceGraphic) { - "`violenceGraphic` is required but was not set" - }, + checkRequired("harassment", harassment), + checkRequired("harassmentThreatening", harassmentThreatening), + checkRequired("hate", hate), + checkRequired("hateThreatening", hateThreatening), + checkRequired("illicit", illicit), + checkRequired("illicitViolent", illicitViolent), + checkRequired("selfHarm", selfHarm), + checkRequired("selfHarmInstructions", selfHarmInstructions), + checkRequired("selfHarmIntent", selfHarmIntent), + checkRequired("sexual", sexual), + checkRequired("sexualMinors", sexualMinors), + checkRequired("violence", violence), + checkRequired("violenceGraphic", violenceGraphic), additionalProperties.toImmutable(), ) } 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 a09b7d9c..06e2dd2c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateParams.kt @@ -20,6 +20,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.http.Headers import com.openai.core.http.QueryParams @@ -219,7 +220,7 @@ constructor( fun build(): ModerationCreateBody = ModerationCreateBody( - checkNotNull(input) { "`input` is required but was not set" }, + checkRequired("input", input), model, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateResponse.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateResponse.kt index b7bbd3a8..18e09389 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateResponse.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationCreateResponse.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -140,10 +141,9 @@ private constructor( fun build(): ModerationCreateResponse = ModerationCreateResponse( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(results) { "`results` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("id", id), + checkRequired("model", model), + checkRequired("results", results).map { it.toImmutable() }, additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationImageUrlInput.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationImageUrlInput.kt index ad189a23..900d46eb 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationImageUrlInput.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationImageUrlInput.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -110,8 +111,8 @@ private constructor( fun build(): ModerationImageUrlInput = ModerationImageUrlInput( - checkNotNull(imageUrl) { "`imageUrl` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("imageUrl", imageUrl), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -191,10 +192,7 @@ private constructor( } fun build(): ImageUrl = - ImageUrl( - checkNotNull(url) { "`url` is required but was not set" }, - additionalProperties.toImmutable() - ) + ImageUrl(checkRequired("url", url), additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModerationTextInput.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModerationTextInput.kt index 4e40081e..52e8c6b6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModerationTextInput.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModerationTextInput.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -108,8 +109,8 @@ private constructor( fun build(): ModerationTextInput = ModerationTextInput( - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/OtherFileChunkingStrategyObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/OtherFileChunkingStrategyObject.kt index d84c40cd..ca56fc1e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/OtherFileChunkingStrategyObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/OtherFileChunkingStrategyObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -97,7 +98,7 @@ private constructor( fun build(): OtherFileChunkingStrategyObject = OtherFileChunkingStrategyObject( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RefusalContentBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/RefusalContentBlock.kt index 0a417241..d5bf4ac4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RefusalContentBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RefusalContentBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -106,8 +107,8 @@ private constructor( fun build(): RefusalContentBlock = RefusalContentBlock( - checkNotNull(refusal) { "`refusal` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("refusal", refusal), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RefusalDeltaBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/RefusalDeltaBlock.kt index 2c348056..e1427cc3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RefusalDeltaBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RefusalDeltaBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -123,8 +124,8 @@ private constructor( fun build(): RefusalDeltaBlock = RefusalDeltaBlock( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), refusal, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RequiredActionFunctionToolCall.kt b/openai-java-core/src/main/kotlin/com/openai/models/RequiredActionFunctionToolCall.kt index 6fc4d4f3..aff74004 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RequiredActionFunctionToolCall.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RequiredActionFunctionToolCall.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -147,9 +148,9 @@ private constructor( fun build(): RequiredActionFunctionToolCall = RequiredActionFunctionToolCall( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(function) { "`function` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("id", id), + checkRequired("function", function), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -250,8 +251,8 @@ private constructor( fun build(): Function = Function( - checkNotNull(arguments) { "`arguments` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("arguments", arguments), + checkRequired("name", name), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonObject.kt index 5d82222f..5f779f08 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -91,7 +92,7 @@ private constructor( fun build(): ResponseFormatJsonObject = ResponseFormatJsonObject( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), additionalProperties.toImmutable() ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonSchema.kt b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonSchema.kt index 2ac078d6..2f34d54e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonSchema.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatJsonSchema.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -108,8 +109,8 @@ private constructor( fun build(): ResponseFormatJsonSchema = ResponseFormatJsonSchema( - checkNotNull(jsonSchema) { "`jsonSchema` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("jsonSchema", jsonSchema), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -311,7 +312,7 @@ private constructor( fun build(): JsonSchema = JsonSchema( - checkNotNull(name) { "`name` is required but was not set" }, + checkRequired("name", name), description, schema, strict, diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatText.kt b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatText.kt index 3fa93845..12f083fa 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatText.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ResponseFormatText.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -90,10 +91,7 @@ private constructor( } fun build(): ResponseFormatText = - ResponseFormatText( - checkNotNull(type) { "`type` is required but was not set" }, - additionalProperties.toImmutable() - ) + ResponseFormatText(checkRequired("type", type), additionalProperties.toImmutable()) } class Type diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Run.kt b/openai-java-core/src/main/kotlin/com/openai/models/Run.kt index 30d8f110..0d54a6ad 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Run.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Run.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -1132,40 +1133,31 @@ private constructor( fun build(): Run = Run( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, - checkNotNull(cancelledAt) { "`cancelledAt` is required but was not set" }, - checkNotNull(completedAt) { "`completedAt` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(expiresAt) { "`expiresAt` is required but was not set" }, - checkNotNull(failedAt) { "`failedAt` is required but was not set" }, - checkNotNull(incompleteDetails) { - "`incompleteDetails` is required but was not set" - }, - checkNotNull(instructions) { "`instructions` is required but was not set" }, - checkNotNull(lastError) { "`lastError` is required but was not set" }, - checkNotNull(maxCompletionTokens) { - "`maxCompletionTokens` is required but was not set" - }, - checkNotNull(maxPromptTokens) { "`maxPromptTokens` is required but was not set" }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(model) { "`model` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(parallelToolCalls) { - "`parallelToolCalls` is required but was not set" - }, - checkNotNull(requiredAction) { "`requiredAction` is required but was not set" }, - checkNotNull(responseFormat) { "`responseFormat` is required but was not set" }, - checkNotNull(startedAt) { "`startedAt` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(toolChoice) { "`toolChoice` is required but was not set" }, - checkNotNull(tools) { "`tools` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(truncationStrategy) { - "`truncationStrategy` is required but was not set" - }, - checkNotNull(usage) { "`usage` is required but was not set" }, + checkRequired("id", id), + checkRequired("assistantId", assistantId), + checkRequired("cancelledAt", cancelledAt), + checkRequired("completedAt", completedAt), + checkRequired("createdAt", createdAt), + checkRequired("expiresAt", expiresAt), + checkRequired("failedAt", failedAt), + checkRequired("incompleteDetails", incompleteDetails), + checkRequired("instructions", instructions), + checkRequired("lastError", lastError), + checkRequired("maxCompletionTokens", maxCompletionTokens), + checkRequired("maxPromptTokens", maxPromptTokens), + checkRequired("metadata", metadata), + checkRequired("model", model), + checkRequired("object_", object_), + checkRequired("parallelToolCalls", parallelToolCalls), + checkRequired("requiredAction", requiredAction), + checkRequired("responseFormat", responseFormat), + checkRequired("startedAt", startedAt), + checkRequired("status", status), + checkRequired("threadId", threadId), + checkRequired("toolChoice", toolChoice), + checkRequired("tools", tools).map { it.toImmutable() }, + checkRequired("truncationStrategy", truncationStrategy), + checkRequired("usage", usage), temperature, topP, additionalProperties.toImmutable(), @@ -1433,8 +1425,8 @@ private constructor( fun build(): LastError = LastError( - checkNotNull(code) { "`code` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, + checkRequired("code", code), + checkRequired("message", message), additionalProperties.toImmutable(), ) } @@ -1673,10 +1665,8 @@ private constructor( fun build(): RequiredAction = RequiredAction( - checkNotNull(submitToolOutputs) { - "`submitToolOutputs` is required but was not set" - }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("submitToolOutputs", submitToolOutputs), + checkRequired("type", type), additionalProperties.toImmutable(), ) } @@ -1784,8 +1774,7 @@ private constructor( fun build(): SubmitToolOutputs = SubmitToolOutputs( - checkNotNull(toolCalls) { "`toolCalls` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("toolCalls", toolCalls).map { it.toImmutable() }, additionalProperties.toImmutable() ) } @@ -2025,7 +2014,7 @@ private constructor( fun build(): TruncationStrategy = TruncationStrategy( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), lastMessages, additionalProperties.toImmutable(), ) @@ -2234,11 +2223,9 @@ private constructor( fun build(): Usage = Usage( - checkNotNull(completionTokens) { - "`completionTokens` is required but was not set" - }, - checkNotNull(promptTokens) { "`promptTokens` is required but was not set" }, - checkNotNull(totalTokens) { "`totalTokens` is required but was not set" }, + checkRequired("completionTokens", completionTokens), + checkRequired("promptTokens", promptTokens), + checkRequired("totalTokens", totalTokens), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RunStep.kt b/openai-java-core/src/main/kotlin/com/openai/models/RunStep.kt index 7125e2bc..ce80dcfd 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RunStep.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RunStep.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -496,22 +497,22 @@ private constructor( fun build(): RunStep = RunStep( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(assistantId) { "`assistantId` is required but was not set" }, - checkNotNull(cancelledAt) { "`cancelledAt` is required but was not set" }, - checkNotNull(completedAt) { "`completedAt` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(expiredAt) { "`expiredAt` is required but was not set" }, - checkNotNull(failedAt) { "`failedAt` is required but was not set" }, - checkNotNull(lastError) { "`lastError` is required but was not set" }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(runId) { "`runId` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(stepDetails) { "`stepDetails` is required but was not set" }, - checkNotNull(threadId) { "`threadId` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, - checkNotNull(usage) { "`usage` is required but was not set" }, + checkRequired("id", id), + checkRequired("assistantId", assistantId), + checkRequired("cancelledAt", cancelledAt), + checkRequired("completedAt", completedAt), + checkRequired("createdAt", createdAt), + checkRequired("expiredAt", expiredAt), + checkRequired("failedAt", failedAt), + checkRequired("lastError", lastError), + checkRequired("metadata", metadata), + checkRequired("object_", object_), + checkRequired("runId", runId), + checkRequired("status", status), + checkRequired("stepDetails", stepDetails), + checkRequired("threadId", threadId), + checkRequired("type", type), + checkRequired("usage", usage), additionalProperties.toImmutable(), ) } @@ -610,8 +611,8 @@ private constructor( fun build(): LastError = LastError( - checkNotNull(code) { "`code` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, + checkRequired("code", code), + checkRequired("message", message), additionalProperties.toImmutable(), ) } @@ -1164,11 +1165,9 @@ private constructor( fun build(): Usage = Usage( - checkNotNull(completionTokens) { - "`completionTokens` is required but was not set" - }, - checkNotNull(promptTokens) { "`promptTokens` is required but was not set" }, - checkNotNull(totalTokens) { "`totalTokens` is required but was not set" }, + checkRequired("completionTokens", completionTokens), + checkRequired("promptTokens", promptTokens), + checkRequired("totalTokens", totalTokens), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaEvent.kt index 56f3d319..3f4e0139 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaEvent.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -128,9 +129,9 @@ private constructor( fun build(): RunStepDeltaEvent = RunStepDeltaEvent( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(delta) { "`delta` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("delta", delta), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaMessageDelta.kt b/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaMessageDelta.kt index a6a52e3a..bcec33dd 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaMessageDelta.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RunStepDeltaMessageDelta.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -113,7 +114,7 @@ private constructor( fun build(): RunStepDeltaMessageDelta = RunStepDeltaMessageDelta( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), messageCreation, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RunStepStreamEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/RunStepStreamEvent.kt index 1f0860fa..d74d5dc6 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RunStepStreamEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RunStepStreamEvent.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -525,8 +526,8 @@ private constructor( fun build(): ThreadRunStepCreated = ThreadRunStepCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -696,8 +697,8 @@ private constructor( fun build(): ThreadRunStepInProgress = ThreadRunStepInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -871,8 +872,8 @@ private constructor( fun build(): ThreadRunStepDelta = ThreadRunStepDelta( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1042,8 +1043,8 @@ private constructor( fun build(): ThreadRunStepCompleted = ThreadRunStepCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1212,8 +1213,8 @@ private constructor( fun build(): ThreadRunStepFailed = ThreadRunStepFailed( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1383,8 +1384,8 @@ private constructor( fun build(): ThreadRunStepCancelled = ThreadRunStepCancelled( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1553,8 +1554,8 @@ private constructor( fun build(): ThreadRunStepExpired = ThreadRunStepExpired( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/RunStreamEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/RunStreamEvent.kt index 0bfb677e..9da21fa1 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/RunStreamEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/RunStreamEvent.kt @@ -21,6 +21,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.getOrThrow import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable @@ -603,8 +604,8 @@ private constructor( fun build(): ThreadRunCreated = ThreadRunCreated( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -783,8 +784,8 @@ private constructor( fun build(): ThreadRunQueued = ThreadRunQueued( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -963,8 +964,8 @@ private constructor( fun build(): ThreadRunInProgress = ThreadRunInProgress( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1143,8 +1144,8 @@ private constructor( fun build(): ThreadRunRequiresAction = ThreadRunRequiresAction( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1322,8 +1323,8 @@ private constructor( fun build(): ThreadRunCompleted = ThreadRunCompleted( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1502,8 +1503,8 @@ private constructor( fun build(): ThreadRunIncomplete = ThreadRunIncomplete( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1679,8 +1680,8 @@ private constructor( fun build(): ThreadRunFailed = ThreadRunFailed( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -1859,8 +1860,8 @@ private constructor( fun build(): ThreadRunCancelling = ThreadRunCancelling( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2038,8 +2039,8 @@ private constructor( fun build(): ThreadRunCancelled = ThreadRunCancelled( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } @@ -2215,8 +2216,8 @@ private constructor( fun build(): ThreadRunExpired = ThreadRunExpired( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategy.kt b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategy.kt index 33588753..9a27f375 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategy.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategy.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -147,12 +148,8 @@ private constructor( fun build(): StaticFileChunkingStrategy = StaticFileChunkingStrategy( - checkNotNull(chunkOverlapTokens) { - "`chunkOverlapTokens` is required but was not set" - }, - checkNotNull(maxChunkSizeTokens) { - "`maxChunkSizeTokens` is required but was not set" - }, + checkRequired("chunkOverlapTokens", chunkOverlapTokens), + checkRequired("maxChunkSizeTokens", maxChunkSizeTokens), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyObject.kt index 340dbf03..d5149c40 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -111,8 +112,8 @@ private constructor( fun build(): StaticFileChunkingStrategyObject = StaticFileChunkingStrategyObject( - checkNotNull(static_) { "`static_` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("static_", static_), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyParam.kt index 672f8e4d..f66bbe8a 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/StaticFileChunkingStrategyParam.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -111,8 +112,8 @@ private constructor( fun build(): StaticFileChunkingStrategyParam = StaticFileChunkingStrategyParam( - checkNotNull(static_) { "`static_` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("static_", static_), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Text.kt b/openai-java-core/src/main/kotlin/com/openai/models/Text.kt index 767a5547..dc11629f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Text.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Text.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import java.util.Objects @@ -135,9 +136,8 @@ private constructor( fun build(): Text = Text( - checkNotNull(annotations) { "`annotations` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(value) { "`value` is required but was not set" }, + checkRequired("annotations", annotations).map { it.toImmutable() }, + checkRequired("value", value), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlock.kt index c05abb22..1fe20f22 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -104,8 +105,8 @@ private constructor( fun build(): TextContentBlock = TextContentBlock( - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlockParam.kt b/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlockParam.kt index 0b45fd8f..686be7b8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlockParam.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/TextContentBlockParam.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -108,8 +109,8 @@ private constructor( fun build(): TextContentBlockParam = TextContentBlockParam( - checkNotNull(text) { "`text` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("text", text), + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/TextDeltaBlock.kt b/openai-java-core/src/main/kotlin/com/openai/models/TextDeltaBlock.kt index a7f02273..c982bb9e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/TextDeltaBlock.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/TextDeltaBlock.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -121,8 +122,8 @@ private constructor( fun build(): TextDeltaBlock = TextDeltaBlock( - checkNotNull(index) { "`index` is required but was not set" }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("index", index), + checkRequired("type", type), text, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Thread.kt b/openai-java-core/src/main/kotlin/com/openai/models/Thread.kt index eb3d72d3..02ee933e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Thread.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Thread.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -200,11 +201,11 @@ private constructor( fun build(): Thread = Thread( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(toolResources) { "`toolResources` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("metadata", metadata), + checkRequired("object_", object_), + checkRequired("toolResources", toolResources), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ThreadDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/ThreadDeleted.kt index b4feece7..2ea9a6f8 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ThreadDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ThreadDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): ThreadDeleted = ThreadDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ThreadStreamEvent.kt b/openai-java-core/src/main/kotlin/com/openai/models/ThreadStreamEvent.kt index 625b6c73..5a8df309 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ThreadStreamEvent.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ThreadStreamEvent.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -138,8 +139,8 @@ private constructor( fun build(): ThreadStreamEvent = ThreadStreamEvent( - checkNotNull(data) { "`data` is required but was not set" }, - checkNotNull(event) { "`event` is required but was not set" }, + checkRequired("data", data), + checkRequired("event", event), enabled, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ToolCallDeltaObject.kt b/openai-java-core/src/main/kotlin/com/openai/models/ToolCallDeltaObject.kt index aee4a149..d16bd04c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ToolCallDeltaObject.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ToolCallDeltaObject.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -163,7 +164,7 @@ private constructor( fun build(): ToolCallDeltaObject = ToolCallDeltaObject( - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("type", type), (toolCalls ?: JsonMissing.of()).map { it.toImmutable() }, additionalProperties.toImmutable(), ) diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ToolCallsStepDetails.kt b/openai-java-core/src/main/kotlin/com/openai/models/ToolCallsStepDetails.kt index 9a97901e..3a908149 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ToolCallsStepDetails.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ToolCallsStepDetails.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -161,9 +162,8 @@ private constructor( fun build(): ToolCallsStepDetails = ToolCallsStepDetails( - checkNotNull(toolCalls) { "`toolCalls` is required but was not set" } - .map { it.toImmutable() }, - checkNotNull(type) { "`type` is required but was not set" }, + checkRequired("toolCalls", toolCalls).map { it.toImmutable() }, + checkRequired("type", type), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Upload.kt b/openai-java-core/src/main/kotlin/com/openai/models/Upload.kt index 0cc96827..433357ef 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/Upload.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/Upload.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -254,14 +255,14 @@ private constructor( fun build(): Upload = Upload( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(bytes) { "`bytes` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(expiresAt) { "`expiresAt` is required but was not set" }, - checkNotNull(filename) { "`filename` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(purpose) { "`purpose` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, + checkRequired("id", id), + checkRequired("bytes", bytes), + checkRequired("createdAt", createdAt), + checkRequired("expiresAt", expiresAt), + checkRequired("filename", filename), + checkRequired("object_", object_), + checkRequired("purpose", purpose), + checkRequired("status", status), file, additionalProperties.toImmutable(), ) 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 c170add4..42375bf2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCancelParams.kt @@ -4,6 +4,7 @@ package com.openai.models import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.toImmutable @@ -189,7 +190,7 @@ constructor( fun build(): UploadCancelParams = UploadCancelParams( - checkNotNull(uploadId) { "`uploadId` is required but was not set" }, + checkRequired("uploadId", uploadId), additionalHeaders.build(), additionalQueryParams.build(), additionalBodyProperties.toImmutable(), 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 76f1f234..b17f1f79 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCompleteParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -198,8 +199,7 @@ constructor( fun build(): UploadCompleteBody = UploadCompleteBody( - checkNotNull(partIds) { "`partIds` is required but was not set" } - .map { it.toImmutable() }, + checkRequired("partIds", partIds).map { it.toImmutable() }, md5, additionalProperties.toImmutable(), ) @@ -388,7 +388,7 @@ constructor( fun build(): UploadCompleteParams = UploadCompleteParams( - checkNotNull(uploadId) { "`uploadId` is required but was not set" }, + checkRequired("uploadId", uploadId), body.build(), additionalHeaders.build(), additionalQueryParams.build(), 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 d49de654..8861914d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadCreateParams.kt @@ -11,6 +11,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.http.Headers import com.openai.core.http.QueryParams import com.openai.core.immutableEmptyMap @@ -268,10 +269,10 @@ constructor( fun build(): UploadCreateBody = UploadCreateBody( - checkNotNull(bytes) { "`bytes` is required but was not set" }, - checkNotNull(filename) { "`filename` is required but was not set" }, - checkNotNull(mimeType) { "`mimeType` is required but was not set" }, - checkNotNull(purpose) { "`purpose` is required but was not set" }, + checkRequired("bytes", bytes), + checkRequired("filename", filename), + checkRequired("mimeType", mimeType), + checkRequired("purpose", purpose), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/UploadPart.kt b/openai-java-core/src/main/kotlin/com/openai/models/UploadPart.kt index 9039c67e..355943b3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/UploadPart.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/UploadPart.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -146,10 +147,10 @@ private constructor( fun build(): UploadPart = UploadPart( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(uploadId) { "`uploadId` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("object_", object_), + checkRequired("uploadId", uploadId), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/VectorStore.kt b/openai-java-core/src/main/kotlin/com/openai/models/VectorStore.kt index 450e5cae..830a3511 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/VectorStore.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/VectorStore.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -303,15 +304,15 @@ private constructor( fun build(): VectorStore = VectorStore( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(fileCounts) { "`fileCounts` is required but was not set" }, - checkNotNull(lastActiveAt) { "`lastActiveAt` is required but was not set" }, - checkNotNull(metadata) { "`metadata` is required but was not set" }, - checkNotNull(name) { "`name` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(usageBytes) { "`usageBytes` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("fileCounts", fileCounts), + checkRequired("lastActiveAt", lastActiveAt), + checkRequired("metadata", metadata), + checkRequired("name", name), + checkRequired("object_", object_), + checkRequired("status", status), + checkRequired("usageBytes", usageBytes), expiresAfter, expiresAt, additionalProperties.toImmutable(), @@ -467,11 +468,11 @@ private constructor( fun build(): FileCounts = FileCounts( - checkNotNull(cancelled) { "`cancelled` is required but was not set" }, - checkNotNull(completed) { "`completed` is required but was not set" }, - checkNotNull(failed) { "`failed` is required but was not set" }, - checkNotNull(inProgress) { "`inProgress` is required but was not set" }, - checkNotNull(total) { "`total` is required but was not set" }, + checkRequired("cancelled", cancelled), + checkRequired("completed", completed), + checkRequired("failed", failed), + checkRequired("inProgress", inProgress), + checkRequired("total", total), additionalProperties.toImmutable(), ) } @@ -714,8 +715,8 @@ private constructor( fun build(): ExpiresAfter = ExpiresAfter( - checkNotNull(anchor) { "`anchor` is required but was not set" }, - checkNotNull(days) { "`days` is required but was not set" }, + checkRequired("anchor", anchor), + checkRequired("days", days), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreDeleted.kt index 3d13a0a6..7238b3b0 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): VectorStoreDeleted = VectorStoreDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFile.kt b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFile.kt index 550b7666..df9510c5 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFile.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFile.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -308,13 +309,13 @@ private constructor( fun build(): VectorStoreFile = VectorStoreFile( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(lastError) { "`lastError` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(usageBytes) { "`usageBytes` is required but was not set" }, - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("lastError", lastError), + checkRequired("object_", object_), + checkRequired("status", status), + checkRequired("usageBytes", usageBytes), + checkRequired("vectorStoreId", vectorStoreId), chunkingStrategy, additionalProperties.toImmutable(), ) @@ -416,8 +417,8 @@ private constructor( fun build(): LastError = LastError( - checkNotNull(code) { "`code` is required but was not set" }, - checkNotNull(message) { "`message` is required but was not set" }, + checkRequired("code", code), + checkRequired("message", message), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileBatch.kt b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileBatch.kt index 7e7e9d45..78b232f2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileBatch.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileBatch.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -212,12 +213,12 @@ private constructor( fun build(): VectorStoreFileBatch = VectorStoreFileBatch( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(createdAt) { "`createdAt` is required but was not set" }, - checkNotNull(fileCounts) { "`fileCounts` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, - checkNotNull(status) { "`status` is required but was not set" }, - checkNotNull(vectorStoreId) { "`vectorStoreId` is required but was not set" }, + checkRequired("id", id), + checkRequired("createdAt", createdAt), + checkRequired("fileCounts", fileCounts), + checkRequired("object_", object_), + checkRequired("status", status), + checkRequired("vectorStoreId", vectorStoreId), additionalProperties.toImmutable(), ) } @@ -371,11 +372,11 @@ private constructor( fun build(): FileCounts = FileCounts( - checkNotNull(cancelled) { "`cancelled` is required but was not set" }, - checkNotNull(completed) { "`completed` is required but was not set" }, - checkNotNull(failed) { "`failed` is required but was not set" }, - checkNotNull(inProgress) { "`inProgress` is required but was not set" }, - checkNotNull(total) { "`total` is required but was not set" }, + checkRequired("cancelled", cancelled), + checkRequired("completed", completed), + checkRequired("failed", failed), + checkRequired("inProgress", inProgress), + checkRequired("total", total), additionalProperties.toImmutable(), ) } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileDeleted.kt index 9b000c62..b6aa2573 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileDeleted.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/VectorStoreFileDeleted.kt @@ -12,6 +12,7 @@ import com.openai.core.JsonField import com.openai.core.JsonMissing import com.openai.core.JsonValue import com.openai.core.NoAutoDetect +import com.openai.core.checkRequired import com.openai.core.immutableEmptyMap import com.openai.core.toImmutable import com.openai.errors.OpenAIInvalidDataException @@ -115,9 +116,9 @@ private constructor( fun build(): VectorStoreFileDeleted = VectorStoreFileDeleted( - checkNotNull(id) { "`id` is required but was not set" }, - checkNotNull(deleted) { "`deleted` is required but was not set" }, - checkNotNull(object_) { "`object_` is required but was not set" }, + checkRequired("id", id), + checkRequired("deleted", deleted), + checkRequired("object_", object_), additionalProperties.toImmutable(), ) }