chore(internal): codegen related update

Author: stainless-app[bot]

README.md

@@ -132,6 +132,21 @@ See this table for the available options:
 > Don't create more than one client in the same application. Each client has a connection pool and
 > thread pools, which are more efficient to share between requests.
 
+### Modifying configuration
+
+To temporarily use a modified client configuration, while reusing the same connection and thread pools, call `withOptions()` on any client or service:
+
+```java
+import com.openai.client.OpenAIClient;
+
+OpenAIClient clientWithOptions = client.withOptions(optionsBuilder -> {
+    optionsBuilder.baseUrl("https://example.com");
+    optionsBuilder.maxRetries(42);
+});
+```
+
+The `withOptions()` method does not affect the original client or service.
+
 ## Requests and responses
 
 To send a request to the OpenAI API, build an instance of some `Params` class and pass it to the corresponding client method. When the response is received, it will be deserialized into an instance of a Java class.

openai-java-core/src/main/kotlin/com/openai/client/OpenAIClient.kt

@@ -2,6 +2,7 @@
 
 package com.openai.client
 
+import com.openai.core.ClientOptions
 import com.openai.services.blocking.AudioService
 import com.openai.services.blocking.BatchService
 import com.openai.services.blocking.BetaService
@@ -19,6 +20,7 @@ import com.openai.services.blocking.ModerationService
 import com.openai.services.blocking.ResponseService
 import com.openai.services.blocking.UploadService
 import com.openai.services.blocking.VectorStoreService
+import java.util.function.Consumer
 
 /**
  * A client for interacting with the OpenAI REST API synchronously. You can also switch to
@@ -49,6 +51,13 @@ interface OpenAIClient {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: Consumer<ClientOptions.Builder>): OpenAIClient
+
     fun completions(): CompletionService
 
     fun chat(): ChatService
@@ -99,6 +108,13 @@ interface OpenAIClient {
     /** A view of [OpenAIClient] that provides access to raw HTTP responses for each method. */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(modifier: Consumer<ClientOptions.Builder>): OpenAIClient.WithRawResponse
+
         fun completions(): CompletionService.WithRawResponse
 
         fun chat(): ChatService.WithRawResponse

openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsync.kt

@@ -2,6 +2,7 @@
 
 package com.openai.client
 
+import com.openai.core.ClientOptions
 import com.openai.services.async.AudioServiceAsync
 import com.openai.services.async.BatchServiceAsync
 import com.openai.services.async.BetaServiceAsync
@@ -19,6 +20,7 @@ import com.openai.services.async.ModerationServiceAsync
 import com.openai.services.async.ResponseServiceAsync
 import com.openai.services.async.UploadServiceAsync
 import com.openai.services.async.VectorStoreServiceAsync
+import java.util.function.Consumer
 
 /**
  * A client for interacting with the OpenAI REST API asynchronously. You can also switch to
@@ -49,6 +51,13 @@ interface OpenAIClientAsync {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: Consumer<ClientOptions.Builder>): OpenAIClientAsync
+
     fun completions(): CompletionServiceAsync
 
     fun chat(): ChatServiceAsync
@@ -99,6 +108,15 @@ interface OpenAIClientAsync {
     /** A view of [OpenAIClientAsync] that provides access to raw HTTP responses for each method. */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): OpenAIClientAsync.WithRawResponse
+
         fun completions(): CompletionServiceAsync.WithRawResponse
 
         fun chat(): ChatServiceAsync.WithRawResponse

openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt

@@ -38,6 +38,7 @@ import com.openai.services.async.UploadServiceAsync
 import com.openai.services.async.UploadServiceAsyncImpl
 import com.openai.services.async.VectorStoreServiceAsync
 import com.openai.services.async.VectorStoreServiceAsyncImpl
+import java.util.function.Consumer
 
 class OpenAIClientAsyncImpl(private val clientOptions: ClientOptions) : OpenAIClientAsync {
 
@@ -120,6 +121,9 @@ class OpenAIClientAsyncImpl(private val clientOptions: ClientOptions) : OpenAICl
 
     override fun withRawResponse(): OpenAIClientAsync.WithRawResponse = withRawResponse
 
+    override fun withOptions(modifier: Consumer<ClientOptions.Builder>): OpenAIClientAsync =
+        OpenAIClientAsyncImpl(clientOptions.toBuilder().apply(modifier::accept).build())
+
     override fun completions(): CompletionServiceAsync = completions
 
     override fun chat(): ChatServiceAsync = chat
@@ -227,6 +231,13 @@ class OpenAIClientAsyncImpl(private val clientOptions: ClientOptions) : OpenAICl
             ContainerServiceAsyncImpl.WithRawResponseImpl(clientOptions)
         }
 
+        override fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): OpenAIClientAsync.WithRawResponse =
+            OpenAIClientAsyncImpl.WithRawResponseImpl(
+                clientOptions.toBuilder().apply(modifier::accept).build()
+            )
+
         override fun completions(): CompletionServiceAsync.WithRawResponse = completions
 
         override fun chat(): ChatServiceAsync.WithRawResponse = chat

openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt

@@ -38,6 +38,7 @@ import com.openai.services.blocking.UploadService
 import com.openai.services.blocking.UploadServiceImpl
 import com.openai.services.blocking.VectorStoreService
 import com.openai.services.blocking.VectorStoreServiceImpl
+import java.util.function.Consumer
 
 class OpenAIClientImpl(private val clientOptions: ClientOptions) : OpenAIClient {
 
@@ -108,6 +109,9 @@ class OpenAIClientImpl(private val clientOptions: ClientOptions) : OpenAIClient
 
     override fun withRawResponse(): OpenAIClient.WithRawResponse = withRawResponse
 
+    override fun withOptions(modifier: Consumer<ClientOptions.Builder>): OpenAIClient =
+        OpenAIClientImpl(clientOptions.toBuilder().apply(modifier::accept).build())
+
     override fun completions(): CompletionService = completions
 
     override fun chat(): ChatService = chat
@@ -215,6 +219,13 @@ class OpenAIClientImpl(private val clientOptions: ClientOptions) : OpenAIClient
             ContainerServiceImpl.WithRawResponseImpl(clientOptions)
         }
 
+        override fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): OpenAIClient.WithRawResponse =
+            OpenAIClientImpl.WithRawResponseImpl(
+                clientOptions.toBuilder().apply(modifier::accept).build()
+            )
+
         override fun completions(): CompletionService.WithRawResponse = completions
 
         override fun chat(): ChatService.WithRawResponse = chat

openai-java-core/src/main/kotlin/com/openai/services/async/AudioServiceAsync.kt

@@ -2,9 +2,11 @@
 
 package com.openai.services.async
 
+import com.openai.core.ClientOptions
 import com.openai.services.async.audio.SpeechServiceAsync
 import com.openai.services.async.audio.TranscriptionServiceAsync
 import com.openai.services.async.audio.TranslationServiceAsync
+import java.util.function.Consumer
 
 interface AudioServiceAsync {
 
@@ -13,6 +15,13 @@ interface AudioServiceAsync {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: Consumer<ClientOptions.Builder>): AudioServiceAsync
+
     fun transcriptions(): TranscriptionServiceAsync
 
     fun translations(): TranslationServiceAsync
@@ -22,6 +31,15 @@ interface AudioServiceAsync {
     /** A view of [AudioServiceAsync] that provides access to raw HTTP responses for each method. */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): AudioServiceAsync.WithRawResponse
+
         fun transcriptions(): TranscriptionServiceAsync.WithRawResponse
 
         fun translations(): TranslationServiceAsync.WithRawResponse

openai-java-core/src/main/kotlin/com/openai/services/async/AudioServiceAsyncImpl.kt

@@ -9,6 +9,7 @@ import com.openai.services.async.audio.TranscriptionServiceAsync
 import com.openai.services.async.audio.TranscriptionServiceAsyncImpl
 import com.openai.services.async.audio.TranslationServiceAsync
 import com.openai.services.async.audio.TranslationServiceAsyncImpl
+import java.util.function.Consumer
 
 class AudioServiceAsyncImpl internal constructor(private val clientOptions: ClientOptions) :
     AudioServiceAsync {
@@ -29,6 +30,9 @@ class AudioServiceAsyncImpl internal constructor(private val clientOptions: Clie
 
     override fun withRawResponse(): AudioServiceAsync.WithRawResponse = withRawResponse
 
+    override fun withOptions(modifier: Consumer<ClientOptions.Builder>): AudioServiceAsync =
+        AudioServiceAsyncImpl(clientOptions.toBuilder().apply(modifier::accept).build())
+
     override fun transcriptions(): TranscriptionServiceAsync = transcriptions
 
     override fun translations(): TranslationServiceAsync = translations
@@ -50,6 +54,13 @@ class AudioServiceAsyncImpl internal constructor(private val clientOptions: Clie
             SpeechServiceAsyncImpl.WithRawResponseImpl(clientOptions)
         }
 
+        override fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): AudioServiceAsync.WithRawResponse =
+            AudioServiceAsyncImpl.WithRawResponseImpl(
+                clientOptions.toBuilder().apply(modifier::accept).build()
+            )
+
         override fun transcriptions(): TranscriptionServiceAsync.WithRawResponse = transcriptions
 
         override fun translations(): TranslationServiceAsync.WithRawResponse = translations

openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsync.kt

@@ -2,6 +2,7 @@
 
 package com.openai.services.async
 
+import com.openai.core.ClientOptions
 import com.openai.core.RequestOptions
 import com.openai.core.http.HttpResponseFor
 import com.openai.models.batches.Batch
@@ -11,6 +12,7 @@ import com.openai.models.batches.BatchListPageAsync
 import com.openai.models.batches.BatchListParams
 import com.openai.models.batches.BatchRetrieveParams
 import java.util.concurrent.CompletableFuture
+import java.util.function.Consumer
 
 interface BatchServiceAsync {
 
@@ -19,6 +21,13 @@ interface BatchServiceAsync {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: Consumer<ClientOptions.Builder>): BatchServiceAsync
+
     /** Creates and executes a batch from an uploaded file of requests */
     fun create(params: BatchCreateParams): CompletableFuture<Batch> =
         create(params, RequestOptions.none())
@@ -118,6 +127,15 @@ interface BatchServiceAsync {
     /** A view of [BatchServiceAsync] that provides access to raw HTTP responses for each method. */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): BatchServiceAsync.WithRawResponse
+
         /**
          * Returns a raw HTTP response for `post /batches`, but is otherwise the same as
          * [BatchServiceAsync.create].

openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsyncImpl.kt

@@ -24,6 +24,7 @@ import com.openai.models.batches.BatchListPageResponse
 import com.openai.models.batches.BatchListParams
 import com.openai.models.batches.BatchRetrieveParams
 import java.util.concurrent.CompletableFuture
+import java.util.function.Consumer
 import kotlin.jvm.optionals.getOrNull
 
 class BatchServiceAsyncImpl internal constructor(private val clientOptions: ClientOptions) :
@@ -35,6 +36,9 @@ class BatchServiceAsyncImpl internal constructor(private val clientOptions: Clie
 
     override fun withRawResponse(): BatchServiceAsync.WithRawResponse = withRawResponse
 
+    override fun withOptions(modifier: Consumer<ClientOptions.Builder>): BatchServiceAsync =
+        BatchServiceAsyncImpl(clientOptions.toBuilder().apply(modifier::accept).build())
+
     override fun create(
         params: BatchCreateParams,
         requestOptions: RequestOptions,
@@ -68,6 +72,13 @@ class BatchServiceAsyncImpl internal constructor(private val clientOptions: Clie
 
         private val errorHandler: Handler<ErrorObject?> = errorHandler(clientOptions.jsonMapper)
 
+        override fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): BatchServiceAsync.WithRawResponse =
+            BatchServiceAsyncImpl.WithRawResponseImpl(
+                clientOptions.toBuilder().apply(modifier::accept).build()
+            )
+
         private val createHandler: Handler<Batch> =
             jsonHandler<Batch>(clientOptions.jsonMapper).withErrorHandler(errorHandler)
 

openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsync.kt

@@ -2,13 +2,31 @@
 
 package com.openai.services.async
 
+import com.openai.core.ClientOptions
+import java.util.function.Consumer
+
 interface BetaServiceAsync {
 
     /**
      * Returns a view of this service that provides access to raw HTTP responses for each method.
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: Consumer<ClientOptions.Builder>): BetaServiceAsync
+
     /** A view of [BetaServiceAsync] that provides access to raw HTTP responses for each method. */
-    interface WithRawResponse
+    interface WithRawResponse {
+
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(modifier: Consumer<ClientOptions.Builder>): BetaServiceAsync.WithRawResponse
+    }
 }

openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt

@@ -3,6 +3,7 @@
 package com.openai.services.async
 
 import com.openai.core.ClientOptions
+import java.util.function.Consumer
 
 class BetaServiceAsyncImpl internal constructor(private val clientOptions: ClientOptions) :
     BetaServiceAsync {
@@ -13,6 +14,17 @@ class BetaServiceAsyncImpl internal constructor(private val clientOptions: Clien
 
     override fun withRawResponse(): BetaServiceAsync.WithRawResponse = withRawResponse
 
+    override fun withOptions(modifier: Consumer<ClientOptions.Builder>): BetaServiceAsync =
+        BetaServiceAsyncImpl(clientOptions.toBuilder().apply(modifier::accept).build())
+
     class WithRawResponseImpl internal constructor(private val clientOptions: ClientOptions) :
-        BetaServiceAsync.WithRawResponse
+        BetaServiceAsync.WithRawResponse {
+
+        override fun withOptions(
+            modifier: Consumer<ClientOptions.Builder>
+        ): BetaServiceAsync.WithRawResponse =
+            BetaServiceAsyncImpl.WithRawResponseImpl(
+                clientOptions.toBuilder().apply(modifier::accept).build()
+            )
+    }
 }