feat(client): allow passing null or optional for nullable fields (#84)

Author: stainless-app[bot]

openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClient.kt

@@ -13,6 +13,7 @@ import com.openai.credential.Credential
 import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
+import java.util.Optional
 
 class OpenAIOkHttpClient private constructor() {
 
@@ -138,9 +139,13 @@ class OpenAIOkHttpClient private constructor() {
             clientOptions.azureServiceVersion(azureServiceVersion)
         }
 
-        fun organization(organization: String) = apply { clientOptions.organization(organization) }
+        fun organization(organization: String?) = apply { clientOptions.organization(organization) }
 
-        fun project(project: String) = apply { clientOptions.project(project) }
+        fun organization(organization: Optional<String>) = organization(organization.orElse(null))
+
+        fun project(project: String?) = apply { clientOptions.project(project) }
+
+        fun project(project: Optional<String>) = project(project.orElse(null))
 
         fun fromEnv() = apply { clientOptions.fromEnv() }
 

openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClientAsync.kt

@@ -13,6 +13,7 @@ import com.openai.credential.Credential
 import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
+import java.util.Optional
 
 class OpenAIOkHttpClientAsync private constructor() {
 
@@ -138,9 +139,13 @@ class OpenAIOkHttpClientAsync private constructor() {
             clientOptions.azureServiceVersion(azureServiceVersion)
         }
 
-        fun organization(organization: String) = apply { clientOptions.organization(organization) }
+        fun organization(organization: String?) = apply { clientOptions.organization(organization) }
 
-        fun project(project: String) = apply { clientOptions.project(project) }
+        fun organization(organization: Optional<String>) = organization(organization.orElse(null))
+
+        fun project(project: String?) = apply { clientOptions.project(project) }
+
+        fun project(project: Optional<String>) = project(project.orElse(null))
 
         fun fromEnv() = apply { clientOptions.fromEnv() }
 

openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt

@@ -14,6 +14,7 @@ import com.openai.core.http.RetryingHttpClient
 import com.openai.credential.BearerTokenCredential
 import com.openai.credential.Credential
 import java.time.Clock
+import java.util.Optional
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
@@ -187,9 +188,13 @@ private constructor(
             this.azureServiceVersion = azureServiceVersion
         }
 
-        fun organization(organization: String) = apply { this.organization = organization }
+        fun organization(organization: String?) = apply { this.organization = organization }
 
-        fun project(project: String) = apply { this.project = project }
+        fun organization(organization: Optional<String>) = organization(organization.orElse(null))
+
+        fun project(project: String?) = apply { this.project = project }
+
+        fun project(project: Optional<String>) = project(project.orElse(null))
 
         fun fromEnv() = apply {
             val openAIKey = System.getenv("OPENAI_API_KEY")

openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt

@@ -167,7 +167,10 @@ constructor(
             fun inputFileId(inputFileId: String) = apply { this.inputFileId = inputFileId }
 
             /** Optional custom metadata for the batch. */
-            fun metadata(metadata: Metadata) = apply { this.metadata = metadata }
+            fun metadata(metadata: Metadata?) = apply { this.metadata = metadata }
+
+            /** Optional custom metadata for the batch. */
+            fun metadata(metadata: Optional<Metadata>) = metadata(metadata.orElse(null))
 
             fun additionalProperties(additionalProperties: Map<String, JsonValue>) = apply {
                 this.additionalProperties.clear()
@@ -269,7 +272,10 @@ constructor(
         fun inputFileId(inputFileId: String) = apply { body.inputFileId(inputFileId) }
 
         /** Optional custom metadata for the batch. */
-        fun metadata(metadata: Metadata) = apply { body.metadata(metadata) }
+        fun metadata(metadata: Metadata?) = apply { body.metadata(metadata) }
+
+        /** Optional custom metadata for the batch. */
+        fun metadata(metadata: Optional<Metadata>) = metadata(metadata.orElse(null))
 
         fun additionalHeaders(additionalHeaders: Headers) = apply {
             this.additionalHeaders.clear()

openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt

@@ -73,13 +73,34 @@ constructor(
          * obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page
          * of the list.
          */
-        fun after(after: String) = apply { this.after = after }
+        fun after(after: String?) = apply { this.after = after }
+
+        /**
+         * A cursor for use in pagination. `after` is an object ID that defines your place in the
+         * list. For instance, if you make a list request and receive 100 objects, ending with
+         * obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page
+         * of the list.
+         */
+        fun after(after: Optional<String>) = after(after.orElse(null))
+
+        /**
+         * A limit on the number of objects to be returned. Limit can range between 1 and 100, and
+         * the default is 20.
+         */
+        fun limit(limit: Long?) = apply { this.limit = limit }
+
+        /**
+         * A limit on the number of objects to be returned. Limit can range between 1 and 100, and
+         * the default is 20.
+         */
+        fun limit(limit: Long) = limit(limit as Long?)
 
         /**
          * A limit on the number of objects to be returned. Limit can range between 1 and 100, and
          * the default is 20.
          */
-        fun limit(limit: Long) = apply { this.limit = limit }
+        @Suppress("USELESS_CAST") // See https://youtrack.jetbrains.com/issue/KT-74228
+        fun limit(limit: Optional<Long>) = limit(limit.orElse(null) as Long?)
 
         fun additionalHeaders(additionalHeaders: Headers) = apply {
             this.additionalHeaders.clear()