Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Report Metabot search failures as tool errors (#82941)

Andrei Simionescu859f67d39e8d
diff --git a/src/metabase/metabot/tools/search.clj b/src/metabase/metabot/tools/search.clj
index 54b1e52012c..02d0af04e93 100644
--- a/src/metabase/metabot/tools/search.clj
+++ b/src/metabase/metabot/tools/search.clj
@@ -592,24 +592,20 @@
(if-let [invalid (invalid-entity-types entity_types allowed-types)]
{:output (str "Invalid entity_types for " label ": " (pr-str (vec invalid))
". Allowed types: " (str/join ", " allowed-types) ".")}
- (try
- (let [results (search (merge {:semantic-queries semantic_queries
- :term-queries keyword_queries
- :entity-types (or (seq entity_types) (vec allowed-types))
- :metabot-id shared/*metabot-id*
- :limit (min max-search-limit
- (or limit default-search-limit))}
- search-opts))]
- {:output (format-search-output results)
- :structured-output {:result-type :search
- :data results
- :total_count (count results)}
- :data-parts [(streaming/search-results-part
- {:total_count (count results)
- :results (mapv search-result->item results)})]})
- (catch Exception e
- (log/error (str "Error in " label ": " (ex-message e)))
- {:output (str "Search failed: " (or (ex-message e) "Unknown error"))}))))
+ (let [results (search (merge {:semantic-queries semantic_queries
+ :term-queries keyword_queries
+ :entity-types (or (seq entity_types) (vec allowed-types))
+ :metabot-id shared/*metabot-id*
+ :limit (min max-search-limit
+ (or limit default-search-limit))}
+ search-opts))]
+ {:output (format-search-output results)
+ :structured-output {:result-type :search
+ :data results
+ :total_count (count results)}
+ :data-parts [(streaming/search-results-part
+ {:total_count (count results)
+ :results (mapv search-result->item results)})]})))
(def ^:private semantic-queries-schema
[:sequential {:error/message "must be an array of strings"}
diff --git a/test/metabase/metabot/tools/search_test.clj b/test/metabase/metabot/tools/search_test.clj
index 0d41d828e6a..006c8d3cd51 100644
--- a/test/metabase/metabot/tools/search_test.clj
+++ b/test/metabase/metabot/tools/search_test.clj
@@ -492,6 +492,12 @@
(is (thrown? Exception
(search/search-tool {:keyword_queries ["x"] :limit 0}))))))))
+(deftest ^:parallel search-failure-throws-test
+ (testing "an exception from search propagates out of the tool (BOT-2199)"
+ (mt/with-dynamic-fn-redefs [search/search (fn [_] (throw (ex-info "Search index unavailable" {})))]
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Search index unavailable"
+ (search/search-tool {:keyword_queries ["x"]}))))))
+
(deftest ^:parallel scalar-search-args-test
(testing "a scalar where an array is declared is rejected with guidance on how to repair the call"
(doseq [[field value message]