Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 41 additions & 4 deletions Sources/ChatGPTSwift/ChatGPTAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,33 @@ public class ChatGPTAPI: @unchecked Sendable {
public func sendMessageStream(text: String,
model: ChatGPTModel = .gpt_hyphen_4o,
systemText: String = ChatGPTAPI.Constants.defaultSystemText,
withHistory: Bool = false,
temperature: Double = ChatGPTAPI.Constants.defaultTemperature,
maxTokens: Int? = nil,
responseFormat: Components.Schemas.CreateChatCompletionRequest.response_formatPayload? = nil,
stop: Components.Schemas.CreateChatCompletionRequest.stopPayload? = nil,
imageData: Data? = nil) async throws -> AsyncMapSequence<AsyncThrowingPrefixWhileSequence<AsyncThrowingMapSequence<ServerSentEventsDeserializationSequence<ServerSentEventsLineDeserializationSequence<HTTPBody>>, ServerSentEventWithJSONData<Components.Schemas.CreateChatCompletionStreamResponse>>>, String> {
var messages = generateInternalMessages(from: text, systemText: systemText)
var messages: [Components.Schemas.ChatCompletionRequestMessage] = []

if withHistory {
messages = historyList.compactMap({ message -> Components.Schemas.ChatCompletionRequestMessage? in
switch message.role {

case "system":
return .ChatCompletionRequestSystemMessage(.init(content: message.content, role: .system))

case "user":
return .ChatCompletionRequestUserMessage(.init(content: .case1(message.content), role: .user))

case "assistant":
return .ChatCompletionRequestAssistantMessage(.init(content: message.content, role: .assistant))

default: return nil

}
})
}
messages.append(contentsOf: generateInternalMessages(from: text, systemText: systemText))
if let imageData {
messages.append(createMessage(imageData: imageData))
}
Expand Down Expand Up @@ -136,15 +157,31 @@ public class ChatGPTAPI: @unchecked Sendable {
public func sendMessage(text: String,
model: ChatGPTModel = .gpt_hyphen_4o,
systemText: String = ChatGPTAPI.Constants.defaultSystemText,
withHistory: Bool = false,
temperature: Double = ChatGPTAPI.Constants.defaultTemperature,
maxTokens: Int? = nil,
responseFormat: Components.Schemas.CreateChatCompletionRequest.response_formatPayload? = nil,
stop: Components.Schemas.CreateChatCompletionRequest.stopPayload? = nil,
imageData: Data? = nil) async throws -> String {
var messages = generateInternalMessages(from: text, systemText: systemText)
if let imageData {
messages.append(createMessage(imageData: imageData))
var messages: [Components.Schemas.ChatCompletionRequestMessage] = []

if withHistory {
messages = historyList.compactMap({ message -> Components.Schemas.ChatCompletionRequestMessage? in
switch message.role {
case "system":
return .ChatCompletionRequestSystemMessage(.init(content: message.content, role: .system))

case "user":
return .ChatCompletionRequestUserMessage(.init(content: .case1(message.content), role: .user))

case "assistant":
return .ChatCompletionRequestAssistantMessage(.init(content: message.content, role: .assistant))

default: return nil
}
})
}
messages.append(contentsOf: generateInternalMessages(from: text, systemText: systemText))

let response = try await client.createChatCompletion(body: .json(.init(
messages: messages,
Expand Down