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 suggested prompts schema and add test (#65299)
lbrdnkc950dad7ebb0
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/client.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/client.cljindex 09003d44e84..81c8702071d 100644--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/client.clj+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/client.clj@@ -326,7 +326,7 @@[:and[:map[:name :string]- [:type [:enum :number, :string, :date, :datetime, :time, :boolean, :null]]+ [:type [:enum :number, :string, :date, :datetime, :time, :boolean, nil]][:description {:optional true} [:maybe :string]][:table-reference {:optional true} :string]][:map {:encode/ai-service-request #(set/rename-keys % {:table-reference :table_reference})}]])diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.cljindex 03788cb7416..05be8b749d7 100644--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.clj+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/client_test.clj@@ -6,10 +6,15 @@[clojure.test :refer :all][metabase-enterprise.metabot-v3.client :as metabot-v3.client][metabase-enterprise.metabot-v3.client.schema :as metabot-v3.client.schema]+ [metabase-enterprise.metabot-v3.config :as metabot-v3.config]+ [metabase-enterprise.metabot-v3.suggested-prompts :as metabot-v3.suggested-prompts][metabase-enterprise.metabot-v3.util :as metabot-v3.util]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata][metabase.test :as mt][metabase.util.json :as json]- [metabase.util.malli :as mu])+ [metabase.util.malli :as mu]+ [toucan2.core :as t2])(:import(java.io ByteArrayInputStream ByteArrayOutputStream)(metabase.server.streaming_response StreamingResponse)))@@ -59,3 +64,34 @@(is (=? [{:_type :TEXT :content "a1a2a3"}{:_type :FINISH_MESSAGE :finish_reason "stop"}](metabot-v3.util/aisdk->messages "assistant" (str/split-lines body))))))))))++(deftest example-generation-payload-unknown-field-types-test+ (let [mp (mt/metadata-provider)]+ (mt/with-temp [:model/Card c {:type :metric+ :dataset_query (-> (lib/query mp (lib.metadata/table mp (mt/id :orders)))+ (lib/aggregate+ (lib/count (lib.metadata/field mp (mt/id :orders :total)))))+ ;; Set large view count to ensure metric is picked in `generate-sample-prompts`.+ :view_count 1000}]+ ;; Add column with type/* to metric result_metadata+ (t2/update! :model/Card :id (:id c)+ {:result_metadata (conj (:result_metadata (t2/select-one :model/Card :id (:id c)))+ {:database_type "point"+ :base_type :type/*+ :effective_type :type/*+ :name "dummy"})})+ (testing "No exception is thrown when type/* column is present it result_metadata"+ (is (= :not-thrown+ (try+ ;; Override calls to ai service as we are interested in no exception being thrown+ ;; prior to those calls.+ (with-redefs [metabot-v3.client/post! (constantly {:status 200+ :body {:table_questions []+ :metric_questions []}})]+ (let [metabot-eid (get-in metabot-v3.config/metabot-config [metabot-v3.config/internal-metabot-id+ :entity-id])+ metabot-id (t2/select-one-fn :id :model/Metabot :entity_id metabot-eid)]+ (metabot-v3.suggested-prompts/generate-sample-prompts metabot-id)+ :not-thrown))+ (catch Exception e+ e))))))))