From 38a83aaf333396c005ab3287fa4e03d7b8b6899d Mon Sep 17 00:00:00 2001
From: Chenyu Li <chenyu.li@dbtlabs.com>
Date: Fri, 18 Oct 2024 13:54:38 -0700
Subject: [PATCH] exclude hook results from results in on-run-end context

---
 core/dbt/task/run.py                          |  4 +-
 .../adapter/hooks/test_on_run_hooks.py        | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/core/dbt/task/run.py b/core/dbt/task/run.py
index 99913a551c5..d9fa902d265 100644
--- a/core/dbt/task/run.py
+++ b/core/dbt/task/run.py
@@ -767,7 +767,9 @@ def after_run(self, adapter, results) -> None:
 
         extras = {
             "schemas": list({s for _, s in database_schema_set}),
-            "results": results,
+            "results": [
+                r for r in results if r.thread_id != "main"
+            ],  # exclude hooks to preserve backwards compatibility
             "database_schemas": list(database_schema_set),
         }
         with adapter.connection_named("master"):
diff --git a/tests/functional/adapter/hooks/test_on_run_hooks.py b/tests/functional/adapter/hooks/test_on_run_hooks.py
index 42edbdae970..a078af582f9 100644
--- a/tests/functional/adapter/hooks/test_on_run_hooks.py
+++ b/tests/functional/adapter/hooks/test_on_run_hooks.py
@@ -160,3 +160,41 @@ def test_results(self, project):
 
         run_results = get_artifact(project.project_root, "target", "run_results.json")
         assert run_results["results"] == []
+
+
+class Test__HookContext:
+    @pytest.fixture(scope="class")
+    def project_config_update(self):
+        return {
+            "on-run-start": [
+                "select 1 as id",  # success
+                "select 1 as id",  # success
+            ],
+            "on-run-end": [
+                '{{ log("Num Results in context: " ~ results|length)}}'
+                "{{ output_thread_ids(results) }}",
+            ],
+        }
+
+    @pytest.fixture(scope="class")
+    def macros(self):
+        return {
+            "log.sql": """
+{% macro output_thread_ids(results) %}
+    {% for result in results %}
+        {{ log("Thread ID: " ~ result.thread_id) }}
+    {% endfor %}
+{% endmacro %}
+"""
+        }
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {"my_model.sql": "select 1"}
+
+    def test_results_in_context(self, project):
+        results, log_output = run_dbt_and_capture(["--debug", "run"])
+        assert "Thread ID: " in log_output
+        assert "Thread ID: main" not in log_output
+        assert results[0].thread_id == "main"
+        assert "Num Results in context: 1" in log_output