use event type in payload

Author: JaredConover

Sources/OpenAI/Private/Streaming/ModelResponseEventsStreamInterpreter.swift

@@ -55,22 +55,30 @@ final class ModelResponseEventsStreamInterpreter: @unchecked Sendable, StreamInt
     }
 
     private func processEvent(_ event: ServerSentEventsStreamParser.Event) throws {
-        var finalEvent = event
-        if event.eventType == "response.output_text.annotation.added" {
-            // Remove when they have fixed (unified)!
-            //
-            // By looking at [API Reference](https://platform.openai.com/docs/api-reference/responses-streaming/response/output_text_annotation/added)
-            // and generated type `Schemas.ResponseOutputTextAnnotationAddedEvent`
-            // We can see that "output_text.annotation" is incorrect, whereas output_text_annotation is the correct one
-            let fixedDataString = event.decodedData.replacingOccurrences(of: "response.output_text.annotation.added", with: "response.output_text_annotation.added")
-            finalEvent = .init(id: event.id, data: fixedDataString.data(using: .utf8) ?? event.data, decodedData: fixedDataString, eventType: "response.output_text_annotation.added", retry: event.retry)
+        var eventType = event.eventType
+
+        if eventType == "message" { // This is currently the default if no SSE event name is specified
+            struct _TypeEnvelope: Decodable { let type: String }
+
+            if var payloadType = try? JSONDecoder().decode(_TypeEnvelope.self, from: event.data).type {
+                if payloadType == "response.output_text.annotation.added" {
+                    // Remove when they have fixed (unified)!
+                    //
+                    // By looking at [API Reference](https://platform.openai.com/docs/api-reference/responses-streaming/response/output_text_annotation/added)
+                    // and generated type `Schemas.ResponseOutputTextAnnotationAddedEvent`
+                    // We can see that "output_text.annotation" is incorrect, whereas output_text_annotation is the correct one
+                    payloadType = "response.output_text_annotation.added"
+                }
+
+                eventType = payloadType
+            }
         }
-        
-        guard let modelResponseEventType = ModelResponseStreamEventType(rawValue: finalEvent.eventType) else {
-            throw InterpreterError.unknownEventType(finalEvent.eventType)
+
+        guard let modelResponseEventType = ModelResponseStreamEventType(rawValue: eventType) else {
+            throw InterpreterError.unknownEventType(eventType)
         }
 
-        let responseStreamEvent = try responseStreamEvent(modelResponseEventType: modelResponseEventType, data: finalEvent.data)
+        let responseStreamEvent = try responseStreamEvent(modelResponseEventType: modelResponseEventType, data: event.data)
         onEventDispatched?(responseStreamEvent)
     }