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
Misc cleanup in Metabot clojure code (#67701)
Noah Moss6cef5f80d0be
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.cljindex a9412781869..0befe07c158 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/api/metabot.clj@@ -88,7 +88,7 @@[:sample {:optional true} :boolean][:model {:optional true} [:enum "metric" "model"]][:model_id {:optional true} pos-int?]]]- (let [offset (if sample nil (request/offset))+ (let [offset (when-not sample (request/offset))rand-fn (case (mdb/db-type):postgres :random:rand)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.cljindex 7cbfc2a9321..d258dc49793 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/suggested_prompts.clj@@ -32,7 +32,7 @@{:limit 20})(defn generate-sample-prompts- "Generate suggested propmpts for instance of Metabot."+ "Generate suggested prompts for instance of Metabot."[metabot-id & {:as opts}](let [opts (merge default-opts opts)](lib-be/with-metadata-provider-cache@@ -65,6 +65,6 @@(t2/insert! :model/MetabotPrompt model-prompts))))))(defn delete-all-metabot-prompts- "Drop suggested propmpts for instance of Metabot."+ "Drop suggested prompts for instance of Metabot."[metabot-id](t2/delete! :model/MetabotPrompt {:where [:= :metabot_id metabot-id]}))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.cljindex 11b55216bb1..57e7d13544d 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/dependencies.clj@@ -48,19 +48,19 @@suitable for Metabot. Takes a map with :id and :source keys."[{:keys [id source]}](try- (let [transform-to-check (api/check-404 (t2/select-one :model/Transform :id id))]- (api/read-check transform-to-check)- (let [result (if (= (keyword (:type source)) :query)- (let [database-id (-> source :query :database)- base-provider (lib-be/application-database-metadata-provider database-id)- metadata (lib-be/instance->metadata transform-to-check :metadata/transform)- updated-metadata (cond-> metadata- source (assoc :source source))- edits {:transform [updated-metadata]}- breakages (dependencies/errors-from-proposed-edits base-provider edits)]- (format-broken-transforms id breakages))- ;; If this is a non-SQL query, we don't do any checks yet, so just return success- {:success true :bad_transforms []})]- {:structured_output result}))+ (let [transform-to-check (api/check-404 (t2/select-one :model/Transform :id id))+ _ (api/read-check transform-to-check)+ result (if (= (keyword (:type source)) :query)+ (let [database-id (-> source :query :database)+ base-provider (lib-be/application-database-metadata-provider database-id)+ metadata (lib-be/instance->metadata transform-to-check :metadata/transform)+ updated-metadata (cond-> metadata+ source (assoc :source source))+ edits {:transform [updated-metadata]}+ breakages (dependencies/errors-from-proposed-edits base-provider edits)]+ (format-broken-transforms id breakages))+ ;; If this is a non-SQL query, we don't do any checks yet, so just return success+ {:success true :bad_transforms []})]+ {:structured_output result})(catch Exception e(metabot-v3.tools.u/handle-agent-error e))))diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.cljindex 2c9532d195a..ebc214bbc90 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/entity_details.clj@@ -138,11 +138,6 @@(->> (lib/filterable-columns base-query)field-values-fn)))))))-(comment- (binding [api/*current-user-permissions-set* (delay #{"/"})]- (metric-details 135))- -)-(defn- convert-metric([db-metric metadata-provider](convert-metric db-metric metadata-provider nil))@@ -313,22 +308,6 @@(throw (ex-info (i18n/tru "Invalid metabot_id {0}" metabot-id){:metabot_id metabot-id, :status-code 400}))))-(comment- (binding [api/*current-user-permissions-set* (delay #{"/"})- api/*current-user-id* 2- api/*is-superuser?* true]- #_(table-details 30 nil)- (card-details 110)- #_(metric-details 108)- #_(dev.toucan2-monitor/with-queries [queries]- (u/prog1 (answer-sources "__METABOT__"- {:with-fields? false- :with-metrics? true- :with-default-temporal-breakout? false- :with-queryable-dimensions? false})- (tap> (queries)))))- -)-(defn get-table-details"Get information about the table or model with ID `table-id`.`table-id` is string either encoding an integer that is the ID of a table@@ -356,14 +335,6 @@{:structured-output details}{:output (or details "table not found")}))))-(comment- (binding [api/*current-user-permissions-set* (delay #{"/"})- api/*current-user-id* 2- api/*is-superuser?* true]- (let [id #_"card__137" #_"card__136" #_27 "27"]- (get-table-details {:table-id id})))- -)-(defn get-metric-details"Get information about the metric with ID `metric-id`."[{:keys [metric-id] :as arguments}]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.cljindex 335c52b4d6c..1cbc7352503 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/field_stats.clj@@ -2,7 +2,6 @@(:require[clojure.set :as set][metabase-enterprise.metabot-v3.tools.util :as metabot-v3.tools.u]- [metabase.api.common :as api][metabase.lib.core :as lib][metabase.sync.core :as sync][metabase.warehouse-schema.models.field-values :as field-values]@@ -70,19 +69,6 @@(catch Exception ex(metabot-v3.tools.u/handle-agent-error ex))))-(comment- (t2/select-pk->fn :field_id :model/FieldValues)- (sort-by key (t2/select-pk->fn :name :model/Table))- (sort-by first (t2/select-fn-vec (juxt :position :name) :model/Field :table_id 8))- (binding [api/*current-user-permissions-set* (delay #{"/"})- api/*current-user-id* 2- api/*is-superuser?* true]- (let [table-id 25]- (-> (for [col-pos (range 15)]- [col-pos (table-field-stats table-id (str (metabot-v3.tools.u/table-field-id-prefix table-id) col-pos) 15)])- vec)))- -)-(defn field-values"Return statistics and/or values for a given field of a given entity."[{:keys [entity-type entity-id field-id limit]}]diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.cljindex f3652ef59fc..5ab3dd3a8a5 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/filters.clj@@ -146,7 +146,7 @@(lib/breakout query expr)))(defn- query-metric*- [{:keys [metric-id filters group-by] :as _arguments}]+ [{:keys [metric-id filters group-by]}](let [card (metabot-v3.tools.u/get-card metric-id)mp (lib-be/application-database-metadata-provider (:database_id card))base-query (->> (lib/query mp (lib.metadata/card mp metric-id))@@ -171,12 +171,6 @@(map-indexed #(metabot-v3.tools.u/->result-column query %2 %1 query-field-id-prefix))returned-cols)}))-(comment- (binding [api/*current-user-permissions-set* (delay #{"/"})]- (let [id 135]- (query-metric* {:metric-id id})))- -)-(defn query-metric"Create a query based on a metric."[{:keys [metric-id] :as arguments}]@@ -225,12 +219,10 @@(lib/order-by query (:column field) direction))(defn- add-limit [query limit]- (if limit- (lib/limit query limit)- query))+ (cond-> query limit (lib/limit limit)))(defn- query-model*- [{:keys [model-id fields filters aggregations group-by order-by limit] :as _arguments}]+ [{:keys [model-id fields filters aggregations group-by order-by limit]}](let [card (metabot-v3.tools.u/get-card model-id)mp (lib-be/application-database-metadata-provider (:database_id card))base-query (lib/query mp (lib.metadata/card mp model-id))@@ -244,17 +236,17 @@(lib/display-name base-query -1 column :long))))resolve-visible-column)fields)- reduce-query (fn [query f coll] (reduce f query coll))- query (-> base-query- (reduce-query (fn [query [expr-or-column expr-name]]- (lib/expression query expr-name expr-or-column))- (filter (comp expression? first) projection))- (add-fields projection)- (reduce-query add-filter (map resolve-visible-column filters))- (reduce-query add-aggregation (map resolve-visible-column aggregations))- (reduce-query add-breakout (map resolve-visible-column group-by))- (reduce-query add-order-by (map resolve-order-by-column order-by))- (add-limit limit))+ query (as-> base-query query+ (reduce (fn [query [expr-or-column expr-name]]+ (lib/expression query expr-name expr-or-column))+ query+ (filter (comp expression? first) projection))+ (add-fields query projection)+ (reduce add-filter query (map resolve-visible-column filters))+ (reduce add-aggregation query (map resolve-visible-column aggregations))+ (reduce add-breakout query (map resolve-visible-column group-by))+ (reduce add-order-by query (map resolve-order-by-column order-by))+ (add-limit query limit))query-id (u/generate-nano-id)query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)returned-cols (lib/returned-columns query)]@@ -304,17 +296,17 @@(lib/display-name base-query -1 column :long))))resolve-visible-column)fields)- reduce-query (fn [query f coll] (reduce f query coll))- query (-> base-query- (reduce-query (fn [query [expr-or-column expr-name]]- (lib/expression query expr-name expr-or-column))- (filter (comp expression? first) projection))- (add-fields projection)- (reduce-query add-filter (map resolve-visible-column filters))- (reduce-query add-aggregation (map resolve-visible-column aggregations))- (reduce-query add-breakout (map resolve-visible-column group-by))- (reduce-query add-order-by (map resolve-order-by-column order-by))- (add-limit limit))+ query (as-> base-query query+ (reduce (fn [query [expr-or-column expr-name]]+ (lib/expression query expr-name expr-or-column))+ query+ (filter (comp expression? first) projection))+ (add-fields query projection)+ (reduce add-filter query (map resolve-visible-column filters))+ (reduce add-aggregation query (map resolve-visible-column aggregations))+ (reduce add-breakout query (map resolve-visible-column group-by))+ (reduce add-order-by query (map resolve-order-by-column order-by))+ (add-limit query limit))query-id (u/generate-nano-id)query-field-id-prefix (metabot-v3.tools.u/query-field-id-prefix query-id)returned-cols (lib/returned-columns query)]@@ -388,7 +380,7 @@(defn filter-records"Add `filters` to the query referenced by `data-source`"- [{:keys [data-source filters] :as _arguments}]+ [{:keys [data-source filters]}](try(let [[filter-field-id-prefix base] (base-query data-source)returned-cols (lib/returned-columns base)@@ -405,22 +397,3 @@(lib/returned-columns query))}})(catch Exception ex(metabot-v3.tools.u/handle-agent-error ex))))--(comment- (require '[metabase.query-processor :as qp]- '[toucan2.core :as t2])- (t2/select :model/Field)- (binding [api/*current-user-permissions-set* (delay #{"/"})- api/*current-user-id* 2- api/*is-superuser?* true]- (-> (filter-records #_{:data-source {:tabl-id 3}- :filters [{:operation "number-greater-than"- :field-id "t3-6"- :value 50}]}- {:data-source {:table-id 1}- :filters [{:operation "greater-than"- :bucket "month-of-year"- :field-id "t1-3"- :value #_"2020-01-01" 1}]})- :structured-output :query qp/process-query :data :native_form :query))- -)diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/show_results_to_user.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/show_results_to_user.cljindex 572f153df76..813057a9682 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/show_results_to_user.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/show_results_to_user.clj@@ -8,7 +8,7 @@(defn show-results-to-user"Generate link where the query can be seen."- [{:keys [query] :as _arguments}]+ [{:keys [query]}](let [query-hash (-> {:dataset_query query}json/encode(.getBytes "UTF-8")diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.cljindex 8c6c5310c2c..ef421a7b495 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/util.clj@@ -226,14 +226,6 @@(integer? limit)(assoc :limit limit))))-(comment- (binding [api/*current-user-id* 2- api/*is-superuser?* true]- (t2/select-fn-vec #(select-keys % [:id :name :type])- :model/Card- (metabot-metrics-and-models-query 1)))- -)-(defn get-metrics-and-models"Retrieve the metric and model cards for the Metabot instance with ID `metabot-id` from the app DB.