Merge branch 'feature/extra-system-prompt-in-prompt-to-code' into develop

intitni · intitni · commit 4d7635a45621 · 2023-04-22T22:04:53.000+08:00
diff --git a/Copilot for Xcode/CustomCommandView.swift b/Copilot for Xcode/CustomCommandView.swift
@@ -176,10 +176,10 @@ struct EditCustomCommandView: View {
             self.systemPrompt = systemPrompt ?? ""
             self.prompt = prompt ?? ""
             continuousMode = false
-        case let .promptToCode(prompt, continuousMode):
+        case let .promptToCode(extraSystemPrompt, prompt, continuousMode):
             commandType = .promptToCode
             self.prompt = prompt ?? ""
-            systemPrompt = ""
+            systemPrompt = extraSystemPrompt ?? ""
             self.continuousMode = continuousMode ?? false
         case .none:
             commandType = .chatWithSelection
@@ -214,6 +214,7 @@ struct EditCustomCommandView: View {
                     systemPromptTextField(title: "Extra System Prompt")
                     promptTextField
                 case .promptToCode:
+                    systemPromptTextField(title: "Extra System Prompt")
                     promptTextField
                     continuousModeToggle
                 case .customChat:
@@ -244,7 +245,11 @@ struct EditCustomCommandView: View {
                                 prompt: prompt
                             )
                         case .promptToCode:
-                            return .promptToCode(prompt: prompt, continuousMode: continuousMode)
+                            return .promptToCode(
+                                extraSystemPrompt: systemPrompt,
+                                prompt: prompt,
+                                continuousMode: continuousMode
+                            )
                         case .customChat:
                             return .customChat(systemPrompt: systemPrompt, prompt: prompt)
                         }
@@ -335,7 +340,11 @@ struct CustomCommandView_Preview: PreviewProvider {
                 ),
                 .init(
                     name: "Refactor Code",
-                    feature: .promptToCode(prompt: "Refactor", continuousMode: false)
+                    feature: .promptToCode(
+                        extraSystemPrompt: nil,
+                        prompt: "Refactor",
+                        continuousMode: false
+                    )
                 ),
                 .init(
                     name: "Tell Me A Joke",
diff --git a/Copilot for Xcode/SettingsView.swift b/Copilot for Xcode/SettingsView.swift
@@ -165,7 +165,7 @@ struct SettingsView: View {
                         case .openAI:
                             Text("OpenAI").tag($0)
                         case .githubCopilot:
-                            Text("GitHub Copilot (Less Accurate)").tag($0)
+                            Text("GitHub Copilot (Implement for experiment, barely works, don't use.)").tag($0)
                         }
                     }
                 } label: {
diff --git a/Core/Sources/Preferences/CustomCommand.swift b/Core/Sources/Preferences/CustomCommand.swift
@@ -5,7 +5,7 @@ public struct CustomCommand: Codable {
     ///
     /// Keep everything optional so nothing will break when the format changes.
     public enum Feature: Codable {
-        case promptToCode(prompt: String?, continuousMode: Bool?)
+        case promptToCode(extraSystemPrompt: String?, prompt: String?, continuousMode: Bool?)
         case chatWithSelection(extraSystemPrompt: String?, prompt: String?)
         case customChat(systemPrompt: String?, prompt: String?)
     }
diff --git a/Core/Sources/Preferences/Keys.swift b/Core/Sources/Preferences/Keys.swift
@@ -236,6 +236,7 @@ public extension UserDefaultPreferenceKeys {
             .init(
                 name: "Add Documentation to Selection",
                 feature: .promptToCode(
+                    extraSystemPrompt: nil,
                     prompt: "Add documentation on top of the code. Use triple slash if the language supports it.",
                     continuousMode: false
                 )
diff --git a/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift
@@ -18,7 +18,8 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
         let copilotService = CopilotSuggestionService(projectRootURL: projectRootURL)
         let relativePath = {
@@ -36,14 +37,25 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
             return filePath
         }()
         
-        let comment = """
-        // update the following code, \(requirement.split(separator: "\n").joined(separator: " ")).
-        \(code.split(separator: "\n").map { "//\($0)" }.joined(separator: "\n"))
+        func convertToComment(_ s: String) -> String {
+            s.split(separator: "\n").map { "// \($0)" }.joined(separator: "\n")
+        }
         
+        let comment = """
+        // A file to refactor the following code
+        //
+        // Code:
+        // ```
+        \(convertToComment(code))
+        // ```
+        //
+        // Requirements:
+        \(convertToComment((extraSystemPrompt ?? "\n") + requirement))
+        //
         
         
-        // Path: \(relativePath)
         
+        // end of file
         """
         let lineCount = comment.breakLines().count
 
@@ -53,7 +65,7 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
                     let result = try await copilotService.getCompletions(
                         fileURL: fileURL,
                         content: comment,
-                        cursorPosition: .init(line: lineCount - 4, character: 0),
+                        cursorPosition: .init(line: lineCount - 3, character: 0),
                         tabSize: indentSize,
                         indentSize: indentSize,
                         usesTabsForIndentation: usesTabsForIndentation,
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift
@@ -20,7 +20,8 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
         let userPreferredLanguage = UserDefaults.shared.value(for: \.chatGPTLanguage)
         let textLanguage = userPreferredLanguage.isEmpty ? "" : "in \(userPreferredLanguage)"
@@ -38,25 +39,33 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
                 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
                 ).
+                
+                \(extraSystemPrompt ?? "")
                 """
             } else {
                 return """
+                # Description
+                
                 You are a senior programer in writing code in \(language.rawValue).
 
                 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
                 ).
+                
+                \(extraSystemPrompt ?? "")
 
+                # Code
+                
                 ```
                 \(code)
                 ```
                 """
             }
         }()
 
-        let chatGPTService = ChatGPTService(systemPrompt: prompt, temperature: 0.5)
+        let chatGPTService = ChatGPTService(systemPrompt: prompt, temperature: 0.3)
         service = chatGPTService
         let stream = try await chatGPTService.send(content: requirement)
         return .init { continuation in
diff --git a/Core/Sources/PromptToCodeService/PromptToCodeService.swift b/Core/Sources/PromptToCodeService/PromptToCodeService.swift
@@ -53,6 +53,7 @@ public final class PromptToCodeService: ObservableObject {
     public var projectRootURL: URL
     public var fileURL: URL
     public var allCode: String
+    public var extraSystemPrompt: String?
 
     public init(
         code: String,
@@ -62,7 +63,8 @@ public final class PromptToCodeService: ObservableObject {
         usesTabsForIndentation: Bool,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String? = nil
     ) {
         self.code = code
         self.selectionRange = selectionRange
@@ -73,6 +75,7 @@ public final class PromptToCodeService: ObservableObject {
         self.fileURL = fileURL
         self.allCode = allCode
         self.history = .empty
+        self.extraSystemPrompt = extraSystemPrompt
     }
 
     public func modifyCode(prompt: String) async throws {
@@ -93,7 +96,8 @@ public final class PromptToCodeService: ObservableObject {
                 requirement: prompt,
                 projectRootURL: projectRootURL,
                 fileURL: fileURL,
-                allCode: allCode
+                allCode: allCode,
+                extraSystemPrompt: extraSystemPrompt
             )
             for try await fragment in stream {
                 code = fragment.code
@@ -145,7 +149,8 @@ protocol PromptToCodeAPI {
         requirement: String,
         projectRootURL: URL,
         fileURL: URL,
-        allCode: String
+        allCode: String,
+        extraSystemPrompt: String?
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error>
 
     func stopResponding()
diff --git a/Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift b/Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift
@@ -3,13 +3,18 @@ import PromptToCodeService
 import SuggestionWidget
 
 extension PromptToCodeProvider {
-    convenience init(service: PromptToCodeService, onClosePromptToCode: @escaping () -> Void) {
+    convenience init(
+        service: PromptToCodeService,
+        name: String?,
+        onClosePromptToCode: @escaping () -> Void
+    ) {
         self.init(
             code: service.code,
             language: service.language.rawValue,
             description: "",
             startLineIndex: service.selectionRange.start.line,
-            startLineColumn: service.selectionRange.start.character
+            startLineColumn: service.selectionRange.start.character,
+            name: name
         )
 
         var cancellables = Set<AnyCancellable>()
@@ -44,18 +49,18 @@ extension PromptToCodeProvider {
                 }
             }
         }
-        
+
         onStopRespondingTap = {
             service.stopResponding()
         }
-        
+
         onAcceptSuggestionTapped = {
             Task { @ServiceActor in
                 let handler = PseudoCommandHandler()
                 await handler.acceptSuggestion()
             }
         }
-        
+
         onContinuousToggleClick = {
             service.isContinuous.toggle()
         }
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -91,7 +91,9 @@ final class WidgetDataSource {
         selectionRange: CursorRange,
         language: CopilotLanguage,
         identSize: Int = 4,
-        usesTabsForIndentation: Bool = false
+        usesTabsForIndentation: Bool = false,
+        extraSystemPrompt: String?,
+        name: String?
     ) async -> PromptToCodeService {
         let build = {
             let service = PromptToCodeService(
@@ -102,10 +104,12 @@ final class WidgetDataSource {
                 usesTabsForIndentation: usesTabsForIndentation,
                 projectRootURL: projectURL,
                 fileURL: url,
-                allCode: allCode
+                allCode: allCode,
+                extraSystemPrompt: extraSystemPrompt
             )
             let provider = PromptToCodeProvider(
                 service: service,
+                name: name,
                 onClosePromptToCode: { [weak self] in
                     self?.removePromptToCode(for: url)
                     let presenter = PresentInWindowSuggestionPresenter()
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -248,7 +248,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     func promptToCode(editor: EditorContent) async throws -> UpdatedContent? {
         Task {
             do {
-                try await presentPromptToCode(editor: editor, prompt: nil, isContinuous: false)
+                try await presentPromptToCode(
+                    editor: editor,
+                    extraSystemPrompt: nil,
+                    prompt: nil,
+                    isContinuous: false,
+                    name: nil
+                )
             } catch {
                 presenter.presentError(error)
             }
@@ -293,19 +299,23 @@ extension WindowBaseCommandHandler {
                 extraSystemPrompt: nil,
                 sendingMessageImmediately: prompt
             )
-        case let .promptToCode(prompt, continuousMode):
+        case let .promptToCode(extraSystemPrompt, prompt, continuousMode):
             try await presentPromptToCode(
                 editor: editor,
+                extraSystemPrompt: extraSystemPrompt,
                 prompt: prompt,
-                isContinuous: continuousMode ?? false
+                isContinuous: continuousMode ?? false,
+                name: command.name
             )
         }
     }
 
     func presentPromptToCode(
         editor: EditorContent,
+        extraSystemPrompt: String?,
         prompt: String?,
-        isContinuous: Bool
+        isContinuous: Bool,
+        name: String?
     ) async throws {
         presenter.markAsProcessing(true)
         defer { presenter.markAsProcessing(false) }
@@ -323,7 +333,7 @@ extension WindowBaseCommandHandler {
             guard var selection = editor.selections.last,
                   selection.start != selection.end
             else { return ("", .cursor(editor.cursorPosition)) }
-            
+
             let isMultipleLine = selection.start.line != selection.end.line
             let isSpaceOnlyBeforeStartPositionOnTheSameLine = {
                 guard selection.start.line >= 0, selection.start.line < editor.lines.count else {
@@ -333,10 +343,12 @@ extension WindowBaseCommandHandler {
                 guard selection.start.character > 0, selection.start.character < line.count else {
                     return false
                 }
-                let substring = line[line.startIndex..<line.index(line.startIndex, offsetBy: selection.start.character)]
-                return substring.allSatisfy({ $0.isWhitespace })
+                let substring =
+                    line[line.startIndex..<line
+                        .index(line.startIndex, offsetBy: selection.start.character)]
+                return substring.allSatisfy { $0.isWhitespace }
             }()
-            
+
             if isMultipleLine || isSpaceOnlyBeforeStartPositionOnTheSameLine {
                 // when there are multiple lines start from char 0 so that it can keep the
                 // indentation.
@@ -357,11 +369,13 @@ extension WindowBaseCommandHandler {
             selectedCode: code,
             allCode: editor.content,
             selectionRange: selection,
-            language: codeLanguage
+            language: codeLanguage,
+            extraSystemPrompt: extraSystemPrompt,
+            name: name
         )
 
         promptToCode.isContinuous = isContinuous
-        if let prompt {
+        if let prompt, !prompt.isEmpty {
             Task { try await promptToCode.modifyCode(prompt: prompt) }
         }
 
@@ -402,7 +416,7 @@ extension WindowBaseCommandHandler {
             ```
             """
         }()
-        
+
         if let extraSystemPrompt {
             systemPrompt += "\n\(extraSystemPrompt)"
         }
diff --git a/Core/Sources/SuggestionWidget/PromptToCodeProvider.swift b/Core/Sources/SuggestionWidget/PromptToCodeProvider.swift
@@ -3,6 +3,7 @@ import SwiftUI
 
 public final class PromptToCodeProvider: ObservableObject {
     let id = UUID()
+    let name: String?
     
     @Published public var code: String
     @Published public var language: String
@@ -33,6 +34,7 @@ public final class PromptToCodeProvider: ObservableObject {
         errorMessage: String = "",
         canRevert: Bool = false,
         isContinuous: Bool = false,
+        name: String? = nil,
         onRevertTapped: @escaping () -> Void = {},
         onStopRespondingTap: @escaping () -> Void = {},
         onCancelTapped: @escaping () -> Void = {},
@@ -50,6 +52,7 @@ public final class PromptToCodeProvider: ObservableObject {
         self.errorMessage = errorMessage
         self.canRevert = canRevert
         self.isContinuous = isContinuous
+        self.name = name
         self.onRevertTapped = onRevertTapped
         self.onStopRespondingTap = onStopRespondingTap
         self.onCancelTapped = onCancelTapped
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ struct SettingsView: View {`
`165`	`165`	`case .openAI:`
`166`	`166`	`Text("OpenAI").tag($0)`
`167`	`167`	`case .githubCopilot:`
`168`		`- Text("GitHub Copilot (Less Accurate)").tag($0)`
	`168`	`+ Text("GitHub Copilot (Implement for experiment, barely works, don't use.)").tag($0)`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`} label: {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public struct CustomCommand: Codable {`
`5`	`5`	`///`
`6`	`6`	`/// Keep everything optional so nothing will break when the format changes.`
`7`	`7`	`public enum Feature: Codable {`
`8`		`- case promptToCode(prompt: String?, continuousMode: Bool?)`
	`8`	`+ case promptToCode(extraSystemPrompt: String?, prompt: String?, continuousMode: Bool?)`
`9`	`9`	`case chatWithSelection(extraSystemPrompt: String?, prompt: String?)`
`10`	`10`	`case customChat(systemPrompt: String?, prompt: String?)`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ public extension UserDefaultPreferenceKeys {`
`236`	`236`	`.init(`
`237`	`237`	`name: "Add Documentation to Selection",`
`238`	`238`	`feature: .promptToCode(`
	`239`	`+ extraSystemPrompt: nil,`
`239`	`240`	`prompt: "Add documentation on top of the code. Use triple slash if the language supports it.",`
`240`	`241`	`continuousMode: false`
`241`	`242`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,18 @@ import PromptToCodeService`
`3`	`3`	`import SuggestionWidget`
`4`	`4`
`5`	`5`	`extension PromptToCodeProvider {`
`6`		`- convenience init(service: PromptToCodeService, onClosePromptToCode: @escaping () -> Void) {`
	`6`	`+ convenience init(`
	`7`	`+ service: PromptToCodeService,`
	`8`	`+ name: String?,`
	`9`	`+ onClosePromptToCode: @escaping () -> Void`
	`10`	`+ ) {`
`7`	`11`	`self.init(`
`8`	`12`	`code: service.code,`
`9`	`13`	`language: service.language.rawValue,`
`10`	`14`	`description: "",`
`11`	`15`	`startLineIndex: service.selectionRange.start.line,`
`12`		`- startLineColumn: service.selectionRange.start.character`
	`16`	`+ startLineColumn: service.selectionRange.start.character,`
	`17`	`+ name: name`
`13`	`18`	`)`
`14`	`19`
`15`	`20`	`var cancellables = Set<AnyCancellable>()`
`@@ -44,18 +49,18 @@ extension PromptToCodeProvider {`
`44`	`49`	`}`
`45`	`50`	`}`
`46`	`51`	`}`
`47`		`-`
	`52`	`+`
`48`	`53`	`onStopRespondingTap = {`
`49`	`54`	`service.stopResponding()`
`50`	`55`	`}`
`51`		`-`
	`56`	`+`
`52`	`57`	`onAcceptSuggestionTapped = {`
`53`	`58`	`Task { @ServiceActor in`
`54`	`59`	`let handler = PseudoCommandHandler()`
`55`	`60`	`await handler.acceptSuggestion()`
`56`	`61`	`}`
`57`	`62`	`}`
`58`		`-`
	`63`	`+`
`59`	`64`	`onContinuousToggleClick = {`
`60`	`65`	`service.isContinuous.toggle()`
`61`	`66`	`}`