Merge branch 'feature/modification-task' into develop

intitni · intitni · commit 57f00a55e7fa · 2024-11-04T17:34:27.000+08:00
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -10,6 +10,7 @@ import Logger
 import ModificationBasic
 import PlusFeatureFlag
 import Preferences
+import PromptToCodeCustomization
 import SuggestionBasic
 import SuggestionInjector
 import Terminal
@@ -204,7 +205,7 @@ struct PseudoCommandHandler: CommandHandler {
         }
     }
 
-    func acceptPromptToCode() async {
+    func acceptModification() async {
         do {
             if UserDefaults.shared.value(for: \.alwaysAcceptSuggestionWithAccessibilityAPI) {
                 throw CancellationError()
@@ -271,23 +272,14 @@ struct PseudoCommandHandler: CommandHandler {
         }
     }
 
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async {
+    func presentModification(state: Shared<ModificationState>) async {
         do {
             @Dependency(\.workspacePool) var workspacePool
             let (_, filespace) = try await workspacePool
-                .fetchOrCreateWorkspaceAndFilespace(fileURL: source.documentURL)
+                .fetchOrCreateWorkspaceAndFilespace(fileURL: state.wrappedValue.source.documentURL)
             let store = await Service.shared.guiController.store
             await store.send(.promptToCodeGroup(.createPromptToCode(.init(
-                promptToCodeState: Shared(.init(
-                    source: source,
-                    snippets: IdentifiedArray(uniqueElements: snippets),
-                    instruction: "",
-                    extraSystemPrompt: "",
-                    isAttachedToTarget: true
-                )),
+                promptToCodeState: state,
                 indentSize: filespace.codeMetadata.indentSize ?? 4,
                 usesTabsForIndentation: filespace.codeMetadata.usesTabsForIndentation ?? false,
                 commandName: nil,
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift
@@ -17,7 +17,7 @@ public struct PromptToCodePanel {
             case textField
         }
 
-        @Shared public var promptToCodeState: PromptToCodeState
+        @Shared public var promptToCodeState: ModificationState
 
         public var id: URL { promptToCodeState.source.documentURL }
 
@@ -53,7 +53,7 @@ public struct PromptToCodePanel {
         }
 
         public init(
-            promptToCodeState: Shared<PromptToCodeState>,
+            promptToCodeState: Shared<ModificationState>,
             indentSize: Int,
             usesTabsForIndentation: Bool,
             commandName: String? = nil,
@@ -227,13 +227,13 @@ public struct PromptToCodePanel {
             case .acceptButtonTapped:
                 state.hasEnded = true
                 return .run { _ in
-                    await commandHandler.acceptPromptToCode()
+                    await commandHandler.acceptModification()
                     activatePreviousActiveXcode()
                 }
                 
             case .acceptAndContinueButtonTapped:
                 return .run { _ in
-                    await commandHandler.acceptPromptToCode()
+                    await commandHandler.acceptModification()
                     activateThisApp()
                 }
 
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift
@@ -713,7 +713,7 @@ extension PromptToCodePanelView {
 
 #Preview("Multiple Snippets") {
     PromptToCodePanelView(store: .init(initialState: .init(
-        promptToCodeState: Shared(PromptToCodeState(
+        promptToCodeState: Shared(ModificationState(
             source: .init(
                 language: CodeLanguage.builtIn(.swift),
                 documentURL: URL(
@@ -785,7 +785,7 @@ extension PromptToCodePanelView {
 
 #Preview("Detached With Long File Name") {
     PromptToCodePanelView(store: .init(initialState: .init(
-        promptToCodeState: Shared(PromptToCodeState(
+        promptToCodeState: Shared(ModificationState(
             source: .init(
                 language: CodeLanguage.builtIn(.swift),
                 documentURL: URL(
diff --git a/Tool/Sources/CommandHandler/CommandHandler.swift b/Tool/Sources/CommandHandler/CommandHandler.swift
@@ -1,7 +1,9 @@
+import ComposableArchitecture
 import Dependencies
 import Foundation
 import ModificationBasic
 import Preferences
+import PromptToCodeCustomization
 import SuggestionBasic
 import Toast
 import XcodeInspector
@@ -25,11 +27,8 @@ public protocol CommandHandler {
 
     // MARK: Modification
 
-    func acceptPromptToCode() async
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async
+    func acceptModification() async
+    func presentModification(state: Shared<ModificationState>) async
 
     // MARK: Custom Command
 
@@ -103,15 +102,12 @@ public final class UniversalCommandHandler: CommandHandler {
         await commandHandler.sendChatMessage(message)
     }
 
-    public func acceptPromptToCode() async {
-        await commandHandler.acceptPromptToCode()
+    public func acceptModification() async {
+        await commandHandler.acceptModification()
     }
 
-    public func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async {
-        await commandHandler.presentModification(source: source, snippets: snippets)
+    public func presentModification(state: Shared<ModificationState>) async {
+        await commandHandler.presentModification(state: state)
     }
 
     public func handleCustomCommand(_ command: CustomCommand) async {
@@ -164,14 +160,11 @@ struct NOOPCommandHandler: CommandHandler {
         print("send chat message")
     }
 
-    func acceptPromptToCode() async {
+    func acceptModification() async {
         print("accept prompt to code")
     }
 
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) {
+    func presentModification(state: Shared<ModificationState>) {
         print("present modification")
     }
 
diff --git a/Tool/Sources/ModificationBasic/ModificationState.swift b/Tool/Sources/ModificationBasic/ModificationState.swift
@@ -0,0 +1,79 @@
+import Foundation
+import IdentifiedCollections
+import SuggestionBasic
+
+public struct ModificationState: Equatable {
+    public typealias Source = ModificationAgentRequest.ModificationSource
+
+    public var source: Source
+    public var history: [ModificationHistoryNode] = []
+    public var snippets: IdentifiedArrayOf<ModificationSnippet> = []
+    public var isGenerating: Bool = false
+    public var instruction: String
+    public var extraSystemPrompt: String
+    public var isAttachedToTarget: Bool = true
+
+    public init(
+        source: Source,
+        history: [ModificationHistoryNode] = [],
+        snippets: IdentifiedArrayOf<ModificationSnippet>,
+        instruction: String,
+        extraSystemPrompt: String,
+        isAttachedToTarget: Bool
+    ) {
+        self.history = history
+        self.snippets = snippets
+        isGenerating = false
+        self.instruction = instruction
+        self.isAttachedToTarget = isAttachedToTarget
+        self.extraSystemPrompt = extraSystemPrompt
+        self.source = source
+    }
+
+    public init(
+        source: Source,
+        originalCode: String,
+        attachedRange: CursorRange,
+        instruction: String,
+        extraSystemPrompt: String
+    ) {
+        self.init(
+            source: source,
+            snippets: [
+                .init(
+                    startLineIndex: 0,
+                    originalCode: originalCode,
+                    modifiedCode: originalCode,
+                    description: "",
+                    error: nil,
+                    attachedRange: attachedRange
+                ),
+            ],
+            instruction: instruction,
+            extraSystemPrompt: extraSystemPrompt,
+            isAttachedToTarget: !attachedRange.isEmpty
+        )
+    }
+
+    public mutating func popHistory() {
+        if !history.isEmpty {
+            let last = history.removeLast()
+            snippets = last.snippets
+            instruction = last.instruction
+        }
+    }
+
+    public mutating func pushHistory() {
+        history.append(.init(snippets: snippets, instruction: instruction))
+        let oldSnippets = snippets
+        snippets = IdentifiedArrayOf()
+        for var snippet in oldSnippets {
+            snippet.originalCode = snippet.modifiedCode
+            snippet.modifiedCode = ""
+            snippet.description = ""
+            snippet.error = nil
+            snippets.append(snippet)
+        }
+    }
+}
+
diff --git a/Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift b/Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift
@@ -226,6 +226,7 @@ public actor ClaudeChatCompletionsService: ChatCompletionsStreamAPI, ChatComplet
         request.httpBody = try encoder.encode(requestBody)
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         request.setValue("2023-06-01", forHTTPHeaderField: "anthropic-version")
+        request.setValue("prompt-caching-2024-07-31", forHTTPHeaderField: "anthropic-beta")
         if !apiKey.isEmpty {
             request.setValue(apiKey, forHTTPHeaderField: "x-api-key")
         }
@@ -358,7 +359,7 @@ extension ClaudeChatCompletionsService.StreamDataChunk {
             }(),
             finishReason: delta?.stop_reason,
             usage: .init(
-                promptTokens: usage?.input_tokens ,
+                promptTokens: usage?.input_tokens,
                 completionTokens: usage?.output_tokens,
                 cachedTokens: usage?.cache_read_input_tokens,
                 otherUsage: {
@@ -376,6 +377,13 @@ extension ClaudeChatCompletionsService.StreamDataChunk {
 extension ClaudeChatCompletionsService.RequestBody {
     init(_ body: ChatCompletionsRequestBody) {
         model = body.model
+        let supportsPromptCache = if model.hasPrefix("claude-3-5-sonnet") || model
+            .hasPrefix("claude-3-opus") || model.hasPrefix("claude-3-haiku")
+        {
+            true
+        } else {
+            false
+        }
 
         var systemPrompts = [SystemPrompt]()
         var nonSystemMessages = [Message]()
@@ -409,7 +417,7 @@ extension ClaudeChatCompletionsService.RequestBody {
             switch message.role {
             case .system:
                 systemPrompts.append(.init(text: message.content, cache_control: {
-                    if message.cacheIfPossible {
+                    if message.cacheIfPossible, supportsPromptCache {
                         return .init()
                     } else {
                         return nil
@@ -425,7 +433,7 @@ extension ClaudeChatCompletionsService.RequestBody {
                 case .padMessageAndAppendToList, .joinMessage:
                     nonSystemMessages[nonSystemMessages.endIndex - 1].content.append(
                         .init(type: .text, text: message.content, cache_control: {
-                            if message.cacheIfPossible {
+                            if message.cacheIfPossible, supportsPromptCache {
                                 return .init()
                             } else {
                                 return nil
@@ -443,7 +451,7 @@ extension ClaudeChatCompletionsService.RequestBody {
                 case .padMessageAndAppendToList, .joinMessage:
                     nonSystemMessages[nonSystemMessages.endIndex - 1].content.append(
                         .init(type: .text, text: message.content, cache_control: {
-                            if message.cacheIfPossible {
+                            if message.cacheIfPossible, supportsPromptCache {
                                 return .init()
                             } else {
                                 return nil
diff --git a/Tool/Sources/PromptToCodeCustomization/PromptToCodeCustomization.swift b/Tool/Sources/PromptToCodeCustomization/PromptToCodeCustomization.swift
@@ -34,7 +34,7 @@ public protocol PromptToCodeCustomizedUI {
     )
 
     func callAsFunction<V: View>(
-        state: Shared<PromptToCodeState>,
+        state: Shared<ModificationState>,
         isInputFieldFocused: Binding<Bool>,
         @ViewBuilder view: @escaping (PromptToCodeCustomizedViews) -> V
     ) -> PromptToCodeCustomizationContextWrapper<V>
@@ -44,7 +44,7 @@ struct NoPromptToCodeCustomizedUI: PromptToCodeCustomizedUI {
     private class Context {}
 
     func callAsFunction<V: View>(
-        state: Shared<PromptToCodeState>,
+        state: Shared<ModificationState>,
         isInputFieldFocused: Binding<Bool>,
         @ViewBuilder view: @escaping (PromptToCodeCustomizedViews) -> V
     ) -> PromptToCodeCustomizationContextWrapper<V> {
@@ -59,78 +59,3 @@ struct NoPromptToCodeCustomizedUI: PromptToCodeCustomizedUI {
     }
 }
 
-public struct PromptToCodeState: Equatable {
-    public typealias Source = ModificationAgentRequest.ModificationSource
-
-    public var source: Source
-    public var history: [ModificationHistoryNode] = []
-    public var snippets: IdentifiedArrayOf<ModificationSnippet> = []
-    public var isGenerating: Bool = false
-    public var instruction: String
-    public var extraSystemPrompt: String
-    public var isAttachedToTarget: Bool = true
-
-    public init(
-        source: Source,
-        history: [ModificationHistoryNode] = [],
-        snippets: IdentifiedArrayOf<ModificationSnippet>,
-        instruction: String,
-        extraSystemPrompt: String,
-        isAttachedToTarget: Bool
-    ) {
-        self.history = history
-        self.snippets = snippets
-        isGenerating = false
-        self.instruction = instruction
-        self.isAttachedToTarget = isAttachedToTarget
-        self.extraSystemPrompt = extraSystemPrompt
-        self.source = source
-    }
-
-    public init(
-        source: Source,
-        originalCode: String,
-        attachedRange: CursorRange,
-        instruction: String,
-        extraSystemPrompt: String
-    ) {
-        self.init(
-            source: source,
-            snippets: [
-                .init(
-                    startLineIndex: 0,
-                    originalCode: originalCode,
-                    modifiedCode: originalCode,
-                    description: "",
-                    error: nil,
-                    attachedRange: attachedRange
-                ),
-            ],
-            instruction: instruction,
-            extraSystemPrompt: extraSystemPrompt,
-            isAttachedToTarget: !attachedRange.isEmpty
-        )
-    }
-
-    public mutating func popHistory() {
-        if !history.isEmpty {
-            let last = history.removeLast()
-            snippets = last.snippets
-            instruction = last.instruction
-        }
-    }
-
-    public mutating func pushHistory() {
-        history.append(.init(snippets: snippets, instruction: instruction))
-        let oldSnippets = snippets
-        snippets = IdentifiedArrayOf()
-        for var snippet in oldSnippets {
-            snippet.originalCode = snippet.modifiedCode
-            snippet.modifiedCode = ""
-            snippet.description = ""
-            snippet.error = nil
-            snippets.append(snippet)
-        }
-    }
-}
-
