Fix circular import

Author: treysp

sqlmesh/core/snapshot/definition.py

@@ -13,10 +13,13 @@
 from sqlglot import exp
 from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
 
-from sqlmesh.core.config.common import TableNamingConvention, VirtualEnvironmentMode
+from sqlmesh.core.config.common import (
+    TableNamingConvention,
+    VirtualEnvironmentMode,
+    EnvironmentSuffixTarget,
+)
 from sqlmesh.core import constants as c
 from sqlmesh.core.audit import StandaloneAudit
-from sqlmesh.core.environment import EnvironmentSuffixTarget
 from sqlmesh.core.macros import call_macro
 from sqlmesh.core.model import Model, ModelKindMixin, ModelKindName, ViewKind, CustomKind
 from sqlmesh.core.model.definition import _Model

sqlmesh/core/snapshot/evaluator.py

@@ -37,7 +37,6 @@
 from sqlmesh.core import dialect as d
 from sqlmesh.core.audit import Audit, StandaloneAudit
 from sqlmesh.core.dialect import schema_
-from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.core.engine_adapter.shared import InsertOverwriteStrategy, DataObjectType
 from sqlmesh.core.macros import RuntimeStage
 from sqlmesh.core.model import (
@@ -83,6 +82,7 @@
 
 if t.TYPE_CHECKING:
     from sqlmesh.core.engine_adapter._typing import DF, QueryOrDF
+    from sqlmesh.core.engine_adapter.base import EngineAdapter
     from sqlmesh.core.environment import EnvironmentNamingInfo
 
 logger = logging.getLogger(__name__)

tests/core/engine_adapter/integration/test_integration.py

@@ -2380,7 +2380,7 @@ def _normalize_snowflake(name: str, prefix_regex: str = "(sqlmesh__)(.*)"):
     # capture row counts for each evaluated snapshot
     actual_execution_stats = {}
 
-    def capture_row_counts(
+    def capture_execution_stats(
         snapshot,
         interval,
         batch_idx,
@@ -2396,7 +2396,9 @@ def capture_row_counts(
             )
 
     # apply prod plan
-    with patch.object(context.console, "update_snapshot_evaluation_progress", capture_row_counts):
+    with patch.object(
+        context.console, "update_snapshot_evaluation_progress", capture_execution_stats
+    ):
         context.plan(auto_apply=True, no_prompts=True)
 
     prod_schema_results = ctx.get_metadata_results(object_names["view_schema"][0])