The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Setting to remove recent views from Metabot context (#75470)
Chris Trutere7ae478c4397
diff --git a/src/metabase/metabot/context.clj b/src/metabase/metabot/context.cljindex ea46d734dc0..7f425bba709 100644--- a/src/metabase/metabot/context.clj+++ b/src/metabase/metabot/context.clj@@ -11,6 +11,7 @@[metabase.lib.core :as lib][metabase.lib.schema :as lib.schema][metabase.metabot.config :as metabot.config]+ [metabase.metabot.settings :as metabot.settings][metabase.metabot.table-utils :as table-utils][metabase.premium-features.core :as premium-features][metabase.transforms-base.util :as transforms-base.u]@@ -299,23 +300,27 @@/dashboards before taking the top 5. Tables are not moderatable and always pass through."[context {:keys [metabot-id] :as _opts}](try- (let [recents (:recents (activity-feed/get-recents api/*current-user-id*- [:views :selections]- {:models [:card :dataset :metric :dashboard :table]}))- recents (cond->> recents- (verified-only? (get-metabot metabot-id))- filter-recents-to-verified)- processed-recents (mapv (fn [item]- (let [item-type- (case (:model item)- :card "question"- :dataset "model"- (name (:model item)))]- (-> item- (select-keys [:id :name :description])- (assoc :type item-type))))- (take 5 recents))]- (assoc context :user_recently_viewed processed-recents))+ ;; When disabled, strip any preexisting :user_recently_viewed so the setting guarantees recent+ ;; views never reach the prompt, even for a caller-supplied context that already carries the key.+ (if-not (metabot.settings/metabot-recent-views-enabled?)+ (dissoc context :user_recently_viewed)+ (assoc context :user_recently_viewed+ (let [recents (:recents (activity-feed/get-recents api/*current-user-id*+ [:views :selections]+ {:models [:card :dataset :metric :dashboard :table]}))+ recents (cond->> recents+ (verified-only? (get-metabot metabot-id))+ filter-recents-to-verified)]+ (mapv (fn [item]+ (let [item-type+ (case (:model item)+ :card "question"+ :dataset "model"+ (name (:model item)))]+ (-> item+ (select-keys [:id :name :description])+ (assoc :type item-type))))+ (take 5 recents)))))(catch Exception e(log/error e "Error adding recent views to metabot context")context)))diff --git a/src/metabase/metabot/settings.clj b/src/metabase/metabot/settings.cljindex 132f79c454f..dbb82ebcff1 100644--- a/src/metabase/metabot/settings.clj+++ b/src/metabase/metabot/settings.clj@@ -93,6 +93,13 @@(setting/get-value-of-type :boolean :embedded-metabot-enabled?)):export? true)+(defsetting metabot-recent-views-enabled?+ (deferred-tru "Whether the user''s recently viewed items are included in the Metabot system prompt.")+ :type :boolean+ :visibility :internal+ :default true+ :export? false)+;;; ------------------------------------------------- LLM Provider ------------------------------------------------(def ^:private direct-providersdiff --git a/test/metabase/metabot/context_test.clj b/test/metabase/metabot/context_test.cljindex acf2ebd2b54..f7a91f96ab8 100644--- a/test/metabase/metabot/context_test.clj+++ b/test/metabase/metabot/context_test.clj@@ -9,7 +9,8 @@[metabase.metabot.agent.user-context :as user-context][metabase.metabot.context :as context][metabase.metabot.table-utils :as table-utils]- [metabase.test :as mt]))+ [metabase.test :as mt]+ [toucan2.core :as t2]))(def ^:private users-native-query (lib/native-query meta/metadata-provider "SELECT * FROM users"))(def ^:private users-mbql-query (lib/query meta/metadata-provider (meta/table-metadata :users)))@@ -241,6 +242,24 @@(is (= #{"question" "model" "dashboard" "table"}(set (map :type recently-viewed)))))))))+(deftest recent-views-disabled-by-setting-test+ (testing "Omits recent views from context when metabot-recent-views-enabled? is false"+ (mt/with-test-user :rasta+ (t2/with-transaction [_conn nil {:rollback-only true}]+ (mt/with-temp [:model/Card {card-id :id} {:type "question" :name "my question"}+ :model/Table {table-id :id} {}]+ (recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Card card-id :view)+ (recent-views/update-users-recent-views! (mt/user->id :rasta) :model/Table table-id :selection)+ (mt/with-temporary-setting-values [metabot-recent-views-enabled? false]+ (let [ctx (context/create-context {})]+ (is (not (contains? ctx :user_recently_viewed))))))))))++(deftest recent-views-disabled-strips-preexisting-test+ (testing "Disabling the setting strips a caller-supplied :user_recently_viewed already in the context"+ (mt/with-temporary-setting-values [metabot-recent-views-enabled? false]+ (is (not (contains? (#'context/add-recent-views {:user_recently_viewed [{:id 1 :name "stale"}]} {})+ :user_recently_viewed))))))+(deftest recent-views-verified-content-filter-test(testing "Recent views filtering by verified content"(mt/with-test-user :rasta