Hook up the service

Author: intitni

Core/Package.swift

@@ -161,6 +161,7 @@ let package = Package(
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
@@ -227,6 +228,7 @@ let package = Package(
         .target(
             name: "SuggestionWidget",
             dependencies: [
+                "PromptToCodeService",
                 "ChatGPTChatTab",
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "SharedUIComponents", package: "Tool"),

…oCodeService/OpenAIPromptToCodeAPI.swift …eService/OpenAIPromptToCodeService.swiftCore/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift renamed to Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift renamed to Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift

@@ -3,16 +3,16 @@ import OpenAIService
 import Preferences
 import SuggestionModel
 
-final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
+public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
     var service: (any ChatGPTServiceType)?
+    
+    public init() {}
 
-    func stopResponding() {
-        Task {
-            await service?.stopReceivingMessage()
-        }
+    public func stopResponding() {
+        Task { await service?.stopReceivingMessage() }
     }
 
-    func modifyCode(
+    public func modifyCode(
         code: String,
         language: CodeLanguage,
         indentSize: Int,

Core/Sources/PromptToCodeService/PreviewPromptToCodeService.swift

@@ -0,0 +1,52 @@
+import Foundation
+import SuggestionModel
+
+public final class PreviewPromptToCodeService: PromptToCodeServiceType {
+    public init() {}
+
+    public func modifyCode(
+        code: String,
+        language: CodeLanguage,
+        indentSize: Int,
+        usesTabsForIndentation: Bool,
+        requirement: String,
+        projectRootURL: URL,
+        fileURL: URL,
+        allCode: String,
+        extraSystemPrompt: String?,
+        generateDescriptionRequirement: Bool?
+    ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
+        return AsyncThrowingStream { continuation in
+            Task {
+                let code = """
+                struct Cat {
+                    var name: String
+                }
+
+                print("Hello world!")
+                """
+                let description = "I have created a struct `Cat`."
+                var resultCode = ""
+                var resultDescription = ""
+                do {
+                    for character in code {
+                        try await Task.sleep(nanoseconds: 50_000_000)
+                        resultCode.append(character)
+                        continuation.yield((resultCode, resultDescription))
+                    }
+                    for character in description {
+                        try await Task.sleep(nanoseconds: 50_000_000)
+                        resultDescription.append(character)
+                        continuation.yield((resultCode, resultDescription))
+                    }
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
+                }
+            }
+        }
+    }
+
+    public func stopResponding() {}
+}
+

Core/Sources/PromptToCodeService/PromptToCodeService.swift

@@ -0,0 +1,43 @@
+import Dependencies
+import Foundation
+import SuggestionModel
+
+public protocol PromptToCodeServiceType {
+    func modifyCode(
+        code: String,
+        language: CodeLanguage,
+        indentSize: Int,
+        usesTabsForIndentation: Bool,
+        requirement: String,
+        projectRootURL: URL,
+        fileURL: URL,
+        allCode: String,
+        extraSystemPrompt: String?,
+        generateDescriptionRequirement: Bool?
+    ) async throws -> AsyncThrowingStream<(code: String, description: String), Error>
+
+    func stopResponding()
+}
+
+public struct PromptToCodeServiceDependencyKey: DependencyKey {
+    public static let liveValue: PromptToCodeServiceType = PreviewPromptToCodeService()
+    public static let previewValue: PromptToCodeServiceType = PreviewPromptToCodeService()
+}
+
+public struct PromptToCodeServiceFactoryDependencyKey: DependencyKey {
+    public static let liveValue: () -> PromptToCodeServiceType = { OpenAIPromptToCodeService() }
+    public static let previewValue: () -> PromptToCodeServiceType = { PreviewPromptToCodeService() }
+}
+
+public extension DependencyValues {
+    var promptToCodeService: PromptToCodeServiceType {
+        get { self[PromptToCodeServiceDependencyKey.self] }
+        set { self[PromptToCodeServiceDependencyKey.self] = newValue }
+    }
+
+    var promptToCodeServiceFactory: () -> PromptToCodeServiceType {
+        get { self[PromptToCodeServiceFactoryDependencyKey.self] }
+        set { self[PromptToCodeServiceFactoryDependencyKey.self] = newValue }
+    }
+}
+

Core/Sources/PromptToCodeService/PromptToCodeServiceType.swift

@@ -83,20 +83,25 @@ enum ChatTabFactory {
                         prompt: prompt
                     )
                 case let .promptToCode(extraSystemPrompt, instruction, _, _):
-                    let service = PromptToCodeService(
+                    let service = OpenAIPromptToCodeService()
+
+                    let result = try await service.modifyCode(
                         code: prompt,
-                        selectionRange: .outOfScope,
                         language: .plaintext,
-                        identSize: 4,
+                        indentSize: 4,
                         usesTabsForIndentation: true,
+                        requirement: instruction ?? "Modify content.",
                         projectRootURL: .init(fileURLWithPath: "/"),
                         fileURL: .init(fileURLWithPath: "/"),
                         allCode: prompt,
                         extraSystemPrompt: extraSystemPrompt,
                         generateDescriptionRequirement: false
                     )
-                    try await service.modifyCode(prompt: instruction ?? "Modify content.")
-                    return service.code
+                    var code = ""
+                    for try await (newCode, _) in result {
+                        code = newCode
+                    }
+                    return code
                 }
             }
         )