Update prompt of prompt to code feature

Author: intitni

Core/Sources/HostApp/FeatureSettings/PromptToCodeSettingsView.swift

@@ -8,13 +8,29 @@ struct PromptToCodeSettingsView: View {
         var suggestionCodeFontSize
         @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
         var acceptSuggestionWithAccessibilityAPI
+        @AppStorage(\.promptToCodeGenerateDescription)
+        var promptToCodeGenerateDescription
+        @AppStorage(\.promptToCodeGenerateDescriptionInUserPreferredLanguage)
+        var promptToCodeGenerateDescriptionInUserPreferredLanguage
         init() {}
     }
 
     @StateObject var settings = Settings()
 
     var body: some View {
         VStack(alignment: .center) {
+            Form {
+                Toggle(isOn: $settings.promptToCodeGenerateDescription) {
+                    Text("Generate Description")
+                }
+
+                Toggle(isOn: $settings.promptToCodeGenerateDescriptionInUserPreferredLanguage) {
+                    Text("Generate Description in user preferred language")
+                }
+            }
+
+            Divider()
+
             Text("Mirroring Settings of Suggestion Feature")
                 .foregroundColor(.white)
                 .padding(.vertical, 2)
@@ -41,7 +57,7 @@ struct PromptToCodeSettingsView: View {
 
                     Text("pt")
                 }.disabled(true)
-                
+
                 Divider()
 
                 Toggle(isOn: $settings.acceptSuggestionWithAccessibilityAPI) {

Core/Sources/Preferences/Keys.swift

@@ -17,14 +17,14 @@ public struct UserDefaultPreferenceKeys {
     }
 
     public var realtimeSuggestionToggle: RealtimeSuggestionToggle { .init() }
-    
+
     // MARK: - Suggestion Feature Provider
-    
+
     public struct SuggestionFeatureProviderKey: UserDefaultPreferenceKey {
         public let defaultValue: SuggestionFeatureProvider = .gitHubCopilot
         public let key = "SuggestionFeatureProvider"
     }
-    
+
     public var suggestionFeatureProvider: SuggestionFeatureProviderKey { .init() }
 
     // MARK: - Realtime Suggestion Debounce
@@ -261,6 +261,24 @@ public extension UserDefaultPreferenceKeys {
     var codeiumVerboseLog: CodeiumVerboseLog { .init() }
 }
 
+public extension UserDefaultPreferenceKeys {
+    struct PromptToCodeGenerateDescription: UserDefaultPreferenceKey {
+        public let defaultValue = true
+        public let key = "PromptToCodeGenerateDescription"
+    }
+
+    var promptToCodeGenerateDescription: PromptToCodeGenerateDescription { .init() }
+
+    struct PromptToCodeGenerateDescriptionInUserPreferredLanguage: UserDefaultPreferenceKey {
+        public let defaultValue = true
+        public let key = "PromptToCodeGenerateDescriptionInUserPreferredLanguage"
+    }
+
+    var promptToCodeGenerateDescriptionInUserPreferredLanguage: PromptToCodeGenerateDescriptionInUserPreferredLanguage {
+        .init()
+    }
+}
+
 // MARK: - UI
 
 public extension UserDefaultPreferenceKeys {

Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift

@@ -1,7 +1,8 @@
-import SuggestionModel
-import GitHubCopilotService
 import Foundation
+import GitHubCopilotService
 import OpenAIService
+import Preferences
+import SuggestionModel
 
 final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
     var service: (any ChatGPTServiceType)?
@@ -24,54 +25,137 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
         extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
         let userPreferredLanguage = UserDefaults.shared.value(for: \.chatGPTLanguage)
-        let textLanguage = userPreferredLanguage.isEmpty ? "" : "in \(userPreferredLanguage)"
-
-        let prompt = {
-            let indentRule = usesTabsForIndentation ? "\(indentSize) tabs" : "\(indentSize) spaces"
-            if code.isEmpty {
-                return """
-                You are a senior programer in writing code in \(language.rawValue).
-                
-                File url: \(fileURL)
-                
-                \(extraSystemPrompt ?? "")
+        let textLanguage = {
+            if !UserDefaults.shared
+                .value(for: \.promptToCodeGenerateDescriptionInUserPreferredLanguage)
+            {
+                return ""
+            }
+            return userPreferredLanguage.isEmpty ? "" : "in \(userPreferredLanguage)"
+        }()
 
-                Please write a piece of code that meets my requirements. The indentation should be \(
-                    indentRule
-                ).
+        let systemPrompt = {
+            switch language {
+            case .builtIn(.markdown), .plaintext:
+                if code.isEmpty {
+                    return """
+                    You are good at writing in \(language.rawValue).
+                    You are editing file: \(fileURL.lastPathComponent).
+                    \(extraSystemPrompt ?? "")
+                    """
+                } else {
+                    return """
+                    You are good at writing in \(language.rawValue).
+                    You are editing file: \(fileURL.lastPathComponent).
+                    \(extraSystemPrompt ?? "")
+                    """
+                }
+            default:
+                if code.isEmpty {
+                    return """
+                    You are a senior programer in writing in \(language.rawValue).
+                    You are editing file: \(fileURL.lastPathComponent).
+                    \(extraSystemPrompt ?? "")
+                    """
+                } else {
+                    return """
+                    You are a senior programer in writing in \(language.rawValue).
+                    You are editing file: \(fileURL.lastPathComponent).
+                    \(extraSystemPrompt ?? "")
+                    """
+                }
+            }
+        }()
 
-                Please reply to me start with the code block, followed by a clear and concise description in 1-3 sentences about what you did \(
-                    textLanguage
-                ).
+        let firstMessage: String? = {
+            if code.isEmpty { return nil }
+            switch language {
+            case .builtIn(.markdown), .plaintext:
+                return """
+                Content:\"""
+                \(code)
+                \"""
                 """
-            } else {
+            default:
                 return """
-                # Description
-                
-                You are a senior programer in writing code in \(language.rawValue).
-                
-                File url: \(fileURL)
-                
-                \(extraSystemPrompt ?? "")
-
-                Please mutate the following code fragment with my requirements. Keep the original indentation. Do not add comments unless told to.
-
-                Please reply to me start with the code block followed by a clear and concise description about what you did in 1-3 sentences \(
-                    textLanguage
-                ).
-
-                # Code
-                
-                ```\(language.rawValue)
+                Code:```
                 \(code)
                 ```
                 """
             }
         }()
 
-        let chatGPTService = ChatGPTService(systemPrompt: prompt, temperature: 0.3)
+        let formattedRequirement = requirement.split(separator: "\n")
+            .map { "    \($0)" }
+            .joined(separator: "\n")
+
+        let secondMessage: String = {
+            func generateDescription(index: Int) -> String {
+                return UserDefaults.shared.value(for: \.promptToCodeGenerateDescription)
+                    ? """
+                    \(index). After the code block, write a clear and concise description \
+                    in 1-3 sentences about what you did in step 1\(textLanguage).
+                    \(index + 1). Reply with the result.
+                    """
+                    : "\(index). Reply with the result."
+            }
+            switch language {
+            case .builtIn(.markdown), .plaintext:
+                if code.isEmpty {
+                    return """
+                    1. Write the content that meets my requirements.
+                        Requirements:\"""
+                        Write the content;
+                    \(formattedRequirement)
+                        \"""
+                    2. Embed the new content in a markdown code block.
+                    \(generateDescription(index: 3))
+                    """
+                } else {
+                    return """
+                    1. Update the content to meet my requirements.
+                        Requirements:\"""
+                    \(formattedRequirement)
+                        \"""
+                    2. Format the updated content to use the original indentation. Especially the first line.
+                    3. Embed the updated content in a markdown code block.
+                    \(generateDescription(index: 4))
+                    """
+                }
+            default:
+                if code.isEmpty {
+                    return """
+                    1. Write the code that meets my requirements.
+                        Requirements:\"""
+                        Write the code in \(language.rawValue);
+                    \(formattedRequirement)
+                        \"""
+                    2. Embed the code in a markdown code block.
+                    \(generateDescription(index: 3))
+                    """
+                } else {
+                    return """
+                    1. Update the code to meet my requirements.
+                        Requirements:\"""
+                        Update the code;
+                    \(formattedRequirement)
+                        \"""
+                    2. Format the updated code to use the original indentation. Especially the first line.
+                    3. Embed the updated code in a markdown code block.
+                    \(generateDescription(index: 4))
+                    """
+                }
+            }
+        }()
+
+        let chatGPTService = ChatGPTService(systemPrompt: systemPrompt, temperature: 0.3)
         service = chatGPTService
-        let stream = try await chatGPTService.send(content: requirement)
+        if let firstMessage {
+            await chatGPTService.mutateHistory { history in
+                history.append(.init(role: .user, content: firstMessage))
+            }
+        }
+        let stream = try await chatGPTService.send(content: secondMessage)
         return .init { continuation in
             Task {
                 var content = ""

Core/Sources/PromptToCodeService/PromptToCodeService.swift

@@ -10,12 +10,7 @@ public final class PromptToCodeService: ObservableObject {
             return designatedPromptToCodeAPI
         }
 
-        switch UserDefaults.shared.value(for: \.promptToCodeFeatureProvider) {
-        case .openAI:
-            return OpenAIPromptToCodeAPI()
-        case .githubCopilot:
-            return CopilotPromptToCodeAPI()
-        }
+        return OpenAIPromptToCodeAPI()
     }
 
     var runningAPI: PromptToCodeAPI?