Fix unit tests

Author: intitni

Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/ExtensionService.xcscheme

@@ -46,6 +46,9 @@
             reference = "container:TestPlan.xctestplan"
             default = "YES">
          </TestPlanReference>
+         <TestPlanReference
+            reference = "container:Pro/ProTestPlan.xctestplan">
+         </TestPlanReference>
       </TestPlans>
    </TestAction>
    <LaunchAction

Core/Package.swift

@@ -363,6 +363,7 @@ let package = Package(
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
                 .product(name: "FocusedCodeFinder", package: "Tool"),
+                .product(name: "AppMonitoring", package: "Tool"),
             ],
             path: "Sources/ChatContextCollectors/ActiveDocumentChatContextCollector"
         ),

Pro

@@ -99,13 +99,6 @@
         "name" : "SharedUIComponentsTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Pro",
-        "identifier" : "LicenseManagementTests",
-        "name" : "LicenseManagementTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Core",
@@ -120,13 +113,6 @@
         "name" : "ASTParserTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Pro",
-        "identifier" : "ChatTabPersistentTests",
-        "name" : "ChatTabPersistentTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Core",

TestPlan.xctestplan

@@ -74,11 +74,17 @@ public struct AgentFinish<Output: AgentOutputParsable> {
     }
 }
 
+extension AgentFinish.ReturnValue: Equatable where Output: Equatable {}
+
+extension AgentFinish: Equatable where Output: Equatable {}
+
 public enum AgentNextStep<Output: AgentOutputParsable> {
     case actions([AgentAction])
     case finish(AgentFinish<Output>)
 }
 
+extension AgentNextStep: Equatable where Output: Equatable {}
+
 public struct AgentScratchPad<Content: Equatable>: Equatable {
     public var content: Content
 

Tool/Sources/LangChain/Agent.swift

@@ -12,42 +12,42 @@ private struct FakeChatModel: ChatModel {
 }
 
 final class ChatAgentParseOutputTests: XCTestCase {
-    func test_parsing_well_formatted_final_answer() throws {
+    func test_parsing_well_formatted_final_answer() async throws {
         let finalAnswer = """
         Final Answer: The answer is 42.
         Because 42 is the answer to everything.
         """
 
         let agent = ChatAgent(chatModel: FakeChatModel(), tools: [], preferredLanguage: "")
-        let result = agent.parseOutput(finalAnswer)
+        let result = await agent.parseOutput(.init(role: .assistant, content: finalAnswer))
         XCTAssertEqual(result, .finish(.init(
-            returnValue: """
+            returnValue: .structured("""
             The answer is 42.
             Because 42 is the answer to everything.
-            """,
+            """),
             log: finalAnswer
         )))
     }
 
-    func test_parsing_final_answer_with_random_prefix() throws {
+    func test_parsing_final_answer_with_random_prefix() async throws {
         let finalAnswer = """
         Now I have the final answer.
         Final Answer: The answer is 42.
         Because 42 is the answer to everything.
         """
 
         let agent = ChatAgent(chatModel: FakeChatModel(), tools: [], preferredLanguage: "")
-        let result = agent.parseOutput(finalAnswer)
+        let result = await agent.parseOutput(.init(role: .assistant, content: finalAnswer))
         XCTAssertEqual(result, .finish(.init(
-            returnValue: """
+            returnValue: .structured("""
             The answer is 42.
             Because 42 is the answer to everything.
-            """,
+            """),
             log: finalAnswer
         )))
     }
 
-    func test_parsing_action() throws {
+    func test_parsing_action() async throws {
         let reply = """
         Question: How to setup langchain python?
         Thought: I am not familiar with langchain python, I should use the Search tool to find more information on how to set it up.
@@ -61,7 +61,7 @@ final class ChatAgentParseOutputTests: XCTestCase {
         """
 
         let agent = ChatAgent(chatModel: FakeChatModel(), tools: [], preferredLanguage: "")
-        let result = agent.parseOutput(reply)
+        let result = await agent.parseOutput(.init(role: .assistant, content: reply))
         XCTAssertEqual(result, .actions([
             .init(
                 toolName: "Search",
@@ -71,7 +71,7 @@ final class ChatAgentParseOutputTests: XCTestCase {
         ]))
     }
 
-    func test_parsing_broken_action_and_return_everything_ahead_of_it() {
+    func test_parsing_broken_action_and_return_everything_ahead_of_it() async {
         let reply = """
         Question: How to setup langchain python?
         Thought: I am not familiar with langchain python, I should use the Search tool to find more information on how to set it up.
@@ -82,26 +82,26 @@ final class ChatAgentParseOutputTests: XCTestCase {
         """
 
         let agent = ChatAgent(chatModel: FakeChatModel(), tools: [], preferredLanguage: "")
-        let result = agent.parseOutput(reply)
+        let result = await agent.parseOutput(.init(role: .assistant, content: reply))
         XCTAssertEqual(result, .finish(.init(
-            returnValue: """
+            returnValue: .structured("""
             Question: How to setup langchain python?
             Thought: I am not familiar with langchain python, I should use the Search tool to find more information on how to set it up.
-            """,
+            """),
             log: reply
         )))
     }
 
-    func test_parsing_simple_reply_that_does_not_follow_the_format() {
+    func test_parsing_simple_reply_that_does_not_follow_the_format() async {
         let reply = """
         The answer is 42.
         Because 42 is the answer to everything.
         """
 
         let agent = ChatAgent(chatModel: FakeChatModel(), tools: [], preferredLanguage: "")
-        let result = agent.parseOutput(reply)
+        let result = await agent.parseOutput(.init(role: .assistant, content: reply))
         XCTAssertEqual(result, .finish(.init(
-            returnValue: reply,
+            returnValue: .structured(reply),
             log: reply
         )))
     }

Tool/Tests/LangChainTests/ChatAgentTests.swift

@@ -139,7 +139,7 @@ final class ChatGPTStreamTests: XCTestCase {
             .init(name: $0.name, description: $0.description, parameters: $0.argumentSchema)
         }, "Function schema is not submitted")
     }
-    
+
     func test_handling_multiple_function_call() async throws {
         let memory = ConversationChatGPTMemory(systemPrompt: "system", systemMessageId: "s")
         let configuration = UserPreferenceChatGPTConfiguration().overriding()
@@ -339,29 +339,30 @@ extension ChatGPTStreamTests {
         }
 
         var name: String { "function" }
-        
+
         var description: String { "description" }
 
         var argumentSchema: JSONSchemaValue {
             [
-                .type: ["null"]
+                .type: ["null"],
             ]
         }
-        
-        var reportProgress: (String) async -> Void = { print($0) }
 
-        func prepare() async {
+        func prepare(reportProgress: @escaping ReportProgress) async {
             print("Function will be called")
         }
 
-        func call(arguments: Parameters) async throws -> String {
+        func call(
+            arguments: Parameters,
+            reportProgress: @escaping ReportProgress
+        ) async throws -> String {
             "Function is called."
         }
     }
 
     struct FunctionProvider: ChatGPTFunctionProvider {
         var functionCallStrategy: OpenAIService.FunctionCallStrategy? { nil }
-        
+
         var functions: [any ChatGPTFunction] { [EmptyFunction()] }
     }
 }