fix(client): bad assistants v2 deserialization (#146)

Author: stainless-app[bot]

openai-java-core/src/main/kotlin/com/openai/core/handlers/SseHandler.kt

@@ -1,3 +1,5 @@
+// File generated from our OpenAPI spec by Stainless.
+
 @file:JvmName("SseHandler")
 
 package com.openai.core.handlers
@@ -117,13 +119,14 @@ private class SseState(
 }
 
 @JvmSynthetic
-internal inline fun <reified T> Handler<StreamResponse<SseMessage>>.mapJson():
-    Handler<StreamResponse<T>> =
+internal inline fun <reified T> Handler<StreamResponse<SseMessage>>.mapJson(
+    includeEventAndData: Boolean = false
+): Handler<StreamResponse<T>> =
     object : Handler<StreamResponse<T>> {
         override fun handle(response: HttpResponse): StreamResponse<T> =
             this@mapJson.handle(response).map {
                 try {
-                    it.json<T>()
+                    it.json<T>(includeEventAndData)
                 } catch (e: Exception) {
                     throw OpenAIException("Error reading response", e)
                 }

openai-java-core/src/main/kotlin/com/openai/core/http/SseMessage.kt

@@ -1,3 +1,5 @@
+// File generated from our OpenAPI spec by Stainless.
+
 package com.openai.core.http
 
 import com.fasterxml.jackson.databind.json.JsonMapper
@@ -39,7 +41,17 @@ private constructor(
         fun build(): SseMessage = SseMessage(jsonMapper!!, event, data, id, retry)
     }
 
-    inline fun <reified T> json(): T = jsonMapper.readerFor(jacksonTypeRef<T>()).readValue(jsonNode)
+    inline fun <reified T> json(includeEventAndData: Boolean = false): T {
+        var jsonNode = jsonNode
+        if (includeEventAndData) {
+            val newJsonNode = jsonMapper.createObjectNode()
+            event?.let { newJsonNode.put("event", event) }
+            newJsonNode.replace("data", jsonNode)
+            jsonNode = newJsonNode
+        }
+
+        return jsonMapper.readerFor(jacksonTypeRef<T>()).readValue(jsonNode)
+    }
 
     private val jsonNode by lazy {
         try {

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

@@ -211,7 +211,7 @@ internal constructor(
 
     private val createAndRunStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /** Create a thread and run it in one request. */

openai-java-core/src/main/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncImpl.kt

@@ -82,7 +82,7 @@ internal constructor(
 
     private val createStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /** Create a run. */
@@ -299,7 +299,7 @@ internal constructor(
 
     private val submitToolOutputsStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /**

openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadServiceImpl.kt

@@ -197,7 +197,7 @@ internal constructor(
 
     private val createAndRunStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /** Create a thread and run it in one request. */

openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/threads/RunServiceImpl.kt

@@ -75,7 +75,7 @@ internal constructor(
 
     private val createStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /** Create a run. */
@@ -278,7 +278,7 @@ internal constructor(
 
     private val submitToolOutputsStreamingHandler: Handler<StreamResponse<AssistantStreamEvent>> =
         sseHandler(clientOptions.jsonMapper)
-            .mapJson<AssistantStreamEvent>()
+            .mapJson<AssistantStreamEvent>(includeEventAndData = true)
             .withErrorHandler(errorHandler)
 
     /**