Revert " ele-4409: added dbt group artifact and column (#814)"

arbiv · web-flow · commit 15147edd88a4 · 2025-05-27T10:51:11.000+03:00
This reverts commit 59270ed.
diff --git a/integration_tests/tests/test_dbt_artifacts/test_groups.py b/integration_tests/tests/test_dbt_artifacts/test_groups.py
diff --git a/macros/edr/dbt_artifacts/upload_dbt_artifacts.sql b/macros/edr/dbt_artifacts/upload_dbt_artifacts.sql
@@ -8,7 +8,6 @@
       "dbt_metrics": elementary.upload_dbt_metrics,
       "dbt_exposures": elementary.upload_dbt_exposures,
       "dbt_seeds": elementary.upload_dbt_seeds,
-      "dbt_groups": elementary.upload_dbt_groups,
       }
     %}
 
diff --git a/macros/edr/dbt_artifacts/upload_dbt_groups.sql b/macros/edr/dbt_artifacts/upload_dbt_groups.sql
diff --git a/macros/edr/dbt_artifacts/upload_dbt_metrics.sql b/macros/edr/dbt_artifacts/upload_dbt_metrics.sql
@@ -30,7 +30,6 @@
                                                                    ('path', 'string'),
                                                                    ('generated_at', 'string'),
                                                                    ('metadata_hash', 'string'),
-                                                                   ('group_name', 'string'),
                                                                    ]) %}
     {{ return(dbt_metrics_empty_table_query) }}
 {% endmacro %}
@@ -58,8 +57,7 @@
         'package_name': node_dict.get('package_name'),
         'original_path': node_dict.get('original_file_path'),
         'path': node_dict.get('path'),
-        'generated_at': elementary.datetime_now_utc_as_string(),
-        'group_name': config_dict.get("group"),
+        'generated_at': elementary.datetime_now_utc_as_string()
     }%}
     {% do flatten_metric_metadata_dict.update({"metadata_hash": elementary.get_artifact_metadata_hash(flatten_metric_metadata_dict)}) %}
     {{ return(flatten_metric_metadata_dict) }}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_models.sql b/macros/edr/dbt_artifacts/upload_dbt_models.sql
@@ -30,8 +30,6 @@
         ('metadata_hash', 'string'),
         ('unique_key', 'string'),
         ('incremental_strategy', 'string'),
-        ('group_name', 'string'),
-        ('access', 'string'),
     ] %}
     {% if target.type == "bigquery" or elementary.get_config_var("include_other_warehouse_specific_columns") %}
         {% do columns.extend([('bigquery_partition_by', 'string'), ('bigquery_cluster_by', 'string')]) %}
@@ -64,7 +62,7 @@
     {% set meta_tags = elementary.safe_get_with_default(meta_dict, 'tags', []) %}
     {% set tags = elementary.union_lists(config_tags, global_tags) %}
     {% set tags = elementary.union_lists(tags, meta_tags) %}
-  
+
     {% set flatten_model_metadata_dict = {
         'unique_id': node_dict.get('unique_id'),
         'alias': node_dict.get('alias'),
@@ -88,8 +86,6 @@
         'incremental_strategy': config_dict.get("incremental_strategy"),
         'bigquery_partition_by': config_dict.get("partition_by"),
         'bigquery_cluster_by': config_dict.get("cluster_by"),
-        'group_name': config_dict.get("group") or node_dict.get("group"),
-        'access': config_dict.get("access") or node_dict.get("access"),
     } %}
     {% do flatten_model_metadata_dict.update({"metadata_hash": elementary.get_artifact_metadata_hash(flatten_model_metadata_dict)}) %}
     {{ return(flatten_model_metadata_dict) }}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_seeds.sql b/macros/edr/dbt_artifacts/upload_dbt_seeds.sql
@@ -23,7 +23,6 @@
                                                                   ('path', 'string'),
                                                                   ('generated_at', 'string'),
                                                                   ('metadata_hash', 'string'),
-                                                                  ('group_name', 'string'),
                                                                   ]) %}
     {{ return(dbt_seeds_empty_table_query) }}
 {% endmacro %}
@@ -66,8 +65,7 @@
         'package_name': node_dict.get('package_name'),
         'original_path': node_dict.get('original_file_path'),
         'path': node_dict.get('path'),
-        'generated_at': elementary.datetime_now_utc_as_string(),
-        'group_name': config_dict.get("group") or node_dict.get("group"),
+        'generated_at': elementary.datetime_now_utc_as_string()
     }%}
     {% do flatten_seed_metadata_dict.update({"metadata_hash": elementary.get_artifact_metadata_hash(flatten_seed_metadata_dict)}) %}
     {{ return(flatten_seed_metadata_dict) }}
diff --git a/macros/edr/dbt_artifacts/upload_dbt_tests.sql b/macros/edr/dbt_artifacts/upload_dbt_tests.sql
@@ -38,8 +38,7 @@
                                                                  ('path', 'string'),
                                                                  ('generated_at', 'string'),
                                                                  ('metadata_hash', 'string'),
-                                                                 ('quality_dimension', 'string'),
-                                                                 ('group_name', 'string'),
+                                                                 ('quality_dimension', 'string')
                                                                  ]) %}
     {{ return(dbt_tests_empty_table_query) }}
 {% endmacro %}
@@ -174,8 +173,7 @@
         'compiled_code': elementary.get_compiled_code(node_dict),
         'path': node_dict.get('path'),
         'generated_at': elementary.datetime_now_utc_as_string(),
-        'quality_dimension': meta_dict.get('quality_dimension') or elementary.get_quality_dimension(test_original_name, test_namespace),
-        'group_name': config_dict.get("group") or node_dict.get("group"),
+        'quality_dimension': meta_dict.get('quality_dimension') or elementary.get_quality_dimension(test_original_name, test_namespace)
     }%}
     {% do flatten_test_metadata_dict.update({"metadata_hash": elementary.get_artifact_metadata_hash(flatten_test_metadata_dict)}) %}
     {{ return(flatten_test_metadata_dict) }}
diff --git a/macros/edr/dbt_artifacts/upload_run_results.sql b/macros/edr/dbt_artifacts/upload_run_results.sql
@@ -31,8 +31,7 @@
                                                                        ('query_id', 'string'),
                                                                        ('thread_id', 'string'),
                                                                        ('materialization', 'string'),
-                                                                       ('adapter_response', 'string'),
-                                                                       ('group_name', 'string'),
+                                                                       ('adapter_response', 'string')
                                                                        ]) %}
     {{ return(dbt_run_results_empty_table_query) }}
 {% endmacro %}
@@ -62,8 +61,7 @@
         'query_id': run_result_dict.get('adapter_response', {}).get('query_id'),
         'thread_id': run_result_dict.get('thread_id'),
         'materialization': config_dict.get('materialized'),
-        'adapter_response': run_result_dict.get('adapter_response', {}),
-        'group_name': config_dict.get('group'),
+        'adapter_response': run_result_dict.get('adapter_response', {})
     } %}
 
     {% set timings = elementary.safe_get_with_default(run_result_dict, 'timing', []) %}
diff --git a/models/edr/dbt_artifacts/dbt_artifacts_hashes.sql b/models/edr/dbt_artifacts/dbt_artifacts_hashes.sql
@@ -14,7 +14,6 @@
   "dbt_exposures",
   "dbt_seeds",
   "dbt_columns",
-  "dbt_groups",
 ] %}
 
 {% for artifact_model in artifact_models %}
diff --git a/models/edr/dbt_artifacts/dbt_groups.sql b/models/edr/dbt_artifacts/dbt_groups.sql
diff --git a/models/edr/run_results/model_run_results.sql b/models/edr/run_results/model_run_results.sql
@@ -31,7 +31,6 @@ SELECT
     run_results.compiled_code,
     run_results.adapter_response,
     run_results.thread_id,
-    run_results.group_name,
     models.database_name,
     models.schema_name,
     coalesce(run_results.materialization, models.materialization) as materialization,
diff --git a/models/edr/run_results/seed_run_results.sql b/models/edr/run_results/seed_run_results.sql
@@ -31,7 +31,6 @@ SELECT
     run_results.compiled_code,
     run_results.adapter_response,
     run_results.thread_id,
-    run_results.group_name,
     seeds.database_name,
     seeds.schema_name,
     run_results.materialization,
diff --git a/models/edr/run_results/snapshot_run_results.sql b/models/edr/run_results/snapshot_run_results.sql
@@ -31,7 +31,6 @@ SELECT
     run_results.compiled_code,
     run_results.adapter_response,
     run_results.thread_id,
-    run_results.group_name,
     snapshots.database_name,
     snapshots.schema_name,
     coalesce(run_results.materialization, snapshots.materialization) as materialization,

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`"dbt_metrics": elementary.upload_dbt_metrics,`
`9`	`9`	`"dbt_exposures": elementary.upload_dbt_exposures,`
`10`	`10`	`"dbt_seeds": elementary.upload_dbt_seeds,`
`11`		`- "dbt_groups": elementary.upload_dbt_groups,`
`12`	`11`	`}`
`13`	`12`	`%}`
`14`	`13`