fix(requestOptions): headers override previous values

aallam · Jun 15, 2024 · 3bbf499 · 3bbf499
1 parent 8aab15e
commit 3bbf499
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/...t/src/commonMain/kotlin/com.aallam.openai.client/internal/extension/HttpRequestBuilder.kt b/...t/src/commonMain/kotlin/com.aallam.openai.client/internal/extension/HttpRequestBuilder.kt
@@ -9,7 +9,10 @@ import io.ktor.client.request.*
  */
 internal fun HttpRequestBuilder.requestOptions(requestOptions: RequestOptions? = null) {
     if (requestOptions == null) return
-    requestOptions.headers.forEach { (key, value) -> headers.append(key, value) }
+    requestOptions.headers.forEach { (key, value) ->
+        if (headers.contains(key)) headers.remove(key)
+        headers[key] = value
+    }
     requestOptions.urlParameters.forEach { (key, value) -> url.parameters.append(key, value) }
     requestOptions.timeout?.let { timeout ->
         timeout {

diff --git a/openai-client/src/commonTest/kotlin/com/aallam/openai/client/misc/TestRequestOptions.kt b/openai-client/src/commonTest/kotlin/com/aallam/openai/client/misc/TestRequestOptions.kt
@@ -32,4 +32,31 @@ class TestRequestOptions {
         client.models(requestOptions = requestOptions)
         assertEquals(requestHeaders?.get(key), requestOptions.headers[key])
     }
+
+    @Test
+    fun testOverride() = runTest {
+        val key = "OpenAI-Beta"
+        val requestOptions = RequestOptions(
+            headers = mapOf(key to "assistants=v0"),
+        )
+        var requestHeaders: Map<String, String>? = null
+        val client = OpenAI(
+            token = token,
+            headers = mapOf(key to "assistants=v3"),
+            httpClientConfig = {
+                install("RequestInterceptor") {
+                    requestPipeline.intercept(HttpRequestPipeline.Before) {
+                        requestHeaders = context.headers.entries().associate { it.key to it.value.first() }
+                    }
+                }
+            }
+        )
+
+        try {
+            client.assistants(requestOptions = requestOptions)
+        } catch (e: Exception) {
+            // skip
+        }
+        assertEquals(requestHeaders?.get(key), requestOptions.headers[key])
+    }
 }