refactor: Remove ChatGPT (#1802)

Author: valentinperignon

Mail/Views/AI Writer/AIModel.swift

@@ -99,7 +99,6 @@ extension AIModel {
             }
             let response = try await mailboxManager.apiFetcher.aiCreateConversation(
                 messages: conversation,
-                engine: UserDefaults.shared.aiEngine,
                 mailbox: mailboxManager.mailbox
             )
             handleAIResponse(response)
@@ -130,7 +129,6 @@ extension AIModel {
                 let response = try await mailboxManager.apiFetcher.aiShortcut(
                     contextId: contextId,
                     shortcut: shortcut,
-                    engine: UserDefaults.shared.aiEngine,
                     mailbox: mailboxManager.mailbox
                 )
                 handleAIResponse(response)
@@ -165,7 +163,6 @@ extension AIModel {
             let response = try await mailboxManager.apiFetcher.aiShortcutAndRecreateConversation(
                 shortcut: shortcut,
                 messages: conversation,
-                engine: UserDefaults.shared.aiEngine,
                 mailbox: mailboxManager.mailbox
             )
             handleAIResponse(response)

Mail/Views/Settings/General/SettingsAIEngineOptionView.swift renamed to Mail/Views/AI Writer/Prompt/AIEngineLabel.swift

@@ -1,6 +1,6 @@
 /*
  Infomaniak Mail - iOS App
- Copyright (C) 2022 Infomaniak Network SA
+ Copyright (C) 2024 Infomaniak Network SA
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -16,22 +16,20 @@
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import DesignSystem
 import MailResources
 import SwiftUI
 
-struct SettingsAIEngineOptionView: View {
+struct AIEngineLabel: View {
     var body: some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 0) {
-                SettingsSectionTitleView(title: MailResourcesStrings.Localizable.settingsAiEngineDescription)
-                AIEngineOptionView(matomoCategory: .settingsAIEngine)
-            }
+        HStack(spacing: IKPadding.mini) {
+            Text(MailResourcesStrings.Localizable.aiGenerationTitlePrompt)
+                .foregroundStyle(MailResourcesAsset.textPrimaryColor)
+            MailResourcesAsset.aiLogo.swiftUIImage
         }
-        .background(MailResourcesAsset.backgroundColor.swiftUIColor)
-        .navigationTitle(MailResourcesStrings.Localizable.aiPromptTitle)
     }
 }
 
 #Preview {
-    SettingsAIEngineOptionView()
+    AIEngineLabel()
 }

Mail/Views/AI Writer/Prompt/AIEngineOptionButton.swift

@@ -36,7 +36,6 @@ struct AIPromptView: View {
     // The focus is done thanks to UIKit, this allows the keyboard to appear more quickly
     @State private var hasFocusedEditor = false
     @State private var prompt = ""
-    @ModalState(context: ContextKeys.aiAlert) private var isShowingAIEngineChoice = false
     @State private var placeholderProposition = Constants.aiPromptExamples.randomElement() ?? MailResourcesStrings.Localizable
         .aiPromptExample1
 
@@ -89,7 +88,7 @@ struct AIPromptView: View {
             }
 
             HStack {
-                AIEngineOptionButton(isShowingAIEngineChoice: $isShowingAIEngineChoice)
+                AIEngineLabel()
 
                 Spacer()
 
@@ -119,9 +118,6 @@ struct AIPromptView: View {
                 matomo.track(eventWithCategory: .aiWriter, name: "dismissPromptWithoutGenerating")
             }
         }
-        .sheet(isPresented: $isShowingAIEngineChoice) {
-            PromptAIEngineOptionView()
-        }
         .matomoView(view: ["AI", "Prompt"])
     }
 }

Mail/Views/AI Writer/Prompt/AIPromptView.swift

@@ -31,7 +31,6 @@ import SwiftUI
 struct SettingsView: View {
     @InjectService private var accountManager: AccountManager
     @InjectService private var appLockHelper: AppLockHelper
-    @InjectService private var featureFlagsManageable: FeatureFlagsManageable
     @InjectService private var platformDetector: PlatformDetectable
     @InjectService private var myKSuiteStore: MyKSuiteStore
     @LazyInjectService private var matomo: MatomoUtils
@@ -40,7 +39,6 @@ struct SettingsView: View {
 
     @EnvironmentObject private var mainViewState: MainViewState
 
-    @AppStorage(UserDefaults.shared.key(.aiEngine)) private var aiEngine = DefaultPreferences.aiEngine
     @AppStorage(UserDefaults.shared.key(.threadDensity)) private var density = DefaultPreferences.threadDensity
     @AppStorage(UserDefaults.shared.key(.theme)) private var theme = DefaultPreferences.theme
     @AppStorage(UserDefaults.shared.key(.accentColor)) private var accentColor = DefaultPreferences.accentColor
@@ -147,14 +145,6 @@ struct SettingsView: View {
                         .buttonStyle(.plain)
                     }
 
-                    // MARK: AI Writer
-
-                    if featureFlagsManageable.isEnabled(.aiMailComposer) {
-                        SettingsSubMenuCell(title: MailResourcesStrings.Localizable.aiPromptTitle, subtitle: aiEngine.title) {
-                            SettingsAIEngineOptionView()
-                        }
-                    }
-
                     // MARK: Auto Advance
 
                     SettingsSubMenuCell(

Mail/Views/AI Writer/Prompt/PromptAIEngineOptionView.swift

@@ -137,17 +137,16 @@ public protocol MailApiExtendedFetchable {
 }
 
 public protocol MailApiAIFetchable {
-    func aiCreateConversation(messages: [AIMessage], output: AIOutputFormat, engine: AIEngine, mailbox: Mailbox) async throws
+    func aiCreateConversation(messages: [AIMessage], output: AIOutputFormat, mailbox: Mailbox) async throws
         -> AIConversationResponse
 
-    func aiShortcut(contextId: String, shortcut: AIShortcutAction, engine: AIEngine, mailbox: Mailbox) async throws
+    func aiShortcut(contextId: String, shortcut: AIShortcutAction, mailbox: Mailbox) async throws
         -> AIShortcutResponse
 
     func aiShortcutAndRecreateConversation(
         shortcut: AIShortcutAction,
         messages: [AIMessage],
         output: AIOutputFormat,
-        engine: AIEngine,
         mailbox: Mailbox
     ) async throws
         -> AIShortcutResponse

Mail/Views/Settings/General/AIEngineOptionView.swift

@@ -42,40 +42,36 @@ public extension MailApiFetcher {
     func aiCreateConversation(
         messages: [AIMessage],
         output: AIOutputFormat = .mail,
-        engine: AIEngine,
         mailbox: Mailbox
     ) async throws -> AIConversationResponse {
         try await perform(request: authenticatedAIRequest(
             .ai(mailbox: mailbox),
             method: .post,
-            parameters: AIConversationRequest(messages: messages, output: output, engine: engine)
+            parameters: AIConversationRequest(messages: messages, output: output)
         ))
     }
 
     func aiShortcut(
         contextId: String,
         shortcut: AIShortcutAction,
-        engine: AIEngine,
         mailbox: Mailbox
     ) async throws -> AIShortcutResponse {
         try await perform(request: authenticatedRequest(
             .aiShortcut(contextId: contextId, shortcut: shortcut.apiName, mailbox: mailbox),
-            method: .patch,
-            parameters: AIShortcutRequest(engine: engine)
+            method: .patch
         ))
     }
 
     func aiShortcutAndRecreateConversation(
         shortcut: AIShortcutAction,
         messages: [AIMessage],
         output: AIOutputFormat = .mail,
-        engine: AIEngine,
         mailbox: Mailbox
     ) async throws -> AIShortcutResponse {
         try await perform(request: authenticatedAIRequest(
             .aiShortcut(shortcut: shortcut.apiName, mailbox: mailbox),
             method: .post,
-            parameters: AIConversationRequest(messages: messages, output: output, engine: engine)
+            parameters: AIConversationRequest(messages: messages, output: output)
         ))
     }
 }