Skip to content

fix: filter dbt models to upload only current project #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cedric-orange wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: filter dbt models to upload only current project #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
260055f
fix: filter dbt models to upload only current project
cedric-orange Mar 14, 2025
902de0e
Merge branch 'elementary-data:master' into master
cedric-orange Apr 28, 2025
b6d7699
Merge branch 'elementary-data:master' into master
cedric-orange Sep 18, 2025
07776f9
fix: apply pr comments
cedric-orange Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_columns.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_columns(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_columns') %}
{% if execute and relation %}
{% set tables = graph.nodes.values() | list + graph.sources.values() | list %}
{% set tables = graph.nodes.values() | selectattr('package_name', '==', project_name) | list + graph.sources.values() | selectattr('package_name', '==', project_name) | list %}
{% do elementary.upload_artifacts_to_table(relation, tables, elementary.flatten_table_columns, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_exposures.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_exposures(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_exposures') %}
{% if execute and relation %}
{% set exposures = graph.exposures.values() | selectattr('resource_type', '==', 'exposure') %}
{% set exposures = graph.exposures.values() | selectattr('resource_type', '==', 'exposure') | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 drops exposures from packages; this should be behind a config/flag (default off) to avoid changing behavior for existing users.

🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_exposures.sql` at line 4, The current
filter on graph.exposures in the upload_dbt_exposures macro (exposures =
graph.exposures.values() | selectattr('resource_type', '==', 'exposure') |
selectattr('package_name', '==', project_name)) force-scopes exposures to the
current project and must be made opt-in; add a boolean config/flag (e.g., a
macro arg or dbt var like scope_exposures_to_project defaulting to false) and
only apply the selectattr('package_name', '==', project_name') filter when that
flag is true, leaving the original exposure selection by resource_type unchanged
when the flag is false so existing behavior remains intact.

{% do elementary.upload_artifacts_to_table(relation, exposures, elementary.flatten_exposure, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_models.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_models(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_models') %}
{% if execute and relation %}
{% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model') %}
{% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model' ) | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 excludes models from packages/dependencies. This is a behavioral change and should be gated behind a config/flag with a default that keeps current behavior. You can use the existing elementary.get_config_var(...) pattern in this file and apply the same guard to all artifact uploads.

💡 Suggested pattern (apply across all upload macros) 
-{% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model' ) | selectattr('package_name', '==', project_name) %}
+{% set models = graph.nodes.values() | selectattr('resource_type', '==', 'model') %}
+{% if elementary.get_config_var('limit_artifacts_to_current_project') %}
+  {% set models = models | selectattr('package_name', '==', project_name) %}
+{% endif %}
🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_models.sql` at line 4, The current
filtering expression that sets models via graph.nodes.values() |
selectattr('resource_type','==','model') | selectattr('package_name','==',
project_name) forces project-only scoping and must be made opt-in; add a config
flag using elementary.get_config_var('edr_upload_scope_project', default=false)
and conditionally apply the package_name == project_name selectattr only when
that flag is true (update upload_dbt_models.sql and apply the same guard in the
other artifact upload macros), keeping the default behavior to include
dependency packages.

{% do elementary.upload_artifacts_to_table(relation, models, elementary.flatten_model, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_seeds.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_seeds(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_seeds') %}
{% if execute and relation %}
{% set seeds = graph.nodes.values() | selectattr('resource_type', '==', 'seed') %}
{% set seeds = graph.nodes.values() | selectattr('resource_type', '==', 'seed') | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 now excludes package seeds; this is a behavioral change. Please guard it behind an explicit flag (default off to preserve current behavior), matching the requested PR approach.

🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_seeds.sql` at line 4, The change
currently filters seeds by package_name unconditionally; make this
project-scoping behavior opt-in by adding a boolean flag (e.g.,
scope_seeds_to_project defaulting to false) and apply the package_name filter
only when that flag is true: modify the seeds jinja expression in
upload_dbt_seeds.sql to conditionally include "| selectattr('package_name',
'==', project_name)" when scope_seeds_to_project is true (keep the original
behavior when false), and ensure the flag is documented/defined where macro
variables are declared so callers can opt in.

{% do elementary.upload_artifacts_to_table(relation, seeds, elementary.flatten_seed, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_snapshots.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_snapshots(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_snapshots') %}
{% if execute and relation %}
{% set snapshots = graph.nodes.values() | selectattr('resource_type', '==', 'snapshot') %}
{% set snapshots = graph.nodes.values() | selectattr('resource_type', '==', 'snapshot') | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 excludes package snapshots; this is a behavior change and should be guarded behind a flag with default preserving current behavior.

🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_snapshots.sql` at line 4, The current
assignment to snapshots filters out package snapshots by comparing package_name
== project_name; make this scoping opt-in by adding a macro parameter or config
flag (e.g., scope_to_project defaulting to false) and apply the
selectattr('package_name','==', project_name) filter only when that flag is
true; update the snapshots variable construction (the line that sets snapshots)
to conditionally include the package_name filter and document the new parameter.

{% do elementary.upload_artifacts_to_table(relation, snapshots, elementary.flatten_model, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_sources.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_sources(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_sources') %}
{% if execute and relation %}
{% set sources = graph.sources.values() | selectattr('resource_type', '==', 'source') %}
{% set sources = graph.sources.values() | selectattr('resource_type', '==', 'source') | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 now excludes package sources; please gate this behind an explicit configuration flag (default off) to preserve existing behavior.

🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_sources.sql` at line 4, The change to how
sources is computed now filters by package_name == project_name and must be made
opt-in: add a config flag (e.g., var or macro argument like
scope_project_sources defaulting to false) and only apply the
selectattr('package_name', '==', project_name) filter when that flag is true,
otherwise keep the original behavior (do not filter by package_name); update the
computation of the sources variable (the expression that uses
graph.sources.values() and selectattr('resource_type', '==', 'source')) to
conditionally append the package_name filter based on the new flag and document
the new flag in the macro signature/usage.

{% do elementary.upload_artifacts_to_table(relation, sources, elementary.flatten_source, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/dbt_artifacts/upload_dbt_tests.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- macro upload_dbt_tests(should_commit=false, metadata_hashes=none) -%}
{% set relation = elementary.get_elementary_relation('dbt_tests') %}
{% if execute and relation %}
{% set tests = graph.nodes.values() | selectattr('resource_type', '==', 'test') %}
{% set tests = graph.nodes.values() | selectattr('resource_type', '==', 'test') | selectattr('package_name', '==', project_name) %}
Copy link

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Make project scoping opt‑in (behavior change).

Line 4 filters out tests from packages/dependencies. That’s a behavior change; per PR discussion this should be gated by a config/flag with a default that preserves current behavior. Please add an opt‑in guard and apply consistently across all artifact uploads.

🤖 Prompt for AI Agents 
In `@macros/edr/dbt_artifacts/upload_dbt_tests.sql` at line 4, The current line
that defines tests by filtering graph.nodes to resource_type == 'test' and
package_name == project_name introduces a behavior change by excluding
dependency tests; make this scoping opt-in by adding a configuration flag (e.g.,
scope_tests_to_project defaulting to false) and only apply the package_name ==
project_name filter when that flag is true; update the tests set definition (the
{% set tests = ... %} expression) to conditionally include the package_name
filter based on that flag and ensure the same opt-in guard is added wherever
artifact uploads perform project-scoped filtering so all artifact uploads behave
consistently.

{% do elementary.upload_artifacts_to_table(relation, tests, elementary.flatten_test, should_commit=should_commit, metadata_hashes=metadata_hashes) %}
{%- endif -%}
{{- return('') -}}
Expand Down