fix: show only user macro count in info (#1948)

Author: eakmanrq

sqlmesh/core/context.py

@@ -63,7 +63,7 @@
 from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.core.environment import Environment, EnvironmentNamingInfo
 from sqlmesh.core.loader import Loader, update_model_schemas
-from sqlmesh.core.macros import ExecutableOrMacro
+from sqlmesh.core.macros import ExecutableOrMacro, macro
 from sqlmesh.core.metric import Metric, rewrite
 from sqlmesh.core.model import Model
 from sqlmesh.core.notification_target import (
@@ -1409,7 +1409,7 @@ def create_external_models(self) -> None:
     def print_info(self) -> None:
         """Prints information about connections, models, macros, etc. to the console."""
         self.console.log_status_update(f"Models: {len(self.models)}")
-        self.console.log_status_update(f"Macros: {len(self._macros)}")
+        self.console.log_status_update(f"Macros: {len(self._macros) - len(macro.get_registry())}")
 
         self._try_connection("data warehouse", self._engine_adapter)
 

tests/core/test_integration.py

@@ -1566,6 +1566,14 @@ def test_environment_suffix_target_table(init_and_plan_context: t.Callable):
 
 def test_environment_catalog_mapping(init_and_plan_context: t.Callable):
     environments_schemas = {"raw", "sushi"}
+    state_tables = {
+        "_versions",
+        "_seeds",
+        "_snapshots",
+        "_environments",
+        "_plan_dags",
+        "_intervals",
+    }
 
     def get_prod_dev_views(metadata: DuckDBMetadata) -> t.Tuple[t.Set[exp.Table], t.Set[exp.Table]]:
         views = metadata.qualified_views
@@ -1577,53 +1585,69 @@ def get_prod_dev_views(metadata: DuckDBMetadata) -> t.Tuple[t.Set[exp.Table], t.
 
     def get_default_catalog_and_non_tables(
         metadata: DuckDBMetadata, default_catalog: t.Optional[str]
-    ) -> t.Tuple[t.Set[exp.Table], t.Set[exp.Table]]:
+    ) -> t.Tuple[t.Set[exp.Table], t.Set[exp.Table], t.Set[exp.Table]]:
         tables = metadata.qualified_tables
-        default_tables = {x for x in tables if x.catalog == default_catalog}
+        user_default_tables = {
+            x for x in tables if x.catalog == default_catalog and x.db != "sqlmesh"
+        }
+        state_default_tables = {
+            x for x in tables if x.catalog == default_catalog and x.db == "sqlmesh"
+        }
         non_default_tables = {x for x in tables if x.catalog != default_catalog}
-        return default_tables, non_default_tables
+        return user_default_tables, state_default_tables, non_default_tables
 
     context, plan = init_and_plan_context(
         "examples/sushi", config="environment_catalog_mapping_config"
     )
     context.apply(plan)
     metadata = DuckDBMetadata.from_context(context)
     prod_views, dev_views = get_prod_dev_views(metadata)
-    default_tables, non_default_tables = get_default_catalog_and_non_tables(
-        metadata, context.default_catalog
-    )
+    (
+        user_default_tables,
+        state_default_tables,
+        non_default_tables,
+    ) = get_default_catalog_and_non_tables(metadata, context.default_catalog)
     assert len(prod_views) == 12
     assert len(dev_views) == 0
-    assert len(default_tables) == 29
-    assert len(non_default_tables) == 0
+    assert len(user_default_tables) == 23
+    assert state_tables.issubset({x.name for x in state_default_tables})
     apply_to_environment(context, "dev")
     prod_views, dev_views = get_prod_dev_views(metadata)
-    default_tables, non_default_tables = get_default_catalog_and_non_tables(
-        metadata, context.default_catalog
-    )
+    (
+        user_default_tables,
+        state_default_tables,
+        non_default_tables,
+    ) = get_default_catalog_and_non_tables(metadata, context.default_catalog)
     assert len(prod_views) == 12
     assert len(dev_views) == 12
-    assert len(default_tables) == 29
+    assert len(user_default_tables) == 23
     assert len(non_default_tables) == 0
+    assert state_tables.issubset({x.name for x in state_default_tables})
     apply_to_environment(context, "prodnot")
     prod_views, dev_views = get_prod_dev_views(metadata)
-    default_tables, non_default_tables = get_default_catalog_and_non_tables(
-        metadata, context.default_catalog
-    )
+    (
+        user_default_tables,
+        state_default_tables,
+        non_default_tables,
+    ) = get_default_catalog_and_non_tables(metadata, context.default_catalog)
     assert len(prod_views) == 12
     assert len(dev_views) == 24
-    assert len(default_tables) == 29
+    assert len(user_default_tables) == 23
     assert len(non_default_tables) == 0
+    assert state_tables.issubset({x.name for x in state_default_tables})
     context.invalidate_environment("dev")
     context._run_janitor()
     prod_views, dev_views = get_prod_dev_views(metadata)
-    default_tables, non_default_tables = get_default_catalog_and_non_tables(
-        metadata, context.default_catalog
-    )
+    (
+        user_default_tables,
+        state_default_tables,
+        non_default_tables,
+    ) = get_default_catalog_and_non_tables(metadata, context.default_catalog)
     assert len(prod_views) == 12
     assert len(dev_views) == 12
-    assert len(default_tables) == 29
+    assert len(user_default_tables) == 23
     assert len(non_default_tables) == 0
+    assert state_tables.issubset({x.name for x in state_default_tables})
 
 
 @pytest.mark.parametrize(

tests/integrations/jupyter/test_magics.py

@@ -528,7 +528,7 @@ def test_info(notebook, sushi_context, convert_all_html_output_to_text, get_all_
     assert len(output.outputs) == 4
     assert convert_all_html_output_to_text(output) == [
         "Models: 14",
-        "Macros: 23",
+        "Macros: 4",
         "Data warehouse connection succeeded",
         "Test connection succeeded",
     ]
@@ -557,7 +557,7 @@ def test_info(notebook, sushi_context, convert_all_html_output_to_text, get_all_
                     h(
                         "span",
                         {"style": f"{NEUTRAL_STYLE}; font-weight: bold"},
-                        "23",
+                        "4",
                     )
                 ),
             )