Skip to content

Commit 0054702

Browse files
committed
Merge branch 'feature/optional-message-id' into develop
2 parents 9fd6cb4 + 821e287 commit 0054702

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

Tool/Sources/OpenAIService/ChatGPTService.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ extension ChatGPTService {
227227
do {
228228
let (trunks, cancel) = try await api()
229229
cancelTask = cancel
230+
let proposedId = UUID().uuidString
230231
for try await trunk in trunks {
231232
guard let delta = trunk.choices.first?.delta else { continue }
232233

@@ -242,7 +243,7 @@ extension ChatGPTService {
242243
}
243244

244245
await memory.streamMessage(
245-
id: trunk.id,
246+
id: trunk.id ?? proposedId,
246247
role: delta.role,
247248
content: delta.content,
248249
functionCall: functionCall
@@ -323,7 +324,7 @@ extension ChatGPTService {
323324

324325
guard let choice = response.choices.first else { return nil }
325326
let message = ChatMessage(
326-
id: response.id,
327+
id: response.id ?? UUID().uuidString,
327328
role: choice.message.role,
328329
content: choice.message.content,
329330
name: choice.message.name,
@@ -425,5 +426,5 @@ func maxTokenForReply(model: String, remainingTokens: Int?) -> Int? {
425426
guard let remainingTokens else { return nil }
426427
guard let model = ChatGPTModel(rawValue: model) else { return remainingTokens }
427428
return min(model.maxToken / 2, remainingTokens)
428-
}
429+
}
429430

Tool/Sources/OpenAIService/CompletionAPI.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ struct CompletionResponseBody: Codable, Equatable {
4242
var total_tokens: Int
4343
}
4444

45-
var id: String
45+
var id: String?
4646
var object: String
47-
var created: Int
4847
var model: String
4948
var usage: Usage
5049
var choices: [Choice]

Tool/Sources/OpenAIService/CompletionStreamAPI.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,8 @@ struct CompletionRequestBody: Encodable, Equatable {
123123
}
124124

125125
struct CompletionStreamDataTrunk: Codable {
126-
var id: String
126+
var id: String?
127127
var object: String
128-
var created: Int
129128
var model: String
130129
var choices: [Choice]
131130

0 commit comments

Comments
 (0)