chore(internal): extract a checkRequired function (#113)

openai · Jan 14, 2025 · 00742be · 00742be
1 parent 8c91743
commit 00742be
Show file tree

Hide file tree

Showing 164 changed files with 850 additions and 796 deletions.
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
@@ -0,0 +1,7 @@
+@file:JvmName("Check")
+
+package com.openai.core
+
+@JvmSynthetic
+internal fun <T : Any> 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
@@ -189,8 +189,8 @@ private constructor(
         }
 
         fun build(): ClientOptions {
-            checkNotNull(httpClient) { "`httpClient` is required but was not set" }
-            checkNotNull(apiKey) { "`apiKey` is required but was not set" }
+            checkRequired("httpClient", httpClient)
+            checkRequired("apiKey", apiKey)
 
             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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()
             )
     }