Add ContextAwarePromptToCodeService

Author: intitni

Core/Package.swift

@@ -200,7 +200,9 @@ let package = Package(
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-            ]
+            ].pro([
+                "ProService",
+            ])
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
 

Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift

@@ -166,7 +166,7 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
 
         let secondMessage = """
         I will update the code you just provided.
-        It looks like every line has an indentation of \(indentation) spaces, I will keep that.
+        Every line has an indentation of \(indentation) spaces, I will keep that.
 
         What is your requirement?
         """
@@ -212,8 +212,14 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
             }
         }
     }
+}
+
+// MAKR: - Internal
 
-    func extractCodeAndDescription(from content: String) -> (code: String, description: String) {
+extension OpenAIPromptToCodeService {
+    func extractCodeAndDescription(from content: String)
+        -> (code: String, description: String)
+    {
         func extractCodeFromMarkdown(_ markdown: String) -> (code: String, endIndex: Int)? {
             let codeBlockRegex = try! NSRegularExpression(
                 pattern: #"```(?:\w+)?[\n]([\s\S]+?)[\n]```"#,
@@ -275,7 +281,8 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
         editorInformation: EditorInformation,
         source: PromptToCodeSource
     ) -> String {
-        guard let annotations = editorInformation.editorContent?.lineAnnotations else { return "" }
+        guard let annotations = editorInformation.editorContent?.lineAnnotations
+        else { return "" }
         let all = annotations
             .lazy
             .filter { annotation in

Core/Sources/PromptToCodeService/PromptToCodeServiceType.swift

@@ -42,11 +42,6 @@ public struct PromptToCodeServiceDependencyKey: DependencyKey {
     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] }
@@ -59,3 +54,57 @@ public extension DependencyValues {
     }
 }
 
+#if canImport(ContextAwarePromptToCodeService)
+
+import ContextAwarePromptToCodeService
+
+extension ContextAwarePromptToCodeService: PromptToCodeServiceType {
+    public func modifyCode(
+        code: String,
+        requirement: String,
+        source: PromptToCodeSource,
+        isDetached: Bool,
+        extraSystemPrompt: String?,
+        generateDescriptionRequirement: Bool?
+    ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
+        try await modifyCode(
+            code: code,
+            requirement: requirement,
+            source: ContextAwarePromptToCodeService.Source(
+                language: source.language,
+                documentURL: source.documentURL,
+                projectRootURL: source.projectRootURL,
+                allCode: source.allCode,
+                range: source.range
+            ),
+            isDetached: isDetached,
+            extraSystemPrompt: extraSystemPrompt,
+            generateDescriptionRequirement: generateDescriptionRequirement
+        )
+    }
+}
+
+public struct PromptToCodeServiceFactoryDependencyKey: DependencyKey {
+    public static let liveValue: () -> PromptToCodeServiceType = {
+        ContextAwarePromptToCodeService()
+    }
+
+    public static let previewValue: () -> PromptToCodeServiceType = {
+        PreviewPromptToCodeService()
+    }
+}
+
+#else
+
+public struct PromptToCodeServiceFactoryDependencyKey: DependencyKey {
+    public static let liveValue: () -> PromptToCodeServiceType = {
+        OpenAIPromptToCodeService()
+    }
+
+    public static let previewValue: () -> PromptToCodeServiceType = {
+        PreviewPromptToCodeService()
+    }
+}
+
+#endif
+