LLMOpenAI: refactor generation call to OpenAI API

See: apple/swift-openapi-runtime#115
StanfordSpezi · Dec 16, 2024 · 91b3f8d · 91b3f8d
1 parent 6471784
commit 91b3f8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Package.swift b/Package.swift
@@ -37,7 +37,7 @@ let package = Package(
         .package(url: "https://github.com/StanfordSpezi/SpeziChat", .upToNextMinor(from: "0.2.1")),
         .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.3.1"),
         .package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.6.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0")
     ],
     targets: [

diff --git a/Sources/SpeziLLMOpenAI/LLMOpenAISession+Generation.swift b/Sources/SpeziLLMOpenAI/LLMOpenAISession+Generation.swift
@@ -39,11 +39,11 @@ extension LLMOpenAISession {
                 }
 
                 let chatStream = try response.ok.body.text_event_hyphen_stream
-                    .asDecodedServerSentEvents()
-                    .filter { $0.data != "[DONE]" }
-                    .asEncodedServerSentEvents()
-                    .asDecodedServerSentEventsWithJSONData(of:
-                        Components.Schemas.CreateChatCompletionStreamResponse.self)
+                    .asDecodedServerSentEventsWithJSONData(
+                        of: Components.Schemas.CreateChatCompletionStreamResponse.self,
+                        decoder: .init(),
+                        while: { incomingData in incomingData != ArraySlice<UInt8>(Data("[DONE]".utf8)) }
+                    )
 
                 for try await chatStreamResult in chatStream {
                     guard let choices = chatStreamResult.data?.choices else {