Move chat related models to ChatBasic

Author: intitni

Core/Sources/ChatContextCollectors/WebChatContextCollector/QueryWebsiteFunction.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import Foundation
 import LangChain
 import OpenAIService

Core/Sources/ChatContextCollectors/WebChatContextCollector/SearchFunction.swift

@@ -1,4 +1,5 @@
 import BingSearchService
+import ChatBasic
 import Foundation
 import OpenAIService
 import Preferences

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import ChatContextCollector
 import Foundation
 import OpenAIService

Core/Sources/ChatService/ChatFunctionProvider.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import Foundation
 import OpenAIService
 

Pro

@@ -170,6 +170,16 @@ let package = Package(
             name: "SuggestionModelTests",
             dependencies: ["SuggestionModel"]
         ),
+        
+        .target(
+            name: "ChatBasic",
+            dependencies: [
+                "AIModel",
+                "Preferences",
+                "Keychain",
+                .product(name: "CodableWrappers", package: "CodableWrappers"),
+            ]
+        ),
 
         .target(name: "AXExtension"),
 
@@ -205,8 +215,10 @@ let package = Package(
             name: "BuiltinExtension",
             dependencies: [
                 "SuggestionModel",
+                "ChatBasic",
                 "Workspace",
                 "ChatTab",
+                "AIModel",
                 .product(name: "CopilotForXcodeKit", package: "CopilotForXcodeKit"),
             ]
         ),
@@ -288,6 +300,7 @@ let package = Package(
                 "OpenAIService",
                 "ObjectiveCExceptionHandling",
                 "USearchIndex",
+                "ChatBasic",
                 .product(name: "Parsing", package: "swift-parsing"),
                 .product(name: "SwiftSoup", package: "SwiftSoup"),
             ]
@@ -312,6 +325,7 @@ let package = Package(
             dependencies: [
                 "LanguageClient",
                 "SuggestionModel",
+                "ChatBasic",
                 "Logger",
                 "Preferences",
                 "Terminal",
@@ -354,6 +368,7 @@ let package = Package(
                 "Preferences",
                 "TokenEncoder",
                 "Keychain",
+                "BuiltinExtension",
                 .product(name: "JSONRPC", package: "JSONRPC"),
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "GoogleGenerativeAI", package: "generative-ai-swift"),
@@ -390,6 +405,7 @@ let package = Package(
             name: "ChatContextCollector",
             dependencies: [
                 "SuggestionModel",
+                "ChatBasic",
                 "OpenAIService",
             ]
         ),

Tool/Package.swift

@@ -100,12 +100,12 @@ public extension ChatGPTArgumentsCollectingFunction {
     }
 }
 
-struct ChatGPTFunctionSchema: Codable, Equatable {
-    var name: String
-    var description: String
-    var parameters: JSONSchemaValue
+public struct ChatGPTFunctionSchema: Codable, Equatable {
+    public var name: String
+    public var description: String
+    public var parameters: JSONSchemaValue
 
-    init(name: String, description: String, parameters: JSONSchemaValue) {
+    public init(name: String, description: String, parameters: JSONSchemaValue) {
         self.name = name
         self.description = description
         self.parameters = parameters

…rvice/FucntionCall/ChatGPTFunction.swift …/Sources/ChatBasic/ChatGPTFunction.swiftTool/Sources/OpenAIService/FucntionCall/ChatGPTFunction.swift renamed to Tool/Sources/ChatBasic/ChatGPTFunction.swift Tool/Sources/OpenAIService/FucntionCall/ChatGPTFunction.swift renamed to Tool/Sources/ChatBasic/ChatGPTFunction.swift

@@ -0,0 +1,163 @@
+import CodableWrappers
+import Foundation
+
+public struct ChatMessage: Equatable, Codable {
+    public typealias ID = String
+
+    public enum Role: String, Codable, Equatable {
+        case system
+        case user
+        case assistant
+    }
+
+    public struct FunctionCall: Codable, Equatable {
+        public var name: String
+        public var arguments: String
+        public init(name: String, arguments: String) {
+            self.name = name
+            self.arguments = arguments
+        }
+    }
+
+    public struct ToolCall: Codable, Equatable, Identifiable {
+        public var id: String
+        public var type: String
+        public var function: FunctionCall
+        public var response: ToolCallResponse
+        public init(
+            id: String,
+            type: String,
+            function: FunctionCall,
+            response: ToolCallResponse? = nil
+        ) {
+            self.id = id
+            self.type = type
+            self.function = function
+            self.response = response ?? .init(content: "", summary: nil)
+        }
+    }
+
+    public struct ToolCallResponse: Codable, Equatable {
+        public var content: String
+        public var summary: String?
+        public init(content: String, summary: String?) {
+            self.content = content
+            self.summary = summary
+        }
+    }
+
+    public struct Reference: Codable, Equatable {
+        public enum Kind: String, Codable {
+            case `class`
+            case `struct`
+            case `enum`
+            case `actor`
+            case `protocol`
+            case `extension`
+            case `case`
+            case property
+            case `typealias`
+            case function
+            case method
+            case text
+            case webpage
+            case other
+        }
+
+        public var title: String
+        public var subTitle: String
+        public var uri: String
+        public var content: String
+        public var startLine: Int?
+        public var endLine: Int?
+        @FallbackDecoding<ReferenceKindFallback>
+        public var kind: Kind
+
+        public init(
+            title: String,
+            subTitle: String,
+            content: String,
+            uri: String,
+            startLine: Int?,
+            endLine: Int?,
+            kind: Kind
+        ) {
+            self.title = title
+            self.subTitle = subTitle
+            self.content = content
+            self.uri = uri
+            self.startLine = startLine
+            self.endLine = endLine
+            self.kind = kind
+        }
+    }
+
+    /// The role of a message.
+    @FallbackDecoding<ChatMessageRoleFallback>
+    public var role: Role
+
+    /// The content of the message, either the chat message, or a result of a function call.
+    public var content: String? {
+        didSet { tokensCount = nil }
+    }
+
+    /// A function call from the bot.
+    public var toolCalls: [ToolCall]? {
+        didSet { tokensCount = nil }
+    }
+
+    /// The function name of a reply to a function call.
+    public var name: String? {
+        didSet { tokensCount = nil }
+    }
+
+    /// The summary of a message that is used for display.
+    public var summary: String?
+
+    /// The id of the message.
+    public var id: ID
+
+    /// The number of tokens of this message.
+    public var tokensCount: Int?
+
+    /// The references of this message.
+    @FallbackDecoding<EmptyArray<Reference>>
+    public var references: [Reference]
+
+    /// Is the message considered empty.
+    public var isEmpty: Bool {
+        if let content, !content.isEmpty { return false }
+        if let toolCalls, !toolCalls.isEmpty { return false }
+        if let name, !name.isEmpty { return false }
+        return true
+    }
+
+    public init(
+        id: String = UUID().uuidString,
+        role: Role,
+        content: String?,
+        name: String? = nil,
+        toolCalls: [ToolCall]? = nil,
+        summary: String? = nil,
+        tokenCount: Int? = nil,
+        references: [Reference] = []
+    ) {
+        self.role = role
+        self.content = content
+        self.name = name
+        self.toolCalls = toolCalls
+        self.summary = summary
+        self.id = id
+        tokensCount = tokenCount
+        self.references = references
+    }
+}
+
+public struct ReferenceKindFallback: FallbackValueProvider {
+    public static var defaultValue: ChatMessage.Reference.Kind { .other }
+}
+
+public struct ChatMessageRoleFallback: FallbackValueProvider {
+    public static var defaultValue: ChatMessage.Role { .user }
+}
+

Tool/Sources/ChatBasic/ChatMessage.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import Foundation
 import OpenAIService
 import Parsing
@@ -14,7 +15,7 @@ public struct ChatContext {
     public struct RetrievedContent {
         public var document: ChatMessage.Reference
         public var priority: Int
-        
+
         public init(document: ChatMessage.Reference, priority: Int) {
             self.document = document
             self.priority = priority