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
fix: token stats (#72777)
Maksym Yakubychbda6c83a1289
diff --git a/enterprise/backend/src/metabase_enterprise/metabot/api.clj b/enterprise/backend/src/metabase_enterprise/metabot/api.cljindex 42e920d9aa0..e1957d8c1d3 100644--- a/enterprise/backend/src/metabase_enterprise/metabot/api.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot/api.clj@@ -1,7 +1,10 @@(ns metabase-enterprise.metabot.api"Enterprise-only Metabot API routes."(:require+ [clojure.string :as str][metabase.api.macros :as api.macros]+ [metabase.metabot.provider-util :as provider-util]+ [metabase.metabot.settings :as metabot.settings][metabase.permissions.core :as perms][metabase.premium-features.core :as premium-features]))@@ -10,12 +13,31 @@[:tokens [:maybe int?]][:updated-at [:maybe :string]]])+(defn- meter-value+ [meters meter-key]+ (or (some-> meter-key keyword meters)+ (some-> meter-key meters)))++(defn- default-metabase-meter-key+ []+ (some-> metabot.settings/default-metabase-llm-metabot-provider+ provider-util/strip-metabase-prefix+ (str/replace-first "/" ":")+ (str ":tokens")))++(defn- meter-entry+ [token-status]+ (let [meters (:meters token-status)+ default-key (default-metabase-meter-key)]+ (meter-value meters default-key)))+(api.macros/defendpoint :get "/usage":- metabot-usage-response-schema"Fetch current Metabot token usage for the current billing period."[_route-params_query-params](perms/check-has-application-permission :setting)- (let [token-status (premium-features/token-status)]- {:tokens (some-> token-status :meters :metabot-tokens :meter-value)- :updated-at (some-> token-status :meters :metabot-tokens :meter-updated-at)}))+ (let [meter (some-> (premium-features/token-status)+ meter-entry)]+ {:tokens (:meter-value meter)+ :updated-at (:meter-updated-at meter)}))diff --git a/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/api_test.cljindex 496a122d235..de9de818afc 100644--- a/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot/api_test.clj@@ -47,8 +47,8 @@(deftest usage-get-returns-token-status-usage-test(mt/with-premium-features #{:metabot-v3}- (with-redefs [premium-features/token-status (constantly {:meters {:metabot-tokens {:meter-value 12345- :meter-updated-at "2026-04-02T19:29:12Z"}}})]+ (with-redefs [premium-features/token-status (constantly {:meters {:anthropic:claude-sonnet-4-6:tokens {:meter-value 12345+ :meter-updated-at "2026-04-02T19:29:12Z"}}})](is (= {:tokens 12345:updated-at "2026-04-02T19:29:12Z"}(mt/user-http-request :crowberto :get 200 "ee/metabot/usage"))))))