Skip to content

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

Store only the model in serdes/meta (#83723)

Alexander Polyankin8450545f622a
diff --git a/enterprise/backend/src/metabase_enterprise/remote_sync/merge.clj b/enterprise/backend/src/metabase_enterprise/remote_sync/merge.clj
index a281509bd6d..b2377363495 100644
--- a/enterprise/backend/src/metabase_enterprise/remote_sync/merge.clj
+++ b/enterprise/backend/src/metabase_enterprise/remote_sync/merge.clj
@@ -27,10 +27,11 @@
(defn- entity-identity
"Returns a stable, rename-independent identity key for a serialized entity's YAML `content`, or nil if the
content can't be parsed or has no serdes path. The key is a vector of `[model id]` pairs (the serdes path
- with labels dropped)."
+ restored by [[serdes/restore-path]], with labels dropped)."
[content]
(try
(some->> (yaml/parse-string content)
+ serdes/restore-path
serdes/path
seq
(mapv (fn [seg] [(str (:model seg)) (str (:id seg))])))
diff --git a/enterprise/backend/src/metabase_enterprise/remote_sync/source/ingestable.clj b/enterprise/backend/src/metabase_enterprise/remote_sync/source/ingestable.clj
index 0111ef8fe8d..d3b8edf2ec5 100644
--- a/enterprise/backend/src/metabase_enterprise/remote_sync/source/ingestable.clj
+++ b/enterprise/backend/src/metabase_enterprise/remote_sync/source/ingestable.clj
@@ -29,7 +29,8 @@
(defn- ingest-content
[file-content]
- (serialization/read-timestamps (yaml/parse-string file-content {:key-fn serialization/parse-key})))
+ (serdes/restore-path
+ (serialization/read-timestamps (yaml/parse-string file-content {:key-fn serialization/parse-key}))))
(defn- ingest-all
"Returns {:entities {stripped-hierarchy {:content <yaml-string> :path <repo-path>}}, :errors [Exception...]}.
diff --git a/enterprise/backend/src/metabase_enterprise/serialization/v2/ingest.clj b/enterprise/backend/src/metabase_enterprise/serialization/v2/ingest.clj
index b2fb591cdb5..5bc30a96c33 100644
--- a/enterprise/backend/src/metabase_enterprise/serialization/v2/ingest.clj
+++ b/enterprise/backend/src/metabase_enterprise/serialization/v2/ingest.clj
@@ -78,7 +78,8 @@
[file]
(-> file
(yaml/from-file {:key-fn parse-key})
- read-timestamps))
+ read-timestamps
+ serdes/restore-path))
(defn- check-resource-path!
"Throws unless `path` is a relative path that stays inside its entity's directory."
diff --git a/enterprise/backend/src/metabase_enterprise/serialization/v2/storage/util.clj b/enterprise/backend/src/metabase_enterprise/serialization/v2/storage/util.clj
index 7113966d9fb..cb5272f097e 100644
--- a/enterprise/backend/src/metabase_enterprise/serialization/v2/storage/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/serialization/v2/storage/util.clj
@@ -52,9 +52,9 @@
(resolve-path (:unique-name-fns ctx) (serdes/storage-path entity ctx)))
(defn without-resources
- "The `entity` as written to its YAML file, without its `:serdes/resources`."
+ "The `entity` as written to its YAML file: [[serdes/storable]], without its `:serdes/resources`."
[entity]
- (dissoc entity :serdes/resources))
+ (serdes/storable (dissoc entity :serdes/resources)))
(defn resource-files
"Each of `entity`'s `:serdes/resources` as `[path-segments content]`, next to its YAML file at `resolved`."
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/serialization_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/serialization_test.clj
index b6f575e833a..7730c3238ec 100644
--- a/enterprise/backend/test/metabase_enterprise/data_apps/serialization_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/serialization_test.clj
@@ -64,7 +64,7 @@
(let [app (insert-app! :description "Pipeline health")]
(export! dump-dir)
(testing "the manifest is a serdes YAML in the app's directory, keyed like a hand-written data_app.yaml"
- (is (= {:serdes/meta [{:model "DataApp" :id (:entity_id app) :label "sales_ops"}]
+ (is (= {:serdes/meta [{:model "DataApp"}]
:entity_id (:entity_id app)
:slug "sales-ops"
:name "Sales Ops"
diff --git a/enterprise/backend/test/metabase_enterprise/remote_sync/impl_test.clj b/enterprise/backend/test/metabase_enterprise/remote_sync/impl_test.clj
index 8dd222ca6a0..012a88453bb 100644
--- a/enterprise/backend/test/metabase_enterprise/remote_sync/impl_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/remote_sync/impl_test.clj
@@ -14,6 +14,7 @@
[metabase-enterprise.remote-sync.test-helpers :as test-helpers]
[metabase.app-db.core :as app-db]
[metabase.collections.models.collection :as collection]
+ [metabase.models.serialization :as serdes]
[metabase.models.serialization.resolve :as resolve]
[metabase.search.core :as search]
[metabase.settings.core :as setting]
@@ -2307,7 +2308,8 @@ serdes/meta:
(is (= "Remapped F2" (t2/select-one-fn :name :model/Dimension :field_id f2-id))))
(testing "a settings file v64 wrote, carrying its Fields' settings under `fields`, keeps them"
(let [files (table-files)
- content (fn [suffix] (yaml/parse-string (val (u/seek #(str/ends-with? (key %) suffix) files))))
+ content (fn [suffix]
+ (serdes/restore-path (yaml/parse-string (val (u/seek #(str/ends-with? (key %) suffix) files)))))
legacy (assoc (content "test_table___tableusersettings.yaml")
:fields [(content "f1___fieldusersettings.yaml")])
[path _] (u/seek #(str/ends-with? (key %) "test_table___tableusersettings.yaml") files)]
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
index 7833e749dfb..1472f2cd2b2 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj
@@ -548,7 +548,8 @@
[:human_readable_field_id {:optional true} [:maybe [:sequential [:maybe :string]]]]]
ser))
(is (not (contains? ser :id)))
- (is (not (contains? ser :field_id)) ":field_id is dropped; it's implied by the path")
+ (is (= ["My Database" nil "Schemaless Table" "email"] (:field_id ser))
+ ":field_id is exported so the path can be rebuilt from the file")
(testing "have no dependencies; the Database, Table and Field are synthesized on import if missing"
(is (= #{}
(set (serdes/deserialization-dependencies ser)))))))
@@ -568,6 +569,20 @@
(testing "Fields carry no dimensions"
(is (not (contains? (ts/extract-one "Field" fk-id) :dimensions)))))))
+(deftest snippet-descendants-test
+ (testing "Exporting a snippet also exports the snippets and cards its template tags reference"
+ (mt/with-empty-h2-app-db!
+ (mt/with-temp [:model/NativeQuerySnippet {b-eid :entity_id} {:name "B" :content "1 = 1"}
+ :model/Card {d-id :id d-eid :entity_id} {:name "D"}
+ :model/NativeQuerySnippet {a-id :id a-eid :entity_id}
+ {:name "A" :content (format "{{snippet: B}} AND id IN ({{#%d-d}})" d-id)}]
+ (let [extraction (into [] (extract/extract {:targets [["NativeQuerySnippet" a-id]]
+ :no-settings true
+ :no-data-model true
+ :no-transforms true}))]
+ (is (= #{a-eid b-eid} (ids-by-model "NativeQuerySnippet" extraction)))
+ (is (= #{d-eid} (ids-by-model "Card" extraction))))))))
+
(deftest native-query-snippets-test
(mt/with-empty-h2-app-db!
(ts/with-temp-dpc [:model/User {ann-id :id} {:first_name "Ann"
@@ -1120,8 +1135,8 @@
:values values}
ser))
(is (not (contains? ser :id)))
- (is (not (contains? ser :field_id))
- ":field_id is dropped; its implied by the path")
+ (is (= ["My Database" nil "Schemaless Table" "Some Field"] (:field_id ser))
+ ":field_id is exported so the path can be rebuilt from the file")
(testing "have no dependencies; the Database and parent Field are synthesized on import if missing"
(is (= #{}
(set (serdes/deserialization-dependencies ser)))))))
@@ -1157,8 +1172,8 @@
:description description
:data_sensitivity :PII}
ser))
- (is (not (contains? ser :field_id))
- ":field_id is dropped; its implied by the path")))
+ (is (= ["My Database" nil "Schemaless Table" "Some Field"] (:field_id ser))
+ ":field_id is exported so the path can be rebuilt from the file")))
(testing "data_sensitivity on the Field itself"
(is (= :PII (:data_sensitivity (ts/extract-one "Field" field-id)))
"a labeled field exports the keyword as-is")
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
index 286138dc1c9..0701c986f3f 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj
@@ -1626,6 +1626,23 @@
:content "11 = 11"}
(t2/select-one :model/NativeQuerySnippet :entity_id (:entity_id snippet)))))))))
+(deftest snippet-referencing-snippet-round-trip-test
+ (testing "A snippet tag referencing another snippet exports its entity_id and imports the local id"
+ (let [serialized (atom nil)]
+ (ts/with-dbs [source-db dest-db]
+ (ts/with-db source-db
+ (let [a (ts/create! :model/NativeQuerySnippet :name "A" :content "1 = 1")
+ b (ts/create! :model/NativeQuerySnippet :name "B" :content "{{snippet: A}} AND 2 = 2")]
+ (reset! serialized [(serdes/extract-one "NativeQuerySnippet" {} b)
+ (serdes/extract-one "NativeQuerySnippet" {} a)])
+ (is (=? {"snippet: A" {:snippet-id (:entity_id a)}}
+ (:template_tags (first @serialized))))))
+ (ts/with-db dest-db
+ (ts/create! :model/NativeQuerySnippet :name "Unrelated" :content "3 = 3")
+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))
+ (is (=? {"snippet: A" {:snippet-id (t2/select-one-pk :model/NativeQuerySnippet :name "A")}}
+ (t2/select-one-fn :template_tags :model/NativeQuerySnippet :name "B"))))))))
+
(deftest snippet-template-tags-import-test
(testing "Template tags import preserves nil, empty, and populated values"
(testing "Missing template_tags field -> {} when selected"
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/osi_ai_context_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/osi_ai_context_test.clj
index 803c0babbb3..71f894c798c 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/osi_ai_context_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/osi_ai_context_test.clj
@@ -108,6 +108,26 @@
(is (=? {:entity_type "table" :entity_local_id table-id}
(t2/select-one :model/OsiAiContext :entity_type "table" :entity_local_id table-id))))))))
+(deftest schemaless-table-entity-round-trip-test
+ (testing "a schemaless Table keeps its nil schema in the export, so both import paths find the Table"
+ (mt/with-temp [:model/Table {table-id :id} {:db_id (mt/id) :schema nil :name "schemaless_table"}
+ :model/OsiAiContext _ {:ai_context {:instructions "no schema"}
+ :entity_type "table" :entity_local_id table-id}]
+ (let [db-name (t2/select-one-fn :name :model/Database :id (mt/id))
+ extracted (serdes/with-cache (extract-for "table" table-id))
+ restored #(t2/select-one :model/OsiAiContext :entity_type "table" :entity_local_id table-id)]
+ (is (= [db-name nil "schemaless_table"] (:entity_local_id extracted)))
+ (testing "from an in-memory ingestion carrying the full path"
+ (t2/delete! :model/OsiAiContext :entity_type "table" :entity_local_id table-id)
+ (serdes.load/load-metabase! (ingestion-in-memory [extracted]))
+ (is (=? {:ai_context {:instructions "no schema"}} (restored))))
+ (testing "from files, whose path is rebuilt from the entity"
+ (ts/with-random-dump-dir [dump-dir "osi-schemaless-"]
+ (storage/store! [extracted] (storage.files/file-writer dump-dir))
+ (t2/delete! :model/OsiAiContext :entity_type "table" :entity_local_id table-id)
+ (serdes/with-cache (serdes.load/load-metabase! (serdes.ingest/ingest-yaml dump-dir)))
+ (is (=? {:ai_context {:instructions "no schema"}} (restored)))))))))
+
(deftest import-over-existing-row-updates-by-compound-key-test
(testing "importing over an existing row updates it in place via the full compound key, not entity_type alone"
(mt/with-temp [:model/Card {card-id :id} {}
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/round_trip_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/round_trip_test.clj
index 695147eecd6..f0fadaa2b62 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/round_trip_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/round_trip_test.clj
@@ -37,6 +37,7 @@
[metabase.search.core :as search]
[metabase.search.test-util :as search.tu]
[metabase.test :as mt]
+ [metabase.util :as u]
[metabase.util.log :as log]
[metabase.util.yaml :as yaml])
(:import
@@ -75,13 +76,14 @@
(into (sorted-set))))
(def ^:private slug-id-prefix-re
- #"#\d+-")
+ #"#\d+([- ])")
(defn- replace-entropy
[s]
- ;; Template tag slugs have the form `#1-my-card-name`, where `1` is the record ID. Record IDs depend on
- ;; import order which is non-deterministic. Replace them with a deterministic placeholder.
- (str/replace s slug-id-prefix-re "#<some-id>-"))
+ ;; Template tag slugs have the form `#1-my-card-name`, and their default display names `#1 My Card Name`, where `1`
+ ;; is the record ID. Record IDs depend on import order which is non-deterministic. Replace them with a deterministic
+ ;; placeholder.
+ (str/replace s slug-id-prefix-re "#<some-id>$1"))
(defn read-yaml
"Reads a YAML file and returns Clojure data, with ignored fields removed."
@@ -91,6 +93,7 @@
(cond
(map? x) (reduce dissoc x ignored-fields)
(string? x) (replace-entropy x)
+ (keyword? x) (keyword (replace-entropy (u/qualified-name x)))
:else x))
(yaml/parse-string (slurp file))))
diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/storage_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/storage_test.clj
index e6c65574da8..017ec92fd7a 100644
--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/storage_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/storage_test.clj
@@ -137,7 +137,7 @@
["orders__SLASH__invoices" "orders__SLASH__invoices.yaml"])
"Slashes in directory names get escaped"))
(testing "the Field was properly exported"
- (is (= (ts/extract-one "Field" (:id website))
+ (is (= (serdes/storable (ts/extract-one "Field" (:id website)))
(-> (yaml/from-file (io/file dump-dir
"databases" "my_company_data"
"tables" "customers"
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.unit.spec.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.unit.spec.tsx
index 9b9ce72bad9..6cbd51df396 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.unit.spec.tsx
@@ -18,6 +18,7 @@ import {
import { DatabaseEditApp } from "./DatabaseEditApp";
const setup = ({ database }: { database: Database }) => {
+ setupEnginesEndpoint({});
setupDatabaseEndpoints(database);
setupEnginesEndpoint(createMockEngines());
setupDatabaseUsageInfoEndpoint(database, {
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.unit.spec.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.unit.spec.tsx
index ea55d266d5a..a367c8c4d51 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.unit.spec.tsx
@@ -15,6 +15,7 @@ import {
import { DatabaseListApp } from "./DatabaseListApp";
const setup = () => {
+ setupEnginesEndpoint({});
setupDatabaseListEndpoint([
createMockDatabase({ id: 1, name: "Stubbed DB", is_stub: true }),
]);
diff --git a/src/metabase/lib/core.cljc b/src/metabase/lib/core.cljc
index 1e2babea451..fde57c39777 100644
--- a/src/metabase/lib/core.cljc
+++ b/src/metabase/lib/core.cljc
@@ -1581,6 +1581,8 @@
native-query
raw-native-query
recognize-template-tags
+ rename-template-tags
+ rename-template-tags-in-text
replace-template-tag-names
required-native-extras
native-query-card-ids
diff --git a/src/metabase/lib/native.cljc b/src/metabase/lib/native.cljc
index 3e39298fd23..fdc7b9290d0 100644
--- a/src/metabase/lib/native.cljc
+++ b/src/metabase/lib/native.cljc
@@ -375,6 +375,24 @@
(= display-name (u.humanization/name->human-readable-name :simple tag-name))
(assoc :display-name (u.humanization/name->human-readable-name :simple new-name))))
+(mu/defn rename-template-tags-in-text :- :string
+ "`text` with its `{{...}}` references renamed per `renames`, a map of old tag name => new tag name."
+ [text :- :string
+ renames :- [:map-of :string :string]]
+ (reduce-kv replace-tag-in-text text renames))
+
+(mu/defn rename-template-tags :- ::lib.schema.template-tag/template-tag-map
+ "`tags`, a map of tag name => tag, with the tags in `renames` renamed the way [[replace-template-tag-names]] renames
+ them."
+ [tags :- ::lib.schema.template-tag/template-tag-map
+ renames :- [:map-of :string :string]]
+ (into {}
+ (map (fn [[tag-name tag]]
+ (if-let [new-name (get renames tag-name)]
+ [new-name (rename-tag tag new-name)]
+ [tag-name tag])))
+ tags))
+
(mu/defn replace-template-tag-names :- ::lib.schema/query
"Apply `renames`, a map of old tag name => new tag name, across the query's native stages: each
affected tag is renamed (a default display name follows the rename, a customized one is kept) and
@@ -400,7 +418,7 @@
tag)))
(m/distinct-by :name))
tags)))
- (update :native #(reduce-kv replace-tag-in-text % stage-renames))))))))))
+ (update :native rename-template-tags-in-text stage-renames)))))))))
(mu/defn native-query-snippet-ids :- [:maybe [:set {:min 1} ::lib.schema.id/native-query-snippet]]
"Returns the card IDs from the template tags of the native query of `query`."
diff --git a/src/metabase/models/serialization.clj b/src/metabase/models/serialization.clj
index a349d0a8e7b..c429f124d0d 100644
--- a/src/metabase/models/serialization.clj
+++ b/src/metabase/models/serialization.clj
@@ -58,6 +58,7 @@
(:require
[clojure.set :as set]
[clojure.string :as str]
+ [clojure.walk :as walk]
[malli.core :as mc]
[malli.transform :as mtx]
[medley.core :as m]
@@ -587,6 +588,28 @@
[entity]
(:serdes/meta entity))
+(defmulti ingested-path
+ "The abstract path of `ingested`, an entity read from a file, computed from its own keys."
+ {:arglists '([model-name ingested])}
+ (fn [model-name _ingested] model-name))
+
+(defmethod ingested-path :default [model-name ingested]
+ [(infer-self-path model-name ingested)])
+
+(defn restore-path
+ "`ingested` with its `:serdes/meta` path computed by [[ingested-path]] when its file stores only the model."
+ [ingested]
+ (let [{:keys [model] :as self} (last (:serdes/meta ingested))]
+ (cond-> ingested
+ (and self (not (contains? self :id))) (assoc :serdes/meta (ingested-path model ingested)))))
+
+(defn storable
+ "`entity` as its file stores it: `:serdes/meta` reduced to `[{:model ...}]`, and removed from nested entities."
+ [entity]
+ (let [model (-> entity :serdes/meta last :model)]
+ (-> (walk/postwalk #(cond-> % (map? %) (dissoc :serdes/meta)) entity)
+ (assoc :serdes/meta [{:model model}]))))
+
(defmulti resource-paths
"Paths of the `:serdes/resources` stored next to an ingested entity's YAML file, relative to its directory."
{:arglists '([ingested])}
@@ -1009,20 +1032,25 @@
(resolve/import-field-fk (import-resolver) field-id))
(defn field->path
- "Given a `field_id` as exported by [[export-field-fk]], turn it into a `[{:model ...}]` path for the Field.
+ "Given a `field_id` as exported by [[export-field-fk]], turn it into a `[{:model ...}]` path for the Field, with one
+ Field segment per name for a nested Field.
This is useful for writing [[deserialization-dependencies]] implementations."
- [[db-name schema table-name field-name]]
- (filterv some? [{:model "Database" :id db-name}
- (when schema {:model "Schema" :id schema})
- {:model "Table" :id table-name}
- {:model "Field" :id field-name}]))
+ [[db-name schema table-name & field-names]]
+ (into (table->path [db-name schema table-name])
+ (map (fn [field-name] {:model "Field" :id field-name}))
+ field-names))
+
+(defn table-path->table-ref
+ "The `[db-name schema table-name]` reference of the Table at `table-path`, with a nil schema for a schemaless Table."
+ [table-path]
+ (let [id-of (fn [model] (some #(when (= model (:model %)) (:id %)) table-path))]
+ [(id-of "Database") (id-of "Schema") (id-of "Table")]))
(defn field-path->field-ref
"The `[db-name schema table-name & field-names]` reference of the Field at `field-path`, nested Fields included."
[field-path]
- (let [[table-path fields] (split-with #(not= "Field" (:model %)) field-path)
- id-of (fn [model] (some #(when (= model (:model %)) (:id %)) table-path))]
- (into [(id-of "Database") (id-of "Schema") (id-of "Table")] (map :id) fields)))
+ (let [[table-path fields] (split-with #(not= "Field" (:model %)) field-path)]
+ (into (table-path->table-ref table-path) (map :id) fields)))
;;; ## MBQL Fields
@@ -1279,7 +1307,7 @@
import-mbql-update-refs
import-mbql-update-maps))
-(defn- stale-card-tag-rename
+(defn card-template-tag-rename
"New name for a card template tag whose `#<id>-slug` name embeds a different id than its (already
remapped) `:card-id`: the id is swapped, the slug is kept verbatim. Nil when they already agree or
the name doesn't embed an id."
@@ -1299,7 +1327,7 @@
x
(into {}
(keep (fn [{tag-name :name, :as tag}]
- (when-let [new-name (stale-card-tag-rename tag)]
+ (when-let [new-name (card-template-tag-rename tag)]
[tag-name new-name])))
(lib/all-template-tags x)))
x))
diff --git a/src/metabase/native_query_snippets/models/native_query_snippet.clj b/src/metabase/native_query_snippets/models/native_query_snippet.clj
index 8fefb90d81f..66d82484e4f 100644
--- a/src/metabase/native_query_snippets/models/native_query_snippet.clj
+++ b/src/metabase/native_query_snippets/models/native_query_snippet.clj
@@ -183,16 +183,35 @@
filter-column
filter-ids))
+(defn- import-template-tags
+ "The imported `template-tags` of a snippet, and the renames of the card tags whose `#<id>-slug` name embeds the
+ exporting instance's card id."
+ [template-tags]
+ (when-let [tags (some->> template-tags
+ serdes/import-mbql
+ (lib/normalize :metabase.lib.schema.template-tag/template-tag-map))]
+ {:tags tags
+ :renames (into {}
+ (keep (fn [[tag-name tag]]
+ (some->> (serdes/card-template-tag-rename tag) (vector tag-name))))
+ tags)}))
+
(defmethod serdes/make-spec "NativeQuerySnippet" [_model-name _opts]
- {:copy [:archived :content :description :entity_id :name]
+ {:copy [:archived :description :entity_id :name]
:skip []
:transform {:created_at (serdes/date)
:collection_id (serdes/fk :model/Collection)
:creator_id (serdes/fk :model/User)
- ;; Normalize on import so template-tag name keys come back as strings (YAML ingest keywordizes
- ;; them).
- :template_tags {:export identity
- :import #(lib/normalize :metabase.lib.schema.template-tag/template-tag-map %)}}
+ :content {:export identity
+ :import-with-context
+ (fn [current _ content]
+ (let [{:keys [renames]} (import-template-tags (:template_tags current))]
+ (cond-> content
+ (and (string? content) (seq renames)) (lib/rename-template-tags-in-text renames))))}
+ :template_tags {:export serdes/export-mbql
+ :import (fn [template-tags]
+ (let [{:keys [tags renames]} (import-template-tags template-tags)]
+ (some-> tags (lib/rename-template-tags renames))))}}
:defaults {:archived false}})
(defmethod serdes/required "NativeQuerySnippet"
@@ -201,15 +220,28 @@
{["Collection" collection_id] {"NativeQuerySnippet" id}}))
(defmethod serdes/deserialization-dependencies "NativeQuerySnippet"
- [{:keys [collection_id]}]
- (when collection_id
- [[{:model "Collection" :id collection_id}]]))
+ [{:keys [collection_id template_tags]}]
+ (set
+ (concat
+ (when collection_id
+ [[{:model "Collection" :id collection_id}]])
+ (serdes/mbql-deps false template_tags))))
(defmethod serdes/serialization-dependencies "NativeQuerySnippet"
- [_model-name {:keys [collection_id]}]
- ;; A snippet only references its containing Collection, which a selective export may legitimately omit.
- (when collection_id
- #{[{:model "Collection" :id collection_id}]}))
+ [_model-name {:keys [collection_id template_tags]}]
+ ;; A snippet's containing Collection may legitimately be omitted by a selective export.
+ (set
+ (concat
+ (when collection_id
+ [[{:model "Collection" :id collection_id}]])
+ (serdes/mbql-deps true template_tags))))
+
+(defmethod serdes/descendants "NativeQuerySnippet" [_model-name id _opts]
+ (into {}
+ (for [path (serdes/mbql-deps true (:template_tags (native-query-snippets.db/snippet id)))
+ :let [{:keys [model] ref-id :id} (last path)]
+ :when (#{"Card" "NativeQuerySnippet"} model)]
+ [[model ref-id] {"NativeQuerySnippet" id}])))
(defmethod serdes/storage-path "NativeQuerySnippet" [snippet ctx]
(serdes/storage-default-collection-path snippet ctx "snippets"))
diff --git a/src/metabase/osi/models/osi_ai_context.clj b/src/metabase/osi/models/osi_ai_context.clj
index 397e79ce986..b54031f74ef 100644
--- a/src/metabase/osi/models/osi_ai_context.clj
+++ b/src/metabase/osi/models/osi_ai_context.clj
@@ -119,22 +119,33 @@
(let [{:keys [model id]} (last parent-path)]
(if (= model "Table")
{:entity_type "table"
- :entity_local_id (serdes/*import-table-fk* (mapv :id parent-path))}
+ :entity_local_id (serdes/*import-table-fk* (serdes/table-path->table-ref parent-path))}
(when-let [etype (parent-model->entity-type model)]
(when-let [toucan (entity-type->toucan etype)]
{:entity_type etype :entity_local_id (serdes/*import-fk* id toucan)})))))
+(defn- portable-parent-path
+ "The parent path of an ingested row from its `entity_type` and its portable `entity_local_id`."
+ [entity-type portable-id]
+ (cond
+ (= entity-type "table") (serdes/table->path portable-id)
+ (entity-type->toucan entity-type) [{:model (name (entity-type->toucan entity-type)) :id portable-id}]
+ :else [{:model entity-type :id portable-id}]))
+
(defmethod serdes/entity-id "OsiAiContext" [_ _] nil)
(defmethod serdes/generate-path "OsiAiContext" [_ {:keys [entity_type entity_local_id]}]
(conj (vec (entity-parent-path entity_type entity_local_id))
{:model "OsiAiContext" :id "ai_context"}))
+(defmethod serdes/ingested-path "OsiAiContext" [_ {:keys [entity_type entity_local_id]}]
+ (conj (portable-parent-path entity_type entity_local_id)
+ {:model "OsiAiContext" :id "ai_context"}))
+
(defmethod serdes/storage-path "OsiAiContext" [entity _ctx]
;; Store under a flat top-level directory rather than nesting next to the entity: serdes/storage-path-prefixes
;; only knows how to nest under Database/Schema/Table/Field, so a Card/Measure/Segment parent would throw.
- ;; The row's identity still lives in its nested generate-path (the on-disk :serdes/meta); this is only the
- ;; file's location. Storage dedups by `:key`, so it must be unambiguous: use the EDN of the parent's
+ ;; The row's identity still lives in its nested generate-path; this is only the file's location. Storage dedups by `:key`, so it must be unambiguous: use the EDN of the parent's
;; `[model id]` pairs (ids can contain "/" and ":", so a delimiter-joined string could collide for distinct
;; paths). The slug is just a readable filename — the unique-name generator disambiguates it by `:key`.
(let [parent (pop (vec (serdes/path entity)))]
@@ -143,17 +154,21 @@
:key (pr-str (mapv (juxt :model :id) parent))}]))
;; `ai_context` is a plain text blob (no FKs — instructions/synonyms/examples are free text), so it copies
-;; verbatim. The key columns are carried by the path, not as fields: `entity_local_id` is resolved from the
-;; parent path on import, and `entity_type` is read back from the parent segment's model.
+;; verbatim. The key columns are exported so [[serdes/ingested-path]] can rebuild the path, and imported from that path.
(defmethod serdes/make-spec "OsiAiContext" [_model-name _opts]
{:copy [:ai_context]
:transform {:created_at (serdes/date)
:updated_at (serdes/date)
- :entity_type {:export (constantly ::serdes/skip)
+ :entity_type {:export identity
:import-with-context
(fn [current _ _] (:entity_type (parent-path->entity (pop (serdes/path current)))))}
:entity_local_id {::serdes/fk true
- :export (constantly ::serdes/skip)
+ :export-with-context
+ (fn [current _ local-id]
+ (let [parent (entity-parent-path (:entity_type current) local-id)]
+ (if (= "table" (:entity_type current))
+ (serdes/table-path->table-ref parent)
+ (:id (last parent)))))
:import-with-context
(fn [current _ _] (:entity_local_id (parent-path->entity (pop (serdes/path current)))))}}})
diff --git a/src/metabase/warehouse_schema/models/dimension.clj b/src/metabase/warehouse_schema/models/dimension.clj
index 7850227ba23..fc5117ae389 100644
--- a/src/metabase/warehouse_schema/models/dimension.clj
+++ b/src/metabase/warehouse_schema/models/dimension.clj
@@ -43,12 +43,16 @@
:transform {:created_at (serdes/date)
:human_readable_field_id (serdes/fk :model/Field)
:field_id {::serdes/fk true
- :export (constantly ::serdes/skip)
+ :export #(serdes/*export-field-fk* %)
:import-with-context
(fn [current _ field-id]
- (or field-id
- (serdes/*import-field-fk*
- (serdes/field-path->field-ref (pop (serdes/path current))))))}}})
+ (if (int? field-id)
+ field-id
+ (serdes/*import-field-fk*
+ (serdes/field-path->field-ref (pop (serdes/path current))))))}}})
+
+(defmethod serdes/ingested-path "Dimension" [_ {:keys [field_id entity_id]}]
+ (conj (serdes/field->path field_id) {:model "Dimension" :id entity_id}))
(def ^:private dimension-slug "___dimension")
diff --git a/src/metabase/warehouse_schema/models/field.clj b/src/metabase/warehouse_schema/models/field.clj
index 5c2ea50f85d..32f1b7634c8 100644
--- a/src/metabase/warehouse_schema/models/field.clj
+++ b/src/metabase/warehouse_schema/models/field.clj
@@ -448,6 +448,9 @@
(map (fn [n] {:model "Field" :id n}) fields))
(filterv some?))))
+(defmethod serdes/ingested-path "Field" [_ {:keys [table_id parent_id name]}]
+ (serdes/field->path (conj (or parent_id table_id) name)))
+
(defmethod serdes/entity-id "Field" [_ {:keys [name]}]
name)
diff --git a/src/metabase/warehouse_schema/models/field_user_settings.clj b/src/metabase/warehouse_schema/models/field_user_settings.clj
index 15da7d15386..e3e5b140732 100644
--- a/src/metabase/warehouse_schema/models/field_user_settings.clj
+++ b/src/metabase/warehouse_schema/models/field_user_settings.clj
@@ -131,11 +131,14 @@
:transform {:created_at (serdes/date)
:fk_target_field_id (serdes/fk :model/Field)
:field_id {::serdes/fk true
- :export (constantly ::serdes/skip)
+ :export #(serdes/*export-field-fk* %)
:import-with-context (fn [current _ _]
(serdes/*import-field-fk*
(serdes/field-path->field-ref (pop (serdes/path current)))))}}})
+(defmethod serdes/ingested-path "FieldUserSettings" [_ {:keys [field_id]}]
+ (conj (serdes/field->path field_id) {:model "FieldUserSettings" :id "1"}))
+
(def ^:private field-user-settings-slug "___fieldusersettings")
(defmethod serdes/storage-path "FieldUserSettings" [field-user-settings _ctx]
diff --git a/src/metabase/warehouse_schema/models/field_values.clj b/src/metabase/warehouse_schema/models/field_values.clj
index c1d77c00cae..20cc15b3239 100644
--- a/src/metabase/warehouse_schema/models/field_values.clj
+++ b/src/metabase/warehouse_schema/models/field_values.clj
@@ -714,7 +714,7 @@
:last_used_at (serdes/date)
:type (serdes/kw)
:field_id {::serdes/fk true
- :export (constantly ::serdes/skip)
+ :export #(serdes/*export-field-fk* %)
:import-with-context (fn [current _ _]
(let [field-ref (field-path->field-ref (serdes/path current))]
(serdes/*import-field-fk* field-ref)))}}
@@ -729,6 +729,9 @@
(= (:hash_key ingested) (:hash_key local)) (dissoc :hash_key))]
((get-method serdes/load-update! "") "FieldValues" ingested local)))
+(defmethod serdes/ingested-path "FieldValues" [_ {:keys [field_id]}]
+ (conj (serdes/field->path field_id) {:model "FieldValues" :id "0"}))
+
(def ^:private field-values-slug "___fieldvalues")
(defmethod serdes/storage-path "FieldValues" [fv _]
diff --git a/src/metabase/warehouse_schema/models/table.clj b/src/metabase/warehouse_schema/models/table.clj
index e8ffc39fa6c..35cdca1c661 100644
--- a/src/metabase/warehouse_schema/models/table.clj
+++ b/src/metabase/warehouse_schema/models/table.clj
@@ -587,6 +587,9 @@
{:model "Schema" :id (:schema table)})
{:model "Table" :id (:name table)}])))
+(defmethod serdes/ingested-path "Table" [_ {:keys [db_id schema name]}]
+ (serdes/table->path [db_id schema name]))
+
(defmethod serdes/entity-id "Table" [_ {:keys [name]}]
name)
diff --git a/src/metabase/warehouse_schema/models/table_user_settings.clj b/src/metabase/warehouse_schema/models/table_user_settings.clj
index 8b9c57c8213..63bdcdd39f2 100644
--- a/src/metabase/warehouse_schema/models/table_user_settings.clj
+++ b/src/metabase/warehouse_schema/models/table_user_settings.clj
@@ -168,13 +168,6 @@
(let [found-table (serdes/load-find-local (pop path))]
(warehouse-schema.db/table-user-settings (:id found-table))))
-(defn- table-path->table-ref [tus-path]
- (let [[db schema table-name :as table-ref] (mapv :id (pop tus-path))]
- (if table-name
- table-ref
- ;; It's too short, so no schema. Shift them over and add a nil schema.
- [db nil schema])))
-
(def ^:private legacy-fields
"The FieldUserSettings a settings file carried before they got files of their own."
(serdes/nested :model/FieldUserSettings :table_id
@@ -182,7 +175,7 @@
(defmethod serdes/load-one! "TableUserSettings" [ingested maybe-local]
(let [settings (serdes/default-load-one! ingested maybe-local)
- table-id (serdes/*import-table-fk* (table-path->table-ref (serdes/path ingested)))]
+ table-id (serdes/*import-table-fk* (serdes/table-path->table-ref (pop (serdes/path ingested))))]
(when (contains? ingested :fields)
((:import-with-context legacy-fields)
(t2/instance :model/TableUserSettings {:table_id table-id}) :fields (:fields ingested)))
@@ -206,9 +199,12 @@
:owner_user_id (serdes/fk :model/User)
:data_layer (serdes/optional-kw)
:table_id {::serdes/fk true
- :export (constantly ::serdes/skip)
+ :export #(serdes/*export-table-fk* %)
:import-with-context (fn [current _ _]
- (serdes/*import-table-fk* (table-path->table-ref (serdes/path current))))}}})
+ (serdes/*import-table-fk* (serdes/table-path->table-ref (pop (serdes/path current)))))}}})
+
+(defmethod serdes/ingested-path "TableUserSettings" [_ {:keys [table_id]}]
+ (conj (serdes/table->path table_id) {:model "TableUserSettings" :id "1"}))
(def ^:private table-user-settings-slug "___tableusersettings")
diff --git a/test/metabase/lib/native_test.cljc b/test/metabase/lib/native_test.cljc
index bfa0ea3a221..19bcbd81bf2 100644
--- a/test/metabase/lib/native_test.cljc
+++ b/test/metabase/lib/native_test.cljc
@@ -880,6 +880,28 @@
query
{"#133-bh-population-model" "#1206-bh-population-model"}))))))
+(deftest ^:parallel rename-template-tags-test
+ (testing "a tag map and its text are renamed the way a query's native stage is"
+ (let [renames {"#133-bh-population-model" "#1206-bh-population-model"}]
+ (is (= "select * from {{#1206-bh-population-model}} where {{ state }}"
+ (lib.native/rename-template-tags-in-text
+ "select * from {{ #133-bh-population-model }} where {{ state }}" renames)))
+ (is (=? {"#1206-bh-population-model" {:name "#1206-bh-population-model"
+ :display-name "#1206 Bh Population Model"
+ :card-id 1206}
+ "state" {:name "state" :display-name "State"}}
+ (lib.native/rename-template-tags
+ {"#133-bh-population-model" {:type :card
+ :name "#133-bh-population-model"
+ :display-name "#133 Bh Population Model"
+ :id "5ebf6c2e-d6e2-449e-97b7-7005047928e5"
+ :card-id 1206}
+ "state" {:type :text
+ :name "state"
+ :display-name "State"
+ :id "6ebf6c2e-d6e2-449e-97b7-7005047928e5"}}
+ renames))))))
+
(deftest ^:parallel replace-template-tag-names-noop-test
(let [query (card-tag-query "select * from {{#133-some-old-slug}}"
{:type :card
diff --git a/test_resources/serialization_baseline/channels/email_channel.yaml b/test_resources/serialization_baseline/channels/email_channel.yaml
index 88101db67cc..c6b80d93153 100644
--- a/test_resources/serialization_baseline/channels/email_channel.yaml
+++ b/test_resources/serialization_baseline/channels/email_channel.yaml
@@ -6,5 +6,4 @@ details:
name: Email Channel
type: channel/email
serdes/meta:
-- id: Email Channel
- model: Channel
+- model: Channel
diff --git a/test_resources/serialization_baseline/channels/http_channel.yaml b/test_resources/serialization_baseline/channels/http_channel.yaml
index 8b9f0db6a99..9fcbc1daf74 100644
--- a/test_resources/serialization_baseline/channels/http_channel.yaml
+++ b/test_resources/serialization_baseline/channels/http_channel.yaml
@@ -5,5 +5,4 @@ details:
name: HTTP Channel
type: channel/http
serdes/meta:
-- id: HTTP Channel
- model: Channel
+- model: Channel
diff --git a/test_resources/serialization_baseline/collections/main/dashboards.yaml b/test_resources/serialization_baseline/collections/main/dashboards.yaml
index 58c23e92059..45d88ee0d90 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards.yaml
@@ -3,6 +3,4 @@ entity_id: cOlDaShBoArDs0ExAmPlx
slug: dashboards
created_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: cOlDaShBoArDs0ExAmPlx
- label: dashboards
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/all_parameter_types.yaml b/test_resources/serialization_baseline/collections/main/dashboards/all_parameter_types.yaml
index 91372ddc954..95511b3d13f 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/all_parameter_types.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/all_parameter_types.yaml
@@ -140,9 +140,7 @@ parameters:
- Doohickey
values_source_type: static-list
serdes/meta:
-- id: thzuTON-F8WG6EcXTXrNK
- label: all_parameter_types
- model: Dashboard
+- model: Dashboard
dashcards: []
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/click_behavior_examples.yaml b/test_resources/serialization_baseline/collections/main/dashboards/click_behavior_examples.yaml
index 583373971e6..fb6010b92ba 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/click_behavior_examples.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/click_behavior_examples.yaml
@@ -11,9 +11,7 @@ parameters:
slug: category
type: string/=
serdes/meta:
-- id: c0R_gvn90vURE5hdxK3f0
- label: click_behavior_examples
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: qaAe9ro4JL3ahgLLne-jG
card_id: Wo5d6IV8lb63wex29uh6H
@@ -37,11 +35,6 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: c0R_gvn90vURE5hdxK3f0
- model: Dashboard
- - id: qaAe9ro4JL3ahgLLne-jG
- model: DashboardCard
- entity_id: iMNmMMABHvbbiVT3ufez6
card_id: UEWVldEEZ-3sYUjjN54qz
created_at: '2026-04-02T02:59:02.778668Z'
@@ -54,11 +47,6 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: c0R_gvn90vURE5hdxK3f0
- model: Dashboard
- - id: iMNmMMABHvbbiVT3ufez6
- model: DashboardCard
- entity_id: RasgF0LvnoJlu7ModLrqv
card_id: dYD1j3pQtJdctg8duByUL
created_at: '2026-04-02T02:59:02.778668Z'
@@ -71,11 +59,6 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: c0R_gvn90vURE5hdxK3f0
- model: Dashboard
- - id: RasgF0LvnoJlu7ModLrqv
- model: DashboardCard
- entity_id: NSyK1LJldomowKbt0HpuE
card_id: ciG63nSLHKRTImt5iWEte
created_at: '2026-04-02T02:59:02.778668Z'
@@ -88,10 +71,5 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: c0R_gvn90vURE5hdxK3f0
- model: Dashboard
- - id: NSyK1LJldomowKbt0HpuE
- model: DashboardCard
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/inline_parameters_dashboard.yaml b/test_resources/serialization_baseline/collections/main/dashboards/inline_parameters_dashboard.yaml
index d2e539d086b..e095dc1e53b 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/inline_parameters_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/inline_parameters_dashboard.yaml
@@ -18,9 +18,7 @@ parameters:
slug: min_price
type: number/>=
serdes/meta:
-- id: eUXWiB6QAXkOc7P1ozoat
- label: inline_parameters_dashboard
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: yaY0FfjZyI9oEQQR5TZ3q
created_at: '2026-04-02T02:59:02.778668Z'
@@ -37,11 +35,6 @@ dashcards:
text: Products in {{category}}
virtual_card:
display: heading
- serdes/meta:
- - id: eUXWiB6QAXkOc7P1ozoat
- model: Dashboard
- - id: yaY0FfjZyI9oEQQR5TZ3q
- model: DashboardCard
- entity_id: v29EoQMk66PPR6a68pe_S
created_at: '2026-04-02T02:59:02.778668Z'
row: 1
@@ -60,11 +53,6 @@ dashcards:
with price above **{{min_price}}**.
virtual_card:
display: text
- serdes/meta:
- - id: eUXWiB6QAXkOc7P1ozoat
- model: Dashboard
- - id: v29EoQMk66PPR6a68pe_S
- model: DashboardCard
- entity_id: _5CQR0-k5mgaLOemB5EOl
card_id: h5F2EjHsRd73Dqqh8sAtd
created_at: '2026-04-02T02:59:02.778668Z'
@@ -97,10 +85,5 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: eUXWiB6QAXkOc7P1ozoat
- model: Dashboard
- - id: _5CQR0-k5mgaLOemB5EOl
- model: DashboardCard
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings.yaml
index fa0900f2af9..a016901964c 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings.yaml
@@ -17,9 +17,7 @@ parameters:
slug: date_range
type: date/range
serdes/meta:
-- id: 8xFV0XmZs2olbGKXWenfS
- label: series_and_parameter_mappings
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: WNjyHH5uA36yKp9D7X7bw
card_id: dShCrdMnthlyOrdrs0001
@@ -62,11 +60,6 @@ dashcards:
graph.show_values: true
graph.x_axis.title_text: Month
graph.y_axis.title_text: Revenue
- serdes/meta:
- - id: 8xFV0XmZs2olbGKXWenfS
- model: Dashboard
- - id: WNjyHH5uA36yKp9D7X7bw
- model: DashboardCard
- entity_id: MyNhSS9N9C8B373tSlfaX
card_id: dShCrdNatveOrders0005
created_at: '2026-04-02T02:59:02.778668Z'
@@ -85,11 +78,6 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: 8xFV0XmZs2olbGKXWenfS
- model: Dashboard
- - id: MyNhSS9N9C8B373tSlfaX
- model: DashboardCard
- entity_id: f9pAJKJNxCtrS93uIN7F4
card_id: dShCrdTtlRevScalr0006
created_at: '2026-04-02T02:59:02.778668Z'
@@ -103,10 +91,5 @@ dashcards:
visualization_settings:
column_settings: null
scalar.field: Total Revenue
- serdes/meta:
- - id: 8xFV0XmZs2olbGKXWenfS
- model: Dashboard
- - id: f9pAJKJNxCtrS93uIN7F4
- model: DashboardCard
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
index 52edbee831a..f9bf8edcc19 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_average_order.yaml
@@ -35,9 +35,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdMnthlyAvgOr0003
- label: monthly_average_order
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
index 1bbfbf08fb5..1b93ceb1677 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_cumulative_orders.yaml
@@ -80,9 +80,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdMnthlyCumul0004
- label: monthly_cumulative_orders
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
index 5f3c023da52..8819b743f00 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_orders.yaml
@@ -80,9 +80,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdMnthlyOrdrs0001
- label: monthly_orders
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
index c8e8cb2d324..33a1eacf59d 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/monthly_revenue.yaml
@@ -85,9 +85,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdMnthlyRevnu0002
- label: monthly_revenue
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
index 96ebf037741..9003027709f 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/native_orders_query.yaml
@@ -23,9 +23,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdNatveOrders0005
- label: native_orders_query
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
index 6adccd327f5..2c194750480 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/series_and_parameter_mappings/total_revenue.yaml
@@ -42,9 +42,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdTtlRevScalr0006
- label: total_revenue
- model: Card
+- model: Card
dashboard_id: 8xFV0XmZs2olbGKXWenfS
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard.yaml b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard.yaml
index 5098a7e2dc0..c4d04aa2ed0 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard.yaml
@@ -11,9 +11,7 @@ parameters:
slug: category
type: string/=
serdes/meta:
-- id: 7RZUq1g5o1C5ws_e3ppKf
- label: tabbed_dashboard
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: _Bv8Qc16SHr8CtmMHBEub
card_id: h5F2EjHsRd73Dqqh8sAtd
@@ -40,13 +38,6 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: 7RZUq1g5o1C5ws_e3ppKf
- model: Dashboard
- - id: XcmNByL-bsDQ15jLHBUwr
- model: DashboardTab
- - id: _Bv8Qc16SHr8CtmMHBEub
- model: DashboardCard
- entity_id: uyqXk5DNhkAMTp4W1TD9-
card_id: dShCrdProdsTables0007
created_at: '2026-04-02T02:59:02.778668Z'
@@ -62,39 +53,17 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: 7RZUq1g5o1C5ws_e3ppKf
- model: Dashboard
- - id: frlnbZFzBEzun9_GwdiZd
- model: DashboardTab
- - id: uyqXk5DNhkAMTp4W1TD9-
- model: DashboardCard
tabs:
- created_at: '2026-04-02T02:59:02.778668Z'
entity_id: XcmNByL-bsDQ15jLHBUwr
name: Overview
position: 0
- serdes/meta:
- - id: 7RZUq1g5o1C5ws_e3ppKf
- model: Dashboard
- - id: XcmNByL-bsDQ15jLHBUwr
- model: DashboardTab
- created_at: '2026-04-02T02:59:02.778668Z'
entity_id: frlnbZFzBEzun9_GwdiZd
name: Details
position: 1
- serdes/meta:
- - id: 7RZUq1g5o1C5ws_e3ppKf
- model: Dashboard
- - id: frlnbZFzBEzun9_GwdiZd
- model: DashboardTab
- created_at: '2026-04-02T02:59:02.778668Z'
entity_id: tiXyfAYcKGSBaGMVsqVom
name: Analysis
position: 2
- serdes/meta:
- - id: 7RZUq1g5o1C5ws_e3ppKf
- model: Dashboard
- - id: tiXyfAYcKGSBaGMVsqVom
- model: DashboardTab
width: full
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
index bd8773f0e7e..12e5ffdb3cf 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/tabbed_dashboard/products_table.yaml
@@ -249,9 +249,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: dShCrdProdsTables0007
- label: products_table
- model: Card
+- model: Card
dashboard_id: 7RZUq1g5o1C5ws_e3ppKf
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/dashboards/virtual_cards_dashboard.yaml b/test_resources/serialization_baseline/collections/main/dashboards/virtual_cards_dashboard.yaml
index 1cdba4fd183..6f17f573b4b 100644
--- a/test_resources/serialization_baseline/collections/main/dashboards/virtual_cards_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/main/dashboards/virtual_cards_dashboard.yaml
@@ -5,9 +5,7 @@ creator_id: [email protected]
collection_id: cOlDaShBoArDs0ExAmPlx
parameters: []
serdes/meta:
-- id: Ylbpm_iPeEYav_o0kpUVD
- label: virtual_cards_dashboard
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: WcNpxqVEO_rIeWZwjYv7Z
created_at: '2026-04-02T02:59:02.778668Z'
@@ -23,11 +21,6 @@ dashcards:
text: Sales Overview
virtual_card:
display: heading
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: WcNpxqVEO_rIeWZwjYv7Z
- model: DashboardCard
- entity_id: TF6Oiw2C13CgEKtPyHIow
created_at: '2026-04-02T02:59:02.778668Z'
row: 1
@@ -45,11 +38,6 @@ dashcards:
Use the filters above to narrow down the data.
virtual_card:
display: text
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: TF6Oiw2C13CgEKtPyHIow
- model: DashboardCard
- entity_id: oGC6qBNiHOKo0tWAHWC1m
created_at: '2026-04-02T02:59:02.778668Z'
row: 1
@@ -65,11 +53,6 @@ dashcards:
url: https://metabase.com/docs
virtual_card:
display: link
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: oGC6qBNiHOKo0tWAHWC1m
- model: DashboardCard
- entity_id: 7jlJ-VFISvhlHqxeW7rWp
created_at: '2026-04-02T02:59:02.778668Z'
row: 2
@@ -87,11 +70,6 @@ dashcards:
model: dashboard
virtual_card:
display: link
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: 7jlJ-VFISvhlHqxeW7rWp
- model: DashboardCard
- entity_id: wn16Kfjjjik8153kj14yI
created_at: '2026-04-02T02:59:02.778668Z'
row: 4
@@ -106,11 +84,6 @@ dashcards:
iframe: <iframe src="https://example.com/embed" width="100%" height="400"></iframe>
virtual_card:
display: iframe
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: wn16Kfjjjik8153kj14yI
- model: DashboardCard
- entity_id: HZ_JpYrkE8fMEYJg93RKd
created_at: '2026-04-02T02:59:02.778668Z'
row: 5
@@ -124,10 +97,5 @@ dashcards:
column_settings: null
virtual_card:
display: placeholder
- serdes/meta:
- - id: Ylbpm_iPeEYav_o0kpUVD
- model: Dashboard
- - id: HZ_JpYrkE8fMEYJg93RKd
- model: DashboardCard
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/documents.yaml b/test_resources/serialization_baseline/collections/main/documents.yaml
index 13f42d5a11f..f497e700f69 100644
--- a/test_resources/serialization_baseline/collections/main/documents.yaml
+++ b/test_resources/serialization_baseline/collections/main/documents.yaml
@@ -3,6 +3,4 @@ entity_id: cOlDoCuMeNtS0ExAmPlx2
slug: documents
created_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: cOlDoCuMeNtS0ExAmPlx2
- label: documents
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report.yaml b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report.yaml
index 33fa90feac7..6a8c4eb3ede 100644
--- a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report.yaml
+++ b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report.yaml
@@ -85,6 +85,4 @@ entity_id: dOc1PrOdAnAlYsIsRpTx2
name: Product Analysis Report
updated_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: dOc1PrOdAnAlYsIsRpTx2
- label: product_analysis_report
- model: Document
+- model: Document
diff --git a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
index 91c26360a07..963cfefab65 100644
--- a/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
+++ b/test_resources/serialization_baseline/collections/main/documents/product_analysis_report/category_breakdown.yaml
@@ -29,9 +29,7 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: cRdCaTbReAkDoWn0ExMp1
- label: category_breakdown
- model: Card
+- model: Card
document_id: dOc1PrOdAnAlYsIsRpTx2
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/minimal.yaml b/test_resources/serialization_baseline/collections/main/minimal.yaml
index a336a2099a6..d81bbd30a40 100644
--- a/test_resources/serialization_baseline/collections/main/minimal.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal.yaml
@@ -3,6 +3,4 @@ entity_id: cOlMiNiMaL000ExAmPlx2
slug: minimal
created_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: cOlMiNiMaL000ExAmPlx2
- label: minimal
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics.yaml
index f7b0cbc038a..71b7f10ad43 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics.yaml
@@ -4,6 +4,4 @@ slug: marketing_analytics
created_at: '2026-04-02T02:59:02.778668Z'
parent_id: cOlMiNiMaL000ExAmPlx2
serdes/meta:
-- id: M-Q4pcV0qkiyJ0kiSWECl
- label: marketing_analytics
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_dashboard.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_dashboard.yaml
index b46d9fed410..8ecc04be211 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_dashboard.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_dashboard.yaml
@@ -11,9 +11,7 @@ parameters:
slug: category
type: string/=
serdes/meta:
-- id: Q_jD-f-9clKLFZ2TfUG2h
- label: product_dashboard
- model: Dashboard
+- model: Dashboard
dashcards:
- entity_id: UkpFcfUZMZt9ehChwnrAO
card_id: f1C68pznmrpN1F5xFDj6d
@@ -37,10 +35,5 @@ dashcards:
series: []
visualization_settings:
column_settings: null
- serdes/meta:
- - id: Q_jD-f-9clKLFZ2TfUG2h
- model: Dashboard
- - id: UkpFcfUZMZt9ehChwnrAO
- model: DashboardCard
tabs: []
width: fixed
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
index 5d747adcd82..5f6e74255a8 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/product_overview.yaml
@@ -126,8 +126,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: f1C68pznmrpN1F5xFDj6d
- label: product_overview
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
index cfd0be04b01..bba364bf26d 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/marketing_analytics/top_products_by_revenue.yaml
@@ -32,8 +32,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: FTxpeL9vY5pyb6Lc6lCDK
- label: top_products_by_revenue
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/minimal/populated_timeline.yaml b/test_resources/serialization_baseline/collections/main/minimal/populated_timeline.yaml
index 7ca225f05f4..e98bc3ef578 100644
--- a/test_resources/serialization_baseline/collections/main/minimal/populated_timeline.yaml
+++ b/test_resources/serialization_baseline/collections/main/minimal/populated_timeline.yaml
@@ -10,13 +10,7 @@ events:
time_matters: true
timestamp: '2020-04-11T00:00:00Z'
timezone: US/Pacific
- serdes/meta:
- - id: null
- label: first_event
- model: TimelineEvent
icon: star
name: Populated Timeline
serdes/meta:
-- id: jqbQYdaqb_vXFlZnjvshP
- label: populated_timeline
- model: Timeline
+- model: Timeline
diff --git a/test_resources/serialization_baseline/collections/main/my_action.yaml b/test_resources/serialization_baseline/collections/main/my_action.yaml
index 9a4f7cce7bc..e5d87e371fd 100644
--- a/test_resources/serialization_baseline/collections/main/my_action.yaml
+++ b/test_resources/serialization_baseline/collections/main/my_action.yaml
@@ -10,6 +10,4 @@ parameters: []
query: []
type: implicit
serdes/meta:
-- id: aCtiOn00ExAmPlEx00001
- label: my_action
- model: Action
+- model: Action
diff --git a/test_resources/serialization_baseline/collections/main/queries.yaml b/test_resources/serialization_baseline/collections/main/queries.yaml
index f9026e3147b..e8b3b7c13ed 100644
--- a/test_resources/serialization_baseline/collections/main/queries.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries.yaml
@@ -3,6 +3,4 @@ entity_id: cOlQuErIeS0ExAmPlE2x1
slug: queries
created_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: cOlQuErIeS0ExAmPlE2x1
- label: queries
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
index d3861110274..30f746bce93 100644
--- a/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/arithmetic_expressions.yaml
@@ -208,8 +208,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: 1O_2jSo2fD6m3Qr6My7aa
- label: arithmetic_expressions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
index fa92f76b8de..e0f95b1f883 100644
--- a/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/basic_aggregations.yaml
@@ -242,8 +242,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: h5F2EjHsRd73Dqqh8sAtd
- label: basic_aggregations
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
index 388880a5bc7..231fa0885e6 100644
--- a/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/comparison_filters.yaml
@@ -231,8 +231,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: 8kTL-8IzNdWMtXfaMPZaE
- label: comparison_filters
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
index 59f4a759706..43a0be2f890 100644
--- a/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/conditional_aggregations.yaml
@@ -173,8 +173,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: irROiaJoSsiXPKGxwWvWY
- label: conditional_aggregations
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml b/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
index 9723949930b..22f54a0326b 100644
--- a/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/conditional_and_type_conversion.yaml
@@ -470,8 +470,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: 1hsUzNOepulZo3Jamzd1R
- label: conditional_and_type_conversion
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml b/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
index 3ca03b54ba0..6b3e0c36a68 100644
--- a/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/cumulative_and_statistical_aggregations.yaml
@@ -208,8 +208,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: x61UtCMCuBNjw0TEFQeWG
- label: cumulative_and_statistical_aggregations
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
index 51118df094d..c55eb7de448 100644
--- a/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/fields_and_expressions.yaml
@@ -166,8 +166,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: fLdExPr3sS10nS0ExAmPl
- label: fields_and_expressions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml b/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
index ffe4656addd..9c837611c06 100644
--- a/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/geographic_filter__inside_.yaml
@@ -432,8 +432,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: bK64P6yr9_Nx-A8S3PqOZ
- label: geographic_filter__inside_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml b/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
index f6a5c0d7444..e6ccefde6aa 100644
--- a/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/joins___strategies_and_compound_conditions.yaml
@@ -666,8 +666,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: wpW9JO5MsHQd0-7WrR7gN
- label: joins___strategies_and_compound_conditions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
index f88a34d4f2a..52ad67c1a83 100644
--- a/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/math_functions.yaml
@@ -472,8 +472,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: jPrM-oh3r1BR42xSs4Ipj
- label: math_functions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml b/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
index 54dccfbc728..c2e13b80849 100644
--- a/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/metric__measure__and_segment_references.yaml
@@ -58,8 +58,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: kBjQ5VXJ5z3vYSW72J6qa
- label: metric__measure__and_segment_references
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
index 3640e3a49bb..7617397f76f 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___card_and_snippet_references.yaml
@@ -33,8 +33,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: HiBFSt0BNx5s5MxVDLLKB
- label: native_query___card_and_snippet_references
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
index 39c10c98593..088d5c613fd 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___field_filter_and_temporal_unit.yaml
@@ -60,8 +60,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: sk02d7sPWAk2TYH2Y7JhZ
- label: native_query___field_filter_and_temporal_unit
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml b/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
index a9fbf05b609..6d7eb059102 100644
--- a/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/native_query___variables.yaml
@@ -47,8 +47,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: 2u10n8GV6u0LFYrq8yV5p
- label: native_query___variables
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml b/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
index fef31bb499c..9e910fd0549 100644
--- a/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/nested_query.yaml
@@ -125,8 +125,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: 1t9TE-8T-AlaM19nx3yQV
- label: nested_query
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
index 4028a73d79e..65cea0637a3 100644
--- a/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/null__empty__and_string_filters.yaml
@@ -420,8 +420,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: ZvHEBpdFQ-VSvem16KCkL
- label: null__empty__and_string_filters
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml b/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
index 405bf6de6a9..c80398a533c 100644
--- a/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/source_card_reference.yaml
@@ -206,8 +206,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: gt4OaWYAuDWRHn5Irnd4h
- label: source_card_reference
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
index 82e8486f866..ebdd187e5d9 100644
--- a/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/string_functions.yaml
@@ -551,8 +551,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: HeLFZSVb4Jm25p4tWfVP9
- label: string_functions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
index 59885dda51c..1610bfb18fe 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_and_logical_filters.yaml
@@ -303,8 +303,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: BMx-SlSPsSfGSKaEgOzn0
- label: temporal_and_logical_filters
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
index 95865a485fd..ddf85153438 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_expressions.yaml
@@ -463,8 +463,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: DBBrqcMAmOO0sbM_CzM_Z
- label: temporal_expressions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml b/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
index ef7bfbccf3a..418f90de7a3 100644
--- a/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/temporal_extraction.yaml
@@ -706,8 +706,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: bDK7jyPszEHzHh4aG4_SV
- label: temporal_extraction
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml b/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
index a7b17b15ddf..d79141ee972 100644
--- a/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/total_revenue.yaml
@@ -42,8 +42,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: IW8kbqZVaMxdGtCM2F4U6
- label: total_revenue
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: metric
diff --git a/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml b/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
index 457740d7223..039b60a0b52 100644
--- a/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/url_functions.yaml
@@ -539,8 +539,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: uwAeNRHymXTD1G_7lWV1d
- label: url_functions
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml b/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
index e10f9845810..b8324b27065 100644
--- a/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
+++ b/test_resources/serialization_baseline/collections/main/queries/window_function___offset.yaml
@@ -109,8 +109,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: ErQY8K5Tep4xBc3VY_-1e
- label: window_function___offset
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/source_model.yaml b/test_resources/serialization_baseline/collections/main/source_model.yaml
index 0fa110981e6..d53a8979038 100644
--- a/test_resources/serialization_baseline/collections/main/source_model.yaml
+++ b/test_resources/serialization_baseline/collections/main/source_model.yaml
@@ -323,8 +323,6 @@ visualization_settings:
column_settings: null
card_schema: 24
serdes/meta:
-- id: sRcMoDeL00ExAmPlEx001
- label: source_model
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: model
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings.yaml
index 05f348e3277..ab386241355 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings.yaml
@@ -3,6 +3,4 @@ entity_id: cOlViZsEtTiNgS0ExAmP1
slug: visualization_settings
created_at: '2026-04-02T02:59:02.778668Z'
serdes/meta:
-- id: cOlViZsEtTiNgS0ExAmP1
- label: visualization_settings
- model: Collection
+- model: Collection
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
index 7b854356233..54a9ae16704 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/customer_locations__map_.yaml
@@ -452,8 +452,6 @@ visualization_settings:
map.zoom: 4
card_schema: 24
serdes/meta:
-- id: CI61cHgBAKPBEDTxhK8X3
- label: customer_locations__map_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
index 10e25ca6090..f69cdb17d03 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/monthly_revenue_changes__waterfall_.yaml
@@ -89,8 +89,6 @@ visualization_settings:
waterfall.total_color: '#509EE3'
card_schema: 24
serdes/meta:
-- id: kJWYpTzyc9ow-75HjyIhf
- label: monthly_revenue_changes__waterfall_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
index 8898231f403..a20b62ae694 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__pie_.yaml
@@ -89,8 +89,6 @@ visualization_settings:
version: 2
card_schema: 24
serdes/meta:
-- id: dYD1j3pQtJdctg8duByUL
- label: orders_by_category__pie_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
index 78a2c1cab46..ba255c9cfe9 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_by_category__stacked_bar_.yaml
@@ -119,8 +119,6 @@ visualization_settings:
stackable.stack_type: stacked
card_schema: 24
serdes/meta:
-- id: ciG63nSLHKRTImt5iWEte
- label: orders_by_category__stacked_bar_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
index 924e1053320..ee36d91ee30 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/orders_pivot_table.yaml
@@ -145,8 +145,6 @@ visualization_settings:
pivot_table.show_row_totals: true
card_schema: 24
serdes/meta:
-- id: BjwHr6elEuKQuL26BEgno
- label: orders_pivot_table
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
index 4f6ca044677..68b4d1d1f94 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/products_table__formatted_.yaml
@@ -337,8 +337,6 @@ visualization_settings:
name: EAN
card_schema: 24
serdes/meta:
-- id: Wo5d6IV8lb63wex29uh6H
- label: products_table__formatted_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
index 5bc2dc5b704..91646a28645 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_gauge.yaml
@@ -55,8 +55,6 @@ visualization_settings:
min: 150000
card_schema: 24
serdes/meta:
-- id: GWrIQqjbzxysSCm8PLU5j
- label: revenue_gauge
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
index a315446dc69..0a054033de4 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/revenue_over_time__line_.yaml
@@ -108,8 +108,6 @@ visualization_settings:
show_series_values: true
card_schema: 24
serdes/meta:
-- id: UEWVldEEZ-3sYUjjN54qz
- label: revenue_over_time__line_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
index fc150bb0ccf..6bf2a12efac 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/sales_funnel.yaml
@@ -80,8 +80,6 @@ visualization_settings:
funnel.type: funnel
card_schema: 24
serdes/meta:
-- id: mkKa6jf-QsuCRnaPOIsYh
- label: sales_funnel
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml b/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
index 3545be4618f..d521479464b 100644
--- a/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
+++ b/test_resources/serialization_baseline/collections/main/visualization_settings/total_revenue__smart_scalar_.yaml
@@ -100,8 +100,6 @@ visualization_settings:
value: 50000
card_schema: 24
serdes/meta:
-- id: bSj47tilPIkwDIewvMf8z
- label: total_revenue__smart_scalar_
- model: Card
+- model: Card
metabase_version: v1.57.1-SNAPSHOT (14ff27d)
type: question
diff --git a/test_resources/serialization_baseline/collections/snippets/active_product_filter.yaml b/test_resources/serialization_baseline/collections/snippets/active_product_filter.yaml
index 59336f1711e..4995f02210b 100644
--- a/test_resources/serialization_baseline/collections/snippets/active_product_filter.yaml
+++ b/test_resources/serialization_baseline/collections/snippets/active_product_filter.yaml
@@ -5,6 +5,4 @@ content: '"CREATED_AT" >= DATEADD(''year'', -1, CURRENT_TIMESTAMP) AND "total_re
creator_id: [email protected]
template_tags: {}
serdes/meta:
-- id: WyQWnT23PF-SfbYLROllJ
- label: active_product_filter
- model: NativeQuerySnippet
+- model: NativeQuerySnippet
diff --git a/test_resources/serialization_baseline/collections/snippets/active_recent_filter.yaml b/test_resources/serialization_baseline/collections/snippets/active_recent_filter.yaml
index 16d7cdb293f..111f097d294 100644
--- a/test_resources/serialization_baseline/collections/snippets/active_recent_filter.yaml
+++ b/test_resources/serialization_baseline/collections/snippets/active_recent_filter.yaml
@@ -2,14 +2,15 @@ name: Active Recent Filter
description: Combines Active Product Filter with Date Range Filter
entity_id: c5PMqT66HwWoy0m52WTI5
created_at: '2026-04-02T02:59:02.778668Z'
-content: '{{snippet: Active Product Filter}} AND {{snippet: Date Range Filter}}'
+content: '{{snippet: Active Product Filter}} AND {{snippet: Date Range Filter}} AND {{snippet: Missing Filter}}
+ AND category = {{category}} AND id IN (SELECT id FROM {{#1-basic-aggregations}})'
creator_id: [email protected]
template_tags:
'snippet: Active Product Filter':
display-name: 'Snippet: Active Product Filter'
id: dd000001-0000-0000-0000-000000000001
name: 'snippet: Active Product Filter'
- snippet-id: 1
+ snippet-id: WyQWnT23PF-SfbYLROllJ
snippet-name: Active Product Filter
type: snippet
'snippet: Date Range Filter':
@@ -18,7 +19,22 @@ template_tags:
name: 'snippet: Date Range Filter'
snippet-name: Date Range Filter
type: snippet
+ 'snippet: Missing Filter':
+ display-name: 'Snippet: Missing Filter'
+ id: dd000003-0000-0000-0000-000000000003
+ name: 'snippet: Missing Filter'
+ snippet-name: Missing Filter
+ type: snippet
+ category:
+ display-name: Category
+ id: dd000004-0000-0000-0000-000000000004
+ name: category
+ type: text
+ '#1-basic-aggregations':
+ card-id: h5F2EjHsRd73Dqqh8sAtd
+ display-name: '#1 Basic Aggregations'
+ id: dd000005-0000-0000-0000-000000000005
+ name: '#1-basic-aggregations'
+ type: card
serdes/meta:
-- id: c5PMqT66HwWoy0m52WTI5
- label: active_recent_filter
- model: NativeQuerySnippet
+- model: NativeQuerySnippet
diff --git a/test_resources/serialization_baseline/collections/snippets/date_range_filter.yaml b/test_resources/serialization_baseline/collections/snippets/date_range_filter.yaml
index 7b7db2c21b2..286914ba404 100644
--- a/test_resources/serialization_baseline/collections/snippets/date_range_filter.yaml
+++ b/test_resources/serialization_baseline/collections/snippets/date_range_filter.yaml
@@ -5,6 +5,4 @@ content: CREATED_AT BETWEEN '2024-01-01' AND '2024-12-31'
creator_id: [email protected]
template_tags: {}
serdes/meta:
-- id: jpIUEStroQyLnJ-MVfeS4
- label: date_range_filter
- model: NativeQuerySnippet
+- model: NativeQuerySnippet
diff --git a/test_resources/serialization_baseline/collections/transforms/daily_order_summary.yaml b/test_resources/serialization_baseline/collections/transforms/daily_order_summary.yaml
index d4ac5434eca..08a6178fdca 100644
--- a/test_resources/serialization_baseline/collections/transforms/daily_order_summary.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/daily_order_summary.yaml
@@ -22,21 +22,13 @@ tags:
- entity_id: qJU4-opN0IFLKDEdmXiYh
position: 0
tag_id: dUW7nvQHQBdA0Rx0gJckI
- serdes/meta:
- - id: qJU4-opN0IFLKDEdmXiYh
- model: TransformTransformTag
- entity_id: hTtmHg0mopz6qzrEDukSm
position: 1
tag_id: 1uWng5tP1gyxr44PJ5FPb
- serdes/meta:
- - id: hTtmHg0mopz6qzrEDukSm
- model: TransformTransformTag
target:
database: Sample Database
name: daily_order_summary
schema: TRANSFORMS
type: table
serdes/meta:
-- id: 7XqqzlsonSq4KFyOvtrAm
- label: daily_order_summary
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/hourly_product_stats.yaml b/test_resources/serialization_baseline/collections/transforms/hourly_product_stats.yaml
index 042aaa602a3..e0579c3ac45 100644
--- a/test_resources/serialization_baseline/collections/transforms/hourly_product_stats.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/hourly_product_stats.yaml
@@ -37,15 +37,10 @@ tags:
- entity_id: T3caSScVNDqFF8Q-EsM84
position: 0
tag_id: wYLcUPbtF7jVPO0duGGHR
- serdes/meta:
- - id: T3caSScVNDqFF8Q-EsM84
- model: TransformTransformTag
target:
database: Sample Database
name: hourly_product_stats
schema: TRANSFORMS
type: table
serdes/meta:
-- id: aWiR53tfmHEibiFGuIQeP
- label: hourly_product_stats
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/monthly_order_summary.yaml b/test_resources/serialization_baseline/collections/transforms/monthly_order_summary.yaml
index c3164427ab2..c6be1f549e1 100644
--- a/test_resources/serialization_baseline/collections/transforms/monthly_order_summary.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/monthly_order_summary.yaml
@@ -40,6 +40,4 @@ target:
schema: TRANSFORMS
type: table
serdes/meta:
-- id: 1fNzUt_CgppinjPk7pGKH
- label: monthly_order_summary
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/monthly_sales_summary.yaml b/test_resources/serialization_baseline/collections/transforms/monthly_sales_summary.yaml
index 20f1c63b9dc..69b894ce9a2 100644
--- a/test_resources/serialization_baseline/collections/transforms/monthly_sales_summary.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/monthly_sales_summary.yaml
@@ -27,6 +27,4 @@ target:
schema: TRANSFORMS
type: table
serdes/meta:
-- id: w7EfUbsxLA7kXBHVXgeaZ
- label: monthly_sales_summary
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/product_revenue_report.yaml b/test_resources/serialization_baseline/collections/transforms/product_revenue_report.yaml
index a6c537ed25f..edd9e1c9fc6 100644
--- a/test_resources/serialization_baseline/collections/transforms/product_revenue_report.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/product_revenue_report.yaml
@@ -27,6 +27,4 @@ target:
schema: TRANSFORMS
type: table
serdes/meta:
-- id: 7JwIkkAG-06-nsl4jzsaq
- label: product_revenue_report
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/product_summary.yaml b/test_resources/serialization_baseline/collections/transforms/product_summary.yaml
index b70365f248e..b07e74999f3 100644
--- a/test_resources/serialization_baseline/collections/transforms/product_summary.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/product_summary.yaml
@@ -40,6 +40,4 @@ target:
schema: TRANSFORMS
type: table
serdes/meta:
-- id: rT5vWxYz1aBcDeFgHiJkL
- label: product_summary
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/collections/transforms/python_hello_world.yaml b/test_resources/serialization_baseline/collections/transforms/python_hello_world.yaml
index 834a466680f..f3354d1e986 100644
--- a/test_resources/serialization_baseline/collections/transforms/python_hello_world.yaml
+++ b/test_resources/serialization_baseline/collections/transforms/python_hello_world.yaml
@@ -22,6 +22,4 @@ target:
schema: TRANSFORMS
type: table
serdes/meta:
-- id: g2cRYwopfoL1BW9Y4n3wb
- label: python_hello_world
- model: Transform
+- model: Transform
diff --git a/test_resources/serialization_baseline/custom_viz_plugins/test_plugin.yaml b/test_resources/serialization_baseline/custom_viz_plugins/test_plugin.yaml
index e46a3dd0887..e422d5d23eb 100644
--- a/test_resources/serialization_baseline/custom_viz_plugins/test_plugin.yaml
+++ b/test_resources/serialization_baseline/custom_viz_plugins/test_plugin.yaml
@@ -5,6 +5,4 @@ bundle_hash: deadbeef
bundle: cHJldGVuZCB0Z3ogYnl0ZXM=
created_at: '2026-04-02T01:50:04.994996Z'
serdes/meta:
-- id: test-plugin
- label: test-plugin
- model: CustomVizPlugin
+- model: CustomVizPlugin
diff --git a/test_resources/serialization_baseline/databases/sample_database/sample_database.yaml b/test_resources/serialization_baseline/databases/sample_database/sample_database.yaml
index a5da8667b03..32cd20353ae 100644
--- a/test_resources/serialization_baseline/databases/sample_database/sample_database.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/sample_database.yaml
@@ -14,5 +14,4 @@ settings:
database-source-dataset-name: test-data
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
+- model: Database
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/created_at.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/created_at.yaml
index 9d859d9ceba..0ec0a0f52af 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/created_at.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/created_at.yaml
@@ -13,12 +13,5 @@ semantic_type: type/CreationTimestamp
position: 7
database_position: 7
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: CREATED_AT
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/discount.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/discount.yaml
index 3917f591abc..f861e1a023f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/discount.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/discount.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Discount
position: 6
database_position: 6
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: DISCOUNT
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/id.yaml
index 67d8e7ff67e..a481118d197 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/id.yaml
@@ -14,12 +14,5 @@ database_is_auto_increment: true
position: 0
database_position: 0
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/product_id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/product_id.yaml
index 748d2c68d3a..2e2a2d06bad 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/product_id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/product_id.yaml
@@ -18,12 +18,5 @@ fk_target_field_id:
position: 2
database_position: 2
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: PRODUCT_ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity.yaml
index 38bb243155a..ab349cb4525 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity.yaml
@@ -14,12 +14,5 @@ position: 8
database_position: 8
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: QUANTITY
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity___fieldvalues.yaml
index a8cb745cf27..155d5567eab 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/quantity___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- ORDERS
+- QUANTITY
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -81,13 +86,4 @@ values:
- 88
- 100
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: QUANTITY
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/subtotal.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/subtotal.yaml
index 3c414e629f5..ab28239369e 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/subtotal.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/subtotal.yaml
@@ -12,12 +12,5 @@ effective_type: type/Float
position: 3
database_position: 3
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: SUBTOTAL
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/tax.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/tax.yaml
index 394275d8bca..a3cced2f74c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/tax.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/tax.yaml
@@ -12,12 +12,5 @@ effective_type: type/Float
position: 4
database_position: 4
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: TAX
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total.yaml
index da8d0340475..70c99c35183 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total.yaml
@@ -12,12 +12,5 @@ effective_type: type/Float
position: 5
database_position: 5
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: TOTAL
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total___fieldusersettings.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total___fieldusersettings.yaml
index 8eeab41c8cc..e005b75a559 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total___fieldusersettings.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/total___fieldusersettings.yaml
@@ -1,13 +1,9 @@
+field_id:
+- Sample Database
+- PUBLIC
+- ORDERS
+- TOTAL
created_at: '2025-06-13T12:52:06.383265Z'
description: Total order amount including tax
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: TOTAL
- model: Field
-- id: '1'
- model: FieldUserSettings
+- model: FieldUserSettings
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id.yaml
index 6e98af85feb..602064fcaee 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id.yaml
@@ -18,12 +18,5 @@ fk_target_field_id:
position: 1
database_position: 1
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: USER_ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id___dimension.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id___dimension.yaml
index 150017abf7b..8c0f98735ae 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id___dimension.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/fields/user_id___dimension.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- ORDERS
+- USER_ID
created_at: '2025-06-13T12:52:06.383265Z'
entity_id: aMXK1q9eBB518aoCBQ6oo
human_readable_field_id:
@@ -8,13 +13,4 @@ human_readable_field_id:
name: User
type: external
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: USER_ID
- model: Field
-- id: aMXK1q9eBB518aoCBQ6oo
- model: Dimension
+- model: Dimension
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
index 8396a51f613..1531dd2102f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/average_revenue_per_order.yaml
@@ -22,6 +22,4 @@ description: Uses Total Revenue and Order Count measures
entity_id: dc8eiyLh9S0IKwV_UuvTz
name: Average Revenue Per Order
serdes/meta:
-- id: dc8eiyLh9S0IKwV_UuvTz
- label: average_revenue_per_order
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
index 54265284673..ec3ebb88512 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/median_order_total.yaml
@@ -21,6 +21,4 @@ definition:
entity_id: d4G5fMj5smJ17Nd0dvE2A
name: Median Order Total
serdes/meta:
-- id: d4G5fMj5smJ17Nd0dvE2A
- label: median_order_total
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
index 90854cc0b28..3edfe61a76c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/order_count.yaml
@@ -15,6 +15,4 @@ definition:
entity_id: DBap2523KuN4Lt-cYrUjF
name: Order Count
serdes/meta:
-- id: DBap2523KuN4Lt-cYrUjF
- label: order_count
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
index 63f504d8181..b469b8aedc2 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/measures/total_revenue.yaml
@@ -21,6 +21,4 @@ definition:
entity_id: 8WteUpyQQqObrxLv4KQ-j
name: Total Revenue
serdes/meta:
-- id: 8WteUpyQQqObrxLv4KQ-j
- label: total_revenue
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders.yaml
index a0980a1f2c7..a96b292f0cd 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders.yaml
@@ -8,11 +8,6 @@ active: true
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
+- model: Table
data_authority: unconfigured
data_layer: internal
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders___tableusersettings.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders___tableusersettings.yaml
index c916f7d5263..d9fe07a43cb 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders___tableusersettings.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/orders___tableusersettings.yaml
@@ -1,12 +1,9 @@
+table_id:
+- Sample Database
+- PUBLIC
+- ORDERS
created_at: '2025-06-13T12:52:06.383265Z'
description: Every order placed, as the team describes it
display_name: Customer Orders
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: ORDERS
- model: Table
-- id: '1'
- model: TableUserSettings
+- model: TableUserSettings
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
index 3197c894278..c3df20bc461 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/orders/segments/large_orders.yaml
@@ -22,6 +22,4 @@ definition:
entity_id: OaFXAvEzPvu9ZXW5PUMRa
name: Large Orders
serdes/meta:
-- id: OaFXAvEzPvu9ZXW5PUMRa
- label: large_orders
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/address.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/address.yaml
index 1a5aeed424c..c312e6edea9 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/address.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/address.yaml
@@ -12,12 +12,5 @@ effective_type: type/Text
position: 1
database_position: 1
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: ADDRESS
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/birth_date.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/birth_date.yaml
index c3deebafc35..c533b048bd7 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/birth_date.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/birth_date.yaml
@@ -12,12 +12,5 @@ effective_type: type/Date
position: 9
database_position: 9
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: BIRTH_DATE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/city.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/city.yaml
index 416080147ec..6f285629134 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/city.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/city.yaml
@@ -13,12 +13,5 @@ semantic_type: type/City
position: 5
database_position: 5
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: CITY
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/created_at.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/created_at.yaml
index 22b37e0cf34..6589f6c30b4 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/created_at.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/created_at.yaml
@@ -13,12 +13,5 @@ semantic_type: type/CreationTimestamp
position: 12
database_position: 12
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: CREATED_AT
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/email.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/email.yaml
index b73d5efa42a..f5a8ebc57aa 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/email.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/email.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Email
position: 2
database_position: 2
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: EMAIL
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/id.yaml
index 73a685a2c5d..98cc8f2312c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/id.yaml
@@ -14,12 +14,5 @@ database_is_auto_increment: true
position: 0
database_position: 0
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/latitude.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/latitude.yaml
index 8312e68a1df..a90f2c363d4 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/latitude.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/latitude.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Latitude
position: 11
database_position: 11
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: LATITUDE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/longitude.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/longitude.yaml
index 2542da863e4..d8b2a14fabb 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/longitude.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/longitude.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Longitude
position: 6
database_position: 6
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: LONGITUDE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/name.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/name.yaml
index 0672a144ac9..ce9f3b3efc2 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/name.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/name.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Name
position: 4
database_position: 4
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: NAME
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/password.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/password.yaml
index 1bd495c8d8d..b76bb76e81f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/password.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/password.yaml
@@ -12,12 +12,5 @@ effective_type: type/Text
position: 3
database_position: 3
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: PASSWORD
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source.yaml
index 139314b32a7..daa08f2e836 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source.yaml
@@ -14,12 +14,5 @@ position: 8
database_position: 8
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: SOURCE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source___fieldvalues.yaml
index 87f10dca20b..e08145c38a9 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/source___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PEOPLE
+- SOURCE
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -9,13 +14,4 @@ values:
- Organic
- Twitter
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: SOURCE
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state.yaml
index 0ba2aa0a8fe..a1f1d6daa8f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state.yaml
@@ -14,12 +14,5 @@ position: 7
database_position: 7
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: STATE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state___fieldvalues.yaml
index 66687e2095a..7b3cdf29c1d 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/state___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PEOPLE
+- STATE
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -53,13 +58,4 @@ values:
- WV
- WY
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: STATE
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/zip.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/zip.yaml
index 1b4c2d14a00..c26abe5490e 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/zip.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/fields/zip.yaml
@@ -12,12 +12,5 @@ effective_type: type/Text
position: 10
database_position: 10
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
-- id: ZIP
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/people.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/people.yaml
index 48e9725f584..d654179559b 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/people.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/people.yaml
@@ -8,11 +8,6 @@ active: true
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PEOPLE
- model: Table
+- model: Table
data_authority: unconfigured
data_layer: internal
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
index 163a69e42ea..ea70b9f3190 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/people/segments/nyc_area_people.yaml
@@ -32,6 +32,4 @@ description: People located within the NYC bounding box
entity_id: D2R9JpvI8sMfYWqfPsTkx
name: NYC Area People
serdes/meta:
-- id: D2R9JpvI8sMfYWqfPsTkx
- label: nyc_area_people
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category.yaml
index 6cd0cd60e4d..7a0db455e79 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category.yaml
@@ -14,12 +14,5 @@ position: 3
database_position: 3
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: CATEGORY
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category___fieldvalues.yaml
index 6b641c0e126..73d4eb936d1 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/category___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PRODUCTS
+- CATEGORY
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -8,13 +13,4 @@ values:
- Gizmo
- Widget
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: CATEGORY
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/created_at.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/created_at.yaml
index 030ab629f92..b7d99438103 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/created_at.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/created_at.yaml
@@ -13,12 +13,5 @@ semantic_type: type/CreationTimestamp
position: 7
database_position: 7
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: CREATED_AT
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean.yaml
index e217030acbf..f1ba8cac41f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean.yaml
@@ -13,12 +13,5 @@ position: 1
database_position: 1
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: EAN
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean___fieldvalues.yaml
index cb6ff0e68a7..f1ed0e6cada 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/ean___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PRODUCTS
+- EAN
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -204,13 +209,4 @@ values:
- '9802920493181'
- '9978391194435'
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: EAN
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/id.yaml
index 3e124bffd88..6b137ae328b 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/id.yaml
@@ -14,12 +14,5 @@ database_is_auto_increment: true
position: 0
database_position: 0
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/price.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/price.yaml
index 48018be58f6..8cd4c39b140 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/price.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/price.yaml
@@ -12,12 +12,5 @@ effective_type: type/Float
position: 5
database_position: 5
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: PRICE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/rating.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/rating.yaml
index 4570c605650..89c1cfc4826 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/rating.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/rating.yaml
@@ -13,12 +13,5 @@ semantic_type: type/Score
position: 6
database_position: 6
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: RATING
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title.yaml
index 357b688f9fc..0322ed8e18f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title.yaml
@@ -14,12 +14,5 @@ position: 2
database_position: 2
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: TITLE
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title___fieldvalues.yaml
index e1edfca9035..e085487215f 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/title___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PRODUCTS
+- TITLE
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -203,13 +208,4 @@ values:
- Synergistic Steel Chair
- Synergistic Wool Coat
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: TITLE
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor.yaml
index faec8a33b00..9af956a8a18 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor.yaml
@@ -14,12 +14,5 @@ position: 4
database_position: 4
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: VENDOR
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor___fieldvalues.yaml
index e5c9c1b52b8..beb12c4d3bc 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/fields/vendor___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- PRODUCTS
+- VENDOR
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -204,13 +209,4 @@ values:
- Zemlak, Botsford and Corkery
- Zemlak-Wiegand
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
-- id: VENDOR
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
index 2a12e6be1f0..f0c17ff6379 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price.yaml
@@ -21,6 +21,4 @@ definition:
entity_id: mSrAvgProdPrice00008x
name: Average Product Price
serdes/meta:
-- id: mSrAvgProdPrice00008x
- label: average_product_price
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
index 5f91fbd0e11..3a7edd22595 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_product_price_2.yaml
@@ -21,6 +21,4 @@ definition:
entity_id: xK7mPqR2sT4uVwXyZ9a1b
name: Average Product Price
serdes/meta:
-- id: xK7mPqR2sT4uVwXyZ9a1b
- label: average_product_price
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
index 438f115ede4..3591f7ca3ad 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/average_widget_price.yaml
@@ -22,6 +22,4 @@ description: Average price of Widget products — uses Widget Products segment a
entity_id: K7cMzOau9SI2h8hCx936w
name: Average Widget Price
serdes/meta:
-- id: K7cMzOau9SI2h8hCx936w
- label: average_widget_price
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
index 5753135109f..3c87a4ee8c6 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/measures/product_count.yaml
@@ -21,6 +21,4 @@ definition:
entity_id: 8kxQ2Wr7PmN5dLf3hYz9v
name: Product Count
serdes/meta:
-- id: 8kxQ2Wr7PmN5dLf3hYz9v
- label: product_count
- model: Measure
+- model: Measure
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/products.yaml
index daf95beb220..a9e0234b1b3 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/products.yaml
@@ -8,11 +8,6 @@ active: true
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: PRODUCTS
- model: Table
+- model: Table
data_authority: unconfigured
data_layer: internal
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
index 12aba54d39a..123e82a0153 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/premium_widgets.yaml
@@ -26,6 +26,4 @@ description: Widget products priced above $50 — refines the Widget Products se
entity_id: 2hxhoN3HrQJIaWc5umpBn
name: Premium Widgets
serdes/meta:
-- id: 2hxhoN3HrQJIaWc5umpBn
- label: premium_widgets
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
index cb18bbd257b..77f84080ebe 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/recent_mid_range_products.yaml
@@ -52,6 +52,4 @@ description: Products created in last year, priced 20-100, not null rating
entity_id: wdYkSSArR5ymVGa0pvb47
name: Recent Mid-Range Products
serdes/meta:
-- id: wdYkSSArR5ymVGa0pvb47
- label: recent_mid_range_products
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
index 4f2593894b2..a6a74254072 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/searchable_products.yaml
@@ -58,6 +58,4 @@ description: Products with non-empty title containing "awesome", vendor starting
entity_id: yZptbJRR3S8L9S9r0ZF8M
name: Searchable Products
serdes/meta:
-- id: yZptbJRR3S8L9S9r0ZF8M
- label: searchable_products
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
index 1075d7a3e64..dfa74bb56a8 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/products/segments/widget_products.yaml
@@ -22,6 +22,4 @@ definition:
entity_id: aB3kLmN9pQrStUvWxYz1a
name: Widget Products
serdes/meta:
-- id: aB3kLmN9pQrStUvWxYz1a
- label: widget_products
- model: Segment
+- model: Segment
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/body.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/body.yaml
index 7c1f0e3f79f..d330d53240c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/body.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/body.yaml
@@ -13,12 +13,5 @@ preview_display: false
position: 4
database_position: 4
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: BODY
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/created_at.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/created_at.yaml
index 84f49471d76..ced2023d9d0 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/created_at.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/created_at.yaml
@@ -13,12 +13,5 @@ semantic_type: type/CreationTimestamp
position: 5
database_position: 5
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: CREATED_AT
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/id.yaml
index b8e1de34aad..98d29d5b9a8 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/id.yaml
@@ -14,12 +14,5 @@ database_is_auto_increment: true
position: 0
database_position: 0
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/product_id.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/product_id.yaml
index e138084733e..37c9270a20d 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/product_id.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/product_id.yaml
@@ -18,12 +18,5 @@ fk_target_field_id:
position: 1
database_position: 1
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: PRODUCT_ID
- model: Field
+- model: Field
database_indexed: true
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating.yaml
index 3b8ce05dd7f..cad3f43a1d5 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating.yaml
@@ -14,12 +14,5 @@ position: 3
database_position: 3
has_field_values: auto-list
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: RATING
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating___fieldvalues.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating___fieldvalues.yaml
index af6a8a027f7..a536f42e43d 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating___fieldvalues.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/rating___fieldvalues.yaml
@@ -1,3 +1,8 @@
+field_id:
+- Sample Database
+- PUBLIC
+- REVIEWS
+- RATING
created_at: '2024-08-28T14:38:42.774331Z'
human_readable_values: []
last_used_at: '2024-08-28T14:38:42.774331Z'
@@ -9,13 +14,4 @@ values:
- 4
- 5
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: RATING
- model: Field
-- id: '0'
- model: FieldValues
+- model: FieldValues
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/reviewer.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/reviewer.yaml
index bb229ff2197..70aabb6de1e 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/reviewer.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/fields/reviewer.yaml
@@ -12,12 +12,5 @@ effective_type: type/Text
position: 2
database_position: 2
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
-- id: REVIEWER
- model: Field
+- model: Field
database_indexed: false
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/reviews.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/reviews.yaml
index 7c12de7754f..fa70dba78a4 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/reviews.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/public/tables/reviews/reviews.yaml
@@ -8,11 +8,6 @@ active: true
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: PUBLIC
- model: Schema
-- id: REVIEWS
- model: Table
+- model: Table
data_authority: unconfigured
data_layer: internal
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/daily_order_summary/daily_order_summary.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/daily_order_summary/daily_order_summary.yaml
index 9d1a3fb3e70..ddb9e8aa34c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/daily_order_summary/daily_order_summary.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/daily_order_summary/daily_order_summary.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: daily_order_summary
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hello_world/hello_world.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hello_world/hello_world.yaml
index b963ffa2895..be3bcd2ca46 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hello_world/hello_world.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hello_world/hello_world.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: hello_world
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hourly_product_stats/hourly_product_stats.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hourly_product_stats/hourly_product_stats.yaml
index 0587ed99a90..949b2621b5c 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hourly_product_stats/hourly_product_stats.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/hourly_product_stats/hourly_product_stats.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: hourly_product_stats
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_order_summary/monthly_order_summary.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_order_summary/monthly_order_summary.yaml
index 0b5f9181555..7adc4d029e0 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_order_summary/monthly_order_summary.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_order_summary/monthly_order_summary.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: monthly_order_summary
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_sales_summary/monthly_sales_summary.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_sales_summary/monthly_sales_summary.yaml
index 19cac9fb7f1..282c971d786 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_sales_summary/monthly_sales_summary.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/monthly_sales_summary/monthly_sales_summary.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: monthly_sales_summary
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_revenue_report/product_revenue_report.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_revenue_report/product_revenue_report.yaml
index 05ebe49f1e3..423a842ce57 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_revenue_report/product_revenue_report.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_revenue_report/product_revenue_report.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: product_revenue_report
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_summary/product_summary.yaml b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_summary/product_summary.yaml
index c76153d9dfe..3285766858e 100644
--- a/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_summary/product_summary.yaml
+++ b/test_resources/serialization_baseline/databases/sample_database/schemas/transforms/tables/product_summary/product_summary.yaml
@@ -7,12 +7,7 @@ active: false
field_order: database
initial_sync_status: complete
serdes/meta:
-- id: Sample Database
- model: Database
-- id: TRANSFORMS
- model: Schema
-- id: product_summary
- model: Table
+- model: Table
data_authority: computed
data_layer: internal
data_source: metabase-transform
diff --git a/test_resources/serialization_baseline/embedding_themes/dark.yaml b/test_resources/serialization_baseline/embedding_themes/dark.yaml
index 4e186fca345..3bd8d1cedb5 100644
--- a/test_resources/serialization_baseline/embedding_themes/dark.yaml
+++ b/test_resources/serialization_baseline/embedding_themes/dark.yaml
@@ -4,6 +4,4 @@ name: Dark
settings: {}
updated_at: '2025-11-05T17:34:01.946143Z'
serdes/meta:
-- id: cAGrIWAv42Lh6i9Jcpu0J
- label: dark
- model: EmbeddingTheme
+- model: EmbeddingTheme
diff --git a/test_resources/serialization_baseline/embedding_themes/light.yaml b/test_resources/serialization_baseline/embedding_themes/light.yaml
index a069ff2be4d..71b67ffb04d 100644
--- a/test_resources/serialization_baseline/embedding_themes/light.yaml
+++ b/test_resources/serialization_baseline/embedding_themes/light.yaml
@@ -4,6 +4,4 @@ name: Light
settings: {}
updated_at: '2025-11-05T17:34:01.946143Z'
serdes/meta:
-- id: WvRp2yy6Tk98WunjkA8aE
- label: light
- model: EmbeddingTheme
+- model: EmbeddingTheme
diff --git a/test_resources/serialization_baseline/glossary/foobar.yaml b/test_resources/serialization_baseline/glossary/foobar.yaml
index ce81506fc85..e238a472157 100644
--- a/test_resources/serialization_baseline/glossary/foobar.yaml
+++ b/test_resources/serialization_baseline/glossary/foobar.yaml
@@ -4,5 +4,4 @@ definition: It's foobar2000 actually
entity_id: fooBar2000gLossary001
term: foobar
serdes/meta:
-- id: fooBar2000gLossary001
- model: Glossary
+- model: Glossary
diff --git a/test_resources/serialization_baseline/metabots/embedded_metabot.yaml b/test_resources/serialization_baseline/metabots/embedded_metabot.yaml
index d46863d72ab..6dd6b2f0232 100644
--- a/test_resources/serialization_baseline/metabots/embedded_metabot.yaml
+++ b/test_resources/serialization_baseline/metabots/embedded_metabot.yaml
@@ -4,6 +4,5 @@ created_at: '2026-04-02T02:59:01.370515Z'
entity_id: embeddedmetabotmetabo
updated_at: '2026-04-02T02:59:01.370515Z'
serdes/meta:
-- id: embeddedmetabotmetabo
- model: Metabot
+- model: Metabot
prompts: []
diff --git a/test_resources/serialization_baseline/metabots/metabot.yaml b/test_resources/serialization_baseline/metabots/metabot.yaml
index 8739866d317..d7aacb729f4 100644
--- a/test_resources/serialization_baseline/metabots/metabot.yaml
+++ b/test_resources/serialization_baseline/metabots/metabot.yaml
@@ -4,6 +4,5 @@ created_at: '2025-05-28T17:49:20.649159Z'
entity_id: metabotmetabotmetabot
updated_at: '2025-05-28T17:49:20.649159Z'
serdes/meta:
-- id: metabotmetabotmetabot
- model: Metabot
+- model: Metabot
prompts: []
diff --git a/test_resources/serialization_baseline/python_libraries/common.py.yaml b/test_resources/serialization_baseline/python_libraries/common.py.yaml
index 8145e026bb5..50b7d5b7d62 100644
--- a/test_resources/serialization_baseline/python_libraries/common.py.yaml
+++ b/test_resources/serialization_baseline/python_libraries/common.py.yaml
@@ -3,5 +3,4 @@ source: ''
entity_id: cWWH9qJPvHNB3rP2vLZrK
created_at: '2026-04-02T01:50:04.994996Z'
serdes/meta:
-- id: cWWH9qJPvHNB3rP2vLZrK
- model: PythonLibrary
+- model: PythonLibrary
diff --git a/test_resources/serialization_baseline/python_libraries/shared.py.yaml b/test_resources/serialization_baseline/python_libraries/shared.py.yaml
index 5fa51fb120c..b93e29c2455 100644
--- a/test_resources/serialization_baseline/python_libraries/shared.py.yaml
+++ b/test_resources/serialization_baseline/python_libraries/shared.py.yaml
@@ -5,5 +5,4 @@ source: |-
entity_id: kb0QxR8AyP5W8SVHGYZr8
created_at: '2026-04-02T02:00:49.163166Z'
serdes/meta:
-- id: kb0QxR8AyP5W8SVHGYZr8
- model: PythonLibrary
+- model: PythonLibrary
diff --git a/test_resources/serialization_baseline/transforms/transform_jobs/daily_job.yaml b/test_resources/serialization_baseline/transforms/transform_jobs/daily_job.yaml
index 5073796293f..440bcc8d111 100644
--- a/test_resources/serialization_baseline/transforms/transform_jobs/daily_job.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_jobs/daily_job.yaml
@@ -6,13 +6,8 @@ job_tags:
- entity_id: PJahvcoF61oX5T4uCT_FY
position: 0
tag_id: dUW7nvQHQBdA0Rx0gJckI
- serdes/meta:
- - id: PJahvcoF61oX5T4uCT_FY
- model: TransformJobTransformTag
name: Daily job
schedule: 0 0 0 * * ? *
ui_display_type: cron/builder
serdes/meta:
-- id: PJahvcoF61oX5T4uCT_FY
- label: daily_job
- model: TransformJob
+- model: TransformJob
diff --git a/test_resources/serialization_baseline/transforms/transform_jobs/hourly_job.yaml b/test_resources/serialization_baseline/transforms/transform_jobs/hourly_job.yaml
index a708a10012d..0454bded3ac 100644
--- a/test_resources/serialization_baseline/transforms/transform_jobs/hourly_job.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_jobs/hourly_job.yaml
@@ -6,13 +6,8 @@ job_tags:
- entity_id: RognTgBT2fXaxoQh4ws7z
position: 0
tag_id: wYLcUPbtF7jVPO0duGGHR
- serdes/meta:
- - id: RognTgBT2fXaxoQh4ws7z
- model: TransformJobTransformTag
name: Hourly job
schedule: 0 0 * * * ? *
ui_display_type: cron/builder
serdes/meta:
-- id: RognTgBT2fXaxoQh4ws7z
- label: hourly_job
- model: TransformJob
+- model: TransformJob
diff --git a/test_resources/serialization_baseline/transforms/transform_jobs/monthly_job.yaml b/test_resources/serialization_baseline/transforms/transform_jobs/monthly_job.yaml
index b0be793fe06..74b62158456 100644
--- a/test_resources/serialization_baseline/transforms/transform_jobs/monthly_job.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_jobs/monthly_job.yaml
@@ -6,13 +6,8 @@ job_tags:
- entity_id: CL1TVitmzJrDjdjvO2xmN
position: 0
tag_id: DeeJHc81qKhD9qWINISO8
- serdes/meta:
- - id: CL1TVitmzJrDjdjvO2xmN
- model: TransformJobTransformTag
name: Monthly job
schedule: 0 0 0 1 * ? *
ui_display_type: cron/builder
serdes/meta:
-- id: CL1TVitmzJrDjdjvO2xmN
- label: monthly_job
- model: TransformJob
+- model: TransformJob
diff --git a/test_resources/serialization_baseline/transforms/transform_jobs/nightly_etl_pipeline.yaml b/test_resources/serialization_baseline/transforms/transform_jobs/nightly_etl_pipeline.yaml
index 52cb8450d0c..de706fed776 100644
--- a/test_resources/serialization_baseline/transforms/transform_jobs/nightly_etl_pipeline.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_jobs/nightly_etl_pipeline.yaml
@@ -5,19 +5,11 @@ job_tags:
- entity_id: uZpZUow557u1cZbqT8BHt
position: 0
tag_id: 1uWng5tP1gyxr44PJ5FPb
- serdes/meta:
- - id: uZpZUow557u1cZbqT8BHt
- model: TransformJobTransformTag
- entity_id: 8WHAzlDHJZ7umVLvzbcfb
position: 1
tag_id: Z2nTZwFTBUz1Yil8AKrp2
- serdes/meta:
- - id: 8WHAzlDHJZ7umVLvzbcfb
- model: TransformJobTransformTag
name: Nightly ETL Pipeline
schedule: 0 0 2 * * ? *
ui_display_type: cron/builder
serdes/meta:
-- id: PMlTT2ZjLB2B-C2Hng72Z
- label: nightly_etl_pipeline
- model: TransformJob
+- model: TransformJob
diff --git a/test_resources/serialization_baseline/transforms/transform_jobs/weekly_job.yaml b/test_resources/serialization_baseline/transforms/transform_jobs/weekly_job.yaml
index 61880fa7ca2..3c8e99fd4a2 100644
--- a/test_resources/serialization_baseline/transforms/transform_jobs/weekly_job.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_jobs/weekly_job.yaml
@@ -6,13 +6,8 @@ job_tags:
- entity_id: lXIFa2SUrXLgaLZJx33oU
position: 0
tag_id: qPGCJu7t97kn-X07_fgSj
- serdes/meta:
- - id: lXIFa2SUrXLgaLZJx33oU
- model: TransformJobTransformTag
name: Weekly job
schedule: 0 0 0 ? * 1 *
ui_display_type: cron/builder
serdes/meta:
-- id: lXIFa2SUrXLgaLZJx33oU
- label: weekly_job
- model: TransformJob
+- model: TransformJob
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/custom_etl.yaml b/test_resources/serialization_baseline/transforms/transform_tags/custom_etl.yaml
index f8815f71473..082878265ed 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/custom_etl.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/custom_etl.yaml
@@ -2,6 +2,4 @@ created_at: '2026-04-02T02:00:49.163166Z'
entity_id: Z2nTZwFTBUz1Yil8AKrp2
name: custom-etl
serdes/meta:
-- id: Z2nTZwFTBUz1Yil8AKrp2
- label: custom_etl
- model: TransformTag
+- model: TransformTag
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/daily.yaml b/test_resources/serialization_baseline/transforms/transform_tags/daily.yaml
index c76ac117f99..092f06252c7 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/daily.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/daily.yaml
@@ -3,6 +3,4 @@ created_at: '2026-04-02T02:00:48.042904Z'
entity_id: dUW7nvQHQBdA0Rx0gJckI
name: daily
serdes/meta:
-- id: dUW7nvQHQBdA0Rx0gJckI
- label: daily
- model: TransformTag
+- model: TransformTag
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/hourly.yaml b/test_resources/serialization_baseline/transforms/transform_tags/hourly.yaml
index 6f90a31498e..01421d55bb8 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/hourly.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/hourly.yaml
@@ -3,6 +3,4 @@ created_at: '2026-04-02T02:00:48.042904Z'
entity_id: wYLcUPbtF7jVPO0duGGHR
name: hourly
serdes/meta:
-- id: wYLcUPbtF7jVPO0duGGHR
- label: hourly
- model: TransformTag
+- model: TransformTag
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/monthly.yaml b/test_resources/serialization_baseline/transforms/transform_tags/monthly.yaml
index 5d2f0bde9dc..094302c4920 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/monthly.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/monthly.yaml
@@ -3,6 +3,4 @@ created_at: '2026-04-02T02:00:48.042904Z'
entity_id: DeeJHc81qKhD9qWINISO8
name: monthly
serdes/meta:
-- id: DeeJHc81qKhD9qWINISO8
- label: monthly
- model: TransformTag
+- model: TransformTag
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/nightly_refresh.yaml b/test_resources/serialization_baseline/transforms/transform_tags/nightly_refresh.yaml
index 1dcc3d91996..42730146bd4 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/nightly_refresh.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/nightly_refresh.yaml
@@ -2,6 +2,4 @@ created_at: '2026-04-02T02:00:49.163166Z'
entity_id: 1uWng5tP1gyxr44PJ5FPb
name: nightly-refresh
serdes/meta:
-- id: 1uWng5tP1gyxr44PJ5FPb
- label: nightly_refresh
- model: TransformTag
+- model: TransformTag
diff --git a/test_resources/serialization_baseline/transforms/transform_tags/weekly.yaml b/test_resources/serialization_baseline/transforms/transform_tags/weekly.yaml
index 0551e6faead..3fbbbfe7b02 100644
--- a/test_resources/serialization_baseline/transforms/transform_tags/weekly.yaml
+++ b/test_resources/serialization_baseline/transforms/transform_tags/weekly.yaml
@@ -3,6 +3,4 @@ created_at: '2026-04-02T02:00:48.042904Z'
entity_id: qPGCJu7t97kn-X07_fgSj
name: weekly
serdes/meta:
-- id: qPGCJu7t97kn-X07_fgSj
- label: weekly
- model: TransformTag
+- model: TransformTag