Remove function role

Author: intitni

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -9,7 +9,7 @@ public struct DisplayedChatMessage: Equatable {
     public enum Role: Equatable {
         case user
         case assistant
-        case function
+        case tool
         case ignored
     }
 
@@ -312,8 +312,7 @@ struct Chat: ReducerProtocol {
                                     return .assistant
                                 }
                                 return .ignored
-                            case .function: return .function
-                            case .tool: return .function
+                            case .tool: return .tool
                             }
                         }(),
                         text: message.summary ?? message.content ?? "",

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -258,7 +258,7 @@ struct ChatHistory: View {
                         trailing: -8
                     ))
                     .padding(.vertical, 4)
-                case .function:
+                case .tool:
                     FunctionMessage(id: message.id, text: text)
                 case .ignored:
                     EmptyView()
@@ -453,7 +453,7 @@ struct ChatPanel_Preview: PreviewProvider {
         ),
         .init(
             id: "6",
-            role: .function,
+            role: .tool,
             text: """
             Searching for something...
             - abc

Core/Sources/ChatService/ContextAwareAutoManagedChatGPTMemory.swift

@@ -39,7 +39,7 @@ public final class ContextAwareAutoManagedChatGPTMemory: ChatGPTMemory {
 
     public func generatePrompt() async -> ChatGPTPrompt {
         let content = (await memory.history)
-            .last(where: { $0.role == .user || $0.role == .function })?.content
+            .last(where: { $0.role == .user || $0.role == .tool })?.content
         try? await contextController.collectContextInformation(
             systemPrompt: """
             \(chatService?.systemPrompt ?? "")

Pro

@@ -194,7 +194,7 @@ extension ChatGPTPrompt {
 extension ModelContent {
     static func convertRole(_ role: ChatMessage.Role) -> String {
         switch role {
-        case .user, .system, .function, .tool:
+        case .user, .system, .tool:
             return "user"
         case .assistant:
             return "model"
@@ -207,10 +207,6 @@ extension ModelContent {
             return "System Prompt:\n\(message.content ?? " ")"
         case .user:
             return message.content ?? " "
-        case .function:
-            return """
-            Result of \(message.name ?? "function"): \(message.content ?? "N/A")
-            """
         case .tool:
             return """
             Result of \(message.toolCallId ?? "tool"): \(message.content ?? "N/A")

Tool/Sources/OpenAIService/APIs/GoogleAIChatCompletionsService.swift

@@ -39,8 +39,6 @@ extension OllamaChatCompletionsService: ChatCompletionsAPI {
                         return .user
                     case .system:
                         return .system
-                    case .function:
-                        return .user
                     case .tool:
                         return .user
                     }
@@ -116,8 +114,6 @@ extension OllamaChatCompletionsService: ChatCompletionsStreamAPI {
                         return .user
                     case .system:
                         return .system
-                    case .function:
-                        return .user
                     case .tool:
                         return .user
                     }

Tool/Sources/OpenAIService/APIs/OlamaChatCompletionsService.swift

@@ -499,7 +499,7 @@ extension ChatGPTService {
 
         await memory.streamMessage(
             id: messageId,
-            role: .function,
+            role: .tool,
             name: call.function.name,
             toolCallId: call.id
         )
@@ -578,7 +578,7 @@ extension ChatGPTService {
         }()
         await memory.streamMessage(
             id: messageId,
-            role: .function,
+            role: .tool,
             content: content,
             name: call.name,
             summary: "Finished running function."

Tool/Sources/OpenAIService/ChatGPTService.swift

@@ -15,7 +15,6 @@ public struct ChatMessage: Equatable, Codable {
         case system
         case user
         case assistant
-        case function
         case tool
     }