tweak a bit more

Author: atvaccaro

warehouse/scripts/dbt_artifacts/__init__.py

@@ -178,8 +178,10 @@ def gvattrs(self) -> Dict[str, Any]:
             and self.catalog_entry.num_bytes > 100_000_000_000  # type: ignore[attr-defined]
         )
 
-        if self.config.materialized in ("table", "incremental"):
+        if self.config.materialized == "table":
             fillcolor = "darkseagreen"
+        elif self.config.materialized == "incremental":
+            fillcolor = "darkseagreen1"
 
         if (
             more_than_100gb

warehouse/scripts/templates/ci_report.md

@@ -1,13 +1,13 @@
 Warehouse report 📦
 
-{% if new_models or changed_or_downstream_incremental_models %}
+{% if new_models or modified_or_downstream_incremental_models %}
 ### Checks/potential follow-ups
 
 Checks indicate the following action items may be necessary.
 {% if new_models -%}
 - [ ] For new models, do they all have a surrogate primary key that is tested to be not-null and unique?
 {%- endif %}
-{% if changed_or_downstream_incremental_models -%}
+{% if modified_or_downstream_incremental_models -%}
 - [ ] For modified incremental models (or incremental models whose parents are modified), does the PR description identify whether a full refresh is needed for these tables?
 {%- endif %}
 {% endif %}
@@ -22,11 +22,11 @@ Checks indicate the following action items may be necessary.
 {% endfor %}
 {% endif %}
 
-{% if changed_or_downstream_incremental_models %}
+{% if modified_or_downstream_incremental_models %}
 
 ### Changed incremental models 🔀
 
-{% for model in changed_or_downstream_incremental_models %}
+{% for model in modified_or_downstream_incremental_models %}
 {{ model }}
 {% endfor %}
 {% endif %}
@@ -37,11 +37,11 @@ Checks indicate the following action items may be necessary.
 
 Legend (in order of precedence)
 
-| Resource type                                  | Indicator | Resolution                            |
-|------------------------------------------------|-----------|---------------------------------------|
-| Large table-materialized model                 | Orange    | Make the model incremental            |
-| Large model without partitioning or clustering | Orange    | Add partitioning and/or clustering    |
-| View with more than one child                  | Yellow    | Materialize as a table or incremental |
-| Incremental                                    | Green     |                                       |
-| Table                                          | Green     |                                       |
-| View                                           | White     |                                       |
+| Resource type                                  | Indicator   | Resolution                            |
+|------------------------------------------------|-------------|---------------------------------------|
+| Large table-materialized model                 | Orange      | Make the model incremental            |
+| Large model without partitioning or clustering | Orange      | Add partitioning and/or clustering    |
+| View with more than one child                  | Yellow      | Materialize as a table or incremental |
+| Incremental                                    | Light green |                                       |
+| Table                                          | Green       |                                       |
+| View                                           | White       |                                       |

warehouse/scripts/visualize.py

@@ -262,42 +262,39 @@ def ci_report(
         ]
     ).result
 
-    changed_or_downstream_incremental_models = dbt.invoke(
+    modified_models = dbt.invoke(
         [
             "ls",
             "--resource-type",
             "model",
             "--select",
-            "state:modified+,config.materialized:incremental",
+            "state:modified+",
             "--exclude",
             "state:new",
             "--state",
             latest_dir,
         ]
     ).result
 
-    modified_models = dbt.invoke(
+    modified_or_downstream_incremental_models = dbt.invoke(
         [
             "ls",
             "--resource-type",
             "model",
             "--select",
-            "state:modified",
+            "state:modified+,config.materialized:incremental",
             "--exclude",
             "state:new",
             "--state",
             latest_dir,
         ]
     ).result
 
+    typer.secho(f"Visualizing the following models: {modified_models}")
     assert isinstance(modified_models, list)
-    assert isinstance(changed_or_downstream_incremental_models, list)
-    include = set(changed_or_downstream_incremental_models + modified_models)
-    typer.secho(f"Visualizing the following models: {include}")
-
     viz(
         ArtifactType.manifest,
-        include=list(include),
+        include=modified_models,
         output=Path("./target/dag.png"),
     )
 
@@ -308,7 +305,7 @@ def ci_report(
     template = env.get_template("ci_report.md")
     report = template.render(
         new_models=new_models,
-        changed_or_downstream_incremental_models=changed_or_downstream_incremental_models,
+        modified_or_downstream_incremental_models=modified_or_downstream_incremental_models,
     )
     typer.secho(f"Writing to {output}", fg=typer.colors.GREEN)
     with open(output, "w") as f: