Merge branch 'feature/tabby-strategy' into develop

Author: intitni

Core/Sources/CodeCompletionService/TabbyService.swift

@@ -30,21 +30,19 @@ extension TabbyService: CodeCompletionServiceType {
     func getCompletion(_ request: PromptStrategy) async throws -> AsyncStream<String> {
         let prefix = request.prefix.joined()
         let suffix = request.suffix.joined()
-        let clipboard = request.relevantCodeSnippets.map(\.content).joined(separator: "\n\n")
         let requestBody = RequestBody(
             language: request.language?.rawValue,
             segments: .init(
-                prefix: clipboard + "\n\n" + prefix,
+                prefix: prefix,
                 suffix: suffix,
-                clipboard: clipboard // it's seems to be ignored by Tabby
+                clipboard: ""
             ),
             temperature: temperature,
             seed: nil
         )
         CodeCompletionLogger.logger.logPrompt([
             (prefix, "prefix"),
             (suffix, "suffix"),
-            (clipboard, "clipboard"),
         ])
         return AsyncStream<String> { continuation in
             let task = Task {

Core/Sources/SuggestionService/RequestStrategies/TabbyRequestStrategy.swift

@@ -0,0 +1,62 @@
+import CopilotForXcodeKit
+import Foundation
+import Fundamental
+
+/// A special strategy for Tabby.
+struct TabbyRequestStrategy: RequestStrategy {
+    var sourceRequest: SuggestionRequest
+    var prefix: [String]
+    var suffix: [String]
+
+    var shouldSkip: Bool {
+        prefix.last?.trimmingCharacters(in: .whitespaces) == "}"
+    }
+
+    func createPrompt() -> Prompt {
+        Prompt(
+            sourceRequest: sourceRequest,
+            prefix: prefix,
+            suffix: suffix
+        )
+    }
+
+    func createRawSuggestionPostProcessor() -> some RawSuggestionPostProcessingStrategy {
+        NoOpRawSuggestionPostProcessingStrategy()
+    }
+
+    struct Prompt: PromptStrategy {
+        let systemPrompt: String = ""
+        var sourceRequest: SuggestionRequest
+        var prefix: [String]
+        var suffix: [String]
+        var filePath: String { sourceRequest.relativePath ?? sourceRequest.fileURL.path }
+        var relevantCodeSnippets: [RelevantCodeSnippet] { sourceRequest.relevantCodeSnippets }
+        var stopWords: [String] { [] }
+        var language: CodeLanguage? { sourceRequest.language }
+
+        var suggestionPrefix: SuggestionPrefix {
+            guard let prefix = prefix.last else { return .empty }
+            return .unchanged(prefix)
+        }
+
+        init(sourceRequest: SuggestionRequest, prefix: [String], suffix: [String]) {
+            self.sourceRequest = sourceRequest
+
+            let prefix = sourceRequest.relevantCodeSnippets.map { $0.content + "\n\n" }
+                + prefix
+
+            self.prefix = prefix
+            self.suffix = suffix
+        }
+
+        /// Not used by ``TabbyService``.
+        func createPrompt(
+            truncatedPrefix: [String],
+            truncatedSuffix: [String],
+            includedSnippets: [RelevantCodeSnippet]
+        ) -> [PromptMessage] {
+            []
+        }
+    }
+}
+

Core/Sources/SuggestionService/Service.swift

@@ -128,6 +128,15 @@ actor Service {
         suffix: [String]
     ) -> any RequestStrategy {
         let id = UserDefaults.shared.value(for: \.requestStrategyId)
+        if let type = CustomModelType(rawValue: UserDefaults.shared.value(for: \.chatModelId)),
+           type == .tabby
+        {
+            return TabbyRequestStrategy(
+                sourceRequest: sourceRequest,
+                prefix: prefix,
+                suffix: suffix
+            )
+        }
         let strategyOption = RequestStrategyOption(rawValue: id) ?? .default
         return strategyOption.strategy.init(
             sourceRequest: sourceRequest,