Fix tests

Author: intitni

Core/Package.swift

@@ -131,7 +131,10 @@ let package = Package(
         .target(name: "Logger"),
         .target(
             name: "OpenAIService",
-            dependencies: [.product(name: "AsyncAlgorithms", package: "swift-async-algorithms")]
+            dependencies: [
+                "Logger",
+                .product(name: "AsyncAlgorithms", package: "swift-async-algorithms")
+            ]
         ),
         .testTarget(
             name: "OpenAIServiceTests",

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -1,6 +1,5 @@
 import AsyncAlgorithms
 import Foundation
-import Logger
 
 public protocol ChatGPTServiceType {
     func send(content: String, summary: String?) async throws -> AsyncThrowingStream<String, Error>
@@ -64,6 +63,7 @@ public actor ChatGPTService: ChatGPTServiceType, ObservableObject {
         didSet { objectWillChange.send() }
     }
 
+    var uuidGenerator: () -> String = { UUID().uuidString }
     var cancelTask: Cancellable?
     var buildCompletionStreamAPI: CompletionStreamAPIBuilder = OpenAICompletionStreamAPI.init
 
@@ -89,7 +89,12 @@ public actor ChatGPTService: ChatGPTServiceType, ObservableObject {
     ) async throws -> AsyncThrowingStream<String, Error> {
         guard !isReceivingMessage else { throw CancellationError() }
         guard let url = URL(string: endpoint) else { throw ChatGPTServiceError.endpointIncorrect }
-        let newMessage = ChatMessage(role: .user, content: content, summary: summary)
+        let newMessage = ChatMessage(
+            id: uuidGenerator(),
+            role: .user,
+            content: content,
+            summary: summary
+        )
         history.append(newMessage)
 
         let requestBody = CompletionRequestBody(
@@ -142,7 +147,6 @@ public actor ChatGPTService: ChatGPTServiceType, ObservableObject {
                         isReceivingMessage = false
                         continuation.finish(throwing: error)
                     } catch {
-                        Logger.service.error(error)
                         history.append(.init(
                             role: .assistant,
                             content: error.localizedDescription
@@ -178,6 +182,10 @@ extension ChatGPTService {
     func changeBuildCompletionStreamAPI(_ builder: @escaping CompletionStreamAPIBuilder) {
         buildCompletionStreamAPI = builder
     }
+    
+    func changeUUIDGenerator(_ generator: @escaping () -> String) {
+        uuidGenerator = generator
+    }
 
     func combineHistoryWithSystemPrompt() -> [CompletionRequestBody.Message] {
         if history.count > 4 {

Core/Sources/OpenAIService/CompletionStreamAPI.swift

@@ -11,12 +11,12 @@ protocol CompletionStreamAPI {
 }
 
 /// https://platform.openai.com/docs/api-reference/chat/create
-struct CompletionRequestBody: Codable {
-    struct Message: Codable {
+struct CompletionRequestBody: Codable, Equatable {
+    struct Message: Codable, Equatable {
         var role: ChatMessage.Role
         var content: String
     }
-    
+
     var model: String
     var messages: [Message]
     var temperature: Double?
@@ -76,7 +76,7 @@ struct OpenAICompletionStreamAPI: CompletionStreamAPI {
         guard let response = response as? HTTPURLResponse else {
             throw ChatGPTServiceError.responseInvalid
         }
-        
+
         guard response.statusCode == 200 else {
             let text = try await result.lines.reduce(into: "") { partialResult, current in
                 partialResult += current
@@ -113,5 +113,3 @@ struct OpenAICompletionStreamAPI: CompletionStreamAPI {
         )
     }
 }
-
-

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -110,6 +110,9 @@ public final class SuggestionWidgetController {
     }
 
     public nonisolated init() {
+        #warning("TODO: A test is initializing this class for unknown reasons, try a better way to avoid this.")
+        if ProcessInfo.processInfo.environment["IS_UNIT_TEST"] == "YES" { return }
+        
         Task { @MainActor in
             activeApplicationMonitorTask = Task { [weak self] in
                 var previousApp: NSRunningApplication?

Core/Tests/OpenAIServiceTests/ChatGPTServiceTests.swift

@@ -36,6 +36,11 @@ final class ChatGPTServiceTests: XCTestCase {
     func test_success() async throws {
         let service = ChatGPTService(systemPrompt: "system", apiKey: "Key")
         var apiKey = ""
+        var idCounter = 0
+        await service.changeUUIDGenerator {
+            defer { idCounter += 1 }
+            return "\(idCounter)"
+        }
         var requestBody: CompletionRequestBody?
         await service.changeBuildCompletionStreamAPI { _apiKey, _, _requestBody in
             apiKey = _apiKey
@@ -62,8 +67,8 @@ final class ChatGPTServiceTests: XCTestCase {
         XCTAssertEqual(all, ["hello", "my", "friends"], "Text stream is correct")
         let history = await service.history
         XCTAssertEqual(history, [
-            .init(role: .user, content: "Hello"),
-            .init(role: .assistant, content: "hellomyfriends", id: "1"),
+            .init(id: "0", role: .user, content: "Hello"),
+            .init(id: "1", role: .assistant, content: "hellomyfriends"),
         ], "History is correctly updated")
     }
 }

TestPlan.xctestplan

@@ -48,7 +48,7 @@
     },
     {
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Core",
         "identifier" : "OpenAIServiceTests",
         "name" : "OpenAIServiceTests"
       }