Merge pull request #252 from azooKey/fix/use_foundation_models_for_text_selection_magic_conversion

fix: 選択テキストに対するいい感じ変換でもFoundationModelsを利用

Author: nyanko3141592

Core/Sources/Core/MagicConversion/AIBackend.swift

@@ -32,4 +32,25 @@ public enum AIClient {
             return try await OpenAIClient.sendRequest(request, apiKey: apiKey, apiEndpoint: apiEndpoint, logger: logger)
         }
     }
+
+    public static func sendTextTransformRequest(
+        _ prompt: String,
+        backend: AIBackend,
+        modelName: String = "",
+        apiKey: String = "",
+        apiEndpoint: String = "",
+        logger: ((String) -> Void)? = nil
+    ) async throws -> String {
+        switch backend {
+        case .foundationModels:
+            return try await FoundationModelsClientCompat.sendTextTransformRequest(prompt, logger: logger)
+        case .openAI:
+            return try await OpenAIClient.sendTextTransformRequest(
+                prompt: prompt,
+                modelName: modelName,
+                apiKey: apiKey,
+                apiEndpoint: apiEndpoint
+            )
+        }
+    }
 }

Core/Sources/Core/MagicConversion/FoundationModelsClient.swift

@@ -88,6 +88,12 @@ public enum FoundationModelsClient {
         @Guide(description: "Array of prediction strings", .count(3...5))
         public var predictions: [String]
     }
+
+    @Generable
+    public struct TextTransformResponse: Codable {
+        @Guide(description: "The transformed text")
+        public var result: String
+    }
     #endif
 
     public static func sendRequest(_ request: OpenAIRequest, logger: ((String) -> Void)? = nil) async throws -> [String] {
@@ -138,6 +144,43 @@ public enum FoundationModelsClient {
         throw FoundationModelsError.unavailable(.frameworkNotAvailable)
         #endif
     }
+
+    public static func sendTextTransformRequest(_ prompt: String, logger: ((String) -> Void)? = nil) async throws -> String {
+        #if canImport(FoundationModels)
+        logger?("Foundation Models text transform request started")
+
+        let systemModel = SystemLanguageModel.default
+
+        switch systemModel.availability {
+        case .available:
+            break
+        case .unavailable(let reason):
+            logger?("Foundation Models not available: \(reason)")
+            let mappedReason: FoundationModelsAvailability.UnavailabilityReason = switch reason {
+            case .deviceNotEligible:
+                .deviceNotEligible
+            case .appleIntelligenceNotEnabled:
+                .appleIntelligenceNotEnabled
+            case .modelNotReady:
+                .modelNotReady
+            @unknown default:
+                .deviceNotEligible
+            }
+            throw FoundationModelsError.unavailable(mappedReason)
+        @unknown default:
+            logger?("Foundation Models availability unknown")
+            throw FoundationModelsError.unavailable(.deviceNotEligible)
+        }
+
+        let session = LanguageModelSession(model: systemModel)
+        let response = try await session.respond(to: prompt, generating: TextTransformResponse.self)
+
+        logger?("Received structured response for text transform")
+        return response.content.result.trimmingCharacters(in: .whitespacesAndNewlines)
+        #else
+        throw FoundationModelsError.unavailable(.frameworkNotAvailable)
+        #endif
+    }
 }
 
 // Compatibility wrapper for older macOS versions
@@ -157,4 +200,12 @@ public enum FoundationModelsClientCompat {
             throw FoundationModelsError.unavailable(.osVersionTooOld)
         }
     }
+
+    public static func sendTextTransformRequest(_ prompt: String, logger: ((String) -> Void)? = nil) async throws -> String {
+        if #available(macOS 26.0, *) {
+            return try await FoundationModelsClient.sendTextTransformRequest(prompt, logger: logger)
+        } else {
+            throw FoundationModelsError.unavailable(.osVersionTooOld)
+        }
+    }
 }

azooKeyMac/InputController/azooKeyMacInputController+SelectedTextTransform.swift

@@ -227,25 +227,43 @@ extension azooKeyMacInputController {
                     self.segmentsManager.appendDebugMessage("transformSelectedText: Created system prompt")
                 }
 
-                // Get API key from Config
+                let backend: AIBackend
+                switch aiBackend {
+                case .foundationModels:
+                    backend = .foundationModels
+                case .openAI:
+                    backend = .openAI
+                case .off:
+                    return
+                }
+
                 let apiKey = Config.OpenAiApiKey().value
-                guard !apiKey.isEmpty else {
-                    await MainActor.run {
-                        self.segmentsManager.appendDebugMessage("transformSelectedText: No OpenAI API key configured")
+                if backend == .openAI {
+                    guard !apiKey.isEmpty else {
+                        await MainActor.run {
+                            self.segmentsManager.appendDebugMessage("transformSelectedText: No OpenAI API key configured")
+                        }
+                        return
                     }
-                    return
                 }
 
                 await MainActor.run {
-                    self.segmentsManager.appendDebugMessage("transformSelectedText: API key found, making request")
+                    let message = backend == .openAI
+                        ? "transformSelectedText: API key found, making request"
+                        : "transformSelectedText: Using Foundation Models, making request"
+                    self.segmentsManager.appendDebugMessage(message)
                 }
 
                 let modelName = Config.OpenAiModelName().value
-                let result = try await OpenAIClient.sendTextTransformRequest(
-                    prompt: systemPrompt,
+                let result = try await AIClient.sendTextTransformRequest(
+                    systemPrompt,
+                    backend: backend,
                     modelName: modelName,
                     apiKey: apiKey,
-                    apiEndpoint: self.endpoint
+                    apiEndpoint: self.endpoint,
+                    logger: { [weak self] message in
+                        self?.segmentsManager.appendDebugMessage(message)
+                    }
                 )
 
                 await MainActor.run {
@@ -396,25 +414,40 @@ extension azooKeyMacInputController {
 
         systemPrompt += "\n\nUser instructions: \(prompt)"
 
-        // Get API key from Config
+        let backend: AIBackend
+        switch aiBackend {
+        case .foundationModels:
+            backend = .foundationModels
+        case .openAI:
+            backend = .openAI
+        case .off:
+            throw NSError(domain: "TransformationError", code: -1, userInfo: [NSLocalizedDescriptionKey: "AI transformation is not available. Please enable AI backend in preferences."])
+        }
+
         let apiKey = Config.OpenAiApiKey().value
-        guard !apiKey.isEmpty else {
-            await MainActor.run {
-                self.segmentsManager.appendDebugMessage("getTransformationPreview: No OpenAI API key configured")
+        if backend == .openAI {
+            guard !apiKey.isEmpty else {
+                await MainActor.run {
+                    self.segmentsManager.appendDebugMessage("getTransformationPreview: No OpenAI API key configured")
+                }
+                throw NSError(domain: "TransformationError", code: -2, userInfo: [NSLocalizedDescriptionKey: "OpenAI API key is missing. Please configure your API key in preferences."])
             }
-            throw NSError(domain: "TransformationError", code: -2, userInfo: [NSLocalizedDescriptionKey: "OpenAI API key is missing. Please configure your API key in preferences."])
         }
 
         await MainActor.run {
-            self.segmentsManager.appendDebugMessage("getTransformationPreview: Sending preview request to API")
+            self.segmentsManager.appendDebugMessage("getTransformationPreview: Sending preview request (\(backend.rawValue))")
         }
 
         let modelName = Config.OpenAiModelName().value
-        let result = try await OpenAIClient.sendTextTransformRequest(
-            prompt: systemPrompt,
+        let result = try await AIClient.sendTextTransformRequest(
+            systemPrompt,
+            backend: backend,
             modelName: modelName,
             apiKey: apiKey,
-            apiEndpoint: self.endpoint
+            apiEndpoint: self.endpoint,
+            logger: { [weak self] message in
+                self?.segmentsManager.appendDebugMessage(message)
+            }
         )
 
         await MainActor.run {