Skip to content

Commit 593bb36

Browse files
committed
Fix that 'cancelled' is printed to the chat
1 parent 076c603 commit 593bb36

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Core/Sources/OpenAIService/ChatGPTService.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ public actor ChatGPTService: ChatGPTServiceType, ObservableObject {
5959
didSet { objectWillChange.send() }
6060
}
6161

62-
public internal(set) var isReceivingMessage = false
62+
public internal(set) var isReceivingMessage = false {
63+
didSet { objectWillChange.send() }
64+
}
65+
6366
var cancelTask: Cancellable?
6467
var buildCompletionStreamAPI: CompletionStreamAPIBuilder = OpenAICompletionStreamAPI.init
6568

66-
deinit {
67-
print("deinit")
68-
}
69-
7069
public init(
7170
systemPrompt: String,
7271
apiKey: String,
@@ -135,6 +134,12 @@ public actor ChatGPTService: ChatGPTServiceType, ObservableObject {
135134

136135
continuation.finish()
137136
isReceivingMessage = false
137+
} catch let error as CancellationError {
138+
isReceivingMessage = false
139+
continuation.finish(throwing: error)
140+
} catch let error as NSError where error.code == NSURLErrorCancelled {
141+
isReceivingMessage = false
142+
continuation.finish(throwing: error)
138143
} catch {
139144
Logger.service.error(error)
140145
history.append(.init(

0 commit comments

Comments
 (0)