Persist all conversation and conversation entry data

Delete all AI Chat history from settings page
brave · Oct 14, 2024 · bb6686b · bb6686b
1 parent 6aa4bc6
commit bb6686b
Show file tree

Hide file tree

Showing 34 changed files with 2,566 additions and 1,003 deletions.
diff --git a/browser/ai_chat/ai_chat_service_factory.cc b/browser/ai_chat/ai_chat_service_factory.cc
@@ -77,9 +77,10 @@ AIChatServiceFactory::BuildServiceInstanceForBrowserContext(
       (g_brave_browser_process->process_misc_metrics())
           ? g_brave_browser_process->process_misc_metrics()->ai_chat_metrics()
           : nullptr,
+      g_browser_process->os_crypt_async(),
       context->GetDefaultStoragePartition()
           ->GetURLLoaderFactoryForBrowserProcess(),
-      version_info::GetChannelString(chrome::GetChannel()));
+      version_info::GetChannelString(chrome::GetChannel()), context->GetPath());
 }
 
 }  // namespace ai_chat
diff --git a/browser/ai_chat/android/ai_chat_utils_android.cc b/browser/ai_chat/android/ai_chat_utils_android.cc
@@ -51,7 +51,7 @@ static void JNI_BraveLeoUtils_OpenLeoQuery(
   // Send the query
   conversation->MaybeUnlinkAssociatedContent();
   mojom::ConversationTurnPtr turn = mojom::ConversationTurn::New(
-      mojom::CharacterType::HUMAN, mojom::ActionType::QUERY,
+      std::nullopt, mojom::CharacterType::HUMAN, mojom::ActionType::QUERY,
       mojom::ConversationTurnVisibility::VISIBLE,
       base::android::ConvertJavaStringToUTF8(query), std::nullopt, std::nullopt,
       base::Time::Now(), std::nullopt, false);

diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc
@@ -20,6 +20,8 @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 
 #if BUILDFLAG(ENABLE_AI_CHAT)
+#include "brave/browser/ai_chat/ai_chat_service_factory.h"
+#include "brave/components/ai_chat/core/browser/ai_chat_service.h"
 #include "brave/components/ai_chat/core/browser/utils.h"
 #include "brave/components/ai_chat/core/common/features.h"
 #endif
@@ -102,7 +104,8 @@ void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings(
 #if BUILDFLAG(ENABLE_AI_CHAT)
 void BraveBrowsingDataRemoverDelegate::ClearAiChatHistory(base::Time begin_time,
                                                           base::Time end_time) {
-  // Handler for the Brave Leo History clearing.
-  // It is prepared for future implementation.
+  // Delete all Leo data
+  ai_chat::AIChatServiceFactory::GetForBrowserContext(profile_)
+      ->ClearAllHistory();
 }
 #endif  // BUILDFLAG(ENABLE_AI_CHAT)
diff --git a/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc b/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.cc
@@ -6,7 +6,9 @@
 #include "brave/browser/ui/webui/ai_chat/ai_chat_ui_page_handler.h"
 
 #include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "brave/browser/ai_chat/ai_chat_service_factory.h"
 #include "brave/browser/ui/side_panel/ai_chat/ai_chat_side_panel_utils.h"

diff --git a/browser/ui/webui/settings/brave_settings_leo_assistant_handler.cc b/browser/ui/webui/settings/brave_settings_leo_assistant_handler.cc
@@ -10,10 +10,12 @@
 #include <vector>
 
 #include "base/containers/contains.h"
+#include "brave/browser/ai_chat/ai_chat_service_factory.h"
 #include "brave/browser/brave_browser_process.h"
 #include "brave/browser/misc_metrics/process_misc_metrics.h"
 #include "brave/browser/ui/sidebar/sidebar_service_factory.h"
 #include "brave/components/ai_chat/core/browser/ai_chat_metrics.h"
+#include "brave/components/ai_chat/core/browser/ai_chat_service.h"
 #include "brave/components/ai_chat/core/common/pref_names.h"
 #include "brave/components/sidebar/browser/sidebar_item.h"
 #include "brave/components/sidebar/browser/sidebar_service.h"
@@ -141,13 +143,13 @@ void BraveLeoAssistantHandler::HandleGetLeoIconVisibility(
 
 void BraveLeoAssistantHandler::HandleResetLeoData(
     const base::Value::List& args) {
-  auto* service = sidebar::SidebarServiceFactory::GetForProfile(profile_);
+  auto* sidebar_service =
+      sidebar::SidebarServiceFactory::GetForProfile(profile_);
+
+  ShowLeoAssistantIconVisibleIfNot(sidebar_service);
 
-  ShowLeoAssistantIconVisibleIfNot(service);
-  profile_->GetPrefs()->ClearPref(ai_chat::prefs::kLastAcceptedDisclaimer);
-  g_brave_browser_process->process_misc_metrics()
-      ->ai_chat_metrics()
-      ->RecordReset();
+  ai_chat::AIChatServiceFactory::GetForBrowserContext(profile_)
+      ->ClearAllHistory();
 
   AllowJavascript();
 }

diff --git a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -84,7 +84,7 @@ void ChromeAutocompleteProviderClient::OpenLeo(const std::u16string& query) {
   // Send the query to the AIChat's backend.
   ai_chat::mojom::ConversationTurnPtr turn =
       ai_chat::mojom::ConversationTurn::New(
-          ai_chat::mojom::CharacterType::HUMAN,
+          std::nullopt, ai_chat::mojom::CharacterType::HUMAN,
           ai_chat::mojom::ActionType::QUERY,
           ai_chat::mojom::ConversationTurnVisibility::VISIBLE,
           base::UTF16ToUTF8(query) /* text */, std::nullopt /* selected_text */,

diff --git a/components/ai_chat/core/browser/BUILD.gn b/components/ai_chat/core/browser/BUILD.gn
@@ -17,8 +17,6 @@ static_library("browser") {
     "ai_chat_database.h",
     "ai_chat_feedback_api.cc",
     "ai_chat_feedback_api.h",
-    "ai_chat_storage_service.cc",
-    "ai_chat_storage_service.h",
     "ai_chat_metrics.cc",
     "ai_chat_metrics.h",
     "ai_chat_service.cc",
@@ -89,6 +87,8 @@ static_library("browser") {
     "//components/component_updater",
     "//components/component_updater:component_updater_paths",
     "//components/keyed_service/core",
+    "//components/os_crypt/async/browser",
+    "//components/os_crypt/async/common",
     "//components/os_crypt/sync:os_crypt",
     "//components/prefs",
     "//components/user_prefs",
@@ -164,6 +164,7 @@ if (!is_ios) {
       "//brave/components/skus/common:mojom",
       "//components/component_updater:component_updater_paths",
       "//components/component_updater:test_support",
+      "//components/os_crypt/async/browser:test_support",
       "//components/os_crypt/sync:test_support",
       "//components/prefs:test_support",
       "//components/sync_preferences:test_support",
@@ -172,6 +173,7 @@ if (!is_ios) {
       "//services/data_decoder/public/cpp:test_support",
       "//services/network:test_support",
       "//services/network/public/cpp:cpp",
+      "//sql:test_support",
       "//testing/gtest:gtest",
     ]
   }
@@ -184,12 +186,18 @@ source_set("test_support") {
     "engine/mock_engine_consumer.h",
     "engine/mock_remote_completion_client.cc",
     "engine/mock_remote_completion_client.h",
+    "mock_conversation_handler_observer.cc",
+    "mock_conversation_handler_observer.h",
+    "test_utils.cc",
+    "test_utils.h",
   ]
 
   deps = [
     "//brave/components/ai_chat/core/browser",
+    "//brave/components/ai_chat/core/common/mojom",
     "//services/network/public/cpp",
     "//testing/gmock",
+    "//testing/gtest",
   ]
 }
 

diff --git a/components/ai_chat/core/browser/DEPS b/components/ai_chat/core/browser/DEPS
@@ -1,7 +1,9 @@
 include_rules = [
+  "+components/os_crypt/async",
   "+services/data_decoder/public",
   "+services/network/public",
   "+services/network/test",
+  "+sql",
   "+third_party/skia/include",
   "+third_party/re2/src/re2",
   "+third_party/tflite",