Allow user to specify runtime via env var

Author: treysp

sqlmesh/__init__.py

@@ -64,6 +64,19 @@ def get(cls) -> RuntimeEnv:
 
         Unlike the rich implementation we try to split out by notebook type instead of treating it all as Jupyter.
         """
+        runtime_env_var = os.getenv("SQLMESH_RUNTIME_ENVIRONMENT")
+        if runtime_env_var:
+            runtime_env_var = runtime_env_var.lower().strip().replace(" ", "").replace("-", "_")
+            runtime_env_var = "non_interactive" if runtime_env_var == "ci" else runtime_env_var
+            runtime_env_var = "debugger" if "debug" in runtime_env_var else runtime_env_var
+            try:
+                return RuntimeEnv(runtime_env_var)
+            except ValueError:
+                valid_values = [f'"{member.value}"' for member in RuntimeEnv] + ['"ci"']
+                raise ValueError(
+                    f"Invalid SQLMESH_RUNTIME_ENVIRONMENT value: {runtime_env_var}. Must be one of {', '.join(valid_values)}."
+                )
+
         try:
             shell = get_ipython()  # type: ignore
             if os.getenv("DATABRICKS_RUNTIME_VERSION"):
@@ -78,11 +91,7 @@ def get(cls) -> RuntimeEnv:
         if debug_mode_enabled():
             return RuntimeEnv.DEBUGGER
 
-        if (
-            is_cicd_environment()
-            or not is_interactive_environment()
-            or str_to_bool(os.environ.get("SQLMESH_NON_INTERACTIVE_TERMINAL", "false"))
-        ):
+        if is_cicd_environment() or not is_interactive_environment():
             return RuntimeEnv.NON_INTERACTIVE
 
         return RuntimeEnv.TERMINAL

sqlmesh/core/console.py

@@ -2850,13 +2850,13 @@ def show_environment_difference_summary(
             )
             return
 
-        self._print(f"**Summary of differences from `{context_diff.environment}`:**\n")
+        self._print(f"\n**Summary of differences from `{context_diff.environment}`:**")
 
         if context_diff.has_requirement_changes:
-            self._print(f"Requirements:\n{context_diff.requirements_diff()}")
+            self._print(f"\nRequirements:\n{context_diff.requirements_diff()}")
 
         if context_diff.has_environment_statements_changes and not no_diff:
-            self._print("[bold]Environment statements:\n")
+            self._print("\nEnvironment statements:\n")
             for _, diff in context_diff.environment_statements_diff(
                 include_python_env=not context_diff.is_new_environment
             ):

tests/integrations/github/cicd/test_integration.py

@@ -287,15 +287,14 @@ def test_merge_pr_has_non_breaking_change(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[1]["status"]).is_in_progress
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
-    expected_prod_plan_summary = """**Summary of differences from `prod`:**
-
+    expected_prod_plan_summary = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.waiter_revenue_by_day`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -16,7 +16,8 @@
 
@@ -484,15 +483,14 @@ def test_merge_pr_has_non_breaking_change_diff_start(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
     assert prod_plan_preview_checks_runs[2]["output"]["title"] == "Prod Plan Preview"
-    expected_prod_plan = """**Summary of differences from `prod`:**
-
+    expected_prod_plan = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.waiter_revenue_by_day`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -16,7 +16,8 @@
 
@@ -992,15 +990,14 @@ def test_no_merge_since_no_deploy_signal(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[1]["status"]).is_in_progress
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
-    expected_prod_plan = """**Summary of differences from `prod`:**
-
+    expected_prod_plan = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.waiter_revenue_by_day`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -16,7 +16,8 @@
 
@@ -1173,15 +1170,14 @@ def test_no_merge_since_no_deploy_signal_no_approvers_defined(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[1]["status"]).is_in_progress
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
-    expected_prod_plan = """**Summary of differences from `prod`:**
-
+    expected_prod_plan = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.waiter_revenue_by_day`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -16,7 +16,8 @@
 
@@ -1343,15 +1339,14 @@ def test_deploy_comment_pre_categorized(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[1]["status"]).is_in_progress
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
-    expected_prod_plan = """**Summary of differences from `prod`:**
-
+    expected_prod_plan = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.waiter_revenue_by_day`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -16,7 +16,8 @@
 
@@ -1682,15 +1677,14 @@ def test_overlapping_changes_models(
     assert GithubCheckStatus(prod_plan_preview_checks_runs[1]["status"]).is_in_progress
     assert GithubCheckStatus(prod_plan_preview_checks_runs[2]["status"]).is_completed
     assert GithubCheckConclusion(prod_plan_preview_checks_runs[2]["conclusion"]).is_success
-    expected_prod_plan_summary = """**Summary of differences from `prod`:**
-
+    expected_prod_plan_summary = """\n**Summary of differences from `prod`:**
 
 **Directly Modified:**
 - `sushi.customers`
 ```diff
----
+--- 
 
-+++
++++ 
 
 @@ -25,7 +25,8 @@
 
@@ -1877,8 +1871,7 @@ def test_pr_delete_model(
         == """<table><thead><tr><th colspan="3">PR Environment Summary</th></tr><tr><th>Model</th><th>Change Type</th><th>Dates Loaded</th></tr></thead><tbody><tr><td>"memory"."sushi"."top_waiters"</td><td>Breaking</td><td>REMOVED</td></tr></tbody></table>"""
     )
 
-    expected_prod_plan_summary = """**Summary of differences from `prod`:**
-
+    expected_prod_plan_summary = """\n**Summary of differences from `prod`:**
 
 **Removed Models:**
 - `sushi.top_waiters`

tests/integrations/jupyter/test_magics.py

@@ -324,7 +324,7 @@ def test_run_dag(
         "'Evaluating models ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100.0% • 18/18"
     )
     assert not output.stderr
-    assert len(output.outputs) == 2
+    assert len(output.outputs) == 6
     assert convert_all_html_output_to_text(output) == [
         "✔ Model batches executed",
         "Run finished for environment 'prod'",