fix(client): allow updating header/query affecting fields in toBuilder()

Author: stainless-app[bot]

langsmith-java-core/src/main/kotlin/com/langchain/smith/core/ClientOptions.kt

@@ -503,28 +503,29 @@ private constructor(
             headers.put("X-Stainless-Runtime", "JRE")
             headers.put("X-Stainless-Runtime-Version", getJavaVersion())
             headers.put("X-Stainless-Kotlin-Version", KotlinVersion.CURRENT.toString())
+            // We replace after all the default headers to allow end-users to overwrite them.
+            headers.replaceAll(this.headers.build())
+            queryParams.replaceAll(this.queryParams.build())
             apiKey?.let {
                 if (!it.isEmpty()) {
-                    headers.put("X-API-Key", it)
+                    headers.replace("X-API-Key", it)
                 }
             }
             organizationId?.let {
                 if (!it.isEmpty()) {
-                    headers.put("X-Organization-Id", it)
+                    headers.replace("X-Organization-Id", it)
                 }
             }
             bearerToken?.let {
                 if (!it.isEmpty()) {
-                    headers.put("Authorization", "Bearer $it")
+                    headers.replace("Authorization", "Bearer $it")
                 }
             }
             tenantId?.let {
                 if (!it.isEmpty()) {
-                    headers.put("X-Tenant-Id", it)
+                    headers.replace("X-Tenant-Id", it)
                 }
             }
-            headers.replaceAll(this.headers.build())
-            queryParams.replaceAll(this.queryParams.build())
 
             return ClientOptions(
                 httpClient,

langsmith-java-core/src/test/kotlin/com/langchain/smith/core/ClientOptionsTest.kt

@@ -16,6 +16,35 @@ internal class ClientOptionsTest {
 
     private val httpClient = mock<HttpClient>()
 
+    @Test
+    fun putHeader_canOverwriteDefaultHeader() {
+        val clientOptions =
+            ClientOptions.builder()
+                .httpClient(httpClient)
+                .putHeader("User-Agent", "My User Agent")
+                .apiKey("My API Key")
+                .tenantId("My Tenant ID")
+                .organizationId("My Organization ID")
+                .build()
+
+        assertThat(clientOptions.headers.values("User-Agent")).containsExactly("My User Agent")
+    }
+
+    @Test
+    fun toBuilder_apiKeyCanBeUpdated() {
+        var clientOptions =
+            ClientOptions.builder()
+                .httpClient(httpClient)
+                .apiKey("My API Key")
+                .tenantId("My Tenant ID")
+                .organizationId("My Organization ID")
+                .build()
+
+        clientOptions = clientOptions.toBuilder().apiKey("another My API Key").build()
+
+        assertThat(clientOptions.headers.values("X-API-Key")).containsExactly("another My API Key")
+    }
+
     @Test
     fun toBuilder_whenOriginalClientOptionsGarbageCollected_doesNotCloseOriginalClient() {
         var clientOptions =